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

Merge remote-tracking branch 'origin/master' into core-settings

Browse source
This commit is contained in:
Vladimir Borisov 2019-11-05 10:17:01 +02:00
commit 9a5e6ab01d
No known key found for this signature in database
GPG key ID: F9A584BE4FCB6603
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -3,6 +3,7 @@ const ReactIs = require('react-is');
const PropTypes = require('prop-types');
const classnames = require('classnames');
const UrlUtils = require('url');
const deepEqual = require('deep-equal');
const { RouteFocusedProvider } = require('../RouteFocusedContext');
const Route = require('../Route');
@ -81,8 +82,14 @@ const Router = ({ className, onPathNotMatch, ...props }) => {
return {
key: `${routeViewIndex}${routeIndex}`,
component: routeConfig.component,
urlParams,
queryParams
urlParams: view !== null && deepEqual(view.urlParams, urlParams) ?
view.urlParams
:
urlParams,
queryParams: view !== null && deepEqual(Array.from(view.queryParams.entries()), Array.from(queryParams.entries())) ?
view.queryParams
:
queryParams
};
} else {
return null;