diff --git a/src/router/FocusedRouteContext/FocusedRouteContext.js b/src/router/FocusedRouteContext/FocusedRouteContext.js deleted file mode 100644 index d1323e8e9..000000000 --- a/src/router/FocusedRouteContext/FocusedRouteContext.js +++ /dev/null @@ -1,7 +0,0 @@ -const React = require('react'); - -const FocusedRouteContext = React.createContext(false); - -FocusedRouteContext.displayName = 'FocusedRouteContext'; - -module.exports = FocusedRouteContext; diff --git a/src/router/FocusedRouteContext/index.js b/src/router/FocusedRouteContext/index.js deleted file mode 100644 index 5163ca12c..000000000 --- a/src/router/FocusedRouteContext/index.js +++ /dev/null @@ -1,7 +0,0 @@ -const FocusedRouteContext = require('./FocusedRouteContext'); -const useFocusedRoute = require('./useFocusedRoute'); - -module.exports = { - FocusedRouteProvider: FocusedRouteContext.Provider, - useFocusedRoute -}; diff --git a/src/router/FocusedRouteContext/useFocusedRoute.js b/src/router/FocusedRouteContext/useFocusedRoute.js deleted file mode 100644 index 3c893f027..000000000 --- a/src/router/FocusedRouteContext/useFocusedRoute.js +++ /dev/null @@ -1,8 +0,0 @@ -const React = require('react'); -const FocusedRouteContext = require('./FocusedRouteContext'); - -const useFocusedRoute = () => { - return React.useContext(FocusedRouteContext); -}; - -module.exports = useFocusedRoute; diff --git a/src/router/RouteFocusedContext/RouteFocusedContext.js b/src/router/RouteFocusedContext/RouteFocusedContext.js new file mode 100644 index 000000000..0d2eca21a --- /dev/null +++ b/src/router/RouteFocusedContext/RouteFocusedContext.js @@ -0,0 +1,7 @@ +const React = require('react'); + +const RouteFocusedContext = React.createContext(false); + +RouteFocusedContext.displayName = 'RouteFocusedContext'; + +module.exports = RouteFocusedContext; diff --git a/src/router/RouteFocusedContext/index.js b/src/router/RouteFocusedContext/index.js new file mode 100644 index 000000000..986b2204e --- /dev/null +++ b/src/router/RouteFocusedContext/index.js @@ -0,0 +1,7 @@ +const RouteFocusedContext = require('./RouteFocusedContext'); +const useRouteFocused = require('./useRouteFocused'); + +module.exports = { + RouteFocusedProvider: RouteFocusedContext.Provider, + useRouteFocused +}; diff --git a/src/router/RouteFocusedContext/useRouteFocused.js b/src/router/RouteFocusedContext/useRouteFocused.js new file mode 100644 index 000000000..79813c58d --- /dev/null +++ b/src/router/RouteFocusedContext/useRouteFocused.js @@ -0,0 +1,8 @@ +const React = require('react'); +const RouteFocusedContext = require('./RouteFocusedContext'); + +const useRouteFocused = () => { + return React.useContext(RouteFocusedContext); +}; + +module.exports = useRouteFocused; diff --git a/src/router/Router/Router.js b/src/router/Router/Router.js index e8617bfca..7fbaa26c3 100644 --- a/src/router/Router/Router.js +++ b/src/router/Router/Router.js @@ -3,7 +3,7 @@ const ReactIs = require('react-is'); const PropTypes = require('prop-types'); const classnames = require('classnames'); const UrlUtils = require('url'); -const { FocusedRouteProvider } = require('../FocusedRouteContext'); +const { RouteFocusedProvider } = require('../RouteFocusedContext'); const Route = require('../Route'); const Router = ({ className, onPathNotMatch, ...props }) => { @@ -102,11 +102,11 @@ const Router = ({ className, onPathNotMatch, ...props }) => { views .filter(view => view !== null) .map(({ key, component, urlParams, queryParams }, index, views) => ( - + {React.createElement(component, { urlParams, queryParams })} - + )) } diff --git a/src/router/index.js b/src/router/index.js index 71623af39..56eb8b422 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -1,9 +1,9 @@ -const { useFocusedRoute } = require('./FocusedRouteContext'); +const { useRouteFocused } = require('./RouteFocusedContext'); const Modal = require('./Modal'); const Router = require('./Router'); module.exports = { - useFocusedRoute, + useRouteFocused, Modal, Router };