javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-11-10 00:27:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(router): simplify param merging (#22999)

Browse Source
This commit is contained in:
Victor Berchet
2021-03-15 08:45:56 -07:00
committed by GitHub
parent e4bf052794
commit 4ce62b26a8
1 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
core/src/components/router/utils/matching.ts
View File

@ -82,18 +82,10 @@ export const matchesPath = (inputPath: string[], chain: RouteChain): RouteChain
return chain; return chain;
}; };
export const mergeParams = (a: any, b: any): any => { // Merges the route parameter objects.
if (!a && b) { // Returns undefined when both parameters are undefined.
return b; export const mergeParams = (a: {[key: string]: any} | undefined, b: {[key: string]: any} | undefined): {[key: string]: any} | undefined => {
} else if (a && !b) { return a || b ? { ...a, ...b } : undefined;
return a;
} else if (a && b) {
return {
...a,
...b
};
}
return undefined;
}; };
export const routerIDsToChain = (ids: RouteID[], chains: RouteChain[]): RouteChain | null => { export const routerIDsToChain = (ids: RouteID[], chains: RouteChain[]): RouteChain | null => {