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

Merge remote-tracking branch 'origin/main' into sync-7-11-15-22

Browse Source
This commit is contained in:
Sean Perkins
2022-11-15 15:40:21 -05:00
parent 44472aeb9f 7a990ff403
commit c149b42d0b
437 changed files with 1449 additions and 1499 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -39,7 +39,6 @@ export const IonRouterOutlet = /*@__PURE__*/ defineComponent({
const ionRouterOutlet = ref();
const id = generateId('ion-router-outlet');
// TODO types
const ionRouter: any = inject('navManager');
const viewStacks: any = inject('viewStacks');
@ -143,7 +142,6 @@ export const IonRouterOutlet = /*@__PURE__*/ defineComponent({
const customAnimation = enteringViewItem.routerAnimation;
if (
animationBuilder === undefined &&
// todo check for tab switch
customAnimation !== undefined
) {
animationBuilder = customAnimation;
@ -198,7 +196,7 @@ export const IonRouterOutlet = /*@__PURE__*/ defineComponent({
const transition = async (
enteringEl: HTMLElement,
leavingEl: HTMLElement,
direction: any, // TODO types
direction: any,
showGoBack: boolean,
progressAnimation: boolean,
animationBuilder?: AnimationBuilder
@ -300,7 +298,6 @@ See https://ionicframework.com/docs/vue/navigation#ionpage for more information.
if (
animationBuilder === undefined &&
routerDirection === 'back' &&
// todo check for tab switch
customAnimation !== undefined
) {
animationBuilder = customAnimation;
@ -418,7 +415,6 @@ See https://ionicframework.com/docs/vue/navigation#ionpage for more information.
*/
onUnmounted(() => viewStacks.clear(id));
// TODO types
const registerIonPage = (viewItem: any, ionPageEl: HTMLElement) => {
const oldIonPageEl = viewItem.ionPageElement;
@ -464,7 +460,6 @@ See https://ionicframework.com/docs/vue/navigation#ionpage for more information.
return h(
'ion-router-outlet',
{ ref: 'ionRouterOutlet' },
// TODO types
components && components.map((c: any) => {
let props = {
ref: c.vueComponentRef,