diff --git a/packages/react-reconciler/src/ReactUpdateQueue.js b/packages/react-reconciler/src/ReactUpdateQueue.js index 22e88ae8cc..f4d2354f2d 100644 --- a/packages/react-reconciler/src/ReactUpdateQueue.js +++ b/packages/react-reconciler/src/ReactUpdateQueue.js @@ -599,19 +599,17 @@ export function commitUpdateQueue( } // Commit the effects - let effect = finishedQueue.firstEffect; + commitUpdateEffects(finishedQueue.firstEffect, instance); finishedQueue.firstEffect = finishedQueue.lastEffect = null; - while (effect !== null) { - const callback = effect.callback; - if (callback !== null) { - effect.callback = null; - callCallback(callback, instance); - } - effect = effect.nextEffect; - } - effect = finishedQueue.firstCapturedEffect; + commitUpdateEffects(finishedQueue.firstCapturedEffect, instance); finishedQueue.firstCapturedEffect = finishedQueue.lastCapturedEffect = null; +} + +function commitUpdateEffects( + effect: Update | null, + instance: any, +): void { while (effect !== null) { const callback = effect.callback; if (callback !== null) {