{"commit":{"authorEmail":"git@sophiebits.com","shortRevision":"169f935f78","subject":"Flip expiration times (#13912)","revision":"169f935f781c764a8c04f441c5e27b00a0329e8c","authorName":"Sophie Alpert","authoredAt":"2018-10-30T15:26:20-07:00"},"parents":["bf9fadfcf42847fa89f9a76c7d4dc2e2c17ee020"],"files":[{"status":"M","path":"packages\/react-dom\/src\/client\/ReactDOM.js"},{"status":"M","path":"packages\/react-noop-renderer\/src\/createReactNoop.js"},{"status":"M","path":"packages\/react-reconciler\/src\/ReactFiberBeginWork.js"},{"status":"M","path":"packages\/react-reconciler\/src\/ReactFiberExpirationTime.js"},{"status":"M","path":"packages\/react-reconciler\/src\/ReactFiberHooks.js"},{"status":"M","path":"packages\/react-reconciler\/src\/ReactFiberNewContext.js"},{"status":"M","path":"packages\/react-reconciler\/src\/ReactFiberPendingPriority.js"},{"status":"M","path":"packages\/react-reconciler\/src\/ReactFiberScheduler.js"},{"status":"M","path":"packages\/react-reconciler\/src\/ReactUpdateQueue.js"}],"body":"See https:\/\/github.com\/facebook\/react\/pull\/13912 commit messages for how this was done.","patch":"diff --git a\/packages\/react-dom\/src\/client\/ReactDOM.js b\/packages\/react-dom\/src\/client\/ReactDOM.js\nindex 64b52f4e78..4654358a10 100644\n--- a\/packages\/react-dom\/src\/client\/ReactDOM.js\n+++ b\/packages\/react-dom\/src\/client\/ReactDOM.js\n@@ -400,7 +400,7 @@ ReactRoot.prototype.createBatch = function(): Batch {\n let insertBefore = firstBatch;\n while (\n insertBefore !== null &&\n- insertBefore._expirationTime <= expirationTime\n+ insertBefore._expirationTime >= expirationTime\n ) {\n insertAfter = insertBefore;\n insertBefore = insertBefore._next;\ndiff --git a\/packages\/react-noop-renderer\/src\/createReactNoop.js b\/packages\/react-noop-renderer\/src\/createReactNoop.js\nindex f7e66a8912..105ba0333c 100644\n--- a\/packages\/react-noop-renderer\/src\/createReactNoop.js\n+++ b\/packages\/react-noop-renderer\/src\/createReactNoop.js\n@@ -956,9 +956,10 @@ function createReactNoop(reconciler: Function, useMutation: boolean) {\n rootID: string = DEFAULT_ROOT_ID,\n ) {\n const root: any = roots.get(rootID);\n+ const expiration = NoopRenderer.computeUniqueAsyncExpiration();\n const batch = {\n _defer: true,\n- _expirationTime: 1,\n+ _expirationTime: expiration,\n _onComplete: () => {\n root.firstBatch = null;\n },\n@@ -969,7 +970,7 @@ function createReactNoop(reconciler: Function, useMutation: boolean) {\n expect(actual).toEqual(expectedFlush);\n return (expectedCommit: Array) => {\n batch._defer = false;\n- NoopRenderer.flushRoot(root, 1);\n+ NoopRenderer.flushRoot(root, expiration);\n expect(yieldedValues).toEqual(expectedCommit);\n };\n },\ndiff --git a\/packages\/react-reconciler\/src\/ReactFiberBeginWork.js b\/packages\/react-reconciler\/src\/ReactFiberBeginWork.js\nindex 051729a0d8..69375a4718 100644\n--- a\/packages\/react-reconciler\/src\/ReactFiberBeginWork.js\n+++ b\/packages\/react-reconciler\/src\/ReactFiberBeginWork.js\n@@ -265,10 +265,7 @@ function updateMemoComponent(\n return child;\n }\n let currentChild = ((current.child: any): Fiber); \/\/ This is always exactly one child\n- if (\n- updateExpirationTime === NoWork ||\n- updateExpirationTime > renderExpirationTime\n- ) {\n+ if (updateExpirationTime < renderExpirationTime) {\n \/\/ This will be the props with resolved defaultProps,\n \/\/ unlike current.memoizedProps which will be the unresolved ones.\n const prevProps = currentChild.memoizedProps;\n@@ -302,11 +299,7 @@ function updateSimpleMemoComponent(\n updateExpirationTime,\n renderExpirationTime: ExpirationTime,\n ): null | Fiber {\n- if (\n- current !== null &&\n- (updateExpirationTime === NoWork ||\n- updateExpirationTime > renderExpirationTime)\n- ) {\n+ if (current !== null && updateExpirationTime < renderExpirationTime) {\n const prevProps = current.memoizedProps;\n if (\n shallowEqual(prevProps, nextProps) &&\n@@ -1471,10 +1464,7 @@ function bailoutOnAlreadyFinishedWork(\n \n \/\/ Check if the children have any pending work.\n const childExpirationTime = workInProgress.childExpirationTime;\n- if (\n- childExpirationTime === NoWork ||\n- childExpirationTime > renderExpirationTime\n- ) {\n+ if (childExpirationTime < renderExpirationTime) {\n \/\/ The children don't have any work either. We can skip them.\n \/\/ TODO: Once we add back resuming, we should check if the children are\n \/\/ a work-in-progress set. If so, we need to transfer their effects.\n@@ -1500,8 +1490,7 @@ function beginWork(\n if (\n oldProps === newProps &&\n !hasLegacyContextChanged() &&\n- (updateExpirationTime === NoWork ||\n- updateExpirationTime > renderExpirationTime)\n+ updateExpirationTime < renderExpirationTime\n ) {\n \/\/ This fiber does not have any pending work. Bailout without entering\n \/\/ the begin phase. There's still some bookkeeping we that needs to be done\n@@ -1550,7 +1539,7 @@ function beginWork(\n primaryChildFragment.childExpirationTime;\n if (\n primaryChildExpirationTime !== NoWork &&\n- primaryChildExpirationTime <= renderExpirationTime\n+ primaryChildExpirationTime >= renderExpirationTime\n ) {\n \/\/ The primary children have pending work. Use the normal path\n \/\/ to attempt to render the primary children again.\ndiff --git a\/packages\/react-reconciler\/src\/ReactFiberExpirationTime.js b\/packages\/react-reconciler\/src\/ReactFiberExpirationTime.js\nindex daea8eaf3c..a29dfbdf17 100644\n--- a\/packages\/react-reconciler\/src\/ReactFiberExpirationTime.js\n+++ b\/packages\/react-reconciler\/src\/ReactFiberExpirationTime.js\n@@ -12,20 +12,20 @@ import MAX_SIGNED_31_BIT_INT from '.\/maxSigned31BitInt';\n export type ExpirationTime = number;\n \n export const NoWork = 0;\n-export const Sync = 1;\n-export const Never = MAX_SIGNED_31_BIT_INT;\n+export const Never = 1;\n+export const Sync = MAX_SIGNED_31_BIT_INT;\n \n const UNIT_SIZE = 10;\n-const MAGIC_NUMBER_OFFSET = 2;\n+const MAGIC_NUMBER_OFFSET = MAX_SIGNED_31_BIT_INT - 1;\n \n \/\/ 1 unit of expiration time represents 10ms.\n export function msToExpirationTime(ms: number): ExpirationTime {\n \/\/ Always add an offset so that we don't clash with the magic number for NoWork.\n- return ((ms \/ UNIT_SIZE) | 0) + MAGIC_NUMBER_OFFSET;\n+ return MAGIC_NUMBER_OFFSET - ((ms \/ UNIT_SIZE) | 0);\n }\n \n export function expirationTimeToMs(expirationTime: ExpirationTime): number {\n- return (expirationTime - MAGIC_NUMBER_OFFSET) * UNIT_SIZE;\n+ return (MAGIC_NUMBER_OFFSET - expirationTime) * UNIT_SIZE;\n }\n \n function ceiling(num: number, precision: number): number {\n@@ -38,9 +38,9 @@ function computeExpirationBucket(\n bucketSizeMs,\n ): ExpirationTime {\n return (\n- MAGIC_NUMBER_OFFSET +\n+ MAGIC_NUMBER_OFFSET -\n ceiling(\n- currentTime - MAGIC_NUMBER_OFFSET + expirationInMs \/ UNIT_SIZE,\n+ MAGIC_NUMBER_OFFSET - currentTime + expirationInMs \/ UNIT_SIZE,\n bucketSizeMs \/ UNIT_SIZE,\n )\n );\ndiff --git a\/packages\/react-reconciler\/src\/ReactFiberHooks.js b\/packages\/react-reconciler\/src\/ReactFiberHooks.js\nindex d2542a1b92..7d6290e9f4 100644\n--- a\/packages\/react-reconciler\/src\/ReactFiberHooks.js\n+++ b\/packages\/react-reconciler\/src\/ReactFiberHooks.js\n@@ -404,7 +404,7 @@ export function useReducer(\n let didSkip = false;\n do {\n const updateExpirationTime = update.expirationTime;\n- if (updateExpirationTime > renderExpirationTime) {\n+ if (updateExpirationTime < renderExpirationTime) {\n \/\/ Priority is insufficient. Skip this update. If this is the first\n \/\/ skipped update, the previous update\/state is the new base\n \/\/ update\/state.\n@@ -414,10 +414,7 @@ export function useReducer(\n newBaseState = newState;\n }\n \/\/ Update the remaining priority in the queue.\n- if (\n- remainingExpirationTime === NoWork ||\n- updateExpirationTime < remainingExpirationTime\n- ) {\n+ if (updateExpirationTime > remainingExpirationTime) {\n remainingExpirationTime = updateExpirationTime;\n }\n } else {\ndiff --git a\/packages\/react-reconciler\/src\/ReactFiberNewContext.js b\/packages\/react-reconciler\/src\/ReactFiberNewContext.js\nindex 582614e290..8af6bd09e0 100644\n--- a\/packages\/react-reconciler\/src\/ReactFiberNewContext.js\n+++ b\/packages\/react-reconciler\/src\/ReactFiberNewContext.js\n@@ -22,7 +22,6 @@ import warningWithoutStack from 'shared\/warningWithoutStack';\n import {isPrimaryRenderer} from '.\/ReactFiberHostConfig';\n import {createCursor, push, pop} from '.\/ReactFiberStack';\n import MAX_SIGNED_31_BIT_INT from '.\/maxSigned31BitInt';\n-import {NoWork} from '.\/ReactFiberExpirationTime';\n import {ContextProvider, ClassComponent} from 'shared\/ReactWorkTags';\n \n import invariant from 'shared\/invariant';\n@@ -169,17 +168,13 @@ export function propagateContextChange(\n enqueueUpdate(fiber, update);\n }\n \n- if (\n- fiber.expirationTime === NoWork ||\n- fiber.expirationTime > renderExpirationTime\n- ) {\n+ if (fiber.expirationTime < renderExpirationTime) {\n fiber.expirationTime = renderExpirationTime;\n }\n let alternate = fiber.alternate;\n if (\n alternate !== null &&\n- (alternate.expirationTime === NoWork ||\n- alternate.expirationTime > renderExpirationTime)\n+ alternate.expirationTime < renderExpirationTime\n ) {\n alternate.expirationTime = renderExpirationTime;\n }\n@@ -188,22 +183,17 @@ export function propagateContextChange(\n let node = fiber.return;\n while (node !== null) {\n alternate = node.alternate;\n- if (\n- node.childExpirationTime === NoWork ||\n- node.childExpirationTime > renderExpirationTime\n- ) {\n+ if (node.childExpirationTime < renderExpirationTime) {\n node.childExpirationTime = renderExpirationTime;\n if (\n alternate !== null &&\n- (alternate.childExpirationTime === NoWork ||\n- alternate.childExpirationTime > renderExpirationTime)\n+ alternate.childExpirationTime < renderExpirationTime\n ) {\n alternate.childExpirationTime = renderExpirationTime;\n }\n } else if (\n alternate !== null &&\n- (alternate.childExpirationTime === NoWork ||\n- alternate.childExpirationTime > renderExpirationTime)\n+ alternate.childExpirationTime < renderExpirationTime\n ) {\n alternate.childExpirationTime = renderExpirationTime;\n } else {\ndiff --git a\/packages\/react-reconciler\/src\/ReactFiberPendingPriority.js b\/packages\/react-reconciler\/src\/ReactFiberPendingPriority.js\nindex 95a0f42f98..6f2fcaa2c3 100644\n--- a\/packages\/react-reconciler\/src\/ReactFiberPendingPriority.js\n+++ b\/packages\/react-reconciler\/src\/ReactFiberPendingPriority.js\n@@ -31,12 +31,12 @@ export function markPendingPriorityLevel(\n \/\/ No other pending updates.\n root.earliestPendingTime = root.latestPendingTime = expirationTime;\n } else {\n- if (earliestPendingTime > expirationTime) {\n+ if (earliestPendingTime < expirationTime) {\n \/\/ This is the earliest pending update.\n root.earliestPendingTime = expirationTime;\n } else {\n const latestPendingTime = root.latestPendingTime;\n- if (latestPendingTime < expirationTime) {\n+ if (latestPendingTime > expirationTime) {\n \/\/ This is the latest pending update\n root.latestPendingTime = expirationTime;\n }\n@@ -65,12 +65,12 @@ export function markCommittedPriorityLevels(\n \/\/ Let's see if the previous latest known pending level was just flushed.\n const latestPendingTime = root.latestPendingTime;\n if (latestPendingTime !== NoWork) {\n- if (latestPendingTime < earliestRemainingTime) {\n+ if (latestPendingTime > earliestRemainingTime) {\n \/\/ We've flushed all the known pending levels.\n root.earliestPendingTime = root.latestPendingTime = NoWork;\n } else {\n const earliestPendingTime = root.earliestPendingTime;\n- if (earliestPendingTime < earliestRemainingTime) {\n+ if (earliestPendingTime > earliestRemainingTime) {\n \/\/ We've flushed the earliest known pending level. Set this to the\n \/\/ latest pending time.\n root.earliestPendingTime = root.latestPendingTime;\n@@ -92,7 +92,7 @@ export function markCommittedPriorityLevels(\n }\n \n const latestSuspendedTime = root.latestSuspendedTime;\n- if (earliestRemainingTime > latestSuspendedTime) {\n+ if (earliestRemainingTime < latestSuspendedTime) {\n \/\/ The earliest remaining level is later than all the suspended work. That\n \/\/ means we've flushed all the suspended work.\n root.earliestSuspendedTime = NoWork;\n@@ -106,7 +106,7 @@ export function markCommittedPriorityLevels(\n return;\n }\n \n- if (earliestRemainingTime < earliestSuspendedTime) {\n+ if (earliestRemainingTime > earliestSuspendedTime) {\n \/\/ The earliest remaining time is earlier than all the suspended work.\n \/\/ Treat it as a pending update.\n markPendingPriorityLevel(root, earliestRemainingTime);\n@@ -128,10 +128,10 @@ export function hasLowerPriorityWork(\n const latestPingedTime = root.latestPingedTime;\n return (\n (latestPendingTime !== NoWork &&\n- latestPendingTime > erroredExpirationTime) ||\n+ latestPendingTime < erroredExpirationTime) ||\n (latestSuspendedTime !== NoWork &&\n- latestSuspendedTime > erroredExpirationTime) ||\n- (latestPingedTime !== NoWork && latestPingedTime > erroredExpirationTime)\n+ latestSuspendedTime < erroredExpirationTime) ||\n+ (latestPingedTime !== NoWork && latestPingedTime < erroredExpirationTime)\n );\n }\n \n@@ -143,8 +143,8 @@ export function isPriorityLevelSuspended(\n const latestSuspendedTime = root.latestSuspendedTime;\n return (\n earliestSuspendedTime !== NoWork &&\n- expirationTime >= earliestSuspendedTime &&\n- expirationTime <= latestSuspendedTime\n+ expirationTime <= earliestSuspendedTime &&\n+ expirationTime >= latestSuspendedTime\n );\n }\n \n@@ -180,10 +180,10 @@ export function markSuspendedPriorityLevel(\n \/\/ No other suspended levels.\n root.earliestSuspendedTime = root.latestSuspendedTime = suspendedTime;\n } else {\n- if (earliestSuspendedTime > suspendedTime) {\n+ if (earliestSuspendedTime < suspendedTime) {\n \/\/ This is the earliest suspended level.\n root.earliestSuspendedTime = suspendedTime;\n- } else if (latestSuspendedTime < suspendedTime) {\n+ } else if (latestSuspendedTime > suspendedTime) {\n \/\/ This is the latest suspended level\n root.latestSuspendedTime = suspendedTime;\n }\n@@ -202,7 +202,7 @@ export function markPingedPriorityLevel(\n \/\/ is thrown out and not reused during the restarted render. One way to\n \/\/ invalidate the progressed work is to restart at expirationTime + 1.\n const latestPingedTime = root.latestPingedTime;\n- if (latestPingedTime === NoWork || latestPingedTime < pingedTime) {\n+ if (latestPingedTime === NoWork || latestPingedTime > pingedTime) {\n root.latestPingedTime = pingedTime;\n }\n findNextExpirationTimeToWorkOn(pingedTime, root);\n@@ -212,7 +212,7 @@ function clearPing(root, completedTime) {\n \/\/ TODO: Track whether the root was pinged during the render phase. If so,\n \/\/ we need to make sure we don't lose track of it.\n const latestPingedTime = root.latestPingedTime;\n- if (latestPingedTime !== NoWork && latestPingedTime <= completedTime) {\n+ if (latestPingedTime !== NoWork && latestPingedTime >= completedTime) {\n root.latestPingedTime = NoWork;\n }\n }\n@@ -225,18 +225,10 @@ export function findEarliestOutstandingPriorityLevel(\n \n const earliestPendingTime = root.earliestPendingTime;\n const earliestSuspendedTime = root.earliestSuspendedTime;\n- if (\n- earliestExpirationTime === NoWork ||\n- (earliestPendingTime !== NoWork &&\n- earliestPendingTime < earliestExpirationTime)\n- ) {\n+ if (earliestPendingTime > earliestExpirationTime) {\n earliestExpirationTime = earliestPendingTime;\n }\n- if (\n- earliestExpirationTime === NoWork ||\n- (earliestSuspendedTime !== NoWork &&\n- earliestSuspendedTime < earliestExpirationTime)\n- ) {\n+ if (earliestSuspendedTime > earliestExpirationTime) {\n earliestExpirationTime = earliestSuspendedTime;\n }\n return earliestExpirationTime;\n@@ -247,7 +239,7 @@ export function didExpireAtExpirationTime(\n currentTime: ExpirationTime,\n ): void {\n const expirationTime = root.expirationTime;\n- if (expirationTime !== NoWork && currentTime >= expirationTime) {\n+ if (expirationTime !== NoWork && currentTime <= expirationTime) {\n \/\/ The root has expired. Flush all work up to the current time.\n root.nextExpirationTimeToWorkOn = currentTime;\n }\n@@ -269,7 +261,7 @@ function findNextExpirationTimeToWorkOn(completedExpirationTime, root) {\n if (\n nextExpirationTimeToWorkOn === NoWork &&\n (completedExpirationTime === NoWork ||\n- latestSuspendedTime > completedExpirationTime)\n+ latestSuspendedTime < completedExpirationTime)\n ) {\n \/\/ The lowest priority suspended work is the work most likely to be\n \/\/ committed next. Let's start rendering it again, so that if it times out,\n@@ -278,11 +270,7 @@ function findNextExpirationTimeToWorkOn(completedExpirationTime, root) {\n }\n \n let expirationTime = nextExpirationTimeToWorkOn;\n- if (\n- expirationTime !== NoWork &&\n- earliestSuspendedTime !== NoWork &&\n- earliestSuspendedTime < expirationTime\n- ) {\n+ if (expirationTime !== NoWork && earliestSuspendedTime > expirationTime) {\n \/\/ Expire using the earliest known expiration time.\n expirationTime = earliestSuspendedTime;\n }\ndiff --git a\/packages\/react-reconciler\/src\/ReactFiberScheduler.js b\/packages\/react-reconciler\/src\/ReactFiberScheduler.js\nindex 5a125c6516..6aaa4e4113 100644\n--- a\/packages\/react-reconciler\/src\/ReactFiberScheduler.js\n+++ b\/packages\/react-reconciler\/src\/ReactFiberScheduler.js\n@@ -241,8 +241,8 @@ if (__DEV__) {\n };\n }\n \n-\/\/ Used to ensure computeUniqueAsyncExpiration is monotonically increasing.\n-let lastUniqueAsyncExpiration: number = 0;\n+\/\/ Used to ensure computeUniqueAsyncExpiration is monotonically decreasing.\n+let lastUniqueAsyncExpiration: number = Sync - 1;\n \n \/\/ Represents the expiration time that incoming updates should use. (If this\n \/\/ is NoWork, use the default strategy: async updates in async mode, sync\n@@ -605,9 +605,7 @@ function commitRoot(root: FiberRoot, finishedWork: Fiber): void {\n const updateExpirationTimeBeforeCommit = finishedWork.expirationTime;\n const childExpirationTimeBeforeCommit = finishedWork.childExpirationTime;\n const earliestRemainingTimeBeforeCommit =\n- updateExpirationTimeBeforeCommit === NoWork ||\n- (childExpirationTimeBeforeCommit !== NoWork &&\n- childExpirationTimeBeforeCommit < updateExpirationTimeBeforeCommit)\n+ childExpirationTimeBeforeCommit > updateExpirationTimeBeforeCommit\n ? childExpirationTimeBeforeCommit\n : updateExpirationTimeBeforeCommit;\n markCommittedPriorityLevels(root, earliestRemainingTimeBeforeCommit);\n@@ -798,9 +796,7 @@ function commitRoot(root: FiberRoot, finishedWork: Fiber): void {\n const updateExpirationTimeAfterCommit = finishedWork.expirationTime;\n const childExpirationTimeAfterCommit = finishedWork.childExpirationTime;\n const earliestRemainingTimeAfterCommit =\n- updateExpirationTimeAfterCommit === NoWork ||\n- (childExpirationTimeAfterCommit !== NoWork &&\n- childExpirationTimeAfterCommit < updateExpirationTimeAfterCommit)\n+ childExpirationTimeAfterCommit > updateExpirationTimeAfterCommit\n ? childExpirationTimeAfterCommit\n : updateExpirationTimeAfterCommit;\n if (earliestRemainingTimeAfterCommit === NoWork) {\n@@ -841,10 +837,7 @@ function commitRoot(root: FiberRoot, finishedWork: Fiber): void {\n \/\/ Only decrement the pending interaction count if we're done.\n \/\/ If there's still work at the current priority,\n \/\/ That indicates that we are waiting for suspense data.\n- if (\n- earliestRemainingTimeAfterCommit === NoWork ||\n- scheduledExpirationTime < earliestRemainingTimeAfterCommit\n- ) {\n+ if (scheduledExpirationTime > earliestRemainingTimeAfterCommit) {\n pendingInteractionMap.delete(scheduledExpirationTime);\n \n scheduledInteractions.forEach(interaction => {\n@@ -904,18 +897,10 @@ function resetChildExpirationTime(\n while (child !== null) {\n const childUpdateExpirationTime = child.expirationTime;\n const childChildExpirationTime = child.childExpirationTime;\n- if (\n- newChildExpirationTime === NoWork ||\n- (childUpdateExpirationTime !== NoWork &&\n- childUpdateExpirationTime < newChildExpirationTime)\n- ) {\n+ if (childUpdateExpirationTime > newChildExpirationTime) {\n newChildExpirationTime = childUpdateExpirationTime;\n }\n- if (\n- newChildExpirationTime === NoWork ||\n- (childChildExpirationTime !== NoWork &&\n- childChildExpirationTime < newChildExpirationTime)\n- ) {\n+ if (childChildExpirationTime > newChildExpirationTime) {\n newChildExpirationTime = childChildExpirationTime;\n }\n if (shouldBubbleActualDurations) {\n@@ -931,18 +916,10 @@ function resetChildExpirationTime(\n while (child !== null) {\n const childUpdateExpirationTime = child.expirationTime;\n const childChildExpirationTime = child.childExpirationTime;\n- if (\n- newChildExpirationTime === NoWork ||\n- (childUpdateExpirationTime !== NoWork &&\n- childUpdateExpirationTime < newChildExpirationTime)\n- ) {\n+ if (childUpdateExpirationTime > newChildExpirationTime) {\n newChildExpirationTime = childUpdateExpirationTime;\n }\n- if (\n- newChildExpirationTime === NoWork ||\n- (childChildExpirationTime !== NoWork &&\n- childChildExpirationTime < newChildExpirationTime)\n- ) {\n+ if (childChildExpirationTime > newChildExpirationTime) {\n newChildExpirationTime = childChildExpirationTime;\n }\n child = child.sibling;\n@@ -1244,7 +1221,7 @@ function renderRoot(root: FiberRoot, isYieldy: boolean): void {\n const interactions: Set = new Set();\n root.pendingInteractionMap.forEach(\n (scheduledInteractions, scheduledExpirationTime) => {\n- if (scheduledExpirationTime <= expirationTime) {\n+ if (scheduledExpirationTime >= expirationTime) {\n scheduledInteractions.forEach(interaction =>\n interactions.add(interaction),\n );\n@@ -1550,11 +1527,11 @@ function computeThreadID(\n function computeUniqueAsyncExpiration(): ExpirationTime {\n const currentTime = requestCurrentTime();\n let result = computeAsyncExpiration(currentTime);\n- if (result <= lastUniqueAsyncExpiration) {\n+ if (result >= lastUniqueAsyncExpiration) {\n \/\/ Since we assume the current time monotonically increases, we only hit\n \/\/ this branch when computeUniqueAsyncExpiration is fired multiple times\n \/\/ within a 200ms window (or whatever the async bucket size is).\n- result = lastUniqueAsyncExpiration + 1;\n+ result = lastUniqueAsyncExpiration - 1;\n }\n lastUniqueAsyncExpiration = result;\n return lastUniqueAsyncExpiration;\n@@ -1589,7 +1566,7 @@ function computeExpirationForFiber(currentTime: ExpirationTime, fiber: Fiber) {\n \/\/ If we're in the middle of rendering a tree, do not update at the same\n \/\/ expiration time that is already rendering.\n if (nextRoot !== null && expirationTime === nextRenderExpirationTime) {\n- expirationTime += 1;\n+ expirationTime -= 1;\n }\n } else {\n \/\/ This is a sync update\n@@ -1600,7 +1577,10 @@ function computeExpirationForFiber(currentTime: ExpirationTime, fiber: Fiber) {\n \/\/ This is an interactive update. Keep track of the lowest pending\n \/\/ interactive expiration time. This allows us to synchronously flush\n \/\/ all interactive updates when needed.\n- if (expirationTime > lowestPriorityPendingInteractiveExpirationTime) {\n+ if (\n+ lowestPriorityPendingInteractiveExpirationTime === NoWork ||\n+ expirationTime < lowestPriorityPendingInteractiveExpirationTime\n+ ) {\n lowestPriorityPendingInteractiveExpirationTime = expirationTime;\n }\n }\n@@ -1694,18 +1674,11 @@ function scheduleWorkToRoot(fiber: Fiber, expirationTime): FiberRoot | null {\n }\n \n \/\/ Update the source fiber's expiration time\n- if (\n- fiber.expirationTime === NoWork ||\n- fiber.expirationTime > expirationTime\n- ) {\n+ if (fiber.expirationTime < expirationTime) {\n fiber.expirationTime = expirationTime;\n }\n let alternate = fiber.alternate;\n- if (\n- alternate !== null &&\n- (alternate.expirationTime === NoWork ||\n- alternate.expirationTime > expirationTime)\n- ) {\n+ if (alternate !== null && alternate.expirationTime < expirationTime) {\n alternate.expirationTime = expirationTime;\n }\n \/\/ Walk the parent path to the root and update the child expiration time.\n@@ -1716,22 +1689,17 @@ function scheduleWorkToRoot(fiber: Fiber, expirationTime): FiberRoot | null {\n } else {\n while (node !== null) {\n alternate = node.alternate;\n- if (\n- node.childExpirationTime === NoWork ||\n- node.childExpirationTime > expirationTime\n- ) {\n+ if (node.childExpirationTime < expirationTime) {\n node.childExpirationTime = expirationTime;\n if (\n alternate !== null &&\n- (alternate.childExpirationTime === NoWork ||\n- alternate.childExpirationTime > expirationTime)\n+ alternate.childExpirationTime < expirationTime\n ) {\n alternate.childExpirationTime = expirationTime;\n }\n } else if (\n alternate !== null &&\n- (alternate.childExpirationTime === NoWork ||\n- alternate.childExpirationTime > expirationTime)\n+ alternate.childExpirationTime < expirationTime\n ) {\n alternate.childExpirationTime = expirationTime;\n }\n@@ -1806,7 +1774,7 @@ function scheduleWork(fiber: Fiber, expirationTime: ExpirationTime) {\n if (\n !isWorking &&\n nextRenderExpirationTime !== NoWork &&\n- expirationTime < nextRenderExpirationTime\n+ expirationTime > nextRenderExpirationTime\n ) {\n \/\/ This is an interruption. (Used for performance tracking.)\n interruptedBy = fiber;\n@@ -1911,7 +1879,7 @@ function scheduleCallbackWithExpirationTime(\n ) {\n if (callbackExpirationTime !== NoWork) {\n \/\/ A callback is already scheduled. Check its expiration time (timeout).\n- if (expirationTime > callbackExpirationTime) {\n+ if (expirationTime < callbackExpirationTime) {\n \/\/ Existing callback has sufficient timeout. Exit.\n return;\n } else {\n@@ -2083,10 +2051,7 @@ function addRootToSchedule(root: FiberRoot, expirationTime: ExpirationTime) {\n } else {\n \/\/ This root is already scheduled, but its priority may have increased.\n const remainingExpirationTime = root.expirationTime;\n- if (\n- remainingExpirationTime === NoWork ||\n- expirationTime < remainingExpirationTime\n- ) {\n+ if (expirationTime > remainingExpirationTime) {\n \/\/ Update the priority.\n root.expirationTime = expirationTime;\n }\n@@ -2135,10 +2100,7 @@ function findHighestPriorityRoot() {\n }\n root = previousScheduledRoot.nextScheduledRoot;\n } else {\n- if (\n- highestPriorityWork === NoWork ||\n- remainingExpirationTime < highestPriorityWork\n- ) {\n+ if (remainingExpirationTime > highestPriorityWork) {\n \/\/ Update the priority, if it's higher\n highestPriorityWork = remainingExpirationTime;\n highestPriorityRoot = root;\n@@ -2214,7 +2176,7 @@ function performWork(minExpirationTime: ExpirationTime, isYieldy: boolean) {\n currentSchedulerTime = currentRendererTime;\n \n if (enableUserTimingAPI) {\n- const didExpire = nextFlushedExpirationTime < currentRendererTime;\n+ const didExpire = nextFlushedExpirationTime > currentRendererTime;\n const timeout = expirationTimeToMs(nextFlushedExpirationTime);\n stopRequestCallbackTimer(didExpire, timeout);\n }\n@@ -2222,14 +2184,13 @@ function performWork(minExpirationTime: ExpirationTime, isYieldy: boolean) {\n while (\n nextFlushedRoot !== null &&\n nextFlushedExpirationTime !== NoWork &&\n- (minExpirationTime === NoWork ||\n- minExpirationTime >= nextFlushedExpirationTime) &&\n- !(didYield && currentRendererTime < nextFlushedExpirationTime)\n+ minExpirationTime <= nextFlushedExpirationTime &&\n+ !(didYield && currentRendererTime > nextFlushedExpirationTime)\n ) {\n performWorkOnRoot(\n nextFlushedRoot,\n nextFlushedExpirationTime,\n- currentRendererTime < nextFlushedExpirationTime,\n+ currentRendererTime > nextFlushedExpirationTime,\n );\n findHighestPriorityRoot();\n recomputeCurrentRendererTime();\n@@ -2239,8 +2200,7 @@ function performWork(minExpirationTime: ExpirationTime, isYieldy: boolean) {\n while (\n nextFlushedRoot !== null &&\n nextFlushedExpirationTime !== NoWork &&\n- (minExpirationTime === NoWork ||\n- minExpirationTime >= nextFlushedExpirationTime)\n+ minExpirationTime <= nextFlushedExpirationTime\n ) {\n performWorkOnRoot(nextFlushedRoot, nextFlushedExpirationTime, false);\n findHighestPriorityRoot();\n@@ -2395,7 +2355,7 @@ function completeRoot(\n ): void {\n \/\/ Check if there's a batch that matches this expiration time.\n const firstBatch = root.firstBatch;\n- if (firstBatch !== null && firstBatch._expirationTime <= expirationTime) {\n+ if (firstBatch !== null && firstBatch._expirationTime >= expirationTime) {\n if (completedBatches === null) {\n completedBatches = [firstBatch];\n } else {\ndiff --git a\/packages\/react-reconciler\/src\/ReactUpdateQueue.js b\/packages\/react-reconciler\/src\/ReactUpdateQueue.js\nindex 79660bd45b..3fe8307c58 100644\n--- a\/packages\/react-reconciler\/src\/ReactUpdateQueue.js\n+++ b\/packages\/react-reconciler\/src\/ReactUpdateQueue.js\n@@ -425,7 +425,7 @@ export function processUpdateQueue(\n let resultState = newBaseState;\n while (update !== null) {\n const updateExpirationTime = update.expirationTime;\n- if (updateExpirationTime > renderExpirationTime) {\n+ if (updateExpirationTime < renderExpirationTime) {\n \/\/ This update does not have sufficient priority. Skip it.\n if (newFirstUpdate === null) {\n \/\/ This is the first skipped update. It will be the first update in\n@@ -437,10 +437,7 @@ export function processUpdateQueue(\n }\n \/\/ Since this update will remain in the list, update the remaining\n \/\/ expiration time.\n- if (\n- newExpirationTime === NoWork ||\n- newExpirationTime > updateExpirationTime\n- ) {\n+ if (newExpirationTime < updateExpirationTime) {\n newExpirationTime = updateExpirationTime;\n }\n } else {\n@@ -476,7 +473,7 @@ export function processUpdateQueue(\n update = queue.firstCapturedUpdate;\n while (update !== null) {\n const updateExpirationTime = update.expirationTime;\n- if (updateExpirationTime > renderExpirationTime) {\n+ if (updateExpirationTime < renderExpirationTime) {\n \/\/ This update does not have sufficient priority. Skip it.\n if (newFirstCapturedUpdate === null) {\n \/\/ This is the first skipped captured update. It will be the first\n@@ -490,10 +487,7 @@ export function processUpdateQueue(\n }\n \/\/ Since this update will remain in the list, update the remaining\n \/\/ expiration time.\n- if (\n- newExpirationTime === NoWork ||\n- newExpirationTime > updateExpirationTime\n- ) {\n+ if (newExpirationTime < updateExpirationTime) {\n newExpirationTime = updateExpirationTime;\n }\n } else {\n"}

dillon1000/react

Files changed