Creepso/stremio-web
1
0
Fork 0
mirror of https://github.com/Stremio/stremio-web.git synced 2026-04-19 01:22:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Router handles onPathNotMatch change

Browse source
This commit is contained in:
NikolaBorislavovHristov 2019-05-16 14:59:45 +03:00
parent 6e97b61659
commit 54cc6df15e
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/navigation/Router/Router.js
View file

@ -5,7 +5,8 @@ const UrlUtils = require('url');
const { RoutesContainerProvider } = require('../RoutesContainerContext');
const Route = require('./Route');
const Router = React.memo(({ className, homePath, onPathNotMatch, ...props }) => {
const Router = React.memo(({ className, homePath, ...props }) => {
const onPathNotMatch = React.useRef(props.onPathNotMatch);
const viewsConfig = React.useMemo(() => {
return props.viewsConfig.map((viewConfig) => {
return viewConfig.map(({ path, options, ...props }) => {
@ -38,8 +39,8 @@ const Router = React.memo(({ className, homePath, onPathNotMatch, ...props }) =>
const { pathname, query } = UrlUtils.parse(window.location.hash.slice(1));
const routeConfig = routeConfigForPath(pathname);
if (routeConfig === null) {
if (typeof onPathNotMatch === 'function') {
onPathNotMatch();
if (typeof onPathNotMatch.current === 'function') {
onPathNotMatch.current();
}
return;
@ -72,6 +73,9 @@ const Router = React.memo(({ className, homePath, onPathNotMatch, ...props }) =>
});
});
}, []);
React.useEffect(() => {
onPathNotMatch.current = props.onPathNotMatch;
}, [props.onPathNotMatch]);
React.useEffect(() => {
if (typeof homePath === 'string') {
const { pathname, path } = UrlUtils.parse(window.location.hash.slice(1));