Skip to content

Fix state leaking when a function component throws on server render #19212

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 6 commits into from
Jul 8, 2020
Merged

Fix state leaking when a function component throws on server render #19212

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
64f35a1
add unit test asserting internal hooks state is reset
pmaccart Jul 7, 2020
d348ec2
Reset internal hooks state before rendering
pmaccart Jun 30, 2020
398116c
reset hooks state on error
pmaccart Jul 7, 2020
e8dfb29
Use expect...toThrow instead of try/catch in test
pmaccart Jul 7, 2020
cb3b104
reset dev-only hooks state inside resetHooksState
pmaccart Jul 7, 2020
21fdac0
reset currentlyRenderingComponent to null
pmaccart Jul 8, 2020
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
Prev Previous commit
Next Next commit
Reset internal hooks state before rendering
  • Loading branch information
@pmaccart
pmaccart committed Jul 7, 2020
commit d348ec220bd129f6336fe15e9ff40b409692b0ce
26 changes: 7 additions & 19 deletions packages/react-dom/src/server/ReactPartialRendererHooks.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,12 +172,12 @@ export function prepareToUseHooks(componentIdentity: Object): void {
isInHookUserCodeInDev = false;
}

// The following should have already been reset
// didScheduleRenderPhaseUpdate = false;
// firstWorkInProgressHook = null;
// numberOfReRenders = 0;
// renderPhaseUpdates = null;
// workInProgressHook = null;
// Reset the internal hooks state before rendering a component
didScheduleRenderPhaseUpdate = false;
firstWorkInProgressHook = null;
numberOfReRenders = 0;
renderPhaseUpdates = null;
workInProgressHook = null;
}

export function finishHooks(
Expand All @@ -202,23 +202,11 @@ export function finishHooks(

children = Component(props, refOrContext);
}
currentlyRenderingComponent = null;
Copy link
Collaborator

Choose a reason for hiding this comment

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

Did we lose currentlyRenderingComponent?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Oops, yes -- added that in as well.

firstWorkInProgressHook = null;
numberOfReRenders = 0;
renderPhaseUpdates = null;
workInProgressHook = null;

if (__DEV__) {
Copy link
Collaborator

Choose a reason for hiding this comment

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

Move this DEV-only block to reset too?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done.

isInHookUserCodeInDev = false;
}

// These were reset above
// currentlyRenderingComponent = null;
// didScheduleRenderPhaseUpdate = false;
// firstWorkInProgressHook = null;
// numberOfReRenders = 0;
// renderPhaseUpdates = null;
// workInProgressHook = null;

return children;
}

Expand Down