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.

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

fix(react-router): correctly set pathChanged in router events #2649

Merged
merged 1 commit into from
Oct 27, 2024
Merged
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions packages/react-router/src/Transitioner.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ export function Transitioner() {
if (previousIsLoading && !routerState.isLoading) {
const toLocation = router.state.location
const fromLocation = router.state.resolvedLocation
const pathChanged = fromLocation.href !== toLocation.href
const pathChanged = fromLocation.pathname !== toLocation.pathname

router.emit({
type: 'onLoad', // When the new URL has committed, when the new matches have been loaded into state.matches
Expand All @@ -97,7 +97,7 @@ export function Transitioner() {
if (previousIsAnyPending && !isAnyPending) {
const toLocation = router.state.location
const fromLocation = router.state.resolvedLocation
const pathChanged = fromLocation.href !== toLocation.href
const pathChanged = fromLocation.pathname !== toLocation.pathname

router.emit({
type: 'onResolved',
Expand Down