[Fiber] Propagate context to dehydrated Suspense boundaries before bailout (#36594)#36595
Open
denk0403 wants to merge 1 commit into
Open
[Fiber] Propagate context to dehydrated Suspense boundaries before bailout (#36594)#36595denk0403 wants to merge 1 commit into
denk0403 wants to merge 1 commit into
Conversation
|
Comparing: 557e28f...729c496 Critical size changesIncludes critical production bundles, as well as any change greater than 2%:
Significant size changesIncludes any change greater than 0.2%: (No significant changes) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Summary
Fixes #36594.
Motivation: When streaming SSR hydrates a
Suspenseboundary, a context update in an already-hydrated ancestor (e.g. a provideruseStateupdate with stable children) can land before the streamed segment hydrates. React bailed out early on the dehydrated boundary without recording that context change, so the client later hydrated server HTML against the new context value and reported a hydration mismatch.Fix: Before early-bailing on a dehydrated
Suspenseboundary, calllazilyPropagateParentContextChanges; if a parent context changed, route throughupdateSuspenseComponentinstead of skipping propagation sochildLanesis updated andupdateDehydratedSuspenseComponentcan recover cleanly.How did you test this change?
A Fizz regression test covers the scenario: context updates in the hydrated shell before the streamed boundary resolves, with no mismatch error and the boundary showing the updated value.
Visual Test
No hydration error!
Screen.Recording.2026-06-02.at.12.26.54.AM.cropped.mp4