Clean up some style nits and other code detritus in the update queue
Andrew Clark committed
Dec 15, 2016 at 18:10 UTC
dfe3d089cc1e58be0a8afdecebc389b87746d4e9
1 file changed
+3
-11
src/renderers/shared/fiber/ReactFiberUpdateQueue.js
+3
-11
@@ -408,7 +408,6 @@ function beginUpdateQueue(
408
// a new state object.
409
let state = prevState;
410
let dontMutatePrevState = true;
411
- let isEmpty = true;
411
let callbackList = null;
412
let update = queue.first;
413
while (update && comparePriority(update.priorityLevel, priorityLevel) <= 0) {
@@ -426,7 +425,6 @@ function beginUpdateQueue(
425
// use the original `prevState`, not the accumulated `state`
426
state = getStateFromUpdate(update, instance, prevState, props);
427
dontMutatePrevState = true;
429
- isEmpty = false;
428
} else {
429
partialState = getStateFromUpdate(update, instance, state, props);
430
if (partialState) {
@@ -436,7 +434,6 @@ function beginUpdateQueue(
434
state = Object.assign(state, partialState);
435
}
436
dontMutatePrevState = false;
439
- isEmpty = false;
437
}
438
}
439
if (update.isForced) {
@@ -447,9 +444,10 @@ function beginUpdateQueue(
444
callbackList.last.next = update;
445
callbackList.last = update;
446
} else {
447
+ const callbackUpdate = cloneUpdate(update);
448
callbackList = {
451
- first: update,
452
- last: update,
449
+ first: callbackUpdate,
450
+ last: callbackUpdate,
451
hasForceUpdate: false,
452
};
453
}
@@ -458,18 +456,12 @@ function beginUpdateQueue(
456
update = update.next;
457
}
458
461
- if (isEmpty) {
462
- // None of the updates contained state. Use the original state object.
463
- state = prevState;
464
- }
465
-
459
if (!queue.first && !queue.hasForceUpdate) {
460
// Queue is now empty
461
workInProgress.updateQueue = null;
462
}
463
464
workInProgress.callbackList = callbackList;
472
- workInProgress.memoizedState = state;
465
466
if (__DEV__) {
467
queue.isProcessing = false;