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

fix(tabs): fix goto root (#16926)

Browse Source 
fixes #16917
This commit is contained in:
Manu MA
2019-01-01 17:51:38 +01:00
committed by GitHub
parent cda2573fdd
commit 8ee9205629
3 changed files with 32 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
angular/src/directives/navigation/ion-tabs.ts
View File

@ -64,6 +64,9 @@ export class IonTabs {
? href ? href
: this.outlet.getLastUrl(tab) || href; : this.outlet.getLastUrl(tab) || href;
return this.navCtrl.navigateBack(url); return this.navCtrl.navigateRoot(url, {
animated: true,
animationDirection: 'back'
});
} }
} }

17
angular/src/providers/nav-controller.ts
View File

@ -44,25 +44,20 @@ export class NavController {
navigateForward(url: string | UrlTree | any[], options: NavigationOptions = {}) { navigateForward(url: string | UrlTree | any[], options: NavigationOptions = {}) {
this.setDirection('forward', options.animated, options.animationDirection); this.setDirection('forward', options.animated, options.animationDirection);
if (Array.isArray(url)) { this.navigate(url, options);
return this.router!.navigate(url, options);
} else {
return this.router!.navigateByUrl(url, options);
}
} }
navigateBack(url: string | UrlTree | any[], options: NavigationOptions = {}) { navigateBack(url: string | UrlTree | any[], options: NavigationOptions = {}) {
this.setDirection('back', options.animated, options.animationDirection); this.setDirection('back', options.animated, options.animationDirection);
// extras = { replaceUrl: true, ...extras }; this.navigate(url, options);
if (Array.isArray(url)) {
return this.router!.navigate(url, options);
} else {
return this.router!.navigateByUrl(url, options);
}
} }
navigateRoot(url: string | UrlTree | any[], options: NavigationOptions = {}) { navigateRoot(url: string | UrlTree | any[], options: NavigationOptions = {}) {
this.setDirection('root', options.animated, options.animationDirection); this.setDirection('root', options.animated, options.animationDirection);
this.navigate(url, options);
}
navigate(url: string | UrlTree | any[], options: NavigationOptions) {
if (Array.isArray(url)) { if (Array.isArray(url)) {
return this.router!.navigate(url, options); return this.router!.navigate(url, options);
} else { } else {

46
core/src/utils/overlays.ts
View File

@ -139,31 +139,29 @@ async function overlayAnimation(
overlay.animation.destroy(); overlay.animation.destroy();
overlay.animation = undefined; overlay.animation = undefined;
return false; return false;
} else {
// Make overlay visible in case it's hidden
baseEl.classList.remove('overlay-hidden');
const aniRoot = baseEl.shadowRoot || overlay.el;
const animation = overlay.animation = await import('./animation').then(mod => mod.create(animationBuilder, aniRoot, opts));
overlay.animation = animation;
if (!overlay.animated || !overlay.config.getBoolean('animated', true)) {
animation.duration(0);
}
if (overlay.keyboardClose) {
animation.beforeAddWrite(() => {
const activeElement = baseEl.ownerDocument!.activeElement as HTMLElement;
if (activeElement && activeElement.matches('input, ion-input, ion-textarea')) {
activeElement.blur();
}
});
}
await animation.playAsync();
const hasCompleted = animation.hasCompleted;
animation.destroy();
overlay.animation = undefined;
return hasCompleted;
} }
// Make overlay visible in case it's hidden
baseEl.classList.remove('overlay-hidden');
const aniRoot = baseEl.shadowRoot || overlay.el;
const animation = overlay.animation = await import('./animation').then(mod => mod.create(animationBuilder, aniRoot, opts));
overlay.animation = animation;
if (!overlay.animated || !overlay.config.getBoolean('animated', true)) {
animation.duration(0);
}
if (overlay.keyboardClose) {
animation.beforeAddWrite(() => {
const activeElement = baseEl.ownerDocument!.activeElement as HTMLElement;
if (activeElement && activeElement.matches('input, ion-input, ion-textarea')) {
activeElement.blur();
}
});
}
await animation.playAsync();
const hasCompleted = animation.hasCompleted;
animation.destroy();
overlay.animation = undefined;
return hasCompleted;
} }
export function autoFocus(containerEl: HTMLElement): HTMLElement | undefined { export function autoFocus(containerEl: HTMLElement): HTMLElement | undefined {