Remove distinction between long, short transitions

We're removing the `timeoutMs` option, so there's no longer any distinction between "short" and "long" transitions. They're all treated the same. This commit doesn't remove `timeoutMs` yet, only combines the internal priority levels.

Author: acdlite

packages/react-reconciler/src/ReactFiberLane.js

@@ -43,23 +43,20 @@ import {
  NoPriority as NoSchedulerPriority,
 } from './SchedulerWithReactIntegration.new';
 
-export const SyncLanePriority: LanePriority = 17;
-export const SyncBatchedLanePriority: LanePriority = 16;
+export const SyncLanePriority: LanePriority = 15;
+export const SyncBatchedLanePriority: LanePriority = 14;
 
-const InputDiscreteHydrationLanePriority: LanePriority = 15;
-export const InputDiscreteLanePriority: LanePriority = 14;
+const InputDiscreteHydrationLanePriority: LanePriority = 13;
+export const InputDiscreteLanePriority: LanePriority = 12;
 
-const InputContinuousHydrationLanePriority: LanePriority = 13;
-export const InputContinuousLanePriority: LanePriority = 12;
+const InputContinuousHydrationLanePriority: LanePriority = 11;
+export const InputContinuousLanePriority: LanePriority = 10;
 
-const DefaultHydrationLanePriority: LanePriority = 11;
-export const DefaultLanePriority: LanePriority = 10;
+const DefaultHydrationLanePriority: LanePriority = 9;
+export const DefaultLanePriority: LanePriority = 8;
 
-const TransitionShortHydrationLanePriority: LanePriority = 9;
-export const TransitionShortLanePriority: LanePriority = 8;
-
-const TransitionLongHydrationLanePriority: LanePriority = 7;
-export const TransitionLongLanePriority: LanePriority = 6;
+const TransitionHydrationPriority: LanePriority = 7;
+export const TransitionPriority: LanePriority = 6;
 
 const RetryLanePriority: LanePriority = 5;
 
@@ -89,11 +86,8 @@ const InputContinuousLanes: Lanes = /* */ 0b0000000000000000000
 export const DefaultHydrationLane: Lane = /* */ 0b0000000000000000000000100000000;
 export const DefaultLanes: Lanes = /* */ 0b0000000000000000000111000000000;
 
-const TransitionShortHydrationLane: Lane = /* */ 0b0000000000000000001000000000000;
-const TransitionShortLanes: Lanes = /* */ 0b0000000000000011110000000000000;
-
-const TransitionLongHydrationLane: Lane = /* */ 0b0000000000000100000000000000000;
-const TransitionLongLanes: Lanes = /* */ 0b0000000001111000000000000000000;
+const TransitionHydrationLane: Lane = /* */ 0b0000000000000000001000000000000;
+const TransitionLanes: Lanes = /* */ 0b0000000001111111110000000000000;
 
 const RetryLanes: Lanes = /* */ 0b0000011110000000000000000000000;
 
@@ -160,23 +154,14 @@ function getHighestPriorityLanes(lanes: Lanes | Lane): Lanes {
  return_highestLanePriority = DefaultLanePriority;
  return defaultLanes;
  }
