Move schedulerPriorityToLanePriority

facebook · Mar 8, 2021 · 7609723 · 7609723
1 parent 3b739ec
commit 7609723
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 47 deletions.
diff --git a/packages/react-dom/src/events/ReactDOMEventListener.js b/packages/react-dom/src/events/ReactDOMEventListener.js
@@ -8,7 +8,10 @@
  */
 
 import type {AnyNativeEvent} from '../events/PluginModuleType';
-import type {FiberRoot} from 'react-reconciler/src/ReactInternalTypes';
+import type {
+ FiberRoot,
+ ReactPriorityLevel,
+} from 'react-reconciler/src/ReactInternalTypes';
 import type {Container, SuspenseInstance} from '../client/ReactDOMHostConfig';
 import type {DOMEventName} from '../events/DOMEventNames';
 
@@ -50,18 +53,27 @@ import {
  DefaultLanePriority as DefaultLanePriority_old,
  getCurrentUpdateLanePriority as getCurrentUpdateLanePriority_old,
  setCurrentUpdateLanePriority as setCurrentUpdateLanePriority_old,
- schedulerPriorityToLanePriority as schedulerPriorityToLanePriority_old,
 } from 'react-reconciler/src/ReactFiberLane.old';
 import {
  InputDiscreteLanePriority as InputDiscreteLanePriority_new,
  InputContinuousLanePriority as InputContinuousLanePriority_new,
  DefaultLanePriority as DefaultLanePriority_new,
  getCurrentUpdateLanePriority as getCurrentUpdateLanePriority_new,
  setCurrentUpdateLanePriority as setCurrentUpdateLanePriority_new,
- schedulerPriorityToLanePriority as schedulerPriorityToLanePriority_new,
+ SyncLanePriority,
+ IdleLanePriority,
+ NoLanePriority,
 } from 'react-reconciler/src/ReactFiberLane.new';
 import {getCurrentPriorityLevel as getCurrentPriorityLevel_old} from 'react-reconciler/src/SchedulerWithReactIntegration.old';
-import {getCurrentPriorityLevel as getCurrentPriorityLevel_new} from 'react-reconciler/src/SchedulerWithReactIntegration.new';
+import {
+ getCurrentPriorityLevel as getCurrentPriorityLevel_new,
+ IdlePriority as IdleSchedulerPriority,
+ ImmediatePriority as ImmediateSchedulerPriority,
+ LowPriority as LowSchedulerPriority,
+ NormalPriority as NormalSchedulerPriority,
+ UserBlockingPriority as UserBlockingSchedulerPriority,
+} from 'react-reconciler/src/SchedulerWithReactIntegration.new';
+import type {LanePriority} from 'react-reconciler/src/ReactFiberLane.new';
 
 const InputDiscreteLanePriority = enableNewReconciler
  ? InputDiscreteLanePriority_new
@@ -78,13 +90,29 @@ const getCurrentUpdateLanePriority = enableNewReconciler
 const setCurrentUpdateLanePriority = enableNewReconciler
  ? setCurrentUpdateLanePriority_new
  : setCurrentUpdateLanePriority_old;
-const schedulerPriorityToLanePriority = enableNewReconciler
- ? schedulerPriorityToLanePriority_new
- : schedulerPriorityToLanePriority_old;
 const getCurrentPriorityLevel = enableNewReconciler
  ? getCurrentPriorityLevel_new
  : getCurrentPriorityLevel_old;
 
+function schedulerPriorityToLanePriority(
+ schedulerPriorityLevel: ReactPriorityLevel,
+): LanePriority {
+ switch (schedulerPriorityLevel) {
+ case ImmediateSchedulerPriority:
+ return SyncLanePriority;
+ case UserBlockingSchedulerPriority:
+ return InputContinuousLanePriority;
+ case NormalSchedulerPriority:
+ case LowSchedulerPriority:
+ // TODO: Handle LowSchedulerPriority, somehow. Maybe the same lane as hydration.
+ return DefaultLanePriority;
+ case IdleSchedulerPriority:
+ return IdleLanePriority;
+ default:
+ return NoLanePriority;
+ }
+}
+
 // TODO: can we stop exporting these?
 export let _enabled = true;
 

diff --git a/packages/react-reconciler/src/ReactFiberLane.new.js b/packages/react-reconciler/src/ReactFiberLane.new.js
@@ -42,7 +42,6 @@ import {
  ImmediatePriority as ImmediateSchedulerPriority,
  UserBlockingPriority as UserBlockingSchedulerPriority,
  NormalPriority as NormalSchedulerPriority,
- LowPriority as LowSchedulerPriority,
  IdlePriority as IdleSchedulerPriority,
  NoPriority as NoSchedulerPriority,
 } from './SchedulerWithReactIntegration.new';
@@ -275,25 +274,6 @@ function getHighestPriorityLanes(lanes: Lanes | Lane): Lanes {
  }
 }
 
-export function schedulerPriorityToLanePriority(
- schedulerPriorityLevel: ReactPriorityLevel,
-): LanePriority {
- switch (schedulerPriorityLevel) {
- case ImmediateSchedulerPriority:
- return SyncLanePriority;
- case UserBlockingSchedulerPriority:
- return InputContinuousLanePriority;
- case NormalSchedulerPriority:
- case LowSchedulerPriority:
- // TODO: Handle LowSchedulerPriority, somehow. Maybe the same lane as hydration.
- return DefaultLanePriority;
- case IdleSchedulerPriority:
- return IdleLanePriority;
- default:
- return NoLanePriority;
- }
-}
-
 export function lanePriorityToSchedulerPriority(
  lanePriority: LanePriority,
 ): ReactPriorityLevel {

diff --git a/packages/react-reconciler/src/ReactFiberLane.old.js b/packages/react-reconciler/src/ReactFiberLane.old.js
@@ -42,7 +42,6 @@ import {
  ImmediatePriority as ImmediateSchedulerPriority,
  UserBlockingPriority as UserBlockingSchedulerPriority,
  NormalPriority as NormalSchedulerPriority,
- LowPriority as LowSchedulerPriority,
  IdlePriority as IdleSchedulerPriority,
  NoPriority as NoSchedulerPriority,
 } from './SchedulerWithReactIntegration.old';
@@ -275,25 +274,6 @@ function getHighestPriorityLanes(lanes: Lanes | Lane): Lanes {
  }
 }
 
-export function schedulerPriorityToLanePriority(
- schedulerPriorityLevel: ReactPriorityLevel,
-): LanePriority {
- switch (schedulerPriorityLevel) {
- case ImmediateSchedulerPriority:
- return SyncLanePriority;
- case UserBlockingSchedulerPriority:
- return InputContinuousLanePriority;
- case NormalSchedulerPriority:
- case LowSchedulerPriority:
- // TODO: Handle LowSchedulerPriority, somehow. Maybe the same lane as hydration.
- return DefaultLanePriority;
- case IdleSchedulerPriority:
- return IdleLanePriority;
- default:
- return NoLanePriority;
- }
-}
-
 export function lanePriorityToSchedulerPriority(
  lanePriority: LanePriority,
 ): ReactPriorityLevel {