close drawer on receiving route

Gaya · Jun 29, 2020 · 376dc44 · 376dc44
1 parent ed4514f
commit 376dc44
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/src/store/app/reducer.ts b/src/store/app/reducer.ts
@@ -1,7 +1,9 @@
 import { AppState } from '../types';
-import { safeStoredDistance } from '../../utils/localStorage';
 import { AppActions } from './actions';
 
+import { safeStoredDistance } from '../../utils/localStorage';
+import { RouteActions } from '../route/actions';
+
 const storedDistanceSettings = safeStoredDistance();
 
 const initialState: AppState = {
@@ -11,13 +13,14 @@ const initialState: AppState = {
   maximumDistance: storedDistanceSettings?.max || 50,
 };
 
-function app(state = initialState, action: AppActions): AppState {
+function app(state = initialState, action: AppActions | RouteActions): AppState {
   switch (action.type) {
     case 'APP_OPEN_DRAWER':
       return {
         ...state,
         drawerOpened: true,
       };
+    case 'ROUTE_RECEIVE':
     case 'APP_CLOSE_DRAWER':
       return {
         ...state,

diff --git a/src/store/route/actions.ts b/src/store/route/actions.ts
@@ -29,7 +29,7 @@ export interface UpdateRouteParameters {
 }
 
 export function updateRouteParameters(payload: RouteParameters) {
-  return (dispatch: Dispatch<routeActions>): void => {
+  return (dispatch: Dispatch<RouteActions>): void => {
     dispatch({
       type: 'ROUTE_UPDATE_PARAMETERS',
       payload,
@@ -55,4 +55,4 @@ interface GenerateRun {
   type: 'ROUTE_GENERATE_RUN';
 }
 
-export type routeActions = UpdateRouteParameters | GenerateRun | ReceiveRoute;
+export type RouteActions = UpdateRouteParameters | GenerateRun | ReceiveRoute;
diff --git a/src/store/route/reducer.ts b/src/store/route/reducer.ts
@@ -1,7 +1,7 @@
 import { safeStoredLocation } from '../../utils/localStorage';
 
 import { RouteState } from '../types';
-import { routeActions } from './actions';
+import { RouteActions } from './actions';
 
 const defaultRouteState: RouteState = {
   location: safeStoredLocation()?.key,
@@ -10,7 +10,7 @@ const defaultRouteState: RouteState = {
   },
 };
 
-function route(state: RouteState = defaultRouteState, action: routeActions): RouteState {
+function route(state: RouteState = defaultRouteState, action: RouteActions): RouteState {
   switch (action.type) {
     case 'ROUTE_RECEIVE':
       return {