Creepso/stremio-web
1
0
Fork 0
mirror of https://github.com/Stremio/stremio-web.git synced 2026-03-24 08:57:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

use match instead of exec in Router

Browse source
This commit is contained in:
NikolaBorislavovHristov 2019-08-27 12:58:53 +03:00
parent 911c62faf1
commit a9eaf1c7d2
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/router/Router/Router.js
View file

@ -13,11 +13,13 @@ const Router = ({ homePath, viewsConfig, onPathNotMatch }) => {
});
});
const routeConfigForPath = React.useCallback((path) => {
for (const viewConfig of viewsConfig) {
for (const routeConfig of viewConfig) {
const match = routeConfig.regexp.exec(path);
if (match) {
return routeConfig;
if (typeof path === 'string') {
for (const viewConfig of viewsConfig) {
for (const routeConfig of viewConfig) {
const match = path.match(routeConfig.regexp);
if (match) {
return routeConfig;
}
}
}
}
@ -36,7 +38,7 @@ const Router = ({ homePath, viewsConfig, onPathNotMatch }) => {
}
const routeViewIndex = viewsConfig.findIndex((v) => v.includes(routeConfig));
const match = routeConfig.regexp.exec(pathname);
const match = pathname.match(routeConfig.regexp);
const queryParams = Array.from(new URLSearchParams(query !== null ? query : '').entries())
.reduce((result, [key, value]) => {
result[key] = value;
@ -108,9 +110,7 @@ Router.propTypes = {
homePath: PropTypes.string,
onPathNotMatch: PropTypes.func,
viewsConfig: PropTypes.arrayOf(PropTypes.arrayOf(PropTypes.exact({
regexp: PropTypes.shape({
exec: PropTypes.func.isRequired
}).isRequired,
regexp: PropTypes.instanceOf(RegExp).isRequired,
keys: PropTypes.arrayOf(PropTypes.shape({
name: PropTypes.string.isRequired
})).isRequired,