Skip to content

Forwardport fixes from v10 #5008

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JoviDeCroock merged 2 commits into from
Feb 1, 2026
+397 −1
Merged

Forwardport fixes from v10 #5008

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d143a6e
Resolve some suspense crashes (#4999)
JoviDeCroock Jan 28, 2026
8d31859
Avoid scheduling suspense state udpates (#5006)
JoviDeCroock Jan 31, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion compat/src/suspense.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ const oldUnmount = options.unmount;
options.unmount = function (vnode) {
/** @type {import('./internal').Component} */
const component = vnode._component;
if (component) component._unmounted = true;
if (component && component._onResolve) {
component._onResolve();
}
Expand Down Expand Up @@ -127,7 +128,7 @@ Suspense.prototype._childDidSuspend = function (promise, suspendingVNode) {

let resolved = false;
const onResolved = () => {
if (resolved) return;
if (resolved || c._unmounted) return;

resolved = true;
suspendingComponent._onResolve = null;
Expand All @@ -137,6 +138,12 @@ Suspense.prototype._childDidSuspend = function (promise, suspendingVNode) {

suspendingComponent._onResolve = onResolved;

// Store and null _parentDom to prevent setState/forceUpdate from
// scheduling renders while suspended. Render would be a no-op anyway
// since renderComponent checks _parentDom, but this avoids queue churn.
const originalParentDom = suspendingComponent._parentDom;
suspendingComponent._parentDom = null;

const onSuspensionComplete = () => {
if (!--c._pendingSuspensionCount) {
// If the suspension was during hydration we don't need to restore the
Expand All @@ -154,6 +161,8 @@ Suspense.prototype._childDidSuspend = function (promise, suspendingVNode) {

let suspended;
while ((suspended = c._suspenders.pop())) {
// Restore _parentDom before forceUpdate so render can proceed
suspended._parentDom = originalParentDom;
suspended.forceUpdate();
}
}
Expand Down
Loading
Loading