Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(nav): custom animation is no longer overridden #23779

Merged
merged 3 commits into from
Aug 18, 2021
Merged

fix(nav): custom animation is no longer overridden #23779

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7263342
fix custom transition
MarkChrisLevy Aug 17, 2021
d04a52e
Fix lint
MarkChrisLevy Aug 17, 2021
0ad606b
fix router outlet
MarkChrisLevy Aug 18, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions core/src/components/nav/nav.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -872,14 +872,15 @@ export class Nav implements NavOutlet {
mode,
showGoBack: this.canGoBackSync(enteringView),
baseEl: this.el,
animationBuilder: this.animation || opts.animationBuilder || config.get('navAnimation'),
progressCallback,
animated: this.animated && config.getBoolean('animated', true),

enteringEl,
leavingEl,

...opts
...opts,

animationBuilder: opts.animationBuilder || this.animation || config.get('navAnimation')
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Any reason why we switched the order here?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Transition passed in opts (e.g. it came from router) should take precedence over nav transition. Simple example - I set transition for nav, but in specific scenario, when moving from view A to B I need other transition, which can be passed to push() or set in router-link. Previous impl would always pick nav's transition.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch! In that case, could we also make that same change here: https://github.com/ionic-team/ionic-framework/blob/main/core/src/components/router-outlet/route-outlet.tsx#L191

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

};
const { hasCompleted } = await transition(animationOpts);
return this.transitionFinish(hasCompleted, enteringView, leavingView, opts);
Expand Down
2 changes: 1 addition & 1 deletion core/src/components/router-outlet/route-outlet.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ export class RouterOutlet implements ComponentInterface, NavOutlet {

const { el, mode } = this;
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({
mode,
Expand Down