Wrap retrySuspendedRoot using SchedulerTracing #13776
Merged
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
sophiebits
commented
Oct 4, 2018
| @@ -2631,6 +2646,11 @@ describe('Profiler', () => { | |||
| }, | |||
| ); | |||
| }); | |||
| expect(ReactTestRenderer).toHaveYielded([ | |||
There was a problem hiding this comment.
The timing of these yields is unchanged; the old test was misleading.
| expect(renderer).toFlushAndYield(['AsyncText [loaded]']); | ||
| expect(renderer.toJSON()).toEqual(['loaded', 'updated']); | ||
|
|
||
| expect(onRender).toHaveBeenCalledTimes(1); | ||
| expect(onRender.mock.calls[0][6]).toMatchInteractions([ | ||
| initialRenderInteraction, | ||
| highPriUpdateInteraction, |
There was a problem hiding this comment.
The way this test changed is a little interesting. Our "hi-pri update" causes us to re-call AsyncText which means that in a sense, the update now is blocked on the suspended component before it fully resolves. I can see the argument either way for how to account for this. The good news is that if we only scheduled an update on the sibling then they would stay independent.
|
ReactDOM: size: 0.0%, gzip: 0.0% Details of bundled changes.Comparing: 40a521a...f9f43af react-dom
react-art
react-test-renderer
react-reconciler
react-native-renderer
scheduler
Generated by 🚫 dangerJS |
sophiebits
force-pushed
the
suspense-trace-hack
branch
from
d77a2bd
to
21a215a
Compare
acdlite
reviewed
Oct 4, 2018
| @@ -766,7 +761,7 @@ function commitRoot(root: FiberRoot, finishedWork: Fiber): void { | |||
| unhandledError = error; | |||
| } | |||
| } finally { | |||
| if (!nextRenderIncludesTimedOutPlaceholder) { | |||
| if (true) { | |||
There was a problem hiding this comment.
ok whatever, ANdrew
sophiebits
force-pushed
the
suspense-trace-hack
branch
from
e1b4d02
to
3501994
Compare
Previously, we were emptying root.pendingInteractionMap and permanently losing those interactions when applying an unrelated update to a tree that has no scheduled work that is waiting on promise resolution. (That is, one that is showing a fallback and waiting for the suspended content to resolve.) The logic I'm leaving untouched with `nextRenderIncludesTimedOutPlaceholder` is *not* correct -- what we want is instead to know if *any* placeholder anywhere in the tree is showing its fallback -- but we don't currently have a better replacement, and this should unblock tracing with suspense again.
acdlite
approved these changes
Oct 4, 2018
sophiebits
force-pushed
the
suspense-trace-hack
branch
from
3501994
to
f9f43af
Compare
acdlite
pushed a commit
to plievone/react
that referenced
this pull request
Oct 5, 2018
Previously, we were emptying root.pendingInteractionMap and permanently losing those interactions when applying an unrelated update to a tree that has no scheduled work that is waiting on promise resolution. (That is, one that is showing a fallback and waiting for the suspended content to resolve.) The logic I'm leaving untouched with `nextRenderIncludesTimedOutPlaceholder` is *not* correct -- what we want is instead to know if *any* placeholder anywhere in the tree is showing its fallback -- but we don't currently have a better replacement, and this should unblock tracing with suspense again.
linjiajian999
pushed a commit
to linjiajian999/react
that referenced
this pull request
Oct 22, 2018
Previously, we were emptying root.pendingInteractionMap and permanently losing those interactions when applying an unrelated update to a tree that has no scheduled work that is waiting on promise resolution. (That is, one that is showing a fallback and waiting for the suspended content to resolve.) The logic I'm leaving untouched with `nextRenderIncludesTimedOutPlaceholder` is *not* correct -- what we want is instead to know if *any* placeholder anywhere in the tree is showing its fallback -- but we don't currently have a better replacement, and this should unblock tracing with suspense again.
jetoneza
pushed a commit
to jetoneza/react
that referenced
this pull request
Jan 23, 2019
Previously, we were emptying root.pendingInteractionMap and permanently losing those interactions when applying an unrelated update to a tree that has no scheduled work that is waiting on promise resolution. (That is, one that is showing a fallback and waiting for the suspended content to resolve.) The logic I'm leaving untouched with `nextRenderIncludesTimedOutPlaceholder` is *not* correct -- what we want is instead to know if *any* placeholder anywhere in the tree is showing its fallback -- but we don't currently have a better replacement, and this should unblock tracing with suspense again.
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.
Previously, we were emptying root.pendingInteractionMap and permanently losing those interactions when applying an unrelated update to a tree that has no scheduled work that is waiting on promise resolution. (That is, one that is showing a fallback and waiting for the suspended content to resolve.)
The logic I'm leaving untouched with
nextRenderIncludesTimedOutPlaceholderis not correct -- what we want is instead to know if any placeholder anywhere in the tree is showing its fallback -- but we don't currently have a better replacement, and this should unblock tracing with suspense again.