Skip to content

fix(react): replacing route uses new route direction and animation #28671

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

Merged
sean-perkins merged 4 commits into from
Dec 11, 2023
Merged

fix(react): replacing route uses new route direction and animation #28671

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d85c8b4
fix(react): replacing route uses new route direction
aeharding Dec 8, 2023
f9c596a
Also prefer user RouteAnimation
aeharding Dec 8, 2023
1a174af
Add comment to document change
aeharding Dec 8, 2023
91beb13
space
aeharding Dec 8, 2023
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
11 changes: 9 additions & 2 deletions packages/react-router/src/ReactRouter/IonRouter.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,8 +187,15 @@ class IonRouterInner extends React.PureComponent<IonRouteProps, IonRouteState> {
routeInfo.lastPathname = currentRouteInfo?.pathname || routeInfo.lastPathname;
routeInfo.prevRouteLastPathname = currentRouteInfo?.lastPathname;
routeInfo.pushedByRoute = pushedByRoute;
routeInfo.routeDirection = currentRouteInfo?.routeDirection || routeInfo.routeDirection;
routeInfo.routeAnimation = currentRouteInfo?.routeAnimation || routeInfo.routeAnimation;

/**
* When replacing routes we should still prefer
* any custom direction/animation that the developer
* has specified when navigating first instead of relying
* on previously used directions/animations.
*/
routeInfo.routeDirection = routeInfo.routeDirection || currentRouteInfo?.routeDirection;
routeInfo.routeAnimation = routeInfo.routeAnimation || currentRouteInfo?.routeAnimation;
Comment thread
aeharding marked this conversation as resolved.
}

this.locationHistory.add(routeInfo);
Expand Down