From 8ccbbe9c0351451a4195c4912fb7fe7f699da8b8 Mon Sep 17 00:00:00 2001 From: Vesa Luusua Date: Tue, 10 Oct 2017 20:10:59 +0300 Subject: [PATCH] NamedRedirect: import routeConfiguration and remove context.flattenedRoutes --- src/components/NamedRedirect/NamedRedirect.js | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/components/NamedRedirect/NamedRedirect.js b/src/components/NamedRedirect/NamedRedirect.js index a4a1f501..be72638a 100644 --- a/src/components/NamedRedirect/NamedRedirect.js +++ b/src/components/NamedRedirect/NamedRedirect.js @@ -4,17 +4,16 @@ */ import React, { PropTypes } from 'react'; import { Redirect } from 'react-router-dom'; +import routeConfiguration from '../../routeConfiguration'; import { pathByRouteName } from '../../util/routes'; -import { withFlattenedRoutes } from '../../util/contextHelpers'; -import * as propTypes from '../../util/propTypes'; const NamedRedirect = props => { - const { name, search, state, params, flattenedRoutes, push } = props; - const pathname = pathByRouteName(name, flattenedRoutes, params); + const { name, search, state, params, push } = props; + const pathname = pathByRouteName(name, routeConfiguration(), params); return ; }; -const { arrayOf, object, string, bool } = PropTypes; +const { bool, object, string } = PropTypes; NamedRedirect.defaultProps = { search: '', state: {}, push: false, params: {} }; @@ -24,7 +23,6 @@ NamedRedirect.propTypes = { state: object, push: bool, params: object, - flattenedRoutes: arrayOf(propTypes.route).isRequired, }; -export default withFlattenedRoutes(NamedRedirect); +export default NamedRedirect;