Fix state leaking when a function component throws on server render #19212
Conversation
|
Hi @pmaccart! Thank you for your pull request and welcome to our community. We require contributors to sign our Contributor License Agreement, and we don't seem to have you on file. In order for us to review and merge your code, please sign at https://code.facebook.com/cla. If you are contributing on behalf of someone else (eg your employer), the individual CLA may not be sufficient and your employer may need to sign the corporate CLA. If you have received this in error or have any questions, please contact us at cla@fb.com. Thanks! |
|
Can you add a test that would have been failing before? That would make it easier to check the changes. |
|
Can we instead add |
This comment has been minimized.
This comment has been minimized.
|
This pull request is automatically built and testable in CodeSandbox. To see build info of the built libraries, click here or the icon next to each commit SHA. Latest deployment of this branch, based on commit 21fdac0:
|
6dad98b to
46556a4
Compare
46556a4 to
398116c
Compare
|
@gaearon Thanks for the feedback, and sorry for the slow response. I made a couple updates to the PR:
|
packages/react-dom/src/__tests__/ReactDOMServerIntegrationHooks-test.js
Outdated
Show resolved
Hide resolved
| if (__DEV__) { | ||
| isInHookUserCodeInDev = false; | ||
| } | ||
|
|
||
| // These were reset above | ||
| // These were reset via the resetHooksState() call |
There was a problem hiding this comment.
Let's just remove this comment?
| numberOfReRenders = 0; | ||
| renderPhaseUpdates = null; | ||
| workInProgressHook = null; | ||
| resetHooksState(); | ||
| if (__DEV__) { |
There was a problem hiding this comment.
Move this DEV-only block to reset too?
| @@ -202,24 +202,21 @@ export function finishHooks( | |||
|
|
|||
| children = Component(props, refOrContext); | |||
| } | |||
| currentlyRenderingComponent = null; | |||
There was a problem hiding this comment.
Did we lose currentlyRenderingComponent?
There was a problem hiding this comment.
Oops, yes -- added that in as well.
|
Looks good. Thx |
…acebook#19212) * add unit test asserting internal hooks state is reset * Reset internal hooks state before rendering * reset hooks state on error * Use expect...toThrow instead of try/catch in test * reset dev-only hooks state inside resetHooksState * reset currentlyRenderingComponent to null
Summary
Reset the internal hooks state when preparing a component for hooks usage, rather than after a component finishes rendering. This fixes #19211, where the internal hooks state is not cleared if a function component throws an error while rendering.
Test Plan
yarn test-prod: validated no test regressions were introduced