Rename stateQueue -> updateQueue

acdlite · acdlite · commit f167826923d9 · 2016-08-04T14:39:40.000-07:00
Also cleans up some types.
diff --git a/src/renderers/shared/fiber/ReactFiber.js b/src/renderers/shared/fiber/ReactFiber.js
@@ -15,7 +15,7 @@
 import type { ReactCoroutine, ReactYield } from 'ReactCoroutine';
 import type { TypeOfWork } from 'ReactTypeOfWork';
 import type { PriorityLevel } from 'ReactPriorityLevel';
-import type { StateQueue } from 'ReactFiberStateQueue';
+import type { UpdateQueue } from 'ReactFiberUpdateQueue';
 
 var ReactTypeOfWork = require('ReactTypeOfWork');
 var {
@@ -80,7 +80,7 @@ export type Fiber = Instance & {
   // TODO: I think that there is a way to merge pendingProps and memoizedProps.
   memoizedProps: any, // The props used to create the output.
   // A queue of local state updates.
-  stateQueue: ?StateQueue,
+  updateQueue: ?UpdateQueue,
   // The state used to create the output. This is a full state object.
   memoizedState: any,
   // Output is the return value of this fiber, or a linked list of return values
@@ -139,7 +139,7 @@ var createFiber = function(tag : TypeOfWork, key : null | string) : Fiber {
 
     pendingProps: null,
     memoizedProps: null,
-    stateQueue: null,
+    updateQueue: null,
     memoizedState: null,
     output: null,
 
@@ -175,7 +175,7 @@ exports.cloneFiber = function(fiber : Fiber, priorityLevel : PriorityLevel) : Fi
     alt.sibling = fiber.sibling;
     alt.ref = alt.ref;
     alt.pendingProps = fiber.pendingProps;
-    alt.stateQueue = fiber.stateQueue;
+    alt.updateQueue = fiber.updateQueue;
     alt.pendingWorkPriority = priorityLevel;
 
     // Whenever we clone, we do so to get a new work in progress.
@@ -197,7 +197,7 @@ exports.cloneFiber = function(fiber : Fiber, priorityLevel : PriorityLevel) : Fi
   alt.ref = alt.ref;
   // pendingProps is here for symmetry but is unnecessary in practice for now.
   alt.pendingProps = fiber.pendingProps;
-  alt.stateQueue = fiber.stateQueue;
+  alt.updateQueue = fiber.updateQueue;
   alt.pendingWorkPriority = priorityLevel;
 
   alt.alternate = fiber;
diff --git a/src/renderers/shared/fiber/ReactFiberBeginWork.js b/src/renderers/shared/fiber/ReactFiberBeginWork.js
@@ -18,7 +18,7 @@ import type { FiberRoot } from 'ReactFiberRoot';
 import type { HostConfig } from 'ReactFiberReconciler';
 import type { Scheduler } from 'ReactFiberScheduler';
 import type { PriorityLevel } from 'ReactPriorityLevel';
-import type { StateQueue } from 'ReactFiberStateQueue';
+import type { UpdateQueue } from 'ReactFiberUpdateQueue';
 
 var {
   reconcileChildFibers,
@@ -42,10 +42,10 @@ var {
 } = require('ReactPriorityLevel');
 var { findNextUnitOfWorkAtPriority } = require('ReactFiberPendingWork');
 var {
-  createStateQueue,
+  createUpdateQueue,
   addToQueue,
-  mergeStateQueue,
-} = require('ReactFiberStateQueue');
+  mergeUpdateQueue,
+} = require('ReactFiberUpdateQueue');
 var ReactInstanceMap = require('ReactInstanceMap');
 
 module.exports = function<T, P, I, C>(config : HostConfig<T, P, I, C>, getScheduler : () => Scheduler) {
@@ -89,15 +89,15 @@ module.exports = function<T, P, I, C>(config : HostConfig<T, P, I, C>, getSchedu
     workInProgress.pendingWorkPriority = NoWork;
   }
 
-  function scheduleUpdate(fiber: Fiber, stateQueue: StateQueue, priorityLevel : PriorityLevel): void {
+  function scheduleUpdate(fiber: Fiber, updateQueue: UpdateQueue, priorityLevel : PriorityLevel): void {
     const { scheduleLowPriWork } = getScheduler();
-    fiber.stateQueue = stateQueue;
+    fiber.updateQueue = updateQueue;
     // Schedule update on the alternate as well, since we don't know which tree
     // is current.
     // $FlowFixMe: Intersection issue. Don't know why it's only happening here.
     const { alternate } = fiber;
     if (alternate !== null) {
-      alternate.stateQueue = stateQueue;
+      alternate.updateQueue = updateQueue;
     }
     while (true) {
       if (fiber.pendingWorkPriority === NoWork ||
@@ -127,10 +127,10 @@ module.exports = function<T, P, I, C>(config : HostConfig<T, P, I, C>, getSchedu
   const updater = {
     enqueueSetState(instance, partialState) {
       const fiber = ReactInstanceMap.get(instance);
-      const stateQueue = fiber.stateQueue ?
-        addToQueue(fiber.stateQueue, partialState) :
-        createStateQueue(partialState);
-      scheduleUpdate(fiber, stateQueue, LowPriority);
+      const updateQueue = fiber.updateQueue ?
+        addToQueue(fiber.updateQueue, partialState) :
+        createUpdateQueue(partialState);
+      scheduleUpdate(fiber, updateQueue, LowPriority);
     },
   };
 
@@ -142,21 +142,22 @@ module.exports = function<T, P, I, C>(config : HostConfig<T, P, I, C>, getSchedu
     if (!props && current) {
       props = current.memoizedProps;
     }
-    // Compute the state using the memoized state and the pending state queue.
-    var stateQueue = workInProgress.stateQueue;
-    var state = current ?
-       mergeStateQueue(stateQueue, current.memoizedState, props) :
-       mergeStateQueue(stateQueue, null, props);
+    // Compute the state using the memoized state and the update queue.
+    var updateQueue = workInProgress.updateQueue;
+    var previousState = current ? current.memoizedState : null;
+    var state = updateQueue ?
+      mergeUpdateQueue(updateQueue, previousState, props) :
+      previousState;
 
     var instance = workInProgress.stateNode;
     if (!instance) {
       var ctor = workInProgress.type;
       workInProgress.stateNode = instance = new ctor(props);
       state = instance.state || null;
-      // The initial state must be added to the pending state queue in case
+      // The initial state must be added to the update queue in case
       // setState is called before the initial render.
       if (state !== null) {
-        workInProgress.stateQueue = createStateQueue(state);
+        workInProgress.updateQueue = createUpdateQueue(state);
       }
       // The instance needs access to the fiber so that it can schedule updates
       ReactInstanceMap.set(instance, workInProgress);
@@ -290,7 +291,7 @@ module.exports = function<T, P, I, C>(config : HostConfig<T, P, I, C>, getSchedu
     workInProgress.output = current.output;
     const priorityLevel = workInProgress.pendingWorkPriority;
     workInProgress.pendingProps = null;
-    workInProgress.stateQueue = current.stateQueue = null;
+    workInProgress.updateQueue = current.updateQueue = null;
     workInProgress.pendingWorkPriority = NoWork;
     workInProgress.stateNode = current.stateNode;
     workInProgress.childInProgress = current.childInProgress;
@@ -320,9 +321,9 @@ module.exports = function<T, P, I, C>(config : HostConfig<T, P, I, C>, getSchedu
     // looking for. In that case, we should be able to just bail out.
     const priorityLevel = workInProgress.pendingWorkPriority;
     workInProgress.pendingProps = null;
-    workInProgress.stateQueue = null;
+    workInProgress.updateQueue = null;
     if (workInProgress.alternate) {
-      workInProgress.alternate.stateQueue = null;
+      workInProgress.alternate.updateQueue = null;
     }
     workInProgress.pendingWorkPriority = NoWork;
 
@@ -365,14 +366,14 @@ module.exports = function<T, P, I, C>(config : HostConfig<T, P, I, C>, getSchedu
     // progress.
     if (current &&
         workInProgress.pendingProps === current.memoizedProps &&
-        workInProgress.stateQueue === null
+        workInProgress.updateQueue === null
     ) {
       return bailoutOnCurrent(current, workInProgress, null);
     }
 
     if (!workInProgress.childInProgress &&
         workInProgress.pendingProps === workInProgress.memoizedProps &&
-        workInProgress.stateQueue === null
+        workInProgress.updateQueue === null
     ) {
       return bailoutOnAlreadyFinishedWork(current, workInProgress);
     }
diff --git a/src/renderers/shared/fiber/ReactFiberPendingWork.js b/src/renderers/shared/fiber/ReactFiberPendingWork.js
@@ -40,14 +40,14 @@ exports.findNextUnitOfWorkAtPriority = function(currentRoot : Fiber, priorityLev
     if (current.pendingWorkPriority !== NoWork &&
         current.pendingWorkPriority <= priorityLevel) {
       // This node has work to do that fits our priority level criteria.
-      if (current.pendingProps !== null || current.stateQueue !== null) {
+      if (current.pendingProps !== null || current.updateQueue !== null) {
         // We found some work to do. We need to return the "work in progress"
         // of this node which will be the alternate.
         const workInProgress = current.alternate;
         if (!workInProgress) {
           throw new Error('Should have wip now');
         }
-        // If current has stateQueue, it's already set on the workInProgress.
+        // If current has updateQueue, it's already set on the workInProgress.
         workInProgress.pendingProps = current.pendingProps;
         return workInProgress;
       }
diff --git a/src/renderers/shared/fiber/ReactFiberScheduler.js b/src/renderers/shared/fiber/ReactFiberScheduler.js
@@ -136,9 +136,9 @@ module.exports = function<T, P, I, C>(config : HostConfig<T, P, I, C>) {
       // The work is now done. We don't need this anymore. This flags
       // to the system not to redo any work here.
       workInProgress.pendingProps = null;
-      workInProgress.stateQueue = null;
+      workInProgress.updateQueue = null;
       if (current) {
-        current.stateQueue = null;
+        current.updateQueue = null;
       }
 
       const returnFiber = workInProgress.return;
@@ -206,7 +206,7 @@ module.exports = function<T, P, I, C>(config : HostConfig<T, P, I, C>) {
 
   function performUnitOfWork(workInProgress : Fiber) : ?Fiber {
     // Ignore work if there is nothing to do.
-    if (workInProgress.pendingProps === null && workInProgress.stateQueue === null) {
+    if (workInProgress.pendingProps === null && workInProgress.updateQueue === null) {
       return completeUnitOfWork(workInProgress);
     }
     // The current, flushed, state of this fiber is the alternate.
diff --git a/src/renderers/shared/fiber/ReactFiberUpdateQueue.js b/src/renderers/shared/fiber/ReactFiberUpdateQueue.js
@@ -6,53 +6,59 @@
  * LICENSE file in the root directory of this source tree. An additional grant
  * of patent rights can be found in the PATENTS file in the same directory.
  *
- * @providesModule ReactFiberStateQueue
+ * @providesModule ReactFiberUpdateQueue
  * @flow
  */
 
 'use strict';
 
-type StateQueueNode = {
+type UpdateQueueNode = {
   partialState: any,
   callback: ?Function,
-  next: ?StateQueueNode,
+  next: ?UpdateQueueNode,
 };
 
-export type StateQueue = StateQueueNode & {
-  tail: ?StateQueueNode
+export type UpdateQueue = UpdateQueueNode & {
+  tail: UpdateQueueNode
 };
 
-exports.createStateQueue = function(partialState : mixed) : StateQueue {
-  return {
+exports.createUpdateQueue = function(partialState : mixed) : UpdateQueue {
+  const queue = {
     partialState,
     callback: null,
     next: null,
-    tail: null,
+    tail: (null : any),
   };
+  queue.tail = queue;
+  return queue;
 };
 
-exports.addToQueue = function(queue : StateQueue, partialState : mixed) : StateQueue {
+exports.addToQueue = function(queue : UpdateQueue, partialState : mixed) : UpdateQueue {
   const node = {
     partialState,
     callback: null,
     next: null,
   };
-  if (!queue.tail) {
-    queue.next = node;
-  } else {
-    queue.tail.next = node;
-  }
+  queue.tail.next = node;
   queue.tail = node;
   return queue;
 };
 
-exports.mergeStateQueue = function(queue : ?StateQueue, prevState : any, props : any) : any {
-  let node : ?StateQueueNode = queue;
-  if (!node) {
-    return prevState;
+exports.callCallbacks = function(queue : UpdateQueue, partialState : mixed) {
+  let node : ?UpdateQueueNode = queue;
+  while (node) {
+    if (node.callback) {
+      const { callback } = node;
+      callback();
+    }
+    node = node.next;
   }
+};
+
+exports.mergeUpdateQueue = function(queue : UpdateQueue, prevState : any, props : any) : any {
+  let node : ?UpdateQueueNode = queue;
   let state = Object.assign({}, prevState);
-  do {
+  while (node) {
     let partialState;
     if (typeof node.partialState === 'function') {
       const updateFn = node.partialState;
@@ -61,6 +67,7 @@ exports.mergeStateQueue = function(queue : ?StateQueue, prevState : any, props :
       partialState = node.partialState;
     }
     state = Object.assign(state, partialState);
-  } while (node = node.next);
+    node = node.next;
+  }
   return state;
 };
