Skip to content

[Fiber] Correctly handle replaying when hydrating - #35494

Merged
gnoff merged 1 commit into
react:mainfrom
gnoff:jstory/fix-hydration-on-immediate-suspend
Jan 13, 2026
Merged

[Fiber] Correctly handle replaying when hydrating#35494
gnoff merged 1 commit into
react:mainfrom
gnoff:jstory/fix-hydration-on-immediate-suspend

Conversation

@gnoff

@gnoffgnoff commented Jan 12, 2026•
edited
Loading

Copy link
Copy Markdown
Collaborator

When hydrating if something suspends and then resolves in a microtask it is possible that React will resume the render without fully unwinding work in progress. This can cause hydration cursors to be offset and lead to hydration errors. This change adds a restore step when replaying HostComponent to ensure the hydration cursor is in the appropriate position when replaying.

fixes: #35210

@gnoff
[Fiber] Correctly handle replaying when hydrating
eaa592d
When hydrating if something suspends and then resolves in a microtask it is possible that React will resume the render without fully unwinding work in progress. This can cause hydration cursors to be offset and lead to hydration errors. This change adds a restore step when replaying HostComponent to ensure the hydration cursor is in the appropriate position when replaying.
@github-actionsgithub-actionsBot added the React Core Team Opened by a member of the React Core Team label Jan 12, 2026
@gnoff
gnoff requested review from acdlite and sebmarkbage and removed request for acdliteJanuary 12, 2026 20:48
@react-sizebot

react-sizebot commented Jan 12, 2026

Copy link
Copy Markdown

Comparing: 5aec1b2...eaa592d

Critical size changes

Includes critical production bundles, as well as any change greater than 2%:

Name+/-BaseCurrent+/- gzipBase gzipCurrent gzip
oss-stable/react-dom/cjs/react-dom.production.js=6.84 kB6.84 kB+0.05%1.88 kB1.88 kB
oss-stable/react-dom/cjs/react-dom-client.production.js+0.05%607.60 kB607.92 kB+0.07%107.53 kB107.61 kB
oss-experimental/react-dom/cjs/react-dom.production.js=6.84 kB6.84 kB=1.88 kB1.88 kB
oss-experimental/react-dom/cjs/react-dom-client.production.js+0.05%666.83 kB667.15 kB+0.07%117.42 kB117.50 kB
facebook-www/ReactDOM-prod.classic.js+0.05%692.91 kB693.27 kB+0.06%121.92 kB122.00 kB
facebook-www/ReactDOM-prod.modern.js+0.05%683.34 kB683.65 kB+0.07%120.31 kB120.39 kB

Significant size changes

Includes any change greater than 0.2%:

(No significant changes)

Generated by 🚫 dangerJS against eaa592d

