Skip to content

Conversation

@onurtemizkan
Copy link
Collaborator

@onurtemizkan onurtemizkan commented Jan 20, 2026

Following up on #18346

Fixes a remaining race condition where the args.patch callback and completion handler in wrapPatchRoutesOnNavigation were still calling getActiveRootSpan() at resolution time instead of using the captured span. This caused wrong span updates when users navigated away during lazy route loading.

The fix uses the captured activeRootSpan consistently, adds a !spanJson.timestamp check to skip updates on ended spans, and removes the WINDOW.location fallback. In captureCurrentLocation, returns null when navigation context exists but targetPath is undefined, instead of falling back to stale WINDOW.location.

Also added E2E tests that simulate rapid navigation scenarios where a slow lazy route handler completes after the user navigated elsewhere.

@onurtemizkan onurtemizkan force-pushed the onur/fix-wrapPatchRoutesOnNavigation branch from 0c40c63 to 63dcf55 Compare January 20, 2026 11:24
@onurtemizkan onurtemizkan marked this pull request as ready for review January 20, 2026 11:24
@onurtemizkan onurtemizkan requested a review from Copilot January 20, 2026 12:15
Copy link
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

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

Pull request overview

This PR fixes a race condition in React Router lazy route handling where navigation spans could be incorrectly updated when users navigate away during lazy route loading.

Changes:

  • Use captured navigation span consistently instead of calling getActiveRootSpan() at resolution time in wrapPatchRoutesOnNavigation
  • Add !spanJson.timestamp guard to prevent updates on already-ended spans
  • Remove WINDOW.location fallback when navigation context exists but targetPath is undefined to avoid using stale location data

Reviewed changes

Copilot reviewed 5 out of 5 changed files in this pull request and generated no comments.

Show a summary per file
File Description
packages/react/src/reactrouter-compat-utils/lazy-routes.tsx Updated captureCurrentLocation to return null instead of falling back to WINDOW.location when inside navigation context with undefined targetPath
packages/react/src/reactrouter-compat-utils/instrumentation.tsx Modified wrapPatchRoutesOnNavigation to use captured activeRootSpan consistently in both args.patch callback and completion handler, added !spanJson.timestamp checks, removed WINDOW.location fallback
packages/react/test/reactrouter-compat-utils/lazy-routes.test.ts Added edge case tests for captureCurrentLocation behavior with and without navigation context
packages/react/test/reactrouter-compat-utils/instrumentation.test.tsx Added unit tests for race condition fix verifying ended spans are not updated
dev-packages/e2e-tests/test-applications/react-router-7-lazy-routes/tests/transactions.test.ts Added E2E tests simulating rapid navigation scenarios to validate the race condition fix

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

@onurtemizkan onurtemizkan force-pushed the onur/fix-wrapPatchRoutesOnNavigation branch from 63dcf55 to 97659e9 Compare January 21, 2026 19:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants