Skip to content

Commit f483bc2

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

File tree

2 files changed

+58
-50
lines changed

2 files changed

+58
-50
lines changed

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

Lines changed: 29 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -751,43 +751,47 @@ export function getBumpedLaneForHydration(
751751
root: FiberRoot,
752752
renderLanes: Lanes,
753753
): Lane {
754-
getHighestPriorityLanes(renderLanes);
755-
const highestLanePriority = return_highestLanePriority;
754+
const renderLane = getHighestPriorityLane(renderLanes);
756755

757756
let lane;
758-
switch (highestLanePriority) {
759-
case SyncLanePriority:
760-
lane = NoLane;
761-
break;
762-
case InputContinuousLanePriority:
757+
switch (renderLane) {
758+
case InputContinuousLane:
763759
lane = InputContinuousHydrationLane;
764760
break;
765-
case DefaultHydrationLanePriority:
766-
case DefaultLanePriority:
761+
case DefaultLane:
767762
lane = DefaultHydrationLane;
768763
break;
769-
case TransitionHydrationPriority:
770-
case TransitionPriority:
771-
lane = TransitionHydrationLane;
772-
break;
773-
case RetryLanePriority:
774-
// Shouldn't be reachable under normal circumstances, so there's no
775-
// dedicated lane for retry priority. Use the one for long transitions.
764+
case TransitionLane1:
765+
case TransitionLane2:
766+
case TransitionLane3:
767+
case TransitionLane4:
768+
case TransitionLane5:
769+
case TransitionLane6:
770+
case TransitionLane7:
771+
case TransitionLane8:
772+
case TransitionLane9:
773+
case TransitionLane10:
774+
case TransitionLane11:
775+
case TransitionLane12:
776+
case TransitionLane13:
777+
case TransitionLane14:
778+
case TransitionLane15:
779+
case TransitionLane16:
780+
case RetryLane1:
781+
case RetryLane2:
782+
case RetryLane3:
783+
case RetryLane4:
784+
case RetryLane5:
776785
lane = TransitionHydrationLane;
777786
break;
778-
case SelectiveHydrationLanePriority:
779-
lane = SelectiveHydrationLane;
780-
break;
781-
case IdleHydrationLanePriority:
782-
case IdleLanePriority:
787+
case IdleLane:
783788
lane = IdleHydrationLane;
784789
break;
785-
case OffscreenLanePriority:
786-
case NoLanePriority:
790+
default:
791+
// Everything else is already either a hydration lane, or shouldn't
792+
// be retried at a hydration lane.
787793
lane = NoLane;
788794
break;
789-
default:
790-
invariant(false, 'Invalid lane: %s. This is a bug in React.', lane);
791795
}
792796

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

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

Lines changed: 29 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -751,43 +751,47 @@ export function getBumpedLaneForHydration(
751751
root: FiberRoot,
752752
renderLanes: Lanes,
753753
): Lane {
754-
getHighestPriorityLanes(renderLanes);
755-
const highestLanePriority = return_highestLanePriority;
754+
const renderLane = getHighestPriorityLane(renderLanes);
756755

757756
let lane;
758-
switch (highestLanePriority) {
759-
case SyncLanePriority:
760-
lane = NoLane;
761-
break;
762-
case InputContinuousLanePriority:
757+
switch (renderLane) {
758+
case InputContinuousLane:
763759
lane = InputContinuousHydrationLane;
764760
break;
765-
case DefaultHydrationLanePriority:
766-
case DefaultLanePriority:
761+
case DefaultLane:
767762
lane = DefaultHydrationLane;
768763
break;
769-
case TransitionHydrationPriority:
770-
case TransitionPriority:
771-
lane = TransitionHydrationLane;
772-
break;
773-
case RetryLanePriority:
774-
// Shouldn't be reachable under normal circumstances, so there's no
775-
// dedicated lane for retry priority. Use the one for long transitions.
764+
case TransitionLane1:
765+
case TransitionLane2:
766+
case TransitionLane3:
767+
case TransitionLane4:
768+
case TransitionLane5:
769+
case TransitionLane6:
770+
case TransitionLane7:
771+
case TransitionLane8:
772+
case TransitionLane9:
773+
case TransitionLane10:
774+
case TransitionLane11:
775+
case TransitionLane12:
776+
case TransitionLane13:
777+
case TransitionLane14:
778+
case TransitionLane15:
779+
case TransitionLane16:
780+
case RetryLane1:
781+
case RetryLane2:
782+
case RetryLane3:
783+
case RetryLane4:
784+
case RetryLane5:
776785
lane = TransitionHydrationLane;
777786
break;
778-
case SelectiveHydrationLanePriority:
779-
lane = SelectiveHydrationLane;
780-
break;
781-
case IdleHydrationLanePriority:
782-
case IdleLanePriority:
787+
case IdleLane:
783788
lane = IdleHydrationLane;
784789
break;
785-
case OffscreenLanePriority:
786-
case NoLanePriority:
790+
default:
791+
// Everything else is already either a hydration lane, or shouldn't
792+
// be retried at a hydration lane.
787793
lane = NoLane;
788794
break;
789-
default:
790-
invariant(false, 'Invalid lane: %s. This is a bug in React.', lane);
791795
}
792796

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

0 commit comments

Comments
 (0)