From 1d718367ec31069a0cef3b08b3f14683ddbf17c2 Mon Sep 17 00:00:00 2001 From: acdlite Date: Mon, 5 Dec 2022 21:17:13 +0000 Subject: [PATCH] Revert recent hydration changes (#25812) We're reverting the stack of changes that this code belongs to in order to unblock the sync to Meta's internal codebase. We will attempt to re-land once the sync is unblocked. I have not yet verified that this fixes the error that were reported internally. I will do that before landing. DiffTrain build for `d807eb52cfd999cfbcb19078a75b15f844e409bb` --- compiled/facebook-www/React-dev.classic.js | 2 +- compiled/facebook-www/React-dev.modern.js | 2 +- compiled/facebook-www/React-prod.classic.js | 2 +- compiled/facebook-www/React-prod.modern.js | 2 +- .../facebook-www/React-profiling.classic.js | 2 +- .../facebook-www/React-profiling.modern.js | 2 +- compiled/facebook-www/ReactART-dev.classic.js | 177 ++++--------- compiled/facebook-www/ReactART-dev.modern.js | 177 ++++--------- .../facebook-www/ReactART-prod.classic.js | 167 ++++++------ compiled/facebook-www/ReactART-prod.modern.js | 167 ++++++------ compiled/facebook-www/ReactDOM-dev.classic.js | 177 ++++--------- compiled/facebook-www/ReactDOM-dev.modern.js | 177 ++++--------- .../facebook-www/ReactDOM-prod.classic.js | 216 +++++++-------- compiled/facebook-www/ReactDOM-prod.modern.js | 216 +++++++-------- .../ReactDOM-profiling.classic.js | 248 ++++++++---------- .../facebook-www/ReactDOM-profiling.modern.js | 248 ++++++++---------- .../ReactDOMForked-dev.classic.js | 177 ++++--------- .../facebook-www/ReactDOMForked-dev.modern.js | 177 ++++--------- .../ReactDOMForked-prod.classic.js | 216 +++++++-------- .../ReactDOMForked-prod.modern.js | 216 +++++++-------- .../ReactDOMForked-profiling.classic.js | 248 ++++++++---------- .../ReactDOMForked-profiling.modern.js | 248 ++++++++---------- .../ReactDOMServer-dev.classic.js | 2 +- .../facebook-www/ReactDOMServer-dev.modern.js | 2 +- .../ReactDOMServer-prod.classic.js | 2 +- .../ReactDOMServer-prod.modern.js | 2 +- .../ReactDOMTesting-dev.classic.js | 172 ++++-------- .../ReactDOMTesting-dev.modern.js | 172 ++++-------- .../ReactDOMTesting-prod.classic.js | 210 +++++++-------- .../ReactDOMTesting-prod.modern.js | 210 +++++++-------- .../ReactTestRenderer-dev.classic.js | 172 ++++-------- .../ReactTestRenderer-dev.modern.js | 172 ++++-------- 32 files changed, 1744 insertions(+), 2636 deletions(-) diff --git a/compiled/facebook-www/React-dev.classic.js b/compiled/facebook-www/React-dev.classic.js index 27744b0bc1d8c..d0b5335315eb1 100644 --- a/compiled/facebook-www/React-dev.classic.js +++ b/compiled/facebook-www/React-dev.classic.js @@ -27,7 +27,7 @@ if ( } "use strict"; -var ReactVersion = "18.3.0-www-classic-2ccfa657d-20221205"; +var ReactVersion = "18.3.0-www-classic-d807eb52c-20221205"; // ATTENTION // When adding new symbols to this file, diff --git a/compiled/facebook-www/React-dev.modern.js b/compiled/facebook-www/React-dev.modern.js index d2dbd5d7dcfc7..2beefdc1fd894 100644 --- a/compiled/facebook-www/React-dev.modern.js +++ b/compiled/facebook-www/React-dev.modern.js @@ -27,7 +27,7 @@ if ( } "use strict"; -var ReactVersion = "18.3.0-www-modern-2ccfa657d-20221205"; +var ReactVersion = "18.3.0-www-modern-d807eb52c-20221205"; // ATTENTION // When adding new symbols to this file, diff --git a/compiled/facebook-www/React-prod.classic.js b/compiled/facebook-www/React-prod.classic.js index 3b43e18be5703..f1908f4536474 100644 --- a/compiled/facebook-www/React-prod.classic.js +++ b/compiled/facebook-www/React-prod.classic.js @@ -643,4 +643,4 @@ exports.useSyncExternalStore = function( ); }; exports.useTransition = useTransition; -exports.version = "18.3.0-www-classic-2ccfa657d-20221205"; +exports.version = "18.3.0-www-classic-d807eb52c-20221205"; diff --git a/compiled/facebook-www/React-prod.modern.js b/compiled/facebook-www/React-prod.modern.js index 2707a03a5b008..187ef54f2fcfa 100644 --- a/compiled/facebook-www/React-prod.modern.js +++ b/compiled/facebook-www/React-prod.modern.js @@ -635,4 +635,4 @@ exports.useSyncExternalStore = function( ); }; exports.useTransition = useTransition; -exports.version = "18.3.0-www-modern-2ccfa657d-20221205"; +exports.version = "18.3.0-www-modern-d807eb52c-20221205"; diff --git a/compiled/facebook-www/React-profiling.classic.js b/compiled/facebook-www/React-profiling.classic.js index 2b5d8065fbfc0..7452eaea32286 100644 --- a/compiled/facebook-www/React-profiling.classic.js +++ b/compiled/facebook-www/React-profiling.classic.js @@ -654,7 +654,7 @@ exports.useSyncExternalStore = function( ); }; exports.useTransition = useTransition; -exports.version = "18.3.0-www-classic-2ccfa657d-20221205"; +exports.version = "18.3.0-www-classic-d807eb52c-20221205"; /* global __REACT_DEVTOOLS_GLOBAL_HOOK__ */ if ( diff --git a/compiled/facebook-www/React-profiling.modern.js b/compiled/facebook-www/React-profiling.modern.js index 13c97ef0998c2..2e3df01972637 100644 --- a/compiled/facebook-www/React-profiling.modern.js +++ b/compiled/facebook-www/React-profiling.modern.js @@ -646,7 +646,7 @@ exports.useSyncExternalStore = function( ); }; exports.useTransition = useTransition; -exports.version = "18.3.0-www-modern-2ccfa657d-20221205"; +exports.version = "18.3.0-www-modern-d807eb52c-20221205"; /* global __REACT_DEVTOOLS_GLOBAL_HOOK__ */ if ( diff --git a/compiled/facebook-www/ReactART-dev.classic.js b/compiled/facebook-www/ReactART-dev.classic.js index 0891ac3017ec2..25660acf15542 100644 --- a/compiled/facebook-www/ReactART-dev.classic.js +++ b/compiled/facebook-www/ReactART-dev.classic.js @@ -69,7 +69,7 @@ function _assertThisInitialized(self) { return self; } -var ReactVersion = "18.3.0-www-classic-2ccfa657d-20221205"; +var ReactVersion = "18.3.0-www-classic-d807eb52c-20221205"; var LegacyRoot = 0; var ConcurrentRoot = 1; @@ -1573,91 +1573,91 @@ var NoLanes = var NoLane = /* */ 0; -var SyncHydrationLane = - /* */ - 1; var SyncLane = /* */ - 2; + 1; var InputContinuousHydrationLane = /* */ - 4; + 2; var InputContinuousLane = /* */ - 8; + 4; var DefaultHydrationLane = /* */ - 16; + 8; var DefaultLane = /* */ - 32; + 16; var TransitionHydrationLane = /* */ - 64; + 32; var TransitionLanes = /* */ - 8388480; + 4194240; var TransitionLane1 = /* */ - 128; + 64; var TransitionLane2 = /* */ - 256; + 128; var TransitionLane3 = /* */ - 512; + 256; var TransitionLane4 = /* */ - 1024; + 512; var TransitionLane5 = /* */ - 2048; + 1024; var TransitionLane6 = /* */ - 4096; + 2048; var TransitionLane7 = /* */ - 8192; + 4096; var TransitionLane8 = /* */ - 16384; + 8192; var TransitionLane9 = /* */ - 32768; + 16384; var TransitionLane10 = /* */ - 65536; + 32768; var TransitionLane11 = /* */ - 131072; + 65536; var TransitionLane12 = /* */ - 262144; + 131072; var TransitionLane13 = /* */ - 524288; + 262144; var TransitionLane14 = /* */ - 1048576; + 524288; var TransitionLane15 = /* */ - 2097152; + 1048576; var TransitionLane16 = /* */ - 4194304; + 2097152; var RetryLanes = /* */ - 125829120; + 130023424; var RetryLane1 = /* */ - 8388608; + 4194304; var RetryLane2 = /* */ - 16777216; + 8388608; var RetryLane3 = /* */ - 33554432; + 16777216; var RetryLane4 = + /* */ + 33554432; +var RetryLane5 = /* */ 67108864; var SomeRetryLane = RetryLane1; @@ -1680,10 +1680,6 @@ var OffscreenLane = function getLabelForLane(lane) { if (enableSchedulingProfiler) { - if (lane & SyncHydrationLane) { - return "SyncHydrationLane"; - } - if (lane & SyncLane) { return "Sync"; } @@ -1739,9 +1735,6 @@ var nextRetryLane = RetryLane1; function getHighestPriorityLanes(lanes) { switch (getHighestPriorityLane(lanes)) { - case SyncHydrationLane: - return SyncHydrationLane; - case SyncLane: return SyncLane; @@ -1782,6 +1775,7 @@ function getHighestPriorityLanes(lanes) { case RetryLane2: case RetryLane3: case RetryLane4: + case RetryLane5: return lanes & RetryLanes; case SelectiveHydrationLane: @@ -1942,7 +1936,6 @@ function getMostRecentEventTime(root, lanes) { function computeExpirationTime(lane, currentTime) { switch (lane) { - case SyncHydrationLane: case SyncLane: case InputContinuousHydrationLane: case InputContinuousLane: @@ -1982,6 +1975,7 @@ function computeExpirationTime(lane, currentTime) { case RetryLane2: case RetryLane3: case RetryLane4: + case RetryLane5: // TODO: Retries should be allowed to expire if they are CPU bound for // too long, but when I made this change it caused a spike in browser // crashes. There must be some other underlying bug; not super urgent but @@ -2064,9 +2058,6 @@ function getLanesToRetrySynchronouslyOnError(root, originallyAttemptedLanes) { return NoLanes; } -function includesSyncLane(lanes) { - return (lanes & (SyncLane | SyncHydrationLane)) !== NoLanes; -} function includesNonIdleWork(lanes) { return (lanes & NonIdleLanes) !== NoLanes; } @@ -2074,8 +2065,6 @@ function includesOnlyRetries(lanes) { return (lanes & RetryLanes) === lanes; } function includesOnlyNonUrgentLanes(lanes) { - // TODO: Should hydration lanes be included here? This function is only - // used in `updateDeferredValueImpl`. var UrgentLanes = SyncLane | InputContinuousLane | DefaultLane; return (lanes & UrgentLanes) === NoLanes; } @@ -2313,10 +2302,6 @@ function getBumpedLaneForHydration(root, renderLanes) { var lane; switch (renderLane) { - case SyncLane: - lane = SyncHydrationLane; - break; - case InputContinuousLane: lane = InputContinuousHydrationLane; break; @@ -2345,6 +2330,7 @@ function getBumpedLaneForHydration(root, renderLanes) { case RetryLane2: case RetryLane3: case RetryLane4: + case RetryLane5: lane = TransitionHydrationLane; break; @@ -12729,14 +12715,7 @@ function getMarkerInstances() { return null; } -var ReactCurrentOwner$1 = ReactSharedInternals.ReactCurrentOwner; // A special exception that's used to unwind the stack when an update flows -// into a dehydrated boundary. - -var SelectiveHydrationException = new Error( - "This is not a real error. It's an implementation detail of React's " + - "selective hydration feature. If this leaks into userspace, it's a bug in " + - "React. Please file an issue." -); +var ReactCurrentOwner$1 = ReactSharedInternals.ReactCurrentOwner; var didReceiveUpdate = false; var didWarnAboutBadClass; var didWarnAboutModulePatternComponent; @@ -14929,29 +14908,18 @@ function updateDehydratedSuspenseComponent( current, attemptHydrationAtLane, eventTime - ); // Throw a special object that signals to the work loop that it should - // interrupt the current render. - // - // Because we're inside a React-only execution stack, we don't - // strictly need to throw here — we could instead modify some internal - // work loop state. But using an exception means we don't need to - // check for this case on every iteration of the work loop. So doing - // it this way moves the check out of the fast path. - - throw SelectiveHydrationException; + ); } - } // If we did not selectively hydrate, we'll continue rendering without - // hydrating. Mark this tree as suspended to prevent it from committing - // outside a transition. - // - // This path should only happen if the hydration lane already suspended. - // Currently, it also happens during sync updates because there is no - // hydration lane for sync updates. + } // If we have scheduled higher pri work above, this will just abort the render + // since we now have higher priority work. We'll try to infinitely suspend until + // we yield. TODO: We could probably just force yielding earlier instead. + + renderDidSuspendDelayIfPossible(); // If we rendered synchronously, we won't yield so have to render something. + // This will cause us to delete any existing content. // TODO: We should ideally have a sync hydration lane that we can apply to do // a pass where we hydrate this subtree in place using the previous Context and then // reapply the update afterwards. - renderDidSuspendDelayIfPossible(); return retrySuspenseComponentWithoutHydrating( current, workInProgress, @@ -22920,8 +22888,7 @@ var SuspendedOnError = 1; var SuspendedOnData = 2; var SuspendedOnImmediate = 3; var SuspendedOnDeprecatedThrowPromise = 4; -var SuspendedAndReadyToUnwind = 5; -var SuspendedOnHydration = 6; // When this is true, the work-in-progress fiber just suspended (or errored) and +var SuspendedAndReadyToUnwind = 5; // When this is true, the work-in-progress fiber just suspended (or errored) and // we've yet to unwind the stack. In some cases, we may yield to the main thread // after this happens. If the fiber is pinged before we resume, we can retry // immediately instead of unwinding the stack. @@ -23442,7 +23409,7 @@ function ensureRootIsScheduled(root, currentTime) { // TODO: Temporary until we confirm this warning is not fired. if ( existingCallbackNode == null && - !includesSyncLane(existingCallbackPriority) + existingCallbackPriority !== SyncLane ) { error( "Expected scheduled callback to exist. This error is likely caused by a bug in React. Please file an issue." @@ -23460,7 +23427,7 @@ function ensureRootIsScheduled(root, currentTime) { var newCallbackNode; - if (includesSyncLane(newCallbackPriority)) { + if (newCallbackPriority === SyncLane) { // Special case: Sync React callbacks are scheduled on a special // internal queue if (root.tag === LegacyRoot) { @@ -23997,7 +23964,7 @@ function performSyncWorkOnRoot(root) { flushPassiveEffects(); var lanes = getNextLanes(root, NoLanes); - if (!includesSyncLane(lanes)) { + if (!includesSomeLane(lanes, SyncLane)) { // There's no remaining sync work left. ensureRootIsScheduled(root, now()); return null; @@ -24207,17 +24174,6 @@ function handleThrow(root, thrownValue) { workInProgressSuspendedReason = shouldAttemptToSuspendUntilDataResolves() ? SuspendedOnData : SuspendedOnImmediate; - } else if (thrownValue === SelectiveHydrationException) { - // An update flowed into a dehydrated boundary. Before we can apply the - // update, we need to finish hydrating. Interrupt the work-in-progress - // render so we can restart at the hydration lane. - // - // The ideal implementation would be able to switch contexts without - // unwinding the current stack. - // - // We could name this something more general but as of now it's the only - // case where we think this should happen. - workInProgressSuspendedReason = SuspendedOnHydration; } else { // This is a regular error. var isWakeable = @@ -24443,7 +24399,7 @@ function renderRootSync(root, lanes) { markRenderStarted(lanes); } - outer: do { + do { try { if ( workInProgressSuspendedReason !== NotSuspended && @@ -24459,25 +24415,9 @@ function renderRootSync(root, lanes) { // function and fork the behavior some other way. var unitOfWork = workInProgress; var thrownValue = workInProgressThrownValue; - - switch (workInProgressSuspendedReason) { - case SuspendedOnHydration: { - // Selective hydration. An update flowed into a dehydrated tree. - // Interrupt the current render so the work loop can switch to the - // hydration lane. - workInProgress = null; - workInProgressRootExitStatus = RootDidNotComplete; - break outer; - } - - default: { - // Continue with the normal work loop. - workInProgressSuspendedReason = NotSuspended; - workInProgressThrownValue = null; - unwindSuspendedUnitOfWork(unitOfWork, thrownValue); - break; - } - } + workInProgressSuspendedReason = NotSuspended; + workInProgressThrownValue = null; + unwindSuspendedUnitOfWork(unitOfWork, thrownValue); // Continue with the normal work loop. } workLoopSync(); @@ -24642,15 +24582,6 @@ function renderRootConcurrent(root, lanes) { break; } - case SuspendedOnHydration: { - // Selective hydration. An update flowed into a dehydrated tree. - // Interrupt the current render so the work loop can switch to the - // hydration lane. - workInProgress = null; - workInProgressRootExitStatus = RootDidNotComplete; - break outer; - } - default: { throw new Error( "Unexpected SuspendedReason. This is a bug in React." @@ -25295,13 +25226,16 @@ function commitRootImpl( // currently schedule the callback in multiple places, will wait until those // are consolidated. - if (includesSyncLane(pendingPassiveEffectsLanes) && root.tag !== LegacyRoot) { + if ( + includesSomeLane(pendingPassiveEffectsLanes, SyncLane) && + root.tag !== LegacyRoot + ) { flushPassiveEffects(); } // Read this again, since a passive effect might have updated it remainingLanes = root.pendingLanes; - if (includesSyncLane(remainingLanes)) { + if (includesSomeLane(remainingLanes, SyncLane)) { { markNestedUpdateScheduled(); } // Count the number of times the root synchronously re-renders without @@ -26017,7 +25951,6 @@ if (replayFailedUnitOfWorkWithInvokeGuardedCallback) { if ( didSuspendOrErrorWhileHydratingDEV() || originalError === SuspenseException || - originalError === SelectiveHydrationException || (originalError !== null && typeof originalError === "object" && typeof originalError.then === "function") diff --git a/compiled/facebook-www/ReactART-dev.modern.js b/compiled/facebook-www/ReactART-dev.modern.js index dec933e032aa9..d9b8a701cb964 100644 --- a/compiled/facebook-www/ReactART-dev.modern.js +++ b/compiled/facebook-www/ReactART-dev.modern.js @@ -69,7 +69,7 @@ function _assertThisInitialized(self) { return self; } -var ReactVersion = "18.3.0-www-modern-2ccfa657d-20221205"; +var ReactVersion = "18.3.0-www-modern-d807eb52c-20221205"; var LegacyRoot = 0; var ConcurrentRoot = 1; @@ -1570,91 +1570,91 @@ var NoLanes = var NoLane = /* */ 0; -var SyncHydrationLane = - /* */ - 1; var SyncLane = /* */ - 2; + 1; var InputContinuousHydrationLane = /* */ - 4; + 2; var InputContinuousLane = /* */ - 8; + 4; var DefaultHydrationLane = /* */ - 16; + 8; var DefaultLane = /* */ - 32; + 16; var TransitionHydrationLane = /* */ - 64; + 32; var TransitionLanes = /* */ - 8388480; + 4194240; var TransitionLane1 = /* */ - 128; + 64; var TransitionLane2 = /* */ - 256; + 128; var TransitionLane3 = /* */ - 512; + 256; var TransitionLane4 = /* */ - 1024; + 512; var TransitionLane5 = /* */ - 2048; + 1024; var TransitionLane6 = /* */ - 4096; + 2048; var TransitionLane7 = /* */ - 8192; + 4096; var TransitionLane8 = /* */ - 16384; + 8192; var TransitionLane9 = /* */ - 32768; + 16384; var TransitionLane10 = /* */ - 65536; + 32768; var TransitionLane11 = /* */ - 131072; + 65536; var TransitionLane12 = /* */ - 262144; + 131072; var TransitionLane13 = /* */ - 524288; + 262144; var TransitionLane14 = /* */ - 1048576; + 524288; var TransitionLane15 = /* */ - 2097152; + 1048576; var TransitionLane16 = /* */ - 4194304; + 2097152; var RetryLanes = /* */ - 125829120; + 130023424; var RetryLane1 = /* */ - 8388608; + 4194304; var RetryLane2 = /* */ - 16777216; + 8388608; var RetryLane3 = /* */ - 33554432; + 16777216; var RetryLane4 = + /* */ + 33554432; +var RetryLane5 = /* */ 67108864; var SomeRetryLane = RetryLane1; @@ -1677,10 +1677,6 @@ var OffscreenLane = function getLabelForLane(lane) { if (enableSchedulingProfiler) { - if (lane & SyncHydrationLane) { - return "SyncHydrationLane"; - } - if (lane & SyncLane) { return "Sync"; } @@ -1736,9 +1732,6 @@ var nextRetryLane = RetryLane1; function getHighestPriorityLanes(lanes) { switch (getHighestPriorityLane(lanes)) { - case SyncHydrationLane: - return SyncHydrationLane; - case SyncLane: return SyncLane; @@ -1779,6 +1772,7 @@ function getHighestPriorityLanes(lanes) { case RetryLane2: case RetryLane3: case RetryLane4: + case RetryLane5: return lanes & RetryLanes; case SelectiveHydrationLane: @@ -1939,7 +1933,6 @@ function getMostRecentEventTime(root, lanes) { function computeExpirationTime(lane, currentTime) { switch (lane) { - case SyncHydrationLane: case SyncLane: case InputContinuousHydrationLane: case InputContinuousLane: @@ -1979,6 +1972,7 @@ function computeExpirationTime(lane, currentTime) { case RetryLane2: case RetryLane3: case RetryLane4: + case RetryLane5: // TODO: Retries should be allowed to expire if they are CPU bound for // too long, but when I made this change it caused a spike in browser // crashes. There must be some other underlying bug; not super urgent but @@ -2061,9 +2055,6 @@ function getLanesToRetrySynchronouslyOnError(root, originallyAttemptedLanes) { return NoLanes; } -function includesSyncLane(lanes) { - return (lanes & (SyncLane | SyncHydrationLane)) !== NoLanes; -} function includesNonIdleWork(lanes) { return (lanes & NonIdleLanes) !== NoLanes; } @@ -2071,8 +2062,6 @@ function includesOnlyRetries(lanes) { return (lanes & RetryLanes) === lanes; } function includesOnlyNonUrgentLanes(lanes) { - // TODO: Should hydration lanes be included here? This function is only - // used in `updateDeferredValueImpl`. var UrgentLanes = SyncLane | InputContinuousLane | DefaultLane; return (lanes & UrgentLanes) === NoLanes; } @@ -2310,10 +2299,6 @@ function getBumpedLaneForHydration(root, renderLanes) { var lane; switch (renderLane) { - case SyncLane: - lane = SyncHydrationLane; - break; - case InputContinuousLane: lane = InputContinuousHydrationLane; break; @@ -2342,6 +2327,7 @@ function getBumpedLaneForHydration(root, renderLanes) { case RetryLane2: case RetryLane3: case RetryLane4: + case RetryLane5: lane = TransitionHydrationLane; break; @@ -12457,14 +12443,7 @@ function getMarkerInstances() { return null; } -var ReactCurrentOwner$1 = ReactSharedInternals.ReactCurrentOwner; // A special exception that's used to unwind the stack when an update flows -// into a dehydrated boundary. - -var SelectiveHydrationException = new Error( - "This is not a real error. It's an implementation detail of React's " + - "selective hydration feature. If this leaks into userspace, it's a bug in " + - "React. Please file an issue." -); +var ReactCurrentOwner$1 = ReactSharedInternals.ReactCurrentOwner; var didReceiveUpdate = false; var didWarnAboutBadClass; var didWarnAboutModulePatternComponent; @@ -14641,29 +14620,18 @@ function updateDehydratedSuspenseComponent( current, attemptHydrationAtLane, eventTime - ); // Throw a special object that signals to the work loop that it should - // interrupt the current render. - // - // Because we're inside a React-only execution stack, we don't - // strictly need to throw here — we could instead modify some internal - // work loop state. But using an exception means we don't need to - // check for this case on every iteration of the work loop. So doing - // it this way moves the check out of the fast path. - - throw SelectiveHydrationException; + ); } - } // If we did not selectively hydrate, we'll continue rendering without - // hydrating. Mark this tree as suspended to prevent it from committing - // outside a transition. - // - // This path should only happen if the hydration lane already suspended. - // Currently, it also happens during sync updates because there is no - // hydration lane for sync updates. + } // If we have scheduled higher pri work above, this will just abort the render + // since we now have higher priority work. We'll try to infinitely suspend until + // we yield. TODO: We could probably just force yielding earlier instead. + + renderDidSuspendDelayIfPossible(); // If we rendered synchronously, we won't yield so have to render something. + // This will cause us to delete any existing content. // TODO: We should ideally have a sync hydration lane that we can apply to do // a pass where we hydrate this subtree in place using the previous Context and then // reapply the update afterwards. - renderDidSuspendDelayIfPossible(); return retrySuspenseComponentWithoutHydrating( current, workInProgress, @@ -22609,8 +22577,7 @@ var SuspendedOnError = 1; var SuspendedOnData = 2; var SuspendedOnImmediate = 3; var SuspendedOnDeprecatedThrowPromise = 4; -var SuspendedAndReadyToUnwind = 5; -var SuspendedOnHydration = 6; // When this is true, the work-in-progress fiber just suspended (or errored) and +var SuspendedAndReadyToUnwind = 5; // When this is true, the work-in-progress fiber just suspended (or errored) and // we've yet to unwind the stack. In some cases, we may yield to the main thread // after this happens. If the fiber is pinged before we resume, we can retry // immediately instead of unwinding the stack. @@ -23131,7 +23098,7 @@ function ensureRootIsScheduled(root, currentTime) { // TODO: Temporary until we confirm this warning is not fired. if ( existingCallbackNode == null && - !includesSyncLane(existingCallbackPriority) + existingCallbackPriority !== SyncLane ) { error( "Expected scheduled callback to exist. This error is likely caused by a bug in React. Please file an issue." @@ -23149,7 +23116,7 @@ function ensureRootIsScheduled(root, currentTime) { var newCallbackNode; - if (includesSyncLane(newCallbackPriority)) { + if (newCallbackPriority === SyncLane) { // Special case: Sync React callbacks are scheduled on a special // internal queue if (root.tag === LegacyRoot) { @@ -23686,7 +23653,7 @@ function performSyncWorkOnRoot(root) { flushPassiveEffects(); var lanes = getNextLanes(root, NoLanes); - if (!includesSyncLane(lanes)) { + if (!includesSomeLane(lanes, SyncLane)) { // There's no remaining sync work left. ensureRootIsScheduled(root, now()); return null; @@ -23896,17 +23863,6 @@ function handleThrow(root, thrownValue) { workInProgressSuspendedReason = shouldAttemptToSuspendUntilDataResolves() ? SuspendedOnData : SuspendedOnImmediate; - } else if (thrownValue === SelectiveHydrationException) { - // An update flowed into a dehydrated boundary. Before we can apply the - // update, we need to finish hydrating. Interrupt the work-in-progress - // render so we can restart at the hydration lane. - // - // The ideal implementation would be able to switch contexts without - // unwinding the current stack. - // - // We could name this something more general but as of now it's the only - // case where we think this should happen. - workInProgressSuspendedReason = SuspendedOnHydration; } else { // This is a regular error. var isWakeable = @@ -24132,7 +24088,7 @@ function renderRootSync(root, lanes) { markRenderStarted(lanes); } - outer: do { + do { try { if ( workInProgressSuspendedReason !== NotSuspended && @@ -24148,25 +24104,9 @@ function renderRootSync(root, lanes) { // function and fork the behavior some other way. var unitOfWork = workInProgress; var thrownValue = workInProgressThrownValue; - - switch (workInProgressSuspendedReason) { - case SuspendedOnHydration: { - // Selective hydration. An update flowed into a dehydrated tree. - // Interrupt the current render so the work loop can switch to the - // hydration lane. - workInProgress = null; - workInProgressRootExitStatus = RootDidNotComplete; - break outer; - } - - default: { - // Continue with the normal work loop. - workInProgressSuspendedReason = NotSuspended; - workInProgressThrownValue = null; - unwindSuspendedUnitOfWork(unitOfWork, thrownValue); - break; - } - } + workInProgressSuspendedReason = NotSuspended; + workInProgressThrownValue = null; + unwindSuspendedUnitOfWork(unitOfWork, thrownValue); // Continue with the normal work loop. } workLoopSync(); @@ -24331,15 +24271,6 @@ function renderRootConcurrent(root, lanes) { break; } - case SuspendedOnHydration: { - // Selective hydration. An update flowed into a dehydrated tree. - // Interrupt the current render so the work loop can switch to the - // hydration lane. - workInProgress = null; - workInProgressRootExitStatus = RootDidNotComplete; - break outer; - } - default: { throw new Error( "Unexpected SuspendedReason. This is a bug in React." @@ -24984,13 +24915,16 @@ function commitRootImpl( // currently schedule the callback in multiple places, will wait until those // are consolidated. - if (includesSyncLane(pendingPassiveEffectsLanes) && root.tag !== LegacyRoot) { + if ( + includesSomeLane(pendingPassiveEffectsLanes, SyncLane) && + root.tag !== LegacyRoot + ) { flushPassiveEffects(); } // Read this again, since a passive effect might have updated it remainingLanes = root.pendingLanes; - if (includesSyncLane(remainingLanes)) { + if (includesSomeLane(remainingLanes, SyncLane)) { { markNestedUpdateScheduled(); } // Count the number of times the root synchronously re-renders without @@ -25706,7 +25640,6 @@ if (replayFailedUnitOfWorkWithInvokeGuardedCallback) { if ( didSuspendOrErrorWhileHydratingDEV() || originalError === SuspenseException || - originalError === SelectiveHydrationException || (originalError !== null && typeof originalError === "object" && typeof originalError.then === "function") diff --git a/compiled/facebook-www/ReactART-prod.classic.js b/compiled/facebook-www/ReactART-prod.classic.js index 7a5e340519e46..a2bf30e1a605c 100644 --- a/compiled/facebook-www/ReactART-prod.classic.js +++ b/compiled/facebook-www/ReactART-prod.classic.js @@ -391,8 +391,8 @@ function clz32Fallback(x) { x >>>= 0; return 0 === x ? 32 : (31 - ((log(x) / LN2) | 0)) | 0; } -var nextTransitionLane = 128, - nextRetryLane = 8388608; +var nextTransitionLane = 64, + nextRetryLane = 4194304; function getHighestPriorityLanes(lanes) { switch (lanes & -lanes) { case 1: @@ -408,7 +408,6 @@ function getHighestPriorityLanes(lanes) { case 32: return 32; case 64: - return 64; case 128: case 256: case 512: @@ -424,13 +423,13 @@ function getHighestPriorityLanes(lanes) { case 524288: case 1048576: case 2097152: + return lanes & 4194240; case 4194304: - return lanes & 8388480; case 8388608: case 16777216: case 33554432: case 67108864: - return lanes & 125829120; + return lanes & 130023424; case 134217728: return 134217728; case 268435456: @@ -471,12 +470,12 @@ function getNextLanes(root, wipLanes) { ((suspendedLanes = nextLanes & -nextLanes), (pingedLanes = wipLanes & -wipLanes), suspendedLanes >= pingedLanes || - (32 === suspendedLanes && 0 !== (pingedLanes & 8388480))) + (16 === suspendedLanes && 0 !== (pingedLanes & 4194240))) ) return wipLanes; 0 === (root.current.mode & 32) && - 0 !== (nextLanes & 8) && - (nextLanes |= pendingLanes & 32); + 0 !== (nextLanes & 4) && + (nextLanes |= pendingLanes & 16); wipLanes = root.entangledLanes; if (0 !== wipLanes) for (root = root.entanglements, wipLanes &= nextLanes; 0 < wipLanes; ) @@ -491,8 +490,8 @@ function computeExpirationTime(lane, currentTime) { case 1: case 2: case 4: - case 8: return currentTime + 250; + case 8: case 16: case 32: case 64: @@ -511,8 +510,8 @@ function computeExpirationTime(lane, currentTime) { case 524288: case 1048576: case 2097152: - case 4194304: return currentTime + 5e3; + case 4194304: case 8388608: case 16777216: case 33554432: @@ -533,12 +532,12 @@ function getLanesToRetrySynchronouslyOnError(root, originallyAttemptedLanes) { return 0 !== root ? root : root & 1073741824 ? 1073741824 : 0; } function includesBlockingLane(root, lanes) { - return 0 !== (root.current.mode & 32) ? !1 : 0 !== (lanes & 60); + return 0 !== (root.current.mode & 32) ? !1 : 0 !== (lanes & 30); } function claimNextTransitionLane() { var lane = nextTransitionLane; nextTransitionLane <<= 1; - 0 === (nextTransitionLane & 8388480) && (nextTransitionLane = 128); + 0 === (nextTransitionLane & 4194240) && (nextTransitionLane = 64); return lane; } function createLaneMap(initial) { @@ -621,13 +620,13 @@ function clearTransitionsForLanes(root, lanes) { var currentUpdatePriority = 0; function lanesToEventPriority(lanes) { lanes &= -lanes; - return 2 < lanes - ? 8 < lanes + return 1 < lanes + ? 4 < lanes ? 0 !== (lanes & 268435455) - ? 32 + ? 16 : 536870912 - : 8 - : 2; + : 4 + : 1; } function shim() { throw Error(formatProdErrorMessage(305)); @@ -992,7 +991,7 @@ function flushSyncCallbacks() { previousUpdatePriority = currentUpdatePriority; try { var queue = syncQueue; - for (currentUpdatePriority = 2; i < queue.length; i++) { + for (currentUpdatePriority = 1; i < queue.length; i++) { var callback = queue[i]; do callback = callback(!0); while (null !== callback); @@ -1185,7 +1184,7 @@ function enqueueUpdate$1(fiber, update, lane) { } function entangleTransitions(root, fiber, lane) { fiber = fiber.updateQueue; - if (null !== fiber && ((fiber = fiber.shared), 0 !== (lane & 8388480))) { + if (null !== fiber && ((fiber = fiber.shared), 0 !== (lane & 4194240))) { var queueLanes = fiber.lanes; queueLanes &= root.pendingLanes; lane |= queueLanes; @@ -2687,8 +2686,8 @@ function checkIfSnapshotChanged(inst) { } } function forceStoreRerender(fiber) { - var root = enqueueConcurrentRenderForLane(fiber, 2); - null !== root && scheduleUpdateOnFiber(root, fiber, 2, -1); + var root = enqueueConcurrentRenderForLane(fiber, 1); + null !== root && scheduleUpdateOnFiber(root, fiber, 1, -1); } function mountState(initialState) { var hook = mountWorkInProgressHook(); @@ -2839,7 +2838,7 @@ function updateMemo(nextCreate, deps) { return nextCreate; } function updateDeferredValueImpl(hook, prevValue, value) { - if (0 === (renderLanes & 42)) + if (0 === (renderLanes & 21)) return ( hook.baseState && ((hook.baseState = !1), (didReceiveUpdate = !0)), (hook.memoizedState = value) @@ -2854,7 +2853,7 @@ function updateDeferredValueImpl(hook, prevValue, value) { function startTransition(setPending, callback, options) { var previousPriority = currentUpdatePriority; currentUpdatePriority = - 0 !== previousPriority && 8 > previousPriority ? previousPriority : 8; + 0 !== previousPriority && 4 > previousPriority ? previousPriority : 4; setPending(!0); var prevTransition = ReactCurrentBatchConfig.transition; ReactCurrentBatchConfig.transition = {}; @@ -2973,7 +2972,7 @@ function enqueueRenderPhaseUpdate(queue, update) { queue.pending = update; } function entangleTransitionUpdate(root, queue, lane) { - if (0 !== (lane & 8388480)) { + if (0 !== (lane & 4194240)) { var queueLanes = queue.lanes; queueLanes &= root.pendingLanes; lane |= queueLanes; @@ -3586,7 +3585,6 @@ function pushMarkerInstance(workInProgress, markerInstance) { )); } var ReactCurrentOwner$1 = ReactSharedInternals.ReactCurrentOwner, - SelectiveHydrationException = Error(formatProdErrorMessage(461)), didReceiveUpdate = !1; function reconcileChildren(current, workInProgress, nextChildren, renderLanes) { workInProgress.child = @@ -4194,7 +4192,7 @@ function updateSuspenseComponent(current, workInProgress, renderLanes) { renderLanes )), (workInProgress.memoizedState = SUSPENDED_MARKER), - (workInProgress.lanes = 8388608), + (workInProgress.lanes = 4194304), current ); pushPrimaryTreeSuspenseHandler(workInProgress); @@ -4452,15 +4450,13 @@ function updateDehydratedSuspenseComponent( nextProps = workInProgressRoot; if (null !== nextProps) { switch (renderLanes & -renderLanes) { - case 2: - didSuspend = 1; - break; - case 8: - didSuspend = 4; + case 4: + didSuspend = 2; break; - case 32: - didSuspend = 16; + case 16: + didSuspend = 8; break; + case 64: case 128: case 256: case 512: @@ -4481,7 +4477,7 @@ function updateDehydratedSuspenseComponent( case 16777216: case 33554432: case 67108864: - didSuspend = 64; + didSuspend = 32; break; case 536870912: didSuspend = 268435456; @@ -4493,11 +4489,11 @@ function updateDehydratedSuspenseComponent( 0 !== (didSuspend & (nextProps.suspendedLanes | renderLanes)) ? 0 : didSuspend; - if (0 !== didSuspend && didSuspend !== suspenseState.retryLane) - throw ((suspenseState.retryLane = didSuspend), + 0 !== didSuspend && + didSuspend !== suspenseState.retryLane && + ((suspenseState.retryLane = didSuspend), enqueueConcurrentRenderForLane(current, didSuspend), - scheduleUpdateOnFiber(nextProps, current, didSuspend, -1), - SelectiveHydrationException); + scheduleUpdateOnFiber(nextProps, current, didSuspend, -1)); } renderDidSuspendDelayIfPossible(); return retrySuspenseComponentWithoutHydrating( @@ -5525,7 +5521,7 @@ function completeWork(current, workInProgress, renderLanes) { ((workInProgress.flags |= 64), (newProps = !0), cutOffTailIfNeeded(instance, !1), - (workInProgress.lanes = 8388608)); + (workInProgress.lanes = 4194304)); } else { if (!newProps) @@ -5553,7 +5549,7 @@ function completeWork(current, workInProgress, renderLanes) { ((workInProgress.flags |= 64), (newProps = !0), cutOffTailIfNeeded(instance, !1), - (workInProgress.lanes = 8388608)); + (workInProgress.lanes = 4194304)); instance.isBackwards ? ((JSCompiler_inline_result.sibling = workInProgress.child), (workInProgress.child = JSCompiler_inline_result)) @@ -7695,7 +7691,7 @@ function requestEventTime() { : (currentEventTime = now()); } function requestUpdateLane(fiber) { - if (0 === (fiber.mode & 1)) return 2; + if (0 === (fiber.mode & 1)) return 1; if ( !deferRenderPhaseUpdateToNextBatch && 0 !== (executionContext & 2) && @@ -7709,7 +7705,7 @@ function requestUpdateLane(fiber) { currentEventTransitionLane ); fiber = currentUpdatePriority; - return 0 !== fiber ? fiber : 32; + return 0 !== fiber ? fiber : 16; } function scheduleUpdateOnFiber(root, fiber, lane, eventTime) { 2 === workInProgressSuspendedReason && @@ -7741,7 +7737,7 @@ function scheduleUpdateOnFiber(root, fiber, lane, eventTime) { markRootSuspended$1(root, workInProgressRootRenderLanes); } ensureRootIsScheduled(root, eventTime); - 2 === lane && + 1 === lane && 0 === executionContext && 0 === (fiber.mode & 1) && ((workInProgressRootRenderTargetTime = now() + 500), @@ -7754,7 +7750,7 @@ function ensureRootIsScheduled(root, currentTime) { suspendedLanes = root.suspendedLanes, pingedLanes = root.pingedLanes, expirationTimes = root.expirationTimes, - lanes = root.pendingLanes & -125829121; + lanes = root.pendingLanes & -130023425; 0 < lanes; ) { @@ -7780,7 +7776,7 @@ function ensureRootIsScheduled(root, currentTime) { root.callbackPriority !== currentTime) ) { null != existingCallbackNode && cancelCallback(existingCallbackNode); - if (0 !== (currentTime & 3)) + if (1 === currentTime) 0 === root.tag ? ((existingCallbackNode = performSyncWorkOnRoot.bind(null, root)), (includesLegacySyncCallbacks = !0), @@ -7795,13 +7791,13 @@ function ensureRootIsScheduled(root, currentTime) { (existingCallbackNode = null); else { switch (lanesToEventPriority(suspendedLanes)) { - case 2: + case 1: existingCallbackNode = ImmediatePriority; break; - case 8: + case 4: existingCallbackNode = UserBlockingPriority; break; - case 32: + case 16: existingCallbackNode = NormalPriority; break; case 536870912: @@ -7904,7 +7900,7 @@ function performConcurrentWorkOnRoot(root, didTimeout) { case 3: markRootSuspended$1(root, lanes); if ( - (lanes & 125829120) === lanes && + (lanes & 130023424) === lanes && ((didTimeout = globalMostRecentFallbackTime + 500 - now()), 10 < didTimeout) ) { @@ -7935,7 +7931,7 @@ function performConcurrentWorkOnRoot(root, didTimeout) { break; case 4: markRootSuspended$1(root, lanes); - if ((lanes & 8388480) === lanes) break; + if ((lanes & 4194240) === lanes) break; didTimeout = root.eventTimes; for (originallyAttemptedLanes = -1; 0 < lanes; ) (errorRetryLanes$128 = 31 - clz32(lanes)), @@ -8078,7 +8074,7 @@ function performSyncWorkOnRoot(root) { if (0 !== (executionContext & 6)) throw Error(formatProdErrorMessage(327)); flushPassiveEffects(); var lanes = getNextLanes(root, 0); - if (0 === (lanes & 3)) return ensureRootIsScheduled(root, now()), null; + if (0 === (lanes & 1)) return ensureRootIsScheduled(root, now()), null; var exitStatus = renderRootSync(root, lanes); if (0 !== root.tag && 2 === exitStatus) { var originallyAttemptedLanes = lanes, @@ -8158,11 +8154,9 @@ function handleThrow(root, thrownValue) { : 3; } else workInProgressSuspendedReason = - thrownValue === SelectiveHydrationException - ? 6 - : null !== thrownValue && - "object" === typeof thrownValue && - "function" === typeof thrownValue.then + null !== thrownValue && + "object" === typeof thrownValue && + "function" === typeof thrownValue.then ? 4 : 1; workInProgressThrownValue = thrownValue; @@ -8172,7 +8166,7 @@ function handleThrow(root, thrownValue) { } function shouldAttemptToSuspendUntilDataResolves() { if ( - (workInProgressRootRenderLanes & 125829120) === + (workInProgressRootRenderLanes & 130023424) === workInProgressRootRenderLanes ) return !0; @@ -8182,7 +8176,7 @@ function shouldAttemptToSuspendUntilDataResolves() { ) return !1; if ( - (workInProgressRootRenderLanes & 8388480) === + (workInProgressRootRenderLanes & 4194240) === workInProgressRootRenderLanes ) { var suspenseHandler = suspenseHandlerStackCursor.current; @@ -8222,21 +8216,14 @@ function renderRootSync(root, lanes) { if (workInProgressRoot !== root || workInProgressRootRenderLanes !== lanes) (workInProgressTransitions = getTransitionsForLanes(root, lanes)), prepareFreshStack(root, lanes); - a: do + do try { if (0 !== workInProgressSuspendedReason && null !== workInProgress) { lanes = workInProgress; var thrownValue = workInProgressThrownValue; - switch (workInProgressSuspendedReason) { - case 6: - workInProgress = null; - workInProgressRootExitStatus = 6; - break a; - default: - (workInProgressSuspendedReason = 0), - (workInProgressThrownValue = null), - unwindSuspendedUnitOfWork(lanes, thrownValue); - } + workInProgressSuspendedReason = 0; + workInProgressThrownValue = null; + unwindSuspendedUnitOfWork(lanes, thrownValue); } workLoopSync(); break; @@ -8306,10 +8293,6 @@ function renderRootConcurrent(root, lanes) { workInProgressThrownValue = null; unwindSuspendedUnitOfWork(lanes, thrownValue); break; - case 6: - workInProgress = null; - workInProgressRootExitStatus = 6; - break a; default: throw Error(formatProdErrorMessage(462)); } @@ -8445,11 +8428,11 @@ function unwindSuspendedUnitOfWork(unitOfWork, thrownValue) { if (1 === unitOfWork.tag) if (null === unitOfWork.alternate) unitOfWork.tag = 17; else { - var update = createUpdate(-1, 2); + var update = createUpdate(-1, 1); update.tag = 2; - enqueueUpdate$1(unitOfWork, update, 2); + enqueueUpdate$1(unitOfWork, update, 1); } - unitOfWork.lanes |= 2; + unitOfWork.lanes |= 1; } else (suspenseBoundary.flags |= 32768), @@ -8588,7 +8571,7 @@ function commitRoot(root, recoverableErrors, transitions) { prevTransition = ReactCurrentBatchConfig$2.transition; try { (ReactCurrentBatchConfig$2.transition = null), - (currentUpdatePriority = 2), + (currentUpdatePriority = 1), commitRootImpl( root, recoverableErrors, @@ -8639,7 +8622,7 @@ function commitRootImpl( transitions = ReactCurrentBatchConfig$2.transition; ReactCurrentBatchConfig$2.transition = null; var previousPriority = currentUpdatePriority; - currentUpdatePriority = 2; + currentUpdatePriority = 1; var prevExecutionContext = executionContext; executionContext |= 4; ReactCurrentOwner$2.current = null; @@ -8678,11 +8661,11 @@ function commitRootImpl( (root = firstUncaughtError), (firstUncaughtError = null), root); - 0 !== (pendingPassiveEffectsLanes & 3) && + 0 !== (pendingPassiveEffectsLanes & 1) && 0 !== root.tag && flushPassiveEffects(); remainingLanes = root.pendingLanes; - 0 !== (remainingLanes & 3) + 0 !== (remainingLanes & 1) ? root === rootWithNestedUpdates ? nestedUpdateCount++ : ((nestedUpdateCount = 0), (rootWithNestedUpdates = root)) @@ -8702,7 +8685,7 @@ function flushPassiveEffects() { remainingLanes = pendingPassiveEffectsRemainingLanes; pendingPassiveEffectsRemainingLanes = 0; var renderPriority = lanesToEventPriority(pendingPassiveEffectsLanes); - renderPriority = 32 > renderPriority ? 32 : renderPriority; + renderPriority = 16 > renderPriority ? 16 : renderPriority; var prevTransition = ReactCurrentBatchConfig$2.transition, previousPriority = currentUpdatePriority; try { @@ -8758,11 +8741,11 @@ function flushPassiveEffectsImpl() { } function captureCommitPhaseErrorOnRoot(rootFiber, sourceFiber, error) { sourceFiber = createCapturedValueAtFiber(error, sourceFiber); - sourceFiber = createRootErrorUpdate(rootFiber, sourceFiber, 2); - rootFiber = enqueueUpdate$1(rootFiber, sourceFiber, 2); + sourceFiber = createRootErrorUpdate(rootFiber, sourceFiber, 1); + rootFiber = enqueueUpdate$1(rootFiber, sourceFiber, 1); sourceFiber = requestEventTime(); null !== rootFiber && - (markRootUpdated(rootFiber, 2, sourceFiber), + (markRootUpdated(rootFiber, 1, sourceFiber), ensureRootIsScheduled(rootFiber, sourceFiber)); } function captureCommitPhaseError(sourceFiber, nearestMountedAncestor, error) { @@ -8796,16 +8779,16 @@ function captureCommitPhaseError(sourceFiber, nearestMountedAncestor, error) { sourceFiber = createClassErrorUpdate( nearestMountedAncestor, sourceFiber, - 2 + 1 ); nearestMountedAncestor = enqueueUpdate$1( nearestMountedAncestor, sourceFiber, - 2 + 1 ); sourceFiber = requestEventTime(); null !== nearestMountedAncestor && - (markRootUpdated(nearestMountedAncestor, 2, sourceFiber), + (markRootUpdated(nearestMountedAncestor, 1, sourceFiber), ensureRootIsScheduled(nearestMountedAncestor, sourceFiber)); break; } @@ -8838,7 +8821,7 @@ function pingSuspendedRoot(root, wakeable, pingedLanes) { (workInProgressRootRenderLanes & pingedLanes) === pingedLanes && (4 === workInProgressRootExitStatus || (3 === workInProgressRootExitStatus && - (workInProgressRootRenderLanes & 125829120) === + (workInProgressRootRenderLanes & 130023424) === workInProgressRootRenderLanes && 500 > now() - globalMostRecentFallbackTime) ? prepareFreshStack(root, 0) @@ -8848,10 +8831,10 @@ function pingSuspendedRoot(root, wakeable, pingedLanes) { function retryTimedOutBoundary(boundaryFiber, retryLane) { 0 === retryLane && (0 === (boundaryFiber.mode & 1) - ? (retryLane = 2) + ? (retryLane = 1) : ((retryLane = nextRetryLane), (nextRetryLane <<= 1), - 0 === (nextRetryLane & 125829120) && (nextRetryLane = 8388608))); + 0 === (nextRetryLane & 130023424) && (nextRetryLane = 4194304))); var eventTime = requestEventTime(); boundaryFiber = enqueueConcurrentRenderForLane(boundaryFiber, retryLane); null !== boundaryFiber && @@ -9798,7 +9781,7 @@ var slice = Array.prototype.slice, return null; }, bundleType: 0, - version: "18.3.0-www-classic-2ccfa657d-20221205", + version: "18.3.0-www-classic-d807eb52c-20221205", rendererPackageName: "react-art" }; var internals$jscomp$inline_1336 = { @@ -9829,7 +9812,7 @@ var internals$jscomp$inline_1336 = { scheduleRoot: null, setRefreshHandler: null, getCurrentFiber: null, - reconcilerVersion: "18.3.0-next-2ccfa657d-20221205" + reconcilerVersion: "18.3.0-next-d807eb52c-20221205" }; if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) { var hook$jscomp$inline_1337 = __REACT_DEVTOOLS_GLOBAL_HOOK__; diff --git a/compiled/facebook-www/ReactART-prod.modern.js b/compiled/facebook-www/ReactART-prod.modern.js index 1c6e8babdd713..8ace85b477d5d 100644 --- a/compiled/facebook-www/ReactART-prod.modern.js +++ b/compiled/facebook-www/ReactART-prod.modern.js @@ -275,8 +275,8 @@ function clz32Fallback(x) { x >>>= 0; return 0 === x ? 32 : (31 - ((log(x) / LN2) | 0)) | 0; } -var nextTransitionLane = 128, - nextRetryLane = 8388608; +var nextTransitionLane = 64, + nextRetryLane = 4194304; function getHighestPriorityLanes(lanes) { switch (lanes & -lanes) { case 1: @@ -292,7 +292,6 @@ function getHighestPriorityLanes(lanes) { case 32: return 32; case 64: - return 64; case 128: case 256: case 512: @@ -308,13 +307,13 @@ function getHighestPriorityLanes(lanes) { case 524288: case 1048576: case 2097152: + return lanes & 4194240; case 4194304: - return lanes & 8388480; case 8388608: case 16777216: case 33554432: case 67108864: - return lanes & 125829120; + return lanes & 130023424; case 134217728: return 134217728; case 268435456: @@ -355,12 +354,12 @@ function getNextLanes(root, wipLanes) { ((suspendedLanes = nextLanes & -nextLanes), (pingedLanes = wipLanes & -wipLanes), suspendedLanes >= pingedLanes || - (32 === suspendedLanes && 0 !== (pingedLanes & 8388480))) + (16 === suspendedLanes && 0 !== (pingedLanes & 4194240))) ) return wipLanes; 0 === (root.current.mode & 32) && - 0 !== (nextLanes & 8) && - (nextLanes |= pendingLanes & 32); + 0 !== (nextLanes & 4) && + (nextLanes |= pendingLanes & 16); wipLanes = root.entangledLanes; if (0 !== wipLanes) for (root = root.entanglements, wipLanes &= nextLanes; 0 < wipLanes; ) @@ -375,8 +374,8 @@ function computeExpirationTime(lane, currentTime) { case 1: case 2: case 4: - case 8: return currentTime + 250; + case 8: case 16: case 32: case 64: @@ -395,8 +394,8 @@ function computeExpirationTime(lane, currentTime) { case 524288: case 1048576: case 2097152: - case 4194304: return currentTime + 5e3; + case 4194304: case 8388608: case 16777216: case 33554432: @@ -417,12 +416,12 @@ function getLanesToRetrySynchronouslyOnError(root, originallyAttemptedLanes) { return 0 !== root ? root : root & 1073741824 ? 1073741824 : 0; } function includesBlockingLane(root, lanes) { - return 0 !== (root.current.mode & 32) ? !1 : 0 !== (lanes & 60); + return 0 !== (root.current.mode & 32) ? !1 : 0 !== (lanes & 30); } function claimNextTransitionLane() { var lane = nextTransitionLane; nextTransitionLane <<= 1; - 0 === (nextTransitionLane & 8388480) && (nextTransitionLane = 128); + 0 === (nextTransitionLane & 4194240) && (nextTransitionLane = 64); return lane; } function createLaneMap(initial) { @@ -505,13 +504,13 @@ function clearTransitionsForLanes(root, lanes) { var currentUpdatePriority = 0; function lanesToEventPriority(lanes) { lanes &= -lanes; - return 2 < lanes - ? 8 < lanes + return 1 < lanes + ? 4 < lanes ? 0 !== (lanes & 268435455) - ? 32 + ? 16 : 536870912 - : 8 - : 2; + : 4 + : 1; } function shim() { throw Error(formatProdErrorMessage(305)); @@ -799,7 +798,7 @@ function flushSyncCallbacks() { previousUpdatePriority = currentUpdatePriority; try { var queue = syncQueue; - for (currentUpdatePriority = 2; i < queue.length; i++) { + for (currentUpdatePriority = 1; i < queue.length; i++) { var callback = queue[i]; do callback = callback(!0); while (null !== callback); @@ -992,7 +991,7 @@ function enqueueUpdate$1(fiber, update, lane) { } function entangleTransitions(root, fiber, lane) { fiber = fiber.updateQueue; - if (null !== fiber && ((fiber = fiber.shared), 0 !== (lane & 8388480))) { + if (null !== fiber && ((fiber = fiber.shared), 0 !== (lane & 4194240))) { var queueLanes = fiber.lanes; queueLanes &= root.pendingLanes; lane |= queueLanes; @@ -2494,8 +2493,8 @@ function checkIfSnapshotChanged(inst) { } } function forceStoreRerender(fiber) { - var root = enqueueConcurrentRenderForLane(fiber, 2); - null !== root && scheduleUpdateOnFiber(root, fiber, 2, -1); + var root = enqueueConcurrentRenderForLane(fiber, 1); + null !== root && scheduleUpdateOnFiber(root, fiber, 1, -1); } function mountState(initialState) { var hook = mountWorkInProgressHook(); @@ -2646,7 +2645,7 @@ function updateMemo(nextCreate, deps) { return nextCreate; } function updateDeferredValueImpl(hook, prevValue, value) { - if (0 === (renderLanes & 42)) + if (0 === (renderLanes & 21)) return ( hook.baseState && ((hook.baseState = !1), (didReceiveUpdate = !0)), (hook.memoizedState = value) @@ -2661,7 +2660,7 @@ function updateDeferredValueImpl(hook, prevValue, value) { function startTransition(setPending, callback, options) { var previousPriority = currentUpdatePriority; currentUpdatePriority = - 0 !== previousPriority && 8 > previousPriority ? previousPriority : 8; + 0 !== previousPriority && 4 > previousPriority ? previousPriority : 4; setPending(!0); var prevTransition = ReactCurrentBatchConfig.transition; ReactCurrentBatchConfig.transition = {}; @@ -2780,7 +2779,7 @@ function enqueueRenderPhaseUpdate(queue, update) { queue.pending = update; } function entangleTransitionUpdate(root, queue, lane) { - if (0 !== (lane & 8388480)) { + if (0 !== (lane & 4194240)) { var queueLanes = queue.lanes; queueLanes &= root.pendingLanes; lane |= queueLanes; @@ -3379,7 +3378,6 @@ function pushMarkerInstance(workInProgress, markerInstance) { )); } var ReactCurrentOwner$1 = ReactSharedInternals.ReactCurrentOwner, - SelectiveHydrationException = Error(formatProdErrorMessage(461)), didReceiveUpdate = !1; function reconcileChildren(current, workInProgress, nextChildren, renderLanes) { workInProgress.child = @@ -3951,7 +3949,7 @@ function updateSuspenseComponent(current, workInProgress, renderLanes) { renderLanes )), (workInProgress.memoizedState = SUSPENDED_MARKER), - (workInProgress.lanes = 8388608), + (workInProgress.lanes = 4194304), current ); pushPrimaryTreeSuspenseHandler(workInProgress); @@ -4209,15 +4207,13 @@ function updateDehydratedSuspenseComponent( nextProps = workInProgressRoot; if (null !== nextProps) { switch (renderLanes & -renderLanes) { - case 2: - didSuspend = 1; - break; - case 8: - didSuspend = 4; + case 4: + didSuspend = 2; break; - case 32: - didSuspend = 16; + case 16: + didSuspend = 8; break; + case 64: case 128: case 256: case 512: @@ -4238,7 +4234,7 @@ function updateDehydratedSuspenseComponent( case 16777216: case 33554432: case 67108864: - didSuspend = 64; + didSuspend = 32; break; case 536870912: didSuspend = 268435456; @@ -4250,11 +4246,11 @@ function updateDehydratedSuspenseComponent( 0 !== (didSuspend & (nextProps.suspendedLanes | renderLanes)) ? 0 : didSuspend; - if (0 !== didSuspend && didSuspend !== suspenseState.retryLane) - throw ((suspenseState.retryLane = didSuspend), + 0 !== didSuspend && + didSuspend !== suspenseState.retryLane && + ((suspenseState.retryLane = didSuspend), enqueueConcurrentRenderForLane(current, didSuspend), - scheduleUpdateOnFiber(nextProps, current, didSuspend, -1), - SelectiveHydrationException); + scheduleUpdateOnFiber(nextProps, current, didSuspend, -1)); } renderDidSuspendDelayIfPossible(); return retrySuspenseComponentWithoutHydrating( @@ -5268,7 +5264,7 @@ function completeWork(current, workInProgress, renderLanes) { ((workInProgress.flags |= 64), (newProps = !0), cutOffTailIfNeeded(instance, !1), - (workInProgress.lanes = 8388608)); + (workInProgress.lanes = 4194304)); } else { if (!newProps) @@ -5296,7 +5292,7 @@ function completeWork(current, workInProgress, renderLanes) { ((workInProgress.flags |= 64), (newProps = !0), cutOffTailIfNeeded(instance, !1), - (workInProgress.lanes = 8388608)); + (workInProgress.lanes = 4194304)); instance.isBackwards ? ((JSCompiler_inline_result.sibling = workInProgress.child), (workInProgress.child = JSCompiler_inline_result)) @@ -7429,7 +7425,7 @@ function requestEventTime() { : (currentEventTime = now()); } function requestUpdateLane(fiber) { - if (0 === (fiber.mode & 1)) return 2; + if (0 === (fiber.mode & 1)) return 1; if ( !deferRenderPhaseUpdateToNextBatch && 0 !== (executionContext & 2) && @@ -7443,7 +7439,7 @@ function requestUpdateLane(fiber) { currentEventTransitionLane ); fiber = currentUpdatePriority; - return 0 !== fiber ? fiber : 32; + return 0 !== fiber ? fiber : 16; } function scheduleUpdateOnFiber(root, fiber, lane, eventTime) { 2 === workInProgressSuspendedReason && @@ -7475,7 +7471,7 @@ function scheduleUpdateOnFiber(root, fiber, lane, eventTime) { markRootSuspended$1(root, workInProgressRootRenderLanes); } ensureRootIsScheduled(root, eventTime); - 2 === lane && + 1 === lane && 0 === executionContext && 0 === (fiber.mode & 1) && ((workInProgressRootRenderTargetTime = now() + 500), @@ -7488,7 +7484,7 @@ function ensureRootIsScheduled(root, currentTime) { suspendedLanes = root.suspendedLanes, pingedLanes = root.pingedLanes, expirationTimes = root.expirationTimes, - lanes = root.pendingLanes & -125829121; + lanes = root.pendingLanes & -130023425; 0 < lanes; ) { @@ -7514,7 +7510,7 @@ function ensureRootIsScheduled(root, currentTime) { root.callbackPriority !== currentTime) ) { null != existingCallbackNode && cancelCallback(existingCallbackNode); - if (0 !== (currentTime & 3)) + if (1 === currentTime) 0 === root.tag ? ((existingCallbackNode = performSyncWorkOnRoot.bind(null, root)), (includesLegacySyncCallbacks = !0), @@ -7529,13 +7525,13 @@ function ensureRootIsScheduled(root, currentTime) { (existingCallbackNode = null); else { switch (lanesToEventPriority(suspendedLanes)) { - case 2: + case 1: existingCallbackNode = ImmediatePriority; break; - case 8: + case 4: existingCallbackNode = UserBlockingPriority; break; - case 32: + case 16: existingCallbackNode = NormalPriority; break; case 536870912: @@ -7638,7 +7634,7 @@ function performConcurrentWorkOnRoot(root, didTimeout) { case 3: markRootSuspended$1(root, lanes); if ( - (lanes & 125829120) === lanes && + (lanes & 130023424) === lanes && ((didTimeout = globalMostRecentFallbackTime + 500 - now()), 10 < didTimeout) ) { @@ -7669,7 +7665,7 @@ function performConcurrentWorkOnRoot(root, didTimeout) { break; case 4: markRootSuspended$1(root, lanes); - if ((lanes & 8388480) === lanes) break; + if ((lanes & 4194240) === lanes) break; didTimeout = root.eventTimes; for (originallyAttemptedLanes = -1; 0 < lanes; ) (errorRetryLanes$128 = 31 - clz32(lanes)), @@ -7812,7 +7808,7 @@ function performSyncWorkOnRoot(root) { if (0 !== (executionContext & 6)) throw Error(formatProdErrorMessage(327)); flushPassiveEffects(); var lanes = getNextLanes(root, 0); - if (0 === (lanes & 3)) return ensureRootIsScheduled(root, now()), null; + if (0 === (lanes & 1)) return ensureRootIsScheduled(root, now()), null; var exitStatus = renderRootSync(root, lanes); if (0 !== root.tag && 2 === exitStatus) { var originallyAttemptedLanes = lanes, @@ -7892,11 +7888,9 @@ function handleThrow(root, thrownValue) { : 3; } else workInProgressSuspendedReason = - thrownValue === SelectiveHydrationException - ? 6 - : null !== thrownValue && - "object" === typeof thrownValue && - "function" === typeof thrownValue.then + null !== thrownValue && + "object" === typeof thrownValue && + "function" === typeof thrownValue.then ? 4 : 1; workInProgressThrownValue = thrownValue; @@ -7906,7 +7900,7 @@ function handleThrow(root, thrownValue) { } function shouldAttemptToSuspendUntilDataResolves() { if ( - (workInProgressRootRenderLanes & 125829120) === + (workInProgressRootRenderLanes & 130023424) === workInProgressRootRenderLanes ) return !0; @@ -7916,7 +7910,7 @@ function shouldAttemptToSuspendUntilDataResolves() { ) return !1; if ( - (workInProgressRootRenderLanes & 8388480) === + (workInProgressRootRenderLanes & 4194240) === workInProgressRootRenderLanes ) { var suspenseHandler = suspenseHandlerStackCursor.current; @@ -7956,21 +7950,14 @@ function renderRootSync(root, lanes) { if (workInProgressRoot !== root || workInProgressRootRenderLanes !== lanes) (workInProgressTransitions = getTransitionsForLanes(root, lanes)), prepareFreshStack(root, lanes); - a: do + do try { if (0 !== workInProgressSuspendedReason && null !== workInProgress) { lanes = workInProgress; var thrownValue = workInProgressThrownValue; - switch (workInProgressSuspendedReason) { - case 6: - workInProgress = null; - workInProgressRootExitStatus = 6; - break a; - default: - (workInProgressSuspendedReason = 0), - (workInProgressThrownValue = null), - unwindSuspendedUnitOfWork(lanes, thrownValue); - } + workInProgressSuspendedReason = 0; + workInProgressThrownValue = null; + unwindSuspendedUnitOfWork(lanes, thrownValue); } workLoopSync(); break; @@ -8040,10 +8027,6 @@ function renderRootConcurrent(root, lanes) { workInProgressThrownValue = null; unwindSuspendedUnitOfWork(lanes, thrownValue); break; - case 6: - workInProgress = null; - workInProgressRootExitStatus = 6; - break a; default: throw Error(formatProdErrorMessage(462)); } @@ -8179,11 +8162,11 @@ function unwindSuspendedUnitOfWork(unitOfWork, thrownValue) { if (1 === unitOfWork.tag) if (null === unitOfWork.alternate) unitOfWork.tag = 17; else { - var update = createUpdate(-1, 2); + var update = createUpdate(-1, 1); update.tag = 2; - enqueueUpdate$1(unitOfWork, update, 2); + enqueueUpdate$1(unitOfWork, update, 1); } - unitOfWork.lanes |= 2; + unitOfWork.lanes |= 1; } else (suspenseBoundary.flags |= 32768), @@ -8322,7 +8305,7 @@ function commitRoot(root, recoverableErrors, transitions) { prevTransition = ReactCurrentBatchConfig$2.transition; try { (ReactCurrentBatchConfig$2.transition = null), - (currentUpdatePriority = 2), + (currentUpdatePriority = 1), commitRootImpl( root, recoverableErrors, @@ -8373,7 +8356,7 @@ function commitRootImpl( transitions = ReactCurrentBatchConfig$2.transition; ReactCurrentBatchConfig$2.transition = null; var previousPriority = currentUpdatePriority; - currentUpdatePriority = 2; + currentUpdatePriority = 1; var prevExecutionContext = executionContext; executionContext |= 4; ReactCurrentOwner$2.current = null; @@ -8412,11 +8395,11 @@ function commitRootImpl( (root = firstUncaughtError), (firstUncaughtError = null), root); - 0 !== (pendingPassiveEffectsLanes & 3) && + 0 !== (pendingPassiveEffectsLanes & 1) && 0 !== root.tag && flushPassiveEffects(); remainingLanes = root.pendingLanes; - 0 !== (remainingLanes & 3) + 0 !== (remainingLanes & 1) ? root === rootWithNestedUpdates ? nestedUpdateCount++ : ((nestedUpdateCount = 0), (rootWithNestedUpdates = root)) @@ -8436,7 +8419,7 @@ function flushPassiveEffects() { remainingLanes = pendingPassiveEffectsRemainingLanes; pendingPassiveEffectsRemainingLanes = 0; var renderPriority = lanesToEventPriority(pendingPassiveEffectsLanes); - renderPriority = 32 > renderPriority ? 32 : renderPriority; + renderPriority = 16 > renderPriority ? 16 : renderPriority; var prevTransition = ReactCurrentBatchConfig$2.transition, previousPriority = currentUpdatePriority; try { @@ -8492,11 +8475,11 @@ function flushPassiveEffectsImpl() { } function captureCommitPhaseErrorOnRoot(rootFiber, sourceFiber, error) { sourceFiber = createCapturedValueAtFiber(error, sourceFiber); - sourceFiber = createRootErrorUpdate(rootFiber, sourceFiber, 2); - rootFiber = enqueueUpdate$1(rootFiber, sourceFiber, 2); + sourceFiber = createRootErrorUpdate(rootFiber, sourceFiber, 1); + rootFiber = enqueueUpdate$1(rootFiber, sourceFiber, 1); sourceFiber = requestEventTime(); null !== rootFiber && - (markRootUpdated(rootFiber, 2, sourceFiber), + (markRootUpdated(rootFiber, 1, sourceFiber), ensureRootIsScheduled(rootFiber, sourceFiber)); } function captureCommitPhaseError(sourceFiber, nearestMountedAncestor, error) { @@ -8530,16 +8513,16 @@ function captureCommitPhaseError(sourceFiber, nearestMountedAncestor, error) { sourceFiber = createClassErrorUpdate( nearestMountedAncestor, sourceFiber, - 2 + 1 ); nearestMountedAncestor = enqueueUpdate$1( nearestMountedAncestor, sourceFiber, - 2 + 1 ); sourceFiber = requestEventTime(); null !== nearestMountedAncestor && - (markRootUpdated(nearestMountedAncestor, 2, sourceFiber), + (markRootUpdated(nearestMountedAncestor, 1, sourceFiber), ensureRootIsScheduled(nearestMountedAncestor, sourceFiber)); break; } @@ -8572,7 +8555,7 @@ function pingSuspendedRoot(root, wakeable, pingedLanes) { (workInProgressRootRenderLanes & pingedLanes) === pingedLanes && (4 === workInProgressRootExitStatus || (3 === workInProgressRootExitStatus && - (workInProgressRootRenderLanes & 125829120) === + (workInProgressRootRenderLanes & 130023424) === workInProgressRootRenderLanes && 500 > now() - globalMostRecentFallbackTime) ? prepareFreshStack(root, 0) @@ -8582,10 +8565,10 @@ function pingSuspendedRoot(root, wakeable, pingedLanes) { function retryTimedOutBoundary(boundaryFiber, retryLane) { 0 === retryLane && (0 === (boundaryFiber.mode & 1) - ? (retryLane = 2) + ? (retryLane = 1) : ((retryLane = nextRetryLane), (nextRetryLane <<= 1), - 0 === (nextRetryLane & 125829120) && (nextRetryLane = 8388608))); + 0 === (nextRetryLane & 130023424) && (nextRetryLane = 4194304))); var eventTime = requestEventTime(); boundaryFiber = enqueueConcurrentRenderForLane(boundaryFiber, retryLane); null !== boundaryFiber && @@ -9465,7 +9448,7 @@ var slice = Array.prototype.slice, return null; }, bundleType: 0, - version: "18.3.0-www-modern-2ccfa657d-20221205", + version: "18.3.0-www-modern-d807eb52c-20221205", rendererPackageName: "react-art" }; var internals$jscomp$inline_1327 = { @@ -9496,7 +9479,7 @@ var internals$jscomp$inline_1327 = { scheduleRoot: null, setRefreshHandler: null, getCurrentFiber: null, - reconcilerVersion: "18.3.0-next-2ccfa657d-20221205" + reconcilerVersion: "18.3.0-next-d807eb52c-20221205" }; if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) { var hook$jscomp$inline_1328 = __REACT_DEVTOOLS_GLOBAL_HOOK__; diff --git a/compiled/facebook-www/ReactDOM-dev.classic.js b/compiled/facebook-www/ReactDOM-dev.classic.js index bacfe59a25887..3f115182f23f3 100644 --- a/compiled/facebook-www/ReactDOM-dev.classic.js +++ b/compiled/facebook-www/ReactDOM-dev.classic.js @@ -7984,91 +7984,91 @@ var NoLanes = var NoLane = /* */ 0; -var SyncHydrationLane = - /* */ - 1; var SyncLane = /* */ - 2; + 1; var InputContinuousHydrationLane = /* */ - 4; + 2; var InputContinuousLane = /* */ - 8; + 4; var DefaultHydrationLane = /* */ - 16; + 8; var DefaultLane = /* */ - 32; + 16; var TransitionHydrationLane = /* */ - 64; + 32; var TransitionLanes = /* */ - 8388480; + 4194240; var TransitionLane1 = /* */ - 128; + 64; var TransitionLane2 = /* */ - 256; + 128; var TransitionLane3 = /* */ - 512; + 256; var TransitionLane4 = /* */ - 1024; + 512; var TransitionLane5 = /* */ - 2048; + 1024; var TransitionLane6 = /* */ - 4096; + 2048; var TransitionLane7 = /* */ - 8192; + 4096; var TransitionLane8 = /* */ - 16384; + 8192; var TransitionLane9 = /* */ - 32768; + 16384; var TransitionLane10 = /* */ - 65536; + 32768; var TransitionLane11 = /* */ - 131072; + 65536; var TransitionLane12 = /* */ - 262144; + 131072; var TransitionLane13 = /* */ - 524288; + 262144; var TransitionLane14 = /* */ - 1048576; + 524288; var TransitionLane15 = /* */ - 2097152; + 1048576; var TransitionLane16 = /* */ - 4194304; + 2097152; var RetryLanes = /* */ - 125829120; + 130023424; var RetryLane1 = /* */ - 8388608; + 4194304; var RetryLane2 = /* */ - 16777216; + 8388608; var RetryLane3 = /* */ - 33554432; + 16777216; var RetryLane4 = + /* */ + 33554432; +var RetryLane5 = /* */ 67108864; var SomeRetryLane = RetryLane1; @@ -8091,10 +8091,6 @@ var OffscreenLane = function getLabelForLane(lane) { if (enableSchedulingProfiler) { - if (lane & SyncHydrationLane) { - return "SyncHydrationLane"; - } - if (lane & SyncLane) { return "Sync"; } @@ -8150,9 +8146,6 @@ var nextRetryLane = RetryLane1; function getHighestPriorityLanes(lanes) { switch (getHighestPriorityLane(lanes)) { - case SyncHydrationLane: - return SyncHydrationLane; - case SyncLane: return SyncLane; @@ -8193,6 +8186,7 @@ function getHighestPriorityLanes(lanes) { case RetryLane2: case RetryLane3: case RetryLane4: + case RetryLane5: return lanes & RetryLanes; case SelectiveHydrationLane: @@ -8353,7 +8347,6 @@ function getMostRecentEventTime(root, lanes) { function computeExpirationTime(lane, currentTime) { switch (lane) { - case SyncHydrationLane: case SyncLane: case InputContinuousHydrationLane: case InputContinuousLane: @@ -8393,6 +8386,7 @@ function computeExpirationTime(lane, currentTime) { case RetryLane2: case RetryLane3: case RetryLane4: + case RetryLane5: // TODO: Retries should be allowed to expire if they are CPU bound for // too long, but when I made this change it caused a spike in browser // crashes. There must be some other underlying bug; not super urgent but @@ -8480,9 +8474,6 @@ function getLanesToRetrySynchronouslyOnError(root, originallyAttemptedLanes) { return NoLanes; } -function includesSyncLane(lanes) { - return (lanes & (SyncLane | SyncHydrationLane)) !== NoLanes; -} function includesNonIdleWork(lanes) { return (lanes & NonIdleLanes) !== NoLanes; } @@ -8490,8 +8481,6 @@ function includesOnlyRetries(lanes) { return (lanes & RetryLanes) === lanes; } function includesOnlyNonUrgentLanes(lanes) { - // TODO: Should hydration lanes be included here? This function is only - // used in `updateDeferredValueImpl`. var UrgentLanes = SyncLane | InputContinuousLane | DefaultLane; return (lanes & UrgentLanes) === NoLanes; } @@ -8733,10 +8722,6 @@ function getBumpedLaneForHydration(root, renderLanes) { var lane; switch (renderLane) { - case SyncLane: - lane = SyncHydrationLane; - break; - case InputContinuousLane: lane = InputContinuousHydrationLane; break; @@ -8765,6 +8750,7 @@ function getBumpedLaneForHydration(root, renderLanes) { case RetryLane2: case RetryLane3: case RetryLane4: + case RetryLane5: lane = TransitionHydrationLane; break; @@ -27050,14 +27036,7 @@ function getMarkerInstances() { return null; } -var ReactCurrentOwner$1 = ReactSharedInternals.ReactCurrentOwner; // A special exception that's used to unwind the stack when an update flows -// into a dehydrated boundary. - -var SelectiveHydrationException = new Error( - "This is not a real error. It's an implementation detail of React's " + - "selective hydration feature. If this leaks into userspace, it's a bug in " + - "React. Please file an issue." -); +var ReactCurrentOwner$1 = ReactSharedInternals.ReactCurrentOwner; var didReceiveUpdate = false; var didWarnAboutBadClass; var didWarnAboutModulePatternComponent; @@ -29507,29 +29486,18 @@ function updateDehydratedSuspenseComponent( current, attemptHydrationAtLane, eventTime - ); // Throw a special object that signals to the work loop that it should - // interrupt the current render. - // - // Because we're inside a React-only execution stack, we don't - // strictly need to throw here — we could instead modify some internal - // work loop state. But using an exception means we don't need to - // check for this case on every iteration of the work loop. So doing - // it this way moves the check out of the fast path. - - throw SelectiveHydrationException; + ); } - } // If we did not selectively hydrate, we'll continue rendering without - // hydrating. Mark this tree as suspended to prevent it from committing - // outside a transition. - // - // This path should only happen if the hydration lane already suspended. - // Currently, it also happens during sync updates because there is no - // hydration lane for sync updates. + } // If we have scheduled higher pri work above, this will just abort the render + // since we now have higher priority work. We'll try to infinitely suspend until + // we yield. TODO: We could probably just force yielding earlier instead. + + renderDidSuspendDelayIfPossible(); // If we rendered synchronously, we won't yield so have to render something. + // This will cause us to delete any existing content. // TODO: We should ideally have a sync hydration lane that we can apply to do // a pass where we hydrate this subtree in place using the previous Context and then // reapply the update afterwards. - renderDidSuspendDelayIfPossible(); return retrySuspenseComponentWithoutHydrating( current, workInProgress, @@ -37802,8 +37770,7 @@ var SuspendedOnError = 1; var SuspendedOnData = 2; var SuspendedOnImmediate = 3; var SuspendedOnDeprecatedThrowPromise = 4; -var SuspendedAndReadyToUnwind = 5; -var SuspendedOnHydration = 6; // When this is true, the work-in-progress fiber just suspended (or errored) and +var SuspendedAndReadyToUnwind = 5; // When this is true, the work-in-progress fiber just suspended (or errored) and // we've yet to unwind the stack. In some cases, we may yield to the main thread // after this happens. If the fiber is pinged before we resume, we can retry // immediately instead of unwinding the stack. @@ -38339,7 +38306,7 @@ function ensureRootIsScheduled(root, currentTime) { // TODO: Temporary until we confirm this warning is not fired. if ( existingCallbackNode == null && - !includesSyncLane(existingCallbackPriority) + existingCallbackPriority !== SyncLane ) { error( "Expected scheduled callback to exist. This error is likely caused by a bug in React. Please file an issue." @@ -38357,7 +38324,7 @@ function ensureRootIsScheduled(root, currentTime) { var newCallbackNode; - if (includesSyncLane(newCallbackPriority)) { + if (newCallbackPriority === SyncLane) { // Special case: Sync React callbacks are scheduled on a special // internal queue if (root.tag === LegacyRoot) { @@ -38914,7 +38881,7 @@ function performSyncWorkOnRoot(root) { flushPassiveEffects(); var lanes = getNextLanes(root, NoLanes); - if (!includesSyncLane(lanes)) { + if (!includesSomeLane(lanes, SyncLane)) { // There's no remaining sync work left. ensureRootIsScheduled(root, now()); return null; @@ -39199,17 +39166,6 @@ function handleThrow(root, thrownValue) { workInProgressSuspendedReason = shouldAttemptToSuspendUntilDataResolves() ? SuspendedOnData : SuspendedOnImmediate; - } else if (thrownValue === SelectiveHydrationException) { - // An update flowed into a dehydrated boundary. Before we can apply the - // update, we need to finish hydrating. Interrupt the work-in-progress - // render so we can restart at the hydration lane. - // - // The ideal implementation would be able to switch contexts without - // unwinding the current stack. - // - // We could name this something more general but as of now it's the only - // case where we think this should happen. - workInProgressSuspendedReason = SuspendedOnHydration; } else { // This is a regular error. var isWakeable = @@ -39437,7 +39393,7 @@ function renderRootSync(root, lanes) { markRenderStarted(lanes); } - outer: do { + do { try { if ( workInProgressSuspendedReason !== NotSuspended && @@ -39453,25 +39409,9 @@ function renderRootSync(root, lanes) { // function and fork the behavior some other way. var unitOfWork = workInProgress; var thrownValue = workInProgressThrownValue; - - switch (workInProgressSuspendedReason) { - case SuspendedOnHydration: { - // Selective hydration. An update flowed into a dehydrated tree. - // Interrupt the current render so the work loop can switch to the - // hydration lane. - workInProgress = null; - workInProgressRootExitStatus = RootDidNotComplete; - break outer; - } - - default: { - // Continue with the normal work loop. - workInProgressSuspendedReason = NotSuspended; - workInProgressThrownValue = null; - unwindSuspendedUnitOfWork(unitOfWork, thrownValue); - break; - } - } + workInProgressSuspendedReason = NotSuspended; + workInProgressThrownValue = null; + unwindSuspendedUnitOfWork(unitOfWork, thrownValue); // Continue with the normal work loop. } workLoopSync(); @@ -39636,15 +39576,6 @@ function renderRootConcurrent(root, lanes) { break; } - case SuspendedOnHydration: { - // Selective hydration. An update flowed into a dehydrated tree. - // Interrupt the current render so the work loop can switch to the - // hydration lane. - workInProgress = null; - workInProgressRootExitStatus = RootDidNotComplete; - break outer; - } - default: { throw new Error( "Unexpected SuspendedReason. This is a bug in React." @@ -40299,13 +40230,16 @@ function commitRootImpl( // currently schedule the callback in multiple places, will wait until those // are consolidated. - if (includesSyncLane(pendingPassiveEffectsLanes) && root.tag !== LegacyRoot) { + if ( + includesSomeLane(pendingPassiveEffectsLanes, SyncLane) && + root.tag !== LegacyRoot + ) { flushPassiveEffects(); } // Read this again, since a passive effect might have updated it remainingLanes = root.pendingLanes; - if (includesSyncLane(remainingLanes)) { + if (includesSomeLane(remainingLanes, SyncLane)) { { markNestedUpdateScheduled(); } // Count the number of times the root synchronously re-renders without @@ -41040,7 +40974,6 @@ if (replayFailedUnitOfWorkWithInvokeGuardedCallback) { if ( didSuspendOrErrorWhileHydratingDEV() || originalError === SuspenseException || - originalError === SelectiveHydrationException || (originalError !== null && typeof originalError === "object" && typeof originalError.then === "function") @@ -42580,7 +42513,7 @@ function createFiberRoot( return root; } -var ReactVersion = "18.3.0-www-classic-2ccfa657d-20221205"; +var ReactVersion = "18.3.0-www-classic-d807eb52c-20221205"; function createPortal( children, diff --git a/compiled/facebook-www/ReactDOM-dev.modern.js b/compiled/facebook-www/ReactDOM-dev.modern.js index 7a19e65a4a9cd..50bbc67a32045 100644 --- a/compiled/facebook-www/ReactDOM-dev.modern.js +++ b/compiled/facebook-www/ReactDOM-dev.modern.js @@ -6153,91 +6153,91 @@ var NoLanes = var NoLane = /* */ 0; -var SyncHydrationLane = - /* */ - 1; var SyncLane = /* */ - 2; + 1; var InputContinuousHydrationLane = /* */ - 4; + 2; var InputContinuousLane = /* */ - 8; + 4; var DefaultHydrationLane = /* */ - 16; + 8; var DefaultLane = /* */ - 32; + 16; var TransitionHydrationLane = /* */ - 64; + 32; var TransitionLanes = /* */ - 8388480; + 4194240; var TransitionLane1 = /* */ - 128; + 64; var TransitionLane2 = /* */ - 256; + 128; var TransitionLane3 = /* */ - 512; + 256; var TransitionLane4 = /* */ - 1024; + 512; var TransitionLane5 = /* */ - 2048; + 1024; var TransitionLane6 = /* */ - 4096; + 2048; var TransitionLane7 = /* */ - 8192; + 4096; var TransitionLane8 = /* */ - 16384; + 8192; var TransitionLane9 = /* */ - 32768; + 16384; var TransitionLane10 = /* */ - 65536; + 32768; var TransitionLane11 = /* */ - 131072; + 65536; var TransitionLane12 = /* */ - 262144; + 131072; var TransitionLane13 = /* */ - 524288; + 262144; var TransitionLane14 = /* */ - 1048576; + 524288; var TransitionLane15 = /* */ - 2097152; + 1048576; var TransitionLane16 = /* */ - 4194304; + 2097152; var RetryLanes = /* */ - 125829120; + 130023424; var RetryLane1 = /* */ - 8388608; + 4194304; var RetryLane2 = /* */ - 16777216; + 8388608; var RetryLane3 = /* */ - 33554432; + 16777216; var RetryLane4 = + /* */ + 33554432; +var RetryLane5 = /* */ 67108864; var SomeRetryLane = RetryLane1; @@ -6260,10 +6260,6 @@ var OffscreenLane = function getLabelForLane(lane) { if (enableSchedulingProfiler) { - if (lane & SyncHydrationLane) { - return "SyncHydrationLane"; - } - if (lane & SyncLane) { return "Sync"; } @@ -6319,9 +6315,6 @@ var nextRetryLane = RetryLane1; function getHighestPriorityLanes(lanes) { switch (getHighestPriorityLane(lanes)) { - case SyncHydrationLane: - return SyncHydrationLane; - case SyncLane: return SyncLane; @@ -6362,6 +6355,7 @@ function getHighestPriorityLanes(lanes) { case RetryLane2: case RetryLane3: case RetryLane4: + case RetryLane5: return lanes & RetryLanes; case SelectiveHydrationLane: @@ -6522,7 +6516,6 @@ function getMostRecentEventTime(root, lanes) { function computeExpirationTime(lane, currentTime) { switch (lane) { - case SyncHydrationLane: case SyncLane: case InputContinuousHydrationLane: case InputContinuousLane: @@ -6562,6 +6555,7 @@ function computeExpirationTime(lane, currentTime) { case RetryLane2: case RetryLane3: case RetryLane4: + case RetryLane5: // TODO: Retries should be allowed to expire if they are CPU bound for // too long, but when I made this change it caused a spike in browser // crashes. There must be some other underlying bug; not super urgent but @@ -6649,9 +6643,6 @@ function getLanesToRetrySynchronouslyOnError(root, originallyAttemptedLanes) { return NoLanes; } -function includesSyncLane(lanes) { - return (lanes & (SyncLane | SyncHydrationLane)) !== NoLanes; -} function includesNonIdleWork(lanes) { return (lanes & NonIdleLanes) !== NoLanes; } @@ -6659,8 +6650,6 @@ function includesOnlyRetries(lanes) { return (lanes & RetryLanes) === lanes; } function includesOnlyNonUrgentLanes(lanes) { - // TODO: Should hydration lanes be included here? This function is only - // used in `updateDeferredValueImpl`. var UrgentLanes = SyncLane | InputContinuousLane | DefaultLane; return (lanes & UrgentLanes) === NoLanes; } @@ -6902,10 +6891,6 @@ function getBumpedLaneForHydration(root, renderLanes) { var lane; switch (renderLane) { - case SyncLane: - lane = SyncHydrationLane; - break; - case InputContinuousLane: lane = InputContinuousHydrationLane; break; @@ -6934,6 +6919,7 @@ function getBumpedLaneForHydration(root, renderLanes) { case RetryLane2: case RetryLane3: case RetryLane4: + case RetryLane5: lane = TransitionHydrationLane; break; @@ -26813,14 +26799,7 @@ function getMarkerInstances() { return null; } -var ReactCurrentOwner$1 = ReactSharedInternals.ReactCurrentOwner; // A special exception that's used to unwind the stack when an update flows -// into a dehydrated boundary. - -var SelectiveHydrationException = new Error( - "This is not a real error. It's an implementation detail of React's " + - "selective hydration feature. If this leaks into userspace, it's a bug in " + - "React. Please file an issue." -); +var ReactCurrentOwner$1 = ReactSharedInternals.ReactCurrentOwner; var didReceiveUpdate = false; var didWarnAboutBadClass; var didWarnAboutModulePatternComponent; @@ -29254,29 +29233,18 @@ function updateDehydratedSuspenseComponent( current, attemptHydrationAtLane, eventTime - ); // Throw a special object that signals to the work loop that it should - // interrupt the current render. - // - // Because we're inside a React-only execution stack, we don't - // strictly need to throw here — we could instead modify some internal - // work loop state. But using an exception means we don't need to - // check for this case on every iteration of the work loop. So doing - // it this way moves the check out of the fast path. - - throw SelectiveHydrationException; + ); } - } // If we did not selectively hydrate, we'll continue rendering without - // hydrating. Mark this tree as suspended to prevent it from committing - // outside a transition. - // - // This path should only happen if the hydration lane already suspended. - // Currently, it also happens during sync updates because there is no - // hydration lane for sync updates. + } // If we have scheduled higher pri work above, this will just abort the render + // since we now have higher priority work. We'll try to infinitely suspend until + // we yield. TODO: We could probably just force yielding earlier instead. + + renderDidSuspendDelayIfPossible(); // If we rendered synchronously, we won't yield so have to render something. + // This will cause us to delete any existing content. // TODO: We should ideally have a sync hydration lane that we can apply to do // a pass where we hydrate this subtree in place using the previous Context and then // reapply the update afterwards. - renderDidSuspendDelayIfPossible(); return retrySuspenseComponentWithoutHydrating( current, workInProgress, @@ -37526,8 +37494,7 @@ var SuspendedOnError = 1; var SuspendedOnData = 2; var SuspendedOnImmediate = 3; var SuspendedOnDeprecatedThrowPromise = 4; -var SuspendedAndReadyToUnwind = 5; -var SuspendedOnHydration = 6; // When this is true, the work-in-progress fiber just suspended (or errored) and +var SuspendedAndReadyToUnwind = 5; // When this is true, the work-in-progress fiber just suspended (or errored) and // we've yet to unwind the stack. In some cases, we may yield to the main thread // after this happens. If the fiber is pinged before we resume, we can retry // immediately instead of unwinding the stack. @@ -38063,7 +38030,7 @@ function ensureRootIsScheduled(root, currentTime) { // TODO: Temporary until we confirm this warning is not fired. if ( existingCallbackNode == null && - !includesSyncLane(existingCallbackPriority) + existingCallbackPriority !== SyncLane ) { error( "Expected scheduled callback to exist. This error is likely caused by a bug in React. Please file an issue." @@ -38081,7 +38048,7 @@ function ensureRootIsScheduled(root, currentTime) { var newCallbackNode; - if (includesSyncLane(newCallbackPriority)) { + if (newCallbackPriority === SyncLane) { // Special case: Sync React callbacks are scheduled on a special // internal queue if (root.tag === LegacyRoot) { @@ -38638,7 +38605,7 @@ function performSyncWorkOnRoot(root) { flushPassiveEffects(); var lanes = getNextLanes(root, NoLanes); - if (!includesSyncLane(lanes)) { + if (!includesSomeLane(lanes, SyncLane)) { // There's no remaining sync work left. ensureRootIsScheduled(root, now()); return null; @@ -38923,17 +38890,6 @@ function handleThrow(root, thrownValue) { workInProgressSuspendedReason = shouldAttemptToSuspendUntilDataResolves() ? SuspendedOnData : SuspendedOnImmediate; - } else if (thrownValue === SelectiveHydrationException) { - // An update flowed into a dehydrated boundary. Before we can apply the - // update, we need to finish hydrating. Interrupt the work-in-progress - // render so we can restart at the hydration lane. - // - // The ideal implementation would be able to switch contexts without - // unwinding the current stack. - // - // We could name this something more general but as of now it's the only - // case where we think this should happen. - workInProgressSuspendedReason = SuspendedOnHydration; } else { // This is a regular error. var isWakeable = @@ -39161,7 +39117,7 @@ function renderRootSync(root, lanes) { markRenderStarted(lanes); } - outer: do { + do { try { if ( workInProgressSuspendedReason !== NotSuspended && @@ -39177,25 +39133,9 @@ function renderRootSync(root, lanes) { // function and fork the behavior some other way. var unitOfWork = workInProgress; var thrownValue = workInProgressThrownValue; - - switch (workInProgressSuspendedReason) { - case SuspendedOnHydration: { - // Selective hydration. An update flowed into a dehydrated tree. - // Interrupt the current render so the work loop can switch to the - // hydration lane. - workInProgress = null; - workInProgressRootExitStatus = RootDidNotComplete; - break outer; - } - - default: { - // Continue with the normal work loop. - workInProgressSuspendedReason = NotSuspended; - workInProgressThrownValue = null; - unwindSuspendedUnitOfWork(unitOfWork, thrownValue); - break; - } - } + workInProgressSuspendedReason = NotSuspended; + workInProgressThrownValue = null; + unwindSuspendedUnitOfWork(unitOfWork, thrownValue); // Continue with the normal work loop. } workLoopSync(); @@ -39360,15 +39300,6 @@ function renderRootConcurrent(root, lanes) { break; } - case SuspendedOnHydration: { - // Selective hydration. An update flowed into a dehydrated tree. - // Interrupt the current render so the work loop can switch to the - // hydration lane. - workInProgress = null; - workInProgressRootExitStatus = RootDidNotComplete; - break outer; - } - default: { throw new Error( "Unexpected SuspendedReason. This is a bug in React." @@ -40023,13 +39954,16 @@ function commitRootImpl( // currently schedule the callback in multiple places, will wait until those // are consolidated. - if (includesSyncLane(pendingPassiveEffectsLanes) && root.tag !== LegacyRoot) { + if ( + includesSomeLane(pendingPassiveEffectsLanes, SyncLane) && + root.tag !== LegacyRoot + ) { flushPassiveEffects(); } // Read this again, since a passive effect might have updated it remainingLanes = root.pendingLanes; - if (includesSyncLane(remainingLanes)) { + if (includesSomeLane(remainingLanes, SyncLane)) { { markNestedUpdateScheduled(); } // Count the number of times the root synchronously re-renders without @@ -40764,7 +40698,6 @@ if (replayFailedUnitOfWorkWithInvokeGuardedCallback) { if ( didSuspendOrErrorWhileHydratingDEV() || originalError === SuspenseException || - originalError === SelectiveHydrationException || (originalError !== null && typeof originalError === "object" && typeof originalError.then === "function") @@ -42304,7 +42237,7 @@ function createFiberRoot( return root; } -var ReactVersion = "18.3.0-www-modern-2ccfa657d-20221205"; +var ReactVersion = "18.3.0-www-modern-d807eb52c-20221205"; function createPortal( children, diff --git a/compiled/facebook-www/ReactDOM-prod.classic.js b/compiled/facebook-www/ReactDOM-prod.classic.js index 0e158c9eb53c7..3eadc44aec50c 100644 --- a/compiled/facebook-www/ReactDOM-prod.classic.js +++ b/compiled/facebook-www/ReactDOM-prod.classic.js @@ -1583,8 +1583,8 @@ function clz32Fallback(x) { x >>>= 0; return 0 === x ? 32 : (31 - ((log(x) / LN2) | 0)) | 0; } -var nextTransitionLane = 128, - nextRetryLane = 8388608; +var nextTransitionLane = 64, + nextRetryLane = 4194304; function getHighestPriorityLanes(lanes) { switch (lanes & -lanes) { case 1: @@ -1600,7 +1600,6 @@ function getHighestPriorityLanes(lanes) { case 32: return 32; case 64: - return 64; case 128: case 256: case 512: @@ -1616,13 +1615,13 @@ function getHighestPriorityLanes(lanes) { case 524288: case 1048576: case 2097152: + return lanes & 4194240; case 4194304: - return lanes & 8388480; case 8388608: case 16777216: case 33554432: case 67108864: - return lanes & 125829120; + return lanes & 130023424; case 134217728: return 134217728; case 268435456: @@ -1663,12 +1662,12 @@ function getNextLanes(root, wipLanes) { ((suspendedLanes = nextLanes & -nextLanes), (pingedLanes = wipLanes & -wipLanes), suspendedLanes >= pingedLanes || - (32 === suspendedLanes && 0 !== (pingedLanes & 8388480))) + (16 === suspendedLanes && 0 !== (pingedLanes & 4194240))) ) return wipLanes; 0 === (root.current.mode & 32) && - 0 !== (nextLanes & 8) && - (nextLanes |= pendingLanes & 32); + 0 !== (nextLanes & 4) && + (nextLanes |= pendingLanes & 16); wipLanes = root.entangledLanes; if (0 !== wipLanes) for (root = root.entanglements, wipLanes &= nextLanes; 0 < wipLanes; ) @@ -1683,8 +1682,8 @@ function computeExpirationTime(lane, currentTime) { case 1: case 2: case 4: - case 8: return currentTime + 250; + case 8: case 16: case 32: case 64: @@ -1703,8 +1702,8 @@ function computeExpirationTime(lane, currentTime) { case 524288: case 1048576: case 2097152: - case 4194304: return currentTime + 5e3; + case 4194304: case 8388608: case 16777216: case 33554432: @@ -1724,7 +1723,7 @@ function markStarvedLanesAsExpired(root, currentTime) { var suspendedLanes = root.suspendedLanes, pingedLanes = root.pingedLanes, expirationTimes = root.expirationTimes, - lanes = root.pendingLanes & -125829121; + lanes = root.pendingLanes & -130023425; 0 < lanes; ) { @@ -1744,12 +1743,12 @@ function getLanesToRetrySynchronouslyOnError(root, originallyAttemptedLanes) { return 0 !== root ? root : root & 1073741824 ? 1073741824 : 0; } function includesBlockingLane(root, lanes) { - return 0 !== (root.current.mode & 32) ? !1 : 0 !== (lanes & 60); + return 0 !== (root.current.mode & 32) ? !1 : 0 !== (lanes & 30); } function claimNextTransitionLane() { var lane = nextTransitionLane; nextTransitionLane <<= 1; - 0 === (nextTransitionLane & 8388480) && (nextTransitionLane = 128); + 0 === (nextTransitionLane & 4194240) && (nextTransitionLane = 64); return lane; } function createLaneMap(initial) { @@ -1840,13 +1839,13 @@ function runWithPriority(priority, fn) { } function lanesToEventPriority(lanes) { lanes &= -lanes; - return 2 < lanes - ? 8 < lanes + return 1 < lanes + ? 4 < lanes ? 0 !== (lanes & 268435455) - ? 32 + ? 16 : 536870912 - : 8 - : 2; + : 4 + : 1; } var Internals = { usingClientEntryPoint: !1, @@ -4931,10 +4930,10 @@ function createEventListenerWrapperWithPriority( eventSystemFlags ) { switch (getEventPriority(domEventName)) { - case 2: + case 1: var listenerWrapper = dispatchDiscreteEvent; break; - case 8: + case 4: listenerWrapper = dispatchContinuousEvent; break; default: @@ -4957,7 +4956,7 @@ function dispatchDiscreteEvent( prevTransition = ReactCurrentBatchConfig.transition; ReactCurrentBatchConfig.transition = null; try { - (currentUpdatePriority = 2), + (currentUpdatePriority = 1), dispatchEvent(domEventName, eventSystemFlags, container, nativeEvent); } finally { (currentUpdatePriority = previousPriority), @@ -4974,7 +4973,7 @@ function dispatchContinuousEvent( prevTransition = ReactCurrentBatchConfig.transition; ReactCurrentBatchConfig.transition = null; try { - (currentUpdatePriority = 8), + (currentUpdatePriority = 4), dispatchEvent(domEventName, eventSystemFlags, container, nativeEvent); } finally { (currentUpdatePriority = previousPriority), @@ -5196,7 +5195,7 @@ function getEventPriority(domEventName) { case "popstate": case "select": case "selectstart": - return 2; + return 1; case "drag": case "dragenter": case "dragexit": @@ -5216,23 +5215,23 @@ function getEventPriority(domEventName) { case "mouseleave": case "pointerenter": case "pointerleave": - return 8; + return 4; case "message": switch (getCurrentPriorityLevel()) { case ImmediatePriority: - return 2; + return 1; case UserBlockingPriority: - return 8; + return 4; case NormalPriority: case LowPriority: - return 32; + return 16; case IdlePriority: return 536870912; default: - return 32; + return 16; } default: - return 32; + return 16; } } var emptyContextObject = {}, @@ -5330,7 +5329,7 @@ function flushSyncCallbacks() { previousUpdatePriority = currentUpdatePriority; try { var queue = syncQueue; - for (currentUpdatePriority = 2; i < queue.length; i++) { + for (currentUpdatePriority = 1; i < queue.length; i++) { var callback = queue[i]; do callback = callback(!0); while (null !== callback); @@ -5824,7 +5823,7 @@ function enqueueUpdate$1(fiber, update, lane) { } function entangleTransitions(root, fiber, lane) { fiber = fiber.updateQueue; - if (null !== fiber && ((fiber = fiber.shared), 0 !== (lane & 8388480))) { + if (null !== fiber && ((fiber = fiber.shared), 0 !== (lane & 4194240))) { var queueLanes = fiber.lanes; queueLanes &= root.pendingLanes; lane |= queueLanes; @@ -7298,8 +7297,8 @@ function checkIfSnapshotChanged(inst) { } } function forceStoreRerender(fiber) { - var root = enqueueConcurrentRenderForLane(fiber, 2); - null !== root && scheduleUpdateOnFiber(root, fiber, 2, -1); + var root = enqueueConcurrentRenderForLane(fiber, 1); + null !== root && scheduleUpdateOnFiber(root, fiber, 1, -1); } function mountState(initialState) { var hook = mountWorkInProgressHook(); @@ -7450,7 +7449,7 @@ function updateMemo(nextCreate, deps) { return nextCreate; } function updateDeferredValueImpl(hook, prevValue, value) { - if (0 === (renderLanes & 42)) + if (0 === (renderLanes & 21)) return ( hook.baseState && ((hook.baseState = !1), (didReceiveUpdate = !0)), (hook.memoizedState = value) @@ -7465,7 +7464,7 @@ function updateDeferredValueImpl(hook, prevValue, value) { function startTransition(setPending, callback, options) { var previousPriority = currentUpdatePriority; currentUpdatePriority = - 0 !== previousPriority && 8 > previousPriority ? previousPriority : 8; + 0 !== previousPriority && 4 > previousPriority ? previousPriority : 4; setPending(!0); var prevTransition = ReactCurrentBatchConfig$1.transition; ReactCurrentBatchConfig$1.transition = {}; @@ -7584,7 +7583,7 @@ function enqueueRenderPhaseUpdate(queue, update) { queue.pending = update; } function entangleTransitionUpdate(root, queue, lane) { - if (0 !== (lane & 8388480)) { + if (0 !== (lane & 4194240)) { var queueLanes = queue.lanes; queueLanes &= root.pendingLanes; lane |= queueLanes; @@ -8106,10 +8105,10 @@ function markSuspenseBoundaryShouldCapture( 1 === sourceFiber.tag && (null === sourceFiber.alternate ? (sourceFiber.tag = 17) - : ((returnFiber = createUpdate(-1, 2)), + : ((returnFiber = createUpdate(-1, 1)), (returnFiber.tag = 2), - enqueueUpdate$1(sourceFiber, returnFiber, 2))), - (sourceFiber.lanes |= 2)), + enqueueUpdate$1(sourceFiber, returnFiber, 1))), + (sourceFiber.lanes |= 1)), suspenseBoundary ); suspenseBoundary.flags |= 32768; @@ -8254,7 +8253,6 @@ function pushMarkerInstance(workInProgress, markerInstance) { )); } var ReactCurrentOwner$1 = ReactSharedInternals.ReactCurrentOwner, - SelectiveHydrationException = Error(formatProdErrorMessage(461)), didReceiveUpdate = !1; function reconcileChildren(current, workInProgress, nextChildren, renderLanes) { workInProgress.child = @@ -8847,9 +8845,9 @@ function updateSuspenseComponent(current, workInProgress, renderLanes) { ) return ( 0 === (workInProgress.mode & 1) - ? (workInProgress.lanes = 2) + ? (workInProgress.lanes = 1) : "$!" === current.data - ? (workInProgress.lanes = 16) + ? (workInProgress.lanes = 8) : (workInProgress.lanes = 1073741824), null ); @@ -8901,7 +8899,7 @@ function updateSuspenseComponent(current, workInProgress, renderLanes) { renderLanes )), (workInProgress.memoizedState = SUSPENDED_MARKER), - (workInProgress.lanes = 8388608), + (workInProgress.lanes = 4194304), current ); pushPrimaryTreeSuspenseHandler(workInProgress); @@ -9156,15 +9154,13 @@ function updateDehydratedSuspenseComponent( nextProps = workInProgressRoot; if (null !== nextProps) { switch (renderLanes & -renderLanes) { - case 2: - suspenseInstance = 1; - break; - case 8: - suspenseInstance = 4; + case 4: + suspenseInstance = 2; break; - case 32: - suspenseInstance = 16; + case 16: + suspenseInstance = 8; break; + case 64: case 128: case 256: case 512: @@ -9185,7 +9181,7 @@ function updateDehydratedSuspenseComponent( case 16777216: case 33554432: case 67108864: - suspenseInstance = 64; + suspenseInstance = 32; break; case 536870912: suspenseInstance = 268435456; @@ -9197,14 +9193,11 @@ function updateDehydratedSuspenseComponent( 0 !== (suspenseInstance & (nextProps.suspendedLanes | renderLanes)) ? 0 : suspenseInstance; - if ( - 0 !== suspenseInstance && - suspenseInstance !== suspenseState.retryLane - ) - throw ((suspenseState.retryLane = suspenseInstance), + 0 !== suspenseInstance && + suspenseInstance !== suspenseState.retryLane && + ((suspenseState.retryLane = suspenseInstance), enqueueConcurrentRenderForLane(current, suspenseInstance), - scheduleUpdateOnFiber(nextProps, current, suspenseInstance, -1), - SelectiveHydrationException); + scheduleUpdateOnFiber(nextProps, current, suspenseInstance, -1)); } renderDidSuspendDelayIfPossible(); return retrySuspenseComponentWithoutHydrating( @@ -10461,7 +10454,7 @@ function completeWork(current, workInProgress, renderLanes) { ((workInProgress.flags |= 64), (newProps = !0), cutOffTailIfNeeded(type, !1), - (workInProgress.lanes = 8388608)); + (workInProgress.lanes = 4194304)); } else { if (!newProps) @@ -10490,7 +10483,7 @@ function completeWork(current, workInProgress, renderLanes) { ((workInProgress.flags |= 64), (newProps = !0), cutOffTailIfNeeded(type, !1), - (workInProgress.lanes = 8388608)); + (workInProgress.lanes = 4194304)); type.isBackwards ? ((JSCompiler_inline_result.sibling = workInProgress.child), (workInProgress.child = JSCompiler_inline_result)) @@ -13003,7 +12996,7 @@ function requestEventTime() { : (currentEventTime = now()); } function requestUpdateLane(fiber) { - if (0 === (fiber.mode & 1)) return 2; + if (0 === (fiber.mode & 1)) return 1; if ( !deferRenderPhaseUpdateToNextBatch && 0 !== (executionContext & 2) && @@ -13019,7 +13012,7 @@ function requestUpdateLane(fiber) { fiber = currentUpdatePriority; if (0 !== fiber) return fiber; fiber = window.event; - fiber = void 0 === fiber ? 32 : getEventPriority(fiber.type); + fiber = void 0 === fiber ? 16 : getEventPriority(fiber.type); return fiber; } function scheduleUpdateOnFiber(root, fiber, lane, eventTime) { @@ -13052,7 +13045,7 @@ function scheduleUpdateOnFiber(root, fiber, lane, eventTime) { markRootSuspended$1(root, workInProgressRootRenderLanes); } ensureRootIsScheduled(root, eventTime); - 2 === lane && + 1 === lane && 0 === executionContext && 0 === (fiber.mode & 1) && (resetRenderTimer(), includesLegacySyncCallbacks && flushSyncCallbacks()); @@ -13074,7 +13067,7 @@ function ensureRootIsScheduled(root, currentTime) { root.callbackPriority !== currentTime) ) { null != existingCallbackNode && cancelCallback(existingCallbackNode); - if (0 !== (currentTime & 3)) + if (1 === currentTime) 0 === root.tag ? scheduleLegacySyncCallback(performSyncWorkOnRoot.bind(null, root)) : scheduleSyncCallback(performSyncWorkOnRoot.bind(null, root)), @@ -13084,13 +13077,13 @@ function ensureRootIsScheduled(root, currentTime) { (existingCallbackNode = null); else { switch (lanesToEventPriority(nextLanes)) { - case 2: + case 1: existingCallbackNode = ImmediatePriority; break; - case 8: + case 4: existingCallbackNode = UserBlockingPriority; break; - case 32: + case 16: existingCallbackNode = NormalPriority; break; case 536870912: @@ -13193,7 +13186,7 @@ function performConcurrentWorkOnRoot(root, didTimeout) { case 3: markRootSuspended$1(root, lanes); if ( - (lanes & 125829120) === lanes && + (lanes & 130023424) === lanes && ((didTimeout = globalMostRecentFallbackTime + 500 - now()), 10 < didTimeout) ) { @@ -13224,7 +13217,7 @@ function performConcurrentWorkOnRoot(root, didTimeout) { break; case 4: markRootSuspended$1(root, lanes); - if ((lanes & 8388480) === lanes) break; + if ((lanes & 4194240) === lanes) break; didTimeout = root.eventTimes; for (originallyAttemptedLanes = -1; 0 < lanes; ) (errorRetryLanes$216 = 31 - clz32(lanes)), @@ -13366,7 +13359,7 @@ function performSyncWorkOnRoot(root) { if (0 !== (executionContext & 6)) throw Error(formatProdErrorMessage(327)); flushPassiveEffects(); var lanes = getNextLanes(root, 0); - if (0 === (lanes & 3)) return ensureRootIsScheduled(root, now()), null; + if (0 === (lanes & 1)) return ensureRootIsScheduled(root, now()), null; var exitStatus = renderRootSync(root, lanes); if (0 !== root.tag && 2 === exitStatus) { var originallyAttemptedLanes = lanes, @@ -13426,7 +13419,7 @@ function flushSync(fn) { try { if ( ((ReactCurrentBatchConfig$3.transition = null), - (currentUpdatePriority = 2), + (currentUpdatePriority = 1), fn) ) return fn(); @@ -13481,11 +13474,9 @@ function handleThrow(root, thrownValue) { : 3; } else workInProgressSuspendedReason = - thrownValue === SelectiveHydrationException - ? 6 - : null !== thrownValue && - "object" === typeof thrownValue && - "function" === typeof thrownValue.then + null !== thrownValue && + "object" === typeof thrownValue && + "function" === typeof thrownValue.then ? 4 : 1; workInProgressThrownValue = thrownValue; @@ -13495,7 +13486,7 @@ function handleThrow(root, thrownValue) { } function shouldAttemptToSuspendUntilDataResolves() { if ( - (workInProgressRootRenderLanes & 125829120) === + (workInProgressRootRenderLanes & 130023424) === workInProgressRootRenderLanes ) return !0; @@ -13505,7 +13496,7 @@ function shouldAttemptToSuspendUntilDataResolves() { ) return !1; if ( - (workInProgressRootRenderLanes & 8388480) === + (workInProgressRootRenderLanes & 4194240) === workInProgressRootRenderLanes ) { var suspenseHandler = suspenseHandlerStackCursor.current; @@ -13549,21 +13540,14 @@ function renderRootSync(root, lanes) { if (workInProgressRoot !== root || workInProgressRootRenderLanes !== lanes) (workInProgressTransitions = getTransitionsForLanes(root, lanes)), prepareFreshStack(root, lanes); - a: do + do try { if (0 !== workInProgressSuspendedReason && null !== workInProgress) { lanes = workInProgress; var thrownValue = workInProgressThrownValue; - switch (workInProgressSuspendedReason) { - case 6: - workInProgress = null; - workInProgressRootExitStatus = 6; - break a; - default: - (workInProgressSuspendedReason = 0), - (workInProgressThrownValue = null), - unwindSuspendedUnitOfWork(lanes, thrownValue); - } + workInProgressSuspendedReason = 0; + workInProgressThrownValue = null; + unwindSuspendedUnitOfWork(lanes, thrownValue); } workLoopSync(); break; @@ -13635,10 +13619,6 @@ function renderRootConcurrent(root, lanes) { workInProgressThrownValue = null; unwindSuspendedUnitOfWork(lanes, thrownValue); break; - case 6: - workInProgress = null; - workInProgressRootExitStatus = 6; - break a; default: throw Error(formatProdErrorMessage(462)); } @@ -13918,7 +13898,7 @@ function commitRoot(root, recoverableErrors, transitions) { prevTransition = ReactCurrentBatchConfig$3.transition; try { (ReactCurrentBatchConfig$3.transition = null), - (currentUpdatePriority = 2), + (currentUpdatePriority = 1), commitRootImpl( root, recoverableErrors, @@ -13969,7 +13949,7 @@ function commitRootImpl( transitions = ReactCurrentBatchConfig$3.transition; ReactCurrentBatchConfig$3.transition = null; var previousPriority = currentUpdatePriority; - currentUpdatePriority = 2; + currentUpdatePriority = 1; var prevExecutionContext = executionContext; executionContext |= 4; ReactCurrentOwner$2.current = null; @@ -14018,11 +13998,11 @@ function commitRootImpl( (root = firstUncaughtError), (firstUncaughtError = null), root); - 0 !== (pendingPassiveEffectsLanes & 3) && + 0 !== (pendingPassiveEffectsLanes & 1) && 0 !== root.tag && flushPassiveEffects(); remainingLanes = root.pendingLanes; - 0 !== (remainingLanes & 3) + 0 !== (remainingLanes & 1) ? root === rootWithNestedUpdates ? nestedUpdateCount++ : ((nestedUpdateCount = 0), (rootWithNestedUpdates = root)) @@ -14059,7 +14039,7 @@ function flushPassiveEffects() { remainingLanes = pendingPassiveEffectsRemainingLanes; pendingPassiveEffectsRemainingLanes = 0; var renderPriority = lanesToEventPriority(pendingPassiveEffectsLanes); - renderPriority = 32 > renderPriority ? 32 : renderPriority; + renderPriority = 16 > renderPriority ? 16 : renderPriority; var prevTransition = ReactCurrentBatchConfig$3.transition, previousPriority = currentUpdatePriority; try { @@ -14115,11 +14095,11 @@ function flushPassiveEffectsImpl() { } function captureCommitPhaseErrorOnRoot(rootFiber, sourceFiber, error) { sourceFiber = createCapturedValueAtFiber(error, sourceFiber); - sourceFiber = createRootErrorUpdate(rootFiber, sourceFiber, 2); - rootFiber = enqueueUpdate$1(rootFiber, sourceFiber, 2); + sourceFiber = createRootErrorUpdate(rootFiber, sourceFiber, 1); + rootFiber = enqueueUpdate$1(rootFiber, sourceFiber, 1); sourceFiber = requestEventTime(); null !== rootFiber && - (markRootUpdated(rootFiber, 2, sourceFiber), + (markRootUpdated(rootFiber, 1, sourceFiber), ensureRootIsScheduled(rootFiber, sourceFiber)); } function captureCommitPhaseError(sourceFiber, nearestMountedAncestor, error) { @@ -14153,16 +14133,16 @@ function captureCommitPhaseError(sourceFiber, nearestMountedAncestor, error) { sourceFiber = createClassErrorUpdate( nearestMountedAncestor, sourceFiber, - 2 + 1 ); nearestMountedAncestor = enqueueUpdate$1( nearestMountedAncestor, sourceFiber, - 2 + 1 ); sourceFiber = requestEventTime(); null !== nearestMountedAncestor && - (markRootUpdated(nearestMountedAncestor, 2, sourceFiber), + (markRootUpdated(nearestMountedAncestor, 1, sourceFiber), ensureRootIsScheduled(nearestMountedAncestor, sourceFiber)); break; } @@ -14195,7 +14175,7 @@ function pingSuspendedRoot(root, wakeable, pingedLanes) { (workInProgressRootRenderLanes & pingedLanes) === pingedLanes && (4 === workInProgressRootExitStatus || (3 === workInProgressRootExitStatus && - (workInProgressRootRenderLanes & 125829120) === + (workInProgressRootRenderLanes & 130023424) === workInProgressRootRenderLanes && 500 > now() - globalMostRecentFallbackTime) ? prepareFreshStack(root, 0) @@ -14205,10 +14185,10 @@ function pingSuspendedRoot(root, wakeable, pingedLanes) { function retryTimedOutBoundary(boundaryFiber, retryLane) { 0 === retryLane && (0 === (boundaryFiber.mode & 1) - ? (retryLane = 2) + ? (retryLane = 1) : ((retryLane = nextRetryLane), (nextRetryLane <<= 1), - 0 === (nextRetryLane & 125829120) && (nextRetryLane = 8388608))); + 0 === (nextRetryLane & 130023424) && (nextRetryLane = 4194304))); var eventTime = requestEventTime(); boundaryFiber = enqueueConcurrentRenderForLane(boundaryFiber, retryLane); null !== boundaryFiber && @@ -15454,7 +15434,7 @@ _attemptSynchronousHydration = function(fiber) { if (root$227.current.memoizedState.isDehydrated) { var lanes = getHighestPriorityLanes(root$227.pendingLanes); 0 !== lanes && - (markRootEntangled(root$227, lanes | 2), + (markRootEntangled(root$227, lanes | 1), ensureRootIsScheduled(root$227, now()), 0 === (executionContext & 6) && (resetRenderTimer(), flushSyncCallbacks())); @@ -15462,23 +15442,23 @@ _attemptSynchronousHydration = function(fiber) { break; case 13: flushSync(function() { - var root = enqueueConcurrentRenderForLane(fiber, 2); + var root = enqueueConcurrentRenderForLane(fiber, 1); if (null !== root) { var eventTime = requestEventTime(); - scheduleUpdateOnFiber(root, fiber, 2, eventTime); + scheduleUpdateOnFiber(root, fiber, 1, eventTime); } }), - markRetryLaneIfNotHydrated(fiber, 2); + markRetryLaneIfNotHydrated(fiber, 1); } }; attemptDiscreteHydration = function(fiber) { if (13 === fiber.tag) { - var root = enqueueConcurrentRenderForLane(fiber, 2); + var root = enqueueConcurrentRenderForLane(fiber, 1); if (null !== root) { var eventTime = requestEventTime(); - scheduleUpdateOnFiber(root, fiber, 2, eventTime); + scheduleUpdateOnFiber(root, fiber, 1, eventTime); } - markRetryLaneIfNotHydrated(fiber, 2); + markRetryLaneIfNotHydrated(fiber, 1); } }; attemptContinuousHydration = function(fiber) { @@ -15548,7 +15528,7 @@ Internals.Events = [ var devToolsConfig$jscomp$inline_1773 = { findFiberByHostInstance: getClosestInstanceFromNode, bundleType: 0, - version: "18.3.0-www-classic-2ccfa657d-20221205", + version: "18.3.0-www-classic-d807eb52c-20221205", rendererPackageName: "react-dom" }; var internals$jscomp$inline_2154 = { @@ -15578,7 +15558,7 @@ var internals$jscomp$inline_2154 = { scheduleRoot: null, setRefreshHandler: null, getCurrentFiber: null, - reconcilerVersion: "18.3.0-next-2ccfa657d-20221205" + reconcilerVersion: "18.3.0-next-d807eb52c-20221205" }; if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) { var hook$jscomp$inline_2155 = __REACT_DEVTOOLS_GLOBAL_HOOK__; @@ -15792,7 +15772,7 @@ exports.unstable_flushControlled = function(fn) { previousPriority = currentUpdatePriority; try { (ReactCurrentBatchConfig$3.transition = null), - (currentUpdatePriority = 2), + (currentUpdatePriority = 1), fn(); } finally { (currentUpdatePriority = previousPriority), @@ -15820,4 +15800,4 @@ exports.unstable_renderSubtreeIntoContainer = function( ); }; exports.unstable_runWithPriority = runWithPriority; -exports.version = "18.3.0-next-2ccfa657d-20221205"; +exports.version = "18.3.0-next-d807eb52c-20221205"; diff --git a/compiled/facebook-www/ReactDOM-prod.modern.js b/compiled/facebook-www/ReactDOM-prod.modern.js index 4287cb3e0e3bd..4cd57adfe524b 100644 --- a/compiled/facebook-www/ReactDOM-prod.modern.js +++ b/compiled/facebook-www/ReactDOM-prod.modern.js @@ -1288,8 +1288,8 @@ function clz32Fallback(x) { x >>>= 0; return 0 === x ? 32 : (31 - ((log(x) / LN2) | 0)) | 0; } -var nextTransitionLane = 128, - nextRetryLane = 8388608; +var nextTransitionLane = 64, + nextRetryLane = 4194304; function getHighestPriorityLanes(lanes) { switch (lanes & -lanes) { case 1: @@ -1305,7 +1305,6 @@ function getHighestPriorityLanes(lanes) { case 32: return 32; case 64: - return 64; case 128: case 256: case 512: @@ -1321,13 +1320,13 @@ function getHighestPriorityLanes(lanes) { case 524288: case 1048576: case 2097152: + return lanes & 4194240; case 4194304: - return lanes & 8388480; case 8388608: case 16777216: case 33554432: case 67108864: - return lanes & 125829120; + return lanes & 130023424; case 134217728: return 134217728; case 268435456: @@ -1368,12 +1367,12 @@ function getNextLanes(root, wipLanes) { ((suspendedLanes = nextLanes & -nextLanes), (pingedLanes = wipLanes & -wipLanes), suspendedLanes >= pingedLanes || - (32 === suspendedLanes && 0 !== (pingedLanes & 8388480))) + (16 === suspendedLanes && 0 !== (pingedLanes & 4194240))) ) return wipLanes; 0 === (root.current.mode & 32) && - 0 !== (nextLanes & 8) && - (nextLanes |= pendingLanes & 32); + 0 !== (nextLanes & 4) && + (nextLanes |= pendingLanes & 16); wipLanes = root.entangledLanes; if (0 !== wipLanes) for (root = root.entanglements, wipLanes &= nextLanes; 0 < wipLanes; ) @@ -1388,8 +1387,8 @@ function computeExpirationTime(lane, currentTime) { case 1: case 2: case 4: - case 8: return currentTime + 250; + case 8: case 16: case 32: case 64: @@ -1408,8 +1407,8 @@ function computeExpirationTime(lane, currentTime) { case 524288: case 1048576: case 2097152: - case 4194304: return currentTime + 5e3; + case 4194304: case 8388608: case 16777216: case 33554432: @@ -1429,7 +1428,7 @@ function markStarvedLanesAsExpired(root, currentTime) { var suspendedLanes = root.suspendedLanes, pingedLanes = root.pingedLanes, expirationTimes = root.expirationTimes, - lanes = root.pendingLanes & -125829121; + lanes = root.pendingLanes & -130023425; 0 < lanes; ) { @@ -1449,12 +1448,12 @@ function getLanesToRetrySynchronouslyOnError(root, originallyAttemptedLanes) { return 0 !== root ? root : root & 1073741824 ? 1073741824 : 0; } function includesBlockingLane(root, lanes) { - return 0 !== (root.current.mode & 32) ? !1 : 0 !== (lanes & 60); + return 0 !== (root.current.mode & 32) ? !1 : 0 !== (lanes & 30); } function claimNextTransitionLane() { var lane = nextTransitionLane; nextTransitionLane <<= 1; - 0 === (nextTransitionLane & 8388480) && (nextTransitionLane = 128); + 0 === (nextTransitionLane & 4194240) && (nextTransitionLane = 64); return lane; } function createLaneMap(initial) { @@ -1545,13 +1544,13 @@ function runWithPriority(priority, fn) { } function lanesToEventPriority(lanes) { lanes &= -lanes; - return 2 < lanes - ? 8 < lanes + return 1 < lanes + ? 4 < lanes ? 0 !== (lanes & 268435455) - ? 32 + ? 16 : 536870912 - : 8 - : 2; + : 4 + : 1; } var _attemptSynchronousHydration, attemptDiscreteHydration, @@ -1920,10 +1919,10 @@ function createEventListenerWrapperWithPriority( eventSystemFlags ) { switch (getEventPriority(domEventName)) { - case 2: + case 1: var listenerWrapper = dispatchDiscreteEvent; break; - case 8: + case 4: listenerWrapper = dispatchContinuousEvent; break; default: @@ -1946,7 +1945,7 @@ function dispatchDiscreteEvent( prevTransition = ReactCurrentBatchConfig.transition; ReactCurrentBatchConfig.transition = null; try { - (currentUpdatePriority = 2), + (currentUpdatePriority = 1), dispatchEvent(domEventName, eventSystemFlags, container, nativeEvent); } finally { (currentUpdatePriority = previousPriority), @@ -1963,7 +1962,7 @@ function dispatchContinuousEvent( prevTransition = ReactCurrentBatchConfig.transition; ReactCurrentBatchConfig.transition = null; try { - (currentUpdatePriority = 8), + (currentUpdatePriority = 4), dispatchEvent(domEventName, eventSystemFlags, container, nativeEvent); } finally { (currentUpdatePriority = previousPriority), @@ -2185,7 +2184,7 @@ function getEventPriority(domEventName) { case "popstate": case "select": case "selectstart": - return 2; + return 1; case "drag": case "dragenter": case "dragexit": @@ -2205,23 +2204,23 @@ function getEventPriority(domEventName) { case "mouseleave": case "pointerenter": case "pointerleave": - return 8; + return 4; case "message": switch (getCurrentPriorityLevel()) { case ImmediatePriority: - return 2; + return 1; case UserBlockingPriority: - return 8; + return 4; case NormalPriority: case LowPriority: - return 32; + return 16; case IdlePriority: return 536870912; default: - return 32; + return 16; } default: - return 32; + return 16; } } function addEventBubbleListener(target, eventType, listener) { @@ -5181,7 +5180,7 @@ function flushSyncCallbacks() { previousUpdatePriority = currentUpdatePriority; try { var queue = syncQueue; - for (currentUpdatePriority = 2; i < queue.length; i++) { + for (currentUpdatePriority = 1; i < queue.length; i++) { var callback = queue[i]; do callback = callback(!0); while (null !== callback); @@ -5675,7 +5674,7 @@ function enqueueUpdate$1(fiber, update, lane) { } function entangleTransitions(root, fiber, lane) { fiber = fiber.updateQueue; - if (null !== fiber && ((fiber = fiber.shared), 0 !== (lane & 8388480))) { + if (null !== fiber && ((fiber = fiber.shared), 0 !== (lane & 4194240))) { var queueLanes = fiber.lanes; queueLanes &= root.pendingLanes; lane |= queueLanes; @@ -7149,8 +7148,8 @@ function checkIfSnapshotChanged(inst) { } } function forceStoreRerender(fiber) { - var root = enqueueConcurrentRenderForLane(fiber, 2); - null !== root && scheduleUpdateOnFiber(root, fiber, 2, -1); + var root = enqueueConcurrentRenderForLane(fiber, 1); + null !== root && scheduleUpdateOnFiber(root, fiber, 1, -1); } function mountState(initialState) { var hook = mountWorkInProgressHook(); @@ -7301,7 +7300,7 @@ function updateMemo(nextCreate, deps) { return nextCreate; } function updateDeferredValueImpl(hook, prevValue, value) { - if (0 === (renderLanes & 42)) + if (0 === (renderLanes & 21)) return ( hook.baseState && ((hook.baseState = !1), (didReceiveUpdate = !0)), (hook.memoizedState = value) @@ -7316,7 +7315,7 @@ function updateDeferredValueImpl(hook, prevValue, value) { function startTransition(setPending, callback, options) { var previousPriority = currentUpdatePriority; currentUpdatePriority = - 0 !== previousPriority && 8 > previousPriority ? previousPriority : 8; + 0 !== previousPriority && 4 > previousPriority ? previousPriority : 4; setPending(!0); var prevTransition = ReactCurrentBatchConfig$1.transition; ReactCurrentBatchConfig$1.transition = {}; @@ -7435,7 +7434,7 @@ function enqueueRenderPhaseUpdate(queue, update) { queue.pending = update; } function entangleTransitionUpdate(root, queue, lane) { - if (0 !== (lane & 8388480)) { + if (0 !== (lane & 4194240)) { var queueLanes = queue.lanes; queueLanes &= root.pendingLanes; lane |= queueLanes; @@ -7943,10 +7942,10 @@ function markSuspenseBoundaryShouldCapture( 1 === sourceFiber.tag && (null === sourceFiber.alternate ? (sourceFiber.tag = 17) - : ((returnFiber = createUpdate(-1, 2)), + : ((returnFiber = createUpdate(-1, 1)), (returnFiber.tag = 2), - enqueueUpdate$1(sourceFiber, returnFiber, 2))), - (sourceFiber.lanes |= 2)), + enqueueUpdate$1(sourceFiber, returnFiber, 1))), + (sourceFiber.lanes |= 1)), suspenseBoundary ); suspenseBoundary.flags |= 32768; @@ -8091,7 +8090,6 @@ function pushMarkerInstance(workInProgress, markerInstance) { )); } var ReactCurrentOwner$1 = ReactSharedInternals.ReactCurrentOwner, - SelectiveHydrationException = Error(formatProdErrorMessage(461)), didReceiveUpdate = !1; function reconcileChildren(current, workInProgress, nextChildren, renderLanes) { workInProgress.child = @@ -8648,9 +8646,9 @@ function updateSuspenseComponent(current, workInProgress, renderLanes) { ) return ( 0 === (workInProgress.mode & 1) - ? (workInProgress.lanes = 2) + ? (workInProgress.lanes = 1) : "$!" === current.data - ? (workInProgress.lanes = 16) + ? (workInProgress.lanes = 8) : (workInProgress.lanes = 1073741824), null ); @@ -8702,7 +8700,7 @@ function updateSuspenseComponent(current, workInProgress, renderLanes) { renderLanes )), (workInProgress.memoizedState = SUSPENDED_MARKER), - (workInProgress.lanes = 8388608), + (workInProgress.lanes = 4194304), current ); pushPrimaryTreeSuspenseHandler(workInProgress); @@ -8957,15 +8955,13 @@ function updateDehydratedSuspenseComponent( nextProps = workInProgressRoot; if (null !== nextProps) { switch (renderLanes & -renderLanes) { - case 2: - suspenseInstance = 1; - break; - case 8: - suspenseInstance = 4; + case 4: + suspenseInstance = 2; break; - case 32: - suspenseInstance = 16; + case 16: + suspenseInstance = 8; break; + case 64: case 128: case 256: case 512: @@ -8986,7 +8982,7 @@ function updateDehydratedSuspenseComponent( case 16777216: case 33554432: case 67108864: - suspenseInstance = 64; + suspenseInstance = 32; break; case 536870912: suspenseInstance = 268435456; @@ -8998,14 +8994,11 @@ function updateDehydratedSuspenseComponent( 0 !== (suspenseInstance & (nextProps.suspendedLanes | renderLanes)) ? 0 : suspenseInstance; - if ( - 0 !== suspenseInstance && - suspenseInstance !== suspenseState.retryLane - ) - throw ((suspenseState.retryLane = suspenseInstance), + 0 !== suspenseInstance && + suspenseInstance !== suspenseState.retryLane && + ((suspenseState.retryLane = suspenseInstance), enqueueConcurrentRenderForLane(current, suspenseInstance), - scheduleUpdateOnFiber(nextProps, current, suspenseInstance, -1), - SelectiveHydrationException); + scheduleUpdateOnFiber(nextProps, current, suspenseInstance, -1)); } renderDidSuspendDelayIfPossible(); return retrySuspenseComponentWithoutHydrating( @@ -10248,7 +10241,7 @@ function completeWork(current, workInProgress, renderLanes) { ((workInProgress.flags |= 64), (newProps = !0), cutOffTailIfNeeded(type, !1), - (workInProgress.lanes = 8388608)); + (workInProgress.lanes = 4194304)); } else { if (!newProps) @@ -10277,7 +10270,7 @@ function completeWork(current, workInProgress, renderLanes) { ((workInProgress.flags |= 64), (newProps = !0), cutOffTailIfNeeded(type, !1), - (workInProgress.lanes = 8388608)); + (workInProgress.lanes = 4194304)); type.isBackwards ? ((JSCompiler_inline_result.sibling = workInProgress.child), (workInProgress.child = JSCompiler_inline_result)) @@ -12781,7 +12774,7 @@ function requestEventTime() { : (currentEventTime = now()); } function requestUpdateLane(fiber) { - if (0 === (fiber.mode & 1)) return 2; + if (0 === (fiber.mode & 1)) return 1; if ( !deferRenderPhaseUpdateToNextBatch && 0 !== (executionContext & 2) && @@ -12797,7 +12790,7 @@ function requestUpdateLane(fiber) { fiber = currentUpdatePriority; if (0 !== fiber) return fiber; fiber = window.event; - fiber = void 0 === fiber ? 32 : getEventPriority(fiber.type); + fiber = void 0 === fiber ? 16 : getEventPriority(fiber.type); return fiber; } function scheduleUpdateOnFiber(root, fiber, lane, eventTime) { @@ -12830,7 +12823,7 @@ function scheduleUpdateOnFiber(root, fiber, lane, eventTime) { markRootSuspended$1(root, workInProgressRootRenderLanes); } ensureRootIsScheduled(root, eventTime); - 2 === lane && + 1 === lane && 0 === executionContext && 0 === (fiber.mode & 1) && (resetRenderTimer(), includesLegacySyncCallbacks && flushSyncCallbacks()); @@ -12852,7 +12845,7 @@ function ensureRootIsScheduled(root, currentTime) { root.callbackPriority !== currentTime) ) { null != existingCallbackNode && cancelCallback(existingCallbackNode); - if (0 !== (currentTime & 3)) + if (1 === currentTime) 0 === root.tag ? scheduleLegacySyncCallback(performSyncWorkOnRoot.bind(null, root)) : scheduleSyncCallback(performSyncWorkOnRoot.bind(null, root)), @@ -12862,13 +12855,13 @@ function ensureRootIsScheduled(root, currentTime) { (existingCallbackNode = null); else { switch (lanesToEventPriority(nextLanes)) { - case 2: + case 1: existingCallbackNode = ImmediatePriority; break; - case 8: + case 4: existingCallbackNode = UserBlockingPriority; break; - case 32: + case 16: existingCallbackNode = NormalPriority; break; case 536870912: @@ -12971,7 +12964,7 @@ function performConcurrentWorkOnRoot(root, didTimeout) { case 3: markRootSuspended$1(root, lanes); if ( - (lanes & 125829120) === lanes && + (lanes & 130023424) === lanes && ((didTimeout = globalMostRecentFallbackTime + 500 - now()), 10 < didTimeout) ) { @@ -13002,7 +12995,7 @@ function performConcurrentWorkOnRoot(root, didTimeout) { break; case 4: markRootSuspended$1(root, lanes); - if ((lanes & 8388480) === lanes) break; + if ((lanes & 4194240) === lanes) break; didTimeout = root.eventTimes; for (originallyAttemptedLanes = -1; 0 < lanes; ) (errorRetryLanes$217 = 31 - clz32(lanes)), @@ -13144,7 +13137,7 @@ function performSyncWorkOnRoot(root) { if (0 !== (executionContext & 6)) throw Error(formatProdErrorMessage(327)); flushPassiveEffects(); var lanes = getNextLanes(root, 0); - if (0 === (lanes & 3)) return ensureRootIsScheduled(root, now()), null; + if (0 === (lanes & 1)) return ensureRootIsScheduled(root, now()), null; var exitStatus = renderRootSync(root, lanes); if (0 !== root.tag && 2 === exitStatus) { var originallyAttemptedLanes = lanes, @@ -13204,7 +13197,7 @@ function flushSync(fn) { try { if ( ((ReactCurrentBatchConfig$3.transition = null), - (currentUpdatePriority = 2), + (currentUpdatePriority = 1), fn) ) return fn(); @@ -13259,11 +13252,9 @@ function handleThrow(root, thrownValue) { : 3; } else workInProgressSuspendedReason = - thrownValue === SelectiveHydrationException - ? 6 - : null !== thrownValue && - "object" === typeof thrownValue && - "function" === typeof thrownValue.then + null !== thrownValue && + "object" === typeof thrownValue && + "function" === typeof thrownValue.then ? 4 : 1; workInProgressThrownValue = thrownValue; @@ -13273,7 +13264,7 @@ function handleThrow(root, thrownValue) { } function shouldAttemptToSuspendUntilDataResolves() { if ( - (workInProgressRootRenderLanes & 125829120) === + (workInProgressRootRenderLanes & 130023424) === workInProgressRootRenderLanes ) return !0; @@ -13283,7 +13274,7 @@ function shouldAttemptToSuspendUntilDataResolves() { ) return !1; if ( - (workInProgressRootRenderLanes & 8388480) === + (workInProgressRootRenderLanes & 4194240) === workInProgressRootRenderLanes ) { var suspenseHandler = suspenseHandlerStackCursor.current; @@ -13327,21 +13318,14 @@ function renderRootSync(root, lanes) { if (workInProgressRoot !== root || workInProgressRootRenderLanes !== lanes) (workInProgressTransitions = getTransitionsForLanes(root, lanes)), prepareFreshStack(root, lanes); - a: do + do try { if (0 !== workInProgressSuspendedReason && null !== workInProgress) { lanes = workInProgress; var thrownValue = workInProgressThrownValue; - switch (workInProgressSuspendedReason) { - case 6: - workInProgress = null; - workInProgressRootExitStatus = 6; - break a; - default: - (workInProgressSuspendedReason = 0), - (workInProgressThrownValue = null), - unwindSuspendedUnitOfWork(lanes, thrownValue); - } + workInProgressSuspendedReason = 0; + workInProgressThrownValue = null; + unwindSuspendedUnitOfWork(lanes, thrownValue); } workLoopSync(); break; @@ -13413,10 +13397,6 @@ function renderRootConcurrent(root, lanes) { workInProgressThrownValue = null; unwindSuspendedUnitOfWork(lanes, thrownValue); break; - case 6: - workInProgress = null; - workInProgressRootExitStatus = 6; - break a; default: throw Error(formatProdErrorMessage(462)); } @@ -13696,7 +13676,7 @@ function commitRoot(root, recoverableErrors, transitions) { prevTransition = ReactCurrentBatchConfig$3.transition; try { (ReactCurrentBatchConfig$3.transition = null), - (currentUpdatePriority = 2), + (currentUpdatePriority = 1), commitRootImpl( root, recoverableErrors, @@ -13747,7 +13727,7 @@ function commitRootImpl( transitions = ReactCurrentBatchConfig$3.transition; ReactCurrentBatchConfig$3.transition = null; var previousPriority = currentUpdatePriority; - currentUpdatePriority = 2; + currentUpdatePriority = 1; var prevExecutionContext = executionContext; executionContext |= 4; ReactCurrentOwner$2.current = null; @@ -13796,11 +13776,11 @@ function commitRootImpl( (root = firstUncaughtError), (firstUncaughtError = null), root); - 0 !== (pendingPassiveEffectsLanes & 3) && + 0 !== (pendingPassiveEffectsLanes & 1) && 0 !== root.tag && flushPassiveEffects(); remainingLanes = root.pendingLanes; - 0 !== (remainingLanes & 3) + 0 !== (remainingLanes & 1) ? root === rootWithNestedUpdates ? nestedUpdateCount++ : ((nestedUpdateCount = 0), (rootWithNestedUpdates = root)) @@ -13837,7 +13817,7 @@ function flushPassiveEffects() { remainingLanes = pendingPassiveEffectsRemainingLanes; pendingPassiveEffectsRemainingLanes = 0; var renderPriority = lanesToEventPriority(pendingPassiveEffectsLanes); - renderPriority = 32 > renderPriority ? 32 : renderPriority; + renderPriority = 16 > renderPriority ? 16 : renderPriority; var prevTransition = ReactCurrentBatchConfig$3.transition, previousPriority = currentUpdatePriority; try { @@ -13893,11 +13873,11 @@ function flushPassiveEffectsImpl() { } function captureCommitPhaseErrorOnRoot(rootFiber, sourceFiber, error) { sourceFiber = createCapturedValueAtFiber(error, sourceFiber); - sourceFiber = createRootErrorUpdate(rootFiber, sourceFiber, 2); - rootFiber = enqueueUpdate$1(rootFiber, sourceFiber, 2); + sourceFiber = createRootErrorUpdate(rootFiber, sourceFiber, 1); + rootFiber = enqueueUpdate$1(rootFiber, sourceFiber, 1); sourceFiber = requestEventTime(); null !== rootFiber && - (markRootUpdated(rootFiber, 2, sourceFiber), + (markRootUpdated(rootFiber, 1, sourceFiber), ensureRootIsScheduled(rootFiber, sourceFiber)); } function captureCommitPhaseError(sourceFiber, nearestMountedAncestor, error) { @@ -13931,16 +13911,16 @@ function captureCommitPhaseError(sourceFiber, nearestMountedAncestor, error) { sourceFiber = createClassErrorUpdate( nearestMountedAncestor, sourceFiber, - 2 + 1 ); nearestMountedAncestor = enqueueUpdate$1( nearestMountedAncestor, sourceFiber, - 2 + 1 ); sourceFiber = requestEventTime(); null !== nearestMountedAncestor && - (markRootUpdated(nearestMountedAncestor, 2, sourceFiber), + (markRootUpdated(nearestMountedAncestor, 1, sourceFiber), ensureRootIsScheduled(nearestMountedAncestor, sourceFiber)); break; } @@ -13973,7 +13953,7 @@ function pingSuspendedRoot(root, wakeable, pingedLanes) { (workInProgressRootRenderLanes & pingedLanes) === pingedLanes && (4 === workInProgressRootExitStatus || (3 === workInProgressRootExitStatus && - (workInProgressRootRenderLanes & 125829120) === + (workInProgressRootRenderLanes & 130023424) === workInProgressRootRenderLanes && 500 > now() - globalMostRecentFallbackTime) ? prepareFreshStack(root, 0) @@ -13983,10 +13963,10 @@ function pingSuspendedRoot(root, wakeable, pingedLanes) { function retryTimedOutBoundary(boundaryFiber, retryLane) { 0 === retryLane && (0 === (boundaryFiber.mode & 1) - ? (retryLane = 2) + ? (retryLane = 1) : ((retryLane = nextRetryLane), (nextRetryLane <<= 1), - 0 === (nextRetryLane & 125829120) && (nextRetryLane = 8388608))); + 0 === (nextRetryLane & 130023424) && (nextRetryLane = 4194304))); var eventTime = requestEventTime(); boundaryFiber = enqueueConcurrentRenderForLane(boundaryFiber, retryLane); null !== boundaryFiber && @@ -15015,7 +14995,7 @@ _attemptSynchronousHydration = function(fiber) { if (root$228.current.memoizedState.isDehydrated) { var lanes = getHighestPriorityLanes(root$228.pendingLanes); 0 !== lanes && - (markRootEntangled(root$228, lanes | 2), + (markRootEntangled(root$228, lanes | 1), ensureRootIsScheduled(root$228, now()), 0 === (executionContext & 6) && (resetRenderTimer(), flushSyncCallbacks())); @@ -15023,23 +15003,23 @@ _attemptSynchronousHydration = function(fiber) { break; case 13: flushSync(function() { - var root = enqueueConcurrentRenderForLane(fiber, 2); + var root = enqueueConcurrentRenderForLane(fiber, 1); if (null !== root) { var eventTime = requestEventTime(); - scheduleUpdateOnFiber(root, fiber, 2, eventTime); + scheduleUpdateOnFiber(root, fiber, 1, eventTime); } }), - markRetryLaneIfNotHydrated(fiber, 2); + markRetryLaneIfNotHydrated(fiber, 1); } }; attemptDiscreteHydration = function(fiber) { if (13 === fiber.tag) { - var root = enqueueConcurrentRenderForLane(fiber, 2); + var root = enqueueConcurrentRenderForLane(fiber, 1); if (null !== root) { var eventTime = requestEventTime(); - scheduleUpdateOnFiber(root, fiber, 2, eventTime); + scheduleUpdateOnFiber(root, fiber, 1, eventTime); } - markRetryLaneIfNotHydrated(fiber, 2); + markRetryLaneIfNotHydrated(fiber, 1); } }; attemptContinuousHydration = function(fiber) { @@ -15109,7 +15089,7 @@ Internals.Events = [ var devToolsConfig$jscomp$inline_1741 = { findFiberByHostInstance: getClosestInstanceFromNode, bundleType: 0, - version: "18.3.0-www-modern-2ccfa657d-20221205", + version: "18.3.0-www-modern-d807eb52c-20221205", rendererPackageName: "react-dom" }; var internals$jscomp$inline_2129 = { @@ -15140,7 +15120,7 @@ var internals$jscomp$inline_2129 = { scheduleRoot: null, setRefreshHandler: null, getCurrentFiber: null, - reconcilerVersion: "18.3.0-next-2ccfa657d-20221205" + reconcilerVersion: "18.3.0-next-d807eb52c-20221205" }; if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) { var hook$jscomp$inline_2130 = __REACT_DEVTOOLS_GLOBAL_HOOK__; @@ -15318,7 +15298,7 @@ exports.unstable_flushControlled = function(fn) { previousPriority = currentUpdatePriority; try { (ReactCurrentBatchConfig$3.transition = null), - (currentUpdatePriority = 2), + (currentUpdatePriority = 1), fn(); } finally { (currentUpdatePriority = previousPriority), @@ -15328,4 +15308,4 @@ exports.unstable_flushControlled = function(fn) { } }; exports.unstable_runWithPriority = runWithPriority; -exports.version = "18.3.0-next-2ccfa657d-20221205"; +exports.version = "18.3.0-next-d807eb52c-20221205"; diff --git a/compiled/facebook-www/ReactDOM-profiling.classic.js b/compiled/facebook-www/ReactDOM-profiling.classic.js index 029f8d55edd03..d0c3e82d66107 100644 --- a/compiled/facebook-www/ReactDOM-profiling.classic.js +++ b/compiled/facebook-www/ReactDOM-profiling.classic.js @@ -1586,13 +1586,13 @@ function onCommitRoot(root, eventPriority) { try { var didError = 64 === (root.current.flags & 64); switch (eventPriority) { - case 2: + case 1: var schedulerPriority = ImmediatePriority; break; - case 8: + case 4: schedulerPriority = UserBlockingPriority; break; - case 32: + case 16: schedulerPriority = NormalPriority; break; case 536870912: @@ -1686,23 +1686,22 @@ function clz32Fallback(x) { } function getLabelForLane(lane) { if (enableSchedulingProfiler) { - if (lane & 1) return "SyncHydrationLane"; - if (lane & 2) return "Sync"; - if (lane & 4) return "InputContinuousHydration"; - if (lane & 8) return "InputContinuous"; - if (lane & 16) return "DefaultHydration"; - if (lane & 32) return "Default"; - if (lane & 64) return "TransitionHydration"; - if (lane & 8388480) return "Transition"; - if (lane & 125829120) return "Retry"; + if (lane & 1) return "Sync"; + if (lane & 2) return "InputContinuousHydration"; + if (lane & 4) return "InputContinuous"; + if (lane & 8) return "DefaultHydration"; + if (lane & 16) return "Default"; + if (lane & 32) return "TransitionHydration"; + if (lane & 4194240) return "Transition"; + if (lane & 130023424) return "Retry"; if (lane & 134217728) return "SelectiveHydration"; if (lane & 268435456) return "IdleHydration"; if (lane & 536870912) return "Idle"; if (lane & 1073741824) return "Offscreen"; } } -var nextTransitionLane = 128, - nextRetryLane = 8388608; +var nextTransitionLane = 64, + nextRetryLane = 4194304; function getHighestPriorityLanes(lanes) { switch (lanes & -lanes) { case 1: @@ -1718,7 +1717,6 @@ function getHighestPriorityLanes(lanes) { case 32: return 32; case 64: - return 64; case 128: case 256: case 512: @@ -1734,13 +1732,13 @@ function getHighestPriorityLanes(lanes) { case 524288: case 1048576: case 2097152: + return lanes & 4194240; case 4194304: - return lanes & 8388480; case 8388608: case 16777216: case 33554432: case 67108864: - return lanes & 125829120; + return lanes & 130023424; case 134217728: return 134217728; case 268435456: @@ -1781,12 +1779,12 @@ function getNextLanes(root, wipLanes) { ((suspendedLanes = nextLanes & -nextLanes), (pingedLanes = wipLanes & -wipLanes), suspendedLanes >= pingedLanes || - (32 === suspendedLanes && 0 !== (pingedLanes & 8388480))) + (16 === suspendedLanes && 0 !== (pingedLanes & 4194240))) ) return wipLanes; 0 === (root.current.mode & 32) && - 0 !== (nextLanes & 8) && - (nextLanes |= pendingLanes & 32); + 0 !== (nextLanes & 4) && + (nextLanes |= pendingLanes & 16); wipLanes = root.entangledLanes; if (0 !== wipLanes) for (root = root.entanglements, wipLanes &= nextLanes; 0 < wipLanes; ) @@ -1801,8 +1799,8 @@ function computeExpirationTime(lane, currentTime) { case 1: case 2: case 4: - case 8: return currentTime + 250; + case 8: case 16: case 32: case 64: @@ -1821,8 +1819,8 @@ function computeExpirationTime(lane, currentTime) { case 524288: case 1048576: case 2097152: - case 4194304: return currentTime + 5e3; + case 4194304: case 8388608: case 16777216: case 33554432: @@ -1842,7 +1840,7 @@ function markStarvedLanesAsExpired(root, currentTime) { var suspendedLanes = root.suspendedLanes, pingedLanes = root.pingedLanes, expirationTimes = root.expirationTimes, - lanes = root.pendingLanes & -125829121; + lanes = root.pendingLanes & -130023425; 0 < lanes; ) { @@ -1862,12 +1860,12 @@ function getLanesToRetrySynchronouslyOnError(root, originallyAttemptedLanes) { return 0 !== root ? root : root & 1073741824 ? 1073741824 : 0; } function includesBlockingLane(root, lanes) { - return 0 !== (root.current.mode & 32) ? !1 : 0 !== (lanes & 60); + return 0 !== (root.current.mode & 32) ? !1 : 0 !== (lanes & 30); } function claimNextTransitionLane() { var lane = nextTransitionLane; nextTransitionLane <<= 1; - 0 === (nextTransitionLane & 8388480) && (nextTransitionLane = 128); + 0 === (nextTransitionLane & 4194240) && (nextTransitionLane = 64); return lane; } function createLaneMap(initial) { @@ -1988,13 +1986,13 @@ function runWithPriority(priority, fn) { } function lanesToEventPriority(lanes) { lanes &= -lanes; - return 2 < lanes - ? 8 < lanes + return 1 < lanes + ? 4 < lanes ? 0 !== (lanes & 268435455) - ? 32 + ? 16 : 536870912 - : 8 - : 2; + : 4 + : 1; } var Internals = { usingClientEntryPoint: !1, @@ -5079,10 +5077,10 @@ function createEventListenerWrapperWithPriority( eventSystemFlags ) { switch (getEventPriority(domEventName)) { - case 2: + case 1: var listenerWrapper = dispatchDiscreteEvent; break; - case 8: + case 4: listenerWrapper = dispatchContinuousEvent; break; default: @@ -5105,7 +5103,7 @@ function dispatchDiscreteEvent( prevTransition = ReactCurrentBatchConfig.transition; ReactCurrentBatchConfig.transition = null; try { - (currentUpdatePriority = 2), + (currentUpdatePriority = 1), dispatchEvent(domEventName, eventSystemFlags, container, nativeEvent); } finally { (currentUpdatePriority = previousPriority), @@ -5122,7 +5120,7 @@ function dispatchContinuousEvent( prevTransition = ReactCurrentBatchConfig.transition; ReactCurrentBatchConfig.transition = null; try { - (currentUpdatePriority = 8), + (currentUpdatePriority = 4), dispatchEvent(domEventName, eventSystemFlags, container, nativeEvent); } finally { (currentUpdatePriority = previousPriority), @@ -5344,7 +5342,7 @@ function getEventPriority(domEventName) { case "popstate": case "select": case "selectstart": - return 2; + return 1; case "drag": case "dragenter": case "dragexit": @@ -5364,23 +5362,23 @@ function getEventPriority(domEventName) { case "mouseleave": case "pointerenter": case "pointerleave": - return 8; + return 4; case "message": switch (getCurrentPriorityLevel()) { case ImmediatePriority: - return 2; + return 1; case UserBlockingPriority: - return 8; + return 4; case NormalPriority: case LowPriority: - return 32; + return 16; case IdlePriority: return 536870912; default: - return 32; + return 16; } default: - return 32; + return 16; } } var emptyContextObject = {}, @@ -5478,7 +5476,7 @@ function flushSyncCallbacks() { previousUpdatePriority = currentUpdatePriority; try { var queue = syncQueue; - for (currentUpdatePriority = 2; i < queue.length; i++) { + for (currentUpdatePriority = 1; i < queue.length; i++) { var callback = queue[i]; do callback = callback(!0); while (null !== callback); @@ -5972,7 +5970,7 @@ function enqueueUpdate$1(fiber, update, lane) { } function entangleTransitions(root, fiber, lane) { fiber = fiber.updateQueue; - if (null !== fiber && ((fiber = fiber.shared), 0 !== (lane & 8388480))) { + if (null !== fiber && ((fiber = fiber.shared), 0 !== (lane & 4194240))) { var queueLanes = fiber.lanes; queueLanes &= root.pendingLanes; lane |= queueLanes; @@ -7446,8 +7444,8 @@ function checkIfSnapshotChanged(inst) { } } function forceStoreRerender(fiber) { - var root = enqueueConcurrentRenderForLane(fiber, 2); - null !== root && scheduleUpdateOnFiber(root, fiber, 2, -1); + var root = enqueueConcurrentRenderForLane(fiber, 1); + null !== root && scheduleUpdateOnFiber(root, fiber, 1, -1); } function mountState(initialState) { var hook = mountWorkInProgressHook(); @@ -7598,7 +7596,7 @@ function updateMemo(nextCreate, deps) { return nextCreate; } function updateDeferredValueImpl(hook, prevValue, value) { - if (0 === (renderLanes & 42)) + if (0 === (renderLanes & 21)) return ( hook.baseState && ((hook.baseState = !1), (didReceiveUpdate = !0)), (hook.memoizedState = value) @@ -7613,7 +7611,7 @@ function updateDeferredValueImpl(hook, prevValue, value) { function startTransition(setPending, callback, options) { var previousPriority = currentUpdatePriority; currentUpdatePriority = - 0 !== previousPriority && 8 > previousPriority ? previousPriority : 8; + 0 !== previousPriority && 4 > previousPriority ? previousPriority : 4; setPending(!0); var prevTransition = ReactCurrentBatchConfig$1.transition; ReactCurrentBatchConfig$1.transition = {}; @@ -7734,7 +7732,7 @@ function enqueueRenderPhaseUpdate(queue, update) { queue.pending = update; } function entangleTransitionUpdate(root, queue, lane) { - if (0 !== (lane & 8388480)) { + if (0 !== (lane & 4194240)) { var queueLanes = queue.lanes; queueLanes &= root.pendingLanes; lane |= queueLanes; @@ -8325,10 +8323,10 @@ function markSuspenseBoundaryShouldCapture( 1 === sourceFiber.tag && (null === sourceFiber.alternate ? (sourceFiber.tag = 17) - : ((returnFiber = createUpdate(-1, 2)), + : ((returnFiber = createUpdate(-1, 1)), (returnFiber.tag = 2), - enqueueUpdate$1(sourceFiber, returnFiber, 2))), - (sourceFiber.lanes |= 2)), + enqueueUpdate$1(sourceFiber, returnFiber, 1))), + (sourceFiber.lanes |= 1)), suspenseBoundary ); suspenseBoundary.flags |= 32768; @@ -8473,7 +8471,6 @@ function pushMarkerInstance(workInProgress, markerInstance) { )); } var ReactCurrentOwner$1 = ReactSharedInternals.ReactCurrentOwner, - SelectiveHydrationException = Error(formatProdErrorMessage(461)), didReceiveUpdate = !1; function reconcileChildren(current, workInProgress, nextChildren, renderLanes) { workInProgress.child = @@ -9079,9 +9076,9 @@ function updateSuspenseComponent(current, workInProgress, renderLanes) { ) return ( 0 === (workInProgress.mode & 1) - ? (workInProgress.lanes = 2) + ? (workInProgress.lanes = 1) : "$!" === current.data - ? (workInProgress.lanes = 16) + ? (workInProgress.lanes = 8) : (workInProgress.lanes = 1073741824), null ); @@ -9133,7 +9130,7 @@ function updateSuspenseComponent(current, workInProgress, renderLanes) { renderLanes )), (workInProgress.memoizedState = SUSPENDED_MARKER), - (workInProgress.lanes = 8388608), + (workInProgress.lanes = 4194304), current ); pushPrimaryTreeSuspenseHandler(workInProgress); @@ -9398,15 +9395,13 @@ function updateDehydratedSuspenseComponent( nextProps = workInProgressRoot; if (null !== nextProps) { switch (renderLanes & -renderLanes) { - case 2: - suspenseInstance = 1; - break; - case 8: - suspenseInstance = 4; + case 4: + suspenseInstance = 2; break; - case 32: - suspenseInstance = 16; + case 16: + suspenseInstance = 8; break; + case 64: case 128: case 256: case 512: @@ -9427,7 +9422,7 @@ function updateDehydratedSuspenseComponent( case 16777216: case 33554432: case 67108864: - suspenseInstance = 64; + suspenseInstance = 32; break; case 536870912: suspenseInstance = 268435456; @@ -9439,14 +9434,11 @@ function updateDehydratedSuspenseComponent( 0 !== (suspenseInstance & (nextProps.suspendedLanes | renderLanes)) ? 0 : suspenseInstance; - if ( - 0 !== suspenseInstance && - suspenseInstance !== suspenseState.retryLane - ) - throw ((suspenseState.retryLane = suspenseInstance), + 0 !== suspenseInstance && + suspenseInstance !== suspenseState.retryLane && + ((suspenseState.retryLane = suspenseInstance), enqueueConcurrentRenderForLane(current, suspenseInstance), - scheduleUpdateOnFiber(nextProps, current, suspenseInstance, -1), - SelectiveHydrationException); + scheduleUpdateOnFiber(nextProps, current, suspenseInstance, -1)); } renderDidSuspendDelayIfPossible(); return retrySuspenseComponentWithoutHydrating( @@ -10770,7 +10762,7 @@ function completeWork(current, workInProgress, renderLanes) { ((workInProgress.flags |= 64), (newProps = !0), cutOffTailIfNeeded(type, !1), - (workInProgress.lanes = 8388608)); + (workInProgress.lanes = 4194304)); } else { if (!newProps) @@ -10799,7 +10791,7 @@ function completeWork(current, workInProgress, renderLanes) { ((workInProgress.flags |= 64), (newProps = !0), cutOffTailIfNeeded(type, !1), - (workInProgress.lanes = 8388608)); + (workInProgress.lanes = 4194304)); type.isBackwards ? ((JSCompiler_inline_result.sibling = workInProgress.child), (workInProgress.child = JSCompiler_inline_result)) @@ -13597,7 +13589,7 @@ function requestEventTime() { : (currentEventTime = now()); } function requestUpdateLane(fiber) { - if (0 === (fiber.mode & 1)) return 2; + if (0 === (fiber.mode & 1)) return 1; if ( !deferRenderPhaseUpdateToNextBatch && 0 !== (executionContext & 2) && @@ -13613,7 +13605,7 @@ function requestUpdateLane(fiber) { fiber = currentUpdatePriority; if (0 !== fiber) return fiber; fiber = window.event; - fiber = void 0 === fiber ? 32 : getEventPriority(fiber.type); + fiber = void 0 === fiber ? 16 : getEventPriority(fiber.type); return fiber; } function scheduleUpdateOnFiber(root, fiber, lane, eventTime) { @@ -13662,7 +13654,7 @@ function scheduleUpdateOnFiber(root, fiber, lane, eventTime) { markRootSuspended$1(root, workInProgressRootRenderLanes); } ensureRootIsScheduled(root, eventTime); - 2 === lane && + 1 === lane && 0 === executionContext && 0 === (fiber.mode & 1) && (resetRenderTimer(), includesLegacySyncCallbacks && flushSyncCallbacks()); @@ -13684,7 +13676,7 @@ function ensureRootIsScheduled(root, currentTime) { root.callbackPriority !== currentTime) ) { null != existingCallbackNode && cancelCallback(existingCallbackNode); - if (0 !== (currentTime & 3)) + if (1 === currentTime) 0 === root.tag ? scheduleLegacySyncCallback(performSyncWorkOnRoot.bind(null, root)) : scheduleSyncCallback(performSyncWorkOnRoot.bind(null, root)), @@ -13694,13 +13686,13 @@ function ensureRootIsScheduled(root, currentTime) { (existingCallbackNode = null); else { switch (lanesToEventPriority(nextLanes)) { - case 2: + case 1: existingCallbackNode = ImmediatePriority; break; - case 8: + case 4: existingCallbackNode = UserBlockingPriority; break; - case 32: + case 16: existingCallbackNode = NormalPriority; break; case 536870912: @@ -13804,7 +13796,7 @@ function performConcurrentWorkOnRoot(root, didTimeout) { case 3: markRootSuspended$1(root, lanes); if ( - (lanes & 125829120) === lanes && + (lanes & 130023424) === lanes && ((didTimeout = globalMostRecentFallbackTime + 500 - now()), 10 < didTimeout) ) { @@ -13835,7 +13827,7 @@ function performConcurrentWorkOnRoot(root, didTimeout) { break; case 4: markRootSuspended$1(root, lanes); - if ((lanes & 8388480) === lanes) break; + if ((lanes & 4194240) === lanes) break; didTimeout = root.eventTimes; for (originallyAttemptedLanes = -1; 0 < lanes; ) (errorRetryLanes$236 = 31 - clz32(lanes)), @@ -13979,7 +13971,7 @@ function performSyncWorkOnRoot(root) { if (0 !== (executionContext & 6)) throw Error(formatProdErrorMessage(327)); flushPassiveEffects(); var lanes = getNextLanes(root, 0); - if (0 === (lanes & 3)) return ensureRootIsScheduled(root, now()), null; + if (0 === (lanes & 1)) return ensureRootIsScheduled(root, now()), null; var exitStatus = renderRootSync(root, lanes); if (0 !== root.tag && 2 === exitStatus) { var originallyAttemptedLanes = lanes, @@ -14039,7 +14031,7 @@ function flushSync(fn) { try { if ( ((ReactCurrentBatchConfig$3.transition = null), - (currentUpdatePriority = 2), + (currentUpdatePriority = 1), fn) ) return fn(); @@ -14093,11 +14085,9 @@ function handleThrow(root, thrownValue) { : 3; } else workInProgressSuspendedReason = - thrownValue === SelectiveHydrationException - ? 6 - : null !== thrownValue && - "object" === typeof thrownValue && - "function" === typeof thrownValue.then + null !== thrownValue && + "object" === typeof thrownValue && + "function" === typeof thrownValue.then ? 4 : 1; workInProgressThrownValue = thrownValue; @@ -14129,7 +14119,7 @@ function handleThrow(root, thrownValue) { } function shouldAttemptToSuspendUntilDataResolves() { if ( - (workInProgressRootRenderLanes & 125829120) === + (workInProgressRootRenderLanes & 130023424) === workInProgressRootRenderLanes ) return !0; @@ -14139,7 +14129,7 @@ function shouldAttemptToSuspendUntilDataResolves() { ) return !1; if ( - (workInProgressRootRenderLanes & 8388480) === + (workInProgressRootRenderLanes & 4194240) === workInProgressRootRenderLanes ) { var suspenseHandler = suspenseHandlerStackCursor.current; @@ -14192,23 +14182,15 @@ function renderRootSync(root, lanes) { prepareFreshStack(root, lanes); } enableSchedulingProfiler && markRenderStarted(lanes); - a: do + do try { - if (0 !== workInProgressSuspendedReason && null !== workInProgress) - switch ( - ((lanes = workInProgress), - (memoizedUpdaters = workInProgressThrownValue), - workInProgressSuspendedReason) - ) { - case 6: - workInProgress = null; - workInProgressRootExitStatus = 6; - break a; - default: - (workInProgressSuspendedReason = 0), - (workInProgressThrownValue = null), - unwindSuspendedUnitOfWork(lanes, memoizedUpdaters); - } + 0 !== workInProgressSuspendedReason && + null !== workInProgress && + ((lanes = workInProgress), + (memoizedUpdaters = workInProgressThrownValue), + (workInProgressSuspendedReason = 0), + (workInProgressThrownValue = null), + unwindSuspendedUnitOfWork(lanes, memoizedUpdaters)); workLoopSync(); break; } catch (thrownValue$239) { @@ -14291,10 +14273,6 @@ function renderRootConcurrent(root, lanes) { workInProgressThrownValue = null; unwindSuspendedUnitOfWork(lanes, memoizedUpdaters); break; - case 6: - workInProgress = null; - workInProgressRootExitStatus = 6; - break a; default: throw Error(formatProdErrorMessage(462)); } @@ -14604,7 +14582,7 @@ function commitRoot(root, recoverableErrors, transitions) { prevTransition = ReactCurrentBatchConfig$3.transition; try { (ReactCurrentBatchConfig$3.transition = null), - (currentUpdatePriority = 2), + (currentUpdatePriority = 1), commitRootImpl( root, recoverableErrors, @@ -14661,7 +14639,7 @@ function commitRootImpl( transitions = ReactCurrentBatchConfig$3.transition; ReactCurrentBatchConfig$3.transition = null; var previousPriority = currentUpdatePriority; - currentUpdatePriority = 2; + currentUpdatePriority = 1; var prevExecutionContext = executionContext; executionContext |= 4; ReactCurrentOwner$2.current = null; @@ -14726,11 +14704,11 @@ function commitRootImpl( (root = firstUncaughtError), (firstUncaughtError = null), root); - 0 !== (pendingPassiveEffectsLanes & 3) && + 0 !== (pendingPassiveEffectsLanes & 1) && 0 !== root.tag && flushPassiveEffects(); remainingLanes = root.pendingLanes; - 0 !== (remainingLanes & 3) + 0 !== (remainingLanes & 1) ? ((nestedUpdateScheduled = !0), root === rootWithNestedUpdates ? nestedUpdateCount++ @@ -14769,7 +14747,7 @@ function flushPassiveEffects() { remainingLanes = pendingPassiveEffectsRemainingLanes; pendingPassiveEffectsRemainingLanes = 0; var renderPriority = lanesToEventPriority(pendingPassiveEffectsLanes); - renderPriority = 32 > renderPriority ? 32 : renderPriority; + renderPriority = 16 > renderPriority ? 16 : renderPriority; var prevTransition = ReactCurrentBatchConfig$3.transition, previousPriority = currentUpdatePriority; try { @@ -14851,11 +14829,11 @@ function flushPassiveEffectsImpl() { } function captureCommitPhaseErrorOnRoot(rootFiber, sourceFiber, error) { sourceFiber = createCapturedValueAtFiber(error, sourceFiber); - sourceFiber = createRootErrorUpdate(rootFiber, sourceFiber, 2); - rootFiber = enqueueUpdate$1(rootFiber, sourceFiber, 2); + sourceFiber = createRootErrorUpdate(rootFiber, sourceFiber, 1); + rootFiber = enqueueUpdate$1(rootFiber, sourceFiber, 1); sourceFiber = requestEventTime(); null !== rootFiber && - (markRootUpdated(rootFiber, 2, sourceFiber), + (markRootUpdated(rootFiber, 1, sourceFiber), ensureRootIsScheduled(rootFiber, sourceFiber)); } function captureCommitPhaseError(sourceFiber, nearestMountedAncestor, error) { @@ -14889,16 +14867,16 @@ function captureCommitPhaseError(sourceFiber, nearestMountedAncestor, error) { sourceFiber = createClassErrorUpdate( nearestMountedAncestor, sourceFiber, - 2 + 1 ); nearestMountedAncestor = enqueueUpdate$1( nearestMountedAncestor, sourceFiber, - 2 + 1 ); sourceFiber = requestEventTime(); null !== nearestMountedAncestor && - (markRootUpdated(nearestMountedAncestor, 2, sourceFiber), + (markRootUpdated(nearestMountedAncestor, 1, sourceFiber), ensureRootIsScheduled(nearestMountedAncestor, sourceFiber)); break; } @@ -14932,7 +14910,7 @@ function pingSuspendedRoot(root, wakeable, pingedLanes) { (workInProgressRootRenderLanes & pingedLanes) === pingedLanes && (4 === workInProgressRootExitStatus || (3 === workInProgressRootExitStatus && - (workInProgressRootRenderLanes & 125829120) === + (workInProgressRootRenderLanes & 130023424) === workInProgressRootRenderLanes && 500 > now() - globalMostRecentFallbackTime) ? prepareFreshStack(root, 0) @@ -14942,10 +14920,10 @@ function pingSuspendedRoot(root, wakeable, pingedLanes) { function retryTimedOutBoundary(boundaryFiber, retryLane) { 0 === retryLane && (0 === (boundaryFiber.mode & 1) - ? (retryLane = 2) + ? (retryLane = 1) : ((retryLane = nextRetryLane), (nextRetryLane <<= 1), - 0 === (nextRetryLane & 125829120) && (nextRetryLane = 8388608))); + 0 === (nextRetryLane & 130023424) && (nextRetryLane = 4194304))); var eventTime = requestEventTime(); boundaryFiber = enqueueConcurrentRenderForLane(boundaryFiber, retryLane); null !== boundaryFiber && @@ -16227,7 +16205,7 @@ _attemptSynchronousHydration = function(fiber) { if (root$248.current.memoizedState.isDehydrated) { var lanes = getHighestPriorityLanes(root$248.pendingLanes); 0 !== lanes && - (markRootEntangled(root$248, lanes | 2), + (markRootEntangled(root$248, lanes | 1), ensureRootIsScheduled(root$248, now()), 0 === (executionContext & 6) && (resetRenderTimer(), flushSyncCallbacks())); @@ -16235,23 +16213,23 @@ _attemptSynchronousHydration = function(fiber) { break; case 13: flushSync(function() { - var root = enqueueConcurrentRenderForLane(fiber, 2); + var root = enqueueConcurrentRenderForLane(fiber, 1); if (null !== root) { var eventTime = requestEventTime(); - scheduleUpdateOnFiber(root, fiber, 2, eventTime); + scheduleUpdateOnFiber(root, fiber, 1, eventTime); } }), - markRetryLaneIfNotHydrated(fiber, 2); + markRetryLaneIfNotHydrated(fiber, 1); } }; attemptDiscreteHydration = function(fiber) { if (13 === fiber.tag) { - var root = enqueueConcurrentRenderForLane(fiber, 2); + var root = enqueueConcurrentRenderForLane(fiber, 1); if (null !== root) { var eventTime = requestEventTime(); - scheduleUpdateOnFiber(root, fiber, 2, eventTime); + scheduleUpdateOnFiber(root, fiber, 1, eventTime); } - markRetryLaneIfNotHydrated(fiber, 2); + markRetryLaneIfNotHydrated(fiber, 1); } }; attemptContinuousHydration = function(fiber) { @@ -16321,7 +16299,7 @@ Internals.Events = [ var devToolsConfig$jscomp$inline_1847 = { findFiberByHostInstance: getClosestInstanceFromNode, bundleType: 0, - version: "18.3.0-www-classic-2ccfa657d-20221205", + version: "18.3.0-www-classic-d807eb52c-20221205", rendererPackageName: "react-dom" }; (function(internals) { @@ -16365,7 +16343,7 @@ var devToolsConfig$jscomp$inline_1847 = { scheduleRoot: null, setRefreshHandler: null, getCurrentFiber: null, - reconcilerVersion: "18.3.0-next-2ccfa657d-20221205" + reconcilerVersion: "18.3.0-next-d807eb52c-20221205" }); assign(Internals, { ReactBrowserEventEmitter: { @@ -16566,7 +16544,7 @@ exports.unstable_flushControlled = function(fn) { previousPriority = currentUpdatePriority; try { (ReactCurrentBatchConfig$3.transition = null), - (currentUpdatePriority = 2), + (currentUpdatePriority = 1), fn(); } finally { (currentUpdatePriority = previousPriority), @@ -16594,7 +16572,7 @@ exports.unstable_renderSubtreeIntoContainer = function( ); }; exports.unstable_runWithPriority = runWithPriority; -exports.version = "18.3.0-next-2ccfa657d-20221205"; +exports.version = "18.3.0-next-d807eb52c-20221205"; /* global __REACT_DEVTOOLS_GLOBAL_HOOK__ */ if ( diff --git a/compiled/facebook-www/ReactDOM-profiling.modern.js b/compiled/facebook-www/ReactDOM-profiling.modern.js index bf639d15ddcca..833bd64a0684d 100644 --- a/compiled/facebook-www/ReactDOM-profiling.modern.js +++ b/compiled/facebook-www/ReactDOM-profiling.modern.js @@ -1291,13 +1291,13 @@ function onCommitRoot(root, eventPriority) { try { var didError = 64 === (root.current.flags & 64); switch (eventPriority) { - case 2: + case 1: var schedulerPriority = ImmediatePriority; break; - case 8: + case 4: schedulerPriority = UserBlockingPriority; break; - case 32: + case 16: schedulerPriority = NormalPriority; break; case 536870912: @@ -1387,23 +1387,22 @@ function clz32Fallback(x) { } function getLabelForLane(lane) { if (enableSchedulingProfiler) { - if (lane & 1) return "SyncHydrationLane"; - if (lane & 2) return "Sync"; - if (lane & 4) return "InputContinuousHydration"; - if (lane & 8) return "InputContinuous"; - if (lane & 16) return "DefaultHydration"; - if (lane & 32) return "Default"; - if (lane & 64) return "TransitionHydration"; - if (lane & 8388480) return "Transition"; - if (lane & 125829120) return "Retry"; + if (lane & 1) return "Sync"; + if (lane & 2) return "InputContinuousHydration"; + if (lane & 4) return "InputContinuous"; + if (lane & 8) return "DefaultHydration"; + if (lane & 16) return "Default"; + if (lane & 32) return "TransitionHydration"; + if (lane & 4194240) return "Transition"; + if (lane & 130023424) return "Retry"; if (lane & 134217728) return "SelectiveHydration"; if (lane & 268435456) return "IdleHydration"; if (lane & 536870912) return "Idle"; if (lane & 1073741824) return "Offscreen"; } } -var nextTransitionLane = 128, - nextRetryLane = 8388608; +var nextTransitionLane = 64, + nextRetryLane = 4194304; function getHighestPriorityLanes(lanes) { switch (lanes & -lanes) { case 1: @@ -1419,7 +1418,6 @@ function getHighestPriorityLanes(lanes) { case 32: return 32; case 64: - return 64; case 128: case 256: case 512: @@ -1435,13 +1433,13 @@ function getHighestPriorityLanes(lanes) { case 524288: case 1048576: case 2097152: + return lanes & 4194240; case 4194304: - return lanes & 8388480; case 8388608: case 16777216: case 33554432: case 67108864: - return lanes & 125829120; + return lanes & 130023424; case 134217728: return 134217728; case 268435456: @@ -1482,12 +1480,12 @@ function getNextLanes(root, wipLanes) { ((suspendedLanes = nextLanes & -nextLanes), (pingedLanes = wipLanes & -wipLanes), suspendedLanes >= pingedLanes || - (32 === suspendedLanes && 0 !== (pingedLanes & 8388480))) + (16 === suspendedLanes && 0 !== (pingedLanes & 4194240))) ) return wipLanes; 0 === (root.current.mode & 32) && - 0 !== (nextLanes & 8) && - (nextLanes |= pendingLanes & 32); + 0 !== (nextLanes & 4) && + (nextLanes |= pendingLanes & 16); wipLanes = root.entangledLanes; if (0 !== wipLanes) for (root = root.entanglements, wipLanes &= nextLanes; 0 < wipLanes; ) @@ -1502,8 +1500,8 @@ function computeExpirationTime(lane, currentTime) { case 1: case 2: case 4: - case 8: return currentTime + 250; + case 8: case 16: case 32: case 64: @@ -1522,8 +1520,8 @@ function computeExpirationTime(lane, currentTime) { case 524288: case 1048576: case 2097152: - case 4194304: return currentTime + 5e3; + case 4194304: case 8388608: case 16777216: case 33554432: @@ -1543,7 +1541,7 @@ function markStarvedLanesAsExpired(root, currentTime) { var suspendedLanes = root.suspendedLanes, pingedLanes = root.pingedLanes, expirationTimes = root.expirationTimes, - lanes = root.pendingLanes & -125829121; + lanes = root.pendingLanes & -130023425; 0 < lanes; ) { @@ -1563,12 +1561,12 @@ function getLanesToRetrySynchronouslyOnError(root, originallyAttemptedLanes) { return 0 !== root ? root : root & 1073741824 ? 1073741824 : 0; } function includesBlockingLane(root, lanes) { - return 0 !== (root.current.mode & 32) ? !1 : 0 !== (lanes & 60); + return 0 !== (root.current.mode & 32) ? !1 : 0 !== (lanes & 30); } function claimNextTransitionLane() { var lane = nextTransitionLane; nextTransitionLane <<= 1; - 0 === (nextTransitionLane & 8388480) && (nextTransitionLane = 128); + 0 === (nextTransitionLane & 4194240) && (nextTransitionLane = 64); return lane; } function createLaneMap(initial) { @@ -1689,13 +1687,13 @@ function runWithPriority(priority, fn) { } function lanesToEventPriority(lanes) { lanes &= -lanes; - return 2 < lanes - ? 8 < lanes + return 1 < lanes + ? 4 < lanes ? 0 !== (lanes & 268435455) - ? 32 + ? 16 : 536870912 - : 8 - : 2; + : 4 + : 1; } var _attemptSynchronousHydration, attemptDiscreteHydration, @@ -2064,10 +2062,10 @@ function createEventListenerWrapperWithPriority( eventSystemFlags ) { switch (getEventPriority(domEventName)) { - case 2: + case 1: var listenerWrapper = dispatchDiscreteEvent; break; - case 8: + case 4: listenerWrapper = dispatchContinuousEvent; break; default: @@ -2090,7 +2088,7 @@ function dispatchDiscreteEvent( prevTransition = ReactCurrentBatchConfig.transition; ReactCurrentBatchConfig.transition = null; try { - (currentUpdatePriority = 2), + (currentUpdatePriority = 1), dispatchEvent(domEventName, eventSystemFlags, container, nativeEvent); } finally { (currentUpdatePriority = previousPriority), @@ -2107,7 +2105,7 @@ function dispatchContinuousEvent( prevTransition = ReactCurrentBatchConfig.transition; ReactCurrentBatchConfig.transition = null; try { - (currentUpdatePriority = 8), + (currentUpdatePriority = 4), dispatchEvent(domEventName, eventSystemFlags, container, nativeEvent); } finally { (currentUpdatePriority = previousPriority), @@ -2329,7 +2327,7 @@ function getEventPriority(domEventName) { case "popstate": case "select": case "selectstart": - return 2; + return 1; case "drag": case "dragenter": case "dragexit": @@ -2349,23 +2347,23 @@ function getEventPriority(domEventName) { case "mouseleave": case "pointerenter": case "pointerleave": - return 8; + return 4; case "message": switch (getCurrentPriorityLevel()) { case ImmediatePriority: - return 2; + return 1; case UserBlockingPriority: - return 8; + return 4; case NormalPriority: case LowPriority: - return 32; + return 16; case IdlePriority: return 536870912; default: - return 32; + return 16; } default: - return 32; + return 16; } } function addEventBubbleListener(target, eventType, listener) { @@ -5325,7 +5323,7 @@ function flushSyncCallbacks() { previousUpdatePriority = currentUpdatePriority; try { var queue = syncQueue; - for (currentUpdatePriority = 2; i < queue.length; i++) { + for (currentUpdatePriority = 1; i < queue.length; i++) { var callback = queue[i]; do callback = callback(!0); while (null !== callback); @@ -5819,7 +5817,7 @@ function enqueueUpdate$1(fiber, update, lane) { } function entangleTransitions(root, fiber, lane) { fiber = fiber.updateQueue; - if (null !== fiber && ((fiber = fiber.shared), 0 !== (lane & 8388480))) { + if (null !== fiber && ((fiber = fiber.shared), 0 !== (lane & 4194240))) { var queueLanes = fiber.lanes; queueLanes &= root.pendingLanes; lane |= queueLanes; @@ -7293,8 +7291,8 @@ function checkIfSnapshotChanged(inst) { } } function forceStoreRerender(fiber) { - var root = enqueueConcurrentRenderForLane(fiber, 2); - null !== root && scheduleUpdateOnFiber(root, fiber, 2, -1); + var root = enqueueConcurrentRenderForLane(fiber, 1); + null !== root && scheduleUpdateOnFiber(root, fiber, 1, -1); } function mountState(initialState) { var hook = mountWorkInProgressHook(); @@ -7445,7 +7443,7 @@ function updateMemo(nextCreate, deps) { return nextCreate; } function updateDeferredValueImpl(hook, prevValue, value) { - if (0 === (renderLanes & 42)) + if (0 === (renderLanes & 21)) return ( hook.baseState && ((hook.baseState = !1), (didReceiveUpdate = !0)), (hook.memoizedState = value) @@ -7460,7 +7458,7 @@ function updateDeferredValueImpl(hook, prevValue, value) { function startTransition(setPending, callback, options) { var previousPriority = currentUpdatePriority; currentUpdatePriority = - 0 !== previousPriority && 8 > previousPriority ? previousPriority : 8; + 0 !== previousPriority && 4 > previousPriority ? previousPriority : 4; setPending(!0); var prevTransition = ReactCurrentBatchConfig$1.transition; ReactCurrentBatchConfig$1.transition = {}; @@ -7581,7 +7579,7 @@ function enqueueRenderPhaseUpdate(queue, update) { queue.pending = update; } function entangleTransitionUpdate(root, queue, lane) { - if (0 !== (lane & 8388480)) { + if (0 !== (lane & 4194240)) { var queueLanes = queue.lanes; queueLanes &= root.pendingLanes; lane |= queueLanes; @@ -8158,10 +8156,10 @@ function markSuspenseBoundaryShouldCapture( 1 === sourceFiber.tag && (null === sourceFiber.alternate ? (sourceFiber.tag = 17) - : ((returnFiber = createUpdate(-1, 2)), + : ((returnFiber = createUpdate(-1, 1)), (returnFiber.tag = 2), - enqueueUpdate$1(sourceFiber, returnFiber, 2))), - (sourceFiber.lanes |= 2)), + enqueueUpdate$1(sourceFiber, returnFiber, 1))), + (sourceFiber.lanes |= 1)), suspenseBoundary ); suspenseBoundary.flags |= 32768; @@ -8306,7 +8304,6 @@ function pushMarkerInstance(workInProgress, markerInstance) { )); } var ReactCurrentOwner$1 = ReactSharedInternals.ReactCurrentOwner, - SelectiveHydrationException = Error(formatProdErrorMessage(461)), didReceiveUpdate = !1; function reconcileChildren(current, workInProgress, nextChildren, renderLanes) { workInProgress.child = @@ -8870,9 +8867,9 @@ function updateSuspenseComponent(current, workInProgress, renderLanes) { ) return ( 0 === (workInProgress.mode & 1) - ? (workInProgress.lanes = 2) + ? (workInProgress.lanes = 1) : "$!" === current.data - ? (workInProgress.lanes = 16) + ? (workInProgress.lanes = 8) : (workInProgress.lanes = 1073741824), null ); @@ -8924,7 +8921,7 @@ function updateSuspenseComponent(current, workInProgress, renderLanes) { renderLanes )), (workInProgress.memoizedState = SUSPENDED_MARKER), - (workInProgress.lanes = 8388608), + (workInProgress.lanes = 4194304), current ); pushPrimaryTreeSuspenseHandler(workInProgress); @@ -9189,15 +9186,13 @@ function updateDehydratedSuspenseComponent( nextProps = workInProgressRoot; if (null !== nextProps) { switch (renderLanes & -renderLanes) { - case 2: - suspenseInstance = 1; - break; - case 8: - suspenseInstance = 4; + case 4: + suspenseInstance = 2; break; - case 32: - suspenseInstance = 16; + case 16: + suspenseInstance = 8; break; + case 64: case 128: case 256: case 512: @@ -9218,7 +9213,7 @@ function updateDehydratedSuspenseComponent( case 16777216: case 33554432: case 67108864: - suspenseInstance = 64; + suspenseInstance = 32; break; case 536870912: suspenseInstance = 268435456; @@ -9230,14 +9225,11 @@ function updateDehydratedSuspenseComponent( 0 !== (suspenseInstance & (nextProps.suspendedLanes | renderLanes)) ? 0 : suspenseInstance; - if ( - 0 !== suspenseInstance && - suspenseInstance !== suspenseState.retryLane - ) - throw ((suspenseState.retryLane = suspenseInstance), + 0 !== suspenseInstance && + suspenseInstance !== suspenseState.retryLane && + ((suspenseState.retryLane = suspenseInstance), enqueueConcurrentRenderForLane(current, suspenseInstance), - scheduleUpdateOnFiber(nextProps, current, suspenseInstance, -1), - SelectiveHydrationException); + scheduleUpdateOnFiber(nextProps, current, suspenseInstance, -1)); } renderDidSuspendDelayIfPossible(); return retrySuspenseComponentWithoutHydrating( @@ -10547,7 +10539,7 @@ function completeWork(current, workInProgress, renderLanes) { ((workInProgress.flags |= 64), (newProps = !0), cutOffTailIfNeeded(type, !1), - (workInProgress.lanes = 8388608)); + (workInProgress.lanes = 4194304)); } else { if (!newProps) @@ -10576,7 +10568,7 @@ function completeWork(current, workInProgress, renderLanes) { ((workInProgress.flags |= 64), (newProps = !0), cutOffTailIfNeeded(type, !1), - (workInProgress.lanes = 8388608)); + (workInProgress.lanes = 4194304)); type.isBackwards ? ((JSCompiler_inline_result.sibling = workInProgress.child), (workInProgress.child = JSCompiler_inline_result)) @@ -13365,7 +13357,7 @@ function requestEventTime() { : (currentEventTime = now()); } function requestUpdateLane(fiber) { - if (0 === (fiber.mode & 1)) return 2; + if (0 === (fiber.mode & 1)) return 1; if ( !deferRenderPhaseUpdateToNextBatch && 0 !== (executionContext & 2) && @@ -13381,7 +13373,7 @@ function requestUpdateLane(fiber) { fiber = currentUpdatePriority; if (0 !== fiber) return fiber; fiber = window.event; - fiber = void 0 === fiber ? 32 : getEventPriority(fiber.type); + fiber = void 0 === fiber ? 16 : getEventPriority(fiber.type); return fiber; } function scheduleUpdateOnFiber(root, fiber, lane, eventTime) { @@ -13430,7 +13422,7 @@ function scheduleUpdateOnFiber(root, fiber, lane, eventTime) { markRootSuspended$1(root, workInProgressRootRenderLanes); } ensureRootIsScheduled(root, eventTime); - 2 === lane && + 1 === lane && 0 === executionContext && 0 === (fiber.mode & 1) && (resetRenderTimer(), includesLegacySyncCallbacks && flushSyncCallbacks()); @@ -13452,7 +13444,7 @@ function ensureRootIsScheduled(root, currentTime) { root.callbackPriority !== currentTime) ) { null != existingCallbackNode && cancelCallback(existingCallbackNode); - if (0 !== (currentTime & 3)) + if (1 === currentTime) 0 === root.tag ? scheduleLegacySyncCallback(performSyncWorkOnRoot.bind(null, root)) : scheduleSyncCallback(performSyncWorkOnRoot.bind(null, root)), @@ -13462,13 +13454,13 @@ function ensureRootIsScheduled(root, currentTime) { (existingCallbackNode = null); else { switch (lanesToEventPriority(nextLanes)) { - case 2: + case 1: existingCallbackNode = ImmediatePriority; break; - case 8: + case 4: existingCallbackNode = UserBlockingPriority; break; - case 32: + case 16: existingCallbackNode = NormalPriority; break; case 536870912: @@ -13572,7 +13564,7 @@ function performConcurrentWorkOnRoot(root, didTimeout) { case 3: markRootSuspended$1(root, lanes); if ( - (lanes & 125829120) === lanes && + (lanes & 130023424) === lanes && ((didTimeout = globalMostRecentFallbackTime + 500 - now()), 10 < didTimeout) ) { @@ -13603,7 +13595,7 @@ function performConcurrentWorkOnRoot(root, didTimeout) { break; case 4: markRootSuspended$1(root, lanes); - if ((lanes & 8388480) === lanes) break; + if ((lanes & 4194240) === lanes) break; didTimeout = root.eventTimes; for (originallyAttemptedLanes = -1; 0 < lanes; ) (errorRetryLanes$237 = 31 - clz32(lanes)), @@ -13747,7 +13739,7 @@ function performSyncWorkOnRoot(root) { if (0 !== (executionContext & 6)) throw Error(formatProdErrorMessage(327)); flushPassiveEffects(); var lanes = getNextLanes(root, 0); - if (0 === (lanes & 3)) return ensureRootIsScheduled(root, now()), null; + if (0 === (lanes & 1)) return ensureRootIsScheduled(root, now()), null; var exitStatus = renderRootSync(root, lanes); if (0 !== root.tag && 2 === exitStatus) { var originallyAttemptedLanes = lanes, @@ -13807,7 +13799,7 @@ function flushSync(fn) { try { if ( ((ReactCurrentBatchConfig$3.transition = null), - (currentUpdatePriority = 2), + (currentUpdatePriority = 1), fn) ) return fn(); @@ -13861,11 +13853,9 @@ function handleThrow(root, thrownValue) { : 3; } else workInProgressSuspendedReason = - thrownValue === SelectiveHydrationException - ? 6 - : null !== thrownValue && - "object" === typeof thrownValue && - "function" === typeof thrownValue.then + null !== thrownValue && + "object" === typeof thrownValue && + "function" === typeof thrownValue.then ? 4 : 1; workInProgressThrownValue = thrownValue; @@ -13897,7 +13887,7 @@ function handleThrow(root, thrownValue) { } function shouldAttemptToSuspendUntilDataResolves() { if ( - (workInProgressRootRenderLanes & 125829120) === + (workInProgressRootRenderLanes & 130023424) === workInProgressRootRenderLanes ) return !0; @@ -13907,7 +13897,7 @@ function shouldAttemptToSuspendUntilDataResolves() { ) return !1; if ( - (workInProgressRootRenderLanes & 8388480) === + (workInProgressRootRenderLanes & 4194240) === workInProgressRootRenderLanes ) { var suspenseHandler = suspenseHandlerStackCursor.current; @@ -13960,23 +13950,15 @@ function renderRootSync(root, lanes) { prepareFreshStack(root, lanes); } enableSchedulingProfiler && markRenderStarted(lanes); - a: do + do try { - if (0 !== workInProgressSuspendedReason && null !== workInProgress) - switch ( - ((lanes = workInProgress), - (memoizedUpdaters = workInProgressThrownValue), - workInProgressSuspendedReason) - ) { - case 6: - workInProgress = null; - workInProgressRootExitStatus = 6; - break a; - default: - (workInProgressSuspendedReason = 0), - (workInProgressThrownValue = null), - unwindSuspendedUnitOfWork(lanes, memoizedUpdaters); - } + 0 !== workInProgressSuspendedReason && + null !== workInProgress && + ((lanes = workInProgress), + (memoizedUpdaters = workInProgressThrownValue), + (workInProgressSuspendedReason = 0), + (workInProgressThrownValue = null), + unwindSuspendedUnitOfWork(lanes, memoizedUpdaters)); workLoopSync(); break; } catch (thrownValue$240) { @@ -14059,10 +14041,6 @@ function renderRootConcurrent(root, lanes) { workInProgressThrownValue = null; unwindSuspendedUnitOfWork(lanes, memoizedUpdaters); break; - case 6: - workInProgress = null; - workInProgressRootExitStatus = 6; - break a; default: throw Error(formatProdErrorMessage(462)); } @@ -14372,7 +14350,7 @@ function commitRoot(root, recoverableErrors, transitions) { prevTransition = ReactCurrentBatchConfig$3.transition; try { (ReactCurrentBatchConfig$3.transition = null), - (currentUpdatePriority = 2), + (currentUpdatePriority = 1), commitRootImpl( root, recoverableErrors, @@ -14429,7 +14407,7 @@ function commitRootImpl( transitions = ReactCurrentBatchConfig$3.transition; ReactCurrentBatchConfig$3.transition = null; var previousPriority = currentUpdatePriority; - currentUpdatePriority = 2; + currentUpdatePriority = 1; var prevExecutionContext = executionContext; executionContext |= 4; ReactCurrentOwner$2.current = null; @@ -14494,11 +14472,11 @@ function commitRootImpl( (root = firstUncaughtError), (firstUncaughtError = null), root); - 0 !== (pendingPassiveEffectsLanes & 3) && + 0 !== (pendingPassiveEffectsLanes & 1) && 0 !== root.tag && flushPassiveEffects(); remainingLanes = root.pendingLanes; - 0 !== (remainingLanes & 3) + 0 !== (remainingLanes & 1) ? ((nestedUpdateScheduled = !0), root === rootWithNestedUpdates ? nestedUpdateCount++ @@ -14537,7 +14515,7 @@ function flushPassiveEffects() { remainingLanes = pendingPassiveEffectsRemainingLanes; pendingPassiveEffectsRemainingLanes = 0; var renderPriority = lanesToEventPriority(pendingPassiveEffectsLanes); - renderPriority = 32 > renderPriority ? 32 : renderPriority; + renderPriority = 16 > renderPriority ? 16 : renderPriority; var prevTransition = ReactCurrentBatchConfig$3.transition, previousPriority = currentUpdatePriority; try { @@ -14619,11 +14597,11 @@ function flushPassiveEffectsImpl() { } function captureCommitPhaseErrorOnRoot(rootFiber, sourceFiber, error) { sourceFiber = createCapturedValueAtFiber(error, sourceFiber); - sourceFiber = createRootErrorUpdate(rootFiber, sourceFiber, 2); - rootFiber = enqueueUpdate$1(rootFiber, sourceFiber, 2); + sourceFiber = createRootErrorUpdate(rootFiber, sourceFiber, 1); + rootFiber = enqueueUpdate$1(rootFiber, sourceFiber, 1); sourceFiber = requestEventTime(); null !== rootFiber && - (markRootUpdated(rootFiber, 2, sourceFiber), + (markRootUpdated(rootFiber, 1, sourceFiber), ensureRootIsScheduled(rootFiber, sourceFiber)); } function captureCommitPhaseError(sourceFiber, nearestMountedAncestor, error) { @@ -14657,16 +14635,16 @@ function captureCommitPhaseError(sourceFiber, nearestMountedAncestor, error) { sourceFiber = createClassErrorUpdate( nearestMountedAncestor, sourceFiber, - 2 + 1 ); nearestMountedAncestor = enqueueUpdate$1( nearestMountedAncestor, sourceFiber, - 2 + 1 ); sourceFiber = requestEventTime(); null !== nearestMountedAncestor && - (markRootUpdated(nearestMountedAncestor, 2, sourceFiber), + (markRootUpdated(nearestMountedAncestor, 1, sourceFiber), ensureRootIsScheduled(nearestMountedAncestor, sourceFiber)); break; } @@ -14700,7 +14678,7 @@ function pingSuspendedRoot(root, wakeable, pingedLanes) { (workInProgressRootRenderLanes & pingedLanes) === pingedLanes && (4 === workInProgressRootExitStatus || (3 === workInProgressRootExitStatus && - (workInProgressRootRenderLanes & 125829120) === + (workInProgressRootRenderLanes & 130023424) === workInProgressRootRenderLanes && 500 > now() - globalMostRecentFallbackTime) ? prepareFreshStack(root, 0) @@ -14710,10 +14688,10 @@ function pingSuspendedRoot(root, wakeable, pingedLanes) { function retryTimedOutBoundary(boundaryFiber, retryLane) { 0 === retryLane && (0 === (boundaryFiber.mode & 1) - ? (retryLane = 2) + ? (retryLane = 1) : ((retryLane = nextRetryLane), (nextRetryLane <<= 1), - 0 === (nextRetryLane & 125829120) && (nextRetryLane = 8388608))); + 0 === (nextRetryLane & 130023424) && (nextRetryLane = 4194304))); var eventTime = requestEventTime(); boundaryFiber = enqueueConcurrentRenderForLane(boundaryFiber, retryLane); null !== boundaryFiber && @@ -15778,7 +15756,7 @@ _attemptSynchronousHydration = function(fiber) { if (root$249.current.memoizedState.isDehydrated) { var lanes = getHighestPriorityLanes(root$249.pendingLanes); 0 !== lanes && - (markRootEntangled(root$249, lanes | 2), + (markRootEntangled(root$249, lanes | 1), ensureRootIsScheduled(root$249, now()), 0 === (executionContext & 6) && (resetRenderTimer(), flushSyncCallbacks())); @@ -15786,23 +15764,23 @@ _attemptSynchronousHydration = function(fiber) { break; case 13: flushSync(function() { - var root = enqueueConcurrentRenderForLane(fiber, 2); + var root = enqueueConcurrentRenderForLane(fiber, 1); if (null !== root) { var eventTime = requestEventTime(); - scheduleUpdateOnFiber(root, fiber, 2, eventTime); + scheduleUpdateOnFiber(root, fiber, 1, eventTime); } }), - markRetryLaneIfNotHydrated(fiber, 2); + markRetryLaneIfNotHydrated(fiber, 1); } }; attemptDiscreteHydration = function(fiber) { if (13 === fiber.tag) { - var root = enqueueConcurrentRenderForLane(fiber, 2); + var root = enqueueConcurrentRenderForLane(fiber, 1); if (null !== root) { var eventTime = requestEventTime(); - scheduleUpdateOnFiber(root, fiber, 2, eventTime); + scheduleUpdateOnFiber(root, fiber, 1, eventTime); } - markRetryLaneIfNotHydrated(fiber, 2); + markRetryLaneIfNotHydrated(fiber, 1); } }; attemptContinuousHydration = function(fiber) { @@ -15872,7 +15850,7 @@ Internals.Events = [ var devToolsConfig$jscomp$inline_1815 = { findFiberByHostInstance: getClosestInstanceFromNode, bundleType: 0, - version: "18.3.0-www-modern-2ccfa657d-20221205", + version: "18.3.0-www-modern-d807eb52c-20221205", rendererPackageName: "react-dom" }; (function(internals) { @@ -15917,7 +15895,7 @@ var devToolsConfig$jscomp$inline_1815 = { scheduleRoot: null, setRefreshHandler: null, getCurrentFiber: null, - reconcilerVersion: "18.3.0-next-2ccfa657d-20221205" + reconcilerVersion: "18.3.0-next-d807eb52c-20221205" }); exports.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED = Internals; exports.createPortal = function(children, container) { @@ -16082,7 +16060,7 @@ exports.unstable_flushControlled = function(fn) { previousPriority = currentUpdatePriority; try { (ReactCurrentBatchConfig$3.transition = null), - (currentUpdatePriority = 2), + (currentUpdatePriority = 1), fn(); } finally { (currentUpdatePriority = previousPriority), @@ -16092,7 +16070,7 @@ exports.unstable_flushControlled = function(fn) { } }; exports.unstable_runWithPriority = runWithPriority; -exports.version = "18.3.0-next-2ccfa657d-20221205"; +exports.version = "18.3.0-next-d807eb52c-20221205"; /* global __REACT_DEVTOOLS_GLOBAL_HOOK__ */ if ( diff --git a/compiled/facebook-www/ReactDOMForked-dev.classic.js b/compiled/facebook-www/ReactDOMForked-dev.classic.js index bacfe59a25887..3f115182f23f3 100644 --- a/compiled/facebook-www/ReactDOMForked-dev.classic.js +++ b/compiled/facebook-www/ReactDOMForked-dev.classic.js @@ -7984,91 +7984,91 @@ var NoLanes = var NoLane = /* */ 0; -var SyncHydrationLane = - /* */ - 1; var SyncLane = /* */ - 2; + 1; var InputContinuousHydrationLane = /* */ - 4; + 2; var InputContinuousLane = /* */ - 8; + 4; var DefaultHydrationLane = /* */ - 16; + 8; var DefaultLane = /* */ - 32; + 16; var TransitionHydrationLane = /* */ - 64; + 32; var TransitionLanes = /* */ - 8388480; + 4194240; var TransitionLane1 = /* */ - 128; + 64; var TransitionLane2 = /* */ - 256; + 128; var TransitionLane3 = /* */ - 512; + 256; var TransitionLane4 = /* */ - 1024; + 512; var TransitionLane5 = /* */ - 2048; + 1024; var TransitionLane6 = /* */ - 4096; + 2048; var TransitionLane7 = /* */ - 8192; + 4096; var TransitionLane8 = /* */ - 16384; + 8192; var TransitionLane9 = /* */ - 32768; + 16384; var TransitionLane10 = /* */ - 65536; + 32768; var TransitionLane11 = /* */ - 131072; + 65536; var TransitionLane12 = /* */ - 262144; + 131072; var TransitionLane13 = /* */ - 524288; + 262144; var TransitionLane14 = /* */ - 1048576; + 524288; var TransitionLane15 = /* */ - 2097152; + 1048576; var TransitionLane16 = /* */ - 4194304; + 2097152; var RetryLanes = /* */ - 125829120; + 130023424; var RetryLane1 = /* */ - 8388608; + 4194304; var RetryLane2 = /* */ - 16777216; + 8388608; var RetryLane3 = /* */ - 33554432; + 16777216; var RetryLane4 = + /* */ + 33554432; +var RetryLane5 = /* */ 67108864; var SomeRetryLane = RetryLane1; @@ -8091,10 +8091,6 @@ var OffscreenLane = function getLabelForLane(lane) { if (enableSchedulingProfiler) { - if (lane & SyncHydrationLane) { - return "SyncHydrationLane"; - } - if (lane & SyncLane) { return "Sync"; } @@ -8150,9 +8146,6 @@ var nextRetryLane = RetryLane1; function getHighestPriorityLanes(lanes) { switch (getHighestPriorityLane(lanes)) { - case SyncHydrationLane: - return SyncHydrationLane; - case SyncLane: return SyncLane; @@ -8193,6 +8186,7 @@ function getHighestPriorityLanes(lanes) { case RetryLane2: case RetryLane3: case RetryLane4: + case RetryLane5: return lanes & RetryLanes; case SelectiveHydrationLane: @@ -8353,7 +8347,6 @@ function getMostRecentEventTime(root, lanes) { function computeExpirationTime(lane, currentTime) { switch (lane) { - case SyncHydrationLane: case SyncLane: case InputContinuousHydrationLane: case InputContinuousLane: @@ -8393,6 +8386,7 @@ function computeExpirationTime(lane, currentTime) { case RetryLane2: case RetryLane3: case RetryLane4: + case RetryLane5: // TODO: Retries should be allowed to expire if they are CPU bound for // too long, but when I made this change it caused a spike in browser // crashes. There must be some other underlying bug; not super urgent but @@ -8480,9 +8474,6 @@ function getLanesToRetrySynchronouslyOnError(root, originallyAttemptedLanes) { return NoLanes; } -function includesSyncLane(lanes) { - return (lanes & (SyncLane | SyncHydrationLane)) !== NoLanes; -} function includesNonIdleWork(lanes) { return (lanes & NonIdleLanes) !== NoLanes; } @@ -8490,8 +8481,6 @@ function includesOnlyRetries(lanes) { return (lanes & RetryLanes) === lanes; } function includesOnlyNonUrgentLanes(lanes) { - // TODO: Should hydration lanes be included here? This function is only - // used in `updateDeferredValueImpl`. var UrgentLanes = SyncLane | InputContinuousLane | DefaultLane; return (lanes & UrgentLanes) === NoLanes; } @@ -8733,10 +8722,6 @@ function getBumpedLaneForHydration(root, renderLanes) { var lane; switch (renderLane) { - case SyncLane: - lane = SyncHydrationLane; - break; - case InputContinuousLane: lane = InputContinuousHydrationLane; break; @@ -8765,6 +8750,7 @@ function getBumpedLaneForHydration(root, renderLanes) { case RetryLane2: case RetryLane3: case RetryLane4: + case RetryLane5: lane = TransitionHydrationLane; break; @@ -27050,14 +27036,7 @@ function getMarkerInstances() { return null; } -var ReactCurrentOwner$1 = ReactSharedInternals.ReactCurrentOwner; // A special exception that's used to unwind the stack when an update flows -// into a dehydrated boundary. - -var SelectiveHydrationException = new Error( - "This is not a real error. It's an implementation detail of React's " + - "selective hydration feature. If this leaks into userspace, it's a bug in " + - "React. Please file an issue." -); +var ReactCurrentOwner$1 = ReactSharedInternals.ReactCurrentOwner; var didReceiveUpdate = false; var didWarnAboutBadClass; var didWarnAboutModulePatternComponent; @@ -29507,29 +29486,18 @@ function updateDehydratedSuspenseComponent( current, attemptHydrationAtLane, eventTime - ); // Throw a special object that signals to the work loop that it should - // interrupt the current render. - // - // Because we're inside a React-only execution stack, we don't - // strictly need to throw here — we could instead modify some internal - // work loop state. But using an exception means we don't need to - // check for this case on every iteration of the work loop. So doing - // it this way moves the check out of the fast path. - - throw SelectiveHydrationException; + ); } - } // If we did not selectively hydrate, we'll continue rendering without - // hydrating. Mark this tree as suspended to prevent it from committing - // outside a transition. - // - // This path should only happen if the hydration lane already suspended. - // Currently, it also happens during sync updates because there is no - // hydration lane for sync updates. + } // If we have scheduled higher pri work above, this will just abort the render + // since we now have higher priority work. We'll try to infinitely suspend until + // we yield. TODO: We could probably just force yielding earlier instead. + + renderDidSuspendDelayIfPossible(); // If we rendered synchronously, we won't yield so have to render something. + // This will cause us to delete any existing content. // TODO: We should ideally have a sync hydration lane that we can apply to do // a pass where we hydrate this subtree in place using the previous Context and then // reapply the update afterwards. - renderDidSuspendDelayIfPossible(); return retrySuspenseComponentWithoutHydrating( current, workInProgress, @@ -37802,8 +37770,7 @@ var SuspendedOnError = 1; var SuspendedOnData = 2; var SuspendedOnImmediate = 3; var SuspendedOnDeprecatedThrowPromise = 4; -var SuspendedAndReadyToUnwind = 5; -var SuspendedOnHydration = 6; // When this is true, the work-in-progress fiber just suspended (or errored) and +var SuspendedAndReadyToUnwind = 5; // When this is true, the work-in-progress fiber just suspended (or errored) and // we've yet to unwind the stack. In some cases, we may yield to the main thread // after this happens. If the fiber is pinged before we resume, we can retry // immediately instead of unwinding the stack. @@ -38339,7 +38306,7 @@ function ensureRootIsScheduled(root, currentTime) { // TODO: Temporary until we confirm this warning is not fired. if ( existingCallbackNode == null && - !includesSyncLane(existingCallbackPriority) + existingCallbackPriority !== SyncLane ) { error( "Expected scheduled callback to exist. This error is likely caused by a bug in React. Please file an issue." @@ -38357,7 +38324,7 @@ function ensureRootIsScheduled(root, currentTime) { var newCallbackNode; - if (includesSyncLane(newCallbackPriority)) { + if (newCallbackPriority === SyncLane) { // Special case: Sync React callbacks are scheduled on a special // internal queue if (root.tag === LegacyRoot) { @@ -38914,7 +38881,7 @@ function performSyncWorkOnRoot(root) { flushPassiveEffects(); var lanes = getNextLanes(root, NoLanes); - if (!includesSyncLane(lanes)) { + if (!includesSomeLane(lanes, SyncLane)) { // There's no remaining sync work left. ensureRootIsScheduled(root, now()); return null; @@ -39199,17 +39166,6 @@ function handleThrow(root, thrownValue) { workInProgressSuspendedReason = shouldAttemptToSuspendUntilDataResolves() ? SuspendedOnData : SuspendedOnImmediate; - } else if (thrownValue === SelectiveHydrationException) { - // An update flowed into a dehydrated boundary. Before we can apply the - // update, we need to finish hydrating. Interrupt the work-in-progress - // render so we can restart at the hydration lane. - // - // The ideal implementation would be able to switch contexts without - // unwinding the current stack. - // - // We could name this something more general but as of now it's the only - // case where we think this should happen. - workInProgressSuspendedReason = SuspendedOnHydration; } else { // This is a regular error. var isWakeable = @@ -39437,7 +39393,7 @@ function renderRootSync(root, lanes) { markRenderStarted(lanes); } - outer: do { + do { try { if ( workInProgressSuspendedReason !== NotSuspended && @@ -39453,25 +39409,9 @@ function renderRootSync(root, lanes) { // function and fork the behavior some other way. var unitOfWork = workInProgress; var thrownValue = workInProgressThrownValue; - - switch (workInProgressSuspendedReason) { - case SuspendedOnHydration: { - // Selective hydration. An update flowed into a dehydrated tree. - // Interrupt the current render so the work loop can switch to the - // hydration lane. - workInProgress = null; - workInProgressRootExitStatus = RootDidNotComplete; - break outer; - } - - default: { - // Continue with the normal work loop. - workInProgressSuspendedReason = NotSuspended; - workInProgressThrownValue = null; - unwindSuspendedUnitOfWork(unitOfWork, thrownValue); - break; - } - } + workInProgressSuspendedReason = NotSuspended; + workInProgressThrownValue = null; + unwindSuspendedUnitOfWork(unitOfWork, thrownValue); // Continue with the normal work loop. } workLoopSync(); @@ -39636,15 +39576,6 @@ function renderRootConcurrent(root, lanes) { break; } - case SuspendedOnHydration: { - // Selective hydration. An update flowed into a dehydrated tree. - // Interrupt the current render so the work loop can switch to the - // hydration lane. - workInProgress = null; - workInProgressRootExitStatus = RootDidNotComplete; - break outer; - } - default: { throw new Error( "Unexpected SuspendedReason. This is a bug in React." @@ -40299,13 +40230,16 @@ function commitRootImpl( // currently schedule the callback in multiple places, will wait until those // are consolidated. - if (includesSyncLane(pendingPassiveEffectsLanes) && root.tag !== LegacyRoot) { + if ( + includesSomeLane(pendingPassiveEffectsLanes, SyncLane) && + root.tag !== LegacyRoot + ) { flushPassiveEffects(); } // Read this again, since a passive effect might have updated it remainingLanes = root.pendingLanes; - if (includesSyncLane(remainingLanes)) { + if (includesSomeLane(remainingLanes, SyncLane)) { { markNestedUpdateScheduled(); } // Count the number of times the root synchronously re-renders without @@ -41040,7 +40974,6 @@ if (replayFailedUnitOfWorkWithInvokeGuardedCallback) { if ( didSuspendOrErrorWhileHydratingDEV() || originalError === SuspenseException || - originalError === SelectiveHydrationException || (originalError !== null && typeof originalError === "object" && typeof originalError.then === "function") @@ -42580,7 +42513,7 @@ function createFiberRoot( return root; } -var ReactVersion = "18.3.0-www-classic-2ccfa657d-20221205"; +var ReactVersion = "18.3.0-www-classic-d807eb52c-20221205"; function createPortal( children, diff --git a/compiled/facebook-www/ReactDOMForked-dev.modern.js b/compiled/facebook-www/ReactDOMForked-dev.modern.js index 7a19e65a4a9cd..50bbc67a32045 100644 --- a/compiled/facebook-www/ReactDOMForked-dev.modern.js +++ b/compiled/facebook-www/ReactDOMForked-dev.modern.js @@ -6153,91 +6153,91 @@ var NoLanes = var NoLane = /* */ 0; -var SyncHydrationLane = - /* */ - 1; var SyncLane = /* */ - 2; + 1; var InputContinuousHydrationLane = /* */ - 4; + 2; var InputContinuousLane = /* */ - 8; + 4; var DefaultHydrationLane = /* */ - 16; + 8; var DefaultLane = /* */ - 32; + 16; var TransitionHydrationLane = /* */ - 64; + 32; var TransitionLanes = /* */ - 8388480; + 4194240; var TransitionLane1 = /* */ - 128; + 64; var TransitionLane2 = /* */ - 256; + 128; var TransitionLane3 = /* */ - 512; + 256; var TransitionLane4 = /* */ - 1024; + 512; var TransitionLane5 = /* */ - 2048; + 1024; var TransitionLane6 = /* */ - 4096; + 2048; var TransitionLane7 = /* */ - 8192; + 4096; var TransitionLane8 = /* */ - 16384; + 8192; var TransitionLane9 = /* */ - 32768; + 16384; var TransitionLane10 = /* */ - 65536; + 32768; var TransitionLane11 = /* */ - 131072; + 65536; var TransitionLane12 = /* */ - 262144; + 131072; var TransitionLane13 = /* */ - 524288; + 262144; var TransitionLane14 = /* */ - 1048576; + 524288; var TransitionLane15 = /* */ - 2097152; + 1048576; var TransitionLane16 = /* */ - 4194304; + 2097152; var RetryLanes = /* */ - 125829120; + 130023424; var RetryLane1 = /* */ - 8388608; + 4194304; var RetryLane2 = /* */ - 16777216; + 8388608; var RetryLane3 = /* */ - 33554432; + 16777216; var RetryLane4 = + /* */ + 33554432; +var RetryLane5 = /* */ 67108864; var SomeRetryLane = RetryLane1; @@ -6260,10 +6260,6 @@ var OffscreenLane = function getLabelForLane(lane) { if (enableSchedulingProfiler) { - if (lane & SyncHydrationLane) { - return "SyncHydrationLane"; - } - if (lane & SyncLane) { return "Sync"; } @@ -6319,9 +6315,6 @@ var nextRetryLane = RetryLane1; function getHighestPriorityLanes(lanes) { switch (getHighestPriorityLane(lanes)) { - case SyncHydrationLane: - return SyncHydrationLane; - case SyncLane: return SyncLane; @@ -6362,6 +6355,7 @@ function getHighestPriorityLanes(lanes) { case RetryLane2: case RetryLane3: case RetryLane4: + case RetryLane5: return lanes & RetryLanes; case SelectiveHydrationLane: @@ -6522,7 +6516,6 @@ function getMostRecentEventTime(root, lanes) { function computeExpirationTime(lane, currentTime) { switch (lane) { - case SyncHydrationLane: case SyncLane: case InputContinuousHydrationLane: case InputContinuousLane: @@ -6562,6 +6555,7 @@ function computeExpirationTime(lane, currentTime) { case RetryLane2: case RetryLane3: case RetryLane4: + case RetryLane5: // TODO: Retries should be allowed to expire if they are CPU bound for // too long, but when I made this change it caused a spike in browser // crashes. There must be some other underlying bug; not super urgent but @@ -6649,9 +6643,6 @@ function getLanesToRetrySynchronouslyOnError(root, originallyAttemptedLanes) { return NoLanes; } -function includesSyncLane(lanes) { - return (lanes & (SyncLane | SyncHydrationLane)) !== NoLanes; -} function includesNonIdleWork(lanes) { return (lanes & NonIdleLanes) !== NoLanes; } @@ -6659,8 +6650,6 @@ function includesOnlyRetries(lanes) { return (lanes & RetryLanes) === lanes; } function includesOnlyNonUrgentLanes(lanes) { - // TODO: Should hydration lanes be included here? This function is only - // used in `updateDeferredValueImpl`. var UrgentLanes = SyncLane | InputContinuousLane | DefaultLane; return (lanes & UrgentLanes) === NoLanes; } @@ -6902,10 +6891,6 @@ function getBumpedLaneForHydration(root, renderLanes) { var lane; switch (renderLane) { - case SyncLane: - lane = SyncHydrationLane; - break; - case InputContinuousLane: lane = InputContinuousHydrationLane; break; @@ -6934,6 +6919,7 @@ function getBumpedLaneForHydration(root, renderLanes) { case RetryLane2: case RetryLane3: case RetryLane4: + case RetryLane5: lane = TransitionHydrationLane; break; @@ -26813,14 +26799,7 @@ function getMarkerInstances() { return null; } -var ReactCurrentOwner$1 = ReactSharedInternals.ReactCurrentOwner; // A special exception that's used to unwind the stack when an update flows -// into a dehydrated boundary. - -var SelectiveHydrationException = new Error( - "This is not a real error. It's an implementation detail of React's " + - "selective hydration feature. If this leaks into userspace, it's a bug in " + - "React. Please file an issue." -); +var ReactCurrentOwner$1 = ReactSharedInternals.ReactCurrentOwner; var didReceiveUpdate = false; var didWarnAboutBadClass; var didWarnAboutModulePatternComponent; @@ -29254,29 +29233,18 @@ function updateDehydratedSuspenseComponent( current, attemptHydrationAtLane, eventTime - ); // Throw a special object that signals to the work loop that it should - // interrupt the current render. - // - // Because we're inside a React-only execution stack, we don't - // strictly need to throw here — we could instead modify some internal - // work loop state. But using an exception means we don't need to - // check for this case on every iteration of the work loop. So doing - // it this way moves the check out of the fast path. - - throw SelectiveHydrationException; + ); } - } // If we did not selectively hydrate, we'll continue rendering without - // hydrating. Mark this tree as suspended to prevent it from committing - // outside a transition. - // - // This path should only happen if the hydration lane already suspended. - // Currently, it also happens during sync updates because there is no - // hydration lane for sync updates. + } // If we have scheduled higher pri work above, this will just abort the render + // since we now have higher priority work. We'll try to infinitely suspend until + // we yield. TODO: We could probably just force yielding earlier instead. + + renderDidSuspendDelayIfPossible(); // If we rendered synchronously, we won't yield so have to render something. + // This will cause us to delete any existing content. // TODO: We should ideally have a sync hydration lane that we can apply to do // a pass where we hydrate this subtree in place using the previous Context and then // reapply the update afterwards. - renderDidSuspendDelayIfPossible(); return retrySuspenseComponentWithoutHydrating( current, workInProgress, @@ -37526,8 +37494,7 @@ var SuspendedOnError = 1; var SuspendedOnData = 2; var SuspendedOnImmediate = 3; var SuspendedOnDeprecatedThrowPromise = 4; -var SuspendedAndReadyToUnwind = 5; -var SuspendedOnHydration = 6; // When this is true, the work-in-progress fiber just suspended (or errored) and +var SuspendedAndReadyToUnwind = 5; // When this is true, the work-in-progress fiber just suspended (or errored) and // we've yet to unwind the stack. In some cases, we may yield to the main thread // after this happens. If the fiber is pinged before we resume, we can retry // immediately instead of unwinding the stack. @@ -38063,7 +38030,7 @@ function ensureRootIsScheduled(root, currentTime) { // TODO: Temporary until we confirm this warning is not fired. if ( existingCallbackNode == null && - !includesSyncLane(existingCallbackPriority) + existingCallbackPriority !== SyncLane ) { error( "Expected scheduled callback to exist. This error is likely caused by a bug in React. Please file an issue." @@ -38081,7 +38048,7 @@ function ensureRootIsScheduled(root, currentTime) { var newCallbackNode; - if (includesSyncLane(newCallbackPriority)) { + if (newCallbackPriority === SyncLane) { // Special case: Sync React callbacks are scheduled on a special // internal queue if (root.tag === LegacyRoot) { @@ -38638,7 +38605,7 @@ function performSyncWorkOnRoot(root) { flushPassiveEffects(); var lanes = getNextLanes(root, NoLanes); - if (!includesSyncLane(lanes)) { + if (!includesSomeLane(lanes, SyncLane)) { // There's no remaining sync work left. ensureRootIsScheduled(root, now()); return null; @@ -38923,17 +38890,6 @@ function handleThrow(root, thrownValue) { workInProgressSuspendedReason = shouldAttemptToSuspendUntilDataResolves() ? SuspendedOnData : SuspendedOnImmediate; - } else if (thrownValue === SelectiveHydrationException) { - // An update flowed into a dehydrated boundary. Before we can apply the - // update, we need to finish hydrating. Interrupt the work-in-progress - // render so we can restart at the hydration lane. - // - // The ideal implementation would be able to switch contexts without - // unwinding the current stack. - // - // We could name this something more general but as of now it's the only - // case where we think this should happen. - workInProgressSuspendedReason = SuspendedOnHydration; } else { // This is a regular error. var isWakeable = @@ -39161,7 +39117,7 @@ function renderRootSync(root, lanes) { markRenderStarted(lanes); } - outer: do { + do { try { if ( workInProgressSuspendedReason !== NotSuspended && @@ -39177,25 +39133,9 @@ function renderRootSync(root, lanes) { // function and fork the behavior some other way. var unitOfWork = workInProgress; var thrownValue = workInProgressThrownValue; - - switch (workInProgressSuspendedReason) { - case SuspendedOnHydration: { - // Selective hydration. An update flowed into a dehydrated tree. - // Interrupt the current render so the work loop can switch to the - // hydration lane. - workInProgress = null; - workInProgressRootExitStatus = RootDidNotComplete; - break outer; - } - - default: { - // Continue with the normal work loop. - workInProgressSuspendedReason = NotSuspended; - workInProgressThrownValue = null; - unwindSuspendedUnitOfWork(unitOfWork, thrownValue); - break; - } - } + workInProgressSuspendedReason = NotSuspended; + workInProgressThrownValue = null; + unwindSuspendedUnitOfWork(unitOfWork, thrownValue); // Continue with the normal work loop. } workLoopSync(); @@ -39360,15 +39300,6 @@ function renderRootConcurrent(root, lanes) { break; } - case SuspendedOnHydration: { - // Selective hydration. An update flowed into a dehydrated tree. - // Interrupt the current render so the work loop can switch to the - // hydration lane. - workInProgress = null; - workInProgressRootExitStatus = RootDidNotComplete; - break outer; - } - default: { throw new Error( "Unexpected SuspendedReason. This is a bug in React." @@ -40023,13 +39954,16 @@ function commitRootImpl( // currently schedule the callback in multiple places, will wait until those // are consolidated. - if (includesSyncLane(pendingPassiveEffectsLanes) && root.tag !== LegacyRoot) { + if ( + includesSomeLane(pendingPassiveEffectsLanes, SyncLane) && + root.tag !== LegacyRoot + ) { flushPassiveEffects(); } // Read this again, since a passive effect might have updated it remainingLanes = root.pendingLanes; - if (includesSyncLane(remainingLanes)) { + if (includesSomeLane(remainingLanes, SyncLane)) { { markNestedUpdateScheduled(); } // Count the number of times the root synchronously re-renders without @@ -40764,7 +40698,6 @@ if (replayFailedUnitOfWorkWithInvokeGuardedCallback) { if ( didSuspendOrErrorWhileHydratingDEV() || originalError === SuspenseException || - originalError === SelectiveHydrationException || (originalError !== null && typeof originalError === "object" && typeof originalError.then === "function") @@ -42304,7 +42237,7 @@ function createFiberRoot( return root; } -var ReactVersion = "18.3.0-www-modern-2ccfa657d-20221205"; +var ReactVersion = "18.3.0-www-modern-d807eb52c-20221205"; function createPortal( children, diff --git a/compiled/facebook-www/ReactDOMForked-prod.classic.js b/compiled/facebook-www/ReactDOMForked-prod.classic.js index 0e158c9eb53c7..3eadc44aec50c 100644 --- a/compiled/facebook-www/ReactDOMForked-prod.classic.js +++ b/compiled/facebook-www/ReactDOMForked-prod.classic.js @@ -1583,8 +1583,8 @@ function clz32Fallback(x) { x >>>= 0; return 0 === x ? 32 : (31 - ((log(x) / LN2) | 0)) | 0; } -var nextTransitionLane = 128, - nextRetryLane = 8388608; +var nextTransitionLane = 64, + nextRetryLane = 4194304; function getHighestPriorityLanes(lanes) { switch (lanes & -lanes) { case 1: @@ -1600,7 +1600,6 @@ function getHighestPriorityLanes(lanes) { case 32: return 32; case 64: - return 64; case 128: case 256: case 512: @@ -1616,13 +1615,13 @@ function getHighestPriorityLanes(lanes) { case 524288: case 1048576: case 2097152: + return lanes & 4194240; case 4194304: - return lanes & 8388480; case 8388608: case 16777216: case 33554432: case 67108864: - return lanes & 125829120; + return lanes & 130023424; case 134217728: return 134217728; case 268435456: @@ -1663,12 +1662,12 @@ function getNextLanes(root, wipLanes) { ((suspendedLanes = nextLanes & -nextLanes), (pingedLanes = wipLanes & -wipLanes), suspendedLanes >= pingedLanes || - (32 === suspendedLanes && 0 !== (pingedLanes & 8388480))) + (16 === suspendedLanes && 0 !== (pingedLanes & 4194240))) ) return wipLanes; 0 === (root.current.mode & 32) && - 0 !== (nextLanes & 8) && - (nextLanes |= pendingLanes & 32); + 0 !== (nextLanes & 4) && + (nextLanes |= pendingLanes & 16); wipLanes = root.entangledLanes; if (0 !== wipLanes) for (root = root.entanglements, wipLanes &= nextLanes; 0 < wipLanes; ) @@ -1683,8 +1682,8 @@ function computeExpirationTime(lane, currentTime) { case 1: case 2: case 4: - case 8: return currentTime + 250; + case 8: case 16: case 32: case 64: @@ -1703,8 +1702,8 @@ function computeExpirationTime(lane, currentTime) { case 524288: case 1048576: case 2097152: - case 4194304: return currentTime + 5e3; + case 4194304: case 8388608: case 16777216: case 33554432: @@ -1724,7 +1723,7 @@ function markStarvedLanesAsExpired(root, currentTime) { var suspendedLanes = root.suspendedLanes, pingedLanes = root.pingedLanes, expirationTimes = root.expirationTimes, - lanes = root.pendingLanes & -125829121; + lanes = root.pendingLanes & -130023425; 0 < lanes; ) { @@ -1744,12 +1743,12 @@ function getLanesToRetrySynchronouslyOnError(root, originallyAttemptedLanes) { return 0 !== root ? root : root & 1073741824 ? 1073741824 : 0; } function includesBlockingLane(root, lanes) { - return 0 !== (root.current.mode & 32) ? !1 : 0 !== (lanes & 60); + return 0 !== (root.current.mode & 32) ? !1 : 0 !== (lanes & 30); } function claimNextTransitionLane() { var lane = nextTransitionLane; nextTransitionLane <<= 1; - 0 === (nextTransitionLane & 8388480) && (nextTransitionLane = 128); + 0 === (nextTransitionLane & 4194240) && (nextTransitionLane = 64); return lane; } function createLaneMap(initial) { @@ -1840,13 +1839,13 @@ function runWithPriority(priority, fn) { } function lanesToEventPriority(lanes) { lanes &= -lanes; - return 2 < lanes - ? 8 < lanes + return 1 < lanes + ? 4 < lanes ? 0 !== (lanes & 268435455) - ? 32 + ? 16 : 536870912 - : 8 - : 2; + : 4 + : 1; } var Internals = { usingClientEntryPoint: !1, @@ -4931,10 +4930,10 @@ function createEventListenerWrapperWithPriority( eventSystemFlags ) { switch (getEventPriority(domEventName)) { - case 2: + case 1: var listenerWrapper = dispatchDiscreteEvent; break; - case 8: + case 4: listenerWrapper = dispatchContinuousEvent; break; default: @@ -4957,7 +4956,7 @@ function dispatchDiscreteEvent( prevTransition = ReactCurrentBatchConfig.transition; ReactCurrentBatchConfig.transition = null; try { - (currentUpdatePriority = 2), + (currentUpdatePriority = 1), dispatchEvent(domEventName, eventSystemFlags, container, nativeEvent); } finally { (currentUpdatePriority = previousPriority), @@ -4974,7 +4973,7 @@ function dispatchContinuousEvent( prevTransition = ReactCurrentBatchConfig.transition; ReactCurrentBatchConfig.transition = null; try { - (currentUpdatePriority = 8), + (currentUpdatePriority = 4), dispatchEvent(domEventName, eventSystemFlags, container, nativeEvent); } finally { (currentUpdatePriority = previousPriority), @@ -5196,7 +5195,7 @@ function getEventPriority(domEventName) { case "popstate": case "select": case "selectstart": - return 2; + return 1; case "drag": case "dragenter": case "dragexit": @@ -5216,23 +5215,23 @@ function getEventPriority(domEventName) { case "mouseleave": case "pointerenter": case "pointerleave": - return 8; + return 4; case "message": switch (getCurrentPriorityLevel()) { case ImmediatePriority: - return 2; + return 1; case UserBlockingPriority: - return 8; + return 4; case NormalPriority: case LowPriority: - return 32; + return 16; case IdlePriority: return 536870912; default: - return 32; + return 16; } default: - return 32; + return 16; } } var emptyContextObject = {}, @@ -5330,7 +5329,7 @@ function flushSyncCallbacks() { previousUpdatePriority = currentUpdatePriority; try { var queue = syncQueue; - for (currentUpdatePriority = 2; i < queue.length; i++) { + for (currentUpdatePriority = 1; i < queue.length; i++) { var callback = queue[i]; do callback = callback(!0); while (null !== callback); @@ -5824,7 +5823,7 @@ function enqueueUpdate$1(fiber, update, lane) { } function entangleTransitions(root, fiber, lane) { fiber = fiber.updateQueue; - if (null !== fiber && ((fiber = fiber.shared), 0 !== (lane & 8388480))) { + if (null !== fiber && ((fiber = fiber.shared), 0 !== (lane & 4194240))) { var queueLanes = fiber.lanes; queueLanes &= root.pendingLanes; lane |= queueLanes; @@ -7298,8 +7297,8 @@ function checkIfSnapshotChanged(inst) { } } function forceStoreRerender(fiber) { - var root = enqueueConcurrentRenderForLane(fiber, 2); - null !== root && scheduleUpdateOnFiber(root, fiber, 2, -1); + var root = enqueueConcurrentRenderForLane(fiber, 1); + null !== root && scheduleUpdateOnFiber(root, fiber, 1, -1); } function mountState(initialState) { var hook = mountWorkInProgressHook(); @@ -7450,7 +7449,7 @@ function updateMemo(nextCreate, deps) { return nextCreate; } function updateDeferredValueImpl(hook, prevValue, value) { - if (0 === (renderLanes & 42)) + if (0 === (renderLanes & 21)) return ( hook.baseState && ((hook.baseState = !1), (didReceiveUpdate = !0)), (hook.memoizedState = value) @@ -7465,7 +7464,7 @@ function updateDeferredValueImpl(hook, prevValue, value) { function startTransition(setPending, callback, options) { var previousPriority = currentUpdatePriority; currentUpdatePriority = - 0 !== previousPriority && 8 > previousPriority ? previousPriority : 8; + 0 !== previousPriority && 4 > previousPriority ? previousPriority : 4; setPending(!0); var prevTransition = ReactCurrentBatchConfig$1.transition; ReactCurrentBatchConfig$1.transition = {}; @@ -7584,7 +7583,7 @@ function enqueueRenderPhaseUpdate(queue, update) { queue.pending = update; } function entangleTransitionUpdate(root, queue, lane) { - if (0 !== (lane & 8388480)) { + if (0 !== (lane & 4194240)) { var queueLanes = queue.lanes; queueLanes &= root.pendingLanes; lane |= queueLanes; @@ -8106,10 +8105,10 @@ function markSuspenseBoundaryShouldCapture( 1 === sourceFiber.tag && (null === sourceFiber.alternate ? (sourceFiber.tag = 17) - : ((returnFiber = createUpdate(-1, 2)), + : ((returnFiber = createUpdate(-1, 1)), (returnFiber.tag = 2), - enqueueUpdate$1(sourceFiber, returnFiber, 2))), - (sourceFiber.lanes |= 2)), + enqueueUpdate$1(sourceFiber, returnFiber, 1))), + (sourceFiber.lanes |= 1)), suspenseBoundary ); suspenseBoundary.flags |= 32768; @@ -8254,7 +8253,6 @@ function pushMarkerInstance(workInProgress, markerInstance) { )); } var ReactCurrentOwner$1 = ReactSharedInternals.ReactCurrentOwner, - SelectiveHydrationException = Error(formatProdErrorMessage(461)), didReceiveUpdate = !1; function reconcileChildren(current, workInProgress, nextChildren, renderLanes) { workInProgress.child = @@ -8847,9 +8845,9 @@ function updateSuspenseComponent(current, workInProgress, renderLanes) { ) return ( 0 === (workInProgress.mode & 1) - ? (workInProgress.lanes = 2) + ? (workInProgress.lanes = 1) : "$!" === current.data - ? (workInProgress.lanes = 16) + ? (workInProgress.lanes = 8) : (workInProgress.lanes = 1073741824), null ); @@ -8901,7 +8899,7 @@ function updateSuspenseComponent(current, workInProgress, renderLanes) { renderLanes )), (workInProgress.memoizedState = SUSPENDED_MARKER), - (workInProgress.lanes = 8388608), + (workInProgress.lanes = 4194304), current ); pushPrimaryTreeSuspenseHandler(workInProgress); @@ -9156,15 +9154,13 @@ function updateDehydratedSuspenseComponent( nextProps = workInProgressRoot; if (null !== nextProps) { switch (renderLanes & -renderLanes) { - case 2: - suspenseInstance = 1; - break; - case 8: - suspenseInstance = 4; + case 4: + suspenseInstance = 2; break; - case 32: - suspenseInstance = 16; + case 16: + suspenseInstance = 8; break; + case 64: case 128: case 256: case 512: @@ -9185,7 +9181,7 @@ function updateDehydratedSuspenseComponent( case 16777216: case 33554432: case 67108864: - suspenseInstance = 64; + suspenseInstance = 32; break; case 536870912: suspenseInstance = 268435456; @@ -9197,14 +9193,11 @@ function updateDehydratedSuspenseComponent( 0 !== (suspenseInstance & (nextProps.suspendedLanes | renderLanes)) ? 0 : suspenseInstance; - if ( - 0 !== suspenseInstance && - suspenseInstance !== suspenseState.retryLane - ) - throw ((suspenseState.retryLane = suspenseInstance), + 0 !== suspenseInstance && + suspenseInstance !== suspenseState.retryLane && + ((suspenseState.retryLane = suspenseInstance), enqueueConcurrentRenderForLane(current, suspenseInstance), - scheduleUpdateOnFiber(nextProps, current, suspenseInstance, -1), - SelectiveHydrationException); + scheduleUpdateOnFiber(nextProps, current, suspenseInstance, -1)); } renderDidSuspendDelayIfPossible(); return retrySuspenseComponentWithoutHydrating( @@ -10461,7 +10454,7 @@ function completeWork(current, workInProgress, renderLanes) { ((workInProgress.flags |= 64), (newProps = !0), cutOffTailIfNeeded(type, !1), - (workInProgress.lanes = 8388608)); + (workInProgress.lanes = 4194304)); } else { if (!newProps) @@ -10490,7 +10483,7 @@ function completeWork(current, workInProgress, renderLanes) { ((workInProgress.flags |= 64), (newProps = !0), cutOffTailIfNeeded(type, !1), - (workInProgress.lanes = 8388608)); + (workInProgress.lanes = 4194304)); type.isBackwards ? ((JSCompiler_inline_result.sibling = workInProgress.child), (workInProgress.child = JSCompiler_inline_result)) @@ -13003,7 +12996,7 @@ function requestEventTime() { : (currentEventTime = now()); } function requestUpdateLane(fiber) { - if (0 === (fiber.mode & 1)) return 2; + if (0 === (fiber.mode & 1)) return 1; if ( !deferRenderPhaseUpdateToNextBatch && 0 !== (executionContext & 2) && @@ -13019,7 +13012,7 @@ function requestUpdateLane(fiber) { fiber = currentUpdatePriority; if (0 !== fiber) return fiber; fiber = window.event; - fiber = void 0 === fiber ? 32 : getEventPriority(fiber.type); + fiber = void 0 === fiber ? 16 : getEventPriority(fiber.type); return fiber; } function scheduleUpdateOnFiber(root, fiber, lane, eventTime) { @@ -13052,7 +13045,7 @@ function scheduleUpdateOnFiber(root, fiber, lane, eventTime) { markRootSuspended$1(root, workInProgressRootRenderLanes); } ensureRootIsScheduled(root, eventTime); - 2 === lane && + 1 === lane && 0 === executionContext && 0 === (fiber.mode & 1) && (resetRenderTimer(), includesLegacySyncCallbacks && flushSyncCallbacks()); @@ -13074,7 +13067,7 @@ function ensureRootIsScheduled(root, currentTime) { root.callbackPriority !== currentTime) ) { null != existingCallbackNode && cancelCallback(existingCallbackNode); - if (0 !== (currentTime & 3)) + if (1 === currentTime) 0 === root.tag ? scheduleLegacySyncCallback(performSyncWorkOnRoot.bind(null, root)) : scheduleSyncCallback(performSyncWorkOnRoot.bind(null, root)), @@ -13084,13 +13077,13 @@ function ensureRootIsScheduled(root, currentTime) { (existingCallbackNode = null); else { switch (lanesToEventPriority(nextLanes)) { - case 2: + case 1: existingCallbackNode = ImmediatePriority; break; - case 8: + case 4: existingCallbackNode = UserBlockingPriority; break; - case 32: + case 16: existingCallbackNode = NormalPriority; break; case 536870912: @@ -13193,7 +13186,7 @@ function performConcurrentWorkOnRoot(root, didTimeout) { case 3: markRootSuspended$1(root, lanes); if ( - (lanes & 125829120) === lanes && + (lanes & 130023424) === lanes && ((didTimeout = globalMostRecentFallbackTime + 500 - now()), 10 < didTimeout) ) { @@ -13224,7 +13217,7 @@ function performConcurrentWorkOnRoot(root, didTimeout) { break; case 4: markRootSuspended$1(root, lanes); - if ((lanes & 8388480) === lanes) break; + if ((lanes & 4194240) === lanes) break; didTimeout = root.eventTimes; for (originallyAttemptedLanes = -1; 0 < lanes; ) (errorRetryLanes$216 = 31 - clz32(lanes)), @@ -13366,7 +13359,7 @@ function performSyncWorkOnRoot(root) { if (0 !== (executionContext & 6)) throw Error(formatProdErrorMessage(327)); flushPassiveEffects(); var lanes = getNextLanes(root, 0); - if (0 === (lanes & 3)) return ensureRootIsScheduled(root, now()), null; + if (0 === (lanes & 1)) return ensureRootIsScheduled(root, now()), null; var exitStatus = renderRootSync(root, lanes); if (0 !== root.tag && 2 === exitStatus) { var originallyAttemptedLanes = lanes, @@ -13426,7 +13419,7 @@ function flushSync(fn) { try { if ( ((ReactCurrentBatchConfig$3.transition = null), - (currentUpdatePriority = 2), + (currentUpdatePriority = 1), fn) ) return fn(); @@ -13481,11 +13474,9 @@ function handleThrow(root, thrownValue) { : 3; } else workInProgressSuspendedReason = - thrownValue === SelectiveHydrationException - ? 6 - : null !== thrownValue && - "object" === typeof thrownValue && - "function" === typeof thrownValue.then + null !== thrownValue && + "object" === typeof thrownValue && + "function" === typeof thrownValue.then ? 4 : 1; workInProgressThrownValue = thrownValue; @@ -13495,7 +13486,7 @@ function handleThrow(root, thrownValue) { } function shouldAttemptToSuspendUntilDataResolves() { if ( - (workInProgressRootRenderLanes & 125829120) === + (workInProgressRootRenderLanes & 130023424) === workInProgressRootRenderLanes ) return !0; @@ -13505,7 +13496,7 @@ function shouldAttemptToSuspendUntilDataResolves() { ) return !1; if ( - (workInProgressRootRenderLanes & 8388480) === + (workInProgressRootRenderLanes & 4194240) === workInProgressRootRenderLanes ) { var suspenseHandler = suspenseHandlerStackCursor.current; @@ -13549,21 +13540,14 @@ function renderRootSync(root, lanes) { if (workInProgressRoot !== root || workInProgressRootRenderLanes !== lanes) (workInProgressTransitions = getTransitionsForLanes(root, lanes)), prepareFreshStack(root, lanes); - a: do + do try { if (0 !== workInProgressSuspendedReason && null !== workInProgress) { lanes = workInProgress; var thrownValue = workInProgressThrownValue; - switch (workInProgressSuspendedReason) { - case 6: - workInProgress = null; - workInProgressRootExitStatus = 6; - break a; - default: - (workInProgressSuspendedReason = 0), - (workInProgressThrownValue = null), - unwindSuspendedUnitOfWork(lanes, thrownValue); - } + workInProgressSuspendedReason = 0; + workInProgressThrownValue = null; + unwindSuspendedUnitOfWork(lanes, thrownValue); } workLoopSync(); break; @@ -13635,10 +13619,6 @@ function renderRootConcurrent(root, lanes) { workInProgressThrownValue = null; unwindSuspendedUnitOfWork(lanes, thrownValue); break; - case 6: - workInProgress = null; - workInProgressRootExitStatus = 6; - break a; default: throw Error(formatProdErrorMessage(462)); } @@ -13918,7 +13898,7 @@ function commitRoot(root, recoverableErrors, transitions) { prevTransition = ReactCurrentBatchConfig$3.transition; try { (ReactCurrentBatchConfig$3.transition = null), - (currentUpdatePriority = 2), + (currentUpdatePriority = 1), commitRootImpl( root, recoverableErrors, @@ -13969,7 +13949,7 @@ function commitRootImpl( transitions = ReactCurrentBatchConfig$3.transition; ReactCurrentBatchConfig$3.transition = null; var previousPriority = currentUpdatePriority; - currentUpdatePriority = 2; + currentUpdatePriority = 1; var prevExecutionContext = executionContext; executionContext |= 4; ReactCurrentOwner$2.current = null; @@ -14018,11 +13998,11 @@ function commitRootImpl( (root = firstUncaughtError), (firstUncaughtError = null), root); - 0 !== (pendingPassiveEffectsLanes & 3) && + 0 !== (pendingPassiveEffectsLanes & 1) && 0 !== root.tag && flushPassiveEffects(); remainingLanes = root.pendingLanes; - 0 !== (remainingLanes & 3) + 0 !== (remainingLanes & 1) ? root === rootWithNestedUpdates ? nestedUpdateCount++ : ((nestedUpdateCount = 0), (rootWithNestedUpdates = root)) @@ -14059,7 +14039,7 @@ function flushPassiveEffects() { remainingLanes = pendingPassiveEffectsRemainingLanes; pendingPassiveEffectsRemainingLanes = 0; var renderPriority = lanesToEventPriority(pendingPassiveEffectsLanes); - renderPriority = 32 > renderPriority ? 32 : renderPriority; + renderPriority = 16 > renderPriority ? 16 : renderPriority; var prevTransition = ReactCurrentBatchConfig$3.transition, previousPriority = currentUpdatePriority; try { @@ -14115,11 +14095,11 @@ function flushPassiveEffectsImpl() { } function captureCommitPhaseErrorOnRoot(rootFiber, sourceFiber, error) { sourceFiber = createCapturedValueAtFiber(error, sourceFiber); - sourceFiber = createRootErrorUpdate(rootFiber, sourceFiber, 2); - rootFiber = enqueueUpdate$1(rootFiber, sourceFiber, 2); + sourceFiber = createRootErrorUpdate(rootFiber, sourceFiber, 1); + rootFiber = enqueueUpdate$1(rootFiber, sourceFiber, 1); sourceFiber = requestEventTime(); null !== rootFiber && - (markRootUpdated(rootFiber, 2, sourceFiber), + (markRootUpdated(rootFiber, 1, sourceFiber), ensureRootIsScheduled(rootFiber, sourceFiber)); } function captureCommitPhaseError(sourceFiber, nearestMountedAncestor, error) { @@ -14153,16 +14133,16 @@ function captureCommitPhaseError(sourceFiber, nearestMountedAncestor, error) { sourceFiber = createClassErrorUpdate( nearestMountedAncestor, sourceFiber, - 2 + 1 ); nearestMountedAncestor = enqueueUpdate$1( nearestMountedAncestor, sourceFiber, - 2 + 1 ); sourceFiber = requestEventTime(); null !== nearestMountedAncestor && - (markRootUpdated(nearestMountedAncestor, 2, sourceFiber), + (markRootUpdated(nearestMountedAncestor, 1, sourceFiber), ensureRootIsScheduled(nearestMountedAncestor, sourceFiber)); break; } @@ -14195,7 +14175,7 @@ function pingSuspendedRoot(root, wakeable, pingedLanes) { (workInProgressRootRenderLanes & pingedLanes) === pingedLanes && (4 === workInProgressRootExitStatus || (3 === workInProgressRootExitStatus && - (workInProgressRootRenderLanes & 125829120) === + (workInProgressRootRenderLanes & 130023424) === workInProgressRootRenderLanes && 500 > now() - globalMostRecentFallbackTime) ? prepareFreshStack(root, 0) @@ -14205,10 +14185,10 @@ function pingSuspendedRoot(root, wakeable, pingedLanes) { function retryTimedOutBoundary(boundaryFiber, retryLane) { 0 === retryLane && (0 === (boundaryFiber.mode & 1) - ? (retryLane = 2) + ? (retryLane = 1) : ((retryLane = nextRetryLane), (nextRetryLane <<= 1), - 0 === (nextRetryLane & 125829120) && (nextRetryLane = 8388608))); + 0 === (nextRetryLane & 130023424) && (nextRetryLane = 4194304))); var eventTime = requestEventTime(); boundaryFiber = enqueueConcurrentRenderForLane(boundaryFiber, retryLane); null !== boundaryFiber && @@ -15454,7 +15434,7 @@ _attemptSynchronousHydration = function(fiber) { if (root$227.current.memoizedState.isDehydrated) { var lanes = getHighestPriorityLanes(root$227.pendingLanes); 0 !== lanes && - (markRootEntangled(root$227, lanes | 2), + (markRootEntangled(root$227, lanes | 1), ensureRootIsScheduled(root$227, now()), 0 === (executionContext & 6) && (resetRenderTimer(), flushSyncCallbacks())); @@ -15462,23 +15442,23 @@ _attemptSynchronousHydration = function(fiber) { break; case 13: flushSync(function() { - var root = enqueueConcurrentRenderForLane(fiber, 2); + var root = enqueueConcurrentRenderForLane(fiber, 1); if (null !== root) { var eventTime = requestEventTime(); - scheduleUpdateOnFiber(root, fiber, 2, eventTime); + scheduleUpdateOnFiber(root, fiber, 1, eventTime); } }), - markRetryLaneIfNotHydrated(fiber, 2); + markRetryLaneIfNotHydrated(fiber, 1); } }; attemptDiscreteHydration = function(fiber) { if (13 === fiber.tag) { - var root = enqueueConcurrentRenderForLane(fiber, 2); + var root = enqueueConcurrentRenderForLane(fiber, 1); if (null !== root) { var eventTime = requestEventTime(); - scheduleUpdateOnFiber(root, fiber, 2, eventTime); + scheduleUpdateOnFiber(root, fiber, 1, eventTime); } - markRetryLaneIfNotHydrated(fiber, 2); + markRetryLaneIfNotHydrated(fiber, 1); } }; attemptContinuousHydration = function(fiber) { @@ -15548,7 +15528,7 @@ Internals.Events = [ var devToolsConfig$jscomp$inline_1773 = { findFiberByHostInstance: getClosestInstanceFromNode, bundleType: 0, - version: "18.3.0-www-classic-2ccfa657d-20221205", + version: "18.3.0-www-classic-d807eb52c-20221205", rendererPackageName: "react-dom" }; var internals$jscomp$inline_2154 = { @@ -15578,7 +15558,7 @@ var internals$jscomp$inline_2154 = { scheduleRoot: null, setRefreshHandler: null, getCurrentFiber: null, - reconcilerVersion: "18.3.0-next-2ccfa657d-20221205" + reconcilerVersion: "18.3.0-next-d807eb52c-20221205" }; if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) { var hook$jscomp$inline_2155 = __REACT_DEVTOOLS_GLOBAL_HOOK__; @@ -15792,7 +15772,7 @@ exports.unstable_flushControlled = function(fn) { previousPriority = currentUpdatePriority; try { (ReactCurrentBatchConfig$3.transition = null), - (currentUpdatePriority = 2), + (currentUpdatePriority = 1), fn(); } finally { (currentUpdatePriority = previousPriority), @@ -15820,4 +15800,4 @@ exports.unstable_renderSubtreeIntoContainer = function( ); }; exports.unstable_runWithPriority = runWithPriority; -exports.version = "18.3.0-next-2ccfa657d-20221205"; +exports.version = "18.3.0-next-d807eb52c-20221205"; diff --git a/compiled/facebook-www/ReactDOMForked-prod.modern.js b/compiled/facebook-www/ReactDOMForked-prod.modern.js index 4287cb3e0e3bd..4cd57adfe524b 100644 --- a/compiled/facebook-www/ReactDOMForked-prod.modern.js +++ b/compiled/facebook-www/ReactDOMForked-prod.modern.js @@ -1288,8 +1288,8 @@ function clz32Fallback(x) { x >>>= 0; return 0 === x ? 32 : (31 - ((log(x) / LN2) | 0)) | 0; } -var nextTransitionLane = 128, - nextRetryLane = 8388608; +var nextTransitionLane = 64, + nextRetryLane = 4194304; function getHighestPriorityLanes(lanes) { switch (lanes & -lanes) { case 1: @@ -1305,7 +1305,6 @@ function getHighestPriorityLanes(lanes) { case 32: return 32; case 64: - return 64; case 128: case 256: case 512: @@ -1321,13 +1320,13 @@ function getHighestPriorityLanes(lanes) { case 524288: case 1048576: case 2097152: + return lanes & 4194240; case 4194304: - return lanes & 8388480; case 8388608: case 16777216: case 33554432: case 67108864: - return lanes & 125829120; + return lanes & 130023424; case 134217728: return 134217728; case 268435456: @@ -1368,12 +1367,12 @@ function getNextLanes(root, wipLanes) { ((suspendedLanes = nextLanes & -nextLanes), (pingedLanes = wipLanes & -wipLanes), suspendedLanes >= pingedLanes || - (32 === suspendedLanes && 0 !== (pingedLanes & 8388480))) + (16 === suspendedLanes && 0 !== (pingedLanes & 4194240))) ) return wipLanes; 0 === (root.current.mode & 32) && - 0 !== (nextLanes & 8) && - (nextLanes |= pendingLanes & 32); + 0 !== (nextLanes & 4) && + (nextLanes |= pendingLanes & 16); wipLanes = root.entangledLanes; if (0 !== wipLanes) for (root = root.entanglements, wipLanes &= nextLanes; 0 < wipLanes; ) @@ -1388,8 +1387,8 @@ function computeExpirationTime(lane, currentTime) { case 1: case 2: case 4: - case 8: return currentTime + 250; + case 8: case 16: case 32: case 64: @@ -1408,8 +1407,8 @@ function computeExpirationTime(lane, currentTime) { case 524288: case 1048576: case 2097152: - case 4194304: return currentTime + 5e3; + case 4194304: case 8388608: case 16777216: case 33554432: @@ -1429,7 +1428,7 @@ function markStarvedLanesAsExpired(root, currentTime) { var suspendedLanes = root.suspendedLanes, pingedLanes = root.pingedLanes, expirationTimes = root.expirationTimes, - lanes = root.pendingLanes & -125829121; + lanes = root.pendingLanes & -130023425; 0 < lanes; ) { @@ -1449,12 +1448,12 @@ function getLanesToRetrySynchronouslyOnError(root, originallyAttemptedLanes) { return 0 !== root ? root : root & 1073741824 ? 1073741824 : 0; } function includesBlockingLane(root, lanes) { - return 0 !== (root.current.mode & 32) ? !1 : 0 !== (lanes & 60); + return 0 !== (root.current.mode & 32) ? !1 : 0 !== (lanes & 30); } function claimNextTransitionLane() { var lane = nextTransitionLane; nextTransitionLane <<= 1; - 0 === (nextTransitionLane & 8388480) && (nextTransitionLane = 128); + 0 === (nextTransitionLane & 4194240) && (nextTransitionLane = 64); return lane; } function createLaneMap(initial) { @@ -1545,13 +1544,13 @@ function runWithPriority(priority, fn) { } function lanesToEventPriority(lanes) { lanes &= -lanes; - return 2 < lanes - ? 8 < lanes + return 1 < lanes + ? 4 < lanes ? 0 !== (lanes & 268435455) - ? 32 + ? 16 : 536870912 - : 8 - : 2; + : 4 + : 1; } var _attemptSynchronousHydration, attemptDiscreteHydration, @@ -1920,10 +1919,10 @@ function createEventListenerWrapperWithPriority( eventSystemFlags ) { switch (getEventPriority(domEventName)) { - case 2: + case 1: var listenerWrapper = dispatchDiscreteEvent; break; - case 8: + case 4: listenerWrapper = dispatchContinuousEvent; break; default: @@ -1946,7 +1945,7 @@ function dispatchDiscreteEvent( prevTransition = ReactCurrentBatchConfig.transition; ReactCurrentBatchConfig.transition = null; try { - (currentUpdatePriority = 2), + (currentUpdatePriority = 1), dispatchEvent(domEventName, eventSystemFlags, container, nativeEvent); } finally { (currentUpdatePriority = previousPriority), @@ -1963,7 +1962,7 @@ function dispatchContinuousEvent( prevTransition = ReactCurrentBatchConfig.transition; ReactCurrentBatchConfig.transition = null; try { - (currentUpdatePriority = 8), + (currentUpdatePriority = 4), dispatchEvent(domEventName, eventSystemFlags, container, nativeEvent); } finally { (currentUpdatePriority = previousPriority), @@ -2185,7 +2184,7 @@ function getEventPriority(domEventName) { case "popstate": case "select": case "selectstart": - return 2; + return 1; case "drag": case "dragenter": case "dragexit": @@ -2205,23 +2204,23 @@ function getEventPriority(domEventName) { case "mouseleave": case "pointerenter": case "pointerleave": - return 8; + return 4; case "message": switch (getCurrentPriorityLevel()) { case ImmediatePriority: - return 2; + return 1; case UserBlockingPriority: - return 8; + return 4; case NormalPriority: case LowPriority: - return 32; + return 16; case IdlePriority: return 536870912; default: - return 32; + return 16; } default: - return 32; + return 16; } } function addEventBubbleListener(target, eventType, listener) { @@ -5181,7 +5180,7 @@ function flushSyncCallbacks() { previousUpdatePriority = currentUpdatePriority; try { var queue = syncQueue; - for (currentUpdatePriority = 2; i < queue.length; i++) { + for (currentUpdatePriority = 1; i < queue.length; i++) { var callback = queue[i]; do callback = callback(!0); while (null !== callback); @@ -5675,7 +5674,7 @@ function enqueueUpdate$1(fiber, update, lane) { } function entangleTransitions(root, fiber, lane) { fiber = fiber.updateQueue; - if (null !== fiber && ((fiber = fiber.shared), 0 !== (lane & 8388480))) { + if (null !== fiber && ((fiber = fiber.shared), 0 !== (lane & 4194240))) { var queueLanes = fiber.lanes; queueLanes &= root.pendingLanes; lane |= queueLanes; @@ -7149,8 +7148,8 @@ function checkIfSnapshotChanged(inst) { } } function forceStoreRerender(fiber) { - var root = enqueueConcurrentRenderForLane(fiber, 2); - null !== root && scheduleUpdateOnFiber(root, fiber, 2, -1); + var root = enqueueConcurrentRenderForLane(fiber, 1); + null !== root && scheduleUpdateOnFiber(root, fiber, 1, -1); } function mountState(initialState) { var hook = mountWorkInProgressHook(); @@ -7301,7 +7300,7 @@ function updateMemo(nextCreate, deps) { return nextCreate; } function updateDeferredValueImpl(hook, prevValue, value) { - if (0 === (renderLanes & 42)) + if (0 === (renderLanes & 21)) return ( hook.baseState && ((hook.baseState = !1), (didReceiveUpdate = !0)), (hook.memoizedState = value) @@ -7316,7 +7315,7 @@ function updateDeferredValueImpl(hook, prevValue, value) { function startTransition(setPending, callback, options) { var previousPriority = currentUpdatePriority; currentUpdatePriority = - 0 !== previousPriority && 8 > previousPriority ? previousPriority : 8; + 0 !== previousPriority && 4 > previousPriority ? previousPriority : 4; setPending(!0); var prevTransition = ReactCurrentBatchConfig$1.transition; ReactCurrentBatchConfig$1.transition = {}; @@ -7435,7 +7434,7 @@ function enqueueRenderPhaseUpdate(queue, update) { queue.pending = update; } function entangleTransitionUpdate(root, queue, lane) { - if (0 !== (lane & 8388480)) { + if (0 !== (lane & 4194240)) { var queueLanes = queue.lanes; queueLanes &= root.pendingLanes; lane |= queueLanes; @@ -7943,10 +7942,10 @@ function markSuspenseBoundaryShouldCapture( 1 === sourceFiber.tag && (null === sourceFiber.alternate ? (sourceFiber.tag = 17) - : ((returnFiber = createUpdate(-1, 2)), + : ((returnFiber = createUpdate(-1, 1)), (returnFiber.tag = 2), - enqueueUpdate$1(sourceFiber, returnFiber, 2))), - (sourceFiber.lanes |= 2)), + enqueueUpdate$1(sourceFiber, returnFiber, 1))), + (sourceFiber.lanes |= 1)), suspenseBoundary ); suspenseBoundary.flags |= 32768; @@ -8091,7 +8090,6 @@ function pushMarkerInstance(workInProgress, markerInstance) { )); } var ReactCurrentOwner$1 = ReactSharedInternals.ReactCurrentOwner, - SelectiveHydrationException = Error(formatProdErrorMessage(461)), didReceiveUpdate = !1; function reconcileChildren(current, workInProgress, nextChildren, renderLanes) { workInProgress.child = @@ -8648,9 +8646,9 @@ function updateSuspenseComponent(current, workInProgress, renderLanes) { ) return ( 0 === (workInProgress.mode & 1) - ? (workInProgress.lanes = 2) + ? (workInProgress.lanes = 1) : "$!" === current.data - ? (workInProgress.lanes = 16) + ? (workInProgress.lanes = 8) : (workInProgress.lanes = 1073741824), null ); @@ -8702,7 +8700,7 @@ function updateSuspenseComponent(current, workInProgress, renderLanes) { renderLanes )), (workInProgress.memoizedState = SUSPENDED_MARKER), - (workInProgress.lanes = 8388608), + (workInProgress.lanes = 4194304), current ); pushPrimaryTreeSuspenseHandler(workInProgress); @@ -8957,15 +8955,13 @@ function updateDehydratedSuspenseComponent( nextProps = workInProgressRoot; if (null !== nextProps) { switch (renderLanes & -renderLanes) { - case 2: - suspenseInstance = 1; - break; - case 8: - suspenseInstance = 4; + case 4: + suspenseInstance = 2; break; - case 32: - suspenseInstance = 16; + case 16: + suspenseInstance = 8; break; + case 64: case 128: case 256: case 512: @@ -8986,7 +8982,7 @@ function updateDehydratedSuspenseComponent( case 16777216: case 33554432: case 67108864: - suspenseInstance = 64; + suspenseInstance = 32; break; case 536870912: suspenseInstance = 268435456; @@ -8998,14 +8994,11 @@ function updateDehydratedSuspenseComponent( 0 !== (suspenseInstance & (nextProps.suspendedLanes | renderLanes)) ? 0 : suspenseInstance; - if ( - 0 !== suspenseInstance && - suspenseInstance !== suspenseState.retryLane - ) - throw ((suspenseState.retryLane = suspenseInstance), + 0 !== suspenseInstance && + suspenseInstance !== suspenseState.retryLane && + ((suspenseState.retryLane = suspenseInstance), enqueueConcurrentRenderForLane(current, suspenseInstance), - scheduleUpdateOnFiber(nextProps, current, suspenseInstance, -1), - SelectiveHydrationException); + scheduleUpdateOnFiber(nextProps, current, suspenseInstance, -1)); } renderDidSuspendDelayIfPossible(); return retrySuspenseComponentWithoutHydrating( @@ -10248,7 +10241,7 @@ function completeWork(current, workInProgress, renderLanes) { ((workInProgress.flags |= 64), (newProps = !0), cutOffTailIfNeeded(type, !1), - (workInProgress.lanes = 8388608)); + (workInProgress.lanes = 4194304)); } else { if (!newProps) @@ -10277,7 +10270,7 @@ function completeWork(current, workInProgress, renderLanes) { ((workInProgress.flags |= 64), (newProps = !0), cutOffTailIfNeeded(type, !1), - (workInProgress.lanes = 8388608)); + (workInProgress.lanes = 4194304)); type.isBackwards ? ((JSCompiler_inline_result.sibling = workInProgress.child), (workInProgress.child = JSCompiler_inline_result)) @@ -12781,7 +12774,7 @@ function requestEventTime() { : (currentEventTime = now()); } function requestUpdateLane(fiber) { - if (0 === (fiber.mode & 1)) return 2; + if (0 === (fiber.mode & 1)) return 1; if ( !deferRenderPhaseUpdateToNextBatch && 0 !== (executionContext & 2) && @@ -12797,7 +12790,7 @@ function requestUpdateLane(fiber) { fiber = currentUpdatePriority; if (0 !== fiber) return fiber; fiber = window.event; - fiber = void 0 === fiber ? 32 : getEventPriority(fiber.type); + fiber = void 0 === fiber ? 16 : getEventPriority(fiber.type); return fiber; } function scheduleUpdateOnFiber(root, fiber, lane, eventTime) { @@ -12830,7 +12823,7 @@ function scheduleUpdateOnFiber(root, fiber, lane, eventTime) { markRootSuspended$1(root, workInProgressRootRenderLanes); } ensureRootIsScheduled(root, eventTime); - 2 === lane && + 1 === lane && 0 === executionContext && 0 === (fiber.mode & 1) && (resetRenderTimer(), includesLegacySyncCallbacks && flushSyncCallbacks()); @@ -12852,7 +12845,7 @@ function ensureRootIsScheduled(root, currentTime) { root.callbackPriority !== currentTime) ) { null != existingCallbackNode && cancelCallback(existingCallbackNode); - if (0 !== (currentTime & 3)) + if (1 === currentTime) 0 === root.tag ? scheduleLegacySyncCallback(performSyncWorkOnRoot.bind(null, root)) : scheduleSyncCallback(performSyncWorkOnRoot.bind(null, root)), @@ -12862,13 +12855,13 @@ function ensureRootIsScheduled(root, currentTime) { (existingCallbackNode = null); else { switch (lanesToEventPriority(nextLanes)) { - case 2: + case 1: existingCallbackNode = ImmediatePriority; break; - case 8: + case 4: existingCallbackNode = UserBlockingPriority; break; - case 32: + case 16: existingCallbackNode = NormalPriority; break; case 536870912: @@ -12971,7 +12964,7 @@ function performConcurrentWorkOnRoot(root, didTimeout) { case 3: markRootSuspended$1(root, lanes); if ( - (lanes & 125829120) === lanes && + (lanes & 130023424) === lanes && ((didTimeout = globalMostRecentFallbackTime + 500 - now()), 10 < didTimeout) ) { @@ -13002,7 +12995,7 @@ function performConcurrentWorkOnRoot(root, didTimeout) { break; case 4: markRootSuspended$1(root, lanes); - if ((lanes & 8388480) === lanes) break; + if ((lanes & 4194240) === lanes) break; didTimeout = root.eventTimes; for (originallyAttemptedLanes = -1; 0 < lanes; ) (errorRetryLanes$217 = 31 - clz32(lanes)), @@ -13144,7 +13137,7 @@ function performSyncWorkOnRoot(root) { if (0 !== (executionContext & 6)) throw Error(formatProdErrorMessage(327)); flushPassiveEffects(); var lanes = getNextLanes(root, 0); - if (0 === (lanes & 3)) return ensureRootIsScheduled(root, now()), null; + if (0 === (lanes & 1)) return ensureRootIsScheduled(root, now()), null; var exitStatus = renderRootSync(root, lanes); if (0 !== root.tag && 2 === exitStatus) { var originallyAttemptedLanes = lanes, @@ -13204,7 +13197,7 @@ function flushSync(fn) { try { if ( ((ReactCurrentBatchConfig$3.transition = null), - (currentUpdatePriority = 2), + (currentUpdatePriority = 1), fn) ) return fn(); @@ -13259,11 +13252,9 @@ function handleThrow(root, thrownValue) { : 3; } else workInProgressSuspendedReason = - thrownValue === SelectiveHydrationException - ? 6 - : null !== thrownValue && - "object" === typeof thrownValue && - "function" === typeof thrownValue.then + null !== thrownValue && + "object" === typeof thrownValue && + "function" === typeof thrownValue.then ? 4 : 1; workInProgressThrownValue = thrownValue; @@ -13273,7 +13264,7 @@ function handleThrow(root, thrownValue) { } function shouldAttemptToSuspendUntilDataResolves() { if ( - (workInProgressRootRenderLanes & 125829120) === + (workInProgressRootRenderLanes & 130023424) === workInProgressRootRenderLanes ) return !0; @@ -13283,7 +13274,7 @@ function shouldAttemptToSuspendUntilDataResolves() { ) return !1; if ( - (workInProgressRootRenderLanes & 8388480) === + (workInProgressRootRenderLanes & 4194240) === workInProgressRootRenderLanes ) { var suspenseHandler = suspenseHandlerStackCursor.current; @@ -13327,21 +13318,14 @@ function renderRootSync(root, lanes) { if (workInProgressRoot !== root || workInProgressRootRenderLanes !== lanes) (workInProgressTransitions = getTransitionsForLanes(root, lanes)), prepareFreshStack(root, lanes); - a: do + do try { if (0 !== workInProgressSuspendedReason && null !== workInProgress) { lanes = workInProgress; var thrownValue = workInProgressThrownValue; - switch (workInProgressSuspendedReason) { - case 6: - workInProgress = null; - workInProgressRootExitStatus = 6; - break a; - default: - (workInProgressSuspendedReason = 0), - (workInProgressThrownValue = null), - unwindSuspendedUnitOfWork(lanes, thrownValue); - } + workInProgressSuspendedReason = 0; + workInProgressThrownValue = null; + unwindSuspendedUnitOfWork(lanes, thrownValue); } workLoopSync(); break; @@ -13413,10 +13397,6 @@ function renderRootConcurrent(root, lanes) { workInProgressThrownValue = null; unwindSuspendedUnitOfWork(lanes, thrownValue); break; - case 6: - workInProgress = null; - workInProgressRootExitStatus = 6; - break a; default: throw Error(formatProdErrorMessage(462)); } @@ -13696,7 +13676,7 @@ function commitRoot(root, recoverableErrors, transitions) { prevTransition = ReactCurrentBatchConfig$3.transition; try { (ReactCurrentBatchConfig$3.transition = null), - (currentUpdatePriority = 2), + (currentUpdatePriority = 1), commitRootImpl( root, recoverableErrors, @@ -13747,7 +13727,7 @@ function commitRootImpl( transitions = ReactCurrentBatchConfig$3.transition; ReactCurrentBatchConfig$3.transition = null; var previousPriority = currentUpdatePriority; - currentUpdatePriority = 2; + currentUpdatePriority = 1; var prevExecutionContext = executionContext; executionContext |= 4; ReactCurrentOwner$2.current = null; @@ -13796,11 +13776,11 @@ function commitRootImpl( (root = firstUncaughtError), (firstUncaughtError = null), root); - 0 !== (pendingPassiveEffectsLanes & 3) && + 0 !== (pendingPassiveEffectsLanes & 1) && 0 !== root.tag && flushPassiveEffects(); remainingLanes = root.pendingLanes; - 0 !== (remainingLanes & 3) + 0 !== (remainingLanes & 1) ? root === rootWithNestedUpdates ? nestedUpdateCount++ : ((nestedUpdateCount = 0), (rootWithNestedUpdates = root)) @@ -13837,7 +13817,7 @@ function flushPassiveEffects() { remainingLanes = pendingPassiveEffectsRemainingLanes; pendingPassiveEffectsRemainingLanes = 0; var renderPriority = lanesToEventPriority(pendingPassiveEffectsLanes); - renderPriority = 32 > renderPriority ? 32 : renderPriority; + renderPriority = 16 > renderPriority ? 16 : renderPriority; var prevTransition = ReactCurrentBatchConfig$3.transition, previousPriority = currentUpdatePriority; try { @@ -13893,11 +13873,11 @@ function flushPassiveEffectsImpl() { } function captureCommitPhaseErrorOnRoot(rootFiber, sourceFiber, error) { sourceFiber = createCapturedValueAtFiber(error, sourceFiber); - sourceFiber = createRootErrorUpdate(rootFiber, sourceFiber, 2); - rootFiber = enqueueUpdate$1(rootFiber, sourceFiber, 2); + sourceFiber = createRootErrorUpdate(rootFiber, sourceFiber, 1); + rootFiber = enqueueUpdate$1(rootFiber, sourceFiber, 1); sourceFiber = requestEventTime(); null !== rootFiber && - (markRootUpdated(rootFiber, 2, sourceFiber), + (markRootUpdated(rootFiber, 1, sourceFiber), ensureRootIsScheduled(rootFiber, sourceFiber)); } function captureCommitPhaseError(sourceFiber, nearestMountedAncestor, error) { @@ -13931,16 +13911,16 @@ function captureCommitPhaseError(sourceFiber, nearestMountedAncestor, error) { sourceFiber = createClassErrorUpdate( nearestMountedAncestor, sourceFiber, - 2 + 1 ); nearestMountedAncestor = enqueueUpdate$1( nearestMountedAncestor, sourceFiber, - 2 + 1 ); sourceFiber = requestEventTime(); null !== nearestMountedAncestor && - (markRootUpdated(nearestMountedAncestor, 2, sourceFiber), + (markRootUpdated(nearestMountedAncestor, 1, sourceFiber), ensureRootIsScheduled(nearestMountedAncestor, sourceFiber)); break; } @@ -13973,7 +13953,7 @@ function pingSuspendedRoot(root, wakeable, pingedLanes) { (workInProgressRootRenderLanes & pingedLanes) === pingedLanes && (4 === workInProgressRootExitStatus || (3 === workInProgressRootExitStatus && - (workInProgressRootRenderLanes & 125829120) === + (workInProgressRootRenderLanes & 130023424) === workInProgressRootRenderLanes && 500 > now() - globalMostRecentFallbackTime) ? prepareFreshStack(root, 0) @@ -13983,10 +13963,10 @@ function pingSuspendedRoot(root, wakeable, pingedLanes) { function retryTimedOutBoundary(boundaryFiber, retryLane) { 0 === retryLane && (0 === (boundaryFiber.mode & 1) - ? (retryLane = 2) + ? (retryLane = 1) : ((retryLane = nextRetryLane), (nextRetryLane <<= 1), - 0 === (nextRetryLane & 125829120) && (nextRetryLane = 8388608))); + 0 === (nextRetryLane & 130023424) && (nextRetryLane = 4194304))); var eventTime = requestEventTime(); boundaryFiber = enqueueConcurrentRenderForLane(boundaryFiber, retryLane); null !== boundaryFiber && @@ -15015,7 +14995,7 @@ _attemptSynchronousHydration = function(fiber) { if (root$228.current.memoizedState.isDehydrated) { var lanes = getHighestPriorityLanes(root$228.pendingLanes); 0 !== lanes && - (markRootEntangled(root$228, lanes | 2), + (markRootEntangled(root$228, lanes | 1), ensureRootIsScheduled(root$228, now()), 0 === (executionContext & 6) && (resetRenderTimer(), flushSyncCallbacks())); @@ -15023,23 +15003,23 @@ _attemptSynchronousHydration = function(fiber) { break; case 13: flushSync(function() { - var root = enqueueConcurrentRenderForLane(fiber, 2); + var root = enqueueConcurrentRenderForLane(fiber, 1); if (null !== root) { var eventTime = requestEventTime(); - scheduleUpdateOnFiber(root, fiber, 2, eventTime); + scheduleUpdateOnFiber(root, fiber, 1, eventTime); } }), - markRetryLaneIfNotHydrated(fiber, 2); + markRetryLaneIfNotHydrated(fiber, 1); } }; attemptDiscreteHydration = function(fiber) { if (13 === fiber.tag) { - var root = enqueueConcurrentRenderForLane(fiber, 2); + var root = enqueueConcurrentRenderForLane(fiber, 1); if (null !== root) { var eventTime = requestEventTime(); - scheduleUpdateOnFiber(root, fiber, 2, eventTime); + scheduleUpdateOnFiber(root, fiber, 1, eventTime); } - markRetryLaneIfNotHydrated(fiber, 2); + markRetryLaneIfNotHydrated(fiber, 1); } }; attemptContinuousHydration = function(fiber) { @@ -15109,7 +15089,7 @@ Internals.Events = [ var devToolsConfig$jscomp$inline_1741 = { findFiberByHostInstance: getClosestInstanceFromNode, bundleType: 0, - version: "18.3.0-www-modern-2ccfa657d-20221205", + version: "18.3.0-www-modern-d807eb52c-20221205", rendererPackageName: "react-dom" }; var internals$jscomp$inline_2129 = { @@ -15140,7 +15120,7 @@ var internals$jscomp$inline_2129 = { scheduleRoot: null, setRefreshHandler: null, getCurrentFiber: null, - reconcilerVersion: "18.3.0-next-2ccfa657d-20221205" + reconcilerVersion: "18.3.0-next-d807eb52c-20221205" }; if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) { var hook$jscomp$inline_2130 = __REACT_DEVTOOLS_GLOBAL_HOOK__; @@ -15318,7 +15298,7 @@ exports.unstable_flushControlled = function(fn) { previousPriority = currentUpdatePriority; try { (ReactCurrentBatchConfig$3.transition = null), - (currentUpdatePriority = 2), + (currentUpdatePriority = 1), fn(); } finally { (currentUpdatePriority = previousPriority), @@ -15328,4 +15308,4 @@ exports.unstable_flushControlled = function(fn) { } }; exports.unstable_runWithPriority = runWithPriority; -exports.version = "18.3.0-next-2ccfa657d-20221205"; +exports.version = "18.3.0-next-d807eb52c-20221205"; diff --git a/compiled/facebook-www/ReactDOMForked-profiling.classic.js b/compiled/facebook-www/ReactDOMForked-profiling.classic.js index 029f8d55edd03..d0c3e82d66107 100644 --- a/compiled/facebook-www/ReactDOMForked-profiling.classic.js +++ b/compiled/facebook-www/ReactDOMForked-profiling.classic.js @@ -1586,13 +1586,13 @@ function onCommitRoot(root, eventPriority) { try { var didError = 64 === (root.current.flags & 64); switch (eventPriority) { - case 2: + case 1: var schedulerPriority = ImmediatePriority; break; - case 8: + case 4: schedulerPriority = UserBlockingPriority; break; - case 32: + case 16: schedulerPriority = NormalPriority; break; case 536870912: @@ -1686,23 +1686,22 @@ function clz32Fallback(x) { } function getLabelForLane(lane) { if (enableSchedulingProfiler) { - if (lane & 1) return "SyncHydrationLane"; - if (lane & 2) return "Sync"; - if (lane & 4) return "InputContinuousHydration"; - if (lane & 8) return "InputContinuous"; - if (lane & 16) return "DefaultHydration"; - if (lane & 32) return "Default"; - if (lane & 64) return "TransitionHydration"; - if (lane & 8388480) return "Transition"; - if (lane & 125829120) return "Retry"; + if (lane & 1) return "Sync"; + if (lane & 2) return "InputContinuousHydration"; + if (lane & 4) return "InputContinuous"; + if (lane & 8) return "DefaultHydration"; + if (lane & 16) return "Default"; + if (lane & 32) return "TransitionHydration"; + if (lane & 4194240) return "Transition"; + if (lane & 130023424) return "Retry"; if (lane & 134217728) return "SelectiveHydration"; if (lane & 268435456) return "IdleHydration"; if (lane & 536870912) return "Idle"; if (lane & 1073741824) return "Offscreen"; } } -var nextTransitionLane = 128, - nextRetryLane = 8388608; +var nextTransitionLane = 64, + nextRetryLane = 4194304; function getHighestPriorityLanes(lanes) { switch (lanes & -lanes) { case 1: @@ -1718,7 +1717,6 @@ function getHighestPriorityLanes(lanes) { case 32: return 32; case 64: - return 64; case 128: case 256: case 512: @@ -1734,13 +1732,13 @@ function getHighestPriorityLanes(lanes) { case 524288: case 1048576: case 2097152: + return lanes & 4194240; case 4194304: - return lanes & 8388480; case 8388608: case 16777216: case 33554432: case 67108864: - return lanes & 125829120; + return lanes & 130023424; case 134217728: return 134217728; case 268435456: @@ -1781,12 +1779,12 @@ function getNextLanes(root, wipLanes) { ((suspendedLanes = nextLanes & -nextLanes), (pingedLanes = wipLanes & -wipLanes), suspendedLanes >= pingedLanes || - (32 === suspendedLanes && 0 !== (pingedLanes & 8388480))) + (16 === suspendedLanes && 0 !== (pingedLanes & 4194240))) ) return wipLanes; 0 === (root.current.mode & 32) && - 0 !== (nextLanes & 8) && - (nextLanes |= pendingLanes & 32); + 0 !== (nextLanes & 4) && + (nextLanes |= pendingLanes & 16); wipLanes = root.entangledLanes; if (0 !== wipLanes) for (root = root.entanglements, wipLanes &= nextLanes; 0 < wipLanes; ) @@ -1801,8 +1799,8 @@ function computeExpirationTime(lane, currentTime) { case 1: case 2: case 4: - case 8: return currentTime + 250; + case 8: case 16: case 32: case 64: @@ -1821,8 +1819,8 @@ function computeExpirationTime(lane, currentTime) { case 524288: case 1048576: case 2097152: - case 4194304: return currentTime + 5e3; + case 4194304: case 8388608: case 16777216: case 33554432: @@ -1842,7 +1840,7 @@ function markStarvedLanesAsExpired(root, currentTime) { var suspendedLanes = root.suspendedLanes, pingedLanes = root.pingedLanes, expirationTimes = root.expirationTimes, - lanes = root.pendingLanes & -125829121; + lanes = root.pendingLanes & -130023425; 0 < lanes; ) { @@ -1862,12 +1860,12 @@ function getLanesToRetrySynchronouslyOnError(root, originallyAttemptedLanes) { return 0 !== root ? root : root & 1073741824 ? 1073741824 : 0; } function includesBlockingLane(root, lanes) { - return 0 !== (root.current.mode & 32) ? !1 : 0 !== (lanes & 60); + return 0 !== (root.current.mode & 32) ? !1 : 0 !== (lanes & 30); } function claimNextTransitionLane() { var lane = nextTransitionLane; nextTransitionLane <<= 1; - 0 === (nextTransitionLane & 8388480) && (nextTransitionLane = 128); + 0 === (nextTransitionLane & 4194240) && (nextTransitionLane = 64); return lane; } function createLaneMap(initial) { @@ -1988,13 +1986,13 @@ function runWithPriority(priority, fn) { } function lanesToEventPriority(lanes) { lanes &= -lanes; - return 2 < lanes - ? 8 < lanes + return 1 < lanes + ? 4 < lanes ? 0 !== (lanes & 268435455) - ? 32 + ? 16 : 536870912 - : 8 - : 2; + : 4 + : 1; } var Internals = { usingClientEntryPoint: !1, @@ -5079,10 +5077,10 @@ function createEventListenerWrapperWithPriority( eventSystemFlags ) { switch (getEventPriority(domEventName)) { - case 2: + case 1: var listenerWrapper = dispatchDiscreteEvent; break; - case 8: + case 4: listenerWrapper = dispatchContinuousEvent; break; default: @@ -5105,7 +5103,7 @@ function dispatchDiscreteEvent( prevTransition = ReactCurrentBatchConfig.transition; ReactCurrentBatchConfig.transition = null; try { - (currentUpdatePriority = 2), + (currentUpdatePriority = 1), dispatchEvent(domEventName, eventSystemFlags, container, nativeEvent); } finally { (currentUpdatePriority = previousPriority), @@ -5122,7 +5120,7 @@ function dispatchContinuousEvent( prevTransition = ReactCurrentBatchConfig.transition; ReactCurrentBatchConfig.transition = null; try { - (currentUpdatePriority = 8), + (currentUpdatePriority = 4), dispatchEvent(domEventName, eventSystemFlags, container, nativeEvent); } finally { (currentUpdatePriority = previousPriority), @@ -5344,7 +5342,7 @@ function getEventPriority(domEventName) { case "popstate": case "select": case "selectstart": - return 2; + return 1; case "drag": case "dragenter": case "dragexit": @@ -5364,23 +5362,23 @@ function getEventPriority(domEventName) { case "mouseleave": case "pointerenter": case "pointerleave": - return 8; + return 4; case "message": switch (getCurrentPriorityLevel()) { case ImmediatePriority: - return 2; + return 1; case UserBlockingPriority: - return 8; + return 4; case NormalPriority: case LowPriority: - return 32; + return 16; case IdlePriority: return 536870912; default: - return 32; + return 16; } default: - return 32; + return 16; } } var emptyContextObject = {}, @@ -5478,7 +5476,7 @@ function flushSyncCallbacks() { previousUpdatePriority = currentUpdatePriority; try { var queue = syncQueue; - for (currentUpdatePriority = 2; i < queue.length; i++) { + for (currentUpdatePriority = 1; i < queue.length; i++) { var callback = queue[i]; do callback = callback(!0); while (null !== callback); @@ -5972,7 +5970,7 @@ function enqueueUpdate$1(fiber, update, lane) { } function entangleTransitions(root, fiber, lane) { fiber = fiber.updateQueue; - if (null !== fiber && ((fiber = fiber.shared), 0 !== (lane & 8388480))) { + if (null !== fiber && ((fiber = fiber.shared), 0 !== (lane & 4194240))) { var queueLanes = fiber.lanes; queueLanes &= root.pendingLanes; lane |= queueLanes; @@ -7446,8 +7444,8 @@ function checkIfSnapshotChanged(inst) { } } function forceStoreRerender(fiber) { - var root = enqueueConcurrentRenderForLane(fiber, 2); - null !== root && scheduleUpdateOnFiber(root, fiber, 2, -1); + var root = enqueueConcurrentRenderForLane(fiber, 1); + null !== root && scheduleUpdateOnFiber(root, fiber, 1, -1); } function mountState(initialState) { var hook = mountWorkInProgressHook(); @@ -7598,7 +7596,7 @@ function updateMemo(nextCreate, deps) { return nextCreate; } function updateDeferredValueImpl(hook, prevValue, value) { - if (0 === (renderLanes & 42)) + if (0 === (renderLanes & 21)) return ( hook.baseState && ((hook.baseState = !1), (didReceiveUpdate = !0)), (hook.memoizedState = value) @@ -7613,7 +7611,7 @@ function updateDeferredValueImpl(hook, prevValue, value) { function startTransition(setPending, callback, options) { var previousPriority = currentUpdatePriority; currentUpdatePriority = - 0 !== previousPriority && 8 > previousPriority ? previousPriority : 8; + 0 !== previousPriority && 4 > previousPriority ? previousPriority : 4; setPending(!0); var prevTransition = ReactCurrentBatchConfig$1.transition; ReactCurrentBatchConfig$1.transition = {}; @@ -7734,7 +7732,7 @@ function enqueueRenderPhaseUpdate(queue, update) { queue.pending = update; } function entangleTransitionUpdate(root, queue, lane) { - if (0 !== (lane & 8388480)) { + if (0 !== (lane & 4194240)) { var queueLanes = queue.lanes; queueLanes &= root.pendingLanes; lane |= queueLanes; @@ -8325,10 +8323,10 @@ function markSuspenseBoundaryShouldCapture( 1 === sourceFiber.tag && (null === sourceFiber.alternate ? (sourceFiber.tag = 17) - : ((returnFiber = createUpdate(-1, 2)), + : ((returnFiber = createUpdate(-1, 1)), (returnFiber.tag = 2), - enqueueUpdate$1(sourceFiber, returnFiber, 2))), - (sourceFiber.lanes |= 2)), + enqueueUpdate$1(sourceFiber, returnFiber, 1))), + (sourceFiber.lanes |= 1)), suspenseBoundary ); suspenseBoundary.flags |= 32768; @@ -8473,7 +8471,6 @@ function pushMarkerInstance(workInProgress, markerInstance) { )); } var ReactCurrentOwner$1 = ReactSharedInternals.ReactCurrentOwner, - SelectiveHydrationException = Error(formatProdErrorMessage(461)), didReceiveUpdate = !1; function reconcileChildren(current, workInProgress, nextChildren, renderLanes) { workInProgress.child = @@ -9079,9 +9076,9 @@ function updateSuspenseComponent(current, workInProgress, renderLanes) { ) return ( 0 === (workInProgress.mode & 1) - ? (workInProgress.lanes = 2) + ? (workInProgress.lanes = 1) : "$!" === current.data - ? (workInProgress.lanes = 16) + ? (workInProgress.lanes = 8) : (workInProgress.lanes = 1073741824), null ); @@ -9133,7 +9130,7 @@ function updateSuspenseComponent(current, workInProgress, renderLanes) { renderLanes )), (workInProgress.memoizedState = SUSPENDED_MARKER), - (workInProgress.lanes = 8388608), + (workInProgress.lanes = 4194304), current ); pushPrimaryTreeSuspenseHandler(workInProgress); @@ -9398,15 +9395,13 @@ function updateDehydratedSuspenseComponent( nextProps = workInProgressRoot; if (null !== nextProps) { switch (renderLanes & -renderLanes) { - case 2: - suspenseInstance = 1; - break; - case 8: - suspenseInstance = 4; + case 4: + suspenseInstance = 2; break; - case 32: - suspenseInstance = 16; + case 16: + suspenseInstance = 8; break; + case 64: case 128: case 256: case 512: @@ -9427,7 +9422,7 @@ function updateDehydratedSuspenseComponent( case 16777216: case 33554432: case 67108864: - suspenseInstance = 64; + suspenseInstance = 32; break; case 536870912: suspenseInstance = 268435456; @@ -9439,14 +9434,11 @@ function updateDehydratedSuspenseComponent( 0 !== (suspenseInstance & (nextProps.suspendedLanes | renderLanes)) ? 0 : suspenseInstance; - if ( - 0 !== suspenseInstance && - suspenseInstance !== suspenseState.retryLane - ) - throw ((suspenseState.retryLane = suspenseInstance), + 0 !== suspenseInstance && + suspenseInstance !== suspenseState.retryLane && + ((suspenseState.retryLane = suspenseInstance), enqueueConcurrentRenderForLane(current, suspenseInstance), - scheduleUpdateOnFiber(nextProps, current, suspenseInstance, -1), - SelectiveHydrationException); + scheduleUpdateOnFiber(nextProps, current, suspenseInstance, -1)); } renderDidSuspendDelayIfPossible(); return retrySuspenseComponentWithoutHydrating( @@ -10770,7 +10762,7 @@ function completeWork(current, workInProgress, renderLanes) { ((workInProgress.flags |= 64), (newProps = !0), cutOffTailIfNeeded(type, !1), - (workInProgress.lanes = 8388608)); + (workInProgress.lanes = 4194304)); } else { if (!newProps) @@ -10799,7 +10791,7 @@ function completeWork(current, workInProgress, renderLanes) { ((workInProgress.flags |= 64), (newProps = !0), cutOffTailIfNeeded(type, !1), - (workInProgress.lanes = 8388608)); + (workInProgress.lanes = 4194304)); type.isBackwards ? ((JSCompiler_inline_result.sibling = workInProgress.child), (workInProgress.child = JSCompiler_inline_result)) @@ -13597,7 +13589,7 @@ function requestEventTime() { : (currentEventTime = now()); } function requestUpdateLane(fiber) { - if (0 === (fiber.mode & 1)) return 2; + if (0 === (fiber.mode & 1)) return 1; if ( !deferRenderPhaseUpdateToNextBatch && 0 !== (executionContext & 2) && @@ -13613,7 +13605,7 @@ function requestUpdateLane(fiber) { fiber = currentUpdatePriority; if (0 !== fiber) return fiber; fiber = window.event; - fiber = void 0 === fiber ? 32 : getEventPriority(fiber.type); + fiber = void 0 === fiber ? 16 : getEventPriority(fiber.type); return fiber; } function scheduleUpdateOnFiber(root, fiber, lane, eventTime) { @@ -13662,7 +13654,7 @@ function scheduleUpdateOnFiber(root, fiber, lane, eventTime) { markRootSuspended$1(root, workInProgressRootRenderLanes); } ensureRootIsScheduled(root, eventTime); - 2 === lane && + 1 === lane && 0 === executionContext && 0 === (fiber.mode & 1) && (resetRenderTimer(), includesLegacySyncCallbacks && flushSyncCallbacks()); @@ -13684,7 +13676,7 @@ function ensureRootIsScheduled(root, currentTime) { root.callbackPriority !== currentTime) ) { null != existingCallbackNode && cancelCallback(existingCallbackNode); - if (0 !== (currentTime & 3)) + if (1 === currentTime) 0 === root.tag ? scheduleLegacySyncCallback(performSyncWorkOnRoot.bind(null, root)) : scheduleSyncCallback(performSyncWorkOnRoot.bind(null, root)), @@ -13694,13 +13686,13 @@ function ensureRootIsScheduled(root, currentTime) { (existingCallbackNode = null); else { switch (lanesToEventPriority(nextLanes)) { - case 2: + case 1: existingCallbackNode = ImmediatePriority; break; - case 8: + case 4: existingCallbackNode = UserBlockingPriority; break; - case 32: + case 16: existingCallbackNode = NormalPriority; break; case 536870912: @@ -13804,7 +13796,7 @@ function performConcurrentWorkOnRoot(root, didTimeout) { case 3: markRootSuspended$1(root, lanes); if ( - (lanes & 125829120) === lanes && + (lanes & 130023424) === lanes && ((didTimeout = globalMostRecentFallbackTime + 500 - now()), 10 < didTimeout) ) { @@ -13835,7 +13827,7 @@ function performConcurrentWorkOnRoot(root, didTimeout) { break; case 4: markRootSuspended$1(root, lanes); - if ((lanes & 8388480) === lanes) break; + if ((lanes & 4194240) === lanes) break; didTimeout = root.eventTimes; for (originallyAttemptedLanes = -1; 0 < lanes; ) (errorRetryLanes$236 = 31 - clz32(lanes)), @@ -13979,7 +13971,7 @@ function performSyncWorkOnRoot(root) { if (0 !== (executionContext & 6)) throw Error(formatProdErrorMessage(327)); flushPassiveEffects(); var lanes = getNextLanes(root, 0); - if (0 === (lanes & 3)) return ensureRootIsScheduled(root, now()), null; + if (0 === (lanes & 1)) return ensureRootIsScheduled(root, now()), null; var exitStatus = renderRootSync(root, lanes); if (0 !== root.tag && 2 === exitStatus) { var originallyAttemptedLanes = lanes, @@ -14039,7 +14031,7 @@ function flushSync(fn) { try { if ( ((ReactCurrentBatchConfig$3.transition = null), - (currentUpdatePriority = 2), + (currentUpdatePriority = 1), fn) ) return fn(); @@ -14093,11 +14085,9 @@ function handleThrow(root, thrownValue) { : 3; } else workInProgressSuspendedReason = - thrownValue === SelectiveHydrationException - ? 6 - : null !== thrownValue && - "object" === typeof thrownValue && - "function" === typeof thrownValue.then + null !== thrownValue && + "object" === typeof thrownValue && + "function" === typeof thrownValue.then ? 4 : 1; workInProgressThrownValue = thrownValue; @@ -14129,7 +14119,7 @@ function handleThrow(root, thrownValue) { } function shouldAttemptToSuspendUntilDataResolves() { if ( - (workInProgressRootRenderLanes & 125829120) === + (workInProgressRootRenderLanes & 130023424) === workInProgressRootRenderLanes ) return !0; @@ -14139,7 +14129,7 @@ function shouldAttemptToSuspendUntilDataResolves() { ) return !1; if ( - (workInProgressRootRenderLanes & 8388480) === + (workInProgressRootRenderLanes & 4194240) === workInProgressRootRenderLanes ) { var suspenseHandler = suspenseHandlerStackCursor.current; @@ -14192,23 +14182,15 @@ function renderRootSync(root, lanes) { prepareFreshStack(root, lanes); } enableSchedulingProfiler && markRenderStarted(lanes); - a: do + do try { - if (0 !== workInProgressSuspendedReason && null !== workInProgress) - switch ( - ((lanes = workInProgress), - (memoizedUpdaters = workInProgressThrownValue), - workInProgressSuspendedReason) - ) { - case 6: - workInProgress = null; - workInProgressRootExitStatus = 6; - break a; - default: - (workInProgressSuspendedReason = 0), - (workInProgressThrownValue = null), - unwindSuspendedUnitOfWork(lanes, memoizedUpdaters); - } + 0 !== workInProgressSuspendedReason && + null !== workInProgress && + ((lanes = workInProgress), + (memoizedUpdaters = workInProgressThrownValue), + (workInProgressSuspendedReason = 0), + (workInProgressThrownValue = null), + unwindSuspendedUnitOfWork(lanes, memoizedUpdaters)); workLoopSync(); break; } catch (thrownValue$239) { @@ -14291,10 +14273,6 @@ function renderRootConcurrent(root, lanes) { workInProgressThrownValue = null; unwindSuspendedUnitOfWork(lanes, memoizedUpdaters); break; - case 6: - workInProgress = null; - workInProgressRootExitStatus = 6; - break a; default: throw Error(formatProdErrorMessage(462)); } @@ -14604,7 +14582,7 @@ function commitRoot(root, recoverableErrors, transitions) { prevTransition = ReactCurrentBatchConfig$3.transition; try { (ReactCurrentBatchConfig$3.transition = null), - (currentUpdatePriority = 2), + (currentUpdatePriority = 1), commitRootImpl( root, recoverableErrors, @@ -14661,7 +14639,7 @@ function commitRootImpl( transitions = ReactCurrentBatchConfig$3.transition; ReactCurrentBatchConfig$3.transition = null; var previousPriority = currentUpdatePriority; - currentUpdatePriority = 2; + currentUpdatePriority = 1; var prevExecutionContext = executionContext; executionContext |= 4; ReactCurrentOwner$2.current = null; @@ -14726,11 +14704,11 @@ function commitRootImpl( (root = firstUncaughtError), (firstUncaughtError = null), root); - 0 !== (pendingPassiveEffectsLanes & 3) && + 0 !== (pendingPassiveEffectsLanes & 1) && 0 !== root.tag && flushPassiveEffects(); remainingLanes = root.pendingLanes; - 0 !== (remainingLanes & 3) + 0 !== (remainingLanes & 1) ? ((nestedUpdateScheduled = !0), root === rootWithNestedUpdates ? nestedUpdateCount++ @@ -14769,7 +14747,7 @@ function flushPassiveEffects() { remainingLanes = pendingPassiveEffectsRemainingLanes; pendingPassiveEffectsRemainingLanes = 0; var renderPriority = lanesToEventPriority(pendingPassiveEffectsLanes); - renderPriority = 32 > renderPriority ? 32 : renderPriority; + renderPriority = 16 > renderPriority ? 16 : renderPriority; var prevTransition = ReactCurrentBatchConfig$3.transition, previousPriority = currentUpdatePriority; try { @@ -14851,11 +14829,11 @@ function flushPassiveEffectsImpl() { } function captureCommitPhaseErrorOnRoot(rootFiber, sourceFiber, error) { sourceFiber = createCapturedValueAtFiber(error, sourceFiber); - sourceFiber = createRootErrorUpdate(rootFiber, sourceFiber, 2); - rootFiber = enqueueUpdate$1(rootFiber, sourceFiber, 2); + sourceFiber = createRootErrorUpdate(rootFiber, sourceFiber, 1); + rootFiber = enqueueUpdate$1(rootFiber, sourceFiber, 1); sourceFiber = requestEventTime(); null !== rootFiber && - (markRootUpdated(rootFiber, 2, sourceFiber), + (markRootUpdated(rootFiber, 1, sourceFiber), ensureRootIsScheduled(rootFiber, sourceFiber)); } function captureCommitPhaseError(sourceFiber, nearestMountedAncestor, error) { @@ -14889,16 +14867,16 @@ function captureCommitPhaseError(sourceFiber, nearestMountedAncestor, error) { sourceFiber = createClassErrorUpdate( nearestMountedAncestor, sourceFiber, - 2 + 1 ); nearestMountedAncestor = enqueueUpdate$1( nearestMountedAncestor, sourceFiber, - 2 + 1 ); sourceFiber = requestEventTime(); null !== nearestMountedAncestor && - (markRootUpdated(nearestMountedAncestor, 2, sourceFiber), + (markRootUpdated(nearestMountedAncestor, 1, sourceFiber), ensureRootIsScheduled(nearestMountedAncestor, sourceFiber)); break; } @@ -14932,7 +14910,7 @@ function pingSuspendedRoot(root, wakeable, pingedLanes) { (workInProgressRootRenderLanes & pingedLanes) === pingedLanes && (4 === workInProgressRootExitStatus || (3 === workInProgressRootExitStatus && - (workInProgressRootRenderLanes & 125829120) === + (workInProgressRootRenderLanes & 130023424) === workInProgressRootRenderLanes && 500 > now() - globalMostRecentFallbackTime) ? prepareFreshStack(root, 0) @@ -14942,10 +14920,10 @@ function pingSuspendedRoot(root, wakeable, pingedLanes) { function retryTimedOutBoundary(boundaryFiber, retryLane) { 0 === retryLane && (0 === (boundaryFiber.mode & 1) - ? (retryLane = 2) + ? (retryLane = 1) : ((retryLane = nextRetryLane), (nextRetryLane <<= 1), - 0 === (nextRetryLane & 125829120) && (nextRetryLane = 8388608))); + 0 === (nextRetryLane & 130023424) && (nextRetryLane = 4194304))); var eventTime = requestEventTime(); boundaryFiber = enqueueConcurrentRenderForLane(boundaryFiber, retryLane); null !== boundaryFiber && @@ -16227,7 +16205,7 @@ _attemptSynchronousHydration = function(fiber) { if (root$248.current.memoizedState.isDehydrated) { var lanes = getHighestPriorityLanes(root$248.pendingLanes); 0 !== lanes && - (markRootEntangled(root$248, lanes | 2), + (markRootEntangled(root$248, lanes | 1), ensureRootIsScheduled(root$248, now()), 0 === (executionContext & 6) && (resetRenderTimer(), flushSyncCallbacks())); @@ -16235,23 +16213,23 @@ _attemptSynchronousHydration = function(fiber) { break; case 13: flushSync(function() { - var root = enqueueConcurrentRenderForLane(fiber, 2); + var root = enqueueConcurrentRenderForLane(fiber, 1); if (null !== root) { var eventTime = requestEventTime(); - scheduleUpdateOnFiber(root, fiber, 2, eventTime); + scheduleUpdateOnFiber(root, fiber, 1, eventTime); } }), - markRetryLaneIfNotHydrated(fiber, 2); + markRetryLaneIfNotHydrated(fiber, 1); } }; attemptDiscreteHydration = function(fiber) { if (13 === fiber.tag) { - var root = enqueueConcurrentRenderForLane(fiber, 2); + var root = enqueueConcurrentRenderForLane(fiber, 1); if (null !== root) { var eventTime = requestEventTime(); - scheduleUpdateOnFiber(root, fiber, 2, eventTime); + scheduleUpdateOnFiber(root, fiber, 1, eventTime); } - markRetryLaneIfNotHydrated(fiber, 2); + markRetryLaneIfNotHydrated(fiber, 1); } }; attemptContinuousHydration = function(fiber) { @@ -16321,7 +16299,7 @@ Internals.Events = [ var devToolsConfig$jscomp$inline_1847 = { findFiberByHostInstance: getClosestInstanceFromNode, bundleType: 0, - version: "18.3.0-www-classic-2ccfa657d-20221205", + version: "18.3.0-www-classic-d807eb52c-20221205", rendererPackageName: "react-dom" }; (function(internals) { @@ -16365,7 +16343,7 @@ var devToolsConfig$jscomp$inline_1847 = { scheduleRoot: null, setRefreshHandler: null, getCurrentFiber: null, - reconcilerVersion: "18.3.0-next-2ccfa657d-20221205" + reconcilerVersion: "18.3.0-next-d807eb52c-20221205" }); assign(Internals, { ReactBrowserEventEmitter: { @@ -16566,7 +16544,7 @@ exports.unstable_flushControlled = function(fn) { previousPriority = currentUpdatePriority; try { (ReactCurrentBatchConfig$3.transition = null), - (currentUpdatePriority = 2), + (currentUpdatePriority = 1), fn(); } finally { (currentUpdatePriority = previousPriority), @@ -16594,7 +16572,7 @@ exports.unstable_renderSubtreeIntoContainer = function( ); }; exports.unstable_runWithPriority = runWithPriority; -exports.version = "18.3.0-next-2ccfa657d-20221205"; +exports.version = "18.3.0-next-d807eb52c-20221205"; /* global __REACT_DEVTOOLS_GLOBAL_HOOK__ */ if ( diff --git a/compiled/facebook-www/ReactDOMForked-profiling.modern.js b/compiled/facebook-www/ReactDOMForked-profiling.modern.js index bf639d15ddcca..833bd64a0684d 100644 --- a/compiled/facebook-www/ReactDOMForked-profiling.modern.js +++ b/compiled/facebook-www/ReactDOMForked-profiling.modern.js @@ -1291,13 +1291,13 @@ function onCommitRoot(root, eventPriority) { try { var didError = 64 === (root.current.flags & 64); switch (eventPriority) { - case 2: + case 1: var schedulerPriority = ImmediatePriority; break; - case 8: + case 4: schedulerPriority = UserBlockingPriority; break; - case 32: + case 16: schedulerPriority = NormalPriority; break; case 536870912: @@ -1387,23 +1387,22 @@ function clz32Fallback(x) { } function getLabelForLane(lane) { if (enableSchedulingProfiler) { - if (lane & 1) return "SyncHydrationLane"; - if (lane & 2) return "Sync"; - if (lane & 4) return "InputContinuousHydration"; - if (lane & 8) return "InputContinuous"; - if (lane & 16) return "DefaultHydration"; - if (lane & 32) return "Default"; - if (lane & 64) return "TransitionHydration"; - if (lane & 8388480) return "Transition"; - if (lane & 125829120) return "Retry"; + if (lane & 1) return "Sync"; + if (lane & 2) return "InputContinuousHydration"; + if (lane & 4) return "InputContinuous"; + if (lane & 8) return "DefaultHydration"; + if (lane & 16) return "Default"; + if (lane & 32) return "TransitionHydration"; + if (lane & 4194240) return "Transition"; + if (lane & 130023424) return "Retry"; if (lane & 134217728) return "SelectiveHydration"; if (lane & 268435456) return "IdleHydration"; if (lane & 536870912) return "Idle"; if (lane & 1073741824) return "Offscreen"; } } -var nextTransitionLane = 128, - nextRetryLane = 8388608; +var nextTransitionLane = 64, + nextRetryLane = 4194304; function getHighestPriorityLanes(lanes) { switch (lanes & -lanes) { case 1: @@ -1419,7 +1418,6 @@ function getHighestPriorityLanes(lanes) { case 32: return 32; case 64: - return 64; case 128: case 256: case 512: @@ -1435,13 +1433,13 @@ function getHighestPriorityLanes(lanes) { case 524288: case 1048576: case 2097152: + return lanes & 4194240; case 4194304: - return lanes & 8388480; case 8388608: case 16777216: case 33554432: case 67108864: - return lanes & 125829120; + return lanes & 130023424; case 134217728: return 134217728; case 268435456: @@ -1482,12 +1480,12 @@ function getNextLanes(root, wipLanes) { ((suspendedLanes = nextLanes & -nextLanes), (pingedLanes = wipLanes & -wipLanes), suspendedLanes >= pingedLanes || - (32 === suspendedLanes && 0 !== (pingedLanes & 8388480))) + (16 === suspendedLanes && 0 !== (pingedLanes & 4194240))) ) return wipLanes; 0 === (root.current.mode & 32) && - 0 !== (nextLanes & 8) && - (nextLanes |= pendingLanes & 32); + 0 !== (nextLanes & 4) && + (nextLanes |= pendingLanes & 16); wipLanes = root.entangledLanes; if (0 !== wipLanes) for (root = root.entanglements, wipLanes &= nextLanes; 0 < wipLanes; ) @@ -1502,8 +1500,8 @@ function computeExpirationTime(lane, currentTime) { case 1: case 2: case 4: - case 8: return currentTime + 250; + case 8: case 16: case 32: case 64: @@ -1522,8 +1520,8 @@ function computeExpirationTime(lane, currentTime) { case 524288: case 1048576: case 2097152: - case 4194304: return currentTime + 5e3; + case 4194304: case 8388608: case 16777216: case 33554432: @@ -1543,7 +1541,7 @@ function markStarvedLanesAsExpired(root, currentTime) { var suspendedLanes = root.suspendedLanes, pingedLanes = root.pingedLanes, expirationTimes = root.expirationTimes, - lanes = root.pendingLanes & -125829121; + lanes = root.pendingLanes & -130023425; 0 < lanes; ) { @@ -1563,12 +1561,12 @@ function getLanesToRetrySynchronouslyOnError(root, originallyAttemptedLanes) { return 0 !== root ? root : root & 1073741824 ? 1073741824 : 0; } function includesBlockingLane(root, lanes) { - return 0 !== (root.current.mode & 32) ? !1 : 0 !== (lanes & 60); + return 0 !== (root.current.mode & 32) ? !1 : 0 !== (lanes & 30); } function claimNextTransitionLane() { var lane = nextTransitionLane; nextTransitionLane <<= 1; - 0 === (nextTransitionLane & 8388480) && (nextTransitionLane = 128); + 0 === (nextTransitionLane & 4194240) && (nextTransitionLane = 64); return lane; } function createLaneMap(initial) { @@ -1689,13 +1687,13 @@ function runWithPriority(priority, fn) { } function lanesToEventPriority(lanes) { lanes &= -lanes; - return 2 < lanes - ? 8 < lanes + return 1 < lanes + ? 4 < lanes ? 0 !== (lanes & 268435455) - ? 32 + ? 16 : 536870912 - : 8 - : 2; + : 4 + : 1; } var _attemptSynchronousHydration, attemptDiscreteHydration, @@ -2064,10 +2062,10 @@ function createEventListenerWrapperWithPriority( eventSystemFlags ) { switch (getEventPriority(domEventName)) { - case 2: + case 1: var listenerWrapper = dispatchDiscreteEvent; break; - case 8: + case 4: listenerWrapper = dispatchContinuousEvent; break; default: @@ -2090,7 +2088,7 @@ function dispatchDiscreteEvent( prevTransition = ReactCurrentBatchConfig.transition; ReactCurrentBatchConfig.transition = null; try { - (currentUpdatePriority = 2), + (currentUpdatePriority = 1), dispatchEvent(domEventName, eventSystemFlags, container, nativeEvent); } finally { (currentUpdatePriority = previousPriority), @@ -2107,7 +2105,7 @@ function dispatchContinuousEvent( prevTransition = ReactCurrentBatchConfig.transition; ReactCurrentBatchConfig.transition = null; try { - (currentUpdatePriority = 8), + (currentUpdatePriority = 4), dispatchEvent(domEventName, eventSystemFlags, container, nativeEvent); } finally { (currentUpdatePriority = previousPriority), @@ -2329,7 +2327,7 @@ function getEventPriority(domEventName) { case "popstate": case "select": case "selectstart": - return 2; + return 1; case "drag": case "dragenter": case "dragexit": @@ -2349,23 +2347,23 @@ function getEventPriority(domEventName) { case "mouseleave": case "pointerenter": case "pointerleave": - return 8; + return 4; case "message": switch (getCurrentPriorityLevel()) { case ImmediatePriority: - return 2; + return 1; case UserBlockingPriority: - return 8; + return 4; case NormalPriority: case LowPriority: - return 32; + return 16; case IdlePriority: return 536870912; default: - return 32; + return 16; } default: - return 32; + return 16; } } function addEventBubbleListener(target, eventType, listener) { @@ -5325,7 +5323,7 @@ function flushSyncCallbacks() { previousUpdatePriority = currentUpdatePriority; try { var queue = syncQueue; - for (currentUpdatePriority = 2; i < queue.length; i++) { + for (currentUpdatePriority = 1; i < queue.length; i++) { var callback = queue[i]; do callback = callback(!0); while (null !== callback); @@ -5819,7 +5817,7 @@ function enqueueUpdate$1(fiber, update, lane) { } function entangleTransitions(root, fiber, lane) { fiber = fiber.updateQueue; - if (null !== fiber && ((fiber = fiber.shared), 0 !== (lane & 8388480))) { + if (null !== fiber && ((fiber = fiber.shared), 0 !== (lane & 4194240))) { var queueLanes = fiber.lanes; queueLanes &= root.pendingLanes; lane |= queueLanes; @@ -7293,8 +7291,8 @@ function checkIfSnapshotChanged(inst) { } } function forceStoreRerender(fiber) { - var root = enqueueConcurrentRenderForLane(fiber, 2); - null !== root && scheduleUpdateOnFiber(root, fiber, 2, -1); + var root = enqueueConcurrentRenderForLane(fiber, 1); + null !== root && scheduleUpdateOnFiber(root, fiber, 1, -1); } function mountState(initialState) { var hook = mountWorkInProgressHook(); @@ -7445,7 +7443,7 @@ function updateMemo(nextCreate, deps) { return nextCreate; } function updateDeferredValueImpl(hook, prevValue, value) { - if (0 === (renderLanes & 42)) + if (0 === (renderLanes & 21)) return ( hook.baseState && ((hook.baseState = !1), (didReceiveUpdate = !0)), (hook.memoizedState = value) @@ -7460,7 +7458,7 @@ function updateDeferredValueImpl(hook, prevValue, value) { function startTransition(setPending, callback, options) { var previousPriority = currentUpdatePriority; currentUpdatePriority = - 0 !== previousPriority && 8 > previousPriority ? previousPriority : 8; + 0 !== previousPriority && 4 > previousPriority ? previousPriority : 4; setPending(!0); var prevTransition = ReactCurrentBatchConfig$1.transition; ReactCurrentBatchConfig$1.transition = {}; @@ -7581,7 +7579,7 @@ function enqueueRenderPhaseUpdate(queue, update) { queue.pending = update; } function entangleTransitionUpdate(root, queue, lane) { - if (0 !== (lane & 8388480)) { + if (0 !== (lane & 4194240)) { var queueLanes = queue.lanes; queueLanes &= root.pendingLanes; lane |= queueLanes; @@ -8158,10 +8156,10 @@ function markSuspenseBoundaryShouldCapture( 1 === sourceFiber.tag && (null === sourceFiber.alternate ? (sourceFiber.tag = 17) - : ((returnFiber = createUpdate(-1, 2)), + : ((returnFiber = createUpdate(-1, 1)), (returnFiber.tag = 2), - enqueueUpdate$1(sourceFiber, returnFiber, 2))), - (sourceFiber.lanes |= 2)), + enqueueUpdate$1(sourceFiber, returnFiber, 1))), + (sourceFiber.lanes |= 1)), suspenseBoundary ); suspenseBoundary.flags |= 32768; @@ -8306,7 +8304,6 @@ function pushMarkerInstance(workInProgress, markerInstance) { )); } var ReactCurrentOwner$1 = ReactSharedInternals.ReactCurrentOwner, - SelectiveHydrationException = Error(formatProdErrorMessage(461)), didReceiveUpdate = !1; function reconcileChildren(current, workInProgress, nextChildren, renderLanes) { workInProgress.child = @@ -8870,9 +8867,9 @@ function updateSuspenseComponent(current, workInProgress, renderLanes) { ) return ( 0 === (workInProgress.mode & 1) - ? (workInProgress.lanes = 2) + ? (workInProgress.lanes = 1) : "$!" === current.data - ? (workInProgress.lanes = 16) + ? (workInProgress.lanes = 8) : (workInProgress.lanes = 1073741824), null ); @@ -8924,7 +8921,7 @@ function updateSuspenseComponent(current, workInProgress, renderLanes) { renderLanes )), (workInProgress.memoizedState = SUSPENDED_MARKER), - (workInProgress.lanes = 8388608), + (workInProgress.lanes = 4194304), current ); pushPrimaryTreeSuspenseHandler(workInProgress); @@ -9189,15 +9186,13 @@ function updateDehydratedSuspenseComponent( nextProps = workInProgressRoot; if (null !== nextProps) { switch (renderLanes & -renderLanes) { - case 2: - suspenseInstance = 1; - break; - case 8: - suspenseInstance = 4; + case 4: + suspenseInstance = 2; break; - case 32: - suspenseInstance = 16; + case 16: + suspenseInstance = 8; break; + case 64: case 128: case 256: case 512: @@ -9218,7 +9213,7 @@ function updateDehydratedSuspenseComponent( case 16777216: case 33554432: case 67108864: - suspenseInstance = 64; + suspenseInstance = 32; break; case 536870912: suspenseInstance = 268435456; @@ -9230,14 +9225,11 @@ function updateDehydratedSuspenseComponent( 0 !== (suspenseInstance & (nextProps.suspendedLanes | renderLanes)) ? 0 : suspenseInstance; - if ( - 0 !== suspenseInstance && - suspenseInstance !== suspenseState.retryLane - ) - throw ((suspenseState.retryLane = suspenseInstance), + 0 !== suspenseInstance && + suspenseInstance !== suspenseState.retryLane && + ((suspenseState.retryLane = suspenseInstance), enqueueConcurrentRenderForLane(current, suspenseInstance), - scheduleUpdateOnFiber(nextProps, current, suspenseInstance, -1), - SelectiveHydrationException); + scheduleUpdateOnFiber(nextProps, current, suspenseInstance, -1)); } renderDidSuspendDelayIfPossible(); return retrySuspenseComponentWithoutHydrating( @@ -10547,7 +10539,7 @@ function completeWork(current, workInProgress, renderLanes) { ((workInProgress.flags |= 64), (newProps = !0), cutOffTailIfNeeded(type, !1), - (workInProgress.lanes = 8388608)); + (workInProgress.lanes = 4194304)); } else { if (!newProps) @@ -10576,7 +10568,7 @@ function completeWork(current, workInProgress, renderLanes) { ((workInProgress.flags |= 64), (newProps = !0), cutOffTailIfNeeded(type, !1), - (workInProgress.lanes = 8388608)); + (workInProgress.lanes = 4194304)); type.isBackwards ? ((JSCompiler_inline_result.sibling = workInProgress.child), (workInProgress.child = JSCompiler_inline_result)) @@ -13365,7 +13357,7 @@ function requestEventTime() { : (currentEventTime = now()); } function requestUpdateLane(fiber) { - if (0 === (fiber.mode & 1)) return 2; + if (0 === (fiber.mode & 1)) return 1; if ( !deferRenderPhaseUpdateToNextBatch && 0 !== (executionContext & 2) && @@ -13381,7 +13373,7 @@ function requestUpdateLane(fiber) { fiber = currentUpdatePriority; if (0 !== fiber) return fiber; fiber = window.event; - fiber = void 0 === fiber ? 32 : getEventPriority(fiber.type); + fiber = void 0 === fiber ? 16 : getEventPriority(fiber.type); return fiber; } function scheduleUpdateOnFiber(root, fiber, lane, eventTime) { @@ -13430,7 +13422,7 @@ function scheduleUpdateOnFiber(root, fiber, lane, eventTime) { markRootSuspended$1(root, workInProgressRootRenderLanes); } ensureRootIsScheduled(root, eventTime); - 2 === lane && + 1 === lane && 0 === executionContext && 0 === (fiber.mode & 1) && (resetRenderTimer(), includesLegacySyncCallbacks && flushSyncCallbacks()); @@ -13452,7 +13444,7 @@ function ensureRootIsScheduled(root, currentTime) { root.callbackPriority !== currentTime) ) { null != existingCallbackNode && cancelCallback(existingCallbackNode); - if (0 !== (currentTime & 3)) + if (1 === currentTime) 0 === root.tag ? scheduleLegacySyncCallback(performSyncWorkOnRoot.bind(null, root)) : scheduleSyncCallback(performSyncWorkOnRoot.bind(null, root)), @@ -13462,13 +13454,13 @@ function ensureRootIsScheduled(root, currentTime) { (existingCallbackNode = null); else { switch (lanesToEventPriority(nextLanes)) { - case 2: + case 1: existingCallbackNode = ImmediatePriority; break; - case 8: + case 4: existingCallbackNode = UserBlockingPriority; break; - case 32: + case 16: existingCallbackNode = NormalPriority; break; case 536870912: @@ -13572,7 +13564,7 @@ function performConcurrentWorkOnRoot(root, didTimeout) { case 3: markRootSuspended$1(root, lanes); if ( - (lanes & 125829120) === lanes && + (lanes & 130023424) === lanes && ((didTimeout = globalMostRecentFallbackTime + 500 - now()), 10 < didTimeout) ) { @@ -13603,7 +13595,7 @@ function performConcurrentWorkOnRoot(root, didTimeout) { break; case 4: markRootSuspended$1(root, lanes); - if ((lanes & 8388480) === lanes) break; + if ((lanes & 4194240) === lanes) break; didTimeout = root.eventTimes; for (originallyAttemptedLanes = -1; 0 < lanes; ) (errorRetryLanes$237 = 31 - clz32(lanes)), @@ -13747,7 +13739,7 @@ function performSyncWorkOnRoot(root) { if (0 !== (executionContext & 6)) throw Error(formatProdErrorMessage(327)); flushPassiveEffects(); var lanes = getNextLanes(root, 0); - if (0 === (lanes & 3)) return ensureRootIsScheduled(root, now()), null; + if (0 === (lanes & 1)) return ensureRootIsScheduled(root, now()), null; var exitStatus = renderRootSync(root, lanes); if (0 !== root.tag && 2 === exitStatus) { var originallyAttemptedLanes = lanes, @@ -13807,7 +13799,7 @@ function flushSync(fn) { try { if ( ((ReactCurrentBatchConfig$3.transition = null), - (currentUpdatePriority = 2), + (currentUpdatePriority = 1), fn) ) return fn(); @@ -13861,11 +13853,9 @@ function handleThrow(root, thrownValue) { : 3; } else workInProgressSuspendedReason = - thrownValue === SelectiveHydrationException - ? 6 - : null !== thrownValue && - "object" === typeof thrownValue && - "function" === typeof thrownValue.then + null !== thrownValue && + "object" === typeof thrownValue && + "function" === typeof thrownValue.then ? 4 : 1; workInProgressThrownValue = thrownValue; @@ -13897,7 +13887,7 @@ function handleThrow(root, thrownValue) { } function shouldAttemptToSuspendUntilDataResolves() { if ( - (workInProgressRootRenderLanes & 125829120) === + (workInProgressRootRenderLanes & 130023424) === workInProgressRootRenderLanes ) return !0; @@ -13907,7 +13897,7 @@ function shouldAttemptToSuspendUntilDataResolves() { ) return !1; if ( - (workInProgressRootRenderLanes & 8388480) === + (workInProgressRootRenderLanes & 4194240) === workInProgressRootRenderLanes ) { var suspenseHandler = suspenseHandlerStackCursor.current; @@ -13960,23 +13950,15 @@ function renderRootSync(root, lanes) { prepareFreshStack(root, lanes); } enableSchedulingProfiler && markRenderStarted(lanes); - a: do + do try { - if (0 !== workInProgressSuspendedReason && null !== workInProgress) - switch ( - ((lanes = workInProgress), - (memoizedUpdaters = workInProgressThrownValue), - workInProgressSuspendedReason) - ) { - case 6: - workInProgress = null; - workInProgressRootExitStatus = 6; - break a; - default: - (workInProgressSuspendedReason = 0), - (workInProgressThrownValue = null), - unwindSuspendedUnitOfWork(lanes, memoizedUpdaters); - } + 0 !== workInProgressSuspendedReason && + null !== workInProgress && + ((lanes = workInProgress), + (memoizedUpdaters = workInProgressThrownValue), + (workInProgressSuspendedReason = 0), + (workInProgressThrownValue = null), + unwindSuspendedUnitOfWork(lanes, memoizedUpdaters)); workLoopSync(); break; } catch (thrownValue$240) { @@ -14059,10 +14041,6 @@ function renderRootConcurrent(root, lanes) { workInProgressThrownValue = null; unwindSuspendedUnitOfWork(lanes, memoizedUpdaters); break; - case 6: - workInProgress = null; - workInProgressRootExitStatus = 6; - break a; default: throw Error(formatProdErrorMessage(462)); } @@ -14372,7 +14350,7 @@ function commitRoot(root, recoverableErrors, transitions) { prevTransition = ReactCurrentBatchConfig$3.transition; try { (ReactCurrentBatchConfig$3.transition = null), - (currentUpdatePriority = 2), + (currentUpdatePriority = 1), commitRootImpl( root, recoverableErrors, @@ -14429,7 +14407,7 @@ function commitRootImpl( transitions = ReactCurrentBatchConfig$3.transition; ReactCurrentBatchConfig$3.transition = null; var previousPriority = currentUpdatePriority; - currentUpdatePriority = 2; + currentUpdatePriority = 1; var prevExecutionContext = executionContext; executionContext |= 4; ReactCurrentOwner$2.current = null; @@ -14494,11 +14472,11 @@ function commitRootImpl( (root = firstUncaughtError), (firstUncaughtError = null), root); - 0 !== (pendingPassiveEffectsLanes & 3) && + 0 !== (pendingPassiveEffectsLanes & 1) && 0 !== root.tag && flushPassiveEffects(); remainingLanes = root.pendingLanes; - 0 !== (remainingLanes & 3) + 0 !== (remainingLanes & 1) ? ((nestedUpdateScheduled = !0), root === rootWithNestedUpdates ? nestedUpdateCount++ @@ -14537,7 +14515,7 @@ function flushPassiveEffects() { remainingLanes = pendingPassiveEffectsRemainingLanes; pendingPassiveEffectsRemainingLanes = 0; var renderPriority = lanesToEventPriority(pendingPassiveEffectsLanes); - renderPriority = 32 > renderPriority ? 32 : renderPriority; + renderPriority = 16 > renderPriority ? 16 : renderPriority; var prevTransition = ReactCurrentBatchConfig$3.transition, previousPriority = currentUpdatePriority; try { @@ -14619,11 +14597,11 @@ function flushPassiveEffectsImpl() { } function captureCommitPhaseErrorOnRoot(rootFiber, sourceFiber, error) { sourceFiber = createCapturedValueAtFiber(error, sourceFiber); - sourceFiber = createRootErrorUpdate(rootFiber, sourceFiber, 2); - rootFiber = enqueueUpdate$1(rootFiber, sourceFiber, 2); + sourceFiber = createRootErrorUpdate(rootFiber, sourceFiber, 1); + rootFiber = enqueueUpdate$1(rootFiber, sourceFiber, 1); sourceFiber = requestEventTime(); null !== rootFiber && - (markRootUpdated(rootFiber, 2, sourceFiber), + (markRootUpdated(rootFiber, 1, sourceFiber), ensureRootIsScheduled(rootFiber, sourceFiber)); } function captureCommitPhaseError(sourceFiber, nearestMountedAncestor, error) { @@ -14657,16 +14635,16 @@ function captureCommitPhaseError(sourceFiber, nearestMountedAncestor, error) { sourceFiber = createClassErrorUpdate( nearestMountedAncestor, sourceFiber, - 2 + 1 ); nearestMountedAncestor = enqueueUpdate$1( nearestMountedAncestor, sourceFiber, - 2 + 1 ); sourceFiber = requestEventTime(); null !== nearestMountedAncestor && - (markRootUpdated(nearestMountedAncestor, 2, sourceFiber), + (markRootUpdated(nearestMountedAncestor, 1, sourceFiber), ensureRootIsScheduled(nearestMountedAncestor, sourceFiber)); break; } @@ -14700,7 +14678,7 @@ function pingSuspendedRoot(root, wakeable, pingedLanes) { (workInProgressRootRenderLanes & pingedLanes) === pingedLanes && (4 === workInProgressRootExitStatus || (3 === workInProgressRootExitStatus && - (workInProgressRootRenderLanes & 125829120) === + (workInProgressRootRenderLanes & 130023424) === workInProgressRootRenderLanes && 500 > now() - globalMostRecentFallbackTime) ? prepareFreshStack(root, 0) @@ -14710,10 +14688,10 @@ function pingSuspendedRoot(root, wakeable, pingedLanes) { function retryTimedOutBoundary(boundaryFiber, retryLane) { 0 === retryLane && (0 === (boundaryFiber.mode & 1) - ? (retryLane = 2) + ? (retryLane = 1) : ((retryLane = nextRetryLane), (nextRetryLane <<= 1), - 0 === (nextRetryLane & 125829120) && (nextRetryLane = 8388608))); + 0 === (nextRetryLane & 130023424) && (nextRetryLane = 4194304))); var eventTime = requestEventTime(); boundaryFiber = enqueueConcurrentRenderForLane(boundaryFiber, retryLane); null !== boundaryFiber && @@ -15778,7 +15756,7 @@ _attemptSynchronousHydration = function(fiber) { if (root$249.current.memoizedState.isDehydrated) { var lanes = getHighestPriorityLanes(root$249.pendingLanes); 0 !== lanes && - (markRootEntangled(root$249, lanes | 2), + (markRootEntangled(root$249, lanes | 1), ensureRootIsScheduled(root$249, now()), 0 === (executionContext & 6) && (resetRenderTimer(), flushSyncCallbacks())); @@ -15786,23 +15764,23 @@ _attemptSynchronousHydration = function(fiber) { break; case 13: flushSync(function() { - var root = enqueueConcurrentRenderForLane(fiber, 2); + var root = enqueueConcurrentRenderForLane(fiber, 1); if (null !== root) { var eventTime = requestEventTime(); - scheduleUpdateOnFiber(root, fiber, 2, eventTime); + scheduleUpdateOnFiber(root, fiber, 1, eventTime); } }), - markRetryLaneIfNotHydrated(fiber, 2); + markRetryLaneIfNotHydrated(fiber, 1); } }; attemptDiscreteHydration = function(fiber) { if (13 === fiber.tag) { - var root = enqueueConcurrentRenderForLane(fiber, 2); + var root = enqueueConcurrentRenderForLane(fiber, 1); if (null !== root) { var eventTime = requestEventTime(); - scheduleUpdateOnFiber(root, fiber, 2, eventTime); + scheduleUpdateOnFiber(root, fiber, 1, eventTime); } - markRetryLaneIfNotHydrated(fiber, 2); + markRetryLaneIfNotHydrated(fiber, 1); } }; attemptContinuousHydration = function(fiber) { @@ -15872,7 +15850,7 @@ Internals.Events = [ var devToolsConfig$jscomp$inline_1815 = { findFiberByHostInstance: getClosestInstanceFromNode, bundleType: 0, - version: "18.3.0-www-modern-2ccfa657d-20221205", + version: "18.3.0-www-modern-d807eb52c-20221205", rendererPackageName: "react-dom" }; (function(internals) { @@ -15917,7 +15895,7 @@ var devToolsConfig$jscomp$inline_1815 = { scheduleRoot: null, setRefreshHandler: null, getCurrentFiber: null, - reconcilerVersion: "18.3.0-next-2ccfa657d-20221205" + reconcilerVersion: "18.3.0-next-d807eb52c-20221205" }); exports.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED = Internals; exports.createPortal = function(children, container) { @@ -16082,7 +16060,7 @@ exports.unstable_flushControlled = function(fn) { previousPriority = currentUpdatePriority; try { (ReactCurrentBatchConfig$3.transition = null), - (currentUpdatePriority = 2), + (currentUpdatePriority = 1), fn(); } finally { (currentUpdatePriority = previousPriority), @@ -16092,7 +16070,7 @@ exports.unstable_flushControlled = function(fn) { } }; exports.unstable_runWithPriority = runWithPriority; -exports.version = "18.3.0-next-2ccfa657d-20221205"; +exports.version = "18.3.0-next-d807eb52c-20221205"; /* global __REACT_DEVTOOLS_GLOBAL_HOOK__ */ if ( diff --git a/compiled/facebook-www/ReactDOMServer-dev.classic.js b/compiled/facebook-www/ReactDOMServer-dev.classic.js index 92012487e496f..b10f3299fcd8b 100644 --- a/compiled/facebook-www/ReactDOMServer-dev.classic.js +++ b/compiled/facebook-www/ReactDOMServer-dev.classic.js @@ -18,7 +18,7 @@ if (__DEV__) { var React = require("react"); -var ReactVersion = "18.3.0-www-classic-2ccfa657d-20221205"; +var ReactVersion = "18.3.0-www-classic-d807eb52c-20221205"; // This refers to a WWW module. var warningWWW = require("warning"); diff --git a/compiled/facebook-www/ReactDOMServer-dev.modern.js b/compiled/facebook-www/ReactDOMServer-dev.modern.js index 660f04d8757aa..5527259dd1772 100644 --- a/compiled/facebook-www/ReactDOMServer-dev.modern.js +++ b/compiled/facebook-www/ReactDOMServer-dev.modern.js @@ -18,7 +18,7 @@ if (__DEV__) { var React = require("react"); -var ReactVersion = "18.3.0-www-modern-2ccfa657d-20221205"; +var ReactVersion = "18.3.0-www-modern-d807eb52c-20221205"; // This refers to a WWW module. var warningWWW = require("warning"); diff --git a/compiled/facebook-www/ReactDOMServer-prod.classic.js b/compiled/facebook-www/ReactDOMServer-prod.classic.js index fb1ebf717fb71..77e7ac3e971e3 100644 --- a/compiled/facebook-www/ReactDOMServer-prod.classic.js +++ b/compiled/facebook-www/ReactDOMServer-prod.classic.js @@ -3620,4 +3620,4 @@ exports.renderToString = function(children, options) { 'The server used "renderToString" which does not support Suspense. If you intended for this Suspense boundary to render the fallback content on the server consider throwing an Error somewhere within the Suspense boundary. If you intended to have the server wait for the suspended component please switch to "renderToReadableStream" which supports Suspense on the server' ); }; -exports.version = "18.3.0-www-classic-2ccfa657d-20221205"; +exports.version = "18.3.0-www-classic-d807eb52c-20221205"; diff --git a/compiled/facebook-www/ReactDOMServer-prod.modern.js b/compiled/facebook-www/ReactDOMServer-prod.modern.js index 12dbd374f0b4c..f00bb70dbce39 100644 --- a/compiled/facebook-www/ReactDOMServer-prod.modern.js +++ b/compiled/facebook-www/ReactDOMServer-prod.modern.js @@ -3533,4 +3533,4 @@ exports.renderToString = function(children, options) { 'The server used "renderToString" which does not support Suspense. If you intended for this Suspense boundary to render the fallback content on the server consider throwing an Error somewhere within the Suspense boundary. If you intended to have the server wait for the suspended component please switch to "renderToReadableStream" which supports Suspense on the server' ); }; -exports.version = "18.3.0-www-modern-2ccfa657d-20221205"; +exports.version = "18.3.0-www-modern-d807eb52c-20221205"; diff --git a/compiled/facebook-www/ReactDOMTesting-dev.classic.js b/compiled/facebook-www/ReactDOMTesting-dev.classic.js index 8d8954b2f4962..a84dc6bbb5bd1 100644 --- a/compiled/facebook-www/ReactDOMTesting-dev.classic.js +++ b/compiled/facebook-www/ReactDOMTesting-dev.classic.js @@ -7645,91 +7645,91 @@ var NoLanes = var NoLane = /* */ 0; -var SyncHydrationLane = - /* */ - 1; var SyncLane = /* */ - 2; + 1; var InputContinuousHydrationLane = /* */ - 4; + 2; var InputContinuousLane = /* */ - 8; + 4; var DefaultHydrationLane = /* */ - 16; + 8; var DefaultLane = /* */ - 32; + 16; var TransitionHydrationLane = /* */ - 64; + 32; var TransitionLanes = /* */ - 8388480; + 4194240; var TransitionLane1 = /* */ - 128; + 64; var TransitionLane2 = /* */ - 256; + 128; var TransitionLane3 = /* */ - 512; + 256; var TransitionLane4 = /* */ - 1024; + 512; var TransitionLane5 = /* */ - 2048; + 1024; var TransitionLane6 = /* */ - 4096; + 2048; var TransitionLane7 = /* */ - 8192; + 4096; var TransitionLane8 = /* */ - 16384; + 8192; var TransitionLane9 = /* */ - 32768; + 16384; var TransitionLane10 = /* */ - 65536; + 32768; var TransitionLane11 = /* */ - 131072; + 65536; var TransitionLane12 = /* */ - 262144; + 131072; var TransitionLane13 = /* */ - 524288; + 262144; var TransitionLane14 = /* */ - 1048576; + 524288; var TransitionLane15 = /* */ - 2097152; + 1048576; var TransitionLane16 = /* */ - 4194304; + 2097152; var RetryLanes = /* */ - 125829120; + 130023424; var RetryLane1 = /* */ - 8388608; + 4194304; var RetryLane2 = /* */ - 16777216; + 8388608; var RetryLane3 = /* */ - 33554432; + 16777216; var RetryLane4 = + /* */ + 33554432; +var RetryLane5 = /* */ 67108864; var SomeRetryLane = RetryLane1; @@ -7754,9 +7754,6 @@ var nextRetryLane = RetryLane1; function getHighestPriorityLanes(lanes) { switch (getHighestPriorityLane(lanes)) { - case SyncHydrationLane: - return SyncHydrationLane; - case SyncLane: return SyncLane; @@ -7797,6 +7794,7 @@ function getHighestPriorityLanes(lanes) { case RetryLane2: case RetryLane3: case RetryLane4: + case RetryLane5: return lanes & RetryLanes; case SelectiveHydrationLane: @@ -7957,7 +7955,6 @@ function getMostRecentEventTime(root, lanes) { function computeExpirationTime(lane, currentTime) { switch (lane) { - case SyncHydrationLane: case SyncLane: case InputContinuousHydrationLane: case InputContinuousLane: @@ -7997,6 +7994,7 @@ function computeExpirationTime(lane, currentTime) { case RetryLane2: case RetryLane3: case RetryLane4: + case RetryLane5: // TODO: Retries should be allowed to expire if they are CPU bound for // too long, but when I made this change it caused a spike in browser // crashes. There must be some other underlying bug; not super urgent but @@ -8084,9 +8082,6 @@ function getLanesToRetrySynchronouslyOnError(root, originallyAttemptedLanes) { return NoLanes; } -function includesSyncLane(lanes) { - return (lanes & (SyncLane | SyncHydrationLane)) !== NoLanes; -} function includesNonIdleWork(lanes) { return (lanes & NonIdleLanes) !== NoLanes; } @@ -8094,8 +8089,6 @@ function includesOnlyRetries(lanes) { return (lanes & RetryLanes) === lanes; } function includesOnlyNonUrgentLanes(lanes) { - // TODO: Should hydration lanes be included here? This function is only - // used in `updateDeferredValueImpl`. var UrgentLanes = SyncLane | InputContinuousLane | DefaultLane; return (lanes & UrgentLanes) === NoLanes; } @@ -8337,10 +8330,6 @@ function getBumpedLaneForHydration(root, renderLanes) { var lane; switch (renderLane) { - case SyncLane: - lane = SyncHydrationLane; - break; - case InputContinuousLane: lane = InputContinuousHydrationLane; break; @@ -8369,6 +8358,7 @@ function getBumpedLaneForHydration(root, renderLanes) { case RetryLane2: case RetryLane3: case RetryLane4: + case RetryLane5: lane = TransitionHydrationLane; break; @@ -25370,14 +25360,7 @@ function throwException( } while (workInProgress !== null); } -var ReactCurrentOwner$1 = ReactSharedInternals.ReactCurrentOwner; // A special exception that's used to unwind the stack when an update flows -// into a dehydrated boundary. - -var SelectiveHydrationException = new Error( - "This is not a real error. It's an implementation detail of React's " + - "selective hydration feature. If this leaks into userspace, it's a bug in " + - "React. Please file an issue." -); +var ReactCurrentOwner$1 = ReactSharedInternals.ReactCurrentOwner; var didReceiveUpdate = false; var didWarnAboutBadClass; var didWarnAboutModulePatternComponent; @@ -27589,29 +27572,18 @@ function updateDehydratedSuspenseComponent( current, attemptHydrationAtLane, eventTime - ); // Throw a special object that signals to the work loop that it should - // interrupt the current render. - // - // Because we're inside a React-only execution stack, we don't - // strictly need to throw here — we could instead modify some internal - // work loop state. But using an exception means we don't need to - // check for this case on every iteration of the work loop. So doing - // it this way moves the check out of the fast path. - - throw SelectiveHydrationException; + ); } - } // If we did not selectively hydrate, we'll continue rendering without - // hydrating. Mark this tree as suspended to prevent it from committing - // outside a transition. - // - // This path should only happen if the hydration lane already suspended. - // Currently, it also happens during sync updates because there is no - // hydration lane for sync updates. + } // If we have scheduled higher pri work above, this will just abort the render + // since we now have higher priority work. We'll try to infinitely suspend until + // we yield. TODO: We could probably just force yielding earlier instead. + + renderDidSuspendDelayIfPossible(); // If we rendered synchronously, we won't yield so have to render something. + // This will cause us to delete any existing content. // TODO: We should ideally have a sync hydration lane that we can apply to do // a pass where we hydrate this subtree in place using the previous Context and then // reapply the update afterwards. - renderDidSuspendDelayIfPossible(); return retrySuspenseComponentWithoutHydrating( current, workInProgress, @@ -34884,8 +34856,7 @@ var SuspendedOnError = 1; var SuspendedOnData = 2; var SuspendedOnImmediate = 3; var SuspendedOnDeprecatedThrowPromise = 4; -var SuspendedAndReadyToUnwind = 5; -var SuspendedOnHydration = 6; // When this is true, the work-in-progress fiber just suspended (or errored) and +var SuspendedAndReadyToUnwind = 5; // When this is true, the work-in-progress fiber just suspended (or errored) and // we've yet to unwind the stack. In some cases, we may yield to the main thread // after this happens. If the fiber is pinged before we resume, we can retry // immediately instead of unwinding the stack. @@ -35217,7 +35188,7 @@ function ensureRootIsScheduled(root, currentTime) { // TODO: Temporary until we confirm this warning is not fired. if ( existingCallbackNode == null && - !includesSyncLane(existingCallbackPriority) + existingCallbackPriority !== SyncLane ) { error( "Expected scheduled callback to exist. This error is likely caused by a bug in React. Please file an issue." @@ -35235,7 +35206,7 @@ function ensureRootIsScheduled(root, currentTime) { var newCallbackNode; - if (includesSyncLane(newCallbackPriority)) { + if (newCallbackPriority === SyncLane) { // Special case: Sync React callbacks are scheduled on a special // internal queue if (root.tag === LegacyRoot) { @@ -35785,7 +35756,7 @@ function performSyncWorkOnRoot(root) { flushPassiveEffects(); var lanes = getNextLanes(root, NoLanes); - if (!includesSyncLane(lanes)) { + if (!includesSomeLane(lanes, SyncLane)) { // There's no remaining sync work left. ensureRootIsScheduled(root, now()); return null; @@ -36066,17 +36037,6 @@ function handleThrow(root, thrownValue) { workInProgressSuspendedReason = shouldAttemptToSuspendUntilDataResolves() ? SuspendedOnData : SuspendedOnImmediate; - } else if (thrownValue === SelectiveHydrationException) { - // An update flowed into a dehydrated boundary. Before we can apply the - // update, we need to finish hydrating. Interrupt the work-in-progress - // render so we can restart at the hydration lane. - // - // The ideal implementation would be able to switch contexts without - // unwinding the current stack. - // - // We could name this something more general but as of now it's the only - // case where we think this should happen. - workInProgressSuspendedReason = SuspendedOnHydration; } else { // This is a regular error. var isWakeable = @@ -36252,7 +36212,7 @@ function renderRootSync(root, lanes) { prepareFreshStack(root, lanes); } - outer: do { + do { try { if ( workInProgressSuspendedReason !== NotSuspended && @@ -36268,25 +36228,9 @@ function renderRootSync(root, lanes) { // function and fork the behavior some other way. var unitOfWork = workInProgress; var thrownValue = workInProgressThrownValue; - - switch (workInProgressSuspendedReason) { - case SuspendedOnHydration: { - // Selective hydration. An update flowed into a dehydrated tree. - // Interrupt the current render so the work loop can switch to the - // hydration lane. - workInProgress = null; - workInProgressRootExitStatus = RootDidNotComplete; - break outer; - } - - default: { - // Continue with the normal work loop. - workInProgressSuspendedReason = NotSuspended; - workInProgressThrownValue = null; - unwindSuspendedUnitOfWork(unitOfWork, thrownValue); - break; - } - } + workInProgressSuspendedReason = NotSuspended; + workInProgressThrownValue = null; + unwindSuspendedUnitOfWork(unitOfWork, thrownValue); // Continue with the normal work loop. } workLoopSync(); @@ -36415,15 +36359,6 @@ function renderRootConcurrent(root, lanes) { break; } - case SuspendedOnHydration: { - // Selective hydration. An update flowed into a dehydrated tree. - // Interrupt the current render so the work loop can switch to the - // hydration lane. - workInProgress = null; - workInProgressRootExitStatus = RootDidNotComplete; - break outer; - } - default: { throw new Error( "Unexpected SuspendedReason. This is a bug in React." @@ -36958,13 +36893,16 @@ function commitRootImpl( // currently schedule the callback in multiple places, will wait until those // are consolidated. - if (includesSyncLane(pendingPassiveEffectsLanes) && root.tag !== LegacyRoot) { + if ( + includesSomeLane(pendingPassiveEffectsLanes, SyncLane) && + root.tag !== LegacyRoot + ) { flushPassiveEffects(); } // Read this again, since a passive effect might have updated it remainingLanes = root.pendingLanes; - if (includesSyncLane(remainingLanes)) { + if (includesSomeLane(remainingLanes, SyncLane)) { // finishing. If there are too many, it indicates an infinite update loop. if (root === rootWithNestedUpdates) { @@ -38852,7 +38790,7 @@ function createFiberRoot( return root; } -var ReactVersion = "18.3.0-www-classic-2ccfa657d-20221205"; +var ReactVersion = "18.3.0-www-classic-d807eb52c-20221205"; function createPortal( children, diff --git a/compiled/facebook-www/ReactDOMTesting-dev.modern.js b/compiled/facebook-www/ReactDOMTesting-dev.modern.js index 51f764cb12bfb..6a0d88887f96d 100644 --- a/compiled/facebook-www/ReactDOMTesting-dev.modern.js +++ b/compiled/facebook-www/ReactDOMTesting-dev.modern.js @@ -5768,91 +5768,91 @@ var NoLanes = var NoLane = /* */ 0; -var SyncHydrationLane = - /* */ - 1; var SyncLane = /* */ - 2; + 1; var InputContinuousHydrationLane = /* */ - 4; + 2; var InputContinuousLane = /* */ - 8; + 4; var DefaultHydrationLane = /* */ - 16; + 8; var DefaultLane = /* */ - 32; + 16; var TransitionHydrationLane = /* */ - 64; + 32; var TransitionLanes = /* */ - 8388480; + 4194240; var TransitionLane1 = /* */ - 128; + 64; var TransitionLane2 = /* */ - 256; + 128; var TransitionLane3 = /* */ - 512; + 256; var TransitionLane4 = /* */ - 1024; + 512; var TransitionLane5 = /* */ - 2048; + 1024; var TransitionLane6 = /* */ - 4096; + 2048; var TransitionLane7 = /* */ - 8192; + 4096; var TransitionLane8 = /* */ - 16384; + 8192; var TransitionLane9 = /* */ - 32768; + 16384; var TransitionLane10 = /* */ - 65536; + 32768; var TransitionLane11 = /* */ - 131072; + 65536; var TransitionLane12 = /* */ - 262144; + 131072; var TransitionLane13 = /* */ - 524288; + 262144; var TransitionLane14 = /* */ - 1048576; + 524288; var TransitionLane15 = /* */ - 2097152; + 1048576; var TransitionLane16 = /* */ - 4194304; + 2097152; var RetryLanes = /* */ - 125829120; + 130023424; var RetryLane1 = /* */ - 8388608; + 4194304; var RetryLane2 = /* */ - 16777216; + 8388608; var RetryLane3 = /* */ - 33554432; + 16777216; var RetryLane4 = + /* */ + 33554432; +var RetryLane5 = /* */ 67108864; var SomeRetryLane = RetryLane1; @@ -5877,9 +5877,6 @@ var nextRetryLane = RetryLane1; function getHighestPriorityLanes(lanes) { switch (getHighestPriorityLane(lanes)) { - case SyncHydrationLane: - return SyncHydrationLane; - case SyncLane: return SyncLane; @@ -5920,6 +5917,7 @@ function getHighestPriorityLanes(lanes) { case RetryLane2: case RetryLane3: case RetryLane4: + case RetryLane5: return lanes & RetryLanes; case SelectiveHydrationLane: @@ -6080,7 +6078,6 @@ function getMostRecentEventTime(root, lanes) { function computeExpirationTime(lane, currentTime) { switch (lane) { - case SyncHydrationLane: case SyncLane: case InputContinuousHydrationLane: case InputContinuousLane: @@ -6120,6 +6117,7 @@ function computeExpirationTime(lane, currentTime) { case RetryLane2: case RetryLane3: case RetryLane4: + case RetryLane5: // TODO: Retries should be allowed to expire if they are CPU bound for // too long, but when I made this change it caused a spike in browser // crashes. There must be some other underlying bug; not super urgent but @@ -6207,9 +6205,6 @@ function getLanesToRetrySynchronouslyOnError(root, originallyAttemptedLanes) { return NoLanes; } -function includesSyncLane(lanes) { - return (lanes & (SyncLane | SyncHydrationLane)) !== NoLanes; -} function includesNonIdleWork(lanes) { return (lanes & NonIdleLanes) !== NoLanes; } @@ -6217,8 +6212,6 @@ function includesOnlyRetries(lanes) { return (lanes & RetryLanes) === lanes; } function includesOnlyNonUrgentLanes(lanes) { - // TODO: Should hydration lanes be included here? This function is only - // used in `updateDeferredValueImpl`. var UrgentLanes = SyncLane | InputContinuousLane | DefaultLane; return (lanes & UrgentLanes) === NoLanes; } @@ -6460,10 +6453,6 @@ function getBumpedLaneForHydration(root, renderLanes) { var lane; switch (renderLane) { - case SyncLane: - lane = SyncHydrationLane; - break; - case InputContinuousLane: lane = InputContinuousHydrationLane; break; @@ -6492,6 +6481,7 @@ function getBumpedLaneForHydration(root, renderLanes) { case RetryLane2: case RetryLane3: case RetryLane4: + case RetryLane5: lane = TransitionHydrationLane; break; @@ -24971,14 +24961,7 @@ function throwException( } while (workInProgress !== null); } -var ReactCurrentOwner$1 = ReactSharedInternals.ReactCurrentOwner; // A special exception that's used to unwind the stack when an update flows -// into a dehydrated boundary. - -var SelectiveHydrationException = new Error( - "This is not a real error. It's an implementation detail of React's " + - "selective hydration feature. If this leaks into userspace, it's a bug in " + - "React. Please file an issue." -); +var ReactCurrentOwner$1 = ReactSharedInternals.ReactCurrentOwner; var didReceiveUpdate = false; var didWarnAboutBadClass; var didWarnAboutModulePatternComponent; @@ -27174,29 +27157,18 @@ function updateDehydratedSuspenseComponent( current, attemptHydrationAtLane, eventTime - ); // Throw a special object that signals to the work loop that it should - // interrupt the current render. - // - // Because we're inside a React-only execution stack, we don't - // strictly need to throw here — we could instead modify some internal - // work loop state. But using an exception means we don't need to - // check for this case on every iteration of the work loop. So doing - // it this way moves the check out of the fast path. - - throw SelectiveHydrationException; + ); } - } // If we did not selectively hydrate, we'll continue rendering without - // hydrating. Mark this tree as suspended to prevent it from committing - // outside a transition. - // - // This path should only happen if the hydration lane already suspended. - // Currently, it also happens during sync updates because there is no - // hydration lane for sync updates. + } // If we have scheduled higher pri work above, this will just abort the render + // since we now have higher priority work. We'll try to infinitely suspend until + // we yield. TODO: We could probably just force yielding earlier instead. + + renderDidSuspendDelayIfPossible(); // If we rendered synchronously, we won't yield so have to render something. + // This will cause us to delete any existing content. // TODO: We should ideally have a sync hydration lane that we can apply to do // a pass where we hydrate this subtree in place using the previous Context and then // reapply the update afterwards. - renderDidSuspendDelayIfPossible(); return retrySuspenseComponentWithoutHydrating( current, workInProgress, @@ -34446,8 +34418,7 @@ var SuspendedOnError = 1; var SuspendedOnData = 2; var SuspendedOnImmediate = 3; var SuspendedOnDeprecatedThrowPromise = 4; -var SuspendedAndReadyToUnwind = 5; -var SuspendedOnHydration = 6; // When this is true, the work-in-progress fiber just suspended (or errored) and +var SuspendedAndReadyToUnwind = 5; // When this is true, the work-in-progress fiber just suspended (or errored) and // we've yet to unwind the stack. In some cases, we may yield to the main thread // after this happens. If the fiber is pinged before we resume, we can retry // immediately instead of unwinding the stack. @@ -34779,7 +34750,7 @@ function ensureRootIsScheduled(root, currentTime) { // TODO: Temporary until we confirm this warning is not fired. if ( existingCallbackNode == null && - !includesSyncLane(existingCallbackPriority) + existingCallbackPriority !== SyncLane ) { error( "Expected scheduled callback to exist. This error is likely caused by a bug in React. Please file an issue." @@ -34797,7 +34768,7 @@ function ensureRootIsScheduled(root, currentTime) { var newCallbackNode; - if (includesSyncLane(newCallbackPriority)) { + if (newCallbackPriority === SyncLane) { // Special case: Sync React callbacks are scheduled on a special // internal queue if (root.tag === LegacyRoot) { @@ -35347,7 +35318,7 @@ function performSyncWorkOnRoot(root) { flushPassiveEffects(); var lanes = getNextLanes(root, NoLanes); - if (!includesSyncLane(lanes)) { + if (!includesSomeLane(lanes, SyncLane)) { // There's no remaining sync work left. ensureRootIsScheduled(root, now()); return null; @@ -35628,17 +35599,6 @@ function handleThrow(root, thrownValue) { workInProgressSuspendedReason = shouldAttemptToSuspendUntilDataResolves() ? SuspendedOnData : SuspendedOnImmediate; - } else if (thrownValue === SelectiveHydrationException) { - // An update flowed into a dehydrated boundary. Before we can apply the - // update, we need to finish hydrating. Interrupt the work-in-progress - // render so we can restart at the hydration lane. - // - // The ideal implementation would be able to switch contexts without - // unwinding the current stack. - // - // We could name this something more general but as of now it's the only - // case where we think this should happen. - workInProgressSuspendedReason = SuspendedOnHydration; } else { // This is a regular error. var isWakeable = @@ -35814,7 +35774,7 @@ function renderRootSync(root, lanes) { prepareFreshStack(root, lanes); } - outer: do { + do { try { if ( workInProgressSuspendedReason !== NotSuspended && @@ -35830,25 +35790,9 @@ function renderRootSync(root, lanes) { // function and fork the behavior some other way. var unitOfWork = workInProgress; var thrownValue = workInProgressThrownValue; - - switch (workInProgressSuspendedReason) { - case SuspendedOnHydration: { - // Selective hydration. An update flowed into a dehydrated tree. - // Interrupt the current render so the work loop can switch to the - // hydration lane. - workInProgress = null; - workInProgressRootExitStatus = RootDidNotComplete; - break outer; - } - - default: { - // Continue with the normal work loop. - workInProgressSuspendedReason = NotSuspended; - workInProgressThrownValue = null; - unwindSuspendedUnitOfWork(unitOfWork, thrownValue); - break; - } - } + workInProgressSuspendedReason = NotSuspended; + workInProgressThrownValue = null; + unwindSuspendedUnitOfWork(unitOfWork, thrownValue); // Continue with the normal work loop. } workLoopSync(); @@ -35977,15 +35921,6 @@ function renderRootConcurrent(root, lanes) { break; } - case SuspendedOnHydration: { - // Selective hydration. An update flowed into a dehydrated tree. - // Interrupt the current render so the work loop can switch to the - // hydration lane. - workInProgress = null; - workInProgressRootExitStatus = RootDidNotComplete; - break outer; - } - default: { throw new Error( "Unexpected SuspendedReason. This is a bug in React." @@ -36520,13 +36455,16 @@ function commitRootImpl( // currently schedule the callback in multiple places, will wait until those // are consolidated. - if (includesSyncLane(pendingPassiveEffectsLanes) && root.tag !== LegacyRoot) { + if ( + includesSomeLane(pendingPassiveEffectsLanes, SyncLane) && + root.tag !== LegacyRoot + ) { flushPassiveEffects(); } // Read this again, since a passive effect might have updated it remainingLanes = root.pendingLanes; - if (includesSyncLane(remainingLanes)) { + if (includesSomeLane(remainingLanes, SyncLane)) { // finishing. If there are too many, it indicates an infinite update loop. if (root === rootWithNestedUpdates) { @@ -38414,7 +38352,7 @@ function createFiberRoot( return root; } -var ReactVersion = "18.3.0-www-modern-2ccfa657d-20221205"; +var ReactVersion = "18.3.0-www-modern-d807eb52c-20221205"; function createPortal( children, diff --git a/compiled/facebook-www/ReactDOMTesting-prod.classic.js b/compiled/facebook-www/ReactDOMTesting-prod.classic.js index 3fb2d12d60341..a873f0af5e69c 100644 --- a/compiled/facebook-www/ReactDOMTesting-prod.classic.js +++ b/compiled/facebook-www/ReactDOMTesting-prod.classic.js @@ -1606,8 +1606,8 @@ function clz32Fallback(x) { x >>>= 0; return 0 === x ? 32 : (31 - ((log(x) / LN2) | 0)) | 0; } -var nextTransitionLane = 128, - nextRetryLane = 8388608; +var nextTransitionLane = 64, + nextRetryLane = 4194304; function getHighestPriorityLanes(lanes) { switch (lanes & -lanes) { case 1: @@ -1623,7 +1623,6 @@ function getHighestPriorityLanes(lanes) { case 32: return 32; case 64: - return 64; case 128: case 256: case 512: @@ -1639,13 +1638,13 @@ function getHighestPriorityLanes(lanes) { case 524288: case 1048576: case 2097152: + return lanes & 4194240; case 4194304: - return lanes & 8388480; case 8388608: case 16777216: case 33554432: case 67108864: - return lanes & 125829120; + return lanes & 130023424; case 134217728: return 134217728; case 268435456: @@ -1686,12 +1685,12 @@ function getNextLanes(root, wipLanes) { ((suspendedLanes = nextLanes & -nextLanes), (pingedLanes = wipLanes & -wipLanes), suspendedLanes >= pingedLanes || - (32 === suspendedLanes && 0 !== (pingedLanes & 8388480))) + (16 === suspendedLanes && 0 !== (pingedLanes & 4194240))) ) return wipLanes; 0 === (root.current.mode & 32) && - 0 !== (nextLanes & 8) && - (nextLanes |= pendingLanes & 32); + 0 !== (nextLanes & 4) && + (nextLanes |= pendingLanes & 16); wipLanes = root.entangledLanes; if (0 !== wipLanes) for (root = root.entanglements, wipLanes &= nextLanes; 0 < wipLanes; ) @@ -1706,8 +1705,8 @@ function computeExpirationTime(lane, currentTime) { case 1: case 2: case 4: - case 8: return currentTime + 250; + case 8: case 16: case 32: case 64: @@ -1726,8 +1725,8 @@ function computeExpirationTime(lane, currentTime) { case 524288: case 1048576: case 2097152: - case 4194304: return currentTime + 5e3; + case 4194304: case 8388608: case 16777216: case 33554432: @@ -1747,7 +1746,7 @@ function markStarvedLanesAsExpired(root, currentTime) { var suspendedLanes = root.suspendedLanes, pingedLanes = root.pingedLanes, expirationTimes = root.expirationTimes, - lanes = root.pendingLanes & -125829121; + lanes = root.pendingLanes & -130023425; 0 < lanes; ) { @@ -1767,12 +1766,12 @@ function getLanesToRetrySynchronouslyOnError(root, originallyAttemptedLanes) { return 0 !== root ? root : root & 1073741824 ? 1073741824 : 0; } function includesBlockingLane(root, lanes) { - return 0 !== (root.current.mode & 32) ? !1 : 0 !== (lanes & 60); + return 0 !== (root.current.mode & 32) ? !1 : 0 !== (lanes & 30); } function claimNextTransitionLane() { var lane = nextTransitionLane; nextTransitionLane <<= 1; - 0 === (nextTransitionLane & 8388480) && (nextTransitionLane = 128); + 0 === (nextTransitionLane & 4194240) && (nextTransitionLane = 64); return lane; } function createLaneMap(initial) { @@ -1839,13 +1838,13 @@ function runWithPriority(priority, fn) { } function lanesToEventPriority(lanes) { lanes &= -lanes; - return 2 < lanes - ? 8 < lanes + return 1 < lanes + ? 4 < lanes ? 0 !== (lanes & 268435455) - ? 32 + ? 16 : 536870912 - : 8 - : 2; + : 4 + : 1; } var ReactDOMSharedInternals = require("ReactDOMComet") .__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED, @@ -4879,10 +4878,10 @@ function createEventListenerWrapperWithPriority( eventSystemFlags ) { switch (getEventPriority(domEventName)) { - case 2: + case 1: var listenerWrapper = dispatchDiscreteEvent; break; - case 8: + case 4: listenerWrapper = dispatchContinuousEvent; break; default: @@ -4905,7 +4904,7 @@ function dispatchDiscreteEvent( prevTransition = ReactCurrentBatchConfig.transition; ReactCurrentBatchConfig.transition = null; try { - (currentUpdatePriority = 2), + (currentUpdatePriority = 1), dispatchEvent(domEventName, eventSystemFlags, container, nativeEvent); } finally { (currentUpdatePriority = previousPriority), @@ -4922,7 +4921,7 @@ function dispatchContinuousEvent( prevTransition = ReactCurrentBatchConfig.transition; ReactCurrentBatchConfig.transition = null; try { - (currentUpdatePriority = 8), + (currentUpdatePriority = 4), dispatchEvent(domEventName, eventSystemFlags, container, nativeEvent); } finally { (currentUpdatePriority = previousPriority), @@ -5082,7 +5081,7 @@ function getEventPriority(domEventName) { case "popstate": case "select": case "selectstart": - return 2; + return 1; case "drag": case "dragenter": case "dragexit": @@ -5102,23 +5101,23 @@ function getEventPriority(domEventName) { case "mouseleave": case "pointerenter": case "pointerleave": - return 8; + return 4; case "message": switch (getCurrentPriorityLevel()) { case ImmediatePriority: - return 2; + return 1; case UserBlockingPriority: - return 8; + return 4; case NormalPriority: case LowPriority: - return 32; + return 16; case IdlePriority: return 536870912; default: - return 32; + return 16; } default: - return 32; + return 16; } } var Internals = { @@ -5221,7 +5220,7 @@ function flushSyncCallbacks() { previousUpdatePriority = currentUpdatePriority; try { var queue = syncQueue; - for (currentUpdatePriority = 2; i < queue.length; i++) { + for (currentUpdatePriority = 1; i < queue.length; i++) { var callback = queue[i]; do callback = callback(!0); while (null !== callback); @@ -5711,7 +5710,7 @@ function enqueueUpdate$1(fiber, update, lane) { } function entangleTransitions(root, fiber, lane) { fiber = fiber.updateQueue; - if (null !== fiber && ((fiber = fiber.shared), 0 !== (lane & 8388480))) { + if (null !== fiber && ((fiber = fiber.shared), 0 !== (lane & 4194240))) { var queueLanes = fiber.lanes; queueLanes &= root.pendingLanes; lane |= queueLanes; @@ -7144,8 +7143,8 @@ function checkIfSnapshotChanged(inst) { } } function forceStoreRerender(fiber) { - var root = enqueueConcurrentRenderForLane(fiber, 2); - null !== root && scheduleUpdateOnFiber(root, fiber, 2, -1); + var root = enqueueConcurrentRenderForLane(fiber, 1); + null !== root && scheduleUpdateOnFiber(root, fiber, 1, -1); } function mountState(initialState) { var hook = mountWorkInProgressHook(); @@ -7274,7 +7273,7 @@ function updateMemo(nextCreate, deps) { return nextCreate; } function updateDeferredValueImpl(hook, prevValue, value) { - if (0 === (renderLanes & 42)) + if (0 === (renderLanes & 21)) return ( hook.baseState && ((hook.baseState = !1), (didReceiveUpdate = !0)), (hook.memoizedState = value) @@ -7289,7 +7288,7 @@ function updateDeferredValueImpl(hook, prevValue, value) { function startTransition(setPending, callback) { var previousPriority = currentUpdatePriority; currentUpdatePriority = - 0 !== previousPriority && 8 > previousPriority ? previousPriority : 8; + 0 !== previousPriority && 4 > previousPriority ? previousPriority : 4; setPending(!0); var prevTransition = ReactCurrentBatchConfig$1.transition; ReactCurrentBatchConfig$1.transition = {}; @@ -7403,7 +7402,7 @@ function enqueueRenderPhaseUpdate(queue, update) { queue.pending = update; } function entangleTransitionUpdate(root, queue, lane) { - if (0 !== (lane & 8388480)) { + if (0 !== (lane & 4194240)) { var queueLanes = queue.lanes; queueLanes &= root.pendingLanes; lane |= queueLanes; @@ -7904,10 +7903,10 @@ function markSuspenseBoundaryShouldCapture( 1 === sourceFiber.tag && (null === sourceFiber.alternate ? (sourceFiber.tag = 17) - : ((returnFiber = createUpdate(-1, 2)), + : ((returnFiber = createUpdate(-1, 1)), (returnFiber.tag = 2), - enqueueUpdate$1(sourceFiber, returnFiber, 2))), - (sourceFiber.lanes |= 2)), + enqueueUpdate$1(sourceFiber, returnFiber, 1))), + (sourceFiber.lanes |= 1)), suspenseBoundary ); suspenseBoundary.flags |= 32768; @@ -7915,7 +7914,6 @@ function markSuspenseBoundaryShouldCapture( return suspenseBoundary; } var ReactCurrentOwner$1 = ReactSharedInternals.ReactCurrentOwner, - SelectiveHydrationException = Error(formatProdErrorMessage(461)), didReceiveUpdate = !1; function reconcileChildren(current, workInProgress, nextChildren, renderLanes) { workInProgress.child = @@ -8479,9 +8477,9 @@ function updateSuspenseComponent(current, workInProgress, renderLanes) { ) return ( 0 === (workInProgress.mode & 1) - ? (workInProgress.lanes = 2) + ? (workInProgress.lanes = 1) : "$!" === current.data - ? (workInProgress.lanes = 16) + ? (workInProgress.lanes = 8) : (workInProgress.lanes = 1073741824), null ); @@ -8517,7 +8515,7 @@ function updateSuspenseComponent(current, workInProgress, renderLanes) { renderLanes )), (workInProgress.memoizedState = SUSPENDED_MARKER), - (workInProgress.lanes = 8388608), + (workInProgress.lanes = 4194304), current ); pushPrimaryTreeSuspenseHandler(workInProgress); @@ -8746,15 +8744,13 @@ function updateDehydratedSuspenseComponent( nextProps = workInProgressRoot; if (null !== nextProps) { switch (renderLanes & -renderLanes) { - case 2: - suspenseInstance = 1; - break; - case 8: - suspenseInstance = 4; + case 4: + suspenseInstance = 2; break; - case 32: - suspenseInstance = 16; + case 16: + suspenseInstance = 8; break; + case 64: case 128: case 256: case 512: @@ -8775,7 +8771,7 @@ function updateDehydratedSuspenseComponent( case 16777216: case 33554432: case 67108864: - suspenseInstance = 64; + suspenseInstance = 32; break; case 536870912: suspenseInstance = 268435456; @@ -8787,14 +8783,11 @@ function updateDehydratedSuspenseComponent( 0 !== (suspenseInstance & (nextProps.suspendedLanes | renderLanes)) ? 0 : suspenseInstance; - if ( - 0 !== suspenseInstance && - suspenseInstance !== suspenseState.retryLane - ) - throw ((suspenseState.retryLane = suspenseInstance), + 0 !== suspenseInstance && + suspenseInstance !== suspenseState.retryLane && + ((suspenseState.retryLane = suspenseInstance), enqueueConcurrentRenderForLane(current, suspenseInstance), - scheduleUpdateOnFiber(nextProps, current, suspenseInstance, -1), - SelectiveHydrationException); + scheduleUpdateOnFiber(nextProps, current, suspenseInstance, -1)); } renderDidSuspendDelayIfPossible(); return retrySuspenseComponentWithoutHydrating( @@ -9863,7 +9856,7 @@ function completeWork(current, workInProgress, renderLanes) { ((workInProgress.flags |= 64), (newProps = !0), cutOffTailIfNeeded(type, !1), - (workInProgress.lanes = 8388608)); + (workInProgress.lanes = 4194304)); } else { if (!newProps) @@ -9892,7 +9885,7 @@ function completeWork(current, workInProgress, renderLanes) { ((workInProgress.flags |= 64), (newProps = !0), cutOffTailIfNeeded(type, !1), - (workInProgress.lanes = 8388608)); + (workInProgress.lanes = 4194304)); type.isBackwards ? ((JSCompiler_inline_result.sibling = workInProgress.child), (workInProgress.child = JSCompiler_inline_result)) @@ -12089,7 +12082,7 @@ function requestEventTime() { : (currentEventTime = now()); } function requestUpdateLane(fiber) { - if (0 === (fiber.mode & 1)) return 2; + if (0 === (fiber.mode & 1)) return 1; if (0 !== (executionContext & 2) && 0 !== workInProgressRootRenderLanes) return workInProgressRootRenderLanes & -workInProgressRootRenderLanes; if (null !== ReactCurrentBatchConfig$2.transition) @@ -12101,7 +12094,7 @@ function requestUpdateLane(fiber) { fiber = currentUpdatePriority; if (0 !== fiber) return fiber; fiber = window.event; - fiber = void 0 === fiber ? 32 : getEventPriority(fiber.type); + fiber = void 0 === fiber ? 16 : getEventPriority(fiber.type); return fiber; } function scheduleUpdateOnFiber(root, fiber, lane, eventTime) { @@ -12117,7 +12110,7 @@ function scheduleUpdateOnFiber(root, fiber, lane, eventTime) { 4 === workInProgressRootExitStatus && markRootSuspended$1(root, workInProgressRootRenderLanes)), ensureRootIsScheduled(root, eventTime), - 2 === lane && + 1 === lane && 0 === executionContext && 0 === (fiber.mode & 1) && (resetRenderTimer(), @@ -12139,7 +12132,7 @@ function ensureRootIsScheduled(root, currentTime) { root.callbackPriority !== currentTime) ) { null != existingCallbackNode && cancelCallback(existingCallbackNode); - if (0 !== (currentTime & 3)) + if (1 === currentTime) 0 === root.tag ? scheduleLegacySyncCallback(performSyncWorkOnRoot.bind(null, root)) : scheduleSyncCallback(performSyncWorkOnRoot.bind(null, root)), @@ -12149,13 +12142,13 @@ function ensureRootIsScheduled(root, currentTime) { (existingCallbackNode = null); else { switch (lanesToEventPriority(nextLanes)) { - case 2: + case 1: existingCallbackNode = ImmediatePriority; break; - case 8: + case 4: existingCallbackNode = UserBlockingPriority; break; - case 32: + case 16: existingCallbackNode = NormalPriority; break; case 536870912: @@ -12258,7 +12251,7 @@ function performConcurrentWorkOnRoot(root, didTimeout) { case 3: markRootSuspended$1(root, lanes); if ( - (lanes & 125829120) === lanes && + (lanes & 130023424) === lanes && ((didTimeout = globalMostRecentFallbackTime + 500 - now()), 10 < didTimeout) ) { @@ -12289,7 +12282,7 @@ function performConcurrentWorkOnRoot(root, didTimeout) { break; case 4: markRootSuspended$1(root, lanes); - if ((lanes & 8388480) === lanes) break; + if ((lanes & 4194240) === lanes) break; didTimeout = root.eventTimes; for (originallyAttemptedLanes = -1; 0 < lanes; ) (errorRetryLanes$194 = 31 - clz32(lanes)), @@ -12431,7 +12424,7 @@ function performSyncWorkOnRoot(root) { if (0 !== (executionContext & 6)) throw Error(formatProdErrorMessage(327)); flushPassiveEffects(); var lanes = getNextLanes(root, 0); - if (0 === (lanes & 3)) return ensureRootIsScheduled(root, now()), null; + if (0 === (lanes & 1)) return ensureRootIsScheduled(root, now()), null; var exitStatus = renderRootSync(root, lanes); if (0 !== root.tag && 2 === exitStatus) { var originallyAttemptedLanes = lanes, @@ -12491,7 +12484,7 @@ function flushSync(fn) { try { if ( ((ReactCurrentBatchConfig$3.transition = null), - (currentUpdatePriority = 2), + (currentUpdatePriority = 1), fn) ) return fn(); @@ -12546,11 +12539,9 @@ function handleThrow(root, thrownValue) { : 3; } else workInProgressSuspendedReason = - thrownValue === SelectiveHydrationException - ? 6 - : null !== thrownValue && - "object" === typeof thrownValue && - "function" === typeof thrownValue.then + null !== thrownValue && + "object" === typeof thrownValue && + "function" === typeof thrownValue.then ? 4 : 1; workInProgressThrownValue = thrownValue; @@ -12560,7 +12551,7 @@ function handleThrow(root, thrownValue) { } function shouldAttemptToSuspendUntilDataResolves() { if ( - (workInProgressRootRenderLanes & 125829120) === + (workInProgressRootRenderLanes & 130023424) === workInProgressRootRenderLanes ) return !0; @@ -12570,7 +12561,7 @@ function shouldAttemptToSuspendUntilDataResolves() { ) return !1; if ( - (workInProgressRootRenderLanes & 8388480) === + (workInProgressRootRenderLanes & 4194240) === workInProgressRootRenderLanes ) { var suspenseHandler = suspenseHandlerStackCursor.current; @@ -12613,21 +12604,14 @@ function renderRootSync(root, lanes) { prevCacheDispatcher = pushCacheDispatcher(); if (workInProgressRoot !== root || workInProgressRootRenderLanes !== lanes) (workInProgressTransitions = null), prepareFreshStack(root, lanes); - a: do + do try { if (0 !== workInProgressSuspendedReason && null !== workInProgress) { lanes = workInProgress; var thrownValue = workInProgressThrownValue; - switch (workInProgressSuspendedReason) { - case 6: - workInProgress = null; - workInProgressRootExitStatus = 6; - break a; - default: - (workInProgressSuspendedReason = 0), - (workInProgressThrownValue = null), - unwindSuspendedUnitOfWork(lanes, thrownValue); - } + workInProgressSuspendedReason = 0; + workInProgressThrownValue = null; + unwindSuspendedUnitOfWork(lanes, thrownValue); } workLoopSync(); break; @@ -12699,10 +12683,6 @@ function renderRootConcurrent(root, lanes) { workInProgressThrownValue = null; unwindSuspendedUnitOfWork(lanes, thrownValue); break; - case 6: - workInProgress = null; - workInProgressRootExitStatus = 6; - break a; default: throw Error(formatProdErrorMessage(462)); } @@ -12968,7 +12948,7 @@ function commitRoot(root, recoverableErrors, transitions) { prevTransition = ReactCurrentBatchConfig$3.transition; try { (ReactCurrentBatchConfig$3.transition = null), - (currentUpdatePriority = 2), + (currentUpdatePriority = 1), commitRootImpl( root, recoverableErrors, @@ -13019,7 +12999,7 @@ function commitRootImpl( transitions = ReactCurrentBatchConfig$3.transition; ReactCurrentBatchConfig$3.transition = null; var previousPriority = currentUpdatePriority; - currentUpdatePriority = 2; + currentUpdatePriority = 1; var prevExecutionContext = executionContext; executionContext |= 4; ReactCurrentOwner$2.current = null; @@ -13068,11 +13048,11 @@ function commitRootImpl( (root = firstUncaughtError), (firstUncaughtError = null), root); - 0 !== (pendingPassiveEffectsLanes & 3) && + 0 !== (pendingPassiveEffectsLanes & 1) && 0 !== root.tag && flushPassiveEffects(); remainingLanes = root.pendingLanes; - 0 !== (remainingLanes & 3) + 0 !== (remainingLanes & 1) ? root === rootWithNestedUpdates ? nestedUpdateCount++ : ((nestedUpdateCount = 0), (rootWithNestedUpdates = root)) @@ -13092,7 +13072,7 @@ function flushPassiveEffects() { remainingLanes = pendingPassiveEffectsRemainingLanes; pendingPassiveEffectsRemainingLanes = 0; var renderPriority = lanesToEventPriority(pendingPassiveEffectsLanes), - priority = 32 > renderPriority ? 32 : renderPriority; + priority = 16 > renderPriority ? 16 : renderPriority; renderPriority = ReactCurrentBatchConfig$3.transition; var previousPriority = currentUpdatePriority; try { @@ -13135,11 +13115,11 @@ function flushPassiveEffects() { } function captureCommitPhaseErrorOnRoot(rootFiber, sourceFiber, error) { sourceFiber = createCapturedValueAtFiber(error, sourceFiber); - sourceFiber = createRootErrorUpdate(rootFiber, sourceFiber, 2); - rootFiber = enqueueUpdate$1(rootFiber, sourceFiber, 2); + sourceFiber = createRootErrorUpdate(rootFiber, sourceFiber, 1); + rootFiber = enqueueUpdate$1(rootFiber, sourceFiber, 1); sourceFiber = requestEventTime(); null !== rootFiber && - (markRootUpdated(rootFiber, 2, sourceFiber), + (markRootUpdated(rootFiber, 1, sourceFiber), ensureRootIsScheduled(rootFiber, sourceFiber)); } function captureCommitPhaseError(sourceFiber, nearestMountedAncestor, error) { @@ -13167,16 +13147,16 @@ function captureCommitPhaseError(sourceFiber, nearestMountedAncestor, error) { sourceFiber = createClassErrorUpdate( nearestMountedAncestor, sourceFiber, - 2 + 1 ); nearestMountedAncestor = enqueueUpdate$1( nearestMountedAncestor, sourceFiber, - 2 + 1 ); sourceFiber = requestEventTime(); null !== nearestMountedAncestor && - (markRootUpdated(nearestMountedAncestor, 2, sourceFiber), + (markRootUpdated(nearestMountedAncestor, 1, sourceFiber), ensureRootIsScheduled(nearestMountedAncestor, sourceFiber)); break; } @@ -13209,7 +13189,7 @@ function pingSuspendedRoot(root, wakeable, pingedLanes) { (workInProgressRootRenderLanes & pingedLanes) === pingedLanes && (4 === workInProgressRootExitStatus || (3 === workInProgressRootExitStatus && - (workInProgressRootRenderLanes & 125829120) === + (workInProgressRootRenderLanes & 130023424) === workInProgressRootRenderLanes && 500 > now() - globalMostRecentFallbackTime) ? prepareFreshStack(root, 0) @@ -13219,10 +13199,10 @@ function pingSuspendedRoot(root, wakeable, pingedLanes) { function retryTimedOutBoundary(boundaryFiber, retryLane) { 0 === retryLane && (0 === (boundaryFiber.mode & 1) - ? (retryLane = 2) + ? (retryLane = 1) : ((retryLane = nextRetryLane), (nextRetryLane <<= 1), - 0 === (nextRetryLane & 125829120) && (nextRetryLane = 8388608))); + 0 === (nextRetryLane & 130023424) && (nextRetryLane = 4194304))); var eventTime = requestEventTime(); boundaryFiber = enqueueConcurrentRenderForLane(boundaryFiber, retryLane); null !== boundaryFiber && @@ -14372,7 +14352,7 @@ _attemptSynchronousHydration = function(fiber) { if (root$205.current.memoizedState.isDehydrated) { var lanes = getHighestPriorityLanes(root$205.pendingLanes); 0 !== lanes && - (markRootEntangled(root$205, lanes | 2), + (markRootEntangled(root$205, lanes | 1), ensureRootIsScheduled(root$205, now()), 0 === (executionContext & 6) && (resetRenderTimer(), flushSyncCallbacks())); @@ -14380,13 +14360,13 @@ _attemptSynchronousHydration = function(fiber) { break; case 13: flushSync(function() { - var root = enqueueConcurrentRenderForLane(fiber, 2); + var root = enqueueConcurrentRenderForLane(fiber, 1); if (null !== root) { var eventTime = requestEventTime(); - scheduleUpdateOnFiber(root, fiber, 2, eventTime); + scheduleUpdateOnFiber(root, fiber, 1, eventTime); } }), - markRetryLaneIfNotHydrated(fiber, 2); + markRetryLaneIfNotHydrated(fiber, 1); } }; attemptContinuousHydration = function(fiber) { @@ -14456,7 +14436,7 @@ Internals.Events = [ var devToolsConfig$jscomp$inline_1699 = { findFiberByHostInstance: getClosestInstanceFromNode, bundleType: 0, - version: "18.3.0-www-classic-2ccfa657d-20221205", + version: "18.3.0-www-classic-d807eb52c-20221205", rendererPackageName: "react-dom" }; var internals$jscomp$inline_2091 = { @@ -14486,7 +14466,7 @@ var internals$jscomp$inline_2091 = { scheduleRoot: null, setRefreshHandler: null, getCurrentFiber: null, - reconcilerVersion: "18.3.0-next-2ccfa657d-20221205" + reconcilerVersion: "18.3.0-next-d807eb52c-20221205" }; if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) { var hook$jscomp$inline_2092 = __REACT_DEVTOOLS_GLOBAL_HOOK__; @@ -14835,7 +14815,7 @@ exports.unstable_flushControlled = function(fn) { previousPriority = currentUpdatePriority; try { (ReactCurrentBatchConfig$3.transition = null), - (currentUpdatePriority = 2), + (currentUpdatePriority = 1), fn(); } finally { (currentUpdatePriority = previousPriority), @@ -14863,4 +14843,4 @@ exports.unstable_renderSubtreeIntoContainer = function( ); }; exports.unstable_runWithPriority = runWithPriority; -exports.version = "18.3.0-next-2ccfa657d-20221205"; +exports.version = "18.3.0-next-d807eb52c-20221205"; diff --git a/compiled/facebook-www/ReactDOMTesting-prod.modern.js b/compiled/facebook-www/ReactDOMTesting-prod.modern.js index 1a705471020eb..e91e00ca6699d 100644 --- a/compiled/facebook-www/ReactDOMTesting-prod.modern.js +++ b/compiled/facebook-www/ReactDOMTesting-prod.modern.js @@ -1347,8 +1347,8 @@ function clz32Fallback(x) { x >>>= 0; return 0 === x ? 32 : (31 - ((log(x) / LN2) | 0)) | 0; } -var nextTransitionLane = 128, - nextRetryLane = 8388608; +var nextTransitionLane = 64, + nextRetryLane = 4194304; function getHighestPriorityLanes(lanes) { switch (lanes & -lanes) { case 1: @@ -1364,7 +1364,6 @@ function getHighestPriorityLanes(lanes) { case 32: return 32; case 64: - return 64; case 128: case 256: case 512: @@ -1380,13 +1379,13 @@ function getHighestPriorityLanes(lanes) { case 524288: case 1048576: case 2097152: + return lanes & 4194240; case 4194304: - return lanes & 8388480; case 8388608: case 16777216: case 33554432: case 67108864: - return lanes & 125829120; + return lanes & 130023424; case 134217728: return 134217728; case 268435456: @@ -1427,12 +1426,12 @@ function getNextLanes(root, wipLanes) { ((suspendedLanes = nextLanes & -nextLanes), (pingedLanes = wipLanes & -wipLanes), suspendedLanes >= pingedLanes || - (32 === suspendedLanes && 0 !== (pingedLanes & 8388480))) + (16 === suspendedLanes && 0 !== (pingedLanes & 4194240))) ) return wipLanes; 0 === (root.current.mode & 32) && - 0 !== (nextLanes & 8) && - (nextLanes |= pendingLanes & 32); + 0 !== (nextLanes & 4) && + (nextLanes |= pendingLanes & 16); wipLanes = root.entangledLanes; if (0 !== wipLanes) for (root = root.entanglements, wipLanes &= nextLanes; 0 < wipLanes; ) @@ -1447,8 +1446,8 @@ function computeExpirationTime(lane, currentTime) { case 1: case 2: case 4: - case 8: return currentTime + 250; + case 8: case 16: case 32: case 64: @@ -1467,8 +1466,8 @@ function computeExpirationTime(lane, currentTime) { case 524288: case 1048576: case 2097152: - case 4194304: return currentTime + 5e3; + case 4194304: case 8388608: case 16777216: case 33554432: @@ -1488,7 +1487,7 @@ function markStarvedLanesAsExpired(root, currentTime) { var suspendedLanes = root.suspendedLanes, pingedLanes = root.pingedLanes, expirationTimes = root.expirationTimes, - lanes = root.pendingLanes & -125829121; + lanes = root.pendingLanes & -130023425; 0 < lanes; ) { @@ -1508,12 +1507,12 @@ function getLanesToRetrySynchronouslyOnError(root, originallyAttemptedLanes) { return 0 !== root ? root : root & 1073741824 ? 1073741824 : 0; } function includesBlockingLane(root, lanes) { - return 0 !== (root.current.mode & 32) ? !1 : 0 !== (lanes & 60); + return 0 !== (root.current.mode & 32) ? !1 : 0 !== (lanes & 30); } function claimNextTransitionLane() { var lane = nextTransitionLane; nextTransitionLane <<= 1; - 0 === (nextTransitionLane & 8388480) && (nextTransitionLane = 128); + 0 === (nextTransitionLane & 4194240) && (nextTransitionLane = 64); return lane; } function createLaneMap(initial) { @@ -1580,13 +1579,13 @@ function runWithPriority(priority, fn) { } function lanesToEventPriority(lanes) { lanes &= -lanes; - return 2 < lanes - ? 8 < lanes + return 1 < lanes + ? 4 < lanes ? 0 !== (lanes & 268435455) - ? 32 + ? 16 : 536870912 - : 8 - : 2; + : 4 + : 1; } var _attemptSynchronousHydration, attemptContinuousHydration, @@ -1868,7 +1867,7 @@ function dispatchDiscreteEvent( prevTransition = ReactCurrentBatchConfig.transition; ReactCurrentBatchConfig.transition = null; try { - (currentUpdatePriority = 2), + (currentUpdatePriority = 1), dispatchEvent(domEventName, eventSystemFlags, container, nativeEvent); } finally { (currentUpdatePriority = previousPriority), @@ -1885,7 +1884,7 @@ function dispatchContinuousEvent( prevTransition = ReactCurrentBatchConfig.transition; ReactCurrentBatchConfig.transition = null; try { - (currentUpdatePriority = 8), + (currentUpdatePriority = 4), dispatchEvent(domEventName, eventSystemFlags, container, nativeEvent); } finally { (currentUpdatePriority = previousPriority), @@ -2045,7 +2044,7 @@ function getEventPriority(domEventName) { case "popstate": case "select": case "selectstart": - return 2; + return 1; case "drag": case "dragenter": case "dragexit": @@ -2065,23 +2064,23 @@ function getEventPriority(domEventName) { case "mouseleave": case "pointerenter": case "pointerleave": - return 8; + return 4; case "message": switch (getCurrentPriorityLevel()) { case ImmediatePriority: - return 2; + return 1; case UserBlockingPriority: - return 8; + return 4; case NormalPriority: case LowPriority: - return 32; + return 16; case IdlePriority: return 536870912; default: - return 32; + return 16; } default: - return 32; + return 16; } } var root = null, @@ -3052,10 +3051,10 @@ function addTrappedEventListener( isCapturePhaseListener ) { switch (getEventPriority(domEventName)) { - case 2: + case 1: var listenerWrapper = dispatchDiscreteEvent; break; - case 8: + case 4: listenerWrapper = dispatchContinuousEvent; break; default: @@ -5027,7 +5026,7 @@ function flushSyncCallbacks() { previousUpdatePriority = currentUpdatePriority; try { var queue = syncQueue; - for (currentUpdatePriority = 2; i < queue.length; i++) { + for (currentUpdatePriority = 1; i < queue.length; i++) { var callback = queue[i]; do callback = callback(!0); while (null !== callback); @@ -5517,7 +5516,7 @@ function enqueueUpdate$1(fiber, update, lane) { } function entangleTransitions(root, fiber, lane) { fiber = fiber.updateQueue; - if (null !== fiber && ((fiber = fiber.shared), 0 !== (lane & 8388480))) { + if (null !== fiber && ((fiber = fiber.shared), 0 !== (lane & 4194240))) { var queueLanes = fiber.lanes; queueLanes &= root.pendingLanes; lane |= queueLanes; @@ -6950,8 +6949,8 @@ function checkIfSnapshotChanged(inst) { } } function forceStoreRerender(fiber) { - var root = enqueueConcurrentRenderForLane(fiber, 2); - null !== root && scheduleUpdateOnFiber(root, fiber, 2, -1); + var root = enqueueConcurrentRenderForLane(fiber, 1); + null !== root && scheduleUpdateOnFiber(root, fiber, 1, -1); } function mountState(initialState) { var hook = mountWorkInProgressHook(); @@ -7080,7 +7079,7 @@ function updateMemo(nextCreate, deps) { return nextCreate; } function updateDeferredValueImpl(hook, prevValue, value) { - if (0 === (renderLanes & 42)) + if (0 === (renderLanes & 21)) return ( hook.baseState && ((hook.baseState = !1), (didReceiveUpdate = !0)), (hook.memoizedState = value) @@ -7095,7 +7094,7 @@ function updateDeferredValueImpl(hook, prevValue, value) { function startTransition(setPending, callback) { var previousPriority = currentUpdatePriority; currentUpdatePriority = - 0 !== previousPriority && 8 > previousPriority ? previousPriority : 8; + 0 !== previousPriority && 4 > previousPriority ? previousPriority : 4; setPending(!0); var prevTransition = ReactCurrentBatchConfig$1.transition; ReactCurrentBatchConfig$1.transition = {}; @@ -7209,7 +7208,7 @@ function enqueueRenderPhaseUpdate(queue, update) { queue.pending = update; } function entangleTransitionUpdate(root, queue, lane) { - if (0 !== (lane & 8388480)) { + if (0 !== (lane & 4194240)) { var queueLanes = queue.lanes; queueLanes &= root.pendingLanes; lane |= queueLanes; @@ -7696,10 +7695,10 @@ function markSuspenseBoundaryShouldCapture( 1 === sourceFiber.tag && (null === sourceFiber.alternate ? (sourceFiber.tag = 17) - : ((returnFiber = createUpdate(-1, 2)), + : ((returnFiber = createUpdate(-1, 1)), (returnFiber.tag = 2), - enqueueUpdate$1(sourceFiber, returnFiber, 2))), - (sourceFiber.lanes |= 2)), + enqueueUpdate$1(sourceFiber, returnFiber, 1))), + (sourceFiber.lanes |= 1)), suspenseBoundary ); suspenseBoundary.flags |= 32768; @@ -7707,7 +7706,6 @@ function markSuspenseBoundaryShouldCapture( return suspenseBoundary; } var ReactCurrentOwner$1 = ReactSharedInternals.ReactCurrentOwner, - SelectiveHydrationException = Error(formatProdErrorMessage(461)), didReceiveUpdate = !1; function reconcileChildren(current, workInProgress, nextChildren, renderLanes) { workInProgress.child = @@ -8235,9 +8233,9 @@ function updateSuspenseComponent(current, workInProgress, renderLanes) { ) return ( 0 === (workInProgress.mode & 1) - ? (workInProgress.lanes = 2) + ? (workInProgress.lanes = 1) : "$!" === current.data - ? (workInProgress.lanes = 16) + ? (workInProgress.lanes = 8) : (workInProgress.lanes = 1073741824), null ); @@ -8273,7 +8271,7 @@ function updateSuspenseComponent(current, workInProgress, renderLanes) { renderLanes )), (workInProgress.memoizedState = SUSPENDED_MARKER), - (workInProgress.lanes = 8388608), + (workInProgress.lanes = 4194304), current ); pushPrimaryTreeSuspenseHandler(workInProgress); @@ -8502,15 +8500,13 @@ function updateDehydratedSuspenseComponent( nextProps = workInProgressRoot; if (null !== nextProps) { switch (renderLanes & -renderLanes) { - case 2: - suspenseInstance = 1; - break; - case 8: - suspenseInstance = 4; + case 4: + suspenseInstance = 2; break; - case 32: - suspenseInstance = 16; + case 16: + suspenseInstance = 8; break; + case 64: case 128: case 256: case 512: @@ -8531,7 +8527,7 @@ function updateDehydratedSuspenseComponent( case 16777216: case 33554432: case 67108864: - suspenseInstance = 64; + suspenseInstance = 32; break; case 536870912: suspenseInstance = 268435456; @@ -8543,14 +8539,11 @@ function updateDehydratedSuspenseComponent( 0 !== (suspenseInstance & (nextProps.suspendedLanes | renderLanes)) ? 0 : suspenseInstance; - if ( - 0 !== suspenseInstance && - suspenseInstance !== suspenseState.retryLane - ) - throw ((suspenseState.retryLane = suspenseInstance), + 0 !== suspenseInstance && + suspenseInstance !== suspenseState.retryLane && + ((suspenseState.retryLane = suspenseInstance), enqueueConcurrentRenderForLane(current, suspenseInstance), - scheduleUpdateOnFiber(nextProps, current, suspenseInstance, -1), - SelectiveHydrationException); + scheduleUpdateOnFiber(nextProps, current, suspenseInstance, -1)); } renderDidSuspendDelayIfPossible(); return retrySuspenseComponentWithoutHydrating( @@ -9605,7 +9598,7 @@ function completeWork(current, workInProgress, renderLanes) { ((workInProgress.flags |= 64), (newProps = !0), cutOffTailIfNeeded(type, !1), - (workInProgress.lanes = 8388608)); + (workInProgress.lanes = 4194304)); } else { if (!newProps) @@ -9634,7 +9627,7 @@ function completeWork(current, workInProgress, renderLanes) { ((workInProgress.flags |= 64), (newProps = !0), cutOffTailIfNeeded(type, !1), - (workInProgress.lanes = 8388608)); + (workInProgress.lanes = 4194304)); type.isBackwards ? ((JSCompiler_inline_result.sibling = workInProgress.child), (workInProgress.child = JSCompiler_inline_result)) @@ -11822,7 +11815,7 @@ function requestEventTime() { : (currentEventTime = now()); } function requestUpdateLane(fiber) { - if (0 === (fiber.mode & 1)) return 2; + if (0 === (fiber.mode & 1)) return 1; if (0 !== (executionContext & 2) && 0 !== workInProgressRootRenderLanes) return workInProgressRootRenderLanes & -workInProgressRootRenderLanes; if (null !== ReactCurrentBatchConfig$2.transition) @@ -11834,7 +11827,7 @@ function requestUpdateLane(fiber) { fiber = currentUpdatePriority; if (0 !== fiber) return fiber; fiber = window.event; - fiber = void 0 === fiber ? 32 : getEventPriority(fiber.type); + fiber = void 0 === fiber ? 16 : getEventPriority(fiber.type); return fiber; } function scheduleUpdateOnFiber(root, fiber, lane, eventTime) { @@ -11850,7 +11843,7 @@ function scheduleUpdateOnFiber(root, fiber, lane, eventTime) { 4 === workInProgressRootExitStatus && markRootSuspended$1(root, workInProgressRootRenderLanes)), ensureRootIsScheduled(root, eventTime), - 2 === lane && + 1 === lane && 0 === executionContext && 0 === (fiber.mode & 1) && (resetRenderTimer(), @@ -11872,7 +11865,7 @@ function ensureRootIsScheduled(root, currentTime) { root.callbackPriority !== currentTime) ) { null != existingCallbackNode && cancelCallback(existingCallbackNode); - if (0 !== (currentTime & 3)) + if (1 === currentTime) 0 === root.tag ? scheduleLegacySyncCallback(performSyncWorkOnRoot.bind(null, root)) : scheduleSyncCallback(performSyncWorkOnRoot.bind(null, root)), @@ -11882,13 +11875,13 @@ function ensureRootIsScheduled(root, currentTime) { (existingCallbackNode = null); else { switch (lanesToEventPriority(nextLanes)) { - case 2: + case 1: existingCallbackNode = ImmediatePriority; break; - case 8: + case 4: existingCallbackNode = UserBlockingPriority; break; - case 32: + case 16: existingCallbackNode = NormalPriority; break; case 536870912: @@ -11991,7 +11984,7 @@ function performConcurrentWorkOnRoot(root, didTimeout) { case 3: markRootSuspended$1(root, lanes); if ( - (lanes & 125829120) === lanes && + (lanes & 130023424) === lanes && ((didTimeout = globalMostRecentFallbackTime + 500 - now()), 10 < didTimeout) ) { @@ -12022,7 +12015,7 @@ function performConcurrentWorkOnRoot(root, didTimeout) { break; case 4: markRootSuspended$1(root, lanes); - if ((lanes & 8388480) === lanes) break; + if ((lanes & 4194240) === lanes) break; didTimeout = root.eventTimes; for (originallyAttemptedLanes = -1; 0 < lanes; ) (errorRetryLanes$195 = 31 - clz32(lanes)), @@ -12164,7 +12157,7 @@ function performSyncWorkOnRoot(root) { if (0 !== (executionContext & 6)) throw Error(formatProdErrorMessage(327)); flushPassiveEffects(); var lanes = getNextLanes(root, 0); - if (0 === (lanes & 3)) return ensureRootIsScheduled(root, now()), null; + if (0 === (lanes & 1)) return ensureRootIsScheduled(root, now()), null; var exitStatus = renderRootSync(root, lanes); if (0 !== root.tag && 2 === exitStatus) { var originallyAttemptedLanes = lanes, @@ -12224,7 +12217,7 @@ function flushSync(fn) { try { if ( ((ReactCurrentBatchConfig$3.transition = null), - (currentUpdatePriority = 2), + (currentUpdatePriority = 1), fn) ) return fn(); @@ -12279,11 +12272,9 @@ function handleThrow(root, thrownValue) { : 3; } else workInProgressSuspendedReason = - thrownValue === SelectiveHydrationException - ? 6 - : null !== thrownValue && - "object" === typeof thrownValue && - "function" === typeof thrownValue.then + null !== thrownValue && + "object" === typeof thrownValue && + "function" === typeof thrownValue.then ? 4 : 1; workInProgressThrownValue = thrownValue; @@ -12293,7 +12284,7 @@ function handleThrow(root, thrownValue) { } function shouldAttemptToSuspendUntilDataResolves() { if ( - (workInProgressRootRenderLanes & 125829120) === + (workInProgressRootRenderLanes & 130023424) === workInProgressRootRenderLanes ) return !0; @@ -12303,7 +12294,7 @@ function shouldAttemptToSuspendUntilDataResolves() { ) return !1; if ( - (workInProgressRootRenderLanes & 8388480) === + (workInProgressRootRenderLanes & 4194240) === workInProgressRootRenderLanes ) { var suspenseHandler = suspenseHandlerStackCursor.current; @@ -12346,21 +12337,14 @@ function renderRootSync(root, lanes) { prevCacheDispatcher = pushCacheDispatcher(); if (workInProgressRoot !== root || workInProgressRootRenderLanes !== lanes) (workInProgressTransitions = null), prepareFreshStack(root, lanes); - a: do + do try { if (0 !== workInProgressSuspendedReason && null !== workInProgress) { lanes = workInProgress; var thrownValue = workInProgressThrownValue; - switch (workInProgressSuspendedReason) { - case 6: - workInProgress = null; - workInProgressRootExitStatus = 6; - break a; - default: - (workInProgressSuspendedReason = 0), - (workInProgressThrownValue = null), - unwindSuspendedUnitOfWork(lanes, thrownValue); - } + workInProgressSuspendedReason = 0; + workInProgressThrownValue = null; + unwindSuspendedUnitOfWork(lanes, thrownValue); } workLoopSync(); break; @@ -12432,10 +12416,6 @@ function renderRootConcurrent(root, lanes) { workInProgressThrownValue = null; unwindSuspendedUnitOfWork(lanes, thrownValue); break; - case 6: - workInProgress = null; - workInProgressRootExitStatus = 6; - break a; default: throw Error(formatProdErrorMessage(462)); } @@ -12701,7 +12681,7 @@ function commitRoot(root, recoverableErrors, transitions) { prevTransition = ReactCurrentBatchConfig$3.transition; try { (ReactCurrentBatchConfig$3.transition = null), - (currentUpdatePriority = 2), + (currentUpdatePriority = 1), commitRootImpl( root, recoverableErrors, @@ -12752,7 +12732,7 @@ function commitRootImpl( transitions = ReactCurrentBatchConfig$3.transition; ReactCurrentBatchConfig$3.transition = null; var previousPriority = currentUpdatePriority; - currentUpdatePriority = 2; + currentUpdatePriority = 1; var prevExecutionContext = executionContext; executionContext |= 4; ReactCurrentOwner$2.current = null; @@ -12801,11 +12781,11 @@ function commitRootImpl( (root = firstUncaughtError), (firstUncaughtError = null), root); - 0 !== (pendingPassiveEffectsLanes & 3) && + 0 !== (pendingPassiveEffectsLanes & 1) && 0 !== root.tag && flushPassiveEffects(); remainingLanes = root.pendingLanes; - 0 !== (remainingLanes & 3) + 0 !== (remainingLanes & 1) ? root === rootWithNestedUpdates ? nestedUpdateCount++ : ((nestedUpdateCount = 0), (rootWithNestedUpdates = root)) @@ -12825,7 +12805,7 @@ function flushPassiveEffects() { remainingLanes = pendingPassiveEffectsRemainingLanes; pendingPassiveEffectsRemainingLanes = 0; var renderPriority = lanesToEventPriority(pendingPassiveEffectsLanes), - priority = 32 > renderPriority ? 32 : renderPriority; + priority = 16 > renderPriority ? 16 : renderPriority; renderPriority = ReactCurrentBatchConfig$3.transition; var previousPriority = currentUpdatePriority; try { @@ -12868,11 +12848,11 @@ function flushPassiveEffects() { } function captureCommitPhaseErrorOnRoot(rootFiber, sourceFiber, error) { sourceFiber = createCapturedValueAtFiber(error, sourceFiber); - sourceFiber = createRootErrorUpdate(rootFiber, sourceFiber, 2); - rootFiber = enqueueUpdate$1(rootFiber, sourceFiber, 2); + sourceFiber = createRootErrorUpdate(rootFiber, sourceFiber, 1); + rootFiber = enqueueUpdate$1(rootFiber, sourceFiber, 1); sourceFiber = requestEventTime(); null !== rootFiber && - (markRootUpdated(rootFiber, 2, sourceFiber), + (markRootUpdated(rootFiber, 1, sourceFiber), ensureRootIsScheduled(rootFiber, sourceFiber)); } function captureCommitPhaseError(sourceFiber, nearestMountedAncestor, error) { @@ -12900,16 +12880,16 @@ function captureCommitPhaseError(sourceFiber, nearestMountedAncestor, error) { sourceFiber = createClassErrorUpdate( nearestMountedAncestor, sourceFiber, - 2 + 1 ); nearestMountedAncestor = enqueueUpdate$1( nearestMountedAncestor, sourceFiber, - 2 + 1 ); sourceFiber = requestEventTime(); null !== nearestMountedAncestor && - (markRootUpdated(nearestMountedAncestor, 2, sourceFiber), + (markRootUpdated(nearestMountedAncestor, 1, sourceFiber), ensureRootIsScheduled(nearestMountedAncestor, sourceFiber)); break; } @@ -12942,7 +12922,7 @@ function pingSuspendedRoot(root, wakeable, pingedLanes) { (workInProgressRootRenderLanes & pingedLanes) === pingedLanes && (4 === workInProgressRootExitStatus || (3 === workInProgressRootExitStatus && - (workInProgressRootRenderLanes & 125829120) === + (workInProgressRootRenderLanes & 130023424) === workInProgressRootRenderLanes && 500 > now() - globalMostRecentFallbackTime) ? prepareFreshStack(root, 0) @@ -12952,10 +12932,10 @@ function pingSuspendedRoot(root, wakeable, pingedLanes) { function retryTimedOutBoundary(boundaryFiber, retryLane) { 0 === retryLane && (0 === (boundaryFiber.mode & 1) - ? (retryLane = 2) + ? (retryLane = 1) : ((retryLane = nextRetryLane), (nextRetryLane <<= 1), - 0 === (nextRetryLane & 125829120) && (nextRetryLane = 8388608))); + 0 === (nextRetryLane & 130023424) && (nextRetryLane = 4194304))); var eventTime = requestEventTime(); boundaryFiber = enqueueConcurrentRenderForLane(boundaryFiber, retryLane); null !== boundaryFiber && @@ -13892,7 +13872,7 @@ _attemptSynchronousHydration = function(fiber) { if (root$206.current.memoizedState.isDehydrated) { var lanes = getHighestPriorityLanes(root$206.pendingLanes); 0 !== lanes && - (markRootEntangled(root$206, lanes | 2), + (markRootEntangled(root$206, lanes | 1), ensureRootIsScheduled(root$206, now()), 0 === (executionContext & 6) && (resetRenderTimer(), flushSyncCallbacks())); @@ -13900,13 +13880,13 @@ _attemptSynchronousHydration = function(fiber) { break; case 13: flushSync(function() { - var root = enqueueConcurrentRenderForLane(fiber, 2); + var root = enqueueConcurrentRenderForLane(fiber, 1); if (null !== root) { var eventTime = requestEventTime(); - scheduleUpdateOnFiber(root, fiber, 2, eventTime); + scheduleUpdateOnFiber(root, fiber, 1, eventTime); } }), - markRetryLaneIfNotHydrated(fiber, 2); + markRetryLaneIfNotHydrated(fiber, 1); } }; attemptContinuousHydration = function(fiber) { @@ -13976,7 +13956,7 @@ Internals.Events = [ var devToolsConfig$jscomp$inline_1686 = { findFiberByHostInstance: getClosestInstanceFromNode, bundleType: 0, - version: "18.3.0-www-modern-2ccfa657d-20221205", + version: "18.3.0-www-modern-d807eb52c-20221205", rendererPackageName: "react-dom" }; var internals$jscomp$inline_2082 = { @@ -14007,7 +13987,7 @@ var internals$jscomp$inline_2082 = { scheduleRoot: null, setRefreshHandler: null, getCurrentFiber: null, - reconcilerVersion: "18.3.0-next-2ccfa657d-20221205" + reconcilerVersion: "18.3.0-next-d807eb52c-20221205" }; if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) { var hook$jscomp$inline_2083 = __REACT_DEVTOOLS_GLOBAL_HOOK__; @@ -14320,7 +14300,7 @@ exports.unstable_flushControlled = function(fn) { previousPriority = currentUpdatePriority; try { (ReactCurrentBatchConfig$3.transition = null), - (currentUpdatePriority = 2), + (currentUpdatePriority = 1), fn(); } finally { (currentUpdatePriority = previousPriority), @@ -14330,4 +14310,4 @@ exports.unstable_flushControlled = function(fn) { } }; exports.unstable_runWithPriority = runWithPriority; -exports.version = "18.3.0-next-2ccfa657d-20221205"; +exports.version = "18.3.0-next-d807eb52c-20221205"; diff --git a/compiled/facebook-www/ReactTestRenderer-dev.classic.js b/compiled/facebook-www/ReactTestRenderer-dev.classic.js index 206e860773e51..c7dc537d156c8 100644 --- a/compiled/facebook-www/ReactTestRenderer-dev.classic.js +++ b/compiled/facebook-www/ReactTestRenderer-dev.classic.js @@ -1152,91 +1152,91 @@ var NoLanes = var NoLane = /* */ 0; -var SyncHydrationLane = - /* */ - 1; var SyncLane = /* */ - 2; + 1; var InputContinuousHydrationLane = /* */ - 4; + 2; var InputContinuousLane = /* */ - 8; + 4; var DefaultHydrationLane = /* */ - 16; + 8; var DefaultLane = /* */ - 32; + 16; var TransitionHydrationLane = /* */ - 64; + 32; var TransitionLanes = /* */ - 8388480; + 4194240; var TransitionLane1 = /* */ - 128; + 64; var TransitionLane2 = /* */ - 256; + 128; var TransitionLane3 = /* */ - 512; + 256; var TransitionLane4 = /* */ - 1024; + 512; var TransitionLane5 = /* */ - 2048; + 1024; var TransitionLane6 = /* */ - 4096; + 2048; var TransitionLane7 = /* */ - 8192; + 4096; var TransitionLane8 = /* */ - 16384; + 8192; var TransitionLane9 = /* */ - 32768; + 16384; var TransitionLane10 = /* */ - 65536; + 32768; var TransitionLane11 = /* */ - 131072; + 65536; var TransitionLane12 = /* */ - 262144; + 131072; var TransitionLane13 = /* */ - 524288; + 262144; var TransitionLane14 = /* */ - 1048576; + 524288; var TransitionLane15 = /* */ - 2097152; + 1048576; var TransitionLane16 = /* */ - 4194304; + 2097152; var RetryLanes = /* */ - 125829120; + 130023424; var RetryLane1 = /* */ - 8388608; + 4194304; var RetryLane2 = /* */ - 16777216; + 8388608; var RetryLane3 = /* */ - 33554432; + 16777216; var RetryLane4 = + /* */ + 33554432; +var RetryLane5 = /* */ 67108864; var SomeRetryLane = RetryLane1; @@ -1261,9 +1261,6 @@ var nextRetryLane = RetryLane1; function getHighestPriorityLanes(lanes) { switch (getHighestPriorityLane(lanes)) { - case SyncHydrationLane: - return SyncHydrationLane; - case SyncLane: return SyncLane; @@ -1304,6 +1301,7 @@ function getHighestPriorityLanes(lanes) { case RetryLane2: case RetryLane3: case RetryLane4: + case RetryLane5: return lanes & RetryLanes; case SelectiveHydrationLane: @@ -1464,7 +1462,6 @@ function getMostRecentEventTime(root, lanes) { function computeExpirationTime(lane, currentTime) { switch (lane) { - case SyncHydrationLane: case SyncLane: case InputContinuousHydrationLane: case InputContinuousLane: @@ -1504,6 +1501,7 @@ function computeExpirationTime(lane, currentTime) { case RetryLane2: case RetryLane3: case RetryLane4: + case RetryLane5: // TODO: Retries should be allowed to expire if they are CPU bound for // too long, but when I made this change it caused a spike in browser // crashes. There must be some other underlying bug; not super urgent but @@ -1586,9 +1584,6 @@ function getLanesToRetrySynchronouslyOnError(root, originallyAttemptedLanes) { return NoLanes; } -function includesSyncLane(lanes) { - return (lanes & (SyncLane | SyncHydrationLane)) !== NoLanes; -} function includesNonIdleWork(lanes) { return (lanes & NonIdleLanes) !== NoLanes; } @@ -1596,8 +1591,6 @@ function includesOnlyRetries(lanes) { return (lanes & RetryLanes) === lanes; } function includesOnlyNonUrgentLanes(lanes) { - // TODO: Should hydration lanes be included here? This function is only - // used in `updateDeferredValueImpl`. var UrgentLanes = SyncLane | InputContinuousLane | DefaultLane; return (lanes & UrgentLanes) === NoLanes; } @@ -1835,10 +1828,6 @@ function getBumpedLaneForHydration(root, renderLanes) { var lane; switch (renderLane) { - case SyncLane: - lane = SyncHydrationLane; - break; - case InputContinuousLane: lane = InputContinuousHydrationLane; break; @@ -1867,6 +1856,7 @@ function getBumpedLaneForHydration(root, renderLanes) { case RetryLane2: case RetryLane3: case RetryLane4: + case RetryLane5: lane = TransitionHydrationLane; break; @@ -11012,14 +11002,7 @@ function throwException( } while (workInProgress !== null); } -var ReactCurrentOwner$1 = ReactSharedInternals.ReactCurrentOwner; // A special exception that's used to unwind the stack when an update flows -// into a dehydrated boundary. - -var SelectiveHydrationException = new Error( - "This is not a real error. It's an implementation detail of React's " + - "selective hydration feature. If this leaks into userspace, it's a bug in " + - "React. Please file an issue." -); +var ReactCurrentOwner$1 = ReactSharedInternals.ReactCurrentOwner; var didReceiveUpdate = false; var didWarnAboutBadClass; var didWarnAboutModulePatternComponent; @@ -12978,29 +12961,18 @@ function updateDehydratedSuspenseComponent( current, attemptHydrationAtLane, eventTime - ); // Throw a special object that signals to the work loop that it should - // interrupt the current render. - // - // Because we're inside a React-only execution stack, we don't - // strictly need to throw here — we could instead modify some internal - // work loop state. But using an exception means we don't need to - // check for this case on every iteration of the work loop. So doing - // it this way moves the check out of the fast path. - - throw SelectiveHydrationException; + ); } - } // If we did not selectively hydrate, we'll continue rendering without - // hydrating. Mark this tree as suspended to prevent it from committing - // outside a transition. - // - // This path should only happen if the hydration lane already suspended. - // Currently, it also happens during sync updates because there is no - // hydration lane for sync updates. + } // If we have scheduled higher pri work above, this will just abort the render + // since we now have higher priority work. We'll try to infinitely suspend until + // we yield. TODO: We could probably just force yielding earlier instead. + + renderDidSuspendDelayIfPossible(); // If we rendered synchronously, we won't yield so have to render something. + // This will cause us to delete any existing content. // TODO: We should ideally have a sync hydration lane that we can apply to do // a pass where we hydrate this subtree in place using the previous Context and then // reapply the update afterwards. - renderDidSuspendDelayIfPossible(); return retrySuspenseComponentWithoutHydrating( current, workInProgress, @@ -19829,8 +19801,7 @@ var SuspendedOnError = 1; var SuspendedOnData = 2; var SuspendedOnImmediate = 3; var SuspendedOnDeprecatedThrowPromise = 4; -var SuspendedAndReadyToUnwind = 5; -var SuspendedOnHydration = 6; // When this is true, the work-in-progress fiber just suspended (or errored) and +var SuspendedAndReadyToUnwind = 5; // When this is true, the work-in-progress fiber just suspended (or errored) and // we've yet to unwind the stack. In some cases, we may yield to the main thread // after this happens. If the fiber is pinged before we resume, we can retry // immediately instead of unwinding the stack. @@ -20148,7 +20119,7 @@ function ensureRootIsScheduled(root, currentTime) { // TODO: Temporary until we confirm this warning is not fired. if ( existingCallbackNode == null && - !includesSyncLane(existingCallbackPriority) + existingCallbackPriority !== SyncLane ) { error( "Expected scheduled callback to exist. This error is likely caused by a bug in React. Please file an issue." @@ -20166,7 +20137,7 @@ function ensureRootIsScheduled(root, currentTime) { var newCallbackNode; - if (includesSyncLane(newCallbackPriority)) { + if (newCallbackPriority === SyncLane) { // Special case: Sync React callbacks are scheduled on a special // internal queue if (root.tag === LegacyRoot) { @@ -20703,7 +20674,7 @@ function performSyncWorkOnRoot(root) { flushPassiveEffects(); var lanes = getNextLanes(root, NoLanes); - if (!includesSyncLane(lanes)) { + if (!includesSomeLane(lanes, SyncLane)) { // There's no remaining sync work left. ensureRootIsScheduled(root, now()); return null; @@ -20928,17 +20899,6 @@ function handleThrow(root, thrownValue) { workInProgressSuspendedReason = shouldAttemptToSuspendUntilDataResolves() ? SuspendedOnData : SuspendedOnImmediate; - } else if (thrownValue === SelectiveHydrationException) { - // An update flowed into a dehydrated boundary. Before we can apply the - // update, we need to finish hydrating. Interrupt the work-in-progress - // render so we can restart at the hydration lane. - // - // The ideal implementation would be able to switch contexts without - // unwinding the current stack. - // - // We could name this something more general but as of now it's the only - // case where we think this should happen. - workInProgressSuspendedReason = SuspendedOnHydration; } else { // This is a regular error. var isWakeable = @@ -21119,7 +21079,7 @@ function renderRootSync(root, lanes) { prepareFreshStack(root, lanes); } - outer: do { + do { try { if ( workInProgressSuspendedReason !== NotSuspended && @@ -21135,25 +21095,9 @@ function renderRootSync(root, lanes) { // function and fork the behavior some other way. var unitOfWork = workInProgress; var thrownValue = workInProgressThrownValue; - - switch (workInProgressSuspendedReason) { - case SuspendedOnHydration: { - // Selective hydration. An update flowed into a dehydrated tree. - // Interrupt the current render so the work loop can switch to the - // hydration lane. - workInProgress = null; - workInProgressRootExitStatus = RootDidNotComplete; - break outer; - } - - default: { - // Continue with the normal work loop. - workInProgressSuspendedReason = NotSuspended; - workInProgressThrownValue = null; - unwindSuspendedUnitOfWork(unitOfWork, thrownValue); - break; - } - } + workInProgressSuspendedReason = NotSuspended; + workInProgressThrownValue = null; + unwindSuspendedUnitOfWork(unitOfWork, thrownValue); // Continue with the normal work loop. } workLoopSync(); @@ -21282,15 +21226,6 @@ function renderRootConcurrent(root, lanes) { break; } - case SuspendedOnHydration: { - // Selective hydration. An update flowed into a dehydrated tree. - // Interrupt the current render so the work loop can switch to the - // hydration lane. - workInProgress = null; - workInProgressRootExitStatus = RootDidNotComplete; - break outer; - } - default: { throw new Error( "Unexpected SuspendedReason. This is a bug in React." @@ -21861,13 +21796,16 @@ function commitRootImpl( // currently schedule the callback in multiple places, will wait until those // are consolidated. - if (includesSyncLane(pendingPassiveEffectsLanes) && root.tag !== LegacyRoot) { + if ( + includesSomeLane(pendingPassiveEffectsLanes, SyncLane) && + root.tag !== LegacyRoot + ) { flushPassiveEffects(); } // Read this again, since a passive effect might have updated it remainingLanes = root.pendingLanes; - if (includesSyncLane(remainingLanes)) { + if (includesSomeLane(remainingLanes, SyncLane)) { { markNestedUpdateScheduled(); } // Count the number of times the root synchronously re-renders without @@ -23837,7 +23775,7 @@ function createFiberRoot( return root; } -var ReactVersion = "18.3.0-www-classic-2ccfa657d-20221205"; +var ReactVersion = "18.3.0-www-classic-d807eb52c-20221205"; var didWarnAboutNestedUpdates; diff --git a/compiled/facebook-www/ReactTestRenderer-dev.modern.js b/compiled/facebook-www/ReactTestRenderer-dev.modern.js index 0bdb16cc06eba..ad14ab64e1756 100644 --- a/compiled/facebook-www/ReactTestRenderer-dev.modern.js +++ b/compiled/facebook-www/ReactTestRenderer-dev.modern.js @@ -1152,91 +1152,91 @@ var NoLanes = var NoLane = /* */ 0; -var SyncHydrationLane = - /* */ - 1; var SyncLane = /* */ - 2; + 1; var InputContinuousHydrationLane = /* */ - 4; + 2; var InputContinuousLane = /* */ - 8; + 4; var DefaultHydrationLane = /* */ - 16; + 8; var DefaultLane = /* */ - 32; + 16; var TransitionHydrationLane = /* */ - 64; + 32; var TransitionLanes = /* */ - 8388480; + 4194240; var TransitionLane1 = /* */ - 128; + 64; var TransitionLane2 = /* */ - 256; + 128; var TransitionLane3 = /* */ - 512; + 256; var TransitionLane4 = /* */ - 1024; + 512; var TransitionLane5 = /* */ - 2048; + 1024; var TransitionLane6 = /* */ - 4096; + 2048; var TransitionLane7 = /* */ - 8192; + 4096; var TransitionLane8 = /* */ - 16384; + 8192; var TransitionLane9 = /* */ - 32768; + 16384; var TransitionLane10 = /* */ - 65536; + 32768; var TransitionLane11 = /* */ - 131072; + 65536; var TransitionLane12 = /* */ - 262144; + 131072; var TransitionLane13 = /* */ - 524288; + 262144; var TransitionLane14 = /* */ - 1048576; + 524288; var TransitionLane15 = /* */ - 2097152; + 1048576; var TransitionLane16 = /* */ - 4194304; + 2097152; var RetryLanes = /* */ - 125829120; + 130023424; var RetryLane1 = /* */ - 8388608; + 4194304; var RetryLane2 = /* */ - 16777216; + 8388608; var RetryLane3 = /* */ - 33554432; + 16777216; var RetryLane4 = + /* */ + 33554432; +var RetryLane5 = /* */ 67108864; var SomeRetryLane = RetryLane1; @@ -1261,9 +1261,6 @@ var nextRetryLane = RetryLane1; function getHighestPriorityLanes(lanes) { switch (getHighestPriorityLane(lanes)) { - case SyncHydrationLane: - return SyncHydrationLane; - case SyncLane: return SyncLane; @@ -1304,6 +1301,7 @@ function getHighestPriorityLanes(lanes) { case RetryLane2: case RetryLane3: case RetryLane4: + case RetryLane5: return lanes & RetryLanes; case SelectiveHydrationLane: @@ -1464,7 +1462,6 @@ function getMostRecentEventTime(root, lanes) { function computeExpirationTime(lane, currentTime) { switch (lane) { - case SyncHydrationLane: case SyncLane: case InputContinuousHydrationLane: case InputContinuousLane: @@ -1504,6 +1501,7 @@ function computeExpirationTime(lane, currentTime) { case RetryLane2: case RetryLane3: case RetryLane4: + case RetryLane5: // TODO: Retries should be allowed to expire if they are CPU bound for // too long, but when I made this change it caused a spike in browser // crashes. There must be some other underlying bug; not super urgent but @@ -1586,9 +1584,6 @@ function getLanesToRetrySynchronouslyOnError(root, originallyAttemptedLanes) { return NoLanes; } -function includesSyncLane(lanes) { - return (lanes & (SyncLane | SyncHydrationLane)) !== NoLanes; -} function includesNonIdleWork(lanes) { return (lanes & NonIdleLanes) !== NoLanes; } @@ -1596,8 +1591,6 @@ function includesOnlyRetries(lanes) { return (lanes & RetryLanes) === lanes; } function includesOnlyNonUrgentLanes(lanes) { - // TODO: Should hydration lanes be included here? This function is only - // used in `updateDeferredValueImpl`. var UrgentLanes = SyncLane | InputContinuousLane | DefaultLane; return (lanes & UrgentLanes) === NoLanes; } @@ -1835,10 +1828,6 @@ function getBumpedLaneForHydration(root, renderLanes) { var lane; switch (renderLane) { - case SyncLane: - lane = SyncHydrationLane; - break; - case InputContinuousLane: lane = InputContinuousHydrationLane; break; @@ -1867,6 +1856,7 @@ function getBumpedLaneForHydration(root, renderLanes) { case RetryLane2: case RetryLane3: case RetryLane4: + case RetryLane5: lane = TransitionHydrationLane; break; @@ -11012,14 +11002,7 @@ function throwException( } while (workInProgress !== null); } -var ReactCurrentOwner$1 = ReactSharedInternals.ReactCurrentOwner; // A special exception that's used to unwind the stack when an update flows -// into a dehydrated boundary. - -var SelectiveHydrationException = new Error( - "This is not a real error. It's an implementation detail of React's " + - "selective hydration feature. If this leaks into userspace, it's a bug in " + - "React. Please file an issue." -); +var ReactCurrentOwner$1 = ReactSharedInternals.ReactCurrentOwner; var didReceiveUpdate = false; var didWarnAboutBadClass; var didWarnAboutModulePatternComponent; @@ -12978,29 +12961,18 @@ function updateDehydratedSuspenseComponent( current, attemptHydrationAtLane, eventTime - ); // Throw a special object that signals to the work loop that it should - // interrupt the current render. - // - // Because we're inside a React-only execution stack, we don't - // strictly need to throw here — we could instead modify some internal - // work loop state. But using an exception means we don't need to - // check for this case on every iteration of the work loop. So doing - // it this way moves the check out of the fast path. - - throw SelectiveHydrationException; + ); } - } // If we did not selectively hydrate, we'll continue rendering without - // hydrating. Mark this tree as suspended to prevent it from committing - // outside a transition. - // - // This path should only happen if the hydration lane already suspended. - // Currently, it also happens during sync updates because there is no - // hydration lane for sync updates. + } // If we have scheduled higher pri work above, this will just abort the render + // since we now have higher priority work. We'll try to infinitely suspend until + // we yield. TODO: We could probably just force yielding earlier instead. + + renderDidSuspendDelayIfPossible(); // If we rendered synchronously, we won't yield so have to render something. + // This will cause us to delete any existing content. // TODO: We should ideally have a sync hydration lane that we can apply to do // a pass where we hydrate this subtree in place using the previous Context and then // reapply the update afterwards. - renderDidSuspendDelayIfPossible(); return retrySuspenseComponentWithoutHydrating( current, workInProgress, @@ -19829,8 +19801,7 @@ var SuspendedOnError = 1; var SuspendedOnData = 2; var SuspendedOnImmediate = 3; var SuspendedOnDeprecatedThrowPromise = 4; -var SuspendedAndReadyToUnwind = 5; -var SuspendedOnHydration = 6; // When this is true, the work-in-progress fiber just suspended (or errored) and +var SuspendedAndReadyToUnwind = 5; // When this is true, the work-in-progress fiber just suspended (or errored) and // we've yet to unwind the stack. In some cases, we may yield to the main thread // after this happens. If the fiber is pinged before we resume, we can retry // immediately instead of unwinding the stack. @@ -20148,7 +20119,7 @@ function ensureRootIsScheduled(root, currentTime) { // TODO: Temporary until we confirm this warning is not fired. if ( existingCallbackNode == null && - !includesSyncLane(existingCallbackPriority) + existingCallbackPriority !== SyncLane ) { error( "Expected scheduled callback to exist. This error is likely caused by a bug in React. Please file an issue." @@ -20166,7 +20137,7 @@ function ensureRootIsScheduled(root, currentTime) { var newCallbackNode; - if (includesSyncLane(newCallbackPriority)) { + if (newCallbackPriority === SyncLane) { // Special case: Sync React callbacks are scheduled on a special // internal queue if (root.tag === LegacyRoot) { @@ -20703,7 +20674,7 @@ function performSyncWorkOnRoot(root) { flushPassiveEffects(); var lanes = getNextLanes(root, NoLanes); - if (!includesSyncLane(lanes)) { + if (!includesSomeLane(lanes, SyncLane)) { // There's no remaining sync work left. ensureRootIsScheduled(root, now()); return null; @@ -20928,17 +20899,6 @@ function handleThrow(root, thrownValue) { workInProgressSuspendedReason = shouldAttemptToSuspendUntilDataResolves() ? SuspendedOnData : SuspendedOnImmediate; - } else if (thrownValue === SelectiveHydrationException) { - // An update flowed into a dehydrated boundary. Before we can apply the - // update, we need to finish hydrating. Interrupt the work-in-progress - // render so we can restart at the hydration lane. - // - // The ideal implementation would be able to switch contexts without - // unwinding the current stack. - // - // We could name this something more general but as of now it's the only - // case where we think this should happen. - workInProgressSuspendedReason = SuspendedOnHydration; } else { // This is a regular error. var isWakeable = @@ -21119,7 +21079,7 @@ function renderRootSync(root, lanes) { prepareFreshStack(root, lanes); } - outer: do { + do { try { if ( workInProgressSuspendedReason !== NotSuspended && @@ -21135,25 +21095,9 @@ function renderRootSync(root, lanes) { // function and fork the behavior some other way. var unitOfWork = workInProgress; var thrownValue = workInProgressThrownValue; - - switch (workInProgressSuspendedReason) { - case SuspendedOnHydration: { - // Selective hydration. An update flowed into a dehydrated tree. - // Interrupt the current render so the work loop can switch to the - // hydration lane. - workInProgress = null; - workInProgressRootExitStatus = RootDidNotComplete; - break outer; - } - - default: { - // Continue with the normal work loop. - workInProgressSuspendedReason = NotSuspended; - workInProgressThrownValue = null; - unwindSuspendedUnitOfWork(unitOfWork, thrownValue); - break; - } - } + workInProgressSuspendedReason = NotSuspended; + workInProgressThrownValue = null; + unwindSuspendedUnitOfWork(unitOfWork, thrownValue); // Continue with the normal work loop. } workLoopSync(); @@ -21282,15 +21226,6 @@ function renderRootConcurrent(root, lanes) { break; } - case SuspendedOnHydration: { - // Selective hydration. An update flowed into a dehydrated tree. - // Interrupt the current render so the work loop can switch to the - // hydration lane. - workInProgress = null; - workInProgressRootExitStatus = RootDidNotComplete; - break outer; - } - default: { throw new Error( "Unexpected SuspendedReason. This is a bug in React." @@ -21861,13 +21796,16 @@ function commitRootImpl( // currently schedule the callback in multiple places, will wait until those // are consolidated. - if (includesSyncLane(pendingPassiveEffectsLanes) && root.tag !== LegacyRoot) { + if ( + includesSomeLane(pendingPassiveEffectsLanes, SyncLane) && + root.tag !== LegacyRoot + ) { flushPassiveEffects(); } // Read this again, since a passive effect might have updated it remainingLanes = root.pendingLanes; - if (includesSyncLane(remainingLanes)) { + if (includesSomeLane(remainingLanes, SyncLane)) { { markNestedUpdateScheduled(); } // Count the number of times the root synchronously re-renders without @@ -23837,7 +23775,7 @@ function createFiberRoot( return root; } -var ReactVersion = "18.3.0-www-modern-2ccfa657d-20221205"; +var ReactVersion = "18.3.0-www-modern-d807eb52c-20221205"; var didWarnAboutNestedUpdates;