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

fix(nav): custom animation is now used correctly (#23779)

Browse Source 
resolves #23777
This commit is contained in:
Mark Chris Levy
2021-08-18 14:34:34 +02:00
committed by GitHub
parent e0c4ad30be
commit f9415ef8a6
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/components/nav/nav.tsx
View File

@ -872,14 +872,15 @@ export class Nav implements NavOutlet {
mode, mode,
showGoBack: this.canGoBackSync(enteringView), showGoBack: this.canGoBackSync(enteringView),
baseEl: this.el, baseEl: this.el,
animationBuilder: this.animation || opts.animationBuilder || config.get('navAnimation'),
progressCallback, progressCallback,
animated: this.animated && config.getBoolean('animated', true), animated: this.animated && config.getBoolean('animated', true),
enteringEl, enteringEl,
leavingEl, leavingEl,
...opts ...opts,
animationBuilder: opts.animationBuilder || this.animation || config.get('navAnimation')
}; };
const { hasCompleted } = await transition(animationOpts); const { hasCompleted } = await transition(animationOpts);
return this.transitionFinish(hasCompleted, enteringView, leavingView, opts); return this.transitionFinish(hasCompleted, enteringView, leavingView, opts);

2
core/src/components/router-outlet/route-outlet.tsx
View File

@ -188,7 +188,7 @@ export class RouterOutlet implements ComponentInterface, NavOutlet {
const { el, mode } = this; const { el, mode } = this;
const animated = this.animated && config.getBoolean('animated', true); const animated = this.animated && config.getBoolean('animated', true);
const animationBuilder = this.animation || opts.animationBuilder || config.get('navAnimation'); const animationBuilder = opts.animationBuilder || this.animation || config.get('navAnimation');
await transition({ await transition({
mode, mode,