Split scheduleUpdate into scheduleUpdate and scheduleWork.

scheduleWork updates the priority of the fiber and its ancestors and
schedules work to be performed.

scheduleUpdate inserts an update into a fiber's update queue and calls
then schedules work with scheduleWork.

Now we don't have to export so many things from the scheduler.

Author: acdlite

src/renderers/shared/fiber/ReactFiberBeginWork.js

@@ -16,7 +16,6 @@ import type {HostContext} from 'ReactFiberHostContext';
 import type {HydrationContext} from 'ReactFiberHydrationContext';
 import type {FiberRoot} from 'ReactFiberRoot';
 import type {HostConfig} from 'ReactFiberReconciler';
-import type {PriorityLevel} from 'ReactPriorityLevel';
 import type {ExpirationTime} from 'ReactFiberExpirationTime';
 
 var {
@@ -72,16 +71,13 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
   config: HostConfig<T, P, I, TI, PI, C, CX, PL>,
   hostContext: HostContext<C, CX>,
   hydrationContext: HydrationContext<C, CX>,
-  scheduleUpdate: (fiber: Fiber, expirationTime: ExpirationTime) => void,
-  getPriorityContext: (
+  scheduleUpdate: (
     fiber: Fiber,
-    forceAsync: boolean,
-  ) => PriorityLevel | null,
-  recalculateCurrentTime: () => ExpirationTime,
-  getExpirationTimeForPriority: (
-    currentTime: ExpirationTime,
-    priorityLevel: PriorityLevel | null,
-  ) => ExpirationTime,
+    partialState: mixed,
+    callback: (() => mixed) | null,
+    isReplace: boolean,
+    isForced: boolean,
+  ) => void,
 ) {
   const {
     shouldSetTextContent,
@@ -103,14 +99,7 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
     mountClassInstance,
     // resumeMountClassInstance,
     updateClassInstance,
-  } = ReactFiberClassComponent(
-    scheduleUpdate,
-    getPriorityContext,
-    memoizeProps,
-    memoizeState,
-    recalculateCurrentTime,
-    getExpirationTimeForPriority,
-  );
+  } = ReactFiberClassComponent(scheduleUpdate, memoizeProps, memoizeState);
 
   // TODO: Remove this and use reconcileChildrenAtExpirationTime directly.
   function reconcileChildren(current, workInProgress, nextChildren) {

src/renderers/shared/fiber/ReactFiberClassComponent.js

@@ -11,7 +11,6 @@
 'use strict';
 
 import type {Fiber} from 'ReactFiber';
-import type {PriorityLevel} from 'ReactPriorityLevel';
 import type {ExpirationTime} from 'ReactFiberExpirationTime';
 
 var {Update} = require('ReactTypeOfSideEffect');
@@ -25,10 +24,7 @@ var {
   getUnmaskedContext,
   isContextConsumer,
 } = require('ReactFiberContext');
-var {
-  insertUpdateIntoFiber,
-  beginUpdateQueue,
-} = require('ReactFiberUpdateQueue');
+var {beginUpdateQueue} = require('ReactFiberUpdateQueue');
 var {hasContextChanged} = require('ReactFiberContext');
 var {isMounted} = require('ReactFiberTreeReflection');
 var ReactInstanceMap = require('ReactInstanceMap');
@@ -76,96 +72,42 @@ if (__DEV__) {
 }
 
 module.exports = function(
-  scheduleUpdate: (fiber: Fiber, expirationTime: ExpirationTime) => void,
-  getPriorityContext: (
+  scheduleUpdate: (
     fiber: Fiber,
-    forceAsync: boolean,
-  ) => PriorityLevel | null,
+    partialState: mixed,
+    callback: (() => mixed) | null,
+    isReplace: boolean,
+    isForced: boolean,
+  ) => void,
   memoizeProps: (workInProgress: Fiber, props: any) => void,
   memoizeState: (workInProgress: Fiber, state: any) => void,
-  recalculateCurrentTime: () => ExpirationTime,
-  getExpirationTimeForPriority: (
-    currentTime: ExpirationTime,
-    priorityLevel: PriorityLevel | null,
-  ) => ExpirationTime,
 ) {
   // Class component state updater
   const updater = {
     isMounted,
     enqueueSetState(instance, partialState, callback) {
       const fiber = ReactInstanceMap.get(instance);
-      const priorityLevel = getPriorityContext(fiber, false);
-      const currentTime = recalculateCurrentTime();
-      const expirationTime = getExpirationTimeForPriority(
-        currentTime,
-        priorityLevel,
-      );
       callback = callback === undefined ? null : callback;
       if (__DEV__) {
         warnOnInvalidCallback(callback, 'setState');
       }
-      const update = {
-        priorityLevel,
-        expirationTime,
-        partialState,
-        callback,
-        isReplace: false,
-        isForced: false,
-        isTopLevelUnmount: false,
-        next: null,
-      };
-      insertUpdateIntoFiber(fiber, update, currentTime);
-      scheduleUpdate(fiber, expirationTime);
+      scheduleUpdate(fiber, partialState, callback, false, false);
     },
     enqueueReplaceState(instance, state, callback) {
       const fiber = ReactInstanceMap.get(instance);
-      const priorityLevel = getPriorityContext(fiber, false);
-      const currentTime = recalculateCurrentTime();
-      const expirationTime = getExpirationTimeForPriority(
-        currentTime,
-        priorityLevel,
-      );
       callback = callback === undefined ? null : callback;
       if (__DEV__) {
         warnOnInvalidCallback(callback, 'replaceState');
       }
-      const update = {
-        priorityLevel,
-        expirationTime,
-        partialState: state,
-        callback,
-        isReplace: true,
-        isForced: false,
-        isTopLevelUnmount: false,
-        next: null,
-      };
-      insertUpdateIntoFiber(fiber, update, currentTime);
-      scheduleUpdate(fiber, expirationTime);
+      scheduleUpdate(fiber, state, callback, true, false);
     },
     enqueueForceUpdate(instance, callback) {
       const fiber = ReactInstanceMap.get(instance);
-      const priorityLevel = getPriorityContext(fiber, false);
-      const currentTime = recalculateCurrentTime();
-      const expirationTime = getExpirationTimeForPriority(
-        currentTime,
-        priorityLevel,
-      );
       callback = callback === undefined ? null : callback;
       if (__DEV__) {
         warnOnInvalidCallback(callback, 'forceUpdate');
       }
-      const update = {
-        priorityLevel,
-        expirationTime,
-        partialState: null,
-        callback,
-        isReplace: false,
-        isForced: true,
-        isTopLevelUnmount: false,
-        next: null,
-      };
-      insertUpdateIntoFiber(fiber, update, currentTime);
-      scheduleUpdate(fiber, expirationTime);
+      scheduleUpdate(fiber, null, callback, false, true);
     },
   };
 

src/renderers/shared/fiber/ReactFiberReconciler.js

@@ -223,7 +223,7 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
   var {getPublicInstance} = config;
 
   var {
-    scheduleUpdate,
+    scheduleWork,
     scheduleCompletionCallback,
     getPriorityContext,
     getExpirationTimeForPriority,
@@ -337,7 +337,7 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
       insertUpdateIntoQueue(root.blockers, block, currentTime);
     }
 
-    scheduleUpdate(current, expirationTime);
+    scheduleWork(current, expirationTime);
     return expirationTime;
   }
 

src/renderers/shared/fiber/ReactFiberScheduler.js

@@ -98,6 +98,7 @@ var {
   processUpdateQueue,
   createUpdateQueue,
   insertUpdateIntoQueue,
+  insertUpdateIntoFiber,
 } = require('ReactFiberUpdateQueue');
 
 var {resetContext} = require('ReactFiberContext');
@@ -180,9 +181,6 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
     hostContext,
     hydrationContext,
     scheduleUpdate,
-    getPriorityContext,
-    recalculateCurrentTime,
-    getExpirationTimeForPriority,
   );
   const {completeWork} = ReactFiberCompleteWork(
     config,
@@ -1531,11 +1529,38 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
     }
   }
 
