Skip to content

[DevTools] Don't keep stale root instances we never mounted around #34504

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
merged 2 commits into from
Sep 16, 2025
Merged

[DevTools] Don't keep stale root instances we never mounted around #34504

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e6cf23c
[DevTools] Use alternate as previous Fiber when reconciling root
eps1lon Sep 16, 2025
a387a3f
[DevTools] Don't keep stale root instances around we never mounted
eps1lon Sep 16, 2025
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
13 changes: 8 additions & 5 deletions packages/react-devtools-shared/src/backend/fiber/renderer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1516,7 +1516,7 @@ export function attach(
currentRoot = rootInstance;
unmountInstanceRecursively(rootInstance);
rootToFiberInstanceMap.delete(root);
flushPendingEvents(root);
flushPendingEvents();
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

drive-by fix. flushPendingEvents doesn't actually use any of its arguments.

currentRoot = (null: any);
});

Expand All @@ -1541,7 +1541,7 @@ export function attach(
currentRoot = newRoot;
setRootPseudoKey(currentRoot.id, root.current);
mountFiberRecursively(root.current, false);
flushPendingEvents(root);
flushPendingEvents();
currentRoot = (null: any);
});

Expand Down Expand Up @@ -2099,7 +2099,7 @@ export function attach(
}
}

function flushPendingEvents(root: Object): void {
function flushPendingEvents(): void {
if (shouldBailoutWithPendingOperations()) {
// If we aren't profiling, we can just bail out here.
// No use sending an empty update over the bridge.
Expand Down Expand Up @@ -5349,7 +5349,7 @@ export function attach(

mountFiberRecursively(root.current, false);

flushPendingEvents(root);
flushPendingEvents();

needsToFlushComponentLogs = false;
currentRoot = (null: any);
Expand Down Expand Up @@ -5452,6 +5452,9 @@ export function attach(
unmountInstanceRecursively(rootInstance);
removeRootPseudoKey(currentRoot.id);
rootToFiberInstanceMap.delete(root);
} else if (!prevWasMounted && !nextIsMounted) {
// We don't need this root anymore.
rootToFiberInstanceMap.delete(root);
}

if (isProfiling && isProfilingSupported) {
Expand All @@ -5475,7 +5478,7 @@ export function attach(
}

// We're done here.
flushPendingEvents(root);
flushPendingEvents();

needsToFlushComponentLogs = false;

Expand Down
Loading