{"commit":{"shortRevision":"d47a3a36ee","revision":"d47a3a36ee9de36cf32cd9233f923ced07b5d79d","authoredAt":"2016-12-21T13:24:08-06:00","authorEmail":"acdlite@me.com","subject":"Merge pull request #8585 from acdlite\/batchstateandcallback","authorName":"Andrew Clark"},"parents":["afd4a54d2a1b95a3e6df3052c4af63bb4154f05b","f4c0c9997362730c2b5182d6a7db19e5e4f9fee5"],"files":[{"status":"M","path":"src\/isomorphic\/classic\/class\/ReactClass.js"},{"status":"M","path":"src\/isomorphic\/modern\/class\/ReactComponent.js"},{"status":"M","path":"src\/isomorphic\/modern\/class\/ReactNoopUpdateQueue.js"},{"status":"M","path":"src\/renderers\/dom\/stack\/server\/ReactServerUpdateQueue.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\/ReactFiberReconciler.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\/shared\/__tests__\/ReactCompositeComponentState-test.js"},{"status":"M","path":"src\/renderers\/shared\/shared\/__tests__\/ReactUpdates-test.js"},{"status":"M","path":"src\/renderers\/shared\/stack\/reconciler\/ReactUpdateQueue.js"}],"patch":"diff --git a\/src\/isomorphic\/classic\/class\/ReactClass.js b\/src\/isomorphic\/classic\/class\/ReactClass.js\nindex 475f08d7d8..f7cc206fd0 100644\n--- a\/src\/isomorphic\/classic\/class\/ReactClass.js\n+++ b\/src\/isomorphic\/classic\/class\/ReactClass.js\n@@ -728,10 +728,7 @@ var ReactClassMixin = {\n * type signature and the only use case for this, is to avoid that.\n *\/\n replaceState: function(newState, callback) {\n- this.updater.enqueueReplaceState(this, newState);\n- if (callback) {\n- this.updater.enqueueCallback(this, callback, 'replaceState');\n- }\n+ this.updater.enqueueReplaceState(this, newState, callback, 'replaceState');\n },\n \n \/**\ndiff --git a\/src\/isomorphic\/modern\/class\/ReactComponent.js b\/src\/isomorphic\/modern\/class\/ReactComponent.js\nindex b93da63e94..48c5af86a3 100644\n--- a\/src\/isomorphic\/modern\/class\/ReactComponent.js\n+++ b\/src\/isomorphic\/modern\/class\/ReactComponent.js\n@@ -65,10 +65,7 @@ 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- this.updater.enqueueSetState(this, partialState);\n- if (callback) {\n- this.updater.enqueueCallback(this, callback, 'setState');\n- }\n+ this.updater.enqueueSetState(this, partialState, callback, 'setState');\n };\n \n \/**\n@@ -86,10 +83,7 @@ ReactComponent.prototype.setState = function(partialState, callback) {\n * @protected\n *\/\n ReactComponent.prototype.forceUpdate = function(callback) {\n- this.updater.enqueueForceUpdate(this);\n- if (callback) {\n- this.updater.enqueueCallback(this, callback, 'forceUpdate');\n- }\n+ this.updater.enqueueForceUpdate(this, callback, 'forceUpdate');\n };\n \n \/**\ndiff --git a\/src\/isomorphic\/modern\/class\/ReactNoopUpdateQueue.js b\/src\/isomorphic\/modern\/class\/ReactNoopUpdateQueue.js\nindex 49d4c72660..7e657e1425 100644\n--- a\/src\/isomorphic\/modern\/class\/ReactNoopUpdateQueue.js\n+++ b\/src\/isomorphic\/modern\/class\/ReactNoopUpdateQueue.js\n@@ -44,16 +44,6 @@ var ReactNoopUpdateQueue = {\n return false;\n },\n \n- \/**\n- * Enqueue a callback that will be executed after all the pending updates\n- * have processed.\n- *\n- * @param {ReactClass} publicInstance The instance to use as `this` context.\n- * @param {?function} callback Called after state is updated.\n- * @internal\n- *\/\n- enqueueCallback: function(publicInstance, callback) { },\n-\n \/**\n * Forces an update. This should only be invoked when it is known with\n * certainty that we are **not** in a DOM transaction.\n@@ -65,9 +55,11 @@ var ReactNoopUpdateQueue = {\n * `componentWillUpdate` and `componentDidUpdate`.\n *\n * @param {ReactClass} publicInstance The instance that should rerender.\n+ * @param {?function} callback Called after component is updated.\n+ * @param {?string} Name of the calling function in the public API.\n * @internal\n *\/\n- enqueueForceUpdate: function(publicInstance) {\n+ enqueueForceUpdate: function(publicInstance, callback, callerName) {\n warnNoop(publicInstance, 'forceUpdate');\n },\n \n@@ -80,9 +72,11 @@ var ReactNoopUpdateQueue = {\n *\n * @param {ReactClass} publicInstance The instance that should rerender.\n * @param {object} completeState Next state.\n+ * @param {?function} callback Called after component is updated.\n+ * @param {?string} Name of the calling function in the public API.\n * @internal\n *\/\n- enqueueReplaceState: function(publicInstance, completeState) {\n+ enqueueReplaceState: function(publicInstance, completeState, callback, callerName) {\n warnNoop(publicInstance, 'replaceState');\n },\n \n@@ -94,9 +88,11 @@ var ReactNoopUpdateQueue = {\n *\n * @param {ReactClass} publicInstance The instance that should rerender.\n * @param {object} partialState Next partial state to be merged with state.\n+ * @param {?function} callback Called after component is updated.\n+ * @param {?string} Name of the calling function in the public API.\n * @internal\n *\/\n- enqueueSetState: function(publicInstance, partialState) {\n+ enqueueSetState: function(publicInstance, partialState, callback, callerName) {\n warnNoop(publicInstance, 'setState');\n },\n };\ndiff --git a\/src\/renderers\/dom\/stack\/server\/ReactServerUpdateQueue.js b\/src\/renderers\/dom\/stack\/server\/ReactServerUpdateQueue.js\nindex b1e6a54c2e..546c9c967e 100644\n--- a\/src\/renderers\/dom\/stack\/server\/ReactServerUpdateQueue.js\n+++ b\/src\/renderers\/dom\/stack\/server\/ReactServerUpdateQueue.js\n@@ -58,20 +58,6 @@ class ReactServerUpdateQueue {\n return false;\n }\n \n- \/**\n- * Enqueue a callback that will be executed after all the pending updates\n- * have processed.\n- *\n- * @param {ReactClass} publicInstance The instance to use as `this` context.\n- * @param {?function} callback Called after state is updated.\n- * @internal\n- *\/\n- enqueueCallback(publicInstance: ReactComponent, callback?: Function, callerName?: string) {\n- if (this.transaction.isInTransaction()) {\n- ReactUpdateQueue.enqueueCallback(publicInstance, callback, callerName);\n- }\n- }\n-\n \/**\n * Forces an update. This should only be invoked when it is known with\n * certainty that we are **not** in a DOM transaction.\n@@ -83,11 +69,13 @@ class ReactServerUpdateQueue {\n * `componentWillUpdate` and `componentDidUpdate`.\n *\n * @param {ReactClass} publicInstance The instance that should rerender.\n+ * @param {?function} callback Called after component is updated.\n+ * @param {?string} Name of the calling function in the public API.\n * @internal\n *\/\n- enqueueForceUpdate(publicInstance: ReactComponent) {\n+ enqueueForceUpdate(publicInstance: ReactComponent, callback?: Function, callerName?: string) {\n if (this.transaction.isInTransaction()) {\n- ReactUpdateQueue.enqueueForceUpdate(publicInstance);\n+ ReactUpdateQueue.enqueueForceUpdate(publicInstance, callback, callerName);\n } else {\n warnNoop(publicInstance, 'forceUpdate');\n }\n@@ -102,11 +90,18 @@ class ReactServerUpdateQueue {\n *\n * @param {ReactClass} publicInstance The instance that should rerender.\n * @param {object|function} completeState Next state.\n+ * @param {?function} callback Called after component is updated.\n+ * @param {?string} Name of the calling function in the public API.\n * @internal\n *\/\n- enqueueReplaceState(publicInstance: ReactComponent, completeState: Object|Function) {\n+ enqueueReplaceState(\n+ publicInstance: ReactComponent,\n+ completeState: Object|Function,\n+ callback?: Function,\n+ callerName?: string\n+ ) {\n if (this.transaction.isInTransaction()) {\n- ReactUpdateQueue.enqueueReplaceState(publicInstance, completeState);\n+ ReactUpdateQueue.enqueueReplaceState(publicInstance, completeState, callback, callerName);\n } else {\n warnNoop(publicInstance, 'replaceState');\n }\n@@ -122,9 +117,14 @@ class ReactServerUpdateQueue {\n * @param {object|function} partialState Next partial state to be merged with state.\n * @internal\n *\/\n- enqueueSetState(publicInstance: ReactComponent, partialState: Object|Function) {\n+ enqueueSetState(\n+ publicInstance: ReactComponent,\n+ partialState: Object|Function,\n+ callback?: Function,\n+ callerName?: string\n+ ) {\n if (this.transaction.isInTransaction()) {\n- ReactUpdateQueue.enqueueSetState(publicInstance, partialState);\n+ ReactUpdateQueue.enqueueSetState(publicInstance, partialState, callback, callerName);\n } else {\n warnNoop(publicInstance, 'setState');\n }\ndiff --git a\/src\/renderers\/shared\/fiber\/ReactFiberBeginWork.js b\/src\/renderers\/shared\/fiber\/ReactFiberBeginWork.js\nindex f7442c7bbd..17142c6a06 100644\n--- a\/src\/renderers\/shared\/fiber\/ReactFiberBeginWork.js\n+++ b\/src\/renderers\/shared\/fiber\/ReactFiberBeginWork.js\n@@ -71,10 +71,8 @@ if (__DEV__) {\n module.exports = function(\n config : HostConfig,\n hostContext : HostContext,\n- scheduleSetState: (fiber : Fiber, partialState : any) => void,\n- scheduleReplaceState: (fiber : Fiber, state : any) => void,\n- scheduleForceUpdate: (fiber : Fiber) => void,\n- scheduleUpdateCallback: (fiber : Fiber, callback : Function) => void,\n+ scheduleUpdate : (fiber : Fiber, priorityLevel : PriorityLevel) => void,\n+ getPriorityContext : () => PriorityLevel,\n ) {\n \n const { shouldSetTextContent } = config;\n@@ -91,12 +89,7 @@ module.exports = function(\n mountClassInstance,\n resumeMountClassInstance,\n updateClassInstance,\n- } = ReactFiberClassComponent(\n- scheduleSetState,\n- scheduleReplaceState,\n- scheduleForceUpdate,\n- scheduleUpdateCallback\n- );\n+ } = ReactFiberClassComponent(scheduleUpdate, getPriorityContext);\n \n function markChildAsProgressed(current, workInProgress, priorityLevel) {\n \/\/ We now have clones. Let's store them as the currently progressed work.\ndiff --git a\/src\/renderers\/shared\/fiber\/ReactFiberClassComponent.js b\/src\/renderers\/shared\/fiber\/ReactFiberClassComponent.js\nindex b8813947b0..99e9a08416 100644\n--- a\/src\/renderers\/shared\/fiber\/ReactFiberClassComponent.js\n+++ b\/src\/renderers\/shared\/fiber\/ReactFiberClassComponent.js\n@@ -19,6 +19,9 @@ var {\n getMaskedContext,\n } = require('ReactFiberContext');\n var {\n+ addUpdate,\n+ addReplaceUpdate,\n+ addForceUpdate,\n beginUpdateQueue,\n } = require('ReactFiberUpdateQueue');\n var { hasContextChanged } = require('ReactFiberContext');\n@@ -31,30 +34,30 @@ var invariant = require('invariant');\n const isArray = Array.isArray;\n \n module.exports = function(\n- scheduleSetState: (fiber : Fiber, partialState : any) => void,\n- scheduleReplaceState: (fiber : Fiber, state : any) => void,\n- scheduleForceUpdate: (fiber : Fiber) => void,\n- scheduleUpdateCallback: (fiber : Fiber, callback : Function) => void,\n+ scheduleUpdate : (fiber : Fiber, priorityLevel : PriorityLevel) => void,\n+ getPriorityContext : () => PriorityLevel,\n ) {\n \n \/\/ Class component state updater\n const updater = {\n isMounted,\n- enqueueSetState(instance, partialState) {\n+ enqueueSetState(instance, partialState, callback) {\n const fiber = ReactInstanceMap.get(instance);\n- scheduleSetState(fiber, partialState);\n+ const priorityLevel = getPriorityContext();\n+ addUpdate(fiber, partialState, callback || null, priorityLevel);\n+ scheduleUpdate(fiber, priorityLevel);\n },\n- enqueueReplaceState(instance, state) {\n+ enqueueReplaceState(instance, state, callback) {\n const fiber = ReactInstanceMap.get(instance);\n- scheduleReplaceState(fiber, state);\n+ const priorityLevel = getPriorityContext();\n+ addReplaceUpdate(fiber, state, callback || null, priorityLevel);\n+ scheduleUpdate(fiber, priorityLevel);\n },\n- enqueueForceUpdate(instance) {\n+ enqueueForceUpdate(instance, callback) {\n const fiber = ReactInstanceMap.get(instance);\n- scheduleForceUpdate(fiber);\n- },\n- enqueueCallback(instance, callback) {\n- const fiber = ReactInstanceMap.get(instance);\n- scheduleUpdateCallback(fiber, callback);\n+ const priorityLevel = getPriorityContext();\n+ addForceUpdate(fiber, callback || null, priorityLevel);\n+ scheduleUpdate(fiber, priorityLevel);\n },\n };\n \ndiff --git a\/src\/renderers\/shared\/fiber\/ReactFiberReconciler.js b\/src\/renderers\/shared\/fiber\/ReactFiberReconciler.js\nindex d81bee1ebd..2b63d3c5f9 100644\n--- a\/src\/renderers\/shared\/fiber\/ReactFiberReconciler.js\n+++ b\/src\/renderers\/shared\/fiber\/ReactFiberReconciler.js\n@@ -17,6 +17,10 @@ import type { FiberRoot } from 'ReactFiberRoot';\n import type { PriorityLevel } from 'ReactPriorityLevel';\n import type { ReactNodeList } from 'ReactTypes';\n \n+var {\n+ addTopLevelUpdate,\n+} = require('ReactFiberUpdateQueue');\n+\n var {\n findCurrentUnmaskedContext,\n isContextProvider,\n@@ -98,14 +102,21 @@ getContextForSubtree._injectFiber(function(fiber : Fiber) {\n module.exports = function(config : HostConfig) : Reconciler {\n \n var {\n- scheduleTopLevelSetState,\n- scheduleUpdateCallback,\n+ scheduleUpdate,\n+ getPriorityContext,\n performWithPriority,\n batchedUpdates,\n syncUpdates,\n deferredUpdates,\n } = ReactFiberScheduler(config);\n \n+ function scheduleTopLevelUpdate(current : Fiber, element : ReactNodeList, callback : ?Function) {\n+ const priorityLevel = getPriorityContext();\n+ const nextState = { element };\n+ addTopLevelUpdate(current, nextState, callback || null, priorityLevel);\n+ scheduleUpdate(current, priorityLevel);\n+ }\n+\n return {\n \n mountContainer(element : ReactNodeList, containerInfo : C, parentComponent : ?ReactComponent, callback: ?Function) : OpaqueNode {\n@@ -113,10 +124,7 @@ module.exports = function(config : HostConfig(config : HostConfig(config : HostConfig(config : HostConfig(config : HostConfig(config : HostConfig | null,\n+ callback : Callback | null,\n priorityLevel : PriorityLevel\n ) : void {\n const update = {\n priorityLevel,\n partialState,\n- callback: null,\n+ callback,\n isReplace: false,\n isForced: false,\n isTopLevelUnmount: false,\n@@ -306,12 +307,13 @@ exports.addUpdate = addUpdate;\n function addReplaceUpdate(\n fiber : Fiber,\n state : any | null,\n+ callback : Callback | null,\n priorityLevel : PriorityLevel\n ) : void {\n const update = {\n priorityLevel,\n partialState: state,\n- callback: null,\n+ callback,\n isReplace: true,\n isForced: false,\n isTopLevelUnmount: false,\n@@ -326,11 +328,15 @@ function addReplaceUpdate(\n }\n exports.addReplaceUpdate = addReplaceUpdate;\n \n-function addForceUpdate(fiber : Fiber, priorityLevel : PriorityLevel) : void {\n+function addForceUpdate(\n+ fiber : Fiber,\n+ callback : Callback | null,\n+ priorityLevel : PriorityLevel\n+) : void {\n const update = {\n priorityLevel,\n partialState: null,\n- callback: null,\n+ callback,\n isReplace: false,\n isForced: true,\n isTopLevelUnmount: false,\n@@ -344,21 +350,6 @@ function addForceUpdate(fiber : Fiber, priorityLevel : PriorityLevel) : void {\n }\n exports.addForceUpdate = addForceUpdate;\n \n-\n-function addCallback(fiber : Fiber, callback: Callback, priorityLevel : PriorityLevel) : void {\n- const update : Update = {\n- priorityLevel,\n- partialState: null,\n- callback,\n- isReplace: false,\n- isForced: false,\n- isTopLevelUnmount: false,\n- next: null,\n- };\n- insertUpdate(fiber, update);\n-}\n-exports.addCallback = addCallback;\n-\n function getPendingPriority(queue : UpdateQueue) : PriorityLevel {\n return queue.first ? queue.first.priorityLevel : NoWork;\n }\n@@ -367,14 +358,18 @@ exports.getPendingPriority = getPendingPriority;\n function addTopLevelUpdate(\n fiber : Fiber,\n partialState : PartialState,\n+ callback : Callback | null,\n priorityLevel : PriorityLevel\n ) : void {\n- const isTopLevelUnmount = partialState === null;\n+ const isTopLevelUnmount = Boolean(\n+ partialState &&\n+ partialState.element === null\n+ );\n \n const update = {\n priorityLevel,\n partialState,\n- callback: null,\n+ callback,\n isReplace: false,\n isForced: false,\n isTopLevelUnmount,\ndiff --git a\/src\/renderers\/shared\/shared\/__tests__\/ReactCompositeComponentState-test.js b\/src\/renderers\/shared\/shared\/__tests__\/ReactCompositeComponentState-test.js\nindex 446fafe747..d9e884cf89 100644\n--- a\/src\/renderers\/shared\/shared\/__tests__\/ReactCompositeComponentState-test.js\n+++ b\/src\/renderers\/shared\/shared\/__tests__\/ReactCompositeComponentState-test.js\n@@ -171,20 +171,8 @@ describe('ReactCompositeComponent-state', () => {\n ['componentDidMount-end', 'orange'],\n ['setState-sunrise', 'orange'],\n ['setState-orange', 'orange'],\n- ];\n-\n- \/\/ In Fiber, the initial callback is not enqueued until after any work\n- \/\/ scheduled by lifecycles has flushed (same semantics as a regular setState\n- \/\/ callback outside of a batch). In Stack, the initial render is scheduled\n- \/\/ inside of batchedUpdates, so the callback gets flushed right after\n- \/\/ componentDidMount.\n- \/\/ TODO: We should fix this, in both Stack and Fiber, so that the behavior\n- \/\/ is consistent regardless of whether you're in a batch.\n- if (!ReactDOMFeatureFlags.useFiber) {\n- expected.push(['initial-callback', 'orange']);\n- }\n-\n- expected.push(['shouldComponentUpdate-currentState', 'orange'],\n+ ['initial-callback', 'orange'],\n+ ['shouldComponentUpdate-currentState', 'orange'],\n ['shouldComponentUpdate-nextState', 'yellow'],\n ['componentWillUpdate-currentState', 'orange'],\n ['componentWillUpdate-nextState', 'yellow'],\n@@ -192,18 +180,11 @@ describe('ReactCompositeComponent-state', () => {\n ['componentDidUpdate-currentState', 'yellow'],\n ['componentDidUpdate-prevState', 'orange'],\n ['setState-yellow', 'yellow'],\n- );\n-\n- if (ReactDOMFeatureFlags.useFiber) {\n- expected.push(['initial-callback', 'yellow']);\n- }\n-\n- expected.push(\n ['componentWillReceiveProps-start', 'yellow'],\n \/\/ setState({color:'green'}) only enqueues a pending state.\n ['componentWillReceiveProps-end', 'yellow'],\n \/\/ pending state queue is processed\n- );\n+ ];\n \n if (ReactDOMFeatureFlags.useFiber) {\n \/\/ In Stack, this is never called because replaceState drops all updates\ndiff --git a\/src\/renderers\/shared\/shared\/__tests__\/ReactUpdates-test.js b\/src\/renderers\/shared\/shared\/__tests__\/ReactUpdates-test.js\nindex 31b9a84acf..a68f875abd 100644\n--- a\/src\/renderers\/shared\/shared\/__tests__\/ReactUpdates-test.js\n+++ b\/src\/renderers\/shared\/shared\/__tests__\/ReactUpdates-test.js\n@@ -648,16 +648,18 @@ describe('ReactUpdates', () => {\n 'Inner-render-1-0',\n 'Inner-didUpdate-1-0',\n 'Outer-didUpdate-1',\n+ \/\/ Happens in a batch, so don't re-render yet\n 'Inner-setState-1',\n- 'Inner-render-1-1',\n- 'Inner-didUpdate-1-1',\n- 'Inner-callback-1',\n 'Outer-callback-1',\n \n- 'Outer-setState-2',\n+ \/\/ Happens in a batch\n+ 'Outer-setState-2',\n+\n+ \/\/ Flush batched updates all at once\n 'Outer-render-2',\n 'Inner-render-2-1',\n 'Inner-didUpdate-2-1',\n+ 'Inner-callback-1',\n 'Outer-didUpdate-2',\n 'Inner-setState-2',\n 'Outer-callback-2',\ndiff --git a\/src\/renderers\/shared\/stack\/reconciler\/ReactUpdateQueue.js b\/src\/renderers\/shared\/stack\/reconciler\/ReactUpdateQueue.js\nindex 1b555520a7..dc9b881a5e 100644\n--- a\/src\/renderers\/shared\/stack\/reconciler\/ReactUpdateQueue.js\n+++ b\/src\/renderers\/shared\/stack\/reconciler\/ReactUpdateQueue.js\n@@ -112,40 +112,6 @@ var ReactUpdateQueue = {\n }\n },\n \n- \/**\n- * Enqueue a callback that will be executed after all the pending updates\n- * have processed.\n- *\n- * @param {ReactClass} publicInstance The instance to use as `this` context.\n- * @param {?function} callback Called after state is updated.\n- * @param {string} callerName Name of the calling function in the public API.\n- * @internal\n- *\/\n- enqueueCallback: function(publicInstance, callback, callerName) {\n- ReactUpdateQueue.validateCallback(callback, callerName);\n- var internalInstance = getInternalInstanceReadyForUpdate(publicInstance);\n-\n- \/\/ Previously we would throw an error if we didn't have an internal\n- \/\/ instance. Since we want to make it a no-op instead, we mirror the same\n- \/\/ behavior we have in other enqueue* methods.\n- \/\/ We also need to ignore callbacks in componentWillMount. See\n- \/\/ enqueueUpdates.\n- if (!internalInstance) {\n- return null;\n- }\n-\n- if (internalInstance._pendingCallbacks) {\n- internalInstance._pendingCallbacks.push(callback);\n- } else {\n- internalInstance._pendingCallbacks = [callback];\n- }\n- \/\/ TODO: The callback here is ignored when setState is called from\n- \/\/ componentWillMount. Either fix it or disallow doing so completely in\n- \/\/ favor of getInitialState. Alternatively, we can disallow\n- \/\/ componentWillMount during server-side rendering.\n- enqueueUpdate(internalInstance);\n- },\n-\n enqueueCallbackInternal: function(internalInstance, callback) {\n if (internalInstance._pendingCallbacks) {\n internalInstance._pendingCallbacks.push(callback);\n@@ -166,9 +132,11 @@ var ReactUpdateQueue = {\n * `componentWillUpdate` and `componentDidUpdate`.\n *\n * @param {ReactClass} publicInstance The instance that should rerender.\n+ * @param {?function} callback Called after component is updated.\n+ * @param {?string} Name of the calling function in the public API.\n * @internal\n *\/\n- enqueueForceUpdate: function(publicInstance) {\n+ enqueueForceUpdate: function(publicInstance, callback, callerName) {\n var internalInstance = getInternalInstanceReadyForUpdate(\n publicInstance,\n 'forceUpdate'\n@@ -178,6 +146,15 @@ var ReactUpdateQueue = {\n return;\n }\n \n+ if (callback) {\n+ ReactUpdateQueue.validateCallback(callback, callerName);\n+ if (internalInstance._pendingCallbacks) {\n+ internalInstance._pendingCallbacks.push(callback);\n+ } else {\n+ internalInstance._pendingCallbacks = [callback];\n+ }\n+ }\n+\n internalInstance._pendingForceUpdate = true;\n \n enqueueUpdate(internalInstance);\n@@ -192,9 +169,11 @@ var ReactUpdateQueue = {\n *\n * @param {ReactClass} publicInstance The instance that should rerender.\n * @param {object} completeState Next state.\n+ * @param {?function} callback Called after state is updated.\n+ * @param {?string} Name of the calling function in the public API.\n * @internal\n *\/\n- enqueueReplaceState: function(publicInstance, completeState) {\n+ enqueueReplaceState: function(publicInstance, completeState, callback, callerName) {\n var internalInstance = getInternalInstanceReadyForUpdate(\n publicInstance,\n 'replaceState'\n@@ -207,6 +186,15 @@ var ReactUpdateQueue = {\n internalInstance._pendingStateQueue = [completeState];\n internalInstance._pendingReplaceState = true;\n \n+ if (callback) {\n+ ReactUpdateQueue.validateCallback(callback, callerName);\n+ if (internalInstance._pendingCallbacks) {\n+ internalInstance._pendingCallbacks.push(callback);\n+ } else {\n+ internalInstance._pendingCallbacks = [callback];\n+ }\n+ }\n+\n enqueueUpdate(internalInstance);\n },\n \n@@ -218,9 +206,11 @@ var ReactUpdateQueue = {\n *\n * @param {ReactClass} publicInstance The instance that should rerender.\n * @param {object} partialState Next partial state to be merged with state.\n+ * @param {?function} callback Called after state is updated.\n+ * @param {?string} Name of the calling function in the public API.\n * @internal\n *\/\n- enqueueSetState: function(publicInstance, partialState) {\n+ enqueueSetState: function(publicInstance, partialState, callback, callerName) {\n if (__DEV__) {\n ReactInstrumentation.debugTool.onSetState();\n warning(\n@@ -244,6 +234,15 @@ var ReactUpdateQueue = {\n (internalInstance._pendingStateQueue = []);\n queue.push(partialState);\n \n+ if (callback) {\n+ ReactUpdateQueue.validateCallback(callback, callerName);\n+ if (internalInstance._pendingCallbacks) {\n+ internalInstance._pendingCallbacks.push(callback);\n+ } else {\n+ internalInstance._pendingCallbacks = [callback];\n+ }\n+ }\n+\n enqueueUpdate(internalInstance);\n },\n \n","body":"Schedule state and callback at the same time"}

dillon1000/react

Files changed