amirho/react
1
0
Fork 0
mirror of https://github.com/facebook/react.git synced 2026-02-24 04:33:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Catch first error from setState updaters

Browse Source
This commit is contained in:
Dan Abramov
2016-11-14 12:55:59 +00:00
parent 64cba04bf9
commit c8451bd0d8
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/renderers/shared/fiber/ReactFiberUpdateQueue.js
View File

@@ -71,7 +71,7 @@ exports.addCallbackToQueue = function(queue : UpdateQueue, callback: Function) :
exports.callCallbacks = function(queue : UpdateQueue, context : any) : Error | null {
let node : ?UpdateQueueNode = queue;
let error = null;
let firstError = null;
while (node) {
const callback = node.callback;
if (callback && !node.callbackWasCalled) {
@@ -82,13 +82,13 @@ exports.callCallbacks = function(queue : UpdateQueue, context : any) : Error | n
} else {
callback();
}
} catch (e) {
error = e;
} catch (error) {
firstError = firstError || error;
}
}
node = node.next;
}
return error;
return firstError;
};
exports.mergeUpdateQueue = function(queue : UpdateQueue, instance : any, prevState : any, props : any) : any {