Remove getExpirationTime

The last remaining use for getExpirationTime was for top-level async updates. I moved that check to scheduleUpdate instead.
facebook · Oct 12, 2017 · 1990983 · 1990983
1 parent d99be5c
commit 1990983
Show file tree

Hide file tree

Showing 2 changed files with 56 additions and 73 deletions.
diff --git a/src/renderers/shared/fiber/ReactFiberReconciler.js b/src/renderers/shared/fiber/ReactFiberReconciler.js
@@ -14,10 +14,6 @@ import type {Fiber} from 'ReactFiber';
 import type {FiberRoot} from 'ReactFiberRoot';
 import type {ReactNodeList} from 'ReactTypes';
 
-var ReactFeatureFlags = require('ReactFeatureFlags');
-
-var {insertUpdateIntoFiber} = require('ReactFiberUpdateQueue');
-
 var {
   findCurrentUnmaskedContext,
   isContextProvider,
@@ -235,8 +231,7 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
   var {getPublicInstance} = config;
 
   var {
-    scheduleWork,
-    getExpirationTime,
+    scheduleUpdate,
     batchedUpdates,
     unbatchedUpdates,
     flushSync,
@@ -266,17 +261,6 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
       }
     }
 
-    // Check if the top-level element is an async wrapper component. If so, treat
-    // updates to the root as async. This is a bit weird but lets us avoid a separate
-    // `renderAsync` API.
-    const forceAsync =
-      ReactFeatureFlags.enableAsyncSubtreeAPI &&
-      element != null &&
-      element.type != null &&
-      element.type.prototype != null &&
-      (element.type.prototype: any).unstable_isAsyncReactComponent === true;
-    const expirationTime = getExpirationTime(current, forceAsync);
-    const nextState = {element};
     callback = callback === undefined ? null : callback;
     if (__DEV__) {
       warning(
@@ -286,17 +270,8 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
         callback,
       );
     }
-    const update = {
-      expirationTime,
-      partialState: nextState,
-      callback,
-      isReplace: false,
-      isForced: false,
-      nextCallback: null,
-      next: null,
-    };
-    insertUpdateIntoFiber(current, update);
-    scheduleWork(current, expirationTime);
+    const state = {element};
+    scheduleUpdate(current, state, callback, false, false);
   }
 
   return {

diff --git a/src/renderers/shared/fiber/ReactFiberScheduler.js b/src/renderers/shared/fiber/ReactFiberScheduler.js
@@ -30,6 +30,7 @@ export type HandleErrorInfo = {
   componentStack: string,
 };
 
+var ReactFeatureFlags = require('ReactFeatureFlags');
 var {popContextProvider} = require('ReactFiberContext');
 const {reset} = require('ReactFiberStack');
 var {
@@ -1381,7 +1382,57 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
     isReplace: boolean,
     isForced: boolean,
   ) {
-    const expirationTime = getExpirationTime(fiber, false);
+    let expirationTime;
+    if (expirationContext !== NoWork) {
+      // An explicit expiration context was set;
+      expirationTime = expirationContext;
+    } else if (isPerformingWork) {
+      if (isCommitting) {
+        // Updates that occur during the commit phase should have task priority
+        // by default.
+        expirationTime = Task;
+      } else {
+        // Updates during the render phase should expire at the same time as
+        // the work that is being rendered.
+        expirationTime = nextRenderExpirationTime;
+      }
+    } else {
+      // No explicit expiration context was set, and we're not currently
+      // performing work. Calculate a new expiration time.
+
+      let forceAsync = false;
+      if (fiber.tag === HostRoot) {
+        // Check if the top-level element is an async wrapper component. If so,
+        // treat updates to the root as async. This is a bit weird but lets us
+        // avoid a separate `renderAsync` API.
+        const element = (partialState: any).element;
+        forceAsync =
+          ReactFeatureFlags.enableAsyncSubtreeAPI &&
+          element != null &&
+          element.type != null &&
+          element.type.prototype != null &&
+          (element.type.prototype: any).unstable_isAsyncReactComponent === true;
+      }
+
+      if (
+        useSyncScheduling &&
+        !(fiber.internalContextTag & AsyncUpdates) &&
+        !forceAsync
+      ) {
+        // This is a sync update
+        expirationTime = Sync;
+      } else {
+        // This is an async update
+        const currentTime = recalculateCurrentTime();
+        expirationTime = asyncExpirationTime(currentTime);
+      }
+    }
+
+    if (expirationTime === Sync && (isCommitting || isBatchingUpdates)) {
+      // If we're in a batch, or in the commit phase, downgrade sync to task
+      expirationTime = Task;
+    }
+
     const update = {
       expirationTime,
       partialState,
@@ -1506,48 +1557,6 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
     }
   }
 
-  function getExpirationTime(
-    fiber: Fiber,
-    forceAsync: boolean,
-  ): ExpirationTime {
-    let expirationTime;
-    if (expirationContext !== NoWork) {
-      // An explicit expiration context was set;
-      expirationTime = expirationContext;
-    } else if (isPerformingWork) {
-      if (isCommitting) {
-        // Updates that occur during the commit phase should have task priority
-        // by default.
-        expirationTime = Task;
-      } else {
-        // Updates during the render phase should expire at the same time as
-        // the work that is being rendered.
-        expirationTime = nextRenderExpirationTime;
-      }
-    } else {
-      // No explicit expiration context was set, and we're not currently
-      // performing work. Calculate a new expiration time.
-      if (
-        useSyncScheduling &&
-        !(fiber.internalContextTag & AsyncUpdates) &&
-        !forceAsync
-      ) {
-        // This is a sync update
-        expirationTime = Sync;
-      } else {
-        // This is an async update
-        const currentTime = recalculateCurrentTime();
-        expirationTime = asyncExpirationTime(currentTime);
-      }
-    }
-
-    if (expirationTime === Sync && (isCommitting || isBatchingUpdates)) {
-      // If we're in a batch, or in the commit phase, downgrade sync to task
-      return Task;
-    }
-    return expirationTime;
-  }
-
   function scheduleErrorRecovery(fiber: Fiber) {
     scheduleWorkImpl(fiber, Task, true);
   }
@@ -1620,8 +1629,7 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
   }
 
   return {
-    scheduleWork: scheduleWork,
-    getExpirationTime: getExpirationTime,
+    scheduleUpdate: scheduleUpdate,
     batchedUpdates: batchedUpdates,
     unbatchedUpdates: unbatchedUpdates,
     flushSync: flushSync,