{"patch":"diff --git a\/src\/renderers\/__tests__\/ReactUpdates-test.js b\/src\/renderers\/__tests__\/ReactUpdates-test.js\nindex 4a455cc0bb..bbe0fc47cb 100644\n--- a\/src\/renderers\/__tests__\/ReactUpdates-test.js\n+++ b\/src\/renderers\/__tests__\/ReactUpdates-test.js\n@@ -901,6 +901,8 @@ describe('ReactUpdates', () => {\n });\n \n it('throws in setState if the update callback is not a function', () => {\n+ spyOn(console, 'error');\n+\n function Foo() {\n this.a = 1;\n this.b = 2;\n@@ -917,20 +919,37 @@ describe('ReactUpdates', () => {\n var component = ReactTestUtils.renderIntoDocument();\n \n expect(() => component.setState({}, 'no')).toThrowError(\n- 'setState(...): Expected the last optional `callback` argument ' +\n- 'to be a function. Instead received: string.'\n+ 'Invalid argument passed as callback. Expected a function. Instead ' +\n+ 'received: no',\n+ );\n+ expectDev(console.error.calls.argsFor(0)[0]).toContain(\n+ 'setState(...): Expected the last optional `callback` argument to be ' +\n+ 'a function. Instead received: no.'\n+ );\n+ component = ReactTestUtils.renderIntoDocument();\n+ expect(() => component.setState({}, {foo: 'bar'})).toThrowError(\n+ 'Invalid argument passed as callback. Expected a function. Instead ' +\n+ 'received: [object Object]',\n );\n- expect(() => component.setState({}, {})).toThrowError(\n- 'setState(...): Expected the last optional `callback` argument ' +\n- 'to be a function. Instead received: Object.'\n+ expectDev(console.error.calls.argsFor(1)[0]).toContain(\n+ 'setState(...): Expected the last optional `callback` argument to be ' +\n+ 'a function. Instead received: [object Object].'\n );\n+ component = ReactTestUtils.renderIntoDocument();\n expect(() => component.setState({}, new Foo())).toThrowError(\n- 'setState(...): Expected the last optional `callback` argument ' +\n- 'to be a function. Instead received: Foo (keys: a, b).'\n+ 'Invalid argument passed as callback. Expected a function. Instead ' +\n+ 'received: [object Object]',\n );\n+ expectDev(console.error.calls.argsFor(2)[0]).toContain(\n+ 'setState(...): Expected the last optional `callback` argument to be ' +\n+ 'a function. Instead received: [object Object].'\n+ );\n+ expect(console.error.calls.count()).toBe(3);\n });\n \n it('throws in replaceState if the update callback is not a function', () => {\n+ spyOn(console, 'error');\n+\n function Foo() {\n this.a = 1;\n this.b = 2;\n@@ -946,20 +965,37 @@ describe('ReactUpdates', () => {\n var component = ReactTestUtils.renderIntoDocument();\n \n expect(() => component.replaceState({}, 'no')).toThrowError(\n- 'replaceState(...): Expected the last optional `callback` argument ' +\n- 'to be a function. Instead received: string.'\n+ 'Invalid argument passed as callback. Expected a function. Instead ' +\n+ 'received: no',\n+ );\n+ expectDev(console.error.calls.argsFor(0)[0]).toContain(\n+ 'replaceState(...): Expected the last optional `callback` argument to be ' +\n+ 'a function. Instead received: no.'\n );\n- expect(() => component.replaceState({}, {})).toThrowError(\n- 'replaceState(...): Expected the last optional `callback` argument ' +\n- 'to be a function. Instead received: Object.'\n+ component = ReactTestUtils.renderIntoDocument();\n+ expect(() => component.replaceState({}, {foo: 'bar'})).toThrowError(\n+ 'Invalid argument passed as callback. Expected a function. Instead ' +\n+ 'received: [object Object]',\n );\n+ expectDev(console.error.calls.argsFor(1)[0]).toContain(\n+ 'replaceState(...): Expected the last optional `callback` argument to be ' +\n+ 'a function. Instead received: [object Object].'\n+ );\n+ component = ReactTestUtils.renderIntoDocument();\n expect(() => component.replaceState({}, new Foo())).toThrowError(\n- 'replaceState(...): Expected the last optional `callback` argument ' +\n- 'to be a function. Instead received: Foo (keys: a, b).'\n+ 'Invalid argument passed as callback. Expected a function. Instead ' +\n+ 'received: [object Object]',\n+ );\n+ expectDev(console.error.calls.argsFor(2)[0]).toContain(\n+ 'replaceState(...): Expected the last optional `callback` argument to be ' +\n+ 'a function. Instead received: [object Object].'\n );\n+ expect(console.error.calls.count()).toBe(3);\n });\n \n it('throws in forceUpdate if the update callback is not a function', () => {\n+ spyOn(console, 'error');\n+\n function Foo() {\n this.a = 1;\n this.b = 2;\n@@ -976,17 +1012,32 @@ describe('ReactUpdates', () => {\n var component = ReactTestUtils.renderIntoDocument();\n \n expect(() => component.forceUpdate('no')).toThrowError(\n- 'forceUpdate(...): Expected the last optional `callback` argument ' +\n- 'to be a function. Instead received: string.'\n+ 'Invalid argument passed as callback. Expected a function. Instead ' +\n+ 'received: no',\n );\n- expect(() => component.forceUpdate({})).toThrowError(\n- 'forceUpdate(...): Expected the last optional `callback` argument ' +\n- 'to be a function. Instead received: Object.'\n+ expectDev(console.error.calls.argsFor(0)[0]).toContain(\n+ 'forceUpdate(...): Expected the last optional `callback` argument to be ' +\n+ 'a function. Instead received: no.'\n );\n+ component = ReactTestUtils.renderIntoDocument();\n+ expect(() => component.forceUpdate({foo: 'bar'})).toThrowError(\n+ 'Invalid argument passed as callback. Expected a function. Instead ' +\n+ 'received: [object Object]',\n+ );\n+ expectDev(console.error.calls.argsFor(1)[0]).toContain(\n+ 'forceUpdate(...): Expected the last optional `callback` argument to be ' +\n+ 'a function. Instead received: [object Object].'\n+ );\n+ component = ReactTestUtils.renderIntoDocument();\n expect(() => component.forceUpdate(new Foo())).toThrowError(\n- 'forceUpdate(...): Expected the last optional `callback` argument ' +\n- 'to be a function. Instead received: Foo (keys: a, b).'\n+ 'Invalid argument passed as callback. Expected a function. Instead ' +\n+ 'received: [object Object]',\n+ );\n+ expectDev(console.error.calls.argsFor(2)[0]).toContain(\n+ 'forceUpdate(...): Expected the last optional `callback` argument to be ' +\n+ 'a function. Instead received: [object Object].'\n );\n+ expect(console.error.calls.count()).toBe(3);\n });\n \n it('does not update one component twice in a batch (#2410)', () => {\ndiff --git a\/src\/renderers\/dom\/shared\/__tests__\/ReactDOM-test.js b\/src\/renderers\/dom\/shared\/__tests__\/ReactDOM-test.js\nindex 25dd09ec83..c7c574a8fb 100644\n--- a\/src\/renderers\/dom\/shared\/__tests__\/ReactDOM-test.js\n+++ b\/src\/renderers\/dom\/shared\/__tests__\/ReactDOM-test.js\n@@ -118,6 +118,8 @@ describe('ReactDOM', () => {\n });\n \n it('throws in render() if the mount callback is not a function', () => {\n+ spyOn(console, 'error');\n+\n function Foo() {\n this.a = 1;\n this.b = 2;\n@@ -133,20 +135,35 @@ describe('ReactDOM', () => {\n \n var myDiv = document.createElement('div');\n expect(() => ReactDOM.render(, myDiv, 'no')).toThrowError(\n- 'render(...): Expected the last optional `callback` argument ' +\n- 'to be a function. Instead received: string.'\n+ 'Invalid argument passed as callback. Expected a function. Instead ' +\n+ 'received: no',\n+ );\n+ expectDev(console.error.calls.argsFor(0)[0]).toContain(\n+ 'render(...): Expected the last optional `callback` argument to be ' +\n+ 'a function. Instead received: no.'\n );\n- expect(() => ReactDOM.render(, myDiv, {})).toThrowError(\n- 'render(...): Expected the last optional `callback` argument ' +\n- 'to be a function. Instead received: Object.'\n+ expect(() => ReactDOM.render(, myDiv, {foo: 'bar'})).toThrowError(\n+ 'Invalid argument passed as callback. Expected a function. Instead ' +\n+ 'received: [object Object]',\n+ );\n+ expectDev(console.error.calls.argsFor(1)[0]).toContain(\n+ 'render(...): Expected the last optional `callback` argument to be ' +\n+ 'a function. Instead received: [object Object].'\n );\n expect(() => ReactDOM.render(, myDiv, new Foo())).toThrowError(\n- 'render(...): Expected the last optional `callback` argument ' +\n- 'to be a function. Instead received: Foo (keys: a, b).'\n+ 'Invalid argument passed as callback. Expected a function. Instead ' +\n+ 'received: [object Object]',\n+ );\n+ expectDev(console.error.calls.argsFor(2)[0]).toContain(\n+ 'render(...): Expected the last optional `callback` argument to be ' +\n+ 'a function. Instead received: [object Object].'\n );\n+ expect(console.error.calls.count()).toBe(3);\n });\n \n it('throws in render() if the update callback is not a function', () => {\n+ spyOn(console, 'error');\n+\n function Foo() {\n this.a = 1;\n this.b = 2;\n@@ -162,19 +179,33 @@ describe('ReactDOM', () => {\n \n var myDiv = document.createElement('div');\n ReactDOM.render(, myDiv);\n-\n expect(() => ReactDOM.render(, myDiv, 'no')).toThrowError(\n- 'render(...): Expected the last optional `callback` argument ' +\n- 'to be a function. Instead received: string.'\n+ 'Invalid argument passed as callback. Expected a function. Instead ' +\n+ 'received: no',\n+ );\n+ expectDev(console.error.calls.argsFor(0)[0]).toContain(\n+ 'render(...): Expected the last optional `callback` argument to be ' +\n+ 'a function. Instead received: no.'\n );\n- expect(() => ReactDOM.render(, myDiv, {})).toThrowError(\n- 'render(...): Expected the last optional `callback` argument ' +\n- 'to be a function. Instead received: Object.'\n+ ReactDOM.render(, myDiv); \/\/ Re-mount\n+ expect(() => ReactDOM.render(, myDiv, {foo: 'bar'})).toThrowError(\n+ 'Invalid argument passed as callback. Expected a function. Instead ' +\n+ 'received: [object Object]',\n );\n+ expectDev(console.error.calls.argsFor(1)[0]).toContain(\n+ 'render(...): Expected the last optional `callback` argument to be ' +\n+ 'a function. Instead received: [object Object].'\n+ );\n+ ReactDOM.render(, myDiv); \/\/ Re-mount\n expect(() => ReactDOM.render(, myDiv, new Foo())).toThrowError(\n- 'render(...): Expected the last optional `callback` argument ' +\n- 'to be a function. Instead received: Foo (keys: a, b).'\n+ 'Invalid argument passed as callback. Expected a function. Instead ' +\n+ 'received: [object Object]',\n+ );\n+ expectDev(console.error.calls.argsFor(2)[0]).toContain(\n+ 'render(...): Expected the last optional `callback` argument to be ' +\n+ 'a function. Instead received: [object Object].'\n );\n+ expect(console.error.calls.count()).toBe(3);\n });\n \n it('preserves focus', () => {\ndiff --git a\/src\/renderers\/dom\/stack\/client\/ReactMount.js b\/src\/renderers\/dom\/stack\/client\/ReactMount.js\nindex cd3fe68503..a1554d81bd 100644\n--- a\/src\/renderers\/dom\/stack\/client\/ReactMount.js\n+++ b\/src\/renderers\/dom\/stack\/client\/ReactMount.js\n@@ -384,6 +384,7 @@ var ReactMount = {\n \n if (callback) {\n componentInstance._pendingCallbacks = [function() {\n+ validateCallback(callback);\n callback.call(componentInstance._renderedComponent.getPublicInstance());\n }];\n }\n@@ -433,7 +434,15 @@ var ReactMount = {\n },\n \n _renderSubtreeIntoContainer: function(parentComponent, nextElement, container, callback) {\n- validateCallback(callback, 'ReactDOM.render');\n+ callback = callback === undefined ? null : callback;\n+ if (__DEV__) {\n+ warning(\n+ callback === null || typeof callback === 'function',\n+ 'render(...): Expected the last optional `callback` argument to be a ' +\n+ 'function. Instead received: %s.',\n+ String(callback)\n+ );\n+ }\n if (!React.isValidElement(nextElement)) {\n if (typeof nextElement === 'string') {\n invariant(\n@@ -489,6 +498,7 @@ var ReactMount = {\n if (shouldUpdateReactComponent(prevElement, nextElement)) {\n var publicInst = prevComponent._renderedComponent.getPublicInstance();\n var updatedCallback = callback && function() {\n+ validateCallback(callback);\n callback.call(publicInst);\n };\n ReactMount._updateRootComponent(\ndiff --git a\/src\/renderers\/shared\/fiber\/ReactFiberClassComponent.js b\/src\/renderers\/shared\/fiber\/ReactFiberClassComponent.js\nindex 94fbf67c21..87f3426099 100644\n--- a\/src\/renderers\/shared\/fiber\/ReactFiberClassComponent.js\n+++ b\/src\/renderers\/shared\/fiber\/ReactFiberClassComponent.js\n@@ -35,11 +35,23 @@ var { getComponentName, isMounted } = require('ReactFiberTreeReflection');\n var ReactInstanceMap = require('ReactInstanceMap');\n var emptyObject = require('emptyObject');\n var shallowEqual = require('shallowEqual');\n-var warning = require('warning');\n var invariant = require('invariant');\n \n const isArray = Array.isArray;\n \n+if (__DEV__) {\n+ var warning = require('warning');\n+ var warnOnInvalidCallback = function(callback : mixed, callerName : string) {\n+ warning(\n+ callback === null || typeof callback === 'function',\n+ '%s(...): Expected the last optional `callback` argument to be a ' +\n+ 'function. Instead received: %s.',\n+ callerName,\n+ String(callback)\n+ );\n+ };\n+}\n+\n module.exports = function(\n scheduleUpdate : (fiber : Fiber, priorityLevel : PriorityLevel) => void,\n getPriorityContext : () => PriorityLevel,\n@@ -53,19 +65,31 @@ module.exports = function(\n enqueueSetState(instance, partialState, callback) {\n const fiber = ReactInstanceMap.get(instance);\n const priorityLevel = getPriorityContext();\n- addUpdate(fiber, partialState, callback || null, priorityLevel);\n+ callback = callback === undefined ? null : callback;\n+ if (__DEV__) {\n+ warnOnInvalidCallback(callback, 'setState');\n+ }\n+ addUpdate(fiber, partialState, callback, priorityLevel);\n scheduleUpdate(fiber, priorityLevel);\n },\n enqueueReplaceState(instance, state, callback) {\n const fiber = ReactInstanceMap.get(instance);\n const priorityLevel = getPriorityContext();\n- addReplaceUpdate(fiber, state, callback || null, priorityLevel);\n+ callback = callback === undefined ? null : callback;\n+ if (__DEV__) {\n+ warnOnInvalidCallback(callback, 'replaceState');\n+ }\n+ addReplaceUpdate(fiber, state, callback, priorityLevel);\n scheduleUpdate(fiber, priorityLevel);\n },\n enqueueForceUpdate(instance, callback) {\n const fiber = ReactInstanceMap.get(instance);\n const priorityLevel = getPriorityContext();\n- addForceUpdate(fiber, callback || null, priorityLevel);\n+ callback = callback === undefined ? null : callback;\n+ if (__DEV__) {\n+ warnOnInvalidCallback(callback, 'forceUpdate');\n+ }\n+ addForceUpdate(fiber, callback, priorityLevel);\n scheduleUpdate(fiber, priorityLevel);\n },\n };\ndiff --git a\/src\/renderers\/shared\/fiber\/ReactFiberReconciler.js b\/src\/renderers\/shared\/fiber\/ReactFiberReconciler.js\nindex 1a429daf0a..00bb5b7d85 100644\n--- a\/src\/renderers\/shared\/fiber\/ReactFiberReconciler.js\n+++ b\/src\/renderers\/shared\/fiber\/ReactFiberReconciler.js\n@@ -30,6 +30,7 @@ var { createFiberRoot } = require('ReactFiberRoot');\n var ReactFiberScheduler = require('ReactFiberScheduler');\n \n if (__DEV__) {\n+ var warning = require('warning');\n var ReactFiberInstrumentation = require('ReactFiberInstrumentation');\n }\n \n@@ -145,7 +146,16 @@ module.exports = function(\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+ callback = callback === undefined ? null : callback;\n+ if (__DEV__) {\n+ warning(\n+ callback === null || typeof callback === 'function',\n+ 'render(...): Expected the last optional `callback` argument to be a ' +\n+ 'function. Instead received: %s.',\n+ String(callback)\n+ );\n+ }\n+ addTopLevelUpdate(current, nextState, callback, priorityLevel);\n scheduleUpdate(current, priorityLevel);\n }\n \ndiff --git a\/src\/renderers\/shared\/fiber\/ReactFiberUpdateQueue.js b\/src\/renderers\/shared\/fiber\/ReactFiberUpdateQueue.js\nindex bb70bec77d..93279e8e16 100644\n--- a\/src\/renderers\/shared\/fiber\/ReactFiberUpdateQueue.js\n+++ b\/src\/renderers\/shared\/fiber\/ReactFiberUpdateQueue.js\n@@ -25,14 +25,17 @@ const {\n TaskPriority,\n } = require('ReactPriorityLevel');\n \n-const validateCallback = require('validateCallback');\n-const warning = require('warning');\n+const invariant = require('invariant');\n+if (__DEV__) {\n+ var warning = require('warning');\n+}\n \n type PartialState =\n $Subtype |\n (prevState: State, props: Props) => $Subtype;\n \n-type Callback = () => void;\n+\/\/ Callbacks are not validated until invocation\n+type Callback = mixed;\n \n type Update = {\n priorityLevel: PriorityLevel,\n@@ -214,33 +217,20 @@ function findInsertionPosition(queue, update) : Update | null {\n \/\/ we shouldn't make a copy.\n \/\/\n \/\/ If the update is cloned, it returns the cloned update.\n-function insertUpdate(fiber : Fiber, update : Update, methodName : string) : Update | null {\n- validateCallback(update.callback, methodName);\n-\n+function insertUpdate(fiber : Fiber, update : Update) : Update | null {\n const queue1 = ensureUpdateQueue(fiber);\n const queue2 = fiber.alternate ? ensureUpdateQueue(fiber.alternate) : null;\n \n \/\/ Warn if an update is scheduled from inside an updater function.\n if (__DEV__) {\n if (queue1.isProcessing || (queue2 && queue2.isProcessing)) {\n- if (methodName === 'setState') {\n- warning(\n- false,\n- 'setState was called from inside the updater function of another' +\n- 'setState. A function passed as the first argument of setState ' +\n- 'should not contain any side-effects. Return a partial state ' +\n- 'object instead of calling setState again. Example: ' +\n- 'this.setState(function(state) { return { count: state.count + 1 }; })'\n- );\n- } else {\n- warning(\n- false,\n- '%s was called from inside the updater function of setState. A ' +\n- 'function passed as the first argument of setState ' +\n- 'should not contain any side-effects.',\n- methodName\n- );\n- }\n+ warning(\n+ false,\n+ 'An update (setState, replaceState, or forceUpdate) was scheduled ' +\n+ 'from inside an update function. Update functions should be pure, ' +\n+ 'with zero side-effects. Consider using componentDidUpdate or a ' +\n+ 'callback.'\n+ );\n }\n }\n \n@@ -287,7 +277,7 @@ function insertUpdate(fiber : Fiber, update : Update, methodName : string) : Upd\n function addUpdate(\n fiber : Fiber,\n partialState : PartialState | null,\n- callback : Callback | null,\n+ callback : mixed,\n priorityLevel : PriorityLevel\n ) : void {\n const update = {\n@@ -299,7 +289,7 @@ function addUpdate(\n isTopLevelUnmount: false,\n next: null,\n };\n- insertUpdate(fiber, update, 'setState');\n+ insertUpdate(fiber, update);\n }\n exports.addUpdate = addUpdate;\n \n@@ -318,7 +308,7 @@ function addReplaceUpdate(\n isTopLevelUnmount: false,\n next: null,\n };\n- insertUpdate(fiber, update, 'replaceState');\n+ insertUpdate(fiber, update);\n }\n exports.addReplaceUpdate = addReplaceUpdate;\n \n@@ -336,7 +326,7 @@ function addForceUpdate(\n isTopLevelUnmount: false,\n next: null,\n };\n- insertUpdate(fiber, update, 'forceUpdate');\n+ insertUpdate(fiber, update);\n }\n exports.addForceUpdate = addForceUpdate;\n \n@@ -365,7 +355,7 @@ function addTopLevelUpdate(\n isTopLevelUnmount,\n next: null,\n };\n- const update2 = insertUpdate(fiber, update, 'render');\n+ const update2 = insertUpdate(fiber, update);\n \n if (isTopLevelUnmount) {\n \/\/ Drop all updates that are lower-priority, so that the tree is not\n@@ -446,7 +436,7 @@ function beginUpdateQueue(\n }\n \/\/ Second condition ignores top-level unmount callbacks if they are not the\n \/\/ last update in the queue, since a subsequent update will cause a remount.\n- if (update.callback && !(update.isTopLevelUnmount && update.next)) {\n+ if (update.callback !== null && !(update.isTopLevelUnmount && update.next !== null)) {\n callbackList = callbackList || [];\n callbackList.push(update.callback);\n workInProgress.effectTag |= CallbackEffect;\n@@ -476,6 +466,12 @@ function commitCallbacks(finishedWork : Fiber, queue : UpdateQueue, context : mi\n }\n for (let i = 0; i < callbackList.length; i++) {\n const callback = callbackList[i];\n+ invariant(\n+ typeof callback === 'function',\n+ 'Invalid argument passed as callback. Expected a function. Instead ' +\n+ 'received: %s',\n+ String(callback)\n+ );\n callback.call(context);\n }\n }\ndiff --git a\/src\/renderers\/shared\/stack\/reconciler\/CallbackQueue.js b\/src\/renderers\/shared\/stack\/reconciler\/CallbackQueue.js\nindex 84e87cac3a..a6cd976129 100644\n--- a\/src\/renderers\/shared\/stack\/reconciler\/CallbackQueue.js\n+++ b\/src\/renderers\/shared\/stack\/reconciler\/CallbackQueue.js\n@@ -15,6 +15,7 @@\n var PooledClass = require('PooledClass');\n \n var invariant = require('invariant');\n+var validateCallback = require('validateCallback');\n \n \/**\n * A specialized pseudo-event module to help keep track of components waiting to\n@@ -70,6 +71,7 @@ class CallbackQueue {\n this._callbacks = null;\n this._contexts = null;\n for (var i = 0; i < callbacks.length; i++) {\n+ validateCallback(callbacks[i]);\n callbacks[i].call(contexts[i], arg);\n }\n callbacks.length = 0;\ndiff --git a\/src\/renderers\/shared\/stack\/reconciler\/ReactUpdateQueue.js b\/src\/renderers\/shared\/stack\/reconciler\/ReactUpdateQueue.js\nindex a9bed9832c..3fbdf6c741 100644\n--- a\/src\/renderers\/shared\/stack\/reconciler\/ReactUpdateQueue.js\n+++ b\/src\/renderers\/shared\/stack\/reconciler\/ReactUpdateQueue.js\n@@ -16,8 +16,18 @@ var ReactInstanceMap = require('ReactInstanceMap');\n var ReactInstrumentation = require('ReactInstrumentation');\n var ReactUpdates = require('ReactUpdates');\n \n-var warning = require('warning');\n-var validateCallback = require('validateCallback');\n+if (__DEV__) {\n+ var warning = require('warning');\n+ var warnOnInvalidCallback = function(callback : mixed, callerName : string) {\n+ warning(\n+ callback === null || typeof callback === 'function',\n+ '%s(...): Expected the last optional `callback` argument to be a ' +\n+ 'function. Instead received: %s.',\n+ callerName,\n+ String(callback)\n+ );\n+ };\n+}\n \n function enqueueUpdate(internalInstance) {\n ReactUpdates.enqueueUpdate(internalInstance);\n@@ -134,7 +144,8 @@ var ReactUpdateQueue = {\n }\n \n if (callback) {\n- validateCallback(callback, callerName);\n+ callback = callback === undefined ? null : callback;\n+ warnOnInvalidCallback(callback, callerName);\n if (internalInstance._pendingCallbacks) {\n internalInstance._pendingCallbacks.push(callback);\n } else {\n@@ -174,7 +185,8 @@ var ReactUpdateQueue = {\n internalInstance._pendingReplaceState = true;\n \n if (callback) {\n- validateCallback(callback, callerName);\n+ callback = callback === undefined ? null : callback;\n+ warnOnInvalidCallback(callback, callerName);\n if (internalInstance._pendingCallbacks) {\n internalInstance._pendingCallbacks.push(callback);\n } else {\n@@ -222,7 +234,8 @@ var ReactUpdateQueue = {\n queue.push(partialState);\n \n if (callback) {\n- validateCallback(callback, callerName);\n+ callback = callback === undefined ? null : callback;\n+ warnOnInvalidCallback(callback, callerName);\n if (internalInstance._pendingCallbacks) {\n internalInstance._pendingCallbacks.push(callback);\n } else {\ndiff --git a\/src\/renderers\/shared\/utils\/validateCallback.js b\/src\/renderers\/shared\/utils\/validateCallback.js\nindex 65c0260db9..657265b84f 100644\n--- a\/src\/renderers\/shared\/utils\/validateCallback.js\n+++ b\/src\/renderers\/shared\/utils\/validateCallback.js\n@@ -14,33 +14,13 @@\n \n const invariant = require('invariant');\n \n-function formatUnexpectedArgument(arg: any) {\n- let type = typeof arg;\n- if (type !== 'object') {\n- return type;\n- }\n- let displayName = arg.constructor && arg.constructor.name || type;\n- let keys = Object.keys(arg);\n- if (keys.length > 0 && keys.length < 20) {\n- return `${displayName} (keys: ${keys.join(', ')})`;\n- }\n- return displayName;\n-}\n-\n-function validateCallback(callback: ?Function, callerName: string) {\n- if (\n- callback !== null &&\n- callback !== undefined &&\n- typeof callback !== 'function'\n- ) {\n- invariant(\n- false,\n- '%s(...): Expected the last optional `callback` argument to be a ' +\n- 'function. Instead received: %s.',\n- callerName,\n- formatUnexpectedArgument(callback)\n- );\n- }\n+function validateCallback(callback: ?Function) {\n+ invariant(\n+ !callback || typeof callback === 'function',\n+ 'Invalid argument passed as callback. Expected a function. Instead ' +\n+ 'received: %s',\n+ String(callback)\n+ );\n }\n \n module.exports = validateCallback;\n","files":[{"status":"M","path":"src\/renderers\/__tests__\/ReactUpdates-test.js"},{"status":"M","path":"src\/renderers\/dom\/shared\/__tests__\/ReactDOM-test.js"},{"status":"M","path":"src\/renderers\/dom\/stack\/client\/ReactMount.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\/ReactFiberUpdateQueue.js"},{"status":"M","path":"src\/renderers\/shared\/stack\/reconciler\/CallbackQueue.js"},{"status":"M","path":"src\/renderers\/shared\/stack\/reconciler\/ReactUpdateQueue.js"},{"status":"M","path":"src\/renderers\/shared\/utils\/validateCallback.js"}],"parents":["00092957b659061482c61c9a41454ea27b467c5e","ea2ade251fc0205a328315ab00921600f03e94f3"],"commit":{"authorName":"Andrew Clark","subject":"Merge pull request #8974 from acdlite\/fibercallbackvalidation","authoredAt":"2017-02-13T12:15:42-08:00","revision":"5ee033e40b44300bbb87973b63423e45d6f96e7c","shortRevision":"5ee033e40b","authorEmail":"acdlite@me.com"},"body":"[Fiber] Move callback validation to top level"}

dillon1000/react

Files changed