Recreate this.router when the state changes

Author: gaearon

modules/Router.js

@@ -55,41 +55,49 @@ const Router = React.createClass({
     }
   },
 
-  componentWillMount() {
-    const { transitionManager, router } = this.createRouterObjects()
+  createRouterObject(state) {
+    const { matchContext } = this.props
+    if (matchContext) {
+      return matchContext.router
+    }
 
-    this._unlisten = transitionManager.listen((error, state) => {
-      if (error) {
-        this.handleError(error)
-      } else {
-        router.location = state.location
-        router.params = state.params
-        this.setState(state, this.props.onUpdate)
-      }
-    })
+    const { history } = this.props
+    const router = createRouterObject(history, this.transitionManager)
 
-    this.router = router
+    return {
+      ...router,
+      location: state.location,
+      params: state.params
+    }
   },
 
-  createRouterObjects() {
+  createTransitionManager() {
     const { matchContext } = this.props
     if (matchContext) {
-      return matchContext
+      return matchContext.transitionManager
     }
 
-    let { history } = this.props
+    const { history } = this.props
     const { routes, children } = this.props
 
-    const transitionManager = createTransitionManager(
+    return createTransitionManager(
       history,
       createRoutes(routes || children)
     )
+  },
 
-    const router = createRouterObject(history, transitionManager)
-    router.location = null
-    router.params = null
+  componentWillMount() {
+    this.transitionManager = this.createTransitionManager()
+    this.router = this.createRouterObject(this.state)
 
-    return { transitionManager, router }
+    this._unlisten = this.transitionManager.listen((error, state) => {
+      if (error) {
+        this.handleError(error)
+      } else {
+        this.router = this.createRouterObject(state)
+        this.setState(state, this.props.onUpdate)
+      }
+    })
   },
 
   /* istanbul ignore next: sanity check */