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

chore(): sync with main for beta 4

Browse Source
This commit is contained in:
Liam DeBeasi
2021-08-18 09:42:03 -04:00
parent ea348f005a 34b150e5e7
commit c8cbe9c1f3
23 changed files with 510 additions and 238 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
packages/vue/src/components/IonRouterOutlet.ts
View File

@ -85,13 +85,18 @@ export const IonRouterOutlet = /*@__PURE__*/ defineComponent({
* to respond to this gesture, so check
* to make sure the view is in the outlet we want.
*/
<<<<<<< HEAD
const routeInfo = ionRouter.getCurrentRouteInfo();
const enteringViewItem = viewStacks.findViewItemByRouteInfo({ pathname: routeInfo.pushedByRoute || '' }, id);
=======
const routeInfo = ionRouter.getLeavingRouteInfo();
const enteringViewItem = viewStacks.findViewItemByRouteInfo({ pathname: routeInfo.pushedByRoute || '' }, id, usingDeprecatedRouteSetup);
>>>>>>> origin/main
return !!enteringViewItem;
}
const onStart = async () => {
const routeInfo = ionRouter.getCurrentRouteInfo();
const routeInfo = ionRouter.getLeavingRouteInfo();
const { routerAnimation } = routeInfo;
const enteringViewItem = viewStacks.findViewItemByRouteInfo({ pathname: routeInfo.pushedByRoute || '' }, id);
const leavingViewItem = viewStacks.findViewItemByRouteInfo(routeInfo, id);
@ -274,7 +279,10 @@ See https://ionicframework.com/docs/vue/navigation#ionpage for more information.
leavingViewItem.mount = false;
leavingViewItem.ionPageElement = undefined;
leavingViewItem.ionRoute = false;
viewStacks.unmountLeavingViews(id, enteringViewItem, leavingViewItem);
}
} else {
viewStacks.mountIntermediaryViews(id, enteringViewItem, leavingViewItem);
}
fireLifecycle(leavingViewItem.vueComponent, leavingViewItem.vueComponentRef, LIFECYCLE_DID_LEAVE);