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

fix(vue): pushing a non-tabs page inside of tabs no longer renders it inside of the tabs outlet (#22112)

Browse Source 
resolves #22066
This commit is contained in:
Liam DeBeasi
2020-09-22 11:55:22 -04:00
committed by GitHub
parent 9ca8b9de46
commit 6ac6810148
3 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,6 +4,7 @@ import {
ref,
computed,
inject,
provide,
watch,
shallowRef,
InjectionKey
@ -15,19 +16,16 @@ import { fireLifecycle, generateId, LIFECYCLE_DID_ENTER, LIFECYCLE_DID_LEAVE, LI
let viewDepthKey: InjectionKey<0> = Symbol(0);
export const IonRouterOutlet = defineComponent({
name: 'IonRouterOutlet',
setup(_, { attrs }) {
setup() {
const vueRouter = useRouter();
const route = useRoute();
const depth = inject(viewDepthKey, 0);
// TODO types
const matchedRouteRef: any = computed(() => {
if (attrs.tabs) {
return route.matched[route.matched.length - 1];
}
const matchedRouteRef: any = computed(() => route.matched[depth]);
provide(viewDepthKey, depth + 1)
return route.matched[depth];
});
const ionRouterOutlet = ref();
const id = generateId('ion-router-outlet');
@ -207,8 +205,6 @@ export const IonRouterOutlet = defineComponent({
}
const currentRoute = ionRouter.getCurrentRouteInfo();
if (currentRoute.tab !== undefined && !attrs.tabs) return
let enteringViewItem = viewStacks.findViewItemByRouteInfo(currentRoute, id);
if (!enteringViewItem) {