Merge pull request #69 from MrLoh/fix-attemptCallRouteThunk-location-bug

fix: fix location access bug in attemptCallRouteThunk
faceyspacey · Aug 6, 2017 · b9ebe43 · b9ebe43
2 parents dea4829 + 735db24
commit b9ebe43
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/src/connectRoutes.js b/src/connectRoutes.js
@@ -323,7 +323,12 @@ export default (
     nextState = selectLocationState(state)
 
     if (typeof route === 'object') {
-      attemptCallRouteThunk(dispatch, store.getState, route)
+      attemptCallRouteThunk(
+        dispatch,
+        store.getState,
+        route,
+        selectLocationState
+      )
     }
 
     if (onAfterChange) {

diff --git a/src/pure-utils/attemptCallRouteThunk.js b/src/pure-utils/attemptCallRouteThunk.js
@@ -4,15 +4,21 @@ import type {
   Dispatch,
   GetState,
   RouteObject,
-  LocationState
+  LocationState,
+  SelectLocationState
 } from '../flow-types'
 
-export default (dispatch: Dispatch, getState: GetState, route: RouteObject) => {
+export default (
+  dispatch: Dispatch,
+  getState: GetState,
+  route: RouteObject,
+  selectLocationState: SelectLocationState
+) => {
   if (typeof window !== 'undefined') {
     const thunk = route.thunk
 
     if (typeof thunk === 'function') {
-      const { kind, hasSSR }: LocationState = getState().location
+      const { kind, hasSSR }: LocationState = selectLocationState(getState())
 
       // call thunks always if it's not initial load of the app or only if it's load
       // without SSR setup yet, so app state is setup on client when prototyping,