Make remaining empty lanes Transition lanes (#20793)

acdlite · web-flow · commit 114ab52953be · 2021-02-10T18:25:33.000-06:00
Doesn't really have any effect now because we batch everything together
anyway but will allow for more parallelism once we support that.
diff --git a/packages/react-reconciler/src/ReactFiberLane.new.js b/packages/react-reconciler/src/ReactFiberLane.new.js
@@ -87,38 +87,43 @@ export const SyncBatchedLane: Lane = /*                 */ 0b0000000000000000000
 export const InputDiscreteHydrationLane: Lane = /*      */ 0b0000000000000000000000000000100;
 const InputDiscreteLane: Lanes = /*                     */ 0b0000000000000000000000000001000;
 
-const InputContinuousHydrationLane: Lane = /*           */ 0b0000000000000000000000000100000;
-const InputContinuousLane: Lanes = /*                   */ 0b0000000000000000000000001000000;
-
-export const DefaultHydrationLane: Lane = /*            */ 0b0000000000000000000000100000000;
-export const DefaultLane: Lanes = /*                    */ 0b0000000000000000000001000000000;
-
-const TransitionHydrationLane: Lane = /*                */ 0b0000000000000000001000000000000;
-const TransitionLanes: Lanes = /*                       */ 0b0000000001111111110000000000000;
-const TransitionLane1: Lane = /*                        */ 0b0000000000000000010000000000000;
-const TransitionLane2: Lane = /*                        */ 0b0000000000000000100000000000000;
-const TransitionLane3: Lane = /*                        */ 0b0000000000000001000000000000000;
-const TransitionLane4: Lane = /*                        */ 0b0000000000000010000000000000000;
-const TransitionLane5: Lane = /*                        */ 0b0000000000000100000000000000000;
-const TransitionLane6: Lane = /*                        */ 0b0000000000001000000000000000000;
-const TransitionLane7: Lane = /*                        */ 0b0000000000010000000000000000000;
-const TransitionLane8: Lane = /*                        */ 0b0000000000100000000000000000000;
-const TransitionLane9: Lane = /*                        */ 0b0000000001000000000000000000000;
-
-const RetryLanes: Lanes = /*                            */ 0b0000011110000000000000000000000;
-const RetryLane1: Lane = /*                             */ 0b0000000010000000000000000000000;
-const RetryLane2: Lane = /*                             */ 0b0000000100000000000000000000000;
-const RetryLane3: Lane = /*                             */ 0b0000001000000000000000000000000;
-const RetryLane4: Lane = /*                             */ 0b0000010000000000000000000000000;
+const InputContinuousHydrationLane: Lane = /*           */ 0b0000000000000000000000000010000;
+const InputContinuousLane: Lanes = /*                   */ 0b0000000000000000000000000100000;
+
+export const DefaultHydrationLane: Lane = /*            */ 0b0000000000000000000000001000000;
+export const DefaultLane: Lanes = /*                    */ 0b0000000000000000000000010000000;
+
+const TransitionLanes: Lanes = /*                       */ 0b0000000011111111111111100000000;
+const TransitionHydrationLane: Lane = /*                */ 0b0000000000000000000000100000000;
+const TransitionLane1: Lane = /*                        */ 0b0000000000000000000001000000000;
+const TransitionLane2: Lane = /*                        */ 0b0000000000000000000010000000000;
+const TransitionLane3: Lane = /*                        */ 0b0000000000000000000100000000000;
+const TransitionLane4: Lane = /*                        */ 0b0000000000000000001000000000000;
+const TransitionLane5: Lane = /*                        */ 0b0000000000000000010000000000000;
+const TransitionLane6: Lane = /*                        */ 0b0000000000000000100000000000000;
+const TransitionLane7: Lane = /*                        */ 0b0000000000000001000000000000000;
+const TransitionLane8: Lane = /*                        */ 0b0000000000000010000000000000000;
+const TransitionLane9: Lane = /*                        */ 0b0000000000000100000000000000000;
+const TransitionLane10: Lane = /*                       */ 0b0000000000001000000000000000000;
+const TransitionLane11: Lane = /*                       */ 0b0000000000010000000000000000000;
+const TransitionLane12: Lane = /*                       */ 0b0000000000100000000000000000000;
+const TransitionLane13: Lane = /*                       */ 0b0000000001000000000000000000000;
+const TransitionLane14: Lane = /*                       */ 0b0000000010000000000000000000000;
+
+const RetryLanes: Lanes = /*                            */ 0b0000111100000000000000000000000;
+const RetryLane1: Lane = /*                             */ 0b0000000100000000000000000000000;
+const RetryLane2: Lane = /*                             */ 0b0000001000000000000000000000000;
+const RetryLane3: Lane = /*                             */ 0b0000010000000000000000000000000;
+const RetryLane4: Lane = /*                             */ 0b0000100000000000000000000000000;
 
 export const SomeRetryLane: Lane = RetryLane1;
 
-export const SelectiveHydrationLane: Lane = /*          */ 0b0000100000000000000000000000000;
+export const SelectiveHydrationLane: Lane = /*          */ 0b0001000000000000000000000000000;
 
-const NonIdleLanes = /*                                 */ 0b0000111111111111111111111111111;
+const NonIdleLanes = /*                                 */ 0b0001111111111111111111111111111;
 
-export const IdleHydrationLane: Lane = /*               */ 0b0001000000000000000000000000000;
-const IdleLane: Lanes = /*                              */ 0b0010000000000000000000000000000;
+export const IdleHydrationLane: Lane = /*               */ 0b0010000000000000000000000000000;
+const IdleLane: Lanes = /*                              */ 0b0100000000000000000000000000000;
 
 export const OffscreenLane: Lane = /*                   */ 0b1000000000000000000000000000000;
 
@@ -179,6 +184,11 @@ function getHighestPriorityLanes(lanes: Lanes | Lane): Lanes {
     case TransitionLane7:
     case TransitionLane8:
     case TransitionLane9:
+    case TransitionLane10:
+    case TransitionLane11:
+    case TransitionLane12:
+    case TransitionLane13:
+    case TransitionLane14:
       return_highestLanePriority = TransitionPriority;
       return lanes & TransitionLanes;
     case RetryLane1:
diff --git a/packages/react-reconciler/src/ReactFiberLane.old.js b/packages/react-reconciler/src/ReactFiberLane.old.js
@@ -87,38 +87,43 @@ export const SyncBatchedLane: Lane = /*                 */ 0b0000000000000000000
 export const InputDiscreteHydrationLane: Lane = /*      */ 0b0000000000000000000000000000100;
 const InputDiscreteLane: Lanes = /*                     */ 0b0000000000000000000000000001000;
 
-const InputContinuousHydrationLane: Lane = /*           */ 0b0000000000000000000000000100000;
-const InputContinuousLane: Lanes = /*                   */ 0b0000000000000000000000001000000;
-
-export const DefaultHydrationLane: Lane = /*            */ 0b0000000000000000000000100000000;
-export const DefaultLane: Lanes = /*                    */ 0b0000000000000000000001000000000;
-
-const TransitionHydrationLane: Lane = /*                */ 0b0000000000000000001000000000000;
-const TransitionLanes: Lanes = /*                       */ 0b0000000001111111110000000000000;
-const TransitionLane1: Lane = /*                        */ 0b0000000000000000010000000000000;
-const TransitionLane2: Lane = /*                        */ 0b0000000000000000100000000000000;
-const TransitionLane3: Lane = /*                        */ 0b0000000000000001000000000000000;
-const TransitionLane4: Lane = /*                        */ 0b0000000000000010000000000000000;
-const TransitionLane5: Lane = /*                        */ 0b0000000000000100000000000000000;
-const TransitionLane6: Lane = /*                        */ 0b0000000000001000000000000000000;
-const TransitionLane7: Lane = /*                        */ 0b0000000000010000000000000000000;
-const TransitionLane8: Lane = /*                        */ 0b0000000000100000000000000000000;
-const TransitionLane9: Lane = /*                        */ 0b0000000001000000000000000000000;
-
-const RetryLanes: Lanes = /*                            */ 0b0000011110000000000000000000000;
-const RetryLane1: Lane = /*                             */ 0b0000000010000000000000000000000;
-const RetryLane2: Lane = /*                             */ 0b0000000100000000000000000000000;
-const RetryLane3: Lane = /*                             */ 0b0000001000000000000000000000000;
-const RetryLane4: Lane = /*                             */ 0b0000010000000000000000000000000;
+const InputContinuousHydrationLane: Lane = /*           */ 0b0000000000000000000000000010000;
+const InputContinuousLane: Lanes = /*                   */ 0b0000000000000000000000000100000;
+
+export const DefaultHydrationLane: Lane = /*            */ 0b0000000000000000000000001000000;
+export const DefaultLane: Lanes = /*                    */ 0b0000000000000000000000010000000;
+
+const TransitionLanes: Lanes = /*                       */ 0b0000000011111111111111100000000;
+const TransitionHydrationLane: Lane = /*                */ 0b0000000000000000000000100000000;
+const TransitionLane1: Lane = /*                        */ 0b0000000000000000000001000000000;
+const TransitionLane2: Lane = /*                        */ 0b0000000000000000000010000000000;
+const TransitionLane3: Lane = /*                        */ 0b0000000000000000000100000000000;
+const TransitionLane4: Lane = /*                        */ 0b0000000000000000001000000000000;
+const TransitionLane5: Lane = /*                        */ 0b0000000000000000010000000000000;
+const TransitionLane6: Lane = /*                        */ 0b0000000000000000100000000000000;
+const TransitionLane7: Lane = /*                        */ 0b0000000000000001000000000000000;
+const TransitionLane8: Lane = /*                        */ 0b0000000000000010000000000000000;
+const TransitionLane9: Lane = /*                        */ 0b0000000000000100000000000000000;
+const TransitionLane10: Lane = /*                       */ 0b0000000000001000000000000000000;
+const TransitionLane11: Lane = /*                       */ 0b0000000000010000000000000000000;
+const TransitionLane12: Lane = /*                       */ 0b0000000000100000000000000000000;
+const TransitionLane13: Lane = /*                       */ 0b0000000001000000000000000000000;
+const TransitionLane14: Lane = /*                       */ 0b0000000010000000000000000000000;
+
+const RetryLanes: Lanes = /*                            */ 0b0000111100000000000000000000000;
+const RetryLane1: Lane = /*                             */ 0b0000000100000000000000000000000;
+const RetryLane2: Lane = /*                             */ 0b0000001000000000000000000000000;
+const RetryLane3: Lane = /*                             */ 0b0000010000000000000000000000000;
+const RetryLane4: Lane = /*                             */ 0b0000100000000000000000000000000;
 
 export const SomeRetryLane: Lane = RetryLane1;
 
-export const SelectiveHydrationLane: Lane = /*          */ 0b0000100000000000000000000000000;
+export const SelectiveHydrationLane: Lane = /*          */ 0b0001000000000000000000000000000;
 
-const NonIdleLanes = /*                                 */ 0b0000111111111111111111111111111;
+const NonIdleLanes = /*                                 */ 0b0001111111111111111111111111111;
 
-export const IdleHydrationLane: Lane = /*               */ 0b0001000000000000000000000000000;
-const IdleLane: Lanes = /*                              */ 0b0010000000000000000000000000000;
+export const IdleHydrationLane: Lane = /*               */ 0b0010000000000000000000000000000;
+const IdleLane: Lanes = /*                              */ 0b0100000000000000000000000000000;
 
 export const OffscreenLane: Lane = /*                   */ 0b1000000000000000000000000000000;
 
@@ -179,6 +184,11 @@ function getHighestPriorityLanes(lanes: Lanes | Lane): Lanes {
     case TransitionLane7:
     case TransitionLane8:
     case TransitionLane9:
+    case TransitionLane10:
+    case TransitionLane11:
+    case TransitionLane12:
+    case TransitionLane13:
+    case TransitionLane14:
       return_highestLanePriority = TransitionPriority;
       return lanes & TransitionLanes;
     case RetryLane1:
diff --git a/packages/react-reconciler/src/__tests__/DebugTracing-test.internal.js b/packages/react-reconciler/src/__tests__/DebugTracing-test.internal.js
@@ -16,6 +16,9 @@ describe('DebugTracing', () => {
 
   let logs;
 
+  const DEFAULT_LANE_STRING = '0b0000000000000000000000010000000';
+  const RETRY_LANE_STRING = '0b0000000100000000000000000000000';
+
   beforeEach(() => {
     jest.resetModules();
 
@@ -129,9 +132,9 @@ describe('DebugTracing', () => {
     expect(Scheduler).toFlushUntilNextPaint([]);
 
     expect(logs).toEqual([
-      'group: ⚛️ render (0b0000000010000000000000000000000)',
+      `group: ⚛️ render (${RETRY_LANE_STRING})`,
       'log: <Example/>',
-      'groupEnd: ⚛️ render (0b0000000010000000000000000000000)',
+      `groupEnd: ⚛️ render (${RETRY_LANE_STRING})`,
     ]);
   });
 
@@ -158,9 +161,9 @@ describe('DebugTracing', () => {
     expect(Scheduler).toFlushUntilNextPaint([]);
 
     expect(logs).toEqual([
-      'group: ⚛️ render (0b0000000000000000000001000000000)',
+      `group: ⚛️ render (${DEFAULT_LANE_STRING})`,
       'log: ⚛️ Example suspended',
-      'groupEnd: ⚛️ render (0b0000000000000000000001000000000)',
+      `groupEnd: ⚛️ render (${DEFAULT_LANE_STRING})`,
     ]);
 
     logs.splice(0);
@@ -199,19 +202,19 @@ describe('DebugTracing', () => {
     expect(Scheduler).toFlushUntilNextPaint([]);
 
     expect(logs).toEqual([
-      'group: ⚛️ render (0b0000000000000000000001000000000)',
+      `group: ⚛️ render (${DEFAULT_LANE_STRING})`,
       'log: <Wrapper/>',
-      'groupEnd: ⚛️ render (0b0000000000000000000001000000000)',
+      `groupEnd: ⚛️ render (${DEFAULT_LANE_STRING})`,
     ]);
 
     logs.splice(0);
 
     expect(Scheduler).toFlushUntilNextPaint([]);
 
     expect(logs).toEqual([
-      'group: ⚛️ render (0b0000000010000000000000000000000)',
+      `group: ⚛️ render (${RETRY_LANE_STRING})`,
       'log: <Example/>',
-      'groupEnd: ⚛️ render (0b0000000010000000000000000000000)',
+      `groupEnd: ⚛️ render (${RETRY_LANE_STRING})`,
     ]);
   });
 
@@ -241,11 +244,11 @@ describe('DebugTracing', () => {
     expect(Scheduler).toFlushUntilNextPaint([]);
 
     expect(logs).toEqual([
-      'group: ⚛️ commit (0b0000000000000000000001000000000)',
-      'group: ⚛️ layout effects (0b0000000000000000000001000000000)',
+      `group: ⚛️ commit (${DEFAULT_LANE_STRING})`,
+      `group: ⚛️ layout effects (${DEFAULT_LANE_STRING})`,
       'log: ⚛️ Example updated state (0b0000000000000000000000000000001)',
-      'groupEnd: ⚛️ layout effects (0b0000000000000000000001000000000)',
-      'groupEnd: ⚛️ commit (0b0000000000000000000001000000000)',
+      `groupEnd: ⚛️ layout effects (${DEFAULT_LANE_STRING})`,
+      `groupEnd: ⚛️ commit (${DEFAULT_LANE_STRING})`,
     ]);
   });
 
@@ -277,10 +280,10 @@ describe('DebugTracing', () => {
     }).toErrorDev('Cannot update during an existing state transition');
 
     expect(logs).toEqual([
-      'group: ⚛️ render (0b0000000000000000000001000000000)',
-      'log: ⚛️ Example updated state (0b0000000000000000000001000000000)',
-      'log: ⚛️ Example updated state (0b0000000000000000000001000000000)',
-      'groupEnd: ⚛️ render (0b0000000000000000000001000000000)',
+      `group: ⚛️ render (${DEFAULT_LANE_STRING})`,
+      `log: ⚛️ Example updated state (${DEFAULT_LANE_STRING})`,
+      `log: ⚛️ Example updated state (${DEFAULT_LANE_STRING})`,
+      `groupEnd: ⚛️ render (${DEFAULT_LANE_STRING})`,
     ]);
   });
 
@@ -308,11 +311,11 @@ describe('DebugTracing', () => {
     expect(Scheduler).toFlushUntilNextPaint([]);
 
     expect(logs).toEqual([
-      'group: ⚛️ commit (0b0000000000000000000001000000000)',
-      'group: ⚛️ layout effects (0b0000000000000000000001000000000)',
+      `group: ⚛️ commit (${DEFAULT_LANE_STRING})`,
+      `group: ⚛️ layout effects (${DEFAULT_LANE_STRING})`,
       'log: ⚛️ Example updated state (0b0000000000000000000000000000001)',
-      'groupEnd: ⚛️ layout effects (0b0000000000000000000001000000000)',
-      'groupEnd: ⚛️ commit (0b0000000000000000000001000000000)',
+      `groupEnd: ⚛️ layout effects (${DEFAULT_LANE_STRING})`,
+      `groupEnd: ⚛️ commit (${DEFAULT_LANE_STRING})`,
     ]);
   });
 
@@ -335,9 +338,9 @@ describe('DebugTracing', () => {
       );
     });
     expect(logs).toEqual([
-      'group: ⚛️ passive effects (0b0000000000000000000001000000000)',
-      'log: ⚛️ Example updated state (0b0000000000000000000001000000000)',
-      'groupEnd: ⚛️ passive effects (0b0000000000000000000001000000000)',
+      `group: ⚛️ passive effects (${DEFAULT_LANE_STRING})`,
+      `log: ⚛️ Example updated state (${DEFAULT_LANE_STRING})`,
+      `groupEnd: ⚛️ passive effects (${DEFAULT_LANE_STRING})`,
     ]);
   });
 
@@ -361,10 +364,10 @@ describe('DebugTracing', () => {
     });
 
     expect(logs).toEqual([
-      'group: ⚛️ render (0b0000000000000000000001000000000)',
-      'log: ⚛️ Example updated state (0b0000000000000000000001000000000)',
-      'log: ⚛️ Example updated state (0b0000000000000000000001000000000)', // debugRenderPhaseSideEffectsForStrictMode
-      'groupEnd: ⚛️ render (0b0000000000000000000001000000000)',
+      `group: ⚛️ render (${DEFAULT_LANE_STRING})`,
+      `log: ⚛️ Example updated state (${DEFAULT_LANE_STRING})`,
+      `log: ⚛️ Example updated state (${DEFAULT_LANE_STRING})`, // debugRenderPhaseSideEffectsForStrictMode
+      `groupEnd: ⚛️ render (${DEFAULT_LANE_STRING})`,
     ]);
   });
 
@@ -389,9 +392,9 @@ describe('DebugTracing', () => {
     expect(Scheduler).toFlushUntilNextPaint([]);
 
     expect(logs).toEqual([
-      'group: ⚛️ render (0b0000000000000000000001000000000)',
+      `group: ⚛️ render (${DEFAULT_LANE_STRING})`,
       'log: Hello from user code',
-      'groupEnd: ⚛️ render (0b0000000000000000000001000000000)',
+      `groupEnd: ⚛️ render (${DEFAULT_LANE_STRING})`,
     ]);
   });
 
diff --git a/packages/react-reconciler/src/__tests__/SchedulingProfiler-test.internal.js b/packages/react-reconciler/src/__tests__/SchedulingProfiler-test.internal.js