-  function scheduleUpdate(fiber: Fiber, expirationTime: ExpirationTime) {
-    return scheduleUpdateImpl(fiber, expirationTime, false);
+  function scheduleUpdate(
+    fiber: Fiber,
+    partialState: mixed,
+    callback: (() => mixed) | null,
+    isReplace: boolean,
+    isForced: boolean,
+  ) {
+    const priorityLevel = getPriorityContext(fiber, false);
+    const currentTime = recalculateCurrentTime();
+    const expirationTime = getExpirationTimeForPriority(
+      currentTime,
+      priorityLevel,
+    );
+    const update = {
+      priorityLevel,
+      expirationTime,
+      partialState,
+      callback,
+      isReplace,
+      isForced,
+      nextCallback: null,
+      next: null,
+    };
+    insertUpdateIntoFiber(fiber, update, currentTime);
+    scheduleWork(fiber, expirationTime);
+  }
+
+  function scheduleWork(fiber: Fiber, expirationTime: ExpirationTime) {
+    return scheduleWorkImpl(fiber, expirationTime, false);
   }
 
-  function scheduleUpdateImpl(
+  function scheduleWorkImpl(
     fiber: Fiber,
     expirationTime: ExpirationTime,
     isErrorRecovery: boolean,
@@ -1669,7 +1694,7 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
       // callback synchronously.
       performWork(TaskPriority, null);
     } else {
-      scheduleUpdate(root.current, expirationTime);
+      scheduleWork(root.current, expirationTime);
     }
   }
 
@@ -1724,7 +1749,7 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
       mostRecentCurrentTime,
       TaskPriority,
     );
-    scheduleUpdateImpl(fiber, taskTime, true);
+    scheduleWorkImpl(fiber, taskTime, true);
   }
 
   function recalculateCurrentTime(): ExpirationTime {
@@ -1818,7 +1843,7 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
   }
 
   return {
-    scheduleUpdate: scheduleUpdate,
+    scheduleWork: scheduleWork,
     scheduleCompletionCallback: scheduleCompletionCallback,
     getPriorityContext: getPriorityContext,
     recalculateCurrentTime: recalculateCurrentTime,