Skip to content

Commit 95746a3

Browse files
committed
Remove LanePriority from getBumpedLaneForHydration (facebook#21086)
I'm removing all uses of LanePriority so I can delete it.
1 parent 60f378f commit 95746a3

File tree

2 files changed

+58
-50
lines changed

2 files changed

+58
-50
lines changed

packages/react-reconciler/src/ReactFiberLane.new.js

+29-25
Original file line numberDiff line numberDiff line change
@@ -757,43 +757,47 @@ export function getBumpedLaneForHydration(
757757
root: FiberRoot,
758758
renderLanes: Lanes,
759759
): Lane {
760-
getHighestPriorityLanes(renderLanes);
761-
const highestLanePriority = return_highestLanePriority;
760+
const renderLane = getHighestPriorityLane(renderLanes);
762761

763762
let lane;
764-
switch (highestLanePriority) {
765-
case SyncLanePriority:
766-
lane = NoLane;
767-
break;
768-
case InputContinuousLanePriority:
763+
switch (renderLane) {
764+
case InputContinuousLane:
769765
lane = InputContinuousHydrationLane;
770766
break;
771-
case DefaultHydrationLanePriority:
772-
case DefaultLanePriority:
767+
case DefaultLane:
773768
lane = DefaultHydrationLane;
774769
break;
775-
case TransitionHydrationPriority:
776-
case TransitionPriority:
777-
lane = TransitionHydrationLane;
778-
break;
779-
case RetryLanePriority:
780-
// Shouldn't be reachable under normal circumstances, so there's no
781-
// dedicated lane for retry priority. Use the one for long transitions.
770+
case TransitionLane1:
771+
case TransitionLane2:
772+
case TransitionLane3:
773+
case TransitionLane4:
774+
case TransitionLane5:
775+
case TransitionLane6:
776+
case TransitionLane7:
777+
case TransitionLane8:
778+
case TransitionLane9:
779+
case TransitionLane10:
780+
case TransitionLane11:
781+
case TransitionLane12:
782+
case TransitionLane13:
783+
case TransitionLane14:
784+
case TransitionLane15:
785+
case TransitionLane16:
786+
case RetryLane1:
787+
case RetryLane2:
788+
case RetryLane3:
789+
case RetryLane4:
790+
case RetryLane5:
782791
lane = TransitionHydrationLane;
783792
break;
784-
case SelectiveHydrationLanePriority:
785-
lane = SelectiveHydrationLane;
786-
break;
787-
case IdleHydrationLanePriority:
788-
case IdleLanePriority:
793+
case IdleLane:
789794
lane = IdleHydrationLane;
790795
break;
791-
case OffscreenLanePriority:
792-
case NoLanePriority:
796+
default:
797+
// Everything else is already either a hydration lane, or shouldn't
798+
// be retried at a hydration lane.
793799
lane = NoLane;
794800
break;
795-
default:
796-
invariant(false, 'Invalid lane: %s. This is a bug in React.', lane);
797801
}
798802

799803
// Check if the lane we chose is suspended. If so, that indicates that we

packages/react-reconciler/src/ReactFiberLane.old.js

+29-25
Original file line numberDiff line numberDiff line change
@@ -757,43 +757,47 @@ export function getBumpedLaneForHydration(
757757
root: FiberRoot,
758758
renderLanes: Lanes,
759759
): Lane {
760-
getHighestPriorityLanes(renderLanes);
761-
const highestLanePriority = return_highestLanePriority;
760+
const renderLane = getHighestPriorityLane(renderLanes);
762761

763762
let lane;
764-
switch (highestLanePriority) {
765-
case SyncLanePriority:
766-
lane = NoLane;
767-
break;
768-
case InputContinuousLanePriority:
763+
switch (renderLane) {
764+
case InputContinuousLane:
769765
lane = InputContinuousHydrationLane;
770766
break;
771-
case DefaultHydrationLanePriority:
772-
case DefaultLanePriority:
767+
case DefaultLane:
773768
lane = DefaultHydrationLane;
774769
break;
775-
case TransitionHydrationPriority:
776-
case TransitionPriority:
777-
lane = TransitionHydrationLane;
778-
break;
779-
case RetryLanePriority:
780-
// Shouldn't be reachable under normal circumstances, so there's no
781-
// dedicated lane for retry priority. Use the one for long transitions.
770+
case TransitionLane1:
771+
case TransitionLane2:
772+
case TransitionLane3:
773+
case TransitionLane4:
774+
case TransitionLane5:
775+
case TransitionLane6:
776+
case TransitionLane7:
777+
case TransitionLane8:
778+
case TransitionLane9:
779+
case TransitionLane10:
780+
case TransitionLane11:
781+
case TransitionLane12:
782+
case TransitionLane13:
783+
case TransitionLane14:
784+
case TransitionLane15:
785+
case TransitionLane16:
786+
case RetryLane1:
787+
case RetryLane2:
788+
case RetryLane3:
789+
case RetryLane4:
790+
case RetryLane5:
782791
lane = TransitionHydrationLane;
783792
break;
784-
case SelectiveHydrationLanePriority:
785-
lane = SelectiveHydrationLane;
786-
break;
787-
case IdleHydrationLanePriority:
788-
case IdleLanePriority:
793+
case IdleLane:
789794
lane = IdleHydrationLane;
790795
break;
791-
case OffscreenLanePriority:
792-
case NoLanePriority:
796+
default:
797+
// Everything else is already either a hydration lane, or shouldn't
798+
// be retried at a hydration lane.
793799
lane = NoLane;
794800
break;
795-
default:
796-
invariant(false, 'Invalid lane: %s. This is a bug in React.', lane);
797801
}
798802

799803
// Check if the lane we chose is suspended. If so, that indicates that we

0 commit comments

Comments
 (0)