- if ((lanes & TransitionShortHydrationLane) !== NoLanes) {
- return_highestLanePriority = TransitionShortHydrationLanePriority;
- return TransitionShortHydrationLane;
- }
- const transitionShortLanes = TransitionShortLanes & lanes;
- if (transitionShortLanes !== NoLanes) {
- return_highestLanePriority = TransitionShortLanePriority;
- return transitionShortLanes;
+ if ((lanes & TransitionHydrationLane) !== NoLanes) {
+ return_highestLanePriority = TransitionHydrationPriority;
+ return TransitionHydrationLane;
  }
- if ((lanes & TransitionLongHydrationLane) !== NoLanes) {
- return_highestLanePriority = TransitionLongHydrationLanePriority;
- return TransitionLongHydrationLane;
- }
- const transitionLongLanes = TransitionLongLanes & lanes;
- if (transitionLongLanes !== NoLanes) {
- return_highestLanePriority = TransitionLongLanePriority;
- return transitionLongLanes;
+ const transitionLanes = TransitionLanes & lanes;
+ if (transitionLanes !== NoLanes) {
+ return_highestLanePriority = TransitionPriority;
+ return transitionLanes;
  }
  const retryLanes = RetryLanes & lanes;
  if (retryLanes !== NoLanes) {
@@ -241,10 +226,8 @@ export function lanePriorityToSchedulerPriority(
  return UserBlockingSchedulerPriority;
  case DefaultHydrationLanePriority:
  case DefaultLanePriority:
- case TransitionShortHydrationLanePriority:
- case TransitionShortLanePriority:
- case TransitionLongHydrationLanePriority:
- case TransitionLongLanePriority:
+ case TransitionHydrationPriority:
+ case TransitionPriority:
  case SelectiveHydrationLanePriority:
  case RetryLanePriority:
  return NormalSchedulerPriority;
@@ -402,7 +385,7 @@ function computeExpirationTime(lane: Lane, currentTime: number) {
  if (priority >= InputContinuousLanePriority) {
  // User interactions should expire slightly more quickly.
  return currentTime + 1000;
- } else if (priority >= TransitionLongLanePriority) {
+ } else if (priority >= TransitionPriority) {
  return currentTime + 5000;
  } else {
  // Anything idle priority or lower should never expire.
@@ -513,9 +496,7 @@ export function findUpdateLane(
  if (lane === NoLane) {
  // If all the default lanes are already being worked on, look for a
  // lane in the transition range.
- lane = pickArbitraryLane(
- (TransitionShortLanes | TransitionLongLanes) & ~wipLanes,
- );
+ lane = pickArbitraryLane(TransitionLanes & ~wipLanes);
  if (lane === NoLane) {
  // All the transition lanes are taken, too. This should be very
  // rare, but as a last resort, pick a default lane. This will have
@@ -525,8 +506,7 @@ export function findUpdateLane(
  }
  return lane;
  }
- case TransitionShortLanePriority: // Should be handled by findTransitionLane instead
- case TransitionLongLanePriority:
+ case TransitionPriority: // Should be handled by findTransitionLane instead
  case RetryLanePriority: // Should be handled by findRetryLane instead
  break;
  case IdleLanePriority:
@@ -548,48 +528,21 @@ export function findUpdateLane(
 
 // To ensure consistency across multiple updates in the same event, this should
 // be pure function, so that it always returns the same lane for given inputs.
-export function findTransitionLane(
- lanePriority: LanePriority,
- wipLanes: Lanes,
- pendingLanes: Lanes,
-): Lane {
- if (lanePriority === TransitionShortLanePriority) {
- // First look for lanes that are completely unclaimed, i.e. have no
- // pending work.
- let lane = pickArbitraryLane(TransitionShortLanes & ~pendingLanes);
- if (lane === NoLane) {
- // If all lanes have pending work, look for a lane that isn't currently
- // being worked on.
- lane = pickArbitraryLane(TransitionShortLanes & ~wipLanes);
- if (lane === NoLane) {
- // If everything is being worked on, pick any lane. This has the
- // effect of interrupting the current work-in-progress.
- lane = pickArbitraryLane(TransitionShortLanes);
- }
- }
- return lane;
- }
- if (lanePriority === TransitionLongLanePriority) {
- // First look for lanes that are completely unclaimed, i.e. have no
- // pending work.
- let lane = pickArbitraryLane(TransitionLongLanes & ~pendingLanes);
+export function findTransitionLane(wipLanes: Lanes, pendingLanes: Lanes): Lane {
+ // First look for lanes that are completely unclaimed, i.e. have no
+ // pending work.
+ let lane = pickArbitraryLane(TransitionLanes & ~pendingLanes);
+ if (lane === NoLane) {
+ // If all lanes have pending work, look for a lane that isn't currently
+ // being worked on.
+ lane = pickArbitraryLane(TransitionLanes & ~wipLanes);
  if (lane === NoLane) {
- // If all lanes have pending work, look for a lane that isn't currently
- // being worked on.
- lane = pickArbitraryLane(TransitionLongLanes & ~wipLanes);
- if (lane === NoLane) {
- // If everything is being worked on, pick any lane. This has the
- // effect of interrupting the current work-in-progress.
- lane = pickArbitraryLane(TransitionLongLanes);
- }
+ // If everything is being worked on, pick any lane. This has the
+ // effect of interrupting the current work-in-progress.
+ lane = pickArbitraryLane(TransitionLanes);
  }
- return lane;
  }
- invariant(
- false,
- 'Invalid transition priority: %s. This is a bug in React.',
- lanePriority,
- );
+ return lane;
 }
 
 // To ensure consistency across multiple updates in the same event, this should
@@ -816,18 +769,14 @@ export function getBumpedLaneForHydration(
  case DefaultLanePriority:
  lane = DefaultHydrationLane;
  break;
- case TransitionShortHydrationLanePriority:
- case TransitionShortLanePriority:
- lane = TransitionShortHydrationLane;
- break;
- case TransitionLongHydrationLanePriority:
- case TransitionLongLanePriority:
- lane = TransitionLongHydrationLane;
+ case TransitionHydrationPriority:
+ case TransitionPriority:
+ lane = TransitionHydrationLane;
  break;
  case RetryLanePriority:
  // Shouldn't be reachable under normal circumstances, so there's no
  // dedicated lane for retry priority. Use the one for long transitions.
- lane = TransitionLongHydrationLane;
+ lane = TransitionHydrationLane;
  break;
  case SelectiveHydrationLanePriority:
  lane = SelectiveHydrationLane;

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

@@ -153,8 +153,6 @@ import {
  SyncLanePriority,
  SyncBatchedLanePriority,
  InputDiscreteLanePriority,
- TransitionShortLanePriority,
- TransitionLongLanePriority,
  DefaultLanePriority,
  NoLanes,
  NoLane,
@@ -457,24 +455,13 @@ export function requestUpdateLane(
  // Use the size of the timeout as a heuristic to prioritize shorter
  // transitions over longer ones.
  // TODO: This will coerce numbers larger than 31 bits to 0.
- const timeoutMs = suspenseConfig.timeoutMs;
- const transitionLanePriority =
- timeoutMs === undefined || (timeoutMs | 0) < 10000
- ? TransitionShortLanePriority
- : TransitionLongLanePriority;
-
  if (currentEventPendingLanes !== NoLanes) {
  currentEventPendingLanes =
  mostRecentlyUpdatedRoot !== null
  ? mostRecentlyUpdatedRoot.pendingLanes
  : NoLanes;
  }
-
- return findTransitionLane(
- transitionLanePriority,
- currentEventWipLanes,
- currentEventPendingLanes,
- );
+ return findTransitionLane(currentEventWipLanes, currentEventPendingLanes);
  }
 
  // TODO: Remove this dependency on the Scheduler priority.

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

@@ -139,8 +139,6 @@ import {
  SyncLanePriority,
  SyncBatchedLanePriority,
  InputDiscreteLanePriority,
- TransitionShortLanePriority,
- TransitionLongLanePriority,
  DefaultLanePriority,
  NoLanes,
  NoLane,
@@ -445,24 +443,13 @@ export function requestUpdateLane(
  // Use the size of the timeout as a heuristic to prioritize shorter
  // transitions over longer ones.
  // TODO: This will coerce numbers larger than 31 bits to 0.
- const timeoutMs = suspenseConfig.timeoutMs;
- const transitionLanePriority =
- timeoutMs === undefined || (timeoutMs | 0) < 10000
- ? TransitionShortLanePriority
- : TransitionLongLanePriority;
-
  if (currentEventPendingLanes !== NoLanes) {
  currentEventPendingLanes =
  mostRecentlyUpdatedRoot !== null
  ? mostRecentlyUpdatedRoot.pendingLanes
  : NoLanes;
  }
-
- return findTransitionLane(
- transitionLanePriority,
- currentEventWipLanes,
- currentEventPendingLanes,
- );
+ return findTransitionLane(currentEventWipLanes, currentEventPendingLanes);
  }
 
  // TODO: Remove this dependency on the Scheduler priority.

packages/react-reconciler/src/__tests__/ReactSuspenseWithNoopRenderer-test.js

@@ -4030,9 +4030,6 @@ describe('ReactSuspenseWithNoopRenderer', () => {
  // Neither is resolved yet.
  'Pending...',
  '',
- 'Pending...',
- 'Suspend! [a]',
- 'Loading...',
  'Suspend! [b]',
  'Loading...',
  ]);

scripts/error-codes/codes.json

@@ -348,7 +348,6 @@
  "356": "Could not read the cache.",
  "357": "The current renderer does not support React Scopes. This error is likely caused by a bug in React. Please file an issue.",
  "358": "Invalid update priority: %s. This is a bug in React.",
- "359": "Invalid transition priority: %s. This is a bug in React.",
  "360": "Invalid lane: %s. This is a bug in React.",
  "361": "The current renderer does not support test selectors. This error is likely caused by a bug in React. Please file an issue.",
  "362": "Could not find React container within specified host subtree.",