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

fix(router): fix selection

Browse Source
This commit is contained in:
Manu Mtz.-Almeida
2018-03-15 18:07:29 +01:00
parent f48d817a85
commit 207f416686
5 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/src/components/tabs/tabs.tsx
View File

@ -11,6 +11,7 @@ export class Tabs implements NavOutlet {
private ids = -1;
private transitioning = false;
private useRouter = false;
private tabsId: number = (++tabIds);
private leavingTab: HTMLIonTabElement | undefined;
@ -70,6 +71,8 @@ export class Tabs implements NavOutlet {
@Event() ionNavChanged: EventEmitter<any>;
componentWillLoad() {
this.useRouter = !!document.querySelector('ion-router') && !this.el.closest('[no-router]');
this.loadConfig('tabsPlacement', 'bottom');
this.loadConfig('tabsLayout', 'icon-top');
this.loadConfig('tabsHighlight', true);
@ -159,7 +162,7 @@ export class Tabs implements NavOutlet {
}
private initSelect(): Promise<void> {
if (document.querySelector('ion-router')) {
if (this.useRouter) {
if (Build.isDev) {
const selectedTab = this.tabs.find(t => t.selected);
if (selectedTab) {
@ -241,9 +244,11 @@ export class Tabs implements NavOutlet {
}
private notifyRouter() {
const router = document.querySelector('ion-router');
if (router) {
return router.navChanged(false);
if (this.useRouter) {
const router = document.querySelector('ion-router');
if (router) {
return router.navChanged(false);
}
}
return Promise.resolve(false);
}