Deterministic updates

High priority updates typically require less work to render than
low priority ones. It's beneficial to flush those first, in their own
batch, before working on more expensive low priority ones. We do this
even if a high priority is scheduled after a low priority one.

However, we don't want this reordering of updates to affect the terminal
state. State should be deterministic: once all work has been flushed,
the final state should be the same regardless of how they were
scheduled.

To get both properties, we store updates on the queue in insertion
order instead of priority order (always append). Then, when processing
the queue, we skip over updates with insufficient priority. Instead of
removing updates from the queue right after processing them, we only
remove them if there are no unprocessed updates before it in the list.

This means that updates may be processed more than once.

As a bonus, the new implementation is simpler and requires less code.

package.json

@@ -60,6 +60,7 @@
     "glob-stream": "^6.1.0",
     "gzip-js": "~0.3.2",
     "gzip-size": "^3.0.0",
+    "jasmine-check": "^1.0.0-rc.0",
     "jest": "20.1.0-delta.1",
     "jest-config": "20.1.0-delta.1",
     "jest-jasmine2": "20.1.0-delta.1",

scripts/jest/test-framework-setup.js

@@ -28,7 +28,7 @@ if (process.env.REACT_CLASS_EQUIVALENCE_TEST) {
     env.afterEach(() => {
       if (console[methodName] !== newMethod && !isSpy(console[methodName])) {
         throw new Error(
-          'Test did not tear down console.' + methodName + ' mock properly.'
+          'Test did not tear down console.' + methodName + ' mock properly.',
         );
       }
       if (console[methodName].__callCount !== 0) {
@@ -40,7 +40,7 @@ if (process.env.REACT_CLASS_EQUIVALENCE_TEST) {
             "spyOn(console, '" +
             methodName +
             "') and test that the " +
-            'warning occurs.'
+            'warning occurs.',
         );
       }
     });
@@ -68,4 +68,6 @@ if (process.env.REACT_CLASS_EQUIVALENCE_TEST) {
     return expectation;
   };
   global.expectDev = expectDev;
+
+  require('jasmine-check').install();
 }

src/renderers/dom/fiber/__tests__/ReactDOMFiberAsync-test.js

@@ -286,8 +286,8 @@ describe('ReactDOMFiberAsync', () => {
 
         // Flush the async updates
         jest.runAllTimers();
-        expect(container.textContent).toEqual('BCAD');
-        expect(ops).toEqual(['BC', 'BCAD']);
+        expect(container.textContent).toEqual('ABCD');
+        expect(ops).toEqual(['BC', 'ABCD']);
       });
     });
   }

src/renderers/noop/ReactNoopEntry.js

@@ -298,9 +298,18 @@ var ReactNoop = {
     const root = NoopRenderer.createContainer(container);
     roots.set(rootID, root);
     return {
+      render(children: any) {
+        const work = NoopRenderer.updateRoot(children, root, null);
+        work.then(() => work.commit());
+      },
       prerender(children: any) {
         return NoopRenderer.updateRoot(children, root, null);
       },
+      unmount() {
+        roots.delete(rootID);
+        const work = NoopRenderer.updateRoot(null, root, null);
+        work.then(() => work.commit());
+      },
       getChildren() {
         return ReactNoop.getChildren(rootID);
       },

src/renderers/shared/fiber/ReactFiberBeginWork.js

@@ -352,7 +352,6 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
         workInProgress,
         updateQueue,
         null,
-        prevState,
         null,
         renderExpirationTime,
       );
@@ -362,7 +361,7 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
         resetHydrationState();
         return bailoutOnAlreadyFinishedWork(current, workInProgress);
       }
