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

defaultUrlParams implemented in the Router

Browse source
This commit is contained in:
NikolaBorislavovHristov 2019-05-22 17:21:38 +03:00
parent 35cd984b98
commit 41d7e1318d
1 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -11,10 +11,16 @@ const Router = ({ className, homePath, ...props }) => {
const onPathNotMatch = React.useRef(props.onPathNotMatch);
const viewsConfig = React.useMemo(() => {
return props.viewsConfig.map((viewConfig) => {
return viewConfig.map(({ path, options, ...props }) => {
return viewConfig.map(({ path, options, defaultUrlParams, ...props }) => {
const keys = [];
const regexp = PathToRegexp(path, keys, options);
return { path, keys, regexp, ...props };
return {
path,
keys,
regexp,
defaultUrlParams: { ...defaultUrlParams },
...props
};
});
});
}, []);
@ -52,7 +58,14 @@ const Router = ({ className, homePath, ...props }) => {
const match = routeConfig.regexp.exec(pathname);
const queryParams = new URLSearchParams(query);
const urlParams = routeConfig.keys.reduce((urlParams, key, index) => {
urlParams[key.name] = match[index + 1];
if (typeof match[index + 1] === 'string') {
urlParams[key.name] = match[index + 1];
} else if (typeof routeConfig.defaultUrlParams[key.name] === 'string') {
urlParams[key.name] = routeConfig.defaultUrlParams[key.name];
} else {
urlParams[key.name] = null;
}
return urlParams;
}, {});
setViews((views) => {