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

fix(vue): improve handling of parameterized urls (#22360)

Browse Source 
resolves #22359
This commit is contained in:
Liam DeBeasi
2020-10-22 11:37:17 -04:00
committed by GitHub
parent 31f9bc81d6
commit 6fad0fe428
7 changed files with 124 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
packages/vue-router/src/viewStacks.ts
View File

@ -27,20 +27,7 @@ export const createViewStacks = () => {
}
const findLeavingViewItemByRouteInfo = (routeInfo: RouteInfo, outletId?: number) => {
return findViewItemByPath(routeInfo.lastPathname, outletId);
}
const findViewItemByMatchedRoute = (matchedRoute: any, outletId: number): ViewItem | undefined => {
const stack = viewStacks[outletId];
if (!stack) return undefined;
return stack.find((viewItem: ViewItem) => {
if (viewItem.matchedRoute.path === matchedRoute.path) {
return viewItem;
}
return undefined;
});
return findViewItemByPath(routeInfo.lastPathname, outletId, false);
}
const findViewItemInStack = (path: string, stack: ViewItem[]): ViewItem | undefined => {
@ -53,7 +40,7 @@ export const createViewStacks = () => {
})
}
const findViewItemByPath = (path: string, outletId?: number): ViewItem | undefined => {
const findViewItemByPath = (path: string, outletId?: number, strict: boolean = true): ViewItem | undefined => {
const matchView = (viewItem: ViewItem) => {
const pathname = path;
const viewItemPath = viewItem.matchedRoute.path;
@ -73,8 +60,10 @@ export const createViewStacks = () => {
const quickMatch = findViewItemInStack(path, stack);
if (quickMatch) return quickMatch;
const match = stack.find(matchView);
if (match) return match;
if (!strict) {
const match = stack.find(matchView);
if (match) return match;
}
} else {
for (let outletId in viewStacks) {
const stack = viewStacks[outletId];
@ -133,7 +122,6 @@ export const createViewStacks = () => {
return {
clear,
findViewItemByRouteInfo,
findViewItemByMatchedRoute,
findLeavingViewItemByRouteInfo,
createViewItem,
getChildrenToRender,