-      const element = state.element;
+      const element = state !== null ? state.element : null;
       if (
         root.hydrate &&
         (current === null || current.child === null) &&

src/renderers/shared/fiber/ReactFiberClassComponent.js

@@ -113,7 +113,7 @@ module.exports = function(
         callback,
         isReplace: false,
         isForced: false,
-        isTopLevelUnmount: false,
+        nextCallback: null,
         next: null,
       };
       insertUpdateIntoFiber(fiber, update, currentTime);
@@ -138,7 +138,7 @@ module.exports = function(
         callback,
         isReplace: true,
         isForced: false,
-        isTopLevelUnmount: false,
+        nextCallback: null,
         next: null,
       };
       insertUpdateIntoFiber(fiber, update, currentTime);
@@ -163,7 +163,7 @@ module.exports = function(
         callback,
         isReplace: false,
         isForced: true,
-        isTopLevelUnmount: false,
+        nextCallback: null,
         next: null,
       };
       insertUpdateIntoFiber(fiber, update, currentTime);
@@ -458,7 +458,7 @@ module.exports = function(
     const unmaskedContext = getUnmaskedContext(workInProgress);
 
     instance.props = props;
-    instance.state = state;
+    instance.state = workInProgress.memoizedState = state;
     instance.refs = emptyObject;
     instance.context = getMaskedContext(workInProgress, unmaskedContext);
 
@@ -482,7 +482,6 @@ module.exports = function(
           workInProgress,
           updateQueue,
           instance,
-          state,
           props,
           renderExpirationTime,
         );
@@ -649,7 +648,6 @@ module.exports = function(
         workInProgress,
         workInProgress.updateQueue,
         instance,
-        oldState,
         newProps,
         renderExpirationTime,
       );

src/renderers/shared/fiber/ReactFiberCommitWork.js

@@ -31,12 +31,7 @@ var {
   clearCaughtError,
 } = require('ReactErrorUtils');
 
-var {
-  Placement,
-  Update,
-  Callback,
-  ContentReset,
-} = require('ReactTypeOfSideEffect');
+var {Placement, Update, ContentReset} = require('ReactTypeOfSideEffect');
 
 var invariant = require('fbjs/lib/invariant');
 
@@ -489,16 +484,26 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
     }
   }
 
-  function commitCallbacks(callbackList, context) {
-    for (let i = 0; i < callbackList.length; i++) {
-      const callback = callbackList[i];
+  function commitCallbacks(updateQueue, context) {
+    let callbackNode = updateQueue.firstCallback;
+    // Reset the callback list before calling them in case something throws.
+    updateQueue.firstCallback = updateQueue.lastCallback = null;
+
+    while (callbackNode !== null) {
+      const callback = callbackNode.callback;
+      // Remove this callback from the update object in case it's still part
+      // of the queue, so that we don't call it again.
+      callbackNode.callback = null;
       invariant(
         typeof callback === 'function',
         'Invalid argument passed as callback. Expected a function. Instead ' +
           'received: %s',
         callback,
       );
       callback.call(context);
+      const nextCallback = callbackNode.nextCallback;
+      callbackNode.nextCallback = null;
+      callbackNode = nextCallback;
     }
   }
 
@@ -531,31 +536,19 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
             }
           }
         }
-        if (
-          finishedWork.effectTag & Callback &&
-          finishedWork.updateQueue !== null
-        ) {
-          const updateQueue = finishedWork.updateQueue;
-          if (updateQueue.callbackList !== null) {
-            // Set the list to null to make sure they don't get called more than once.
-            const callbackList = updateQueue.callbackList;
-            updateQueue.callbackList = null;
-            commitCallbacks(callbackList, instance);
-          }
+        const updateQueue = finishedWork.updateQueue;
+        if (updateQueue !== null) {
+          commitCallbacks(updateQueue, instance);
         }
         return;
       }
       case HostRoot: {
         const updateQueue = finishedWork.updateQueue;
-        if (updateQueue !== null && updateQueue.callbackList !== null) {
-          // Set the list to null to make sure they don't get called more
-          // than once.
-          const callbackList = updateQueue.callbackList;
-          updateQueue.callbackList = null;
+        if (updateQueue !== null) {
           const instance = finishedWork.child !== null
             ? finishedWork.child.stateNode
             : null;
-          commitCallbacks(callbackList, instance);
+          commitCallbacks(updateQueue, instance);
         }
         return;
       }

src/renderers/shared/fiber/ReactFiberReconciler.js

@@ -278,43 +278,22 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
         callback,
       );
     }
-    const isTopLevelUnmount = nextState.element === null;
     const update = {
       priorityLevel,
       expirationTime,
       partialState: nextState,
       callback,
       isReplace: false,
       isForced: false,
-      isTopLevelUnmount,
+      nextCallback: null,
       next: null,
     };
