Remove decoupleUpdatePriorityFromScheduler

facebook · Mar 8, 2021 · e89d74e · e89d74e
1 parent 5fe091c
commit e89d74e
Show file tree

Hide file tree

Showing 18 changed files with 226 additions and 542 deletions.
diff --git a/packages/react-dom/src/events/ReactDOMEventListener.js b/packages/react-dom/src/events/ReactDOMEventListener.js
@@ -40,7 +40,6 @@ import {getClosestInstanceFromNode} from '../client/ReactDOMComponentTree';
 
 import {
  enableLegacyFBSupport,
- decoupleUpdatePriorityFromScheduler,
  enableNewReconciler,
 } from 'shared/ReactFeatureFlags';
 import {dispatchEventForPluginEventSystem} from './DOMPluginEventSystem';
@@ -177,25 +176,10 @@ function dispatchContinuousEvent(
  container,
  nativeEvent,
 ) {
- if (decoupleUpdatePriorityFromScheduler) {
- const previousPriority = getCurrentUpdateLanePriority();
- try {
- // TODO: Double wrapping is necessary while we decouple Scheduler priority.
- setCurrentUpdateLanePriority(InputContinuousLanePriority);
- runWithPriority(
- UserBlockingPriority,
- dispatchEvent.bind(
- null,
- domEventName,
- eventSystemFlags,
- container,
- nativeEvent,
- ),
- );
- } finally {
- setCurrentUpdateLanePriority(previousPriority);
- }
- } else {
+ const previousPriority = getCurrentUpdateLanePriority();
+ try {
+ // TODO: Double wrapping is necessary while we decouple Scheduler priority.
+ setCurrentUpdateLanePriority(InputContinuousLanePriority);
  runWithPriority(
  UserBlockingPriority,
  dispatchEvent.bind(
@@ -206,6 +190,8 @@ function dispatchContinuousEvent(
  nativeEvent,
  ),
  );
+ } finally {
+ setCurrentUpdateLanePriority(previousPriority);
  }
 }
 

diff --git a/packages/react-reconciler/src/ReactFiberHooks.new.js b/packages/react-reconciler/src/ReactFiberHooks.new.js
@@ -27,7 +27,6 @@ import {
  enableSchedulingProfiler,
  enableNewReconciler,
  enableCache,
- decoupleUpdatePriorityFromScheduler,
  enableUseRefAccessWarning,
  enableStrictEffects,
  enableLazyContextPropagation,
@@ -1713,66 +1712,37 @@ function rerenderDeferredValue<T>(value: T): T {
 
 function startTransition(setPending, callback) {
  const priorityLevel = getCurrentPriorityLevel();
- if (decoupleUpdatePriorityFromScheduler) {
- const previousLanePriority = getCurrentUpdateLanePriority();
- setCurrentUpdateLanePriority(
- higherLanePriority(previousLanePriority, InputContinuousLanePriority),
- );
+ const previousLanePriority = getCurrentUpdateLanePriority();
+ setCurrentUpdateLanePriority(
+ higherLanePriority(previousLanePriority, InputContinuousLanePriority),
+ );
 
- runWithPriority(
- priorityLevel < UserBlockingPriority
- ? UserBlockingPriority
- : priorityLevel,
- () => {
- setPending(true);
- },
- );
+ runWithPriority(
+ priorityLevel < UserBlockingPriority ? UserBlockingPriority : priorityLevel,
+ () => {
+ setPending(true);
+ },
+ );
 
-  // TODO: Can remove this. Was only necessary because we used to give
-  // different behavior to transitions without a config object. Now they are
-  // all treated the same.
-  setCurrentUpdateLanePriority(DefaultLanePriority);
+ // TODO: Can remove this. Was only necessary because we used to give
+ // different behavior to transitions without a config object. Now they are
+ // all treated the same.
+ setCurrentUpdateLanePriority(DefaultLanePriority);
 
- runWithPriority(
- priorityLevel > NormalPriority ? NormalPriority : priorityLevel,
- () => {
- const prevTransition = ReactCurrentBatchConfig.transition;
- ReactCurrentBatchConfig.transition = 1;
- try {
- setPending(false);
- callback();
- } finally {
- if (decoupleUpdatePriorityFromScheduler) {
- setCurrentUpdateLanePriority(previousLanePriority);
- }
- ReactCurrentBatchConfig.transition = prevTransition;
- }
- },
- );
- } else {
- runWithPriority(
- priorityLevel < UserBlockingPriority
- ? UserBlockingPriority
- : priorityLevel,
- () => {
- setPending(true);
- },
- );
-
- runWithPriority(
- priorityLevel > NormalPriority ? NormalPriority : priorityLevel,
- () => {
- const prevTransition = ReactCurrentBatchConfig.transition;
- ReactCurrentBatchConfig.transition = 1;
- try {
- setPending(false);
- callback();
- } finally {
- ReactCurrentBatchConfig.transition = prevTransition;
- }
- },
- );
- }
+ runWithPriority(
+ priorityLevel > NormalPriority ? NormalPriority : priorityLevel,
+ () => {
+ const prevTransition = ReactCurrentBatchConfig.transition;
+ ReactCurrentBatchConfig.transition = 1;
+ try {
+ setPending(false);
+ callback();
+ } finally {
+ setCurrentUpdateLanePriority(previousLanePriority);
+ ReactCurrentBatchConfig.transition = prevTransition;
+ }
+ },
+ );
 }
 
 function mountTransition(): [(() => void) => void, boolean] {

diff --git a/packages/react-reconciler/src/ReactFiberHooks.old.js b/packages/react-reconciler/src/ReactFiberHooks.old.js
@@ -27,7 +27,6 @@ import {
  enableSchedulingProfiler,
  enableNewReconciler,
  enableCache,
- decoupleUpdatePriorityFromScheduler,
  enableUseRefAccessWarning,
  enableStrictEffects,
  enableLazyContextPropagation,
@@ -1713,66 +1712,37 @@ function rerenderDeferredValue<T>(value: T): T {
 
 function startTransition(setPending, callback) {
  const priorityLevel = getCurrentPriorityLevel();
- if (decoupleUpdatePriorityFromScheduler) {
- const previousLanePriority = getCurrentUpdateLanePriority();
- setCurrentUpdateLanePriority(
- higherLanePriority(previousLanePriority, InputContinuousLanePriority),
- );
+ const previousLanePriority = getCurrentUpdateLanePriority();
+ setCurrentUpdateLanePriority(
+ higherLanePriority(previousLanePriority, InputContinuousLanePriority),
+ );
 
- runWithPriority(
- priorityLevel < UserBlockingPriority
- ? UserBlockingPriority
- : priorityLevel,
- () => {
- setPending(true);
- },
- );
+ runWithPriority(
+ priorityLevel < UserBlockingPriority ? UserBlockingPriority : priorityLevel,
+ () => {
+ setPending(true);
+ },
+ );
 
-  // TODO: Can remove this. Was only necessary because we used to give
-  // different behavior to transitions without a config object. Now they are
-  // all treated the same.
-  setCurrentUpdateLanePriority(DefaultLanePriority);
+ // TODO: Can remove this. Was only necessary because we used to give
+ // different behavior to transitions without a config object. Now they are
+ // all treated the same.
+ setCurrentUpdateLanePriority(DefaultLanePriority);
 
- runWithPriority(
- priorityLevel > NormalPriority ? NormalPriority : priorityLevel,
- () => {
- const prevTransition = ReactCurrentBatchConfig.transition;
- ReactCurrentBatchConfig.transition = 1;
- try {
- setPending(false);
- callback();
- } finally {
- if (decoupleUpdatePriorityFromScheduler) {
- setCurrentUpdateLanePriority(previousLanePriority);
- }
- ReactCurrentBatchConfig.transition = prevTransition;
- }
- },
- );
- } else {
- runWithPriority(
- priorityLevel < UserBlockingPriority
- ? UserBlockingPriority
- : priorityLevel,
- () => {
- setPending(true);
- },
- );
-
- runWithPriority(
- priorityLevel > NormalPriority ? NormalPriority : priorityLevel,
- () => {
- const prevTransition = ReactCurrentBatchConfig.transition;
- ReactCurrentBatchConfig.transition = 1;
- try {
- setPending(false);
- callback();
- } finally {
- ReactCurrentBatchConfig.transition = prevTransition;
- }
- },
- );
- }
+ runWithPriority(
+ priorityLevel > NormalPriority ? NormalPriority : priorityLevel,
+ () => {
+ const prevTransition = ReactCurrentBatchConfig.transition;
+ ReactCurrentBatchConfig.transition = 1;
+ try {
+ setPending(false);
+ callback();
+ } finally {
+ setCurrentUpdateLanePriority(previousLanePriority);
+ ReactCurrentBatchConfig.transition = prevTransition;
+ }
+ },
+ );
 }
 
 function mountTransition(): [(() => void) => void, boolean] {