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

feat(angular): expose animationDirection (#16802)

Browse Source 
* feat(angular): expose animationDirection

* update
This commit is contained in:
Manu MA
2018-12-18 20:17:16 +01:00
committed by GitHub
parent dfbb5b6e6e
commit 320eb03168
4 changed files with 57 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
angular/src/directives/navigation/stack-controller.ts
View File

@ -2,7 +2,7 @@ import { ComponentRef, NgZone } from '@angular/core';
import { ActivatedRoute, Router } from '@angular/router';
import { RouterDirection } from '@ionic/core';
import { NavController, NavDirection } from '../../providers/nav-controller';
import { NavController } from '../../providers/nav-controller';
import { RouteView, computeStackId, destroyView, getUrl, insertView, isTabSwitch, toSegments } from './stack-utils';
@ -43,14 +43,14 @@ export class StackController {
}
async setActive(enteringView: RouteView) {
let { direction, animated } = this.navCtrl.consumeTransition();
let { direction, animation } = this.navCtrl.consumeTransition();
const leavingView = this.activeView;
if (isTabSwitch(enteringView, leavingView)) {
direction = 'back';
animated = false;
animation = undefined;
}
this.insertView(enteringView, direction);
await this.transition(enteringView, leavingView, direction, animated, this.canGoBack(1), false);
await this.transition(enteringView, leavingView, animation, this.canGoBack(1), false);
this.cleanup();
}
@ -73,7 +73,6 @@ export class StackController {
views[views.length - 1], // leaving view
'back',
true,
true,
true
);
}
@ -130,8 +129,7 @@ export class StackController {
private async transition(
enteringView: RouteView | undefined,
leavingView: RouteView | undefined,
direction: NavDirection,
animated: boolean,
direction: 'forward' | 'back' | undefined,
showGoBack: boolean,
progressAnimation: boolean
) {
@ -159,9 +157,9 @@ export class StackController {
await containerEl.componentOnReady();
this.runningTransition = containerEl.commit(enteringEl, leavingEl, {
duration: !animated ? 0 : undefined,
direction: direction === 'forward' ? 'forward' : 'back', // TODO: refactor
deepWait: true,
duration: direction === undefined ? 0 : undefined,
direction,
showGoBack,
progressAnimation
});