-    const update2 = insertUpdateIntoFiber(current, update, currentTime);
-
-    if (isTopLevelUnmount) {
-      // TODO: Redesign the top-level mount/update/unmount API to avoid this
-      // special case.
-      const queue1 = current.updateQueue;
-      const queue2 = current.alternate !== null
-        ? current.alternate.updateQueue
-        : null;
-
-      // Drop all updates that are lower-priority, so that the tree is not
-      // remounted. We need to do this for both queues.
-      if (queue1 !== null && update.next !== null) {
-        update.next = null;
-        queue1.last = update;
-      }
-      if (queue2 !== null && update2 !== null && update2.next !== null) {
-        update2.next = null;
-        queue2.last = update;
-      }
-    }
+    insertUpdateIntoFiber(current, update, currentTime);
 
     if (isPrerender) {
       // Block the root from committing at this expiration time.
       if (root.blockers === null) {
-        root.blockers = createUpdateQueue();
+        root.blockers = createUpdateQueue(null);
       }
       const block = {
         priorityLevel: null,
@@ -323,7 +302,7 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
         callback: null,
         isReplace: false,
         isForced: false,
-        isTopLevelUnmount: false,
+        nextCallback: null,
         next: null,
       };
       insertUpdateIntoQueue(root.blockers, block, currentTime);
@@ -344,7 +323,7 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
     if (blockers === null) {
       return;
     }
-    processUpdateQueue(blockers, null, null, null, expirationTime);
+    processUpdateQueue(blockers, null, null, expirationTime);
     expireWork(root, expirationTime);
   };
   WorkNode.prototype.then = function(callback) {
@@ -395,7 +374,7 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
 
       let completionCallbacks = container.completionCallbacks;
       if (completionCallbacks === null) {
-        completionCallbacks = createUpdateQueue();
+        completionCallbacks = createUpdateQueue(null);
       }
 
       return new WorkNode(container, expirationTime);

src/renderers/shared/fiber/ReactFiberScheduler.js

@@ -416,21 +416,23 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
     // the end of the current batch.
     const completionCallbacks = root.completionCallbacks;
     if (completionCallbacks !== null) {
-      processUpdateQueue(completionCallbacks, null, null, null, completedAt);
-      const callbackList = completionCallbacks.callbackList;
-      if (callbackList !== null) {
-        // Add new callbacks to list of completion callbacks
+      processUpdateQueue(completionCallbacks, null, null, completedAt);
+      // Add new callbacks to list of completion callbacks
+      let callbackNode = completionCallbacks.firstCallback;
+      completionCallbacks.firstCallback = completionCallbacks.lastCallback = null;
+      while (callbackNode !== null) {
+        const callback: () => mixed = (callbackNode.callback: any);
+        // Remove this callback from the update object in case it's still part
+        // of the queue, so that we don't call it again.
+        callbackNode.callback = null;
         if (rootCompletionCallbackList === null) {
-          rootCompletionCallbackList = callbackList;
+          rootCompletionCallbackList = [callback];
         } else {
-          for (let i = 0; i < callbackList.length; i++) {
-            rootCompletionCallbackList.push(callbackList[i]);
-          }
-        }
-        completionCallbacks.callbackList = null;
-        if (completionCallbacks.first === null) {
-          root.completionCallbacks = null;
+          rootCompletionCallbackList.push(callback);
         }
+        const nextCallback = callbackNode.nextCallback;
+        callbackNode.nextCallback = null;
+        callbackNode = nextCallback;
       }
     }
   }
@@ -1642,12 +1644,12 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
       callback,
       isReplace: false,
       isForced: false,
-      isTopLevelUnmount: false,
+      nextCallback: null,
       next: null,
     };
     const currentTime = recalculateCurrentTime();
     if (root.completionCallbacks === null) {
-      root.completionCallbacks = createUpdateQueue();
+      root.completionCallbacks = createUpdateQueue(null);
     }
     insertUpdateIntoQueue(root.completionCallbacks, update, currentTime);
     if (expirationTime === root.completedAt) {