Move handling of params and location into createRouterObject

Author: gaearon

modules/Router.js

@@ -62,13 +62,7 @@ const Router = React.createClass({
     }
 
     const { history } = this.props
-    const router = createRouterObject(history, this.transitionManager)
-
-    return {
-      ...router,
-      location: state.location,
-      params: state.params
-    }
+    return createRouterObject(history, this.transitionManager, state)
   },
 
   createTransitionManager() {

modules/RouterUtils.js

@@ -1,7 +1,9 @@
-export function createRouterObject(history, transitionManager) {
+export function createRouterObject(history, transitionManager, state) {
   return {
     ...history,
     setRouteLeaveHook: transitionManager.listenBeforeLeavingRoute,
-    isActive: transitionManager.isActive
+    isActive: transitionManager.isActive,
+    location: state.location,
+    params: state.params
   }
 }

modules/__tests__/RouterContext-test.js

@@ -31,7 +31,7 @@ describe('RouterContext', () => {
       isActive: expect.createSpy().andReturn(isActiveSentinel)
     }
 
-    router = createRouterObject(history, transitionManager)
+    router = createRouterObject(history, transitionManager, {})
 
     class Component extends React.Component {
       constructor(props, ctx) {

modules/match.js

@@ -43,12 +43,7 @@ function match({ history, routes, location, ...options }, callback) {
     let renderProps
 
     if (nextState) {
-      const router = {
-        ...createRouterObject(history, transitionManager),
-        location: nextState.location,
-        params: nextState.params
-      }
-
+      const router = createRouterObject(history, transitionManager, nextState)
       renderProps = {
         ...nextState,
         router,