fix(react): Prevent lazy route handlers from updating wrong navigation span #18898
+303
−27
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Following up on #18346
Fixes a remaining race condition where the
args.patchcallback and completion handler inwrapPatchRoutesOnNavigationwere still callinggetActiveRootSpan()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
activeRootSpanconsistently, adds a!spanJson.timestampcheck to skip updates on ended spans, and removes theWINDOW.locationfallback. IncaptureCurrentLocation, returnsnullwhen navigation context exists buttargetPathisundefined, instead of falling back to staleWINDOW.location.Also added E2E tests that simulate rapid navigation scenarios where a slow lazy route handler completes after the user navigated elsewhere.