{"parents":["2182b690046a8794079fc3817223e98bf64072b8"],"files":[{"status":"M","path":"scripts\/fiber\/tests-failing.txt"},{"status":"M","path":"scripts\/fiber\/tests-passing.txt"},{"status":"M","path":"src\/addons\/transitions\/__tests__\/ReactTransitionGroup-test.js"},{"status":"M","path":"src\/isomorphic\/classic\/class\/ReactClass.js"},{"status":"M","path":"src\/isomorphic\/modern\/class\/ReactComponent.js"},{"status":"M","path":"src\/renderers\/shared\/fiber\/ReactFiberBeginWork.js"},{"status":"M","path":"src\/renderers\/shared\/fiber\/ReactFiberClassComponent.js"},{"status":"M","path":"src\/renderers\/shared\/fiber\/ReactFiberCommitWork.js"},{"status":"M","path":"src\/renderers\/shared\/fiber\/ReactFiberCompleteWork.js"},{"status":"M","path":"src\/renderers\/shared\/fiber\/ReactFiberScheduler.js"},{"status":"M","path":"src\/renderers\/shared\/fiber\/ReactFiberUpdateQueue.js"},{"status":"M","path":"src\/renderers\/shared\/fiber\/ReactTypeOfSideEffect.js"},{"status":"M","path":"src\/renderers\/shared\/fiber\/__tests__\/ReactIncrementalSideEffects-test.js"}],"patch":"diff --git a\/scripts\/fiber\/tests-failing.txt b\/scripts\/fiber\/tests-failing.txt\nindex 8c9b7a4904..f91c436b8d 100644\n--- a\/scripts\/fiber\/tests-failing.txt\n+++ b\/scripts\/fiber\/tests-failing.txt\n@@ -87,6 +87,9 @@ src\/renderers\/art\/__tests__\/ReactART-test.js\n * resolves refs before componentDidMount\n * resolves refs before componentDidUpdate\n \n+src\/renderers\/dom\/__tests__\/ReactDOMProduction-test.js\n+* should throw with an error code in production\n+\n src\/renderers\/dom\/shared\/__tests__\/CSSPropertyOperations-test.js\n * should set style attribute when styles exist\n * should warn when using hyphenated style names\n@@ -369,7 +372,6 @@ src\/renderers\/dom\/stack\/client\/__tests__\/ReactMount-test.js\n * should account for escaping on a checksum mismatch\n * should warn if render removes React-rendered children\n * should warn if the unmounted node was rendered by another copy of React\n-* passes the correct callback context\n * tracks root instances\n * marks top-level mounts\n \n@@ -608,8 +610,6 @@ src\/renderers\/shared\/stack\/reconciler\/__tests__\/ReactUpdates-test.js\n * throws in setState if the update callback is not a function\n * throws in replaceState if the update callback is not a function\n * throws in forceUpdate if the update callback is not a function\n-* does not update one component twice in a batch (#2410)\n-* unstable_batchedUpdates should return value from a callback\n \n src\/renderers\/shared\/stack\/reconciler\/__tests__\/refs-test.js\n * Should increase refs with an increase in divs\ndiff --git a\/scripts\/fiber\/tests-passing.txt b\/scripts\/fiber\/tests-passing.txt\nindex 995e16d47e..3046357ff1 100644\n--- a\/scripts\/fiber\/tests-passing.txt\n+++ b\/scripts\/fiber\/tests-passing.txt\n@@ -438,7 +438,6 @@ src\/renderers\/dom\/__tests__\/ReactDOMProduction-test.js\n * should use prod React\n * should handle a simple flow\n * should call lifecycle methods\n-* should throw with an error code in production\n \n src\/renderers\/dom\/fiber\/__tests__\/ReactDOMFiber-test.js\n * should render strings as children\n@@ -692,6 +691,7 @@ src\/renderers\/dom\/stack\/client\/__tests__\/ReactMount-test.js\n * should warn if mounting into dirty rendered markup\n * should not warn if mounting into non-empty node\n * should warn when mounting into document.body\n+* passes the correct callback context\n \n src\/renderers\/dom\/stack\/client\/__tests__\/ReactMountDestruction-test.js\n * should destroy a react root upon request\n@@ -788,6 +788,8 @@ src\/renderers\/shared\/fiber\/__tests__\/ReactIncremental-test.js\n * calls componentWill* twice if an update render is aborted\n * does not call componentWillReceiveProps for state-only updates\n * skips will\/DidUpdate when bailing unless an update was already in progress\n+* performs batched updates at the end of the batch\n+* can nest batchedUpdates\n \n src\/renderers\/shared\/fiber\/__tests__\/ReactIncrementalReflection-test.js\n * handles isMounted even when the initial render is deferred\n@@ -833,6 +835,7 @@ src\/renderers\/shared\/fiber\/__tests__\/ReactIncrementalSideEffects-test.js\n * can defer side-effects and reuse them later - complex\n * deprioritizes setStates that happens within a deprioritized tree\n * calls callback after update is flushed\n+* calls setState callback even if component bails out\n * calls componentWillUnmount after a deletion, even if nested\n * calls componentDidMount\/Update after insertion\/update\n * invokes ref callbacks after insertion\/update\/unmount\n@@ -1124,7 +1127,9 @@ src\/renderers\/shared\/stack\/reconciler\/__tests__\/ReactUpdates-test.js\n * should not reconcile children passed via props\n * should queue nested updates\n * calls componentWillReceiveProps setState callback properly\n+* does not update one component twice in a batch (#2410)\n * does not update one component twice in a batch (#6371)\n+* unstable_batchedUpdates should return value from a callback\n \n src\/renderers\/shared\/stack\/reconciler\/__tests__\/Transaction-test.js\n * should invoke closers with\/only-with init returns\ndiff --git a\/src\/addons\/transitions\/__tests__\/ReactTransitionGroup-test.js b\/src\/addons\/transitions\/__tests__\/ReactTransitionGroup-test.js\nindex 90c0e01900..0729be98f4 100644\n--- a\/src\/addons\/transitions\/__tests__\/ReactTransitionGroup-test.js\n+++ b\/src\/addons\/transitions\/__tests__\/ReactTransitionGroup-test.js\n@@ -97,10 +97,10 @@ describe('ReactTransitionGroup', () => {\n expect(log).toEqual(['didMount', 'willEnter', 'didEnter']);\n \n log = [];\n- instance.setState({count: 1}, function() {\n- expect(log).toEqual(['willLeave', 'didLeave', 'willUnmount']);\n- });\n+ instance.setState({count: 1});\n });\n+\n+ expect(log).toEqual(['willLeave', 'didLeave', 'willUnmount']);\n });\n \n it('should handle enter\/leave\/enter\/leave correctly', () => {\ndiff --git a\/src\/isomorphic\/classic\/class\/ReactClass.js b\/src\/isomorphic\/classic\/class\/ReactClass.js\nindex f0a5965006..475f08d7d8 100644\n--- a\/src\/isomorphic\/classic\/class\/ReactClass.js\n+++ b\/src\/isomorphic\/classic\/class\/ReactClass.js\n@@ -728,11 +728,6 @@ var ReactClassMixin = {\n * type signature and the only use case for this, is to avoid that.\n *\/\n replaceState: function(newState, callback) {\n- if (this.updater.isFiberUpdater) {\n- this.updater.enqueueReplaceState(this, newState, callback);\n- return;\n- }\n-\n this.updater.enqueueReplaceState(this, newState);\n if (callback) {\n this.updater.enqueueCallback(this, callback, 'replaceState');\ndiff --git a\/src\/isomorphic\/modern\/class\/ReactComponent.js b\/src\/isomorphic\/modern\/class\/ReactComponent.js\nindex 1eac5e786d..b93da63e94 100644\n--- a\/src\/isomorphic\/modern\/class\/ReactComponent.js\n+++ b\/src\/isomorphic\/modern\/class\/ReactComponent.js\n@@ -65,12 +65,6 @@ ReactComponent.prototype.setState = function(partialState, callback) {\n 'setState(...): takes an object of state variables to update or a ' +\n 'function which returns an object of state variables.'\n );\n-\n- if (this.updater.isFiberUpdater) {\n- this.updater.enqueueSetState(this, partialState, callback);\n- return;\n- }\n-\n this.updater.enqueueSetState(this, partialState);\n if (callback) {\n this.updater.enqueueCallback(this, callback, 'setState');\n@@ -92,11 +86,6 @@ ReactComponent.prototype.setState = function(partialState, callback) {\n * @protected\n *\/\n ReactComponent.prototype.forceUpdate = function(callback) {\n- if (this.updater.isFiberUpdater) {\n- this.updater.enqueueForceUpdate(this, callback);\n- return;\n- }\n-\n this.updater.enqueueForceUpdate(this);\n if (callback) {\n this.updater.enqueueCallback(this, callback, 'forceUpdate');\ndiff --git a\/src\/renderers\/shared\/fiber\/ReactFiberBeginWork.js b\/src\/renderers\/shared\/fiber\/ReactFiberBeginWork.js\nindex d8b41f7737..e1c2b1284b 100644\n--- a\/src\/renderers\/shared\/fiber\/ReactFiberBeginWork.js\n+++ b\/src\/renderers\/shared\/fiber\/ReactFiberBeginWork.js\n@@ -48,7 +48,7 @@ var ReactFiberClassComponent = require('ReactFiberClassComponent');\n \n module.exports = function(\n config : HostConfig,\n- scheduleUpdate : (fiber: Fiber, priorityLevel : ?PriorityLevel) => void\n+ scheduleUpdate : (fiber: Fiber) => void\n ) {\n \n const {\ndiff --git a\/src\/renderers\/shared\/fiber\/ReactFiberClassComponent.js b\/src\/renderers\/shared\/fiber\/ReactFiberClassComponent.js\nindex ac07fc852c..db71854a12 100644\n--- a\/src\/renderers\/shared\/fiber\/ReactFiberClassComponent.js\n+++ b\/src\/renderers\/shared\/fiber\/ReactFiberClassComponent.js\n@@ -26,7 +26,7 @@ var { isMounted } = require('ReactFiberTreeReflection');\n var ReactInstanceMap = require('ReactInstanceMap');\n var shallowEqual = require('shallowEqual');\n \n-module.exports = function(scheduleUpdate : (fiber: Fiber, priorityLevel : ?PriorityLevel) => void) {\n+module.exports = function(scheduleUpdate : (fiber: Fiber) => void) {\n \n function scheduleUpdateQueue(fiber: Fiber, updateQueue: UpdateQueue) {\n fiber.updateQueue = updateQueue;\n@@ -41,35 +41,33 @@ module.exports = function(scheduleUpdate : (fiber: Fiber, priorityLevel : ?Prior\n \/\/ Class component state updater\n const updater = {\n isMounted,\n- enqueueSetState(instance, partialState, callback) {\n+ enqueueSetState(instance, partialState) {\n const fiber = ReactInstanceMap.get(instance);\n const updateQueue = fiber.updateQueue ?\n addToQueue(fiber.updateQueue, partialState) :\n createUpdateQueue(partialState);\n- if (callback) {\n- addCallbackToQueue(updateQueue, callback);\n- }\n scheduleUpdateQueue(fiber, updateQueue);\n },\n- enqueueReplaceState(instance, state, callback) {\n+ enqueueReplaceState(instance, state) {\n const fiber = ReactInstanceMap.get(instance);\n const updateQueue = createUpdateQueue(state);\n updateQueue.isReplace = true;\n- if (callback) {\n- addCallbackToQueue(updateQueue, callback);\n- }\n scheduleUpdateQueue(fiber, updateQueue);\n },\n- enqueueForceUpdate(instance, callback) {\n+ enqueueForceUpdate(instance) {\n const fiber = ReactInstanceMap.get(instance);\n const updateQueue = fiber.updateQueue || createUpdateQueue(null);\n updateQueue.isForced = true;\n- if (callback) {\n- addCallbackToQueue(updateQueue, callback);\n- }\n scheduleUpdateQueue(fiber, updateQueue);\n },\n- isFiberUpdater: true,\n+ enqueueCallback(instance, callback) {\n+ const fiber = ReactInstanceMap.get(instance);\n+ let updateQueue = fiber.updateQueue ?\n+ fiber.updateQueue :\n+ createUpdateQueue(null);\n+ addCallbackToQueue(updateQueue, callback);\n+ scheduleUpdateQueue(fiber, updateQueue);\n+ },\n };\n \n function checkShouldComponentUpdate(workInProgress, oldProps, newProps, newState) {\n@@ -210,11 +208,21 @@ module.exports = function(scheduleUpdate : (fiber: Fiber, priorityLevel : ?Prior\n \/\/ TODO: Previous state can be null.\n let newState;\n if (updateQueue) {\n- newState = mergeUpdateQueue(updateQueue, instance, previousState, newProps);\n+ if (!updateQueue.hasUpdate) {\n+ newState = previousState;\n+ } else {\n+ newState = mergeUpdateQueue(updateQueue, instance, previousState, newProps);\n+ }\n } else {\n newState = previousState;\n }\n \n+ if (oldProps === newProps &&\n+ previousState === newState &&\n+ updateQueue && !updateQueue.isForced) {\n+ return false;\n+ }\n+\n if (!checkShouldComponentUpdate(\n workInProgress,\n oldProps,\ndiff --git a\/src\/renderers\/shared\/fiber\/ReactFiberCommitWork.js b\/src\/renderers\/shared\/fiber\/ReactFiberCommitWork.js\nindex db844453c8..b23e5bdd6f 100644\n--- a\/src\/renderers\/shared\/fiber\/ReactFiberCommitWork.js\n+++ b\/src\/renderers\/shared\/fiber\/ReactFiberCommitWork.js\n@@ -29,7 +29,8 @@ var { callCallbacks } = require('ReactFiberUpdateQueue');\n \n var {\n Placement,\n- PlacementAndUpdate,\n+ Update,\n+ Callback,\n } = require('ReactTypeOfSideEffect');\n \n module.exports = function(config : HostConfig) {\n@@ -102,8 +103,7 @@ module.exports = function(config : HostConfig) {\n \/\/ If it is not host node and, we might have a host node inside it.\n \/\/ Try to search down until we find one.\n \/\/ TODO: For coroutines, this will have to search the stateNode.\n- if (node.effectTag === Placement ||\n- node.effectTag === PlacementAndUpdate) {\n+ if (node.effectTag & Placement) {\n \/\/ If we don't have a child, try the siblings instead.\n continue siblings;\n }\n@@ -114,8 +114,7 @@ module.exports = function(config : HostConfig) {\n }\n }\n \/\/ Check if this host node is stable or about to be placed.\n- if (node.effectTag !== Placement &&\n- node.effectTag !== PlacementAndUpdate) {\n+ if (!(node.effectTag & Placement)) {\n \/\/ Found it!\n return node.stateNode;\n }\n@@ -329,41 +328,41 @@ module.exports = function(config : HostConfig) {\n case ClassComponent: {\n const instance = finishedWork.stateNode;\n let error = null;\n- if (!current) {\n- if (typeof instance.componentDidMount === 'function') {\n- error = tryCallComponentDidMount(instance);\n- }\n- } else {\n- if (typeof instance.componentDidUpdate === 'function') {\n- const prevProps = current.memoizedProps;\n- const prevState = current.memoizedState;\n- error = tryCallComponentDidUpdate(instance, prevProps, prevState);\n+ if (finishedWork.effectTag & Update) {\n+ if (!current) {\n+ if (typeof instance.componentDidMount === 'function') {\n+ error = tryCallComponentDidMount(instance);\n+ }\n+ } else {\n+ if (typeof instance.componentDidUpdate === 'function') {\n+ const prevProps = current.memoizedProps;\n+ const prevState = current.memoizedState;\n+ error = tryCallComponentDidUpdate(instance, prevProps, prevState);\n+ }\n }\n+ attachRef(current, finishedWork, instance);\n }\n- \/\/ Clear updates from current fiber. This must go before the callbacks\n- \/\/ are reset, in case an update is triggered from inside a callback. Is\n- \/\/ this safe? Relies on the assumption that work is only committed if\n- \/\/ the update queue is empty.\n+ \/\/ Clear updates from current fiber.\n if (finishedWork.alternate) {\n finishedWork.alternate.updateQueue = null;\n }\n- if (finishedWork.callbackList) {\n- const { callbackList } = finishedWork;\n- finishedWork.callbackList = null;\n- callCallbacks(callbackList, instance);\n+ if (finishedWork.effectTag & Callback) {\n+ if (finishedWork.callbackList) {\n+ callCallbacks(finishedWork.callbackList, instance);\n+ finishedWork.callbackList = null;\n+ }\n }\n- attachRef(current, finishedWork, instance);\n if (error) {\n return trapError(finishedWork, error);\n }\n return null;\n }\n case HostContainer: {\n- const instance = finishedWork.stateNode;\n- if (instance.callbackList) {\n- const { callbackList } = instance;\n- instance.callbackList = null;\n- callCallbacks(callbackList, instance.current.child.stateNode);\n+ const rootFiber = finishedWork.stateNode;\n+ if (rootFiber.callbackList) {\n+ const { callbackList } = rootFiber;\n+ rootFiber.callbackList = null;\n+ callCallbacks(callbackList, rootFiber.current.child.stateNode);\n }\n }\n case HostComponent: {\ndiff --git a\/src\/renderers\/shared\/fiber\/ReactFiberCompleteWork.js b\/src\/renderers\/shared\/fiber\/ReactFiberCompleteWork.js\nindex 590332d5ce..b0eea7c87e 100644\n--- a\/src\/renderers\/shared\/fiber\/ReactFiberCompleteWork.js\n+++ b\/src\/renderers\/shared\/fiber\/ReactFiberCompleteWork.js\n@@ -34,6 +34,7 @@ var {\n } = ReactTypeOfWork;\n var {\n Update,\n+ Callback,\n } = ReactTypeOfSideEffect;\n \n module.exports = function(config : HostConfig) {\n@@ -48,6 +49,11 @@ module.exports = function(config : HostConfig) {\n workInProgress.effectTag |= Update;\n }\n \n+ function markCallback(workInProgress : Fiber) {\n+ \/\/ Tag the fiber with a callback effect.\n+ workInProgress.effectTag |= Callback;\n+ }\n+\n function transferOutput(child : ?Fiber, returnFiber : Fiber) {\n \/\/ If we have a single result, we just pass that through as the output to\n \/\/ avoid unnecessary traversal. When we have multiple output, we just pass\n@@ -124,19 +130,24 @@ module.exports = function(config : HostConfig) {\n \/\/ Also need to transfer the props, because pendingProps will be null\n \/\/ in the case of an update\n const { state, props } = workInProgress.stateNode;\n+ const updateQueue = workInProgress.updateQueue;\n workInProgress.memoizedState = state;\n workInProgress.memoizedProps = props;\n- \/\/ Transfer update queue to callbackList field so callbacks can be\n- \/\/ called during commit phase.\n- workInProgress.callbackList = workInProgress.updateQueue;\n if (current) {\n if (current.memoizedProps !== workInProgress.memoizedProps ||\n- current.memoizedState !== workInProgress.memoizedState) {\n+ current.memoizedState !== workInProgress.memoizedState ||\n+ updateQueue && updateQueue.isForced) {\n markUpdate(workInProgress);\n }\n } else {\n markUpdate(workInProgress);\n }\n+ if (updateQueue && updateQueue.hasCallback) {\n+ \/\/ Transfer update queue to callbackList field so callbacks can be\n+ \/\/ called during commit phase.\n+ workInProgress.callbackList = updateQueue;\n+ markCallback(workInProgress);\n+ }\n return null;\n case HostContainer:\n transferOutput(workInProgress.child, workInProgress);\ndiff --git a\/src\/renderers\/shared\/fiber\/ReactFiberScheduler.js b\/src\/renderers\/shared\/fiber\/ReactFiberScheduler.js\nindex 5fc00776c7..fb4e5e885b 100644\n--- a\/src\/renderers\/shared\/fiber\/ReactFiberScheduler.js\n+++ b\/src\/renderers\/shared\/fiber\/ReactFiberScheduler.js\n@@ -39,6 +39,11 @@ var {\n Update,\n PlacementAndUpdate,\n Deletion,\n+ Callback,\n+ PlacementAndCallback,\n+ UpdateAndCallback,\n+ PlacementAndUpdateAndCallback,\n+ DeletionAndCallback,\n } = require('ReactTypeOfSideEffect');\n \n var {\n@@ -52,9 +57,6 @@ if (__DEV__) {\n var timeHeuristicForUnitOfWork = 1;\n \n module.exports = function(config : HostConfig) {\n- \/\/ Use a closure to circumvent the circular dependency between the scheduler\n- \/\/ and ReactFiberBeginWork. Don't know if there's a better way to do this.\n-\n const { beginWork } = ReactFiberBeginWork(config, scheduleUpdate);\n const { completeWork } = ReactFiberCompleteWork(config);\n const { commitInsertion, commitDeletion, commitWork, commitLifeCycles } =\n@@ -139,28 +141,34 @@ module.exports = function(config : HostConfig) {\n let effectfulFiber = finishedWork.firstEffect;\n while (effectfulFiber) {\n switch (effectfulFiber.effectTag) {\n- case Placement: {\n+ case Placement:\n+ case PlacementAndCallback: {\n commitInsertion(effectfulFiber);\n- \/\/ Clear the effect tag so that we know that this is inserted, before\n+ \/\/ Clear the \"placement\" from effect tag so that we know that this is inserted, before\n \/\/ any life-cycles like componentDidMount gets called.\n effectfulFiber.effectTag = NoEffect;\n break;\n }\n- case PlacementAndUpdate: {\n+ case PlacementAndUpdate:\n+ case PlacementAndUpdateAndCallback: {\n+ \/\/ Placement\n commitInsertion(effectfulFiber);\n- const current = effectfulFiber.alternate;\n- commitWork(current, effectfulFiber);\n \/\/ Clear the \"placement\" from effect tag so that we know that this is inserted, before\n \/\/ any life-cycles like componentDidMount gets called.\n effectfulFiber.effectTag = Update;\n+\n+ \/\/ Update\n+ const current = effectfulFiber.alternate;\n+ commitWork(current, effectfulFiber);\n break;\n }\n- case Update: {\n+ case Update:\n+ case UpdateAndCallback:\n const current = effectfulFiber.alternate;\n commitWork(current, effectfulFiber);\n break;\n- }\n- case Deletion: {\n+ case Deletion:\n+ case DeletionAndCallback:\n \/\/ Deletion might cause an error in componentWillUnmount().\n \/\/ We will continue nevertheless and handle those later on.\n const trappedErrors = commitDeletion(effectfulFiber);\n@@ -176,8 +184,8 @@ module.exports = function(config : HostConfig) {\n }\n }\n break;\n- }\n }\n+\n effectfulFiber = effectfulFiber.nextEffect;\n }\n \n@@ -186,8 +194,7 @@ module.exports = function(config : HostConfig) {\n \/\/ already been invoked.\n effectfulFiber = finishedWork.firstEffect;\n while (effectfulFiber) {\n- if (effectfulFiber.effectTag === Update ||\n- effectfulFiber.effectTag === PlacementAndUpdate) {\n+ if (effectfulFiber.effectTag & (Update | Callback)) {\n const current = effectfulFiber.alternate;\n const trappedError = commitLifeCycles(current, effectfulFiber);\n if (trappedError) {\n@@ -540,22 +547,22 @@ module.exports = function(config : HostConfig) {\n }\n }\n \n- function performAndHandleErrors(priorityLevel : PriorityLevel, deadline : ?Deadline) {\n+ function performAndHandleErrors(priorityLevel : PriorityLevel, deadline : null | Deadline) {\n \/\/ The exact priority level doesn't matter, so long as it's in range of the\n \/\/ work (sync, animation, deferred) being performed.\n try {\n if (priorityLevel === SynchronousPriority) {\n performSynchronousWorkUnsafe();\n- }\n- if (priorityLevel > AnimationPriority) {\n+ } else if (priorityLevel > AnimationPriority) {\n if (!deadline) {\n throw new Error('No deadline');\n } else {\n performDeferredWorkUnsafe(deadline);\n }\n return;\n+ } else {\n+ performAnimationWorkUnsafe();\n }\n- performAnimationWorkUnsafe();\n } catch (error) {\n const failedUnitOfWork = nextUnitOfWork;\n \/\/ Reset because it points to the error boundary:\n@@ -639,31 +646,25 @@ module.exports = function(config : HostConfig) {\n }\n }\n \n- function scheduleWork(root : FiberRoot, priorityLevel : ?PriorityLevel) {\n- if (priorityLevel == null) {\n- priorityLevel = priorityContext;\n- }\n-\n- if (priorityLevel === SynchronousPriority) {\n- scheduleSynchronousWork(root);\n- }\n+ function scheduleWork(root : FiberRoot) {\n+ scheduleWorkAtPriority(root, priorityContext);\n+ }\n \n+ function scheduleWorkAtPriority(root : FiberRoot, priorityLevel : PriorityLevel) {\n if (priorityLevel === NoWork) {\n return;\n- }\n- if (priorityLevel > AnimationPriority) {\n+ } else if (priorityLevel === SynchronousPriority) {\n+ scheduleSynchronousWork(root);\n+ } else if (priorityLevel <= AnimationPriority) {\n+ scheduleAnimationWork(root, priorityLevel);\n+ } else {\n scheduleDeferredWork(root, priorityLevel);\n return;\n }\n- scheduleAnimationWork(root, priorityLevel);\n }\n \n- function scheduleUpdate(fiber: Fiber, priorityLevel : ?PriorityLevel): void {\n- \/\/ Use priority context if no priority is provided\n- if (priorityLevel == null) {\n- priorityLevel = priorityContext;\n- }\n-\n+ function scheduleUpdate(fiber : Fiber) {\n+ const priorityLevel = priorityContext;\n while (true) {\n if (fiber.pendingWorkPriority === NoWork ||\n fiber.pendingWorkPriority >= priorityLevel) {\n@@ -678,7 +679,7 @@ module.exports = function(config : HostConfig) {\n if (!fiber.return) {\n if (fiber.tag === HostContainer) {\n const root : FiberRoot = (fiber.stateNode : any);\n- scheduleWork(root, priorityLevel);\n+ scheduleWorkAtPriority(root, priorityLevel);\n return;\n } else {\n throw new Error('Invalid root');\ndiff --git a\/src\/renderers\/shared\/fiber\/ReactFiberUpdateQueue.js b\/src\/renderers\/shared\/fiber\/ReactFiberUpdateQueue.js\nindex 8e27e73981..b1d985771c 100644\n--- a\/src\/renderers\/shared\/fiber\/ReactFiberUpdateQueue.js\n+++ b\/src\/renderers\/shared\/fiber\/ReactFiberUpdateQueue.js\n@@ -22,6 +22,8 @@ type UpdateQueueNode = {\n export type UpdateQueue = UpdateQueueNode & {\n isReplace: boolean,\n isForced: boolean,\n+ hasUpdate: boolean,\n+ hasCallback: boolean,\n tail: UpdateQueueNode\n };\n \n@@ -33,6 +35,8 @@ exports.createUpdateQueue = function(partialState : mixed) : UpdateQueue {\n next: null,\n isReplace: false,\n isForced: false,\n+ hasUpdate: partialState != null,\n+ hasCallback: false,\n tail: (null : any),\n };\n queue.tail = queue;\n@@ -48,6 +52,7 @@ function addToQueue(queue : UpdateQueue, partialState : mixed) : UpdateQueue {\n };\n queue.tail.next = node;\n queue.tail = node;\n+ queue.hasUpdate = queue.hasUpdate || (partialState == null);\n return queue;\n }\n \n@@ -59,15 +64,21 @@ exports.addCallbackToQueue = function(queue : UpdateQueue, callback: Function) :\n addToQueue(queue, null);\n }\n queue.tail.callback = callback;\n+ queue.hasCallback = true;\n return queue;\n };\n \n exports.callCallbacks = function(queue : UpdateQueue, context : any) {\n let node : ?UpdateQueueNode = queue;\n while (node) {\n- if (node.callback && !node.callbackWasCalled) {\n+ const callback = node.callback;\n+ if (callback && !node.callbackWasCalled) {\n node.callbackWasCalled = true;\n- node.callback.call(context);\n+ if (typeof context !== 'undefined') {\n+ callback.call(context);\n+ } else {\n+ callback();\n+ }\n }\n node = node.next;\n }\ndiff --git a\/src\/renderers\/shared\/fiber\/ReactTypeOfSideEffect.js b\/src\/renderers\/shared\/fiber\/ReactTypeOfSideEffect.js\nindex 55a9cabc42..19daf44853 100644\n--- a\/src\/renderers\/shared\/fiber\/ReactTypeOfSideEffect.js\n+++ b\/src\/renderers\/shared\/fiber\/ReactTypeOfSideEffect.js\n@@ -12,12 +12,17 @@\n \n 'use strict';\n \n-export type TypeOfSideEffect = 0 | 1 | 2 | 3 | 4;\n+export type TypeOfSideEffect = 0 | 1 | 2 | 3 | 4 | 8 | 9 | 10 | 11 | 12;\n \n module.exports = {\n- NoEffect: 0,\n- Placement: 1,\n- Update: 2,\n- PlacementAndUpdate: 3,\n- Deletion: 4,\n+ NoEffect: 0, \/\/ 0b0000\n+ Placement: 1, \/\/ 0b0001\n+ Update: 2, \/\/ 0b0010\n+ PlacementAndUpdate: 3, \/\/ 0b0011\n+ Deletion: 4, \/\/ 0b0100\n+ Callback: 8, \/\/ 0b1000\n+ PlacementAndCallback: 9, \/\/ 0b1001\n+ UpdateAndCallback: 10, \/\/ 0b1010\n+ PlacementAndUpdateAndCallback: 11, \/\/ 0b1011\n+ DeletionAndCallback: 12, \/\/ 0b1100\n };\ndiff --git a\/src\/renderers\/shared\/fiber\/__tests__\/ReactIncrementalSideEffects-test.js b\/src\/renderers\/shared\/fiber\/__tests__\/ReactIncrementalSideEffects-test.js\nindex 6722ccdf33..9e64dc43c1 100644\n--- a\/src\/renderers\/shared\/fiber\/__tests__\/ReactIncrementalSideEffects-test.js\n+++ b\/src\/renderers\/shared\/fiber\/__tests__\/ReactIncrementalSideEffects-test.js\n@@ -860,6 +860,35 @@ describe('ReactIncrementalSideEffects', () => {\n expect(called).toBe(true);\n });\n \n+ it('calls setState callback even if component bails out', () => {\n+ let instance;\n+ class Foo extends React.Component {\n+ constructor() {\n+ super();\n+ instance = this;\n+ this.state = { text: 'foo' };\n+ }\n+ shouldComponentUpdate(nextProps, nextState) {\n+ return this.state.text !== nextState.text;\n+ }\n+ render() {\n+ return ;\n+ }\n+ }\n+\n+ ReactNoop.render();\n+ ReactNoop.flush();\n+ expect(ReactNoop.getChildren()).toEqual([\n+ span('foo'),\n+ ]);\n+ let called = false;\n+ instance.setState({}, () => {\n+ called = true;\n+ });\n+ ReactNoop.flush();\n+ expect(called).toBe(true);\n+ });\n+\n \/\/ TODO: Test that callbacks are not lost if an update is preempted.\n \n it('calls componentWillUnmount after a deletion, even if nested', () => {\n","commit":{"authorEmail":"acdlite@fb.com","subject":"New effect type: Callback","authorName":"Andrew Clark","shortRevision":"c3ab541e0f","authoredAt":"2016-11-01T17:41:36-07:00","revision":"c3ab541e0f73056ca1b442876da5ede24197ed28"},"body":"This solves the problem I had with enqueueSetState and enqueueCallback\nbeing separate."}

dillon1000/react

Files changed