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

chore(): fix build error

Browse Source
This commit is contained in:
Dan Bucholtz
2018-02-16 11:58:01 -06:00
parent 910fd00159
commit 6e2bf74f87
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1348,7 +1348,7 @@ export function getDefaultEscapeHatch(): EscapeHatch {
};
}
export function reconcileFromExternalRouterImpl(nav: Nav, component: any, data: any = {}, escapeHatch: EscapeHatch, isTopLevel: boolean) {
export function reconcileFromExternalRouterImpl(nav: Nav, component: any, data: any = {}, escapeHatch: EscapeHatch, isTopLevel: boolean): Promise<NavResult> {
// check if the nav has an `<ion-tab>` as a parent
if (isParentTab(nav.element as any)) {
// check if the tab is selected
@ -1374,8 +1374,10 @@ export function updateTab(nav: Nav, component: any, data: any, escapeHatch: Esca
}).then(() => {
// okay, the tab is not selected, so we need to do a "switch" transition
// basically, we should update the nav, and then swap the tabs
return promise.then(() => {
return tabs.select(tab);
return promise.then((navResult) => {
return tabs.select(tab).then(() => {
return navResult;
});
});
});
}