Skip to content

[Fizz] Clean up the replay nodes if we're already rendered past an element #33581

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
Jun 20, 2025
Merged

[Fizz] Clean up the replay nodes if we're already rendered past an element #33581

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8ddcae4
Restore replay in renderNode
sebmarkbage Jun 20, 2025
917c674
Clean up a node if we suspend after having rendering passed it
sebmarkbage Jun 20, 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
7 changes: 7 additions & 0 deletions packages/react-server/src/ReactFizzServer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3099,6 +3099,9 @@ function replayElement(
if (task.node === currentNode) {
// This same element suspended so we need to pop the replay we just added.
task.replay = replay;
} else {
// We finished rendering this node, so now we can consume this slot.
replayNodes.splice(i, 1);
}
throw x;
}
Expand Down Expand Up @@ -4127,6 +4130,8 @@ function renderNode(
const segment = task.blockedSegment;
if (segment === null) {
// Replay
task = ((task: any): ReplayTask); // Refined
const previousReplaySet: ReplaySet = task.replay;
try {
return renderNodeDestructive(request, task, node, childIndex);
} catch (thrownValue) {
Expand Down Expand Up @@ -4166,6 +4171,7 @@ function renderNode(
task.keyPath = previousKeyPath;
task.treeContext = previousTreeContext;
task.componentStack = previousComponentStack;
task.replay = previousReplaySet;
if (__DEV__) {
task.debugTask = previousDebugTask;
}
Expand Down Expand Up @@ -4199,6 +4205,7 @@ function renderNode(
task.keyPath = previousKeyPath;
task.treeContext = previousTreeContext;
task.componentStack = previousComponentStack;
task.replay = previousReplaySet;
if (__DEV__) {
task.debugTask = previousDebugTask;
}
Expand Down
Loading