Land enableNativeEventPriorityInference (#20955)

* Land enableNativeEventPriorityInference

* Move schedulerPriorityToLanePriority

* Remove obsolete comment

packages/react-dom/src/__tests__/ReactDOMNativeEventHeuristic-test.js

@@ -43,7 +43,6 @@ describe('ReactDOMNativeEventHeuristic-test', () => {
  }
 
  // @gate experimental
- // @gate enableNativeEventPriorityInference
  it('ignores discrete events on a pending removed element', async () => {
  const disableButtonRef = React.createRef();
  const submitButtonRef = React.createRef();
@@ -95,7 +94,6 @@ describe('ReactDOMNativeEventHeuristic-test', () => {
  });
 
  // @gate experimental
- // @gate enableNativeEventPriorityInference
  it('ignores discrete events on a pending removed event listener', async () => {
  const disableButtonRef = React.createRef();
  const submitButtonRef = React.createRef();
@@ -165,7 +163,6 @@ describe('ReactDOMNativeEventHeuristic-test', () => {
  });
 
  // @gate experimental
- // @gate enableNativeEventPriorityInference
  it('uses the newest discrete events on a pending changed event listener', async () => {
  const enableButtonRef = React.createRef();
  const submitButtonRef = React.createRef();
@@ -229,7 +226,6 @@ describe('ReactDOMNativeEventHeuristic-test', () => {
  });
 
  // @gate experimental
- // @gate enableNativeEventPriorityInference
  it('mouse over should be user-blocking but not discrete', async () => {
  const root = ReactDOM.unstable_createRoot(container);
 
@@ -260,7 +256,6 @@ describe('ReactDOMNativeEventHeuristic-test', () => {
  });
 
  // @gate experimental
- // @gate enableNativeEventPriorityInference
  it('mouse enter should be user-blocking but not discrete', async () => {
  const root = ReactDOM.unstable_createRoot(container);
 

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;
 
@@ -410,8 +438,6 @@ export function getEventPriority(domEventName: DOMEventName): * {
  // Eventually this mechanism will be replaced by a check
  // of the current priority on the native scheduler.
  const schedulerPriority = getCurrentPriorityLevel();
- // TODO: Inline schedulerPriorityToLanePriority into this file
- // when we delete the enableNativeEventPriorityInference flag.
  return schedulerPriorityToLanePriority(schedulerPriority);
  }
  default:

packages/react-noop-renderer/src/createReactNoop.js

@@ -27,7 +27,6 @@ import {
  LegacyRoot,
 } from 'react-reconciler/src/ReactRootTags';
 
-import {enableNativeEventPriorityInference} from 'shared/ReactFeatureFlags';
 import ReactSharedInternals from 'shared/ReactSharedInternals';
 import enqueueTask from 'shared/enqueueTask';
 const {IsSomeRendererActing} = ReactSharedInternals;
@@ -934,19 +933,12 @@ function createReactNoop(reconciler: Function, useMutation: boolean) {
  discreteUpdates: NoopRenderer.discreteUpdates,
 
  idleUpdates<T>(fn: () => T): T {
- if (enableNativeEventPriorityInference) {
- const prevEventPriority = currentEventPriority;
- currentEventPriority = NoopRenderer.IdleEventPriority;
- try {
- fn();
- } finally {
- currentEventPriority = prevEventPriority;
- }
- } else {
- return Scheduler.unstable_runWithPriority(
- Scheduler.unstable_IdlePriority,
- fn,
- );
+ const prevEventPriority = currentEventPriority;
+ currentEventPriority = NoopRenderer.IdleEventPriority;
+ try {
+ fn();
+ } finally {
+ currentEventPriority = prevEventPriority;
  }
  },
 

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 {

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 {

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

@@ -32,7 +32,6 @@ import {
  disableSchedulerTimeoutInWorkLoop,
  enableStrictEffects,
  skipUnmountedBoundaries,
- enableNativeEventPriorityInference,
 } from 'shared/ReactFeatureFlags';
 import ReactSharedInternals from 'shared/ReactSharedInternals';
 import invariant from 'shared/invariant';
@@ -168,7 +167,6 @@ import {
  markRootExpired,
  markDiscreteUpdatesExpired,
  markRootFinished,
- schedulerPriorityToLanePriority,
  lanePriorityToSchedulerPriority,
  higherLanePriority,
 } from './ReactFiberLane.new';
@@ -456,15 +454,8 @@ export function requestUpdateLane(fiber: Fiber): Lane {
  const currentLanePriority = getCurrentUpdateLanePriority();
  lane = findUpdateLane(currentLanePriority);
  } else {
- if (enableNativeEventPriorityInference) {
- const eventLanePriority = getCurrentEventPriority();
- lane = findUpdateLane(eventLanePriority);
- } else {
- const schedulerLanePriority = schedulerPriorityToLanePriority(
- schedulerPriority,
- );
- lane = findUpdateLane(schedulerLanePriority);
- }
+ const eventLanePriority = getCurrentEventPriority();
+ lane = findUpdateLane(eventLanePriority);
  }
 
  return lane;

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

@@ -32,7 +32,6 @@ import {
  disableSchedulerTimeoutInWorkLoop,
  enableStrictEffects,
  skipUnmountedBoundaries,
- enableNativeEventPriorityInference,
 } from 'shared/ReactFeatureFlags';
 import ReactSharedInternals from 'shared/ReactSharedInternals';
 import invariant from 'shared/invariant';
@@ -168,7 +167,6 @@ import {
  markRootExpired,
  markDiscreteUpdatesExpired,
  markRootFinished,
- schedulerPriorityToLanePriority,
  lanePriorityToSchedulerPriority,
  higherLanePriority,
 } from './ReactFiberLane.old';
@@ -456,15 +454,8 @@ export function requestUpdateLane(fiber: Fiber): Lane {
  const currentLanePriority = getCurrentUpdateLanePriority();
  lane = findUpdateLane(currentLanePriority);
  } else {
- if (enableNativeEventPriorityInference) {
- const eventLanePriority = getCurrentEventPriority();
- lane = findUpdateLane(eventLanePriority);
- } else {
- const schedulerLanePriority = schedulerPriorityToLanePriority(
- schedulerPriority,
- );
- lane = findUpdateLane(schedulerLanePriority);
- }
+ const eventLanePriority = getCurrentEventPriority();
+ lane = findUpdateLane(eventLanePriority);
  }
 
  return lane;