{"body":"* Land #20615 in main fork\r\n\r\nIncludes change to interleaved updates.\r\n\r\n```\r\nyarn replace-fork\r\n```\r\n\r\n* Check deferRenderPhaseUpdateToNextBatch in test","files":[{"path":"packages\/react-reconciler\/src\/ReactFiberClassComponent.old.js","status":"M"},{"path":"packages\/react-reconciler\/src\/ReactFiberHooks.old.js","status":"M"},{"path":"packages\/react-reconciler\/src\/ReactFiberInterleavedUpdates.old.js","status":"A"},{"path":"packages\/react-reconciler\/src\/ReactFiberNewContext.old.js","status":"M"},{"path":"packages\/react-reconciler\/src\/ReactFiberReconciler.old.js","status":"M"},{"path":"packages\/react-reconciler\/src\/ReactFiberThrow.old.js","status":"M"},{"path":"packages\/react-reconciler\/src\/ReactFiberWorkLoop.old.js","status":"M"},{"path":"packages\/react-reconciler\/src\/ReactUpdateQueue.old.js","status":"M"},{"path":"packages\/react-reconciler\/src\/__tests__\/ReactIncrementalUpdates-test.js","status":"M"}],"parents":["dc27b5aaae5e1a028dc77412d5396466aaa87268"],"patch":"diff --git a\/packages\/react-reconciler\/src\/ReactFiberClassComponent.old.js b\/packages\/react-reconciler\/src\/ReactFiberClassComponent.old.js\nindex 36bf2d22f7..5f366e7c25 100644\n--- a\/packages\/react-reconciler\/src\/ReactFiberClassComponent.old.js\n+++ b\/packages\/react-reconciler\/src\/ReactFiberClassComponent.old.js\n@@ -214,7 +214,7 @@ const classComponentUpdater = {\n update.callback = callback;\n }\n \n- enqueueUpdate(fiber, update);\n+ enqueueUpdate(fiber, update, lane);\n const root = scheduleUpdateOnFiber(fiber, lane, eventTime);\n if (root !== null) {\n entangleTransitions(root, fiber, lane);\n@@ -249,7 +249,7 @@ const classComponentUpdater = {\n update.callback = callback;\n }\n \n- enqueueUpdate(fiber, update);\n+ enqueueUpdate(fiber, update, lane);\n const root = scheduleUpdateOnFiber(fiber, lane, eventTime);\n if (root !== null) {\n entangleTransitions(root, fiber, lane);\n@@ -283,7 +283,7 @@ const classComponentUpdater = {\n update.callback = callback;\n }\n \n- enqueueUpdate(fiber, update);\n+ enqueueUpdate(fiber, update, lane);\n const root = scheduleUpdateOnFiber(fiber, lane, eventTime);\n if (root !== null) {\n entangleTransitions(root, fiber, lane);\ndiff --git a\/packages\/react-reconciler\/src\/ReactFiberHooks.old.js b\/packages\/react-reconciler\/src\/ReactFiberHooks.old.js\nindex 35b0c2ca15..17038f14b0 100644\n--- a\/packages\/react-reconciler\/src\/ReactFiberHooks.old.js\n+++ b\/packages\/react-reconciler\/src\/ReactFiberHooks.old.js\n@@ -77,6 +77,7 @@ import {\n warnIfNotCurrentlyActingUpdatesInDev,\n warnIfNotScopedWithMatchingAct,\n markSkippedUpdateLanes,\n+ isInterleavedUpdate,\n } from '.\/ReactFiberWorkLoop.old';\n \n import invariant from 'shared\/invariant';\n@@ -110,6 +111,7 @@ import {\n enqueueUpdate,\n entangleTransitions,\n } from '.\/ReactUpdateQueue.old';\n+import {pushInterleavedQueue} from '.\/ReactFiberInterleavedUpdates.old';\n \n const {ReactCurrentDispatcher, ReactCurrentBatchConfig} = ReactSharedInternals;\n \n@@ -122,8 +124,9 @@ type Update = {|\n priority?: ReactPriorityLevel,\n |};\n \n-type UpdateQueue = {|\n+export type UpdateQueue = {|\n pending: Update | null,\n+ interleaved: Update | null,\n lanes: Lanes,\n dispatch: (A => mixed) | null,\n lastRenderedReducer: ((S, A) => S) | null,\n@@ -657,6 +660,7 @@ function mountReducer(\n hook.memoizedState = hook.baseState = initialState;\n const queue = (hook.queue = {\n pending: null,\n+ interleaved: null,\n lanes: NoLanes,\n dispatch: null,\n lastRenderedReducer: reducer,\n@@ -800,7 +804,22 @@ function updateReducer(\n queue.lastRenderedState = newState;\n }\n \n- if (baseQueue === null) {\n+ \/\/ Interleaved updates are stored on a separate queue. We aren't going to\n+ \/\/ process them during this render, but we do need to track which lanes\n+ \/\/ are remaining.\n+ const lastInterleaved = queue.interleaved;\n+ if (lastInterleaved !== null) {\n+ let interleaved = lastInterleaved;\n+ do {\n+ const interleavedLane = interleaved.lane;\n+ currentlyRenderingFiber.lanes = mergeLanes(\n+ currentlyRenderingFiber.lanes,\n+ interleavedLane,\n+ );\n+ markSkippedUpdateLanes(interleavedLane);\n+ interleaved = ((interleaved: any).next: Update);\n+ } while (interleaved !== lastInterleaved);\n+ } else if (baseQueue === null) {\n \/\/ `queue.lanes` is used for entangling transitions. We can set it back to\n \/\/ zero once the queue is empty.\n queue.lanes = NoLanes;\n@@ -1132,6 +1151,7 @@ function useMutableSource(\n \/\/ including any interleaving updates that occur.\n const newQueue = {\n pending: null,\n+ interleaved: null,\n lanes: NoLanes,\n dispatch: null,\n lastRenderedReducer: basicStateReducer,\n@@ -1188,6 +1208,7 @@ function mountState(\n hook.memoizedState = hook.baseState = initialState;\n const queue = (hook.queue = {\n pending: null,\n+ interleaved: null,\n lanes: NoLanes,\n dispatch: null,\n lastRenderedReducer: basicStateReducer,\n@@ -1869,7 +1890,7 @@ function refreshCache(fiber: Fiber, seedKey: ?() => T, seedValue: T) {\n cache: seededCache,\n };\n refreshUpdate.payload = payload;\n- enqueueUpdate(provider, refreshUpdate);\n+ enqueueUpdate(provider, refreshUpdate, lane);\n return;\n }\n }\n@@ -1904,17 +1925,6 @@ function dispatchAction(\n next: (null: any),\n };\n \n- \/\/ Append the update to the end of the list.\n- const pending = queue.pending;\n- if (pending === null) {\n- \/\/ This is the first update. Create a circular list.\n- update.next = update;\n- } else {\n- update.next = pending.next;\n- pending.next = update;\n- }\n- queue.pending = update;\n-\n const alternate = fiber.alternate;\n if (\n fiber === currentlyRenderingFiber ||\n@@ -1924,7 +1934,41 @@ function dispatchAction(\n \/\/ queue -> linked list of updates. After this render pass, we'll restart\n \/\/ and apply the stashed updates on top of the work-in-progress hook.\n didScheduleRenderPhaseUpdateDuringThisPass = didScheduleRenderPhaseUpdate = true;\n+ const pending = queue.pending;\n+ if (pending === null) {\n+ \/\/ This is the first update. Create a circular list.\n+ update.next = update;\n+ } else {\n+ update.next = pending.next;\n+ pending.next = update;\n+ }\n+ queue.pending = update;\n } else {\n+ if (isInterleavedUpdate(fiber, lane)) {\n+ const interleaved = queue.interleaved;\n+ if (interleaved === null) {\n+ \/\/ This is the first update. Create a circular list.\n+ update.next = update;\n+ \/\/ At the end of the current render, this queue's interleaved updates will\n+ \/\/ be transfered to the pending queue.\n+ pushInterleavedQueue(queue);\n+ } else {\n+ update.next = interleaved.next;\n+ interleaved.next = update;\n+ }\n+ queue.interleaved = update;\n+ } else {\n+ const pending = queue.pending;\n+ if (pending === null) {\n+ \/\/ This is the first update. Create a circular list.\n+ update.next = update;\n+ } else {\n+ update.next = pending.next;\n+ pending.next = update;\n+ }\n+ queue.pending = update;\n+ }\n+\n if (\n fiber.lanes === NoLanes &&\n (alternate === null || alternate.lanes === NoLanes)\ndiff --git a\/packages\/react-reconciler\/src\/ReactFiberInterleavedUpdates.old.js b\/packages\/react-reconciler\/src\/ReactFiberInterleavedUpdates.old.js\nnew file mode 100644\nindex 0000000000..2009679446\n--- \/dev\/null\n+++ b\/packages\/react-reconciler\/src\/ReactFiberInterleavedUpdates.old.js\n@@ -0,0 +1,55 @@\n+\/**\n+ * Copyright (c) Facebook, Inc. and its affiliates.\n+ *\n+ * This source code is licensed under the MIT license found in the\n+ * LICENSE file in the root directory of this source tree.\n+ *\n+ * @flow\n+ *\/\n+\n+import type {UpdateQueue as HookQueue} from '.\/ReactFiberHooks.old';\n+import type {SharedQueue as ClassQueue} from '.\/ReactUpdateQueue.old';\n+\n+\/\/ An array of all update queues that received updates during the current\n+\/\/ render. When this render exits, either because it finishes or because it is\n+\/\/ interrupted, the interleaved updates will be transfered onto the main part\n+\/\/ of the queue.\n+let interleavedQueues: Array<\n+ HookQueue | ClassQueue,\n+> | null = null;\n+\n+export function pushInterleavedQueue(\n+ queue: HookQueue | ClassQueue,\n+) {\n+ if (interleavedQueues === null) {\n+ interleavedQueues = [queue];\n+ } else {\n+ interleavedQueues.push(queue);\n+ }\n+}\n+\n+export function enqueueInterleavedUpdates() {\n+ \/\/ Transfer the interleaved updates onto the main queue. Each queue has a\n+ \/\/ `pending` field and an `interleaved` field. When they are not null, they\n+ \/\/ point to the last node in a circular linked list. We need to append the\n+ \/\/ interleaved list to the end of the pending list by joining them into a\n+ \/\/ single, circular list.\n+ if (interleavedQueues !== null) {\n+ for (let i = 0; i < interleavedQueues.length; i++) {\n+ const queue = interleavedQueues[i];\n+ const lastInterleavedUpdate = queue.interleaved;\n+ if (lastInterleavedUpdate !== null) {\n+ queue.interleaved = null;\n+ const firstInterleavedUpdate = lastInterleavedUpdate.next;\n+ const lastPendingUpdate = queue.pending;\n+ if (lastPendingUpdate !== null) {\n+ const firstPendingUpdate = lastPendingUpdate.next;\n+ lastPendingUpdate.next = (firstInterleavedUpdate: any);\n+ lastInterleavedUpdate.next = (firstPendingUpdate: any);\n+ }\n+ queue.pending = (lastInterleavedUpdate: any);\n+ }\n+ }\n+ interleavedQueues = null;\n+ }\n+}\ndiff --git a\/packages\/react-reconciler\/src\/ReactFiberNewContext.old.js b\/packages\/react-reconciler\/src\/ReactFiberNewContext.old.js\nindex 934bc6b3fc..c1102b89f9 100644\n--- a\/packages\/react-reconciler\/src\/ReactFiberNewContext.old.js\n+++ b\/packages\/react-reconciler\/src\/ReactFiberNewContext.old.js\n@@ -11,6 +11,7 @@ import type {ReactContext} from 'shared\/ReactTypes';\n import type {Fiber, ContextDependency} from '.\/ReactInternalTypes';\n import type {StackCursor} from '.\/ReactFiberStack.old';\n import type {Lanes} from '.\/ReactFiberLane.old';\n+import type {SharedQueue} from '.\/ReactUpdateQueue.old';\n \n import {isPrimaryRenderer} from '.\/ReactFiberHostConfig';\n import {createCursor, push, pop} from '.\/ReactFiberStack.old';\n@@ -31,7 +32,7 @@ import {\n \n import invariant from 'shared\/invariant';\n import is from 'shared\/objectIs';\n-import {createUpdate, enqueueUpdate, ForceUpdate} from '.\/ReactUpdateQueue.old';\n+import {createUpdate, ForceUpdate} from '.\/ReactUpdateQueue.old';\n import {markWorkInProgressReceivedUpdate} from '.\/ReactFiberBeginWork.old';\n import {enableSuspenseServerRenderer} from 'shared\/ReactFeatureFlags';\n \n@@ -211,16 +212,30 @@ export function propagateContextChange(\n \n if (fiber.tag === ClassComponent) {\n \/\/ Schedule a force update on the work-in-progress.\n- const update = createUpdate(\n- NoTimestamp,\n- pickArbitraryLane(renderLanes),\n- );\n+ const lane = pickArbitraryLane(renderLanes);\n+ const update = createUpdate(NoTimestamp, lane);\n update.tag = ForceUpdate;\n \/\/ TODO: Because we don't have a work-in-progress, this will add the\n \/\/ update to the current fiber, too, which means it will persist even if\n \/\/ this render is thrown away. Since it's a race condition, not sure it's\n \/\/ worth fixing.\n- enqueueUpdate(fiber, update);\n+\n+ \/\/ Inlined `enqueueUpdate` to remove interleaved update check\n+ const updateQueue = fiber.updateQueue;\n+ if (updateQueue === null) {\n+ \/\/ Only occurs if the fiber has been unmounted.\n+ } else {\n+ const sharedQueue: SharedQueue = (updateQueue: any).shared;\n+ const pending = sharedQueue.pending;\n+ if (pending === null) {\n+ \/\/ This is the first update. Create a circular list.\n+ update.next = update;\n+ } else {\n+ update.next = pending.next;\n+ pending.next = update;\n+ }\n+ sharedQueue.pending = update;\n+ }\n }\n fiber.lanes = mergeLanes(fiber.lanes, renderLanes);\n const alternate = fiber.alternate;\ndiff --git a\/packages\/react-reconciler\/src\/ReactFiberReconciler.old.js b\/packages\/react-reconciler\/src\/ReactFiberReconciler.old.js\nindex 1fc12435d6..64bbea2c40 100644\n--- a\/packages\/react-reconciler\/src\/ReactFiberReconciler.old.js\n+++ b\/packages\/react-reconciler\/src\/ReactFiberReconciler.old.js\n@@ -318,7 +318,7 @@ export function updateContainer(\n update.callback = callback;\n }\n \n- enqueueUpdate(current, update);\n+ enqueueUpdate(current, update, lane);\n const root = scheduleUpdateOnFiber(current, lane, eventTime);\n if (root !== null) {\n entangleTransitions(root, current, lane);\ndiff --git a\/packages\/react-reconciler\/src\/ReactFiberThrow.old.js b\/packages\/react-reconciler\/src\/ReactFiberThrow.old.js\nindex e753449773..6ae53d02fc 100644\n--- a\/packages\/react-reconciler\/src\/ReactFiberThrow.old.js\n+++ b\/packages\/react-reconciler\/src\/ReactFiberThrow.old.js\n@@ -293,7 +293,7 @@ function throwException(\n \/\/ prevent a bail out.\n const update = createUpdate(NoTimestamp, SyncLane);\n update.tag = ForceUpdate;\n- enqueueUpdate(sourceFiber, update);\n+ enqueueUpdate(sourceFiber, update, SyncLane);\n }\n }\n \ndiff --git a\/packages\/react-reconciler\/src\/ReactFiberWorkLoop.old.js b\/packages\/react-reconciler\/src\/ReactFiberWorkLoop.old.js\nindex e1431de643..0f99452a4c 100644\n--- a\/packages\/react-reconciler\/src\/ReactFiberWorkLoop.old.js\n+++ b\/packages\/react-reconciler\/src\/ReactFiberWorkLoop.old.js\n@@ -34,7 +34,6 @@ import {\n disableSchedulerTimeoutInWorkLoop,\n enableDoubleInvokingEffects,\n skipUnmountedBoundaries,\n- enableDiscreteEventMicroTasks,\n } from 'shared\/ReactFeatureFlags';\n import ReactSharedInternals from 'shared\/ReactSharedInternals';\n import invariant from 'shared\/invariant';\n@@ -207,6 +206,7 @@ import {\n pop as popFromStack,\n createCursor,\n } from '.\/ReactFiberStack.old';\n+import {enqueueInterleavedUpdates} from '.\/ReactFiberInterleavedUpdates.old';\n \n import {\n markNestedUpdateScheduled,\n@@ -217,6 +217,7 @@ import {\n syncNestedUpdateFlag,\n } from '.\/ReactProfilerTimer.old';\n \n+import {enableDiscreteEventMicroTasks} from 'shared\/ReactFeatureFlags';\n \/\/ DEV stuff\n import getComponentName from 'shared\/getComponentName';\n import ReactStrictModeWarnings from '.\/ReactStrictModeWarnings.old';\n@@ -537,6 +538,7 @@ export function scheduleUpdateOnFiber(\n }\n }\n \n+ \/\/ TODO: Consolidate with `isInterleavedUpdate` check\n if (root === workInProgressRoot) {\n \/\/ Received an update to a tree that's in the middle of rendering. Mark\n \/\/ that there was an interleaved update work on this root. Unless the\n@@ -674,6 +676,22 @@ function markUpdateLaneFromFiberToRoot(\n }\n }\n \n+export function isInterleavedUpdate(fiber: Fiber, lane: Lane) {\n+ return (\n+ \/\/ TODO: Optimize slightly by comparing to root that fiber belongs to.\n+ \/\/ Requires some refactoring. Not a big deal though since it's rare for\n+ \/\/ concurrent apps to have more than a single root.\n+ workInProgressRoot !== null &&\n+ (fiber.mode & BlockingMode) !== NoMode &&\n+ \/\/ If this is a render phase update (i.e. UNSAFE_componentWillReceiveProps),\n+ \/\/ then don't treat this as an interleaved update. This pattern is\n+ \/\/ accompanied by a warning but we haven't fully deprecated it yet. We can\n+ \/\/ remove once the deferRenderPhaseUpdateToNextBatch flag is enabled.\n+ (deferRenderPhaseUpdateToNextBatch ||\n+ (executionContext & RenderContext) === NoContext)\n+ );\n+}\n+\n \/\/ Use this function to schedule a task for a root. There's only one task per\n \/\/ root; if a task was already scheduled, we'll check to make sure the priority\n \/\/ of the existing task is the same as the priority of the next level that the\n@@ -1376,6 +1394,8 @@ function prepareFreshStack(root: FiberRoot, lanes: Lanes) {\n workInProgressRootUpdatedLanes = NoLanes;\n workInProgressRootPingedLanes = NoLanes;\n \n+ enqueueInterleavedUpdates();\n+\n if (enableSchedulerTracing) {\n spawnedWorkDuringRender = null;\n }\n@@ -2307,7 +2327,7 @@ function captureCommitPhaseErrorOnRoot(\n ) {\n const errorInfo = createCapturedValue(error, sourceFiber);\n const update = createRootErrorUpdate(rootFiber, errorInfo, (SyncLane: Lane));\n- enqueueUpdate(rootFiber, update);\n+ enqueueUpdate(rootFiber, update, (SyncLane: Lane));\n const eventTime = requestEventTime();\n const root = markUpdateLaneFromFiberToRoot(rootFiber, (SyncLane: Lane));\n if (root !== null) {\n@@ -2354,7 +2374,7 @@ export function captureCommitPhaseError(\n errorInfo,\n (SyncLane: Lane),\n );\n- enqueueUpdate(fiber, update);\n+ enqueueUpdate(fiber, update, (SyncLane: Lane));\n const eventTime = requestEventTime();\n const root = markUpdateLaneFromFiberToRoot(fiber, (SyncLane: Lane));\n if (root !== null) {\ndiff --git a\/packages\/react-reconciler\/src\/ReactUpdateQueue.old.js b\/packages\/react-reconciler\/src\/ReactUpdateQueue.old.js\nindex 1d71e14819..d1e82e10d7 100644\n--- a\/packages\/react-reconciler\/src\/ReactUpdateQueue.old.js\n+++ b\/packages\/react-reconciler\/src\/ReactUpdateQueue.old.js\n@@ -105,7 +105,11 @@ import {Callback, ShouldCapture, DidCapture} from '.\/ReactFiberFlags';\n import {debugRenderPhaseSideEffectsForStrictMode} from 'shared\/ReactFeatureFlags';\n \n import {StrictMode} from '.\/ReactTypeOfMode';\n-import {markSkippedUpdateLanes} from '.\/ReactFiberWorkLoop.old';\n+import {\n+ markSkippedUpdateLanes,\n+ isInterleavedUpdate,\n+} from '.\/ReactFiberWorkLoop.old';\n+import {pushInterleavedQueue} from '.\/ReactFiberInterleavedUpdates.old';\n \n import invariant from 'shared\/invariant';\n \n@@ -124,8 +128,9 @@ export type Update = {|\n next: Update | null,\n |};\n \n-type SharedQueue = {|\n+export type SharedQueue = {|\n pending: Update | null,\n+ interleaved: Update | null,\n lanes: Lanes,\n |};\n \n@@ -165,6 +170,7 @@ export function initializeUpdateQueue(fiber: Fiber): void {\n lastBaseUpdate: null,\n shared: {\n pending: null,\n+ interleaved: null,\n lanes: NoLanes,\n },\n effects: null,\n@@ -205,7 +211,11 @@ export function createUpdate(eventTime: number, lane: Lane): Update<*> {\n return update;\n }\n \n-export function enqueueUpdate(fiber: Fiber, update: Update) {\n+export function enqueueUpdate(\n+ fiber: Fiber,\n+ update: Update,\n+ lane: Lane,\n+) {\n const updateQueue = fiber.updateQueue;\n if (updateQueue === null) {\n \/\/ Only occurs if the fiber has been unmounted.\n@@ -213,15 +223,31 @@ export function enqueueUpdate(fiber: Fiber, update: Update) {\n }\n \n const sharedQueue: SharedQueue = (updateQueue: any).shared;\n- const pending = sharedQueue.pending;\n- if (pending === null) {\n- \/\/ This is the first update. Create a circular list.\n- update.next = update;\n+\n+ if (isInterleavedUpdate(fiber, lane)) {\n+ const interleaved = sharedQueue.interleaved;\n+ if (interleaved === null) {\n+ \/\/ This is the first update. Create a circular list.\n+ update.next = update;\n+ \/\/ At the end of the current render, this queue's interleaved updates will\n+ \/\/ be transfered to the pending queue.\n+ pushInterleavedQueue(sharedQueue);\n+ } else {\n+ update.next = interleaved.next;\n+ interleaved.next = update;\n+ }\n+ sharedQueue.interleaved = update;\n } else {\n- update.next = pending.next;\n- pending.next = update;\n+ const pending = sharedQueue.pending;\n+ if (pending === null) {\n+ \/\/ This is the first update. Create a circular list.\n+ update.next = update;\n+ } else {\n+ update.next = pending.next;\n+ pending.next = update;\n+ }\n+ sharedQueue.pending = update;\n }\n- sharedQueue.pending = update;\n \n if (__DEV__) {\n if (\n@@ -591,7 +617,17 @@ export function processUpdateQueue(\n queue.firstBaseUpdate = newFirstBaseUpdate;\n queue.lastBaseUpdate = newLastBaseUpdate;\n \n- if (firstBaseUpdate === null) {\n+ \/\/ Interleaved updates are stored on a separate queue. We aren't going to\n+ \/\/ process them during this render, but we do need to track which lanes\n+ \/\/ are remaining.\n+ const lastInterleaved = queue.shared.interleaved;\n+ if (lastInterleaved !== null) {\n+ let interleaved = lastInterleaved;\n+ do {\n+ newLanes = mergeLanes(newLanes, interleaved.lane);\n+ interleaved = ((interleaved: any).next: Update);\n+ } while (interleaved !== lastInterleaved);\n+ } else if (firstBaseUpdate === null) {\n \/\/ `queue.lanes` is used for entangling transitions. We can set it back to\n \/\/ zero once the queue is empty.\n queue.shared.lanes = NoLanes;\ndiff --git a\/packages\/react-reconciler\/src\/__tests__\/ReactIncrementalUpdates-test.js b\/packages\/react-reconciler\/src\/__tests__\/ReactIncrementalUpdates-test.js\nindex 2dd1cd18e7..e24e2576dd 100644\n--- a\/packages\/react-reconciler\/src\/__tests__\/ReactIncrementalUpdates-test.js\n+++ b\/packages\/react-reconciler\/src\/__tests__\/ReactIncrementalUpdates-test.js\n@@ -320,7 +320,16 @@ describe('ReactIncrementalUpdates', () => {\n });\n \n expect(instance.state).toEqual({a: 'a', b: 'b'});\n- expect(Scheduler).toHaveYielded(['componentWillReceiveProps', 'render']);\n+\n+ if (gate(flags => flags.deferRenderPhaseUpdateToNextBatch)) {\n+ expect(Scheduler).toHaveYielded([\n+ 'componentWillReceiveProps',\n+ 'render',\n+ 'render',\n+ ]);\n+ } else {\n+ expect(Scheduler).toHaveYielded(['componentWillReceiveProps', 'render']);\n+ }\n });\n \n it('updates triggered from inside a class setState updater', () => {\n","commit":{"authorEmail":"git@andrewclark.io","shortRevision":"7cb9fd7ef8","authoredAt":"2021-02-01T18:05:42-06:00","revision":"7cb9fd7ef822436aef13c8cbf648af1e21a5309a","authorName":"Andrew Clark","subject":"Land interleaved updates change in main fork (#20710)"}}

dillon1000/react

Files changed