More robust fix for #18515 #18535
Merged
More robust fix for #18515 #18535
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Adds a regression test for the same underlying bug as facebook#18515 but using pings. Test already passes, but I confirmed it fails if you revert the fix in facebook#18515.
facebook-github-bot
added
React Core Team
|
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 942d555:
|
Details of bundled changes.Comparing: ddc4b65...942d555 react-dom
react-native-renderer
react-art
ReactDOM: size: 0.0%, gzip: 0.0% Size changes (stable) |
Details of bundled changes.Comparing: ddc4b65...942d555 react-native-renderer
react-dom
react-art
Size changes (experimental) |
gaearon
reviewed
Apr 8, 2020
| root.finishedExpirationTime = expirationTime; | ||
|
|
||
| root.nextKnownPendingLevel = getRemainingExpirationTime(finishedWork); |
There was a problem hiding this comment.
Is it worth writing a regression test that would fail if this and the defensive safeguard were removed? Looks like the new test covers the Concurrent render only. Not sure if this matters.
There was a problem hiding this comment.
The diff view is misleading because of collapsed sections. This line is the sync path. The concurrent path is here: https://github.com/facebook/react/pull/18535/files#diff-63c455475b8566c10993b2daa2c3211bR685
The test in #18515 covers the sync path because the discrete update is expired but I can add another test since that one happens to be fixed by the other change.
gaearon
approved these changes
Apr 8, 2020
sebmarkbage
approved these changes
Apr 8, 2020
This was referenced Oct 1, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Adds a regression test for the same underlying bug as #18515 but using pings.
Test already passes, but I confirmed it fails if you revert the fix in #18515.
Also confirmed that this fix alone is sufficient to fix the bug. However, I've kept the previous fix as defense against a future regression, since we've had similar bugs around clearing Suspense timers before.
The fix is to always set
nextKnownPendingLevelupon finishing a root, instead of only when it suspends.