Improve redirect handling

4Catalyzer · Nov 7, 2016 · bb8f6cf · bb8f6cf
1 parent 0204070
commit bb8f6cf
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/Redirect.js b/src/Redirect.js
@@ -13,8 +13,8 @@ export default class Redirect {
     if (typeof to === 'function') {
       toLocation = to(match);
     } else {
-      const { matcher, params } = match;
-      toLocation = matcher.format(to, params);
+      const { router, params } = match;
+      toLocation = router.matcher.format(to, params);
     }
 
     throw new RedirectException(toLocation);

diff --git a/src/createBaseRouter.js b/src/createBaseRouter.js
@@ -65,6 +65,7 @@ export default function createBaseRouter({
         createLocation,
         isActive,
         addTransitionHook,
+        matcher,
       };
 
       this.childContext = {
@@ -115,7 +116,7 @@ export default function createBaseRouter({
       const augmentedMatch = {
         ...match,
         routes,
-        matcher, // For e.g. Redirect to format pattern.
+        match, // For symmetry with withRouter.
         router: this.router, // Convenience access for route components.
         context: matchContext,
       };