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

fix(angular): per-page animations now work with swipe to go back (#21706)

Browse Source 
resolves #21692
This commit is contained in:
Liam DeBeasi
2020-07-10 09:38:58 -04:00
committed by GitHub
parent f00ad8a835
commit 2664587749
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -127,7 +127,7 @@ export class StackController {
* Save any custom animation so that navigating * Save any custom animation so that navigating
* back will use this custom animation by default. * back will use this custom animation by default.
*/ */
if (animationBuilder !== undefined && leavingView) { if (leavingView) {
leavingView.animationBuilder = animationBuilder; leavingView.animationBuilder = animationBuilder;
} }
@ -190,13 +190,16 @@ export class StackController {
if (leavingView) { if (leavingView) {
const views = this.getStack(leavingView.stackId); const views = this.getStack(leavingView.stackId);
const enteringView = views[views.length - 2]; const enteringView = views[views.length - 2];
const customAnimation = enteringView.animationBuilder;
return this.wait(() => { return this.wait(() => {
return this.transition( return this.transition(
enteringView, // entering view enteringView, // entering view
leavingView, // leaving view leavingView, // leaving view
'back', 'back',
this.canGoBack(2), this.canGoBack(2),
true true,
customAnimation
); );
}); });
} }