@gnoff
gnoff requested a review from acdliteJanuary 12, 2026 21:20
@aapolaakkioaapolaakkio mentioned this pull request Jan 13, 2026
Closed
@gnoff
gnoff merged commit c186624 into react:mainJan 13, 2026
240 checks passed
@gnoff
gnoff deleted the jstory/fix-hydration-on-immediate-suspend branch January 13, 2026 20:48
github-actionsBot pushed a commit that referenced this pull request Jan 13, 2026
@gnoff
[Fiber] Correctly handle replaying when hydrating (#35494)
5fe51da
When hydrating if something suspends and then resolves in a microtask it
is possible that React will resume the render without fully unwinding
work in progress. This can cause hydration cursors to be offset and lead
to hydration errors. This change adds a restore step when replaying
HostComponent to ensure the hydration cursor is in the appropriate
position when replaying.
fixes: #35210
DiffTrain build for [c186624](c186624)
github-actionsBot pushed a commit that referenced this pull request Jan 13, 2026
@gnoff
[Fiber] Correctly handle replaying when hydrating (#35494)
ee52a94
When hydrating if something suspends and then resolves in a microtask it
is possible that React will resume the render without fully unwinding
work in progress. This can cause hydration cursors to be offset and lead
to hydration errors. This change adds a restore step when replaying
HostComponent to ensure the hydration cursor is in the appropriate
position when replaying.
fixes: #35210
DiffTrain build for [c186624](c186624)
@nextjs-botnextjs-bot mentioned this pull request Jan 14, 2026
Merged
@sovetski

sovetski commented Jan 25, 2026

Copy link
Copy Markdown

Do we have this change in the latest version of React? (19.2.3)

@rubennorterubennorte mentioned this pull request Jun 5, 2026
Closed
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@acdliteacdliteacdlite approved these changes
@sebmarkbagesebmarkbageAwaiting requested review from sebmarkbage

Assignees

No one assigned

Labels

CLA SignedReact Core TeamOpened by a member of the React Core Team

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Bug: A tree hydrated but some attributes of the server rendered HTML didn't match the client properties.

4 participants

@gnoff@react-sizebot@sovetski@acdlite
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
[Fiber] Correctly handle replaying when hydrating by gnoff · Pull Request #35494 · react/react · GitHub
Skip to content
[Fiber] Correctly handle replaying when hydrating - #35494
Merged
gnoff merged 1 commit into
react:mainfrom 
gnoff:jstory/fix-hydration-on-immediate-suspend
Jan 13, 2026
Merged
[Fiber] Correctly handle replaying when hydrating#35494
gnoff merged 1 commit into
react:mainfrom 
gnoff:jstory/fix-hydration-on-immediate-suspend
Conversation
@gnoff
@gnoffgnoff
commented
Jan 12, 2026•

edited

Loading

Copy link


Copy Markdown

Collaborator
When hydrating if something suspends and then resolves in a microtask it is possible that React will resume the render without fully unwinding work in progress. This can cause hydration cursors to be offset and lead to hydration errors. This change adds a restore step when replaying HostComponent to ensure the hydration cursor is in the appropriate position when replaying.
fixes: #35210
@gnoff
[Fiber] Correctly handle replaying when hydrating
eaa592d
When hydrating if something suspends and then resolves in a microtask it is possible that React will resume the render without fully unwinding work in progress. This can cause hydration cursors to be offset and lead to hydration errors. This change adds a restore step when replaying HostComponent to ensure the hydration cursor is in the appropriate position when replaying.
@github-actionsgithub-actionsBot
added
the 
React Core Team
Opened by a member of the React Core Team
label
Jan 12, 2026
@gnoff
gnoff
requested review from
acdlite and sebmarkbage
and removed request for
acdliteJanuary 12, 2026 20:48
@react-sizebot
react-sizebot
commented
Jan 12, 2026

Copy link


Copy Markdown

Comparing: 5aec1b2...eaa592d
Critical size changes
Includes critical production bundles, as well as any change greater than 2%:
Name+/-BaseCurrent+/- gzipBase gzipCurrent gzip
oss-stable/react-dom/cjs/react-dom.production.js=6.84 kB6.84 kB+0.05%1.88 kB1.88 kB
oss-stable/react-dom/cjs/react-dom-client.production.js+0.05%607.60 kB607.92 kB+0.07%107.53 kB107.61 kB
oss-experimental/react-dom/cjs/react-dom.production.js=6.84 kB6.84 kB=1.88 kB1.88 kB
oss-experimental/react-dom/cjs/react-dom-client.production.js+0.05%666.83 kB667.15 kB+0.07%117.42 kB117.50 kB
facebook-www/ReactDOM-prod.classic.js+0.05%692.91 kB693.27 kB+0.06%121.92 kB122.00 kB
facebook-www/ReactDOM-prod.modern.js+0.05%683.34 kB683.65 kB+0.07%120.31 kB120.39 kB
Significant size changes
Includes any change greater than 0.2%:
(No significant changes)

Generated by 🚫 dangerJS against eaa592d
@gnoff
gnoff
requested a review
from acdliteJanuary 12, 2026 21:20
@aapolaakkioaapolaakkio
mentioned this pull request
Jan 13, 2026

Closed

@gnoff
gnoff
merged commit c186624
into
react:mainJan 13, 2026

240 checks passed

@gnoff
gnoff
deleted the

jstory/fix-hydration-on-immediate-suspend

branch
January 13, 2026 20:48
github-actionsBot
pushed a commit
that referenced
this pull request
Jan 13, 2026
@gnoff
[Fiber] Correctly handle replaying when hydrating (#35494)
5fe51da
When hydrating if something suspends and then resolves in a microtask it
is possible that React will resume the render without fully unwinding
work in progress. This can cause hydration cursors to be offset and lead
to hydration errors. This change adds a restore step when replaying
HostComponent to ensure the hydration cursor is in the appropriate
position when replaying.
fixes: #35210
DiffTrain build for [c186624](c186624)
github-actionsBot
pushed a commit
that referenced
this pull request
Jan 13, 2026
@gnoff
[Fiber] Correctly handle replaying when hydrating (#35494)
ee52a94
When hydrating if something suspends and then resolves in a microtask it
is possible that React will resume the render without fully unwinding
work in progress. This can cause hydration cursors to be offset and lead
to hydration errors. This change adds a restore step when replaying
HostComponent to ensure the hydration cursor is in the appropriate
position when replaying.
fixes: #35210
DiffTrain build for [c186624](c186624)
@nextjs-botnextjs-bot
mentioned this pull request
Jan 14, 2026
 Merged

@sovetski
sovetski
commented
Jan 25, 2026

Copy link


Copy Markdown

Do we have this change in the latest version of React? (19.2.3)
@rubennorterubennorte
mentioned this pull request
Jun 5, 2026
 Closed

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@acdliteacdliteacdlite approved these changes
@sebmarkbagesebmarkbageAwaiting requested review from sebmarkbage

Assignees


No one assigned


Labels

CLA SignedReact Core TeamOpened by a member of the React Core Team

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

Bug: A tree hydrated but some attributes of the server rendered HTML didn't match the client properties.


4 participants

@gnoff@react-sizebot@sovetski@acdlite

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
[Fiber] Correctly handle replaying when hydrating by gnoff · Pull Request #35494 · react/react · GitHub
Skip to content
[Fiber] Correctly handle replaying when hydrating - #35494
Merged
gnoff merged 1 commit into
react:mainfrom 
gnoff:jstory/fix-hydration-on-immediate-suspend
Jan 13, 2026
Merged
[Fiber] Correctly handle replaying when hydrating#35494
gnoff merged 1 commit into
react:mainfrom 
gnoff:jstory/fix-hydration-on-immediate-suspend
Conversation
@gnoff
@gnoffgnoff
commented
Jan 12, 2026•

edited

Loading

Copy link


Copy Markdown

Collaborator
When hydrating if something suspends and then resolves in a microtask it is possible that React will resume the render without fully unwinding work in progress. This can cause hydration cursors to be offset and lead to hydration errors. This change adds a restore step when replaying HostComponent to ensure the hydration cursor is in the appropriate position when replaying.
fixes: #35210
@gnoff
[Fiber] Correctly handle replaying when hydrating
eaa592d
When hydrating if something suspends and then resolves in a microtask it is possible that React will resume the render without fully unwinding work in progress. This can cause hydration cursors to be offset and lead to hydration errors. This change adds a restore step when replaying HostComponent to ensure the hydration cursor is in the appropriate position when replaying.
@github-actionsgithub-actionsBot
added
the 
React Core Team
Opened by a member of the React Core Team
label
Jan 12, 2026
@gnoff
gnoff
requested review from
acdlite and sebmarkbage
and removed request for
acdliteJanuary 12, 2026 20:48
@react-sizebot
react-sizebot
commented
Jan 12, 2026

Copy link


Copy Markdown

Comparing: 5aec1b2...eaa592d
Critical size changes
Includes critical production bundles, as well as any change greater than 2%:
Name+/-BaseCurrent+/- gzipBase gzipCurrent gzip
oss-stable/react-dom/cjs/react-dom.production.js=6.84 kB6.84 kB+0.05%1.88 kB1.88 kB
oss-stable/react-dom/cjs/react-dom-client.production.js+0.05%607.60 kB607.92 kB+0.07%107.53 kB107.61 kB
oss-experimental/react-dom/cjs/react-dom.production.js=6.84 kB6.84 kB=1.88 kB1.88 kB
oss-experimental/react-dom/cjs/react-dom-client.production.js+0.05%666.83 kB667.15 kB+0.07%117.42 kB117.50 kB
facebook-www/ReactDOM-prod.classic.js+0.05%692.91 kB693.27 kB+0.06%121.92 kB122.00 kB
facebook-www/ReactDOM-prod.modern.js+0.05%683.34 kB683.65 kB+0.07%120.31 kB120.39 kB
Significant size changes
Includes any change greater than 0.2%:
(No significant changes)

Generated by 🚫 dangerJS against eaa592d
@gnoff
gnoff
requested a review
from acdliteJanuary 12, 2026 21:20
@aapolaakkioaapolaakkio
mentioned this pull request
Jan 13, 2026

Closed

@gnoff
gnoff
merged commit c186624
into
react:mainJan 13, 2026

240 checks passed

@gnoff
gnoff
deleted the

jstory/fix-hydration-on-immediate-suspend

branch
January 13, 2026 20:48
github-actionsBot
pushed a commit
that referenced
this pull request
Jan 13, 2026
@gnoff
[Fiber] Correctly handle replaying when hydrating (#35494)
5fe51da
When hydrating if something suspends and then resolves in a microtask it
is possible that React will resume the render without fully unwinding
work in progress. This can cause hydration cursors to be offset and lead
to hydration errors. This change adds a restore step when replaying
HostComponent to ensure the hydration cursor is in the appropriate
position when replaying.
fixes: #35210
DiffTrain build for [c186624](c186624)
github-actionsBot
pushed a commit
that referenced
this pull request
Jan 13, 2026
@gnoff
[Fiber] Correctly handle replaying when hydrating (#35494)
ee52a94
When hydrating if something suspends and then resolves in a microtask it
is possible that React will resume the render without fully unwinding
work in progress. This can cause hydration cursors to be offset and lead
to hydration errors. This change adds a restore step when replaying
HostComponent to ensure the hydration cursor is in the appropriate
position when replaying.
fixes: #35210
DiffTrain build for [c186624](c186624)
@nextjs-botnextjs-bot
mentioned this pull request
Jan 14, 2026
 Merged

@sovetski
sovetski
commented
Jan 25, 2026

Copy link


Copy Markdown

Do we have this change in the latest version of React? (19.2.3)
@rubennorterubennorte
mentioned this pull request
Jun 5, 2026
 Closed

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@acdliteacdliteacdlite approved these changes
@sebmarkbagesebmarkbageAwaiting requested review from sebmarkbage

Assignees


No one assigned


Labels

CLA SignedReact Core TeamOpened by a member of the React Core Team

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

Bug: A tree hydrated but some attributes of the server rendered HTML didn't match the client properties.


4 participants

@gnoff@react-sizebot@sovetski@acdlite

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
[Fiber] Correctly handle replaying when hydrating by gnoff · Pull Request #35494 · react/react · GitHub
Skip to content
[Fiber] Correctly handle replaying when hydrating - #35494
Merged
gnoff merged 1 commit into
react:mainfrom 
gnoff:jstory/fix-hydration-on-immediate-suspend
Jan 13, 2026
Merged
[Fiber] Correctly handle replaying when hydrating#35494
gnoff merged 1 commit into
react:mainfrom 
gnoff:jstory/fix-hydration-on-immediate-suspend
Conversation
@gnoff
@gnoffgnoff
commented
Jan 12, 2026•

edited

Loading

Copy link


Copy Markdown

Collaborator
When hydrating if something suspends and then resolves in a microtask it is possible that React will resume the render without fully unwinding work in progress. This can cause hydration cursors to be offset and lead to hydration errors. This change adds a restore step when replaying HostComponent to ensure the hydration cursor is in the appropriate position when replaying.
fixes: #35210
@gnoff
[Fiber] Correctly handle replaying when hydrating
eaa592d
When hydrating if something suspends and then resolves in a microtask it is possible that React will resume the render without fully unwinding work in progress. This can cause hydration cursors to be offset and lead to hydration errors. This change adds a restore step when replaying HostComponent to ensure the hydration cursor is in the appropriate position when replaying.
@github-actionsgithub-actionsBot
added
the 
React Core Team
Opened by a member of the React Core Team
label
Jan 12, 2026
@gnoff
gnoff
requested review from
acdlite and sebmarkbage
and removed request for
acdliteJanuary 12, 2026 20:48
@react-sizebot
react-sizebot
commented
Jan 12, 2026

Copy link


Copy Markdown

Comparing: 5aec1b2...eaa592d
Critical size changes
Includes critical production bundles, as well as any change greater than 2%:
Name+/-BaseCurrent+/- gzipBase gzipCurrent gzip
oss-stable/react-dom/cjs/react-dom.production.js=6.84 kB6.84 kB+0.05%1.88 kB1.88 kB
oss-stable/react-dom/cjs/react-dom-client.production.js+0.05%607.60 kB607.92 kB+0.07%107.53 kB107.61 kB
oss-experimental/react-dom/cjs/react-dom.production.js=6.84 kB6.84 kB=1.88 kB1.88 kB
oss-experimental/react-dom/cjs/react-dom-client.production.js+0.05%666.83 kB667.15 kB+0.07%117.42 kB117.50 kB
facebook-www/ReactDOM-prod.classic.js+0.05%692.91 kB693.27 kB+0.06%121.92 kB122.00 kB
facebook-www/ReactDOM-prod.modern.js+0.05%683.34 kB683.65 kB+0.07%120.31 kB120.39 kB
Significant size changes
Includes any change greater than 0.2%:
(No significant changes)

Generated by 🚫 dangerJS against eaa592d
@gnoff
gnoff
requested a review
from acdliteJanuary 12, 2026 21:20
@aapolaakkioaapolaakkio
mentioned this pull request
Jan 13, 2026

Closed

@gnoff
gnoff
merged commit c186624
into
react:mainJan 13, 2026

240 checks passed

@gnoff
gnoff
deleted the

jstory/fix-hydration-on-immediate-suspend

branch
January 13, 2026 20:48
github-actionsBot
pushed a commit
that referenced
this pull request
Jan 13, 2026
@gnoff
[Fiber] Correctly handle replaying when hydrating (#35494)
5fe51da
When hydrating if something suspends and then resolves in a microtask it
is possible that React will resume the render without fully unwinding
work in progress. This can cause hydration cursors to be offset and lead
to hydration errors. This change adds a restore step when replaying
HostComponent to ensure the hydration cursor is in the appropriate
position when replaying.
fixes: #35210
DiffTrain build for [c186624](c186624)
github-actionsBot
pushed a commit
that referenced
this pull request
Jan 13, 2026
@gnoff
[Fiber] Correctly handle replaying when hydrating (#35494)
ee52a94
When hydrating if something suspends and then resolves in a microtask it
is possible that React will resume the render without fully unwinding
work in progress. This can cause hydration cursors to be offset and lead
to hydration errors. This change adds a restore step when replaying
HostComponent to ensure the hydration cursor is in the appropriate
position when replaying.
fixes: #35210
DiffTrain build for [c186624](c186624)
@nextjs-botnextjs-bot
mentioned this pull request
Jan 14, 2026
 Merged

@sovetski
sovetski
commented
Jan 25, 2026

Copy link


Copy Markdown

Do we have this change in the latest version of React? (19.2.3)
@rubennorterubennorte
mentioned this pull request
Jun 5, 2026
 Closed

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@acdliteacdliteacdlite approved these changes
@sebmarkbagesebmarkbageAwaiting requested review from sebmarkbage

Assignees


No one assigned


Labels

CLA SignedReact Core TeamOpened by a member of the React Core Team

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

Bug: A tree hydrated but some attributes of the server rendered HTML didn't match the client properties.


4 participants

@gnoff@react-sizebot@sovetski@acdlite

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
[Fiber] Correctly handle replaying when hydrating by gnoff · Pull Request #35494 · react/react · GitHub
Skip to content
[Fiber] Correctly handle replaying when hydrating - #35494
Merged
gnoff merged 1 commit into
react:mainfrom 
gnoff:jstory/fix-hydration-on-immediate-suspend
Jan 13, 2026
Merged
[Fiber] Correctly handle replaying when hydrating#35494
gnoff merged 1 commit into
react:mainfrom 
gnoff:jstory/fix-hydration-on-immediate-suspend
Conversation
@gnoff
@gnoffgnoff
commented
Jan 12, 2026•

edited

Loading

Copy link


Copy Markdown

Collaborator
When hydrating if something suspends and then resolves in a microtask it is possible that React will resume the render without fully unwinding work in progress. This can cause hydration cursors to be offset and lead to hydration errors. This change adds a restore step when replaying HostComponent to ensure the hydration cursor is in the appropriate position when replaying.
fixes: #35210
@gnoff
[Fiber] Correctly handle replaying when hydrating
eaa592d
When hydrating if something suspends and then resolves in a microtask it is possible that React will resume the render without fully unwinding work in progress. This can cause hydration cursors to be offset and lead to hydration errors. This change adds a restore step when replaying HostComponent to ensure the hydration cursor is in the appropriate position when replaying.
@github-actionsgithub-actionsBot
added
the 
React Core Team
Opened by a member of the React Core Team
label
Jan 12, 2026
@gnoff
gnoff
requested review from
acdlite and sebmarkbage
and removed request for
acdliteJanuary 12, 2026 20:48
@react-sizebot
react-sizebot
commented
Jan 12, 2026

Copy link


Copy Markdown

Comparing: 5aec1b2...eaa592d
Critical size changes
Includes critical production bundles, as well as any change greater than 2%:
Name+/-BaseCurrent+/- gzipBase gzipCurrent gzip
oss-stable/react-dom/cjs/react-dom.production.js=6.84 kB6.84 kB+0.05%1.88 kB1.88 kB
oss-stable/react-dom/cjs/react-dom-client.production.js+0.05%607.60 kB607.92 kB+0.07%107.53 kB107.61 kB
oss-experimental/react-dom/cjs/react-dom.production.js=6.84 kB6.84 kB=1.88 kB1.88 kB
oss-experimental/react-dom/cjs/react-dom-client.production.js+0.05%666.83 kB667.15 kB+0.07%117.42 kB117.50 kB
facebook-www/ReactDOM-prod.classic.js+0.05%692.91 kB693.27 kB+0.06%121.92 kB122.00 kB
facebook-www/ReactDOM-prod.modern.js+0.05%683.34 kB683.65 kB+0.07%120.31 kB120.39 kB
Significant size changes
Includes any change greater than 0.2%:
(No significant changes)

Generated by 🚫 dangerJS against eaa592d
@gnoff
gnoff
requested a review
from acdliteJanuary 12, 2026 21:20
@aapolaakkioaapolaakkio
mentioned this pull request
Jan 13, 2026

Closed

@gnoff
gnoff
merged commit c186624
into
react:mainJan 13, 2026

240 checks passed

@gnoff
gnoff
deleted the

jstory/fix-hydration-on-immediate-suspend

branch
January 13, 2026 20:48
github-actionsBot
pushed a commit
that referenced
this pull request
Jan 13, 2026
@gnoff
[Fiber] Correctly handle replaying when hydrating (#35494)
5fe51da
When hydrating if something suspends and then resolves in a microtask it
is possible that React will resume the render without fully unwinding
work in progress. This can cause hydration cursors to be offset and lead
to hydration errors. This change adds a restore step when replaying
HostComponent to ensure the hydration cursor is in the appropriate
position when replaying.
fixes: #35210
DiffTrain build for [c186624](c186624)
github-actionsBot
pushed a commit
that referenced
this pull request
Jan 13, 2026
@gnoff
[Fiber] Correctly handle replaying when hydrating (#35494)
ee52a94
When hydrating if something suspends and then resolves in a microtask it
is possible that React will resume the render without fully unwinding
work in progress. This can cause hydration cursors to be offset and lead
to hydration errors. This change adds a restore step when replaying
HostComponent to ensure the hydration cursor is in the appropriate
position when replaying.
fixes: #35210
DiffTrain build for [c186624](c186624)
@nextjs-botnextjs-bot
mentioned this pull request
Jan 14, 2026
 Merged

@sovetski
sovetski
commented
Jan 25, 2026

Copy link


Copy Markdown

Do we have this change in the latest version of React? (19.2.3)
@rubennorterubennorte
mentioned this pull request
Jun 5, 2026
 Closed

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@acdliteacdliteacdlite approved these changes
@sebmarkbagesebmarkbageAwaiting requested review from sebmarkbage

Assignees


No one assigned


Labels

CLA SignedReact Core TeamOpened by a member of the React Core Team

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

Bug: A tree hydrated but some attributes of the server rendered HTML didn't match the client properties.


4 participants

@gnoff@react-sizebot@sovetski@acdlite

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
[Fiber] Correctly handle replaying when hydrating by gnoff · Pull Request #35494 · react/react · GitHub
Skip to content
[Fiber] Correctly handle replaying when hydrating - #35494
Merged
gnoff merged 1 commit into
react:mainfrom 
gnoff:jstory/fix-hydration-on-immediate-suspend
Jan 13, 2026
Merged
[Fiber] Correctly handle replaying when hydrating#35494
gnoff merged 1 commit into
react:mainfrom 
gnoff:jstory/fix-hydration-on-immediate-suspend
Conversation
@gnoff
@gnoffgnoff
commented
Jan 12, 2026•

edited

Loading

Copy link


Copy Markdown

Collaborator
When hydrating if something suspends and then resolves in a microtask it is possible that React will resume the render without fully unwinding work in progress. This can cause hydration cursors to be offset and lead to hydration errors. This change adds a restore step when replaying HostComponent to ensure the hydration cursor is in the appropriate position when replaying.
fixes: #35210
@gnoff
[Fiber] Correctly handle replaying when hydrating
eaa592d
When hydrating if something suspends and then resolves in a microtask it is possible that React will resume the render without fully unwinding work in progress. This can cause hydration cursors to be offset and lead to hydration errors. This change adds a restore step when replaying HostComponent to ensure the hydration cursor is in the appropriate position when replaying.
@github-actionsgithub-actionsBot
added
the 
React Core Team
Opened by a member of the React Core Team
label
Jan 12, 2026
@gnoff
gnoff
requested review from
acdlite and sebmarkbage
and removed request for
acdliteJanuary 12, 2026 20:48
@react-sizebot
react-sizebot
commented
Jan 12, 2026

Copy link


Copy Markdown

Comparing: 5aec1b2...eaa592d
Critical size changes
Includes critical production bundles, as well as any change greater than 2%:
Name+/-BaseCurrent+/- gzipBase gzipCurrent gzip
oss-stable/react-dom/cjs/react-dom.production.js=6.84 kB6.84 kB+0.05%1.88 kB1.88 kB
oss-stable/react-dom/cjs/react-dom-client.production.js+0.05%607.60 kB607.92 kB+0.07%107.53 kB107.61 kB
oss-experimental/react-dom/cjs/react-dom.production.js=6.84 kB6.84 kB=1.88 kB1.88 kB
oss-experimental/react-dom/cjs/react-dom-client.production.js+0.05%666.83 kB667.15 kB+0.07%117.42 kB117.50 kB
facebook-www/ReactDOM-prod.classic.js+0.05%692.91 kB693.27 kB+0.06%121.92 kB122.00 kB
facebook-www/ReactDOM-prod.modern.js+0.05%683.34 kB683.65 kB+0.07%120.31 kB120.39 kB
Significant size changes
Includes any change greater than 0.2%:
(No significant changes)

Generated by 🚫 dangerJS against eaa592d
@gnoff
gnoff
requested a review
from acdliteJanuary 12, 2026 21:20
@aapolaakkioaapolaakkio
mentioned this pull request
Jan 13, 2026

Closed

@gnoff
gnoff
merged commit c186624
into
react:mainJan 13, 2026

240 checks passed

@gnoff
gnoff
deleted the

jstory/fix-hydration-on-immediate-suspend

branch
January 13, 2026 20:48
github-actionsBot
pushed a commit
that referenced
this pull request
Jan 13, 2026
@gnoff
[Fiber] Correctly handle replaying when hydrating (#35494)
5fe51da
When hydrating if something suspends and then resolves in a microtask it
is possible that React will resume the render without fully unwinding
work in progress. This can cause hydration cursors to be offset and lead
to hydration errors. This change adds a restore step when replaying
HostComponent to ensure the hydration cursor is in the appropriate
position when replaying.
fixes: #35210
DiffTrain build for [c186624](c186624)
github-actionsBot
pushed a commit
that referenced
this pull request
Jan 13, 2026
@gnoff
[Fiber] Correctly handle replaying when hydrating (#35494)
ee52a94
When hydrating if something suspends and then resolves in a microtask it
is possible that React will resume the render without fully unwinding
work in progress. This can cause hydration cursors to be offset and lead
to hydration errors. This change adds a restore step when replaying
HostComponent to ensure the hydration cursor is in the appropriate
position when replaying.
fixes: #35210
DiffTrain build for [c186624](c186624)
@nextjs-botnextjs-bot
mentioned this pull request
Jan 14, 2026
 Merged

@sovetski
sovetski
commented
Jan 25, 2026

Copy link


Copy Markdown

Do we have this change in the latest version of React? (19.2.3)
@rubennorterubennorte
mentioned this pull request
Jun 5, 2026
 Closed

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@acdliteacdliteacdlite approved these changes
@sebmarkbagesebmarkbageAwaiting requested review from sebmarkbage

Assignees


No one assigned


Labels

CLA SignedReact Core TeamOpened by a member of the React Core Team

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

Bug: A tree hydrated but some attributes of the server rendered HTML didn't match the client properties.


4 participants

@gnoff@react-sizebot@sovetski@acdlite

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
[Fiber] Correctly handle replaying when hydrating by gnoff · Pull Request #35494 · react/react · GitHub
Skip to content
[Fiber] Correctly handle replaying when hydrating - #35494
Merged
gnoff merged 1 commit into
react:mainfrom 
gnoff:jstory/fix-hydration-on-immediate-suspend
Jan 13, 2026
Merged
[Fiber] Correctly handle replaying when hydrating#35494
gnoff merged 1 commit into
react:mainfrom 
gnoff:jstory/fix-hydration-on-immediate-suspend
Conversation
@gnoff
@gnoffgnoff
commented
Jan 12, 2026•

edited

Loading

Copy link


Copy Markdown

Collaborator
When hydrating if something suspends and then resolves in a microtask it is possible that React will resume the render without fully unwinding work in progress. This can cause hydration cursors to be offset and lead to hydration errors. This change adds a restore step when replaying HostComponent to ensure the hydration cursor is in the appropriate position when replaying.
fixes: #35210
@gnoff
[Fiber] Correctly handle replaying when hydrating
eaa592d
When hydrating if something suspends and then resolves in a microtask it is possible that React will resume the render without fully unwinding work in progress. This can cause hydration cursors to be offset and lead to hydration errors. This change adds a restore step when replaying HostComponent to ensure the hydration cursor is in the appropriate position when replaying.
@github-actionsgithub-actionsBot
added
the 
React Core Team
Opened by a member of the React Core Team
label
Jan 12, 2026
@gnoff
gnoff
requested review from
acdlite and sebmarkbage
and removed request for
acdliteJanuary 12, 2026 20:48
@react-sizebot
react-sizebot
commented
Jan 12, 2026

Copy link


Copy Markdown

Comparing: 5aec1b2...eaa592d
Critical size changes
Includes critical production bundles, as well as any change greater than 2%:
Name+/-BaseCurrent+/- gzipBase gzipCurrent gzip
oss-stable/react-dom/cjs/react-dom.production.js=6.84 kB6.84 kB+0.05%1.88 kB1.88 kB
oss-stable/react-dom/cjs/react-dom-client.production.js+0.05%607.60 kB607.92 kB+0.07%107.53 kB107.61 kB
oss-experimental/react-dom/cjs/react-dom.production.js=6.84 kB6.84 kB=1.88 kB1.88 kB
oss-experimental/react-dom/cjs/react-dom-client.production.js+0.05%666.83 kB667.15 kB+0.07%117.42 kB117.50 kB
facebook-www/ReactDOM-prod.classic.js+0.05%692.91 kB693.27 kB+0.06%121.92 kB122.00 kB
facebook-www/ReactDOM-prod.modern.js+0.05%683.34 kB683.65 kB+0.07%120.31 kB120.39 kB
Significant size changes
Includes any change greater than 0.2%:
(No significant changes)

Generated by 🚫 dangerJS against eaa592d
@gnoff
gnoff
requested a review
from acdliteJanuary 12, 2026 21:20
@aapolaakkioaapolaakkio
mentioned this pull request
Jan 13, 2026

Closed

@gnoff
gnoff
merged commit c186624
into
react:mainJan 13, 2026

240 checks passed

@gnoff
gnoff
deleted the

jstory/fix-hydration-on-immediate-suspend

branch
January 13, 2026 20:48
github-actionsBot
pushed a commit
that referenced
this pull request
Jan 13, 2026
@gnoff
[Fiber] Correctly handle replaying when hydrating (#35494)
5fe51da
When hydrating if something suspends and then resolves in a microtask it
is possible that React will resume the render without fully unwinding
work in progress. This can cause hydration cursors to be offset and lead
to hydration errors. This change adds a restore step when replaying
HostComponent to ensure the hydration cursor is in the appropriate
position when replaying.
fixes: #35210
DiffTrain build for [c186624](c186624)
github-actionsBot
pushed a commit
that referenced
this pull request
Jan 13, 2026
@gnoff
[Fiber] Correctly handle replaying when hydrating (#35494)
ee52a94
When hydrating if something suspends and then resolves in a microtask it
is possible that React will resume the render without fully unwinding
work in progress. This can cause hydration cursors to be offset and lead
to hydration errors. This change adds a restore step when replaying
HostComponent to ensure the hydration cursor is in the appropriate
position when replaying.
fixes: #35210
DiffTrain build for [c186624](c186624)
@nextjs-botnextjs-bot
mentioned this pull request
Jan 14, 2026
 Merged

@sovetski
sovetski
commented
Jan 25, 2026

Copy link


Copy Markdown

Do we have this change in the latest version of React? (19.2.3)
@rubennorterubennorte
mentioned this pull request
Jun 5, 2026
 Closed

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@acdliteacdliteacdlite approved these changes
@sebmarkbagesebmarkbageAwaiting requested review from sebmarkbage

Assignees


No one assigned


Labels

CLA SignedReact Core TeamOpened by a member of the React Core Team

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

Bug: A tree hydrated but some attributes of the server rendered HTML didn't match the client properties.


4 participants

@gnoff@react-sizebot@sovetski@acdlite

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
[Fiber] Correctly handle replaying when hydrating by gnoff · Pull Request #35494 · react/react · GitHub
Skip to content
[Fiber] Correctly handle replaying when hydrating - #35494
Merged
gnoff merged 1 commit into
react:mainfrom 
gnoff:jstory/fix-hydration-on-immediate-suspend
Jan 13, 2026
Merged
[Fiber] Correctly handle replaying when hydrating#35494
gnoff merged 1 commit into
react:mainfrom 
gnoff:jstory/fix-hydration-on-immediate-suspend
Conversation
@gnoff
@gnoffgnoff
commented
Jan 12, 2026•

edited

Loading

Copy link


Copy Markdown

Collaborator
When hydrating if something suspends and then resolves in a microtask it is possible that React will resume the render without fully unwinding work in progress. This can cause hydration cursors to be offset and lead to hydration errors. This change adds a restore step when replaying HostComponent to ensure the hydration cursor is in the appropriate position when replaying.
fixes: #35210
@gnoff
[Fiber] Correctly handle replaying when hydrating
eaa592d
When hydrating if something suspends and then resolves in a microtask it is possible that React will resume the render without fully unwinding work in progress. This can cause hydration cursors to be offset and lead to hydration errors. This change adds a restore step when replaying HostComponent to ensure the hydration cursor is in the appropriate position when replaying.
@github-actionsgithub-actionsBot
added
the 
React Core Team
Opened by a member of the React Core Team
label
Jan 12, 2026
@gnoff
gnoff
requested review from
acdlite and sebmarkbage
and removed request for
acdliteJanuary 12, 2026 20:48
@react-sizebot
react-sizebot
commented
Jan 12, 2026

Copy link


Copy Markdown

Comparing: 5aec1b2...eaa592d
Critical size changes
Includes critical production bundles, as well as any change greater than 2%:
Name+/-BaseCurrent+/- gzipBase gzipCurrent gzip
oss-stable/react-dom/cjs/react-dom.production.js=6.84 kB6.84 kB+0.05%1.88 kB1.88 kB
oss-stable/react-dom/cjs/react-dom-client.production.js+0.05%607.60 kB607.92 kB+0.07%107.53 kB107.61 kB
oss-experimental/react-dom/cjs/react-dom.production.js=6.84 kB6.84 kB=1.88 kB1.88 kB
oss-experimental/react-dom/cjs/react-dom-client.production.js+0.05%666.83 kB667.15 kB+0.07%117.42 kB117.50 kB
facebook-www/ReactDOM-prod.classic.js+0.05%692.91 kB693.27 kB+0.06%121.92 kB122.00 kB
facebook-www/ReactDOM-prod.modern.js+0.05%683.34 kB683.65 kB+0.07%120.31 kB120.39 kB
Significant size changes
Includes any change greater than 0.2%:
(No significant changes)

Generated by 🚫 dangerJS against eaa592d
@gnoff
gnoff
requested a review
from acdliteJanuary 12, 2026 21:20
@aapolaakkioaapolaakkio
mentioned this pull request
Jan 13, 2026

Closed

@gnoff
gnoff
merged commit c186624
into
react:mainJan 13, 2026

240 checks passed

@gnoff
gnoff
deleted the

jstory/fix-hydration-on-immediate-suspend

branch
January 13, 2026 20:48
github-actionsBot
pushed a commit
that referenced
this pull request
Jan 13, 2026
@gnoff
[Fiber] Correctly handle replaying when hydrating (#35494)
5fe51da
When hydrating if something suspends and then resolves in a microtask it
is possible that React will resume the render without fully unwinding
work in progress. This can cause hydration cursors to be offset and lead
to hydration errors. This change adds a restore step when replaying
HostComponent to ensure the hydration cursor is in the appropriate
position when replaying.
fixes: #35210
DiffTrain build for [c186624](c186624)
github-actionsBot
pushed a commit
that referenced
this pull request
Jan 13, 2026
@gnoff
[Fiber] Correctly handle replaying when hydrating (#35494)
ee52a94
When hydrating if something suspends and then resolves in a microtask it
is possible that React will resume the render without fully unwinding
work in progress. This can cause hydration cursors to be offset and lead
to hydration errors. This change adds a restore step when replaying
HostComponent to ensure the hydration cursor is in the appropriate
position when replaying.
fixes: #35210
DiffTrain build for [c186624](c186624)
@nextjs-botnextjs-bot
mentioned this pull request
Jan 14, 2026
 Merged

@sovetski
sovetski
commented
Jan 25, 2026

Copy link


Copy Markdown

Do we have this change in the latest version of React? (19.2.3)
@rubennorterubennorte
mentioned this pull request
Jun 5, 2026
 Closed

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@acdliteacdliteacdlite approved these changes
@sebmarkbagesebmarkbageAwaiting requested review from sebmarkbage

Assignees


No one assigned


Labels

CLA SignedReact Core TeamOpened by a member of the React Core Team

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

Bug: A tree hydrated but some attributes of the server rendered HTML didn't match the client properties.


4 participants

@gnoff@react-sizebot@sovetski@acdlite