[Fiber] support hydration when rendering Suspense anywhere #32224
+816
−40
Conversation
This file contains 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
github-actions
bot
added
the
React Core Team
gnoff
force-pushed
the
suspense-anywhere-hydration
branch
from
ec6a539 to
5b6d0a9
Compare
gnoff
force-pushed
the
suspense-anywhere-hydration
branch
from
5b6d0a9 to
e0dff86
Compare
gnoff
force-pushed
the
suspense-anywhere-hydration
branch
from
e0dff86 to
7ca25bf
Compare
gnoff
force-pushed
the
suspense-anywhere-hydration
branch
from
7ca25bf to
f49516e
Compare
gnoff
force-pushed
the
suspense-anywhere-hydration
branch
from
f49516e to
29269cc
Compare
gnoff
force-pushed
the
suspense-anywhere-hydration
branch
from
29269cc to
cb8aee0
Compare
gnoff
force-pushed
the
suspense-anywhere-hydration
branch
from
cb8aee0 to
d103fac
Compare
gnoff
force-pushed
the
suspense-anywhere-hydration
branch
from
d103fac to
4a89f74
Compare
gnoff
force-pushed
the
suspense-anywhere-hydration
branch
from
4a89f74 to
186fd8b
Compare
gnoff
force-pushed
the
suspense-anywhere-hydration
branch
from
186fd8b to
0c469b3
Compare
gnoff
force-pushed
the
suspense-anywhere-hydration
branch
from
0c469b3 to
75a8cbf
Compare
gnoff
force-pushed
the
suspense-anywhere-hydration
branch
from
75a8cbf to
d64a73c
Compare
gnoff
commented
Jan 27, 2025
| @@ -948,6 +993,37 @@ export function clearSuspenseBoundary( | |||
| data === SUSPENSE_FALLBACK_START_DATA | |||
| ) { | |||
| depth++; | |||
| } else if (data.length === 1) { | |||
There was a problem hiding this comment.
This may be a bit bold but rendering comments in React components it's super common and this is only run on dehydrated suspense boundaries so we're generally only susceptible to colliding with user of innerHTML. We can't eliminate every collision so while prefixing with $ and this style of comment is not going to be written by a user so the most likely consequence is that there is a collision with an extension.
If we want to be significantly more defensive we can add a check that the nextSibling is also a comment matching the Suspense end marker. But I don't think it's actually worth the code size to include
gnoff
force-pushed
the
suspense-anywhere-hydration
branch
from
d64a73c to
507f04c
Compare
gnoff
force-pushed
the
suspense-anywhere-hydration
branch
from
507f04c to
5832fe9
Compare
stacked on facebook#32163 This continues the work of making Suspense workable anywhere in a react-dom tree. See the prior PRs for how we handle server rendering and client rendering. In this change we update the hydration implementation to be able to locate expected nodes. In particular this means hydration understands now that the default hydration context is the document body when the container is above the body. One case that is unique to hydration is clearing Suspense boundaries. When hydration fails or when the server instructs the client to recover an errored boundary it's possible that the html, head, and body tags in the initial document were written from a fallback or a different primary content on the server and need to be replaced by the client render. However these tags (and in the case of head, their content) won't be inside the comment nodes that identify the bounds of the Suspense boundary. And when client rendering you may not even render the same singletons that were server rendered. So when server rendering a boudnary which contributes to the preamble (the html, head, and body tag openings plus the head contents) we emit a special marker comment just before closing the boundary out. This marker encodes which parts of the preamble this boundary owned. If we need to clear the suspense boundary on the client we read this marker and use it to reset the appropriate singleton state.
gnoff
force-pushed
the
suspense-anywhere-hydration
branch
2 times, most recently
from
b7ed994 to
a85088e
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
follow up to #32163
This continues the work of making Suspense workable anywhere in a react-dom tree. See the prior PRs for how we handle server rendering and client rendering. In this change we update the hydration implementation to be able to locate expected nodes. In particular this means hydration understands now that the default hydration context is the document body when the container is above the body.
One case that is unique to hydration is clearing Suspense boundaries. When hydration fails or when the server instructs the client to recover an errored boundary it's possible that the html, head, and body tags in the initial document were written from a fallback or a different primary content on the server and need to be replaced by the client render. However these tags (and in the case of head, their content) won't be inside the comment nodes that identify the bounds of the Suspense boundary. And when client rendering you may not even render the same singletons that were server rendered. So when server rendering a boudnary which contributes to the preamble (the html, head, and body tag openings plus the head contents) we emit a special marker comment just before closing the boundary out. This marker encodes which parts of the preamble this boundary owned. If we need to clear the suspense boundary on the client we read this marker and use it to reset the appropriate singleton state.