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

feat(angular): add global pop() (#17182)

Browse Source 
fixes #16340
This commit is contained in:
Manu MA
2019-01-21 01:52:47 +01:00
committed by GitHub
parent 25b88478a1
commit 766c79d2a1
7 changed files with 35 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,6 +3,8 @@ import { Injectable, Optional } from '@angular/core';
import { NavigationExtras, NavigationStart, Router, UrlTree } from '@angular/router';
import { NavDirection, RouterDirection } from '@ionic/core';
import { IonRouterOutlet } from '../directives/navigation/ion-router-outlet';
import { Platform } from './platform';
export interface AnimationOptions {
@ -17,6 +19,7 @@ export interface NavigationOptions extends NavigationExtras, AnimationOptions {}
})
export class NavController {
private topOutlet?: IonRouterOutlet;
private direction: 'forward' | 'back' | 'root' | 'auto' = DEFAULT_DIRECTION;
private animated?: NavDirection = DEFAULT_ANIMATED;
private guessDirection: RouterDirection = 'forward';
@ -41,7 +44,7 @@ export class NavController {
}
// Subscribe to backButton events
platform.backButton.subscribeWithPriority(0, () => this.goBack());
platform.backButton.subscribeWithPriority(0, () => this.pop());
}
navigateForward(url: string | UrlTree | any[], options: NavigationOptions = {}): Promise<boolean> {
@ -67,16 +70,32 @@ export class NavController {
}
}
goBack(options: AnimationOptions = { animated: true, animationDirection: 'back' }) {
back(options: AnimationOptions = { animated: true, animationDirection: 'back' }) {
this.setDirection('back', options.animated, options.animationDirection);
return this.location.back();
}
async pop() {
let outlet = this.topOutlet;
while (outlet) {
if (await outlet.pop()) {
break;
} else {
outlet = outlet.parentOutlet;
}
}
}
setDirection(direction: RouterDirection, animated?: boolean, animationDirection?: 'forward' | 'back') {
this.direction = direction;
this.animated = getAnimation(direction, animated, animationDirection);
}
setTopOutlet(outlet: IonRouterOutlet) {
this.topOutlet = outlet;
}
consumeTransition() {
let direction: RouterDirection = 'root';
let animation: NavDirection | undefined;