mirror of
https://github.com/facebook/react.git
synced 2025-11-01 09:12:30 +00:00
Let's schedule the passive effects even earlier (#16714)
It turns out I needed to schedule mine in the mutation phase and there are also clean up life-cycles there.
This commit is contained in:
1 parent
cc2492ccf1
commit
440cbf2ee5
2 files changed
+31
-13
No files matched your search
+13
-12
@@ -1819,7 +1819,8 @@ function commitRootImpl(root, renderPriorityLevel) {
|
||||
|
||||
function commitBeforeMutationEffects() {
|
||||
while (nextEffect !== null) {
|
||||
if ((nextEffect.effectTag & Snapshot) !== NoEffect) {
|
||||
const effectTag = nextEffect.effectTag;
|
||||
if ((effectTag & Snapshot) !== NoEffect) {
|
||||
setCurrentDebugFiberInDEV(nextEffect);
|
||||
recordEffect();
|
||||
|
||||
@@ -1828,6 +1829,17 @@ function commitBeforeMutationEffects() {
|
||||
|
||||
resetCurrentDebugFiberInDEV();
|
||||
}
|
||||
if ((effectTag & Passive) !== NoEffect) {
|
||||
// If there are passive effects, schedule a callback to flush at
|
||||
// the earliest opportunity.
|
||||
if (!rootDoesHavePassiveEffects) {
|
||||
rootDoesHavePassiveEffects = true;
|
||||
scheduleCallback(NormalPriority, () => {
|
||||
flushPassiveEffects();
|
||||
return null;
|
||||
});
|
||||
}
|
||||
}
|
||||
nextEffect = nextEffect.nextEffect;
|
||||
}
|
||||
}
|
||||
@@ -1850,17 +1862,6 @@ function commitMutationEffects(root: FiberRoot, renderPriorityLevel) {
|
||||
}
|
||||
}
|
||||
|
||||
if (effectTag & Passive) {
|
||||
// If there are passive effects, schedule a callback to flush them.
|
||||
if (!rootDoesHavePassiveEffects) {
|
||||
rootDoesHavePassiveEffects = true;
|
||||
scheduleCallback(NormalPriority, () => {
|
||||
flushPassiveEffects();
|
||||
return null;
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
// The following switch statement is only concerned about placement,
|
||||
// updates, and deletions. To avoid needing to add a case for every possible
|
||||
// bitmap value, we remove the secondary effects from the effect tag and
|
||||
|
||||
@@ -281,13 +281,30 @@ describe('ReactSchedulerIntegration', () => {
|
||||
});
|
||||
return null;
|
||||
}
|
||||
function CleanupEffect() {
|
||||
useLayoutEffect(() => () => {
|
||||
Scheduler.unstable_yieldValue('Cleanup Layout Effect');
|
||||
Scheduler.unstable_scheduleCallback(NormalPriority, () =>
|
||||
Scheduler.unstable_yieldValue(
|
||||
'Scheduled Normal Callback from Cleanup Layout Effect',
|
||||
),
|
||||
);
|
||||
});
|
||||
return null;
|
||||
}
|
||||
await ReactNoop.act(async () => {
|
||||
ReactNoop.render(<CleanupEffect />);
|
||||
});
|
||||
expect(Scheduler).toHaveYielded([]);
|
||||
await ReactNoop.act(async () => {
|
||||
ReactNoop.render(<Effects />);
|
||||
});
|
||||
expect(Scheduler).toHaveYielded([
|
||||
'Cleanup Layout Effect',
|
||||
'Layout Effect',
|
||||
'Passive Effect',
|
||||
// This callback should be scheduled after the passive effects.
|
||||
// These callbacks should be scheduled after the passive effects.
|
||||
'Scheduled Normal Callback from Cleanup Layout Effect',
|
||||
'Scheduled Normal Callback from Layout Effect',
|
||||
]);
|
||||
});
|
||||
|
||||
Reference in new issue
Block a user