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

feat(angular): animation is explicit

Browse Source
This commit is contained in:
Manu Mtz.-Almeida
2018-04-16 21:01:33 +02:00
parent c1cbbc52d2
commit 099b3edda3
3 changed files with 82 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
angular/src/directives/navigation/ion-router-outlet.ts
View File

@ -140,8 +140,8 @@ export class IonRouterOutlet implements OnDestroy, OnInit {
enteringView = this.stackCtrl.createView(this.activated, activatedRoute);
}
const direction = this.navCtrl.consumeDirection();
await this.stackCtrl.setActive(enteringView, direction);
const {direction, animated} = this.navCtrl.consumeTransition();
await this.stackCtrl.setActive(enteringView, direction, animated);
this.activateEvents.emit(this.activated.instance);
emitEvent(this.elementRef.nativeElement);

58
angular/src/directives/navigation/router-controller.ts
View File

@ -35,12 +35,10 @@ export class StackController {
return this.views.length > deep;
}
async setActive(enteringView: RouteView, direction: number | undefined) {
async setActive(enteringView: RouteView, direction: number, animated: boolean) {
const leavingView = this.getActive();
const forcedGoBack = direction === -1;
const reused = this.insertView(enteringView, forcedGoBack);
direction = direction != null ? direction : (reused ? -1 : 1);
await this.transition(enteringView, leavingView, direction, this.canGoBack(1));
this.insertView(enteringView, direction);
await this.transition(enteringView, leavingView, direction, animated, this.canGoBack(1));
this.cleanup();
}
@ -50,23 +48,29 @@ export class StackController {
this.navCtrl.goBack(view.url);
}
private insertView(enteringView: RouteView, forcedGoBack: boolean): boolean {
if (this.stack) {
const index = this.views.indexOf(enteringView);
if (index >= 0) {
this.views = this.views.slice(0, index + 1);
return true;
} else {
if (forcedGoBack) {
this.views = [enteringView];
} else {
this.views.push(enteringView);
}
return false;
}
} else {
private insertView(enteringView: RouteView, direction: number) {
// no stack
if (!this.stack) {
this.views = [enteringView];
return false;
return;
}
// stack setRoot
if (direction === 0) {
this.views = [enteringView];
return;
}
// stack
const index = this.views.indexOf(enteringView);
if (index >= 0) {
this.views = this.views.slice(0, index + 1);
} else {
if (direction === 1) {
this.views.push(enteringView);
} else {
this.views = [enteringView];
}
}
}
@ -85,7 +89,13 @@ export class StackController {
return this.views.length > 0 ? this.views[this.views.length - 1] : null;
}
private async transition(enteringView: RouteView, leavingView: RouteView, direction: number, showGoBack: boolean) {
private async transition(
enteringView: RouteView,
leavingView: RouteView,
direction: number,
animated: boolean,
showGoBack: boolean
) {
const enteringEl = enteringView ? enteringView.element : undefined;
const leavingEl = leavingView ? leavingView.element : undefined;
const containerEl = this.containerEl;
@ -95,8 +105,8 @@ export class StackController {
await containerEl.componentOnReady();
await containerEl.commit(enteringEl, leavingEl, {
duration: direction === 0 ? 0 : undefined,
direction: direction === -1 ? NavDirection.Back : NavDirection.Forward,
duration: !animated ? 0 : undefined,
direction: direction === 1 ? NavDirection.Forward : NavDirection.Back,
deepWait: true,
showGoBack
});