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

chore(): fix extra merge conflict

Browse Source
This commit is contained in:
Liam DeBeasi
2021-08-04 11:03:08 -04:00
parent c70a18ebc2
commit 7c0f9b73e8
1 changed files with 0 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
packages/vue/src/components/IonTabs.ts
View File

@ -34,35 +34,6 @@ export const IonTabs = /*@__PURE__*/ defineComponent({
}, routerOutlet) }, routerOutlet)
]; ];
<<<<<<< HEAD
=======
if (!userProvidedRouterOutlet && !$data.didWarn) {
console.warn(`[@ionic/vue Deprecation] Starting in Ionic Vue v6.0, developers must add an 'ion-router-outlet' instance inside of 'ion-tabs'.
Before:
<ion-tabs>
<ion-tab-bar slot="bottom">
...
</ion-tab-bar>
</ion-tabs>
After:
<ion-tabs>
<ion-router-outlet></ion-router-outlet>
<ion-tab-bar slot="bottom">
...
</ion-tab-bar>
</ion-tabs>
Be sure to import 'IonRouterOutlet' from '@ionic/vue' and provide that import to your Vue component. See https://ionicframework.com/docs/vue/navigation#working-with-tabs for more information.
`);
$data.didWarn = true;
}
>>>>>>> origin/main
/** /**
* If ion-tab-bar has slot="top" it needs to be * If ion-tab-bar has slot="top" it needs to be
* rendered before `.tabs-inner` otherwise it will * rendered before `.tabs-inner` otherwise it will