Reset hydration state after reentering #16306
Merged
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
We might reenter a hydration state, when attempting to hydrate a boundary. We need to ensure that we reset it to not hydrating once we exit it. Otherwise the next sibling will still be in hydration mode.
sebmarkbage
commented
Aug 7, 2019
| @@ -134,7 +139,6 @@ function unwindInterruptedWork(interruptedWork: Fiber) { | |||
| break; | |||
| case DehydratedSuspenseComponent: | |||
| if (enableSuspenseServerRenderer) { | |||
| // TODO: popHydrationState | |||
There was a problem hiding this comment.
This one is not needed since restarting the root covers it. I think anything covered by resetFreshStack also doesn't need to be here.
sebmarkbage
commented
Aug 7, 2019
| popSuspenseContext(workInProgress); | ||
| if (workInProgress.alternate === null) { | ||
| // TODO: popHydrationState |
There was a problem hiding this comment.
I can't actually do this yet because this because popping causes hydration warnings. This is part of a larger bug that suspending in a dehydrated tree can leave the hydration context in an inconsistent state when we move to work on the sibling of the thing that suspended. That's a bigger issue to fix.
|
ReactDOM: size: 0.0%, gzip: -0.0% Details of bundled changes.Comparing: 7c838a6...a9cc9a5 react-art
react-dom
react-test-renderer
react-reconciler
react-native-renderer
Generated by 🚫 dangerJS |
rodoabad
approved these changes
Aug 7, 2019
acdlite
approved these changes
Aug 7, 2019
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.
We might reenter a hydration state, when attempting to hydrate a boundary. We need to ensure that we reset it to not hydrating once we exit it. Otherwise the next sibling will still be in hydration mode.