Fix TS type declarations for BasemapName and CartoSlice

CHANGELOG.md

@@ -7,6 +7,7 @@
 - Refactor useViewportFeatures [#238](https://github.com/CartoDB/carto-react/pull/238)
 - Add clear button for TimeSeriesWidget widget and enable the speed button even though the animation has not started  [#239](https://github.com/CartoDB/carto-react/pull/239)
 - Improve timeseries animation performance [#243](https://github.com/CartoDB/carto-react/pull/243)
+- Fix TS type declarations for BasemapName and CartoSlice [#248](https://github.com/CartoDB/carto-react/pull/248) 
 
 ## 1.1.3 (2021-12-04)
 

packages/react-redux/src/slices/cartoSlice.d.ts

@@ -1,7 +1,8 @@
 import { Credentials } from '@carto/react-api/';
 import { SourceProps } from '@carto/react-api/types';
 import { CartoBasemapsNames, GMapsBasemapsNames } from '@carto/react-basemaps/';
-import { InitialCartoState, Reducer, ViewState } from '../types';
+import { InitialCartoState, CartoState, ViewState } from '../types';
+import { AnyAction, Reducer } from 'redux';
 
 type Source = SourceProps & { id: string } & { filters?: any};
 
@@ -11,7 +12,7 @@ type Layer = {
   layerAttributes?: object;
 };
 
-type BasemapName = CartoBasemapsNames & GMapsBasemapsNames;
+type BasemapName = CartoBasemapsNames | GMapsBasemapsNames;
 
 type FilterBasic = {
   type: '';
@@ -57,7 +58,7 @@ declare enum CartoActions {
   SET_CREDENTIALS = 'carto/setCredentials'
 }
 
-export function createCartoSlice(initialState: InitialCartoState): Reducer;
+export function createCartoSlice(initialState: InitialCartoState): Reducer<CartoState, AnyAction>;
 
 export function addSource(
   source: Source

packages/react-redux/src/slices/oauthSlice.d.ts

@@ -1,5 +1,6 @@
 import { OauthApp } from '@carto/react-auth/';
-import { InitialOauthState, Reducer } from '../types';
+import { InitialOauthState, OauthState } from '../types';
+import { AnyAction, Reducer } from 'redux';
 
 type OauthParams = {
   accessToken: string,
@@ -18,7 +19,7 @@ declare enum OauthActions {
   LOGOUT = 'oauth/logout'
 }
 
-export function createOauthCartoSlice(initialState: InitialOauthState): Reducer;
+export function createOauthCartoSlice(initialState: InitialOauthState): Reducer<OauthState, AnyAction>;
 
 export function setOAuthApp(arg: OauthApp): {
   type: OauthActions.SET_OAUTH_APP,

packages/react-redux/src/types.d.ts

@@ -2,7 +2,6 @@ import { Credentials } from '@carto/react-api';
 import { OauthApp } from '@carto/react-auth';
 import { CartoBasemapsNames } from '@carto/react-basemaps';
 import { Viewport } from '@carto/react-core';
-import { AnyAction } from 'redux';
 
 export type ViewState = {
   latitude?: number,
@@ -54,8 +53,3 @@ export type OauthState = {
   token: string,
   userInfo: string
 } & InitialOauthState;
-
-export type Reducer = {
-  state: CartoState | OauthState,
-  action: AnyAction
-}