Skip to content

Reuse SSR fallback instead of remounting when hydration suspends on client data - #37644

Open
ShravanthReddy wants to merge 1 commit into
react:mainfrom
ShravanthReddy:fix/issue-fix
Open

ShravanthReddy wants to merge 1 commit into
react:mainfrom
ShravanthReddy:fix/issue-fix

Conversation

@ShravanthReddy

Copy link
Copy Markdown

When a Suspense boundary is client-rendered on the server, the server emits the fallback as a permanent fallback (<!--$!-->). If hydration's first client render suspends again (e.g. on a client-created promise), React was deleting the server-rendered fallback DOM and mounting an identical new fallback. Same pixels, different nodes: CSS animations restart and DOM state is lost.

This change keeps the dehydrated fallback fragment in place as the fallback branch when the boundary re-suspends during hydration, instead of remounting it. The fix is gated on permanent server fallbacks only, so normal hydration and mismatch behavior are untouched.

Fixes #37620.

Tests: added three tests to ReactDOMFizzServer-test.js: regression (fallback node identity across hydration), control (fallback still replaced when hydration doesn't suspend), and re-suspension (second promise suspending before the first resolves).

@meta-cla

meta-cla Bot commented Sep 16, 2026

Copy link
Copy Markdown

Hi @ShravanthReddy!

Thank you for your pull request and welcome to our community.

Action Required

In order to merge any pull request (code, docs, etc.), we require contributors to sign our Contributor License Agreement, and we don't seem to have one on file for you.

Process

In order for us to review and merge your suggested changes, please sign at https://code.facebook.com/cla. If you are contributing on behalf of someone else (eg your employer), the individual CLA may not be sufficient and your employer may need to sign the corporate CLA.

Once the CLA is signed, our tooling will perform checks and validations. Afterwards, the pull request will be tagged with CLA signed. The tagging process may take up to 1 hour after signing. Please give it that time before contacting us about it.

If you have received this in error or have any questions, please contact us at cla@meta.com. Thanks!

@github-actions

Copy link
Copy Markdown

A size report will appear here when the build finishes.

Generated by sizebot against 2d26e08

@meta-cla

meta-cla Bot commented Sep 16, 2026

Copy link
Copy Markdown

Thank you for signing our Contributor License Agreement. We can now accept your code for this (and any) Meta Open Source project. Thanks!

@meta-cla meta-cla Bot added the CLA Signed label Sep 16, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Bug: Suspense fallback remounts on hydration after use(browser()) + client use(promise)

1 participant