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

fix(tabs): select whether the tabs is currently selected when activating it, so it knows to go to it's root page if so

Browse Source
This commit is contained in:
Dan Bucholtz
2018-02-23 15:41:14 -06:00
parent 5197358a3b
commit cc1fc2e032
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/core/src/components/nav/nav.tsx
View File

@ -265,8 +265,8 @@ export class Nav implements PublicNav, NavOutlet {
} }
@Method() @Method()
activateFromTab() { activateFromTab(tabAlreadySelected: boolean) {
return activateFromTabImpl(this); return activateFromTabImpl(this, tabAlreadySelected);
} }
canSwipeBack(): boolean { canSwipeBack(): boolean {
@ -628,11 +628,11 @@ export function navigateToUrl(nav: Nav, url: string, _method: string): Promise<a
return nav.routerDelegate.pushUrlState(url); return nav.routerDelegate.pushUrlState(url);
} }
export function activateFromTabImpl(nav: Nav): Promise<any> { export function activateFromTabImpl(nav: Nav, tabAlreadySelected: boolean): Promise<any> {
return nav.onAllTransitionsComplete().then(() => { return nav.onAllTransitionsComplete().then(() => {
// if there is not a view set and it's not transitioning, // if there is not a view set and it's not transitioning,
// go ahead and set the root // go ahead and set the root
if (nav.getViews().length === 0 && !nav.isTransitioning()) { if ( (nav.getViews().length === 0 || tabAlreadySelected) && !nav.isTransitioning()) {
return nav.setRoot(nav.root); return nav.setRoot(nav.root);
} }

2
packages/core/src/components/tab/tab.tsx
View File

@ -130,7 +130,7 @@ export class Tab {
// the tab's nav has not been initialized externally, so // the tab's nav has not been initialized externally, so
// check if we need to initiailize it // check if we need to initiailize it
return nav.componentOnReady() return nav.componentOnReady()
.then(() => nav.activateFromTab()); .then(() => nav.activateFromTab(this.selected));
}); });
} }