Remove scheduler priority from hydration (#20957)
Ricky committed
Mar 9, 2021 at 17:25 UTC
5d1d1679bf435bf222500f17f5c409daa3f3214a
1 file changed
+4
-9
packages/react-dom/src/events/ReactDOMEventReplaying.js
+4
-9
@@ -16,10 +16,8 @@ import type {LanePriority} from 'react-reconciler/src/ReactFiberLane.old';
16
17
import {enableSelectiveHydration} from 'shared/ReactFeatureFlags';
18
import {
19
- unstable_runWithPriority as runWithPriority,
19
unstable_scheduleCallback as scheduleCallback,
20
unstable_NormalPriority as NormalPriority,
22
- unstable_getCurrentPriorityLevel as getCurrentPriorityLevel,
21
} from 'scheduler';
22
import {
23
getNearestMountedFiber,
@@ -111,7 +109,6 @@ const queuedPointerCaptures: Map<number, QueuedReplayableEvent> = new Map();
109
type QueuedHydrationTarget = {|
110
blockedOn: null | Container | SuspenseInstance,
111
target: Node,
114
- priority: number,
112
lanePriority: LanePriority,
113
|};
114
const queuedExplicitHydrationTargets: Array<QueuedHydrationTarget> = [];
@@ -394,9 +391,7 @@ function attemptExplicitHydrationTarget(
391
// Increase its priority.
392
queuedTarget.blockedOn = instance;
393
attemptHydrationAtPriority(queuedTarget.lanePriority, () => {
397
- runWithPriority(queuedTarget.priority, () => {
398
- attemptHydrationAtCurrentPriority(nearestMounted);
399
- });
394
+ attemptHydrationAtCurrentPriority(nearestMounted);
395
});
396
397
return;
@@ -417,17 +412,17 @@ function attemptExplicitHydrationTarget(
412
413
export function queueExplicitHydrationTarget(target: Node): void {
414
if (enableSelectiveHydration) {
420
- const schedulerPriority = getCurrentPriorityLevel();
415
const updateLanePriority = getCurrentUpdatePriority();
416
const queuedTarget: QueuedHydrationTarget = {
417
blockedOn: null,
418
target: target,
425
- priority: schedulerPriority,
419
lanePriority: updateLanePriority,
420
};
421
let i = 0;
422
for (; i < queuedExplicitHydrationTargets.length; i++) {
430
- if (schedulerPriority <= queuedExplicitHydrationTargets[i].priority) {
423
+ if (
424
+ updateLanePriority <= queuedExplicitHydrationTargets[i].lanePriority
425
+ ) {
426
break;
427
}
428
}