From db5930d5f50ae4189067c685bea7d32cd91bc564 Mon Sep 17 00:00:00 2001 From: sebmarkbage Date: Tue, 26 Mar 2024 21:46:28 +0000 Subject: [PATCH] Remove legacy hydration mode (#28440) While Meta is still using legacy mode and we can't remove completely, Meta is not using legacy hydration so we should be able to remove that. This is just the first step. Once removed, we can vastly simplify the DOMConfig for hydration. This will have to be rebased when tests are upgraded. DiffTrain build for commit https://github.com/facebook/react/commit/670d61bea23470e980ba13c1c8441e375779b0b8. --- .../cjs/ReactTestRenderer-dev.js | 13 +- .../cjs/ReactTestRenderer-prod.js | 514 ++++++++--------- .../cjs/ReactTestRenderer-profiling.js | 530 +++++++++--------- .../Libraries/Renderer/REVISION | 2 +- .../implementations/ReactFabric-dev.fb.js | 13 +- .../implementations/ReactFabric-prod.fb.js | 499 ++++++++--------- .../ReactFabric-profiling.fb.js | 489 ++++++++-------- .../ReactNativeRenderer-dev.fb.js | 13 +- .../ReactNativeRenderer-prod.fb.js | 499 ++++++++--------- .../ReactNativeRenderer-profiling.fb.js | 489 ++++++++-------- 10 files changed, 1438 insertions(+), 1623 deletions(-) diff --git a/compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react-test-renderer/cjs/ReactTestRenderer-dev.js b/compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react-test-renderer/cjs/ReactTestRenderer-dev.js index a1ba6c721b..af4486e0b3 100644 --- a/compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react-test-renderer/cjs/ReactTestRenderer-dev.js +++ b/compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react-test-renderer/cjs/ReactTestRenderer-dev.js @@ -7,7 +7,7 @@ * @noflow * @nolint * @preventMunge - * @generated SignedSource<<21dac50eb838d3086d9a7abc82a7da35>> + * @generated SignedSource<<3512f830a7f7738685a3f378f1fc8206>> */ "use strict"; @@ -14614,15 +14614,6 @@ if (__DEV__) { // This is the first render pass. Attempt to hydrate. pushPrimaryTreeSuspenseHandler(workInProgress); // We should never be hydrating at this point because it is the first pass, - if ((workInProgress.mode & ConcurrentMode) === NoMode) { - return retrySuspenseComponentWithoutHydrating( - current, - workInProgress, - renderLanes, - null - ); - } - if (isSuspenseInstanceFallback()) { // This boundary is in a permanent fallback state. In this case, we'll never // get an update and we'll never be able to hydrate the final content. Let's just try the @@ -25519,7 +25510,7 @@ if (__DEV__) { return root; } - var ReactVersion = "19.0.0-canary-d06a69d2"; + var ReactVersion = "19.0.0-canary-ce2d02ca"; // Might add PROFILE later. diff --git a/compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react-test-renderer/cjs/ReactTestRenderer-prod.js b/compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react-test-renderer/cjs/ReactTestRenderer-prod.js index 661feceb50..0fa691ebc8 100644 --- a/compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react-test-renderer/cjs/ReactTestRenderer-prod.js +++ b/compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react-test-renderer/cjs/ReactTestRenderer-prod.js @@ -7,7 +7,7 @@ * @noflow * @nolint * @preventMunge - * @generated SignedSource<<51d2e01fac80b676ffe4586ff18a91a2>> + * @generated SignedSource<<3f3b0c631049128f2d0d89145a25e654>> */ "use strict"; @@ -4365,110 +4365,256 @@ function updateSuspenseComponent(current, workInProgress, renderLanes) { JSCompiler_temp = 0 !== (workInProgress.flags & 32); workInProgress.flags &= -33; if (null === current) { - didSuspend = nextProps.children; + var nextPrimaryChildren = nextProps.children; nextProps = nextProps.fallback; - if (showFallback) { - reuseSuspenseHandlerOnStack(workInProgress); - showFallback = workInProgress.mode; - var progressedPrimaryFragment = workInProgress.child; - didSuspend = { mode: "hidden", children: didSuspend }; - 0 === (showFallback & 1) && null !== progressedPrimaryFragment - ? ((progressedPrimaryFragment.childLanes = 0), - (progressedPrimaryFragment.pendingProps = didSuspend)) - : (progressedPrimaryFragment = createFiberFromOffscreen( - didSuspend, + if (showFallback) + return ( + reuseSuspenseHandlerOnStack(workInProgress), + (showFallback = workInProgress.mode), + (didSuspend = workInProgress.child), + (nextPrimaryChildren = { + mode: "hidden", + children: nextPrimaryChildren + }), + 0 === (showFallback & 1) && null !== didSuspend + ? ((didSuspend.childLanes = 0), + (didSuspend.pendingProps = nextPrimaryChildren)) + : (didSuspend = createFiberFromOffscreen( + nextPrimaryChildren, + showFallback, + 0, + null + )), + (nextProps = createFiberFromFragment( + nextProps, + showFallback, + renderLanes, + null + )), + (didSuspend.return = workInProgress), + (nextProps.return = workInProgress), + (didSuspend.sibling = nextProps), + (workInProgress.child = didSuspend), + (nextPrimaryChildren = workInProgress.child), + (nextPrimaryChildren.memoizedState = + mountSuspenseOffscreenState(renderLanes)), + (nextPrimaryChildren.childLanes = getRemainingWorkInPrimaryTree( + current, + JSCompiler_temp, + renderLanes + )), + (workInProgress.memoizedState = SUSPENDED_MARKER), + nextProps + ); + pushPrimaryTreeSuspenseHandler(workInProgress); + return mountSuspensePrimaryChildren(workInProgress, nextPrimaryChildren); + } + nextPrimaryChildren = current.memoizedState; + if (null !== nextPrimaryChildren && null !== nextPrimaryChildren.dehydrated) { + if (didSuspend) + workInProgress.flags & 256 + ? (pushPrimaryTreeSuspenseHandler(workInProgress), + (workInProgress.flags &= -257), + (JSCompiler_temp = createCapturedValueFromError( + Error( + "There was an error while hydrating this Suspense boundary. Switched to client rendering." + ) + )), + (workInProgress = retrySuspenseComponentWithoutHydrating( + current, + workInProgress, + renderLanes, + JSCompiler_temp + ))) + : null !== workInProgress.memoizedState + ? (reuseSuspenseHandlerOnStack(workInProgress), + (workInProgress.child = current.child), + (workInProgress.flags |= 128), + (workInProgress = null)) + : (reuseSuspenseHandlerOnStack(workInProgress), + (nextPrimaryChildren = nextProps.fallback), + (showFallback = workInProgress.mode), + (nextProps = createFiberFromOffscreen( + { mode: "visible", children: nextProps.children }, showFallback, 0, null - )); - nextProps = createFiberFromFragment( - nextProps, - showFallback, + )), + (nextPrimaryChildren = createFiberFromFragment( + nextPrimaryChildren, + showFallback, + renderLanes, + null + )), + (nextPrimaryChildren.flags |= 2), + (nextProps.return = workInProgress), + (nextPrimaryChildren.return = workInProgress), + (nextProps.sibling = nextPrimaryChildren), + (workInProgress.child = nextProps), + 0 !== (workInProgress.mode & 1) && + reconcileChildFibers( + workInProgress, + current.child, + null, + renderLanes + ), + (nextProps = workInProgress.child), + (nextProps.memoizedState = mountSuspenseOffscreenState(renderLanes)), + (nextProps.childLanes = getRemainingWorkInPrimaryTree( + current, + JSCompiler_temp, + renderLanes + )), + (workInProgress.memoizedState = SUSPENDED_MARKER), + (workInProgress = nextPrimaryChildren)); + else if ((pushPrimaryTreeSuspenseHandler(workInProgress), shim$1())) + (JSCompiler_temp = shim$1().digest), + (nextProps = Error( + "The server could not finish this Suspense boundary, likely due to an error during server rendering. Switched to client rendering." + )), + (nextProps.digest = JSCompiler_temp), + (JSCompiler_temp = createCapturedValueFromError( + nextProps, + JSCompiler_temp, + void 0 + )), + (workInProgress = retrySuspenseComponentWithoutHydrating( + current, + workInProgress, + renderLanes, + JSCompiler_temp + )); + else if ( + ((JSCompiler_temp = 0 !== (renderLanes & current.childLanes)), + didReceiveUpdate || JSCompiler_temp) + ) { + JSCompiler_temp = workInProgressRoot; + if (null !== JSCompiler_temp) { + nextProps = renderLanes & -renderLanes; + if (0 !== (nextProps & 42)) nextProps = 1; + else + switch (nextProps) { + case 2: + nextProps = 1; + break; + case 8: + nextProps = 4; + break; + case 32: + nextProps = 16; + break; + case 128: + case 256: + case 512: + case 1024: + case 2048: + case 4096: + case 8192: + case 16384: + case 32768: + case 65536: + case 131072: + case 262144: + case 524288: + case 1048576: + case 2097152: + case 4194304: + case 8388608: + case 16777216: + case 33554432: + nextProps = 64; + break; + case 268435456: + nextProps = 134217728; + break; + default: + nextProps = 0; + } + nextProps = + 0 !== (nextProps & (JSCompiler_temp.suspendedLanes | renderLanes)) + ? 0 + : nextProps; + if (0 !== nextProps && nextProps !== nextPrimaryChildren.retryLane) + throw ( + ((nextPrimaryChildren.retryLane = nextProps), + enqueueConcurrentRenderForLane(current, nextProps), + scheduleUpdateOnFiber(JSCompiler_temp, current, nextProps), + SelectiveHydrationException) + ); + } + shim$1() || renderDidSuspendDelayIfPossible(); + workInProgress = retrySuspenseComponentWithoutHydrating( + current, + workInProgress, renderLanes, null ); - progressedPrimaryFragment.return = workInProgress; - nextProps.return = workInProgress; - progressedPrimaryFragment.sibling = nextProps; - workInProgress.child = progressedPrimaryFragment; - showFallback = workInProgress.child; - showFallback.memoizedState = mountSuspenseOffscreenState(renderLanes); - showFallback.childLanes = getRemainingWorkInPrimaryTree( - current, - JSCompiler_temp, - renderLanes - ); - workInProgress.memoizedState = SUSPENDED_MARKER; - return nextProps; - } - pushPrimaryTreeSuspenseHandler(workInProgress); - return mountSuspensePrimaryChildren(workInProgress, didSuspend); - } - progressedPrimaryFragment = current.memoizedState; - if (null !== progressedPrimaryFragment) { - var dehydrated = progressedPrimaryFragment.dehydrated; - if (null !== dehydrated) - return updateDehydratedSuspenseComponent( - current, - workInProgress, - didSuspend, - JSCompiler_temp, - nextProps, - dehydrated, - progressedPrimaryFragment, - renderLanes - ); + } else + shim$1() + ? ((workInProgress.flags |= 128), + (workInProgress.child = current.child), + retryDehydratedSuspenseBoundary.bind(null, current), + shim$1(), + (workInProgress = null)) + : ((workInProgress = mountSuspensePrimaryChildren( + workInProgress, + nextProps.children + )), + (workInProgress.flags |= 4096)); + return workInProgress; } if (showFallback) { reuseSuspenseHandlerOnStack(workInProgress); - showFallback = nextProps.fallback; - didSuspend = workInProgress.mode; - progressedPrimaryFragment = current.child; - dehydrated = progressedPrimaryFragment.sibling; - var primaryChildProps = { mode: "hidden", children: nextProps.children }; - 0 === (didSuspend & 1) && workInProgress.child !== progressedPrimaryFragment + nextPrimaryChildren = nextProps.fallback; + showFallback = workInProgress.mode; + didSuspend = current.child; + var currentFallbackChildFragment = didSuspend.sibling, + primaryChildProps = { mode: "hidden", children: nextProps.children }; + 0 === (showFallback & 1) && workInProgress.child !== didSuspend ? ((nextProps = workInProgress.child), (nextProps.childLanes = 0), (nextProps.pendingProps = primaryChildProps), (workInProgress.deletions = null)) - : ((nextProps = createWorkInProgress( - progressedPrimaryFragment, - primaryChildProps - )), - (nextProps.subtreeFlags = - progressedPrimaryFragment.subtreeFlags & 31457280)); - null !== dehydrated - ? (showFallback = createWorkInProgress(dehydrated, showFallback)) - : ((showFallback = createFiberFromFragment( + : ((nextProps = createWorkInProgress(didSuspend, primaryChildProps)), + (nextProps.subtreeFlags = didSuspend.subtreeFlags & 31457280)); + null !== currentFallbackChildFragment + ? (nextPrimaryChildren = createWorkInProgress( + currentFallbackChildFragment, + nextPrimaryChildren + )) + : ((nextPrimaryChildren = createFiberFromFragment( + nextPrimaryChildren, showFallback, - didSuspend, renderLanes, null )), - (showFallback.flags |= 2)); - showFallback.return = workInProgress; + (nextPrimaryChildren.flags |= 2)); + nextPrimaryChildren.return = workInProgress; nextProps.return = workInProgress; - nextProps.sibling = showFallback; + nextProps.sibling = nextPrimaryChildren; workInProgress.child = nextProps; - nextProps = showFallback; - showFallback = workInProgress.child; - didSuspend = current.child.memoizedState; - null === didSuspend - ? (didSuspend = mountSuspenseOffscreenState(renderLanes)) - : ((progressedPrimaryFragment = didSuspend.cachePool), - null !== progressedPrimaryFragment - ? ((dehydrated = CacheContext._currentValue2), - (progressedPrimaryFragment = - progressedPrimaryFragment.parent !== dehydrated - ? { parent: dehydrated, pool: dehydrated } - : progressedPrimaryFragment)) - : (progressedPrimaryFragment = getSuspendedCache()), - (didSuspend = { - baseLanes: didSuspend.baseLanes | renderLanes, - cachePool: progressedPrimaryFragment + nextProps = nextPrimaryChildren; + nextPrimaryChildren = workInProgress.child; + showFallback = current.child.memoizedState; + null === showFallback + ? (showFallback = mountSuspenseOffscreenState(renderLanes)) + : ((didSuspend = showFallback.cachePool), + null !== didSuspend + ? ((currentFallbackChildFragment = CacheContext._currentValue2), + (didSuspend = + didSuspend.parent !== currentFallbackChildFragment + ? { + parent: currentFallbackChildFragment, + pool: currentFallbackChildFragment + } + : didSuspend)) + : (didSuspend = getSuspendedCache()), + (showFallback = { + baseLanes: showFallback.baseLanes | renderLanes, + cachePool: didSuspend })); - showFallback.memoizedState = didSuspend; - showFallback.childLanes = getRemainingWorkInPrimaryTree( + nextPrimaryChildren.memoizedState = showFallback; + nextPrimaryChildren.childLanes = getRemainingWorkInPrimaryTree( current, JSCompiler_temp, renderLanes @@ -4524,176 +4670,6 @@ function retrySuspenseComponentWithoutHydrating( workInProgress.memoizedState = null; return current; } -function updateDehydratedSuspenseComponent( - current, - workInProgress, - didSuspend, - didPrimaryChildrenDefer, - nextProps, - suspenseInstance, - suspenseState, - renderLanes -) { - if (didSuspend) { - if (workInProgress.flags & 256) - return ( - pushPrimaryTreeSuspenseHandler(workInProgress), - (workInProgress.flags &= -257), - (didPrimaryChildrenDefer = createCapturedValueFromError( - Error( - "There was an error while hydrating this Suspense boundary. Switched to client rendering." - ) - )), - retrySuspenseComponentWithoutHydrating( - current, - workInProgress, - renderLanes, - didPrimaryChildrenDefer - ) - ); - if (null !== workInProgress.memoizedState) - return ( - reuseSuspenseHandlerOnStack(workInProgress), - (workInProgress.child = current.child), - (workInProgress.flags |= 128), - null - ); - reuseSuspenseHandlerOnStack(workInProgress); - suspenseState = nextProps.fallback; - didSuspend = workInProgress.mode; - nextProps = createFiberFromOffscreen( - { mode: "visible", children: nextProps.children }, - didSuspend, - 0, - null - ); - suspenseState = createFiberFromFragment( - suspenseState, - didSuspend, - renderLanes, - null - ); - suspenseState.flags |= 2; - nextProps.return = workInProgress; - suspenseState.return = workInProgress; - nextProps.sibling = suspenseState; - workInProgress.child = nextProps; - 0 !== (workInProgress.mode & 1) && - reconcileChildFibers(workInProgress, current.child, null, renderLanes); - nextProps = workInProgress.child; - nextProps.memoizedState = mountSuspenseOffscreenState(renderLanes); - nextProps.childLanes = getRemainingWorkInPrimaryTree( - current, - didPrimaryChildrenDefer, - renderLanes - ); - workInProgress.memoizedState = SUSPENDED_MARKER; - return suspenseState; - } - pushPrimaryTreeSuspenseHandler(workInProgress); - if (0 === (workInProgress.mode & 1)) - return retrySuspenseComponentWithoutHydrating( - current, - workInProgress, - renderLanes, - null - ); - if (shim$1()) - return ( - (didPrimaryChildrenDefer = shim$1().digest), - (suspenseState = Error( - "The server could not finish this Suspense boundary, likely due to an error during server rendering. Switched to client rendering." - )), - (suspenseState.digest = didPrimaryChildrenDefer), - (didPrimaryChildrenDefer = createCapturedValueFromError( - suspenseState, - didPrimaryChildrenDefer, - void 0 - )), - retrySuspenseComponentWithoutHydrating( - current, - workInProgress, - renderLanes, - didPrimaryChildrenDefer - ) - ); - didPrimaryChildrenDefer = 0 !== (renderLanes & current.childLanes); - if (didReceiveUpdate || didPrimaryChildrenDefer) { - didPrimaryChildrenDefer = workInProgressRoot; - if (null !== didPrimaryChildrenDefer) { - nextProps = renderLanes & -renderLanes; - if (0 !== (nextProps & 42)) nextProps = 1; - else - switch (nextProps) { - case 2: - nextProps = 1; - break; - case 8: - nextProps = 4; - break; - case 32: - nextProps = 16; - break; - case 128: - case 256: - case 512: - case 1024: - case 2048: - case 4096: - case 8192: - case 16384: - case 32768: - case 65536: - case 131072: - case 262144: - case 524288: - case 1048576: - case 2097152: - case 4194304: - case 8388608: - case 16777216: - case 33554432: - nextProps = 64; - break; - case 268435456: - nextProps = 134217728; - break; - default: - nextProps = 0; - } - nextProps = - 0 !== - (nextProps & (didPrimaryChildrenDefer.suspendedLanes | renderLanes)) - ? 0 - : nextProps; - if (0 !== nextProps && nextProps !== suspenseState.retryLane) - throw ( - ((suspenseState.retryLane = nextProps), - enqueueConcurrentRenderForLane(current, nextProps), - scheduleUpdateOnFiber(didPrimaryChildrenDefer, current, nextProps), - SelectiveHydrationException) - ); - } - shim$1() || renderDidSuspendDelayIfPossible(); - return retrySuspenseComponentWithoutHydrating( - current, - workInProgress, - renderLanes, - null - ); - } - if (shim$1()) - return ( - (workInProgress.flags |= 128), - (workInProgress.child = current.child), - retryDehydratedSuspenseBoundary.bind(null, current), - shim$1(), - null - ); - current = mountSuspensePrimaryChildren(workInProgress, nextProps.children); - current.flags |= 4096; - return current; -} function scheduleSuspenseWorkOnFiber(fiber, renderLanes, propagationRoot) { fiber.lanes |= renderLanes; var alternate = fiber.alternate; @@ -9178,19 +9154,19 @@ function wrapFiber(fiber) { fiberToWrapper.set(fiber, wrapper)); return wrapper; } -var devToolsConfig$jscomp$inline_1016 = { +var devToolsConfig$jscomp$inline_1024 = { findFiberByHostInstance: function () { throw Error("TestRenderer does not support findFiberByHostInstance()"); }, bundleType: 0, - version: "19.0.0-canary-05018b8a", + version: "19.0.0-canary-f980cc33", rendererPackageName: "react-test-renderer" }; -var internals$jscomp$inline_1194 = { - bundleType: devToolsConfig$jscomp$inline_1016.bundleType, - version: devToolsConfig$jscomp$inline_1016.version, - rendererPackageName: devToolsConfig$jscomp$inline_1016.rendererPackageName, - rendererConfig: devToolsConfig$jscomp$inline_1016.rendererConfig, +var internals$jscomp$inline_1214 = { + bundleType: devToolsConfig$jscomp$inline_1024.bundleType, + version: devToolsConfig$jscomp$inline_1024.version, + rendererPackageName: devToolsConfig$jscomp$inline_1024.rendererPackageName, + rendererConfig: devToolsConfig$jscomp$inline_1024.rendererConfig, overrideHookState: null, overrideHookStateDeletePath: null, overrideHookStateRenamePath: null, @@ -9207,26 +9183,26 @@ var internals$jscomp$inline_1194 = { return null === fiber ? null : fiber.stateNode; }, findFiberByHostInstance: - devToolsConfig$jscomp$inline_1016.findFiberByHostInstance || + devToolsConfig$jscomp$inline_1024.findFiberByHostInstance || emptyFindFiberByHostInstance, findHostInstancesForRefresh: null, scheduleRefresh: null, scheduleRoot: null, setRefreshHandler: null, getCurrentFiber: null, - reconcilerVersion: "19.0.0-canary-05018b8a" + reconcilerVersion: "19.0.0-canary-f980cc33" }; if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) { - var hook$jscomp$inline_1195 = __REACT_DEVTOOLS_GLOBAL_HOOK__; + var hook$jscomp$inline_1215 = __REACT_DEVTOOLS_GLOBAL_HOOK__; if ( - !hook$jscomp$inline_1195.isDisabled && - hook$jscomp$inline_1195.supportsFiber + !hook$jscomp$inline_1215.isDisabled && + hook$jscomp$inline_1215.supportsFiber ) try { - (rendererID = hook$jscomp$inline_1195.inject( - internals$jscomp$inline_1194 + (rendererID = hook$jscomp$inline_1215.inject( + internals$jscomp$inline_1214 )), - (injectedHook = hook$jscomp$inline_1195); + (injectedHook = hook$jscomp$inline_1215); } catch (err) {} } exports._Scheduler = Scheduler; diff --git a/compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react-test-renderer/cjs/ReactTestRenderer-profiling.js b/compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react-test-renderer/cjs/ReactTestRenderer-profiling.js index 53e0c4e396..862de53b46 100644 --- a/compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react-test-renderer/cjs/ReactTestRenderer-profiling.js +++ b/compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react-test-renderer/cjs/ReactTestRenderer-profiling.js @@ -7,7 +7,7 @@ * @noflow * @nolint * @preventMunge - * @generated SignedSource<<44835174a8d1d34753167cc8228651eb>> + * @generated SignedSource<<3b33716ce484e4bc4eb2c83e48bea56e>> */ "use strict"; @@ -4451,122 +4451,266 @@ function updateSuspenseComponent(current, workInProgress, renderLanes) { JSCompiler_temp = 0 !== (workInProgress.flags & 32); workInProgress.flags &= -33; if (null === current) { - didSuspend = nextProps.children; + var nextPrimaryChildren = nextProps.children; nextProps = nextProps.fallback; - if (showFallback) { - reuseSuspenseHandlerOnStack(workInProgress); - showFallback = workInProgress.mode; - var progressedPrimaryFragment = workInProgress.child; - didSuspend = { mode: "hidden", children: didSuspend }; - 0 === (showFallback & 1) && null !== progressedPrimaryFragment - ? ((progressedPrimaryFragment.childLanes = 0), - (progressedPrimaryFragment.pendingProps = didSuspend), - workInProgress.mode & 2 && - ((progressedPrimaryFragment.actualDuration = 0), - (progressedPrimaryFragment.actualStartTime = -1), - (progressedPrimaryFragment.selfBaseDuration = 0), - (progressedPrimaryFragment.treeBaseDuration = 0))) - : (progressedPrimaryFragment = createFiberFromOffscreen( - didSuspend, + if (showFallback) + return ( + reuseSuspenseHandlerOnStack(workInProgress), + (showFallback = workInProgress.mode), + (didSuspend = workInProgress.child), + (nextPrimaryChildren = { + mode: "hidden", + children: nextPrimaryChildren + }), + 0 === (showFallback & 1) && null !== didSuspend + ? ((didSuspend.childLanes = 0), + (didSuspend.pendingProps = nextPrimaryChildren), + workInProgress.mode & 2 && + ((didSuspend.actualDuration = 0), + (didSuspend.actualStartTime = -1), + (didSuspend.selfBaseDuration = 0), + (didSuspend.treeBaseDuration = 0))) + : (didSuspend = createFiberFromOffscreen( + nextPrimaryChildren, + showFallback, + 0, + null + )), + (nextProps = createFiberFromFragment( + nextProps, + showFallback, + renderLanes, + null + )), + (didSuspend.return = workInProgress), + (nextProps.return = workInProgress), + (didSuspend.sibling = nextProps), + (workInProgress.child = didSuspend), + (nextPrimaryChildren = workInProgress.child), + (nextPrimaryChildren.memoizedState = + mountSuspenseOffscreenState(renderLanes)), + (nextPrimaryChildren.childLanes = getRemainingWorkInPrimaryTree( + current, + JSCompiler_temp, + renderLanes + )), + (workInProgress.memoizedState = SUSPENDED_MARKER), + nextProps + ); + pushPrimaryTreeSuspenseHandler(workInProgress); + return mountSuspensePrimaryChildren(workInProgress, nextPrimaryChildren); + } + nextPrimaryChildren = current.memoizedState; + if (null !== nextPrimaryChildren && null !== nextPrimaryChildren.dehydrated) { + if (didSuspend) + workInProgress.flags & 256 + ? (pushPrimaryTreeSuspenseHandler(workInProgress), + (workInProgress.flags &= -257), + (JSCompiler_temp = createCapturedValueFromError( + Error( + "There was an error while hydrating this Suspense boundary. Switched to client rendering." + ) + )), + (workInProgress = retrySuspenseComponentWithoutHydrating( + current, + workInProgress, + renderLanes, + JSCompiler_temp + ))) + : null !== workInProgress.memoizedState + ? (reuseSuspenseHandlerOnStack(workInProgress), + (workInProgress.child = current.child), + (workInProgress.flags |= 128), + (workInProgress = null)) + : (reuseSuspenseHandlerOnStack(workInProgress), + (nextPrimaryChildren = nextProps.fallback), + (showFallback = workInProgress.mode), + (nextProps = createFiberFromOffscreen( + { mode: "visible", children: nextProps.children }, showFallback, 0, null - )); - nextProps = createFiberFromFragment( - nextProps, - showFallback, + )), + (nextPrimaryChildren = createFiberFromFragment( + nextPrimaryChildren, + showFallback, + renderLanes, + null + )), + (nextPrimaryChildren.flags |= 2), + (nextProps.return = workInProgress), + (nextPrimaryChildren.return = workInProgress), + (nextProps.sibling = nextPrimaryChildren), + (workInProgress.child = nextProps), + 0 !== (workInProgress.mode & 1) && + reconcileChildFibers( + workInProgress, + current.child, + null, + renderLanes + ), + (nextProps = workInProgress.child), + (nextProps.memoizedState = mountSuspenseOffscreenState(renderLanes)), + (nextProps.childLanes = getRemainingWorkInPrimaryTree( + current, + JSCompiler_temp, + renderLanes + )), + (workInProgress.memoizedState = SUSPENDED_MARKER), + (workInProgress = nextPrimaryChildren)); + else if ((pushPrimaryTreeSuspenseHandler(workInProgress), shim$1())) + (JSCompiler_temp = shim$1().digest), + (nextProps = Error( + "The server could not finish this Suspense boundary, likely due to an error during server rendering. Switched to client rendering." + )), + (nextProps.digest = JSCompiler_temp), + (JSCompiler_temp = createCapturedValueFromError( + nextProps, + JSCompiler_temp, + void 0 + )), + (workInProgress = retrySuspenseComponentWithoutHydrating( + current, + workInProgress, + renderLanes, + JSCompiler_temp + )); + else if ( + ((JSCompiler_temp = 0 !== (renderLanes & current.childLanes)), + didReceiveUpdate || JSCompiler_temp) + ) { + JSCompiler_temp = workInProgressRoot; + if (null !== JSCompiler_temp) { + nextProps = renderLanes & -renderLanes; + if (0 !== (nextProps & 42)) nextProps = 1; + else + switch (nextProps) { + case 2: + nextProps = 1; + break; + case 8: + nextProps = 4; + break; + case 32: + nextProps = 16; + break; + case 128: + case 256: + case 512: + case 1024: + case 2048: + case 4096: + case 8192: + case 16384: + case 32768: + case 65536: + case 131072: + case 262144: + case 524288: + case 1048576: + case 2097152: + case 4194304: + case 8388608: + case 16777216: + case 33554432: + nextProps = 64; + break; + case 268435456: + nextProps = 134217728; + break; + default: + nextProps = 0; + } + nextProps = + 0 !== (nextProps & (JSCompiler_temp.suspendedLanes | renderLanes)) + ? 0 + : nextProps; + if (0 !== nextProps && nextProps !== nextPrimaryChildren.retryLane) + throw ( + ((nextPrimaryChildren.retryLane = nextProps), + enqueueConcurrentRenderForLane(current, nextProps), + scheduleUpdateOnFiber(JSCompiler_temp, current, nextProps), + SelectiveHydrationException) + ); + } + shim$1() || renderDidSuspendDelayIfPossible(); + workInProgress = retrySuspenseComponentWithoutHydrating( + current, + workInProgress, renderLanes, null ); - progressedPrimaryFragment.return = workInProgress; - nextProps.return = workInProgress; - progressedPrimaryFragment.sibling = nextProps; - workInProgress.child = progressedPrimaryFragment; - showFallback = workInProgress.child; - showFallback.memoizedState = mountSuspenseOffscreenState(renderLanes); - showFallback.childLanes = getRemainingWorkInPrimaryTree( - current, - JSCompiler_temp, - renderLanes - ); - workInProgress.memoizedState = SUSPENDED_MARKER; - return nextProps; - } - pushPrimaryTreeSuspenseHandler(workInProgress); - return mountSuspensePrimaryChildren(workInProgress, didSuspend); - } - progressedPrimaryFragment = current.memoizedState; - if (null !== progressedPrimaryFragment) { - var dehydrated = progressedPrimaryFragment.dehydrated; - if (null !== dehydrated) - return updateDehydratedSuspenseComponent( - current, - workInProgress, - didSuspend, - JSCompiler_temp, - nextProps, - dehydrated, - progressedPrimaryFragment, - renderLanes - ); + } else + shim$1() + ? ((workInProgress.flags |= 128), + (workInProgress.child = current.child), + retryDehydratedSuspenseBoundary.bind(null, current), + shim$1(), + (workInProgress = null)) + : ((workInProgress = mountSuspensePrimaryChildren( + workInProgress, + nextProps.children + )), + (workInProgress.flags |= 4096)); + return workInProgress; } if (showFallback) { reuseSuspenseHandlerOnStack(workInProgress); - showFallback = nextProps.fallback; - didSuspend = workInProgress.mode; - progressedPrimaryFragment = current.child; - dehydrated = progressedPrimaryFragment.sibling; - var primaryChildProps = { mode: "hidden", children: nextProps.children }; - 0 === (didSuspend & 1) && workInProgress.child !== progressedPrimaryFragment + nextPrimaryChildren = nextProps.fallback; + showFallback = workInProgress.mode; + didSuspend = current.child; + var currentFallbackChildFragment = didSuspend.sibling, + primaryChildProps = { mode: "hidden", children: nextProps.children }; + 0 === (showFallback & 1) && workInProgress.child !== didSuspend ? ((nextProps = workInProgress.child), (nextProps.childLanes = 0), (nextProps.pendingProps = primaryChildProps), workInProgress.mode & 2 && ((nextProps.actualDuration = 0), (nextProps.actualStartTime = -1), - (nextProps.selfBaseDuration = - progressedPrimaryFragment.selfBaseDuration), - (nextProps.treeBaseDuration = - progressedPrimaryFragment.treeBaseDuration)), + (nextProps.selfBaseDuration = didSuspend.selfBaseDuration), + (nextProps.treeBaseDuration = didSuspend.treeBaseDuration)), (workInProgress.deletions = null)) - : ((nextProps = createWorkInProgress( - progressedPrimaryFragment, - primaryChildProps - )), - (nextProps.subtreeFlags = - progressedPrimaryFragment.subtreeFlags & 31457280)); - null !== dehydrated - ? (showFallback = createWorkInProgress(dehydrated, showFallback)) - : ((showFallback = createFiberFromFragment( + : ((nextProps = createWorkInProgress(didSuspend, primaryChildProps)), + (nextProps.subtreeFlags = didSuspend.subtreeFlags & 31457280)); + null !== currentFallbackChildFragment + ? (nextPrimaryChildren = createWorkInProgress( + currentFallbackChildFragment, + nextPrimaryChildren + )) + : ((nextPrimaryChildren = createFiberFromFragment( + nextPrimaryChildren, showFallback, - didSuspend, renderLanes, null )), - (showFallback.flags |= 2)); - showFallback.return = workInProgress; + (nextPrimaryChildren.flags |= 2)); + nextPrimaryChildren.return = workInProgress; nextProps.return = workInProgress; - nextProps.sibling = showFallback; + nextProps.sibling = nextPrimaryChildren; workInProgress.child = nextProps; - nextProps = showFallback; - showFallback = workInProgress.child; - didSuspend = current.child.memoizedState; - null === didSuspend - ? (didSuspend = mountSuspenseOffscreenState(renderLanes)) - : ((progressedPrimaryFragment = didSuspend.cachePool), - null !== progressedPrimaryFragment - ? ((dehydrated = CacheContext._currentValue2), - (progressedPrimaryFragment = - progressedPrimaryFragment.parent !== dehydrated - ? { parent: dehydrated, pool: dehydrated } - : progressedPrimaryFragment)) - : (progressedPrimaryFragment = getSuspendedCache()), - (didSuspend = { - baseLanes: didSuspend.baseLanes | renderLanes, - cachePool: progressedPrimaryFragment + nextProps = nextPrimaryChildren; + nextPrimaryChildren = workInProgress.child; + showFallback = current.child.memoizedState; + null === showFallback + ? (showFallback = mountSuspenseOffscreenState(renderLanes)) + : ((didSuspend = showFallback.cachePool), + null !== didSuspend + ? ((currentFallbackChildFragment = CacheContext._currentValue2), + (didSuspend = + didSuspend.parent !== currentFallbackChildFragment + ? { + parent: currentFallbackChildFragment, + pool: currentFallbackChildFragment + } + : didSuspend)) + : (didSuspend = getSuspendedCache()), + (showFallback = { + baseLanes: showFallback.baseLanes | renderLanes, + cachePool: didSuspend })); - showFallback.memoizedState = didSuspend; - showFallback.childLanes = getRemainingWorkInPrimaryTree( + nextPrimaryChildren.memoizedState = showFallback; + nextPrimaryChildren.childLanes = getRemainingWorkInPrimaryTree( current, JSCompiler_temp, renderLanes @@ -4622,176 +4766,6 @@ function retrySuspenseComponentWithoutHydrating( workInProgress.memoizedState = null; return current; } -function updateDehydratedSuspenseComponent( - current, - workInProgress, - didSuspend, - didPrimaryChildrenDefer, - nextProps, - suspenseInstance, - suspenseState, - renderLanes -) { - if (didSuspend) { - if (workInProgress.flags & 256) - return ( - pushPrimaryTreeSuspenseHandler(workInProgress), - (workInProgress.flags &= -257), - (didPrimaryChildrenDefer = createCapturedValueFromError( - Error( - "There was an error while hydrating this Suspense boundary. Switched to client rendering." - ) - )), - retrySuspenseComponentWithoutHydrating( - current, - workInProgress, - renderLanes, - didPrimaryChildrenDefer - ) - ); - if (null !== workInProgress.memoizedState) - return ( - reuseSuspenseHandlerOnStack(workInProgress), - (workInProgress.child = current.child), - (workInProgress.flags |= 128), - null - ); - reuseSuspenseHandlerOnStack(workInProgress); - suspenseState = nextProps.fallback; - didSuspend = workInProgress.mode; - nextProps = createFiberFromOffscreen( - { mode: "visible", children: nextProps.children }, - didSuspend, - 0, - null - ); - suspenseState = createFiberFromFragment( - suspenseState, - didSuspend, - renderLanes, - null - ); - suspenseState.flags |= 2; - nextProps.return = workInProgress; - suspenseState.return = workInProgress; - nextProps.sibling = suspenseState; - workInProgress.child = nextProps; - 0 !== (workInProgress.mode & 1) && - reconcileChildFibers(workInProgress, current.child, null, renderLanes); - nextProps = workInProgress.child; - nextProps.memoizedState = mountSuspenseOffscreenState(renderLanes); - nextProps.childLanes = getRemainingWorkInPrimaryTree( - current, - didPrimaryChildrenDefer, - renderLanes - ); - workInProgress.memoizedState = SUSPENDED_MARKER; - return suspenseState; - } - pushPrimaryTreeSuspenseHandler(workInProgress); - if (0 === (workInProgress.mode & 1)) - return retrySuspenseComponentWithoutHydrating( - current, - workInProgress, - renderLanes, - null - ); - if (shim$1()) - return ( - (didPrimaryChildrenDefer = shim$1().digest), - (suspenseState = Error( - "The server could not finish this Suspense boundary, likely due to an error during server rendering. Switched to client rendering." - )), - (suspenseState.digest = didPrimaryChildrenDefer), - (didPrimaryChildrenDefer = createCapturedValueFromError( - suspenseState, - didPrimaryChildrenDefer, - void 0 - )), - retrySuspenseComponentWithoutHydrating( - current, - workInProgress, - renderLanes, - didPrimaryChildrenDefer - ) - ); - didPrimaryChildrenDefer = 0 !== (renderLanes & current.childLanes); - if (didReceiveUpdate || didPrimaryChildrenDefer) { - didPrimaryChildrenDefer = workInProgressRoot; - if (null !== didPrimaryChildrenDefer) { - nextProps = renderLanes & -renderLanes; - if (0 !== (nextProps & 42)) nextProps = 1; - else - switch (nextProps) { - case 2: - nextProps = 1; - break; - case 8: - nextProps = 4; - break; - case 32: - nextProps = 16; - break; - case 128: - case 256: - case 512: - case 1024: - case 2048: - case 4096: - case 8192: - case 16384: - case 32768: - case 65536: - case 131072: - case 262144: - case 524288: - case 1048576: - case 2097152: - case 4194304: - case 8388608: - case 16777216: - case 33554432: - nextProps = 64; - break; - case 268435456: - nextProps = 134217728; - break; - default: - nextProps = 0; - } - nextProps = - 0 !== - (nextProps & (didPrimaryChildrenDefer.suspendedLanes | renderLanes)) - ? 0 - : nextProps; - if (0 !== nextProps && nextProps !== suspenseState.retryLane) - throw ( - ((suspenseState.retryLane = nextProps), - enqueueConcurrentRenderForLane(current, nextProps), - scheduleUpdateOnFiber(didPrimaryChildrenDefer, current, nextProps), - SelectiveHydrationException) - ); - } - shim$1() || renderDidSuspendDelayIfPossible(); - return retrySuspenseComponentWithoutHydrating( - current, - workInProgress, - renderLanes, - null - ); - } - if (shim$1()) - return ( - (workInProgress.flags |= 128), - (workInProgress.child = current.child), - retryDehydratedSuspenseBoundary.bind(null, current), - shim$1(), - null - ); - current = mountSuspensePrimaryChildren(workInProgress, nextProps.children); - current.flags |= 4096; - return current; -} function scheduleSuspenseWorkOnFiber(fiber, renderLanes, propagationRoot) { fiber.lanes |= renderLanes; var alternate = fiber.alternate; @@ -9606,19 +9580,19 @@ function wrapFiber(fiber) { fiberToWrapper.set(fiber, wrapper)); return wrapper; } -var devToolsConfig$jscomp$inline_1058 = { +var devToolsConfig$jscomp$inline_1066 = { findFiberByHostInstance: function () { throw Error("TestRenderer does not support findFiberByHostInstance()"); }, bundleType: 0, - version: "19.0.0-canary-fa4a6c6a", + version: "19.0.0-canary-ee4675ac", rendererPackageName: "react-test-renderer" }; -var internals$jscomp$inline_1235 = { - bundleType: devToolsConfig$jscomp$inline_1058.bundleType, - version: devToolsConfig$jscomp$inline_1058.version, - rendererPackageName: devToolsConfig$jscomp$inline_1058.rendererPackageName, - rendererConfig: devToolsConfig$jscomp$inline_1058.rendererConfig, +var internals$jscomp$inline_1255 = { + bundleType: devToolsConfig$jscomp$inline_1066.bundleType, + version: devToolsConfig$jscomp$inline_1066.version, + rendererPackageName: devToolsConfig$jscomp$inline_1066.rendererPackageName, + rendererConfig: devToolsConfig$jscomp$inline_1066.rendererConfig, overrideHookState: null, overrideHookStateDeletePath: null, overrideHookStateRenamePath: null, @@ -9635,26 +9609,26 @@ var internals$jscomp$inline_1235 = { return null === fiber ? null : fiber.stateNode; }, findFiberByHostInstance: - devToolsConfig$jscomp$inline_1058.findFiberByHostInstance || + devToolsConfig$jscomp$inline_1066.findFiberByHostInstance || emptyFindFiberByHostInstance, findHostInstancesForRefresh: null, scheduleRefresh: null, scheduleRoot: null, setRefreshHandler: null, getCurrentFiber: null, - reconcilerVersion: "19.0.0-canary-fa4a6c6a" + reconcilerVersion: "19.0.0-canary-ee4675ac" }; if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) { - var hook$jscomp$inline_1236 = __REACT_DEVTOOLS_GLOBAL_HOOK__; + var hook$jscomp$inline_1256 = __REACT_DEVTOOLS_GLOBAL_HOOK__; if ( - !hook$jscomp$inline_1236.isDisabled && - hook$jscomp$inline_1236.supportsFiber + !hook$jscomp$inline_1256.isDisabled && + hook$jscomp$inline_1256.supportsFiber ) try { - (rendererID = hook$jscomp$inline_1236.inject( - internals$jscomp$inline_1235 + (rendererID = hook$jscomp$inline_1256.inject( + internals$jscomp$inline_1255 )), - (injectedHook = hook$jscomp$inline_1236); + (injectedHook = hook$jscomp$inline_1256); } catch (err) {} } exports._Scheduler = Scheduler; diff --git a/compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/REVISION b/compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/REVISION index 7ba687cc32..3fa55ccecf 100644 --- a/compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/REVISION +++ b/compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/REVISION @@ -1 +1 @@ -56efb2e2271492288b1ba37c247df2a65d9046b7 +670d61bea23470e980ba13c1c8441e375779b0b8 diff --git a/compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/implementations/ReactFabric-dev.fb.js b/compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/implementations/ReactFabric-dev.fb.js index df6d47bc12..64cb5ad22c 100644 --- a/compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/implementations/ReactFabric-dev.fb.js +++ b/compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/implementations/ReactFabric-dev.fb.js @@ -7,7 +7,7 @@ * @noflow * @nolint * @preventMunge - * @generated SignedSource<<36cb08f7e3bb5d5260109e5dc114f41a>> + * @generated SignedSource<<3d8580891aa508376928393223024e49>> */ "use strict"; @@ -18725,15 +18725,6 @@ to return true:wantsResponderID| | // This is the first render pass. Attempt to hydrate. pushPrimaryTreeSuspenseHandler(workInProgress); // We should never be hydrating at this point because it is the first pass, - if ((workInProgress.mode & ConcurrentMode) === NoMode) { - return retrySuspenseComponentWithoutHydrating( - current, - workInProgress, - renderLanes, - null - ); - } - if (isSuspenseInstanceFallback()) { // This boundary is in a permanent fallback state. In this case, we'll never // get an update and we'll never be able to hydrate the final content. Let's just try the @@ -29867,7 +29858,7 @@ to return true:wantsResponderID| | return root; } - var ReactVersion = "19.0.0-canary-180a4de1"; + var ReactVersion = "19.0.0-canary-42ba9c63"; function createPortal$1( children, diff --git a/compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/implementations/ReactFabric-prod.fb.js b/compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/implementations/ReactFabric-prod.fb.js index 5f7c6c19a4..868929fff2 100644 --- a/compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/implementations/ReactFabric-prod.fb.js +++ b/compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/implementations/ReactFabric-prod.fb.js @@ -7,7 +7,7 @@ * @noflow * @nolint * @preventMunge - * @generated SignedSource<> + * @generated SignedSource<<171f2e06e0a151d06445de01ff246eec>> */ "use strict"; @@ -893,7 +893,7 @@ eventPluginOrder = Array.prototype.slice.call([ "ReactNativeBridgeEventPlugin" ]); recomputePluginOrdering(); -var injectedNamesToPlugins$jscomp$inline_251 = { +var injectedNamesToPlugins$jscomp$inline_250 = { ResponderEventPlugin: ResponderEventPlugin, ReactNativeBridgeEventPlugin: { eventTypes: {}, @@ -939,32 +939,32 @@ var injectedNamesToPlugins$jscomp$inline_251 = { } } }, - isOrderingDirty$jscomp$inline_252 = !1, - pluginName$jscomp$inline_253; -for (pluginName$jscomp$inline_253 in injectedNamesToPlugins$jscomp$inline_251) + isOrderingDirty$jscomp$inline_251 = !1, + pluginName$jscomp$inline_252; +for (pluginName$jscomp$inline_252 in injectedNamesToPlugins$jscomp$inline_250) if ( - injectedNamesToPlugins$jscomp$inline_251.hasOwnProperty( - pluginName$jscomp$inline_253 + injectedNamesToPlugins$jscomp$inline_250.hasOwnProperty( + pluginName$jscomp$inline_252 ) ) { - var pluginModule$jscomp$inline_254 = - injectedNamesToPlugins$jscomp$inline_251[pluginName$jscomp$inline_253]; + var pluginModule$jscomp$inline_253 = + injectedNamesToPlugins$jscomp$inline_250[pluginName$jscomp$inline_252]; if ( - !namesToPlugins.hasOwnProperty(pluginName$jscomp$inline_253) || - namesToPlugins[pluginName$jscomp$inline_253] !== - pluginModule$jscomp$inline_254 + !namesToPlugins.hasOwnProperty(pluginName$jscomp$inline_252) || + namesToPlugins[pluginName$jscomp$inline_252] !== + pluginModule$jscomp$inline_253 ) { - if (namesToPlugins[pluginName$jscomp$inline_253]) + if (namesToPlugins[pluginName$jscomp$inline_252]) throw Error( "EventPluginRegistry: Cannot inject two different event plugins using the same name, `" + - (pluginName$jscomp$inline_253 + "`.") + (pluginName$jscomp$inline_252 + "`.") ); - namesToPlugins[pluginName$jscomp$inline_253] = - pluginModule$jscomp$inline_254; - isOrderingDirty$jscomp$inline_252 = !0; + namesToPlugins[pluginName$jscomp$inline_252] = + pluginModule$jscomp$inline_253; + isOrderingDirty$jscomp$inline_251 = !0; } } -isOrderingDirty$jscomp$inline_252 && recomputePluginOrdering(); +isOrderingDirty$jscomp$inline_251 && recomputePluginOrdering(); var emptyObject$1 = {}, removedKeys = null, removedKeyCount = 0, @@ -5931,20 +5931,21 @@ function updateSuspenseComponent(current, workInProgress, renderLanes) { JSCompiler_temp = 0 !== (workInProgress.flags & 32); workInProgress.flags &= -33; if (null === current) { - didSuspend = nextProps.children; - var nextFallbackChildren = nextProps.fallback; + var nextPrimaryChildren = nextProps.children; + didSuspend = nextProps.fallback; if (showFallback) return ( reuseSuspenseHandlerOnStack(workInProgress), (nextProps = mountSuspenseFallbackChildren( workInProgress, + nextPrimaryChildren, didSuspend, - nextFallbackChildren, renderLanes )), - (showFallback = workInProgress.child), - (showFallback.memoizedState = mountSuspenseOffscreenState(renderLanes)), - (showFallback.childLanes = getRemainingWorkInPrimaryTree( + (nextPrimaryChildren = workInProgress.child), + (nextPrimaryChildren.memoizedState = + mountSuspenseOffscreenState(renderLanes)), + (nextPrimaryChildren.childLanes = getRemainingWorkInPrimaryTree( current, JSCompiler_temp, renderLanes @@ -5957,13 +5958,14 @@ function updateSuspenseComponent(current, workInProgress, renderLanes) { reuseSuspenseHandlerOnStack(workInProgress), (nextProps = mountSuspenseFallbackChildren( workInProgress, + nextPrimaryChildren, didSuspend, - nextFallbackChildren, renderLanes )), - (showFallback = workInProgress.child), - (showFallback.memoizedState = mountSuspenseOffscreenState(renderLanes)), - (showFallback.childLanes = getRemainingWorkInPrimaryTree( + (nextPrimaryChildren = workInProgress.child), + (nextPrimaryChildren.memoizedState = + mountSuspenseOffscreenState(renderLanes)), + (nextPrimaryChildren.childLanes = getRemainingWorkInPrimaryTree( current, JSCompiler_temp, renderLanes @@ -5973,73 +5975,215 @@ function updateSuspenseComponent(current, workInProgress, renderLanes) { nextProps ); pushPrimaryTreeSuspenseHandler(workInProgress); - return mountSuspensePrimaryChildren(workInProgress, didSuspend); + return mountSuspensePrimaryChildren(workInProgress, nextPrimaryChildren); } - nextFallbackChildren = current.memoizedState; - if (null !== nextFallbackChildren) { - var dehydrated = nextFallbackChildren.dehydrated; - if (null !== dehydrated) - return updateDehydratedSuspenseComponent( + nextPrimaryChildren = current.memoizedState; + if (null !== nextPrimaryChildren && null !== nextPrimaryChildren.dehydrated) { + if (didSuspend) + workInProgress.flags & 256 + ? (pushPrimaryTreeSuspenseHandler(workInProgress), + (workInProgress.flags &= -257), + (JSCompiler_temp = createCapturedValueFromError( + Error( + "There was an error while hydrating this Suspense boundary. Switched to client rendering." + ) + )), + (workInProgress = retrySuspenseComponentWithoutHydrating( + current, + workInProgress, + renderLanes, + JSCompiler_temp + ))) + : null !== workInProgress.memoizedState + ? (reuseSuspenseHandlerOnStack(workInProgress), + (workInProgress.child = current.child), + (workInProgress.flags |= 128), + (workInProgress = null)) + : (reuseSuspenseHandlerOnStack(workInProgress), + (nextPrimaryChildren = nextProps.fallback), + (showFallback = workInProgress.mode), + (nextProps = createFiberFromOffscreen( + { mode: "visible", children: nextProps.children }, + showFallback, + 0, + null + )), + (nextPrimaryChildren = createFiberFromFragment( + nextPrimaryChildren, + showFallback, + renderLanes, + null + )), + (nextPrimaryChildren.flags |= 2), + (nextProps.return = workInProgress), + (nextPrimaryChildren.return = workInProgress), + (nextProps.sibling = nextPrimaryChildren), + (workInProgress.child = nextProps), + 0 !== (workInProgress.mode & 1) && + reconcileChildFibers( + workInProgress, + current.child, + null, + renderLanes + ), + (nextProps = workInProgress.child), + (nextProps.memoizedState = mountSuspenseOffscreenState(renderLanes)), + (nextProps.childLanes = getRemainingWorkInPrimaryTree( + current, + JSCompiler_temp, + renderLanes + )), + (workInProgress.memoizedState = SUSPENDED_MARKER), + (workInProgress = nextPrimaryChildren)); + else if ((pushPrimaryTreeSuspenseHandler(workInProgress), shim$1())) + (JSCompiler_temp = shim$1().digest), + (nextProps = Error( + "The server could not finish this Suspense boundary, likely due to an error during server rendering. Switched to client rendering." + )), + (nextProps.digest = JSCompiler_temp), + (JSCompiler_temp = createCapturedValueFromError( + nextProps, + JSCompiler_temp, + void 0 + )), + (workInProgress = retrySuspenseComponentWithoutHydrating( + current, + workInProgress, + renderLanes, + JSCompiler_temp + )); + else if ( + ((JSCompiler_temp = 0 !== (renderLanes & current.childLanes)), + didReceiveUpdate || JSCompiler_temp) + ) { + JSCompiler_temp = workInProgressRoot; + if (null !== JSCompiler_temp) { + nextProps = renderLanes & -renderLanes; + if (enableUnifiedSyncLane && 0 !== (nextProps & SyncUpdateLanes)) + nextProps = 1; + else + switch (nextProps) { + case 2: + nextProps = 1; + break; + case 8: + nextProps = 4; + break; + case 32: + nextProps = 16; + break; + case 128: + case 256: + case 512: + case 1024: + case 2048: + case 4096: + case 8192: + case 16384: + case 32768: + case 65536: + case 131072: + case 262144: + case 524288: + case 1048576: + case 2097152: + case 4194304: + case 8388608: + case 16777216: + case 33554432: + nextProps = 64; + break; + case 268435456: + nextProps = 134217728; + break; + default: + nextProps = 0; + } + nextProps = + 0 !== (nextProps & (JSCompiler_temp.suspendedLanes | renderLanes)) + ? 0 + : nextProps; + if (0 !== nextProps && nextProps !== nextPrimaryChildren.retryLane) + throw ( + ((nextPrimaryChildren.retryLane = nextProps), + enqueueConcurrentRenderForLane(current, nextProps), + scheduleUpdateOnFiber(JSCompiler_temp, current, nextProps), + SelectiveHydrationException) + ); + } + shim$1() || renderDidSuspendDelayIfPossible(); + workInProgress = retrySuspenseComponentWithoutHydrating( current, workInProgress, - didSuspend, - JSCompiler_temp, - nextProps, - dehydrated, - nextFallbackChildren, - renderLanes + renderLanes, + null ); + } else + shim$1() + ? ((workInProgress.flags |= 128), + (workInProgress.child = current.child), + retryDehydratedSuspenseBoundary.bind(null, current), + shim$1(), + (workInProgress = null)) + : ((workInProgress = mountSuspensePrimaryChildren( + workInProgress, + nextProps.children + )), + (workInProgress.flags |= 4096)); + return workInProgress; } if (showFallback) { reuseSuspenseHandlerOnStack(workInProgress); - showFallback = nextProps.fallback; - didSuspend = workInProgress.mode; - nextFallbackChildren = current.child; - dehydrated = nextFallbackChildren.sibling; - var primaryChildProps = { mode: "hidden", children: nextProps.children }; - 0 === (didSuspend & 1) && workInProgress.child !== nextFallbackChildren + nextPrimaryChildren = nextProps.fallback; + showFallback = workInProgress.mode; + didSuspend = current.child; + var currentFallbackChildFragment = didSuspend.sibling, + primaryChildProps = { mode: "hidden", children: nextProps.children }; + 0 === (showFallback & 1) && workInProgress.child !== didSuspend ? ((nextProps = workInProgress.child), (nextProps.childLanes = 0), (nextProps.pendingProps = primaryChildProps), (workInProgress.deletions = null)) - : ((nextProps = createWorkInProgress( - nextFallbackChildren, - primaryChildProps - )), - (nextProps.subtreeFlags = - nextFallbackChildren.subtreeFlags & 31457280)); - null !== dehydrated - ? (showFallback = createWorkInProgress(dehydrated, showFallback)) - : ((showFallback = createFiberFromFragment( + : ((nextProps = createWorkInProgress(didSuspend, primaryChildProps)), + (nextProps.subtreeFlags = didSuspend.subtreeFlags & 31457280)); + null !== currentFallbackChildFragment + ? (nextPrimaryChildren = createWorkInProgress( + currentFallbackChildFragment, + nextPrimaryChildren + )) + : ((nextPrimaryChildren = createFiberFromFragment( + nextPrimaryChildren, showFallback, - didSuspend, renderLanes, null )), - (showFallback.flags |= 2)); - showFallback.return = workInProgress; + (nextPrimaryChildren.flags |= 2)); + nextPrimaryChildren.return = workInProgress; nextProps.return = workInProgress; - nextProps.sibling = showFallback; + nextProps.sibling = nextPrimaryChildren; workInProgress.child = nextProps; - nextProps = showFallback; - showFallback = workInProgress.child; - didSuspend = current.child.memoizedState; - null === didSuspend - ? (didSuspend = mountSuspenseOffscreenState(renderLanes)) - : ((nextFallbackChildren = didSuspend.cachePool), - null !== nextFallbackChildren - ? ((dehydrated = CacheContext._currentValue2), - (nextFallbackChildren = - nextFallbackChildren.parent !== dehydrated - ? { parent: dehydrated, pool: dehydrated } - : nextFallbackChildren)) - : (nextFallbackChildren = getSuspendedCache()), - (didSuspend = { - baseLanes: didSuspend.baseLanes | renderLanes, - cachePool: nextFallbackChildren + nextProps = nextPrimaryChildren; + nextPrimaryChildren = workInProgress.child; + showFallback = current.child.memoizedState; + null === showFallback + ? (showFallback = mountSuspenseOffscreenState(renderLanes)) + : ((didSuspend = showFallback.cachePool), + null !== didSuspend + ? ((currentFallbackChildFragment = CacheContext._currentValue2), + (didSuspend = + didSuspend.parent !== currentFallbackChildFragment + ? { + parent: currentFallbackChildFragment, + pool: currentFallbackChildFragment + } + : didSuspend)) + : (didSuspend = getSuspendedCache()), + (showFallback = { + baseLanes: showFallback.baseLanes | renderLanes, + cachePool: didSuspend })); - showFallback.memoizedState = didSuspend; - showFallback.childLanes = getRemainingWorkInPrimaryTree( + nextPrimaryChildren.memoizedState = showFallback; + nextPrimaryChildren.childLanes = getRemainingWorkInPrimaryTree( current, JSCompiler_temp, renderLanes @@ -6125,177 +6269,6 @@ function retrySuspenseComponentWithoutHydrating( workInProgress.memoizedState = null; return current; } -function updateDehydratedSuspenseComponent( - current, - workInProgress, - didSuspend, - didPrimaryChildrenDefer, - nextProps, - suspenseInstance, - suspenseState, - renderLanes -) { - if (didSuspend) { - if (workInProgress.flags & 256) - return ( - pushPrimaryTreeSuspenseHandler(workInProgress), - (workInProgress.flags &= -257), - (didPrimaryChildrenDefer = createCapturedValueFromError( - Error( - "There was an error while hydrating this Suspense boundary. Switched to client rendering." - ) - )), - retrySuspenseComponentWithoutHydrating( - current, - workInProgress, - renderLanes, - didPrimaryChildrenDefer - ) - ); - if (null !== workInProgress.memoizedState) - return ( - reuseSuspenseHandlerOnStack(workInProgress), - (workInProgress.child = current.child), - (workInProgress.flags |= 128), - null - ); - reuseSuspenseHandlerOnStack(workInProgress); - suspenseState = nextProps.fallback; - didSuspend = workInProgress.mode; - nextProps = createFiberFromOffscreen( - { mode: "visible", children: nextProps.children }, - didSuspend, - 0, - null - ); - suspenseState = createFiberFromFragment( - suspenseState, - didSuspend, - renderLanes, - null - ); - suspenseState.flags |= 2; - nextProps.return = workInProgress; - suspenseState.return = workInProgress; - nextProps.sibling = suspenseState; - workInProgress.child = nextProps; - 0 !== (workInProgress.mode & 1) && - reconcileChildFibers(workInProgress, current.child, null, renderLanes); - nextProps = workInProgress.child; - nextProps.memoizedState = mountSuspenseOffscreenState(renderLanes); - nextProps.childLanes = getRemainingWorkInPrimaryTree( - current, - didPrimaryChildrenDefer, - renderLanes - ); - workInProgress.memoizedState = SUSPENDED_MARKER; - return suspenseState; - } - pushPrimaryTreeSuspenseHandler(workInProgress); - if (0 === (workInProgress.mode & 1)) - return retrySuspenseComponentWithoutHydrating( - current, - workInProgress, - renderLanes, - null - ); - if (shim$1()) - return ( - (didPrimaryChildrenDefer = shim$1().digest), - (suspenseState = Error( - "The server could not finish this Suspense boundary, likely due to an error during server rendering. Switched to client rendering." - )), - (suspenseState.digest = didPrimaryChildrenDefer), - (didPrimaryChildrenDefer = createCapturedValueFromError( - suspenseState, - didPrimaryChildrenDefer, - void 0 - )), - retrySuspenseComponentWithoutHydrating( - current, - workInProgress, - renderLanes, - didPrimaryChildrenDefer - ) - ); - didPrimaryChildrenDefer = 0 !== (renderLanes & current.childLanes); - if (didReceiveUpdate || didPrimaryChildrenDefer) { - didPrimaryChildrenDefer = workInProgressRoot; - if (null !== didPrimaryChildrenDefer) { - nextProps = renderLanes & -renderLanes; - if (enableUnifiedSyncLane && 0 !== (nextProps & SyncUpdateLanes)) - nextProps = 1; - else - switch (nextProps) { - case 2: - nextProps = 1; - break; - case 8: - nextProps = 4; - break; - case 32: - nextProps = 16; - break; - case 128: - case 256: - case 512: - case 1024: - case 2048: - case 4096: - case 8192: - case 16384: - case 32768: - case 65536: - case 131072: - case 262144: - case 524288: - case 1048576: - case 2097152: - case 4194304: - case 8388608: - case 16777216: - case 33554432: - nextProps = 64; - break; - case 268435456: - nextProps = 134217728; - break; - default: - nextProps = 0; - } - nextProps = - 0 !== - (nextProps & (didPrimaryChildrenDefer.suspendedLanes | renderLanes)) - ? 0 - : nextProps; - if (0 !== nextProps && nextProps !== suspenseState.retryLane) - throw ( - ((suspenseState.retryLane = nextProps), - enqueueConcurrentRenderForLane(current, nextProps), - scheduleUpdateOnFiber(didPrimaryChildrenDefer, current, nextProps), - SelectiveHydrationException) - ); - } - shim$1() || renderDidSuspendDelayIfPossible(); - return retrySuspenseComponentWithoutHydrating( - current, - workInProgress, - renderLanes, - null - ); - } - if (shim$1()) - return ( - (workInProgress.flags |= 128), - (workInProgress.child = current.child), - retryDehydratedSuspenseBoundary.bind(null, current), - shim$1(), - null - ); - current = mountSuspensePrimaryChildren(workInProgress, nextProps.children); - current.flags |= 4096; - return current; -} function scheduleSuspenseWorkOnFiber(fiber, renderLanes, propagationRoot) { fiber.lanes |= renderLanes; var alternate = fiber.alternate; @@ -10634,10 +10607,10 @@ batchedUpdatesImpl = function (fn, a) { } }; var roots = new Map(), - devToolsConfig$jscomp$inline_1103 = { + devToolsConfig$jscomp$inline_1111 = { findFiberByHostInstance: getInstanceFromNode, bundleType: 0, - version: "19.0.0-canary-e0d11f5a", + version: "19.0.0-canary-125aec61", rendererPackageName: "react-native-renderer", rendererConfig: { getInspectorDataForInstance: getInspectorDataForInstance, @@ -10653,11 +10626,11 @@ var roots = new Map(), }.bind(null, findNodeHandle) } }; -var internals$jscomp$inline_1330 = { - bundleType: devToolsConfig$jscomp$inline_1103.bundleType, - version: devToolsConfig$jscomp$inline_1103.version, - rendererPackageName: devToolsConfig$jscomp$inline_1103.rendererPackageName, - rendererConfig: devToolsConfig$jscomp$inline_1103.rendererConfig, +var internals$jscomp$inline_1350 = { + bundleType: devToolsConfig$jscomp$inline_1111.bundleType, + version: devToolsConfig$jscomp$inline_1111.version, + rendererPackageName: devToolsConfig$jscomp$inline_1111.rendererPackageName, + rendererConfig: devToolsConfig$jscomp$inline_1111.rendererConfig, overrideHookState: null, overrideHookStateDeletePath: null, overrideHookStateRenamePath: null, @@ -10673,26 +10646,26 @@ var internals$jscomp$inline_1330 = { return null === fiber ? null : fiber.stateNode; }, findFiberByHostInstance: - devToolsConfig$jscomp$inline_1103.findFiberByHostInstance || + devToolsConfig$jscomp$inline_1111.findFiberByHostInstance || emptyFindFiberByHostInstance, findHostInstancesForRefresh: null, scheduleRefresh: null, scheduleRoot: null, setRefreshHandler: null, getCurrentFiber: null, - reconcilerVersion: "19.0.0-canary-e0d11f5a" + reconcilerVersion: "19.0.0-canary-125aec61" }; if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) { - var hook$jscomp$inline_1331 = __REACT_DEVTOOLS_GLOBAL_HOOK__; + var hook$jscomp$inline_1351 = __REACT_DEVTOOLS_GLOBAL_HOOK__; if ( - !hook$jscomp$inline_1331.isDisabled && - hook$jscomp$inline_1331.supportsFiber + !hook$jscomp$inline_1351.isDisabled && + hook$jscomp$inline_1351.supportsFiber ) try { - (rendererID = hook$jscomp$inline_1331.inject( - internals$jscomp$inline_1330 + (rendererID = hook$jscomp$inline_1351.inject( + internals$jscomp$inline_1350 )), - (injectedHook = hook$jscomp$inline_1331); + (injectedHook = hook$jscomp$inline_1351); } catch (err) {} } exports.createPortal = function (children, containerTag) { diff --git a/compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/implementations/ReactFabric-profiling.fb.js b/compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/implementations/ReactFabric-profiling.fb.js index 4864a9936c..4800901d21 100644 --- a/compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/implementations/ReactFabric-profiling.fb.js +++ b/compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/implementations/ReactFabric-profiling.fb.js @@ -7,7 +7,7 @@ * @noflow * @nolint * @preventMunge - * @generated SignedSource<> + * @generated SignedSource<<678b4fde4c7c00ef882ad8a25ac7bf72>> */ "use strict"; @@ -897,7 +897,7 @@ eventPluginOrder = Array.prototype.slice.call([ "ReactNativeBridgeEventPlugin" ]); recomputePluginOrdering(); -var injectedNamesToPlugins$jscomp$inline_267 = { +var injectedNamesToPlugins$jscomp$inline_266 = { ResponderEventPlugin: ResponderEventPlugin, ReactNativeBridgeEventPlugin: { eventTypes: {}, @@ -943,32 +943,32 @@ var injectedNamesToPlugins$jscomp$inline_267 = { } } }, - isOrderingDirty$jscomp$inline_268 = !1, - pluginName$jscomp$inline_269; -for (pluginName$jscomp$inline_269 in injectedNamesToPlugins$jscomp$inline_267) + isOrderingDirty$jscomp$inline_267 = !1, + pluginName$jscomp$inline_268; +for (pluginName$jscomp$inline_268 in injectedNamesToPlugins$jscomp$inline_266) if ( - injectedNamesToPlugins$jscomp$inline_267.hasOwnProperty( - pluginName$jscomp$inline_269 + injectedNamesToPlugins$jscomp$inline_266.hasOwnProperty( + pluginName$jscomp$inline_268 ) ) { - var pluginModule$jscomp$inline_270 = - injectedNamesToPlugins$jscomp$inline_267[pluginName$jscomp$inline_269]; + var pluginModule$jscomp$inline_269 = + injectedNamesToPlugins$jscomp$inline_266[pluginName$jscomp$inline_268]; if ( - !namesToPlugins.hasOwnProperty(pluginName$jscomp$inline_269) || - namesToPlugins[pluginName$jscomp$inline_269] !== - pluginModule$jscomp$inline_270 + !namesToPlugins.hasOwnProperty(pluginName$jscomp$inline_268) || + namesToPlugins[pluginName$jscomp$inline_268] !== + pluginModule$jscomp$inline_269 ) { - if (namesToPlugins[pluginName$jscomp$inline_269]) + if (namesToPlugins[pluginName$jscomp$inline_268]) throw Error( "EventPluginRegistry: Cannot inject two different event plugins using the same name, `" + - (pluginName$jscomp$inline_269 + "`.") + (pluginName$jscomp$inline_268 + "`.") ); - namesToPlugins[pluginName$jscomp$inline_269] = - pluginModule$jscomp$inline_270; - isOrderingDirty$jscomp$inline_268 = !0; + namesToPlugins[pluginName$jscomp$inline_268] = + pluginModule$jscomp$inline_269; + isOrderingDirty$jscomp$inline_267 = !0; } } -isOrderingDirty$jscomp$inline_268 && recomputePluginOrdering(); +isOrderingDirty$jscomp$inline_267 && recomputePluginOrdering(); var emptyObject$1 = {}, removedKeys = null, removedKeyCount = 0, @@ -6139,20 +6139,21 @@ function updateSuspenseComponent(current, workInProgress, renderLanes) { JSCompiler_temp = 0 !== (workInProgress.flags & 32); workInProgress.flags &= -33; if (null === current) { - didSuspend = nextProps.children; - var nextFallbackChildren = nextProps.fallback; + var nextPrimaryChildren = nextProps.children; + didSuspend = nextProps.fallback; if (showFallback) return ( reuseSuspenseHandlerOnStack(workInProgress), (nextProps = mountSuspenseFallbackChildren( workInProgress, + nextPrimaryChildren, didSuspend, - nextFallbackChildren, renderLanes )), - (showFallback = workInProgress.child), - (showFallback.memoizedState = mountSuspenseOffscreenState(renderLanes)), - (showFallback.childLanes = getRemainingWorkInPrimaryTree( + (nextPrimaryChildren = workInProgress.child), + (nextPrimaryChildren.memoizedState = + mountSuspenseOffscreenState(renderLanes)), + (nextPrimaryChildren.childLanes = getRemainingWorkInPrimaryTree( current, JSCompiler_temp, renderLanes @@ -6165,13 +6166,14 @@ function updateSuspenseComponent(current, workInProgress, renderLanes) { reuseSuspenseHandlerOnStack(workInProgress), (nextProps = mountSuspenseFallbackChildren( workInProgress, + nextPrimaryChildren, didSuspend, - nextFallbackChildren, renderLanes )), - (showFallback = workInProgress.child), - (showFallback.memoizedState = mountSuspenseOffscreenState(renderLanes)), - (showFallback.childLanes = getRemainingWorkInPrimaryTree( + (nextPrimaryChildren = workInProgress.child), + (nextPrimaryChildren.memoizedState = + mountSuspenseOffscreenState(renderLanes)), + (nextPrimaryChildren.childLanes = getRemainingWorkInPrimaryTree( current, JSCompiler_temp, renderLanes @@ -6181,78 +6183,220 @@ function updateSuspenseComponent(current, workInProgress, renderLanes) { nextProps ); pushPrimaryTreeSuspenseHandler(workInProgress); - return mountSuspensePrimaryChildren(workInProgress, didSuspend); + return mountSuspensePrimaryChildren(workInProgress, nextPrimaryChildren); } - nextFallbackChildren = current.memoizedState; - if (null !== nextFallbackChildren) { - var dehydrated = nextFallbackChildren.dehydrated; - if (null !== dehydrated) - return updateDehydratedSuspenseComponent( + nextPrimaryChildren = current.memoizedState; + if (null !== nextPrimaryChildren && null !== nextPrimaryChildren.dehydrated) { + if (didSuspend) + workInProgress.flags & 256 + ? (pushPrimaryTreeSuspenseHandler(workInProgress), + (workInProgress.flags &= -257), + (JSCompiler_temp = createCapturedValueFromError( + Error( + "There was an error while hydrating this Suspense boundary. Switched to client rendering." + ) + )), + (workInProgress = retrySuspenseComponentWithoutHydrating( + current, + workInProgress, + renderLanes, + JSCompiler_temp + ))) + : null !== workInProgress.memoizedState + ? (reuseSuspenseHandlerOnStack(workInProgress), + (workInProgress.child = current.child), + (workInProgress.flags |= 128), + (workInProgress = null)) + : (reuseSuspenseHandlerOnStack(workInProgress), + (nextPrimaryChildren = nextProps.fallback), + (showFallback = workInProgress.mode), + (nextProps = createFiberFromOffscreen( + { mode: "visible", children: nextProps.children }, + showFallback, + 0, + null + )), + (nextPrimaryChildren = createFiberFromFragment( + nextPrimaryChildren, + showFallback, + renderLanes, + null + )), + (nextPrimaryChildren.flags |= 2), + (nextProps.return = workInProgress), + (nextPrimaryChildren.return = workInProgress), + (nextProps.sibling = nextPrimaryChildren), + (workInProgress.child = nextProps), + 0 !== (workInProgress.mode & 1) && + reconcileChildFibers( + workInProgress, + current.child, + null, + renderLanes + ), + (nextProps = workInProgress.child), + (nextProps.memoizedState = mountSuspenseOffscreenState(renderLanes)), + (nextProps.childLanes = getRemainingWorkInPrimaryTree( + current, + JSCompiler_temp, + renderLanes + )), + (workInProgress.memoizedState = SUSPENDED_MARKER), + (workInProgress = nextPrimaryChildren)); + else if ((pushPrimaryTreeSuspenseHandler(workInProgress), shim$1())) + (JSCompiler_temp = shim$1().digest), + (nextProps = Error( + "The server could not finish this Suspense boundary, likely due to an error during server rendering. Switched to client rendering." + )), + (nextProps.digest = JSCompiler_temp), + (JSCompiler_temp = createCapturedValueFromError( + nextProps, + JSCompiler_temp, + void 0 + )), + (workInProgress = retrySuspenseComponentWithoutHydrating( + current, + workInProgress, + renderLanes, + JSCompiler_temp + )); + else if ( + ((JSCompiler_temp = 0 !== (renderLanes & current.childLanes)), + didReceiveUpdate || JSCompiler_temp) + ) { + JSCompiler_temp = workInProgressRoot; + if (null !== JSCompiler_temp) { + nextProps = renderLanes & -renderLanes; + if (enableUnifiedSyncLane && 0 !== (nextProps & SyncUpdateLanes)) + nextProps = 1; + else + switch (nextProps) { + case 2: + nextProps = 1; + break; + case 8: + nextProps = 4; + break; + case 32: + nextProps = 16; + break; + case 128: + case 256: + case 512: + case 1024: + case 2048: + case 4096: + case 8192: + case 16384: + case 32768: + case 65536: + case 131072: + case 262144: + case 524288: + case 1048576: + case 2097152: + case 4194304: + case 8388608: + case 16777216: + case 33554432: + nextProps = 64; + break; + case 268435456: + nextProps = 134217728; + break; + default: + nextProps = 0; + } + nextProps = + 0 !== (nextProps & (JSCompiler_temp.suspendedLanes | renderLanes)) + ? 0 + : nextProps; + if (0 !== nextProps && nextProps !== nextPrimaryChildren.retryLane) + throw ( + ((nextPrimaryChildren.retryLane = nextProps), + enqueueConcurrentRenderForLane(current, nextProps), + scheduleUpdateOnFiber(JSCompiler_temp, current, nextProps), + SelectiveHydrationException) + ); + } + shim$1() || renderDidSuspendDelayIfPossible(); + workInProgress = retrySuspenseComponentWithoutHydrating( current, workInProgress, - didSuspend, - JSCompiler_temp, - nextProps, - dehydrated, - nextFallbackChildren, - renderLanes + renderLanes, + null ); + } else + shim$1() + ? ((workInProgress.flags |= 128), + (workInProgress.child = current.child), + retryDehydratedSuspenseBoundary.bind(null, current), + shim$1(), + (workInProgress = null)) + : ((workInProgress = mountSuspensePrimaryChildren( + workInProgress, + nextProps.children + )), + (workInProgress.flags |= 4096)); + return workInProgress; } if (showFallback) { reuseSuspenseHandlerOnStack(workInProgress); - showFallback = nextProps.fallback; - didSuspend = workInProgress.mode; - nextFallbackChildren = current.child; - dehydrated = nextFallbackChildren.sibling; - var primaryChildProps = { mode: "hidden", children: nextProps.children }; - 0 === (didSuspend & 1) && workInProgress.child !== nextFallbackChildren + nextPrimaryChildren = nextProps.fallback; + showFallback = workInProgress.mode; + didSuspend = current.child; + var currentFallbackChildFragment = didSuspend.sibling, + primaryChildProps = { mode: "hidden", children: nextProps.children }; + 0 === (showFallback & 1) && workInProgress.child !== didSuspend ? ((nextProps = workInProgress.child), (nextProps.childLanes = 0), (nextProps.pendingProps = primaryChildProps), workInProgress.mode & 2 && ((nextProps.actualDuration = 0), (nextProps.actualStartTime = -1), - (nextProps.selfBaseDuration = nextFallbackChildren.selfBaseDuration), - (nextProps.treeBaseDuration = nextFallbackChildren.treeBaseDuration)), + (nextProps.selfBaseDuration = didSuspend.selfBaseDuration), + (nextProps.treeBaseDuration = didSuspend.treeBaseDuration)), (workInProgress.deletions = null)) - : ((nextProps = createWorkInProgress( - nextFallbackChildren, - primaryChildProps - )), - (nextProps.subtreeFlags = - nextFallbackChildren.subtreeFlags & 31457280)); - null !== dehydrated - ? (showFallback = createWorkInProgress(dehydrated, showFallback)) - : ((showFallback = createFiberFromFragment( + : ((nextProps = createWorkInProgress(didSuspend, primaryChildProps)), + (nextProps.subtreeFlags = didSuspend.subtreeFlags & 31457280)); + null !== currentFallbackChildFragment + ? (nextPrimaryChildren = createWorkInProgress( + currentFallbackChildFragment, + nextPrimaryChildren + )) + : ((nextPrimaryChildren = createFiberFromFragment( + nextPrimaryChildren, showFallback, - didSuspend, renderLanes, null )), - (showFallback.flags |= 2)); - showFallback.return = workInProgress; + (nextPrimaryChildren.flags |= 2)); + nextPrimaryChildren.return = workInProgress; nextProps.return = workInProgress; - nextProps.sibling = showFallback; + nextProps.sibling = nextPrimaryChildren; workInProgress.child = nextProps; - nextProps = showFallback; - showFallback = workInProgress.child; - didSuspend = current.child.memoizedState; - null === didSuspend - ? (didSuspend = mountSuspenseOffscreenState(renderLanes)) - : ((nextFallbackChildren = didSuspend.cachePool), - null !== nextFallbackChildren - ? ((dehydrated = CacheContext._currentValue2), - (nextFallbackChildren = - nextFallbackChildren.parent !== dehydrated - ? { parent: dehydrated, pool: dehydrated } - : nextFallbackChildren)) - : (nextFallbackChildren = getSuspendedCache()), - (didSuspend = { - baseLanes: didSuspend.baseLanes | renderLanes, - cachePool: nextFallbackChildren + nextProps = nextPrimaryChildren; + nextPrimaryChildren = workInProgress.child; + showFallback = current.child.memoizedState; + null === showFallback + ? (showFallback = mountSuspenseOffscreenState(renderLanes)) + : ((didSuspend = showFallback.cachePool), + null !== didSuspend + ? ((currentFallbackChildFragment = CacheContext._currentValue2), + (didSuspend = + didSuspend.parent !== currentFallbackChildFragment + ? { + parent: currentFallbackChildFragment, + pool: currentFallbackChildFragment + } + : didSuspend)) + : (didSuspend = getSuspendedCache()), + (showFallback = { + baseLanes: showFallback.baseLanes | renderLanes, + cachePool: didSuspend })); - showFallback.memoizedState = didSuspend; - showFallback.childLanes = getRemainingWorkInPrimaryTree( + nextPrimaryChildren.memoizedState = showFallback; + nextPrimaryChildren.childLanes = getRemainingWorkInPrimaryTree( current, JSCompiler_temp, renderLanes @@ -6343,177 +6487,6 @@ function retrySuspenseComponentWithoutHydrating( workInProgress.memoizedState = null; return current; } -function updateDehydratedSuspenseComponent( - current, - workInProgress, - didSuspend, - didPrimaryChildrenDefer, - nextProps, - suspenseInstance, - suspenseState, - renderLanes -) { - if (didSuspend) { - if (workInProgress.flags & 256) - return ( - pushPrimaryTreeSuspenseHandler(workInProgress), - (workInProgress.flags &= -257), - (didPrimaryChildrenDefer = createCapturedValueFromError( - Error( - "There was an error while hydrating this Suspense boundary. Switched to client rendering." - ) - )), - retrySuspenseComponentWithoutHydrating( - current, - workInProgress, - renderLanes, - didPrimaryChildrenDefer - ) - ); - if (null !== workInProgress.memoizedState) - return ( - reuseSuspenseHandlerOnStack(workInProgress), - (workInProgress.child = current.child), - (workInProgress.flags |= 128), - null - ); - reuseSuspenseHandlerOnStack(workInProgress); - suspenseState = nextProps.fallback; - didSuspend = workInProgress.mode; - nextProps = createFiberFromOffscreen( - { mode: "visible", children: nextProps.children }, - didSuspend, - 0, - null - ); - suspenseState = createFiberFromFragment( - suspenseState, - didSuspend, - renderLanes, - null - ); - suspenseState.flags |= 2; - nextProps.return = workInProgress; - suspenseState.return = workInProgress; - nextProps.sibling = suspenseState; - workInProgress.child = nextProps; - 0 !== (workInProgress.mode & 1) && - reconcileChildFibers(workInProgress, current.child, null, renderLanes); - nextProps = workInProgress.child; - nextProps.memoizedState = mountSuspenseOffscreenState(renderLanes); - nextProps.childLanes = getRemainingWorkInPrimaryTree( - current, - didPrimaryChildrenDefer, - renderLanes - ); - workInProgress.memoizedState = SUSPENDED_MARKER; - return suspenseState; - } - pushPrimaryTreeSuspenseHandler(workInProgress); - if (0 === (workInProgress.mode & 1)) - return retrySuspenseComponentWithoutHydrating( - current, - workInProgress, - renderLanes, - null - ); - if (shim$1()) - return ( - (didPrimaryChildrenDefer = shim$1().digest), - (suspenseState = Error( - "The server could not finish this Suspense boundary, likely due to an error during server rendering. Switched to client rendering." - )), - (suspenseState.digest = didPrimaryChildrenDefer), - (didPrimaryChildrenDefer = createCapturedValueFromError( - suspenseState, - didPrimaryChildrenDefer, - void 0 - )), - retrySuspenseComponentWithoutHydrating( - current, - workInProgress, - renderLanes, - didPrimaryChildrenDefer - ) - ); - didPrimaryChildrenDefer = 0 !== (renderLanes & current.childLanes); - if (didReceiveUpdate || didPrimaryChildrenDefer) { - didPrimaryChildrenDefer = workInProgressRoot; - if (null !== didPrimaryChildrenDefer) { - nextProps = renderLanes & -renderLanes; - if (enableUnifiedSyncLane && 0 !== (nextProps & SyncUpdateLanes)) - nextProps = 1; - else - switch (nextProps) { - case 2: - nextProps = 1; - break; - case 8: - nextProps = 4; - break; - case 32: - nextProps = 16; - break; - case 128: - case 256: - case 512: - case 1024: - case 2048: - case 4096: - case 8192: - case 16384: - case 32768: - case 65536: - case 131072: - case 262144: - case 524288: - case 1048576: - case 2097152: - case 4194304: - case 8388608: - case 16777216: - case 33554432: - nextProps = 64; - break; - case 268435456: - nextProps = 134217728; - break; - default: - nextProps = 0; - } - nextProps = - 0 !== - (nextProps & (didPrimaryChildrenDefer.suspendedLanes | renderLanes)) - ? 0 - : nextProps; - if (0 !== nextProps && nextProps !== suspenseState.retryLane) - throw ( - ((suspenseState.retryLane = nextProps), - enqueueConcurrentRenderForLane(current, nextProps), - scheduleUpdateOnFiber(didPrimaryChildrenDefer, current, nextProps), - SelectiveHydrationException) - ); - } - shim$1() || renderDidSuspendDelayIfPossible(); - return retrySuspenseComponentWithoutHydrating( - current, - workInProgress, - renderLanes, - null - ); - } - if (shim$1()) - return ( - (workInProgress.flags |= 128), - (workInProgress.child = current.child), - retryDehydratedSuspenseBoundary.bind(null, current), - shim$1(), - null - ); - current = mountSuspensePrimaryChildren(workInProgress, nextProps.children); - current.flags |= 4096; - return current; -} function scheduleSuspenseWorkOnFiber(fiber, renderLanes, propagationRoot) { fiber.lanes |= renderLanes; var alternate = fiber.alternate; @@ -11340,10 +11313,10 @@ batchedUpdatesImpl = function (fn, a) { } }; var roots = new Map(), - devToolsConfig$jscomp$inline_1184 = { + devToolsConfig$jscomp$inline_1192 = { findFiberByHostInstance: getInstanceFromNode, bundleType: 0, - version: "19.0.0-canary-ee881b72", + version: "19.0.0-canary-ef497dcd", rendererPackageName: "react-native-renderer", rendererConfig: { getInspectorDataForInstance: getInspectorDataForInstance, @@ -11373,10 +11346,10 @@ var roots = new Map(), } catch (err) {} return hook.checkDCE ? !0 : !1; })({ - bundleType: devToolsConfig$jscomp$inline_1184.bundleType, - version: devToolsConfig$jscomp$inline_1184.version, - rendererPackageName: devToolsConfig$jscomp$inline_1184.rendererPackageName, - rendererConfig: devToolsConfig$jscomp$inline_1184.rendererConfig, + bundleType: devToolsConfig$jscomp$inline_1192.bundleType, + version: devToolsConfig$jscomp$inline_1192.version, + rendererPackageName: devToolsConfig$jscomp$inline_1192.rendererPackageName, + rendererConfig: devToolsConfig$jscomp$inline_1192.rendererConfig, overrideHookState: null, overrideHookStateDeletePath: null, overrideHookStateRenamePath: null, @@ -11392,14 +11365,14 @@ var roots = new Map(), return null === fiber ? null : fiber.stateNode; }, findFiberByHostInstance: - devToolsConfig$jscomp$inline_1184.findFiberByHostInstance || + devToolsConfig$jscomp$inline_1192.findFiberByHostInstance || emptyFindFiberByHostInstance, findHostInstancesForRefresh: null, scheduleRefresh: null, scheduleRoot: null, setRefreshHandler: null, getCurrentFiber: null, - reconcilerVersion: "19.0.0-canary-ee881b72" + reconcilerVersion: "19.0.0-canary-ef497dcd" }); exports.createPortal = function (children, containerTag) { return createPortal$1( diff --git a/compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/implementations/ReactNativeRenderer-dev.fb.js b/compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/implementations/ReactNativeRenderer-dev.fb.js index 19023ca4c0..9322d8462c 100644 --- a/compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/implementations/ReactNativeRenderer-dev.fb.js +++ b/compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/implementations/ReactNativeRenderer-dev.fb.js @@ -7,7 +7,7 @@ * @noflow * @nolint * @preventMunge - * @generated SignedSource<> + * @generated SignedSource<<0049bc903b79ac30bcede14f8871b302>> */ "use strict"; @@ -18996,15 +18996,6 @@ to return true:wantsResponderID| | // This is the first render pass. Attempt to hydrate. pushPrimaryTreeSuspenseHandler(workInProgress); // We should never be hydrating at this point because it is the first pass, - if ((workInProgress.mode & ConcurrentMode) === NoMode) { - return retrySuspenseComponentWithoutHydrating( - current, - workInProgress, - renderLanes, - null - ); - } - if (isSuspenseInstanceFallback()) { // This boundary is in a permanent fallback state. In this case, we'll never // get an update and we'll never be able to hydrate the final content. Let's just try the @@ -30307,7 +30298,7 @@ to return true:wantsResponderID| | return root; } - var ReactVersion = "19.0.0-canary-97b48a97"; + var ReactVersion = "19.0.0-canary-99e8da3a"; function createPortal$1( children, diff --git a/compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/implementations/ReactNativeRenderer-prod.fb.js b/compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/implementations/ReactNativeRenderer-prod.fb.js index 0d7d9cb7af..db2f517e73 100644 --- a/compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/implementations/ReactNativeRenderer-prod.fb.js +++ b/compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/implementations/ReactNativeRenderer-prod.fb.js @@ -7,7 +7,7 @@ * @noflow * @nolint * @preventMunge - * @generated SignedSource<> + * @generated SignedSource<> */ "use strict"; @@ -893,7 +893,7 @@ eventPluginOrder = Array.prototype.slice.call([ "ReactNativeBridgeEventPlugin" ]); recomputePluginOrdering(); -var injectedNamesToPlugins$jscomp$inline_258 = { +var injectedNamesToPlugins$jscomp$inline_257 = { ResponderEventPlugin: ResponderEventPlugin, ReactNativeBridgeEventPlugin: { eventTypes: {}, @@ -939,32 +939,32 @@ var injectedNamesToPlugins$jscomp$inline_258 = { } } }, - isOrderingDirty$jscomp$inline_259 = !1, - pluginName$jscomp$inline_260; -for (pluginName$jscomp$inline_260 in injectedNamesToPlugins$jscomp$inline_258) + isOrderingDirty$jscomp$inline_258 = !1, + pluginName$jscomp$inline_259; +for (pluginName$jscomp$inline_259 in injectedNamesToPlugins$jscomp$inline_257) if ( - injectedNamesToPlugins$jscomp$inline_258.hasOwnProperty( - pluginName$jscomp$inline_260 + injectedNamesToPlugins$jscomp$inline_257.hasOwnProperty( + pluginName$jscomp$inline_259 ) ) { - var pluginModule$jscomp$inline_261 = - injectedNamesToPlugins$jscomp$inline_258[pluginName$jscomp$inline_260]; + var pluginModule$jscomp$inline_260 = + injectedNamesToPlugins$jscomp$inline_257[pluginName$jscomp$inline_259]; if ( - !namesToPlugins.hasOwnProperty(pluginName$jscomp$inline_260) || - namesToPlugins[pluginName$jscomp$inline_260] !== - pluginModule$jscomp$inline_261 + !namesToPlugins.hasOwnProperty(pluginName$jscomp$inline_259) || + namesToPlugins[pluginName$jscomp$inline_259] !== + pluginModule$jscomp$inline_260 ) { - if (namesToPlugins[pluginName$jscomp$inline_260]) + if (namesToPlugins[pluginName$jscomp$inline_259]) throw Error( "EventPluginRegistry: Cannot inject two different event plugins using the same name, `" + - (pluginName$jscomp$inline_260 + "`.") + (pluginName$jscomp$inline_259 + "`.") ); - namesToPlugins[pluginName$jscomp$inline_260] = - pluginModule$jscomp$inline_261; - isOrderingDirty$jscomp$inline_259 = !0; + namesToPlugins[pluginName$jscomp$inline_259] = + pluginModule$jscomp$inline_260; + isOrderingDirty$jscomp$inline_258 = !0; } } -isOrderingDirty$jscomp$inline_259 && recomputePluginOrdering(); +isOrderingDirty$jscomp$inline_258 && recomputePluginOrdering(); var instanceCache = new Map(), instanceProps = new Map(); function getInstanceFromTag(tag) { @@ -5997,20 +5997,21 @@ function updateSuspenseComponent(current, workInProgress, renderLanes) { JSCompiler_temp = 0 !== (workInProgress.flags & 32); workInProgress.flags &= -33; if (null === current) { - didSuspend = nextProps.children; - var nextFallbackChildren = nextProps.fallback; + var nextPrimaryChildren = nextProps.children; + didSuspend = nextProps.fallback; if (showFallback) return ( reuseSuspenseHandlerOnStack(workInProgress), (nextProps = mountSuspenseFallbackChildren( workInProgress, + nextPrimaryChildren, didSuspend, - nextFallbackChildren, renderLanes )), - (showFallback = workInProgress.child), - (showFallback.memoizedState = mountSuspenseOffscreenState(renderLanes)), - (showFallback.childLanes = getRemainingWorkInPrimaryTree( + (nextPrimaryChildren = workInProgress.child), + (nextPrimaryChildren.memoizedState = + mountSuspenseOffscreenState(renderLanes)), + (nextPrimaryChildren.childLanes = getRemainingWorkInPrimaryTree( current, JSCompiler_temp, renderLanes @@ -6023,13 +6024,14 @@ function updateSuspenseComponent(current, workInProgress, renderLanes) { reuseSuspenseHandlerOnStack(workInProgress), (nextProps = mountSuspenseFallbackChildren( workInProgress, + nextPrimaryChildren, didSuspend, - nextFallbackChildren, renderLanes )), - (showFallback = workInProgress.child), - (showFallback.memoizedState = mountSuspenseOffscreenState(renderLanes)), - (showFallback.childLanes = getRemainingWorkInPrimaryTree( + (nextPrimaryChildren = workInProgress.child), + (nextPrimaryChildren.memoizedState = + mountSuspenseOffscreenState(renderLanes)), + (nextPrimaryChildren.childLanes = getRemainingWorkInPrimaryTree( current, JSCompiler_temp, renderLanes @@ -6039,73 +6041,215 @@ function updateSuspenseComponent(current, workInProgress, renderLanes) { nextProps ); pushPrimaryTreeSuspenseHandler(workInProgress); - return mountSuspensePrimaryChildren(workInProgress, didSuspend); + return mountSuspensePrimaryChildren(workInProgress, nextPrimaryChildren); } - nextFallbackChildren = current.memoizedState; - if (null !== nextFallbackChildren) { - var dehydrated = nextFallbackChildren.dehydrated; - if (null !== dehydrated) - return updateDehydratedSuspenseComponent( + nextPrimaryChildren = current.memoizedState; + if (null !== nextPrimaryChildren && null !== nextPrimaryChildren.dehydrated) { + if (didSuspend) + workInProgress.flags & 256 + ? (pushPrimaryTreeSuspenseHandler(workInProgress), + (workInProgress.flags &= -257), + (JSCompiler_temp = createCapturedValueFromError( + Error( + "There was an error while hydrating this Suspense boundary. Switched to client rendering." + ) + )), + (workInProgress = retrySuspenseComponentWithoutHydrating( + current, + workInProgress, + renderLanes, + JSCompiler_temp + ))) + : null !== workInProgress.memoizedState + ? (reuseSuspenseHandlerOnStack(workInProgress), + (workInProgress.child = current.child), + (workInProgress.flags |= 128), + (workInProgress = null)) + : (reuseSuspenseHandlerOnStack(workInProgress), + (nextPrimaryChildren = nextProps.fallback), + (showFallback = workInProgress.mode), + (nextProps = createFiberFromOffscreen( + { mode: "visible", children: nextProps.children }, + showFallback, + 0, + null + )), + (nextPrimaryChildren = createFiberFromFragment( + nextPrimaryChildren, + showFallback, + renderLanes, + null + )), + (nextPrimaryChildren.flags |= 2), + (nextProps.return = workInProgress), + (nextPrimaryChildren.return = workInProgress), + (nextProps.sibling = nextPrimaryChildren), + (workInProgress.child = nextProps), + 0 !== (workInProgress.mode & 1) && + reconcileChildFibers( + workInProgress, + current.child, + null, + renderLanes + ), + (nextProps = workInProgress.child), + (nextProps.memoizedState = mountSuspenseOffscreenState(renderLanes)), + (nextProps.childLanes = getRemainingWorkInPrimaryTree( + current, + JSCompiler_temp, + renderLanes + )), + (workInProgress.memoizedState = SUSPENDED_MARKER), + (workInProgress = nextPrimaryChildren)); + else if ((pushPrimaryTreeSuspenseHandler(workInProgress), shim$1())) + (JSCompiler_temp = shim$1().digest), + (nextProps = Error( + "The server could not finish this Suspense boundary, likely due to an error during server rendering. Switched to client rendering." + )), + (nextProps.digest = JSCompiler_temp), + (JSCompiler_temp = createCapturedValueFromError( + nextProps, + JSCompiler_temp, + void 0 + )), + (workInProgress = retrySuspenseComponentWithoutHydrating( + current, + workInProgress, + renderLanes, + JSCompiler_temp + )); + else if ( + ((JSCompiler_temp = 0 !== (renderLanes & current.childLanes)), + didReceiveUpdate || JSCompiler_temp) + ) { + JSCompiler_temp = workInProgressRoot; + if (null !== JSCompiler_temp) { + nextProps = renderLanes & -renderLanes; + if (enableUnifiedSyncLane && 0 !== (nextProps & SyncUpdateLanes)) + nextProps = 1; + else + switch (nextProps) { + case 2: + nextProps = 1; + break; + case 8: + nextProps = 4; + break; + case 32: + nextProps = 16; + break; + case 128: + case 256: + case 512: + case 1024: + case 2048: + case 4096: + case 8192: + case 16384: + case 32768: + case 65536: + case 131072: + case 262144: + case 524288: + case 1048576: + case 2097152: + case 4194304: + case 8388608: + case 16777216: + case 33554432: + nextProps = 64; + break; + case 268435456: + nextProps = 134217728; + break; + default: + nextProps = 0; + } + nextProps = + 0 !== (nextProps & (JSCompiler_temp.suspendedLanes | renderLanes)) + ? 0 + : nextProps; + if (0 !== nextProps && nextProps !== nextPrimaryChildren.retryLane) + throw ( + ((nextPrimaryChildren.retryLane = nextProps), + enqueueConcurrentRenderForLane(current, nextProps), + scheduleUpdateOnFiber(JSCompiler_temp, current, nextProps), + SelectiveHydrationException) + ); + } + shim$1() || renderDidSuspendDelayIfPossible(); + workInProgress = retrySuspenseComponentWithoutHydrating( current, workInProgress, - didSuspend, - JSCompiler_temp, - nextProps, - dehydrated, - nextFallbackChildren, - renderLanes + renderLanes, + null ); + } else + shim$1() + ? ((workInProgress.flags |= 128), + (workInProgress.child = current.child), + retryDehydratedSuspenseBoundary.bind(null, current), + shim$1(), + (workInProgress = null)) + : ((workInProgress = mountSuspensePrimaryChildren( + workInProgress, + nextProps.children + )), + (workInProgress.flags |= 4096)); + return workInProgress; } if (showFallback) { reuseSuspenseHandlerOnStack(workInProgress); - showFallback = nextProps.fallback; - didSuspend = workInProgress.mode; - nextFallbackChildren = current.child; - dehydrated = nextFallbackChildren.sibling; - var primaryChildProps = { mode: "hidden", children: nextProps.children }; - 0 === (didSuspend & 1) && workInProgress.child !== nextFallbackChildren + nextPrimaryChildren = nextProps.fallback; + showFallback = workInProgress.mode; + didSuspend = current.child; + var currentFallbackChildFragment = didSuspend.sibling, + primaryChildProps = { mode: "hidden", children: nextProps.children }; + 0 === (showFallback & 1) && workInProgress.child !== didSuspend ? ((nextProps = workInProgress.child), (nextProps.childLanes = 0), (nextProps.pendingProps = primaryChildProps), (workInProgress.deletions = null)) - : ((nextProps = createWorkInProgress( - nextFallbackChildren, - primaryChildProps - )), - (nextProps.subtreeFlags = - nextFallbackChildren.subtreeFlags & 31457280)); - null !== dehydrated - ? (showFallback = createWorkInProgress(dehydrated, showFallback)) - : ((showFallback = createFiberFromFragment( + : ((nextProps = createWorkInProgress(didSuspend, primaryChildProps)), + (nextProps.subtreeFlags = didSuspend.subtreeFlags & 31457280)); + null !== currentFallbackChildFragment + ? (nextPrimaryChildren = createWorkInProgress( + currentFallbackChildFragment, + nextPrimaryChildren + )) + : ((nextPrimaryChildren = createFiberFromFragment( + nextPrimaryChildren, showFallback, - didSuspend, renderLanes, null )), - (showFallback.flags |= 2)); - showFallback.return = workInProgress; + (nextPrimaryChildren.flags |= 2)); + nextPrimaryChildren.return = workInProgress; nextProps.return = workInProgress; - nextProps.sibling = showFallback; + nextProps.sibling = nextPrimaryChildren; workInProgress.child = nextProps; - nextProps = showFallback; - showFallback = workInProgress.child; - didSuspend = current.child.memoizedState; - null === didSuspend - ? (didSuspend = mountSuspenseOffscreenState(renderLanes)) - : ((nextFallbackChildren = didSuspend.cachePool), - null !== nextFallbackChildren - ? ((dehydrated = CacheContext._currentValue), - (nextFallbackChildren = - nextFallbackChildren.parent !== dehydrated - ? { parent: dehydrated, pool: dehydrated } - : nextFallbackChildren)) - : (nextFallbackChildren = getSuspendedCache()), - (didSuspend = { - baseLanes: didSuspend.baseLanes | renderLanes, - cachePool: nextFallbackChildren + nextProps = nextPrimaryChildren; + nextPrimaryChildren = workInProgress.child; + showFallback = current.child.memoizedState; + null === showFallback + ? (showFallback = mountSuspenseOffscreenState(renderLanes)) + : ((didSuspend = showFallback.cachePool), + null !== didSuspend + ? ((currentFallbackChildFragment = CacheContext._currentValue), + (didSuspend = + didSuspend.parent !== currentFallbackChildFragment + ? { + parent: currentFallbackChildFragment, + pool: currentFallbackChildFragment + } + : didSuspend)) + : (didSuspend = getSuspendedCache()), + (showFallback = { + baseLanes: showFallback.baseLanes | renderLanes, + cachePool: didSuspend })); - showFallback.memoizedState = didSuspend; - showFallback.childLanes = getRemainingWorkInPrimaryTree( + nextPrimaryChildren.memoizedState = showFallback; + nextPrimaryChildren.childLanes = getRemainingWorkInPrimaryTree( current, JSCompiler_temp, renderLanes @@ -6191,177 +6335,6 @@ function retrySuspenseComponentWithoutHydrating( workInProgress.memoizedState = null; return current; } -function updateDehydratedSuspenseComponent( - current, - workInProgress, - didSuspend, - didPrimaryChildrenDefer, - nextProps, - suspenseInstance, - suspenseState, - renderLanes -) { - if (didSuspend) { - if (workInProgress.flags & 256) - return ( - pushPrimaryTreeSuspenseHandler(workInProgress), - (workInProgress.flags &= -257), - (didPrimaryChildrenDefer = createCapturedValueFromError( - Error( - "There was an error while hydrating this Suspense boundary. Switched to client rendering." - ) - )), - retrySuspenseComponentWithoutHydrating( - current, - workInProgress, - renderLanes, - didPrimaryChildrenDefer - ) - ); - if (null !== workInProgress.memoizedState) - return ( - reuseSuspenseHandlerOnStack(workInProgress), - (workInProgress.child = current.child), - (workInProgress.flags |= 128), - null - ); - reuseSuspenseHandlerOnStack(workInProgress); - suspenseState = nextProps.fallback; - didSuspend = workInProgress.mode; - nextProps = createFiberFromOffscreen( - { mode: "visible", children: nextProps.children }, - didSuspend, - 0, - null - ); - suspenseState = createFiberFromFragment( - suspenseState, - didSuspend, - renderLanes, - null - ); - suspenseState.flags |= 2; - nextProps.return = workInProgress; - suspenseState.return = workInProgress; - nextProps.sibling = suspenseState; - workInProgress.child = nextProps; - 0 !== (workInProgress.mode & 1) && - reconcileChildFibers(workInProgress, current.child, null, renderLanes); - nextProps = workInProgress.child; - nextProps.memoizedState = mountSuspenseOffscreenState(renderLanes); - nextProps.childLanes = getRemainingWorkInPrimaryTree( - current, - didPrimaryChildrenDefer, - renderLanes - ); - workInProgress.memoizedState = SUSPENDED_MARKER; - return suspenseState; - } - pushPrimaryTreeSuspenseHandler(workInProgress); - if (0 === (workInProgress.mode & 1)) - return retrySuspenseComponentWithoutHydrating( - current, - workInProgress, - renderLanes, - null - ); - if (shim$1()) - return ( - (didPrimaryChildrenDefer = shim$1().digest), - (suspenseState = Error( - "The server could not finish this Suspense boundary, likely due to an error during server rendering. Switched to client rendering." - )), - (suspenseState.digest = didPrimaryChildrenDefer), - (didPrimaryChildrenDefer = createCapturedValueFromError( - suspenseState, - didPrimaryChildrenDefer, - void 0 - )), - retrySuspenseComponentWithoutHydrating( - current, - workInProgress, - renderLanes, - didPrimaryChildrenDefer - ) - ); - didPrimaryChildrenDefer = 0 !== (renderLanes & current.childLanes); - if (didReceiveUpdate || didPrimaryChildrenDefer) { - didPrimaryChildrenDefer = workInProgressRoot; - if (null !== didPrimaryChildrenDefer) { - nextProps = renderLanes & -renderLanes; - if (enableUnifiedSyncLane && 0 !== (nextProps & SyncUpdateLanes)) - nextProps = 1; - else - switch (nextProps) { - case 2: - nextProps = 1; - break; - case 8: - nextProps = 4; - break; - case 32: - nextProps = 16; - break; - case 128: - case 256: - case 512: - case 1024: - case 2048: - case 4096: - case 8192: - case 16384: - case 32768: - case 65536: - case 131072: - case 262144: - case 524288: - case 1048576: - case 2097152: - case 4194304: - case 8388608: - case 16777216: - case 33554432: - nextProps = 64; - break; - case 268435456: - nextProps = 134217728; - break; - default: - nextProps = 0; - } - nextProps = - 0 !== - (nextProps & (didPrimaryChildrenDefer.suspendedLanes | renderLanes)) - ? 0 - : nextProps; - if (0 !== nextProps && nextProps !== suspenseState.retryLane) - throw ( - ((suspenseState.retryLane = nextProps), - enqueueConcurrentRenderForLane(current, nextProps), - scheduleUpdateOnFiber(didPrimaryChildrenDefer, current, nextProps), - SelectiveHydrationException) - ); - } - shim$1() || renderDidSuspendDelayIfPossible(); - return retrySuspenseComponentWithoutHydrating( - current, - workInProgress, - renderLanes, - null - ); - } - if (shim$1()) - return ( - (workInProgress.flags |= 128), - (workInProgress.child = current.child), - retryDehydratedSuspenseBoundary.bind(null, current), - shim$1(), - null - ); - current = mountSuspensePrimaryChildren(workInProgress, nextProps.children); - current.flags |= 4096; - return current; -} function scheduleSuspenseWorkOnFiber(fiber, renderLanes, propagationRoot) { fiber.lanes |= renderLanes; var alternate = fiber.alternate; @@ -10851,10 +10824,10 @@ batchedUpdatesImpl = function (fn, a) { } }; var roots = new Map(), - devToolsConfig$jscomp$inline_1172 = { + devToolsConfig$jscomp$inline_1180 = { findFiberByHostInstance: getInstanceFromTag, bundleType: 0, - version: "19.0.0-canary-3b56660d", + version: "19.0.0-canary-8e44571d", rendererPackageName: "react-native-renderer", rendererConfig: { getInspectorDataForInstance: getInspectorDataForInstance, @@ -10870,11 +10843,11 @@ var roots = new Map(), }.bind(null, findNodeHandle) } }; -var internals$jscomp$inline_1413 = { - bundleType: devToolsConfig$jscomp$inline_1172.bundleType, - version: devToolsConfig$jscomp$inline_1172.version, - rendererPackageName: devToolsConfig$jscomp$inline_1172.rendererPackageName, - rendererConfig: devToolsConfig$jscomp$inline_1172.rendererConfig, +var internals$jscomp$inline_1433 = { + bundleType: devToolsConfig$jscomp$inline_1180.bundleType, + version: devToolsConfig$jscomp$inline_1180.version, + rendererPackageName: devToolsConfig$jscomp$inline_1180.rendererPackageName, + rendererConfig: devToolsConfig$jscomp$inline_1180.rendererConfig, overrideHookState: null, overrideHookStateDeletePath: null, overrideHookStateRenamePath: null, @@ -10890,26 +10863,26 @@ var internals$jscomp$inline_1413 = { return null === fiber ? null : fiber.stateNode; }, findFiberByHostInstance: - devToolsConfig$jscomp$inline_1172.findFiberByHostInstance || + devToolsConfig$jscomp$inline_1180.findFiberByHostInstance || emptyFindFiberByHostInstance, findHostInstancesForRefresh: null, scheduleRefresh: null, scheduleRoot: null, setRefreshHandler: null, getCurrentFiber: null, - reconcilerVersion: "19.0.0-canary-3b56660d" + reconcilerVersion: "19.0.0-canary-8e44571d" }; if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) { - var hook$jscomp$inline_1414 = __REACT_DEVTOOLS_GLOBAL_HOOK__; + var hook$jscomp$inline_1434 = __REACT_DEVTOOLS_GLOBAL_HOOK__; if ( - !hook$jscomp$inline_1414.isDisabled && - hook$jscomp$inline_1414.supportsFiber + !hook$jscomp$inline_1434.isDisabled && + hook$jscomp$inline_1434.supportsFiber ) try { - (rendererID = hook$jscomp$inline_1414.inject( - internals$jscomp$inline_1413 + (rendererID = hook$jscomp$inline_1434.inject( + internals$jscomp$inline_1433 )), - (injectedHook = hook$jscomp$inline_1414); + (injectedHook = hook$jscomp$inline_1434); } catch (err) {} } exports.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED = { diff --git a/compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/implementations/ReactNativeRenderer-profiling.fb.js b/compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/implementations/ReactNativeRenderer-profiling.fb.js index e634be08db..c2379cbe4a 100644 --- a/compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/implementations/ReactNativeRenderer-profiling.fb.js +++ b/compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/implementations/ReactNativeRenderer-profiling.fb.js @@ -7,7 +7,7 @@ * @noflow * @nolint * @preventMunge - * @generated SignedSource<<806703288a397a412dfed9596429714a>> + * @generated SignedSource<> */ "use strict"; @@ -897,7 +897,7 @@ eventPluginOrder = Array.prototype.slice.call([ "ReactNativeBridgeEventPlugin" ]); recomputePluginOrdering(); -var injectedNamesToPlugins$jscomp$inline_274 = { +var injectedNamesToPlugins$jscomp$inline_273 = { ResponderEventPlugin: ResponderEventPlugin, ReactNativeBridgeEventPlugin: { eventTypes: {}, @@ -943,32 +943,32 @@ var injectedNamesToPlugins$jscomp$inline_274 = { } } }, - isOrderingDirty$jscomp$inline_275 = !1, - pluginName$jscomp$inline_276; -for (pluginName$jscomp$inline_276 in injectedNamesToPlugins$jscomp$inline_274) + isOrderingDirty$jscomp$inline_274 = !1, + pluginName$jscomp$inline_275; +for (pluginName$jscomp$inline_275 in injectedNamesToPlugins$jscomp$inline_273) if ( - injectedNamesToPlugins$jscomp$inline_274.hasOwnProperty( - pluginName$jscomp$inline_276 + injectedNamesToPlugins$jscomp$inline_273.hasOwnProperty( + pluginName$jscomp$inline_275 ) ) { - var pluginModule$jscomp$inline_277 = - injectedNamesToPlugins$jscomp$inline_274[pluginName$jscomp$inline_276]; + var pluginModule$jscomp$inline_276 = + injectedNamesToPlugins$jscomp$inline_273[pluginName$jscomp$inline_275]; if ( - !namesToPlugins.hasOwnProperty(pluginName$jscomp$inline_276) || - namesToPlugins[pluginName$jscomp$inline_276] !== - pluginModule$jscomp$inline_277 + !namesToPlugins.hasOwnProperty(pluginName$jscomp$inline_275) || + namesToPlugins[pluginName$jscomp$inline_275] !== + pluginModule$jscomp$inline_276 ) { - if (namesToPlugins[pluginName$jscomp$inline_276]) + if (namesToPlugins[pluginName$jscomp$inline_275]) throw Error( "EventPluginRegistry: Cannot inject two different event plugins using the same name, `" + - (pluginName$jscomp$inline_276 + "`.") + (pluginName$jscomp$inline_275 + "`.") ); - namesToPlugins[pluginName$jscomp$inline_276] = - pluginModule$jscomp$inline_277; - isOrderingDirty$jscomp$inline_275 = !0; + namesToPlugins[pluginName$jscomp$inline_275] = + pluginModule$jscomp$inline_276; + isOrderingDirty$jscomp$inline_274 = !0; } } -isOrderingDirty$jscomp$inline_275 && recomputePluginOrdering(); +isOrderingDirty$jscomp$inline_274 && recomputePluginOrdering(); var instanceCache = new Map(), instanceProps = new Map(); function getInstanceFromTag(tag) { @@ -6205,20 +6205,21 @@ function updateSuspenseComponent(current, workInProgress, renderLanes) { JSCompiler_temp = 0 !== (workInProgress.flags & 32); workInProgress.flags &= -33; if (null === current) { - didSuspend = nextProps.children; - var nextFallbackChildren = nextProps.fallback; + var nextPrimaryChildren = nextProps.children; + didSuspend = nextProps.fallback; if (showFallback) return ( reuseSuspenseHandlerOnStack(workInProgress), (nextProps = mountSuspenseFallbackChildren( workInProgress, + nextPrimaryChildren, didSuspend, - nextFallbackChildren, renderLanes )), - (showFallback = workInProgress.child), - (showFallback.memoizedState = mountSuspenseOffscreenState(renderLanes)), - (showFallback.childLanes = getRemainingWorkInPrimaryTree( + (nextPrimaryChildren = workInProgress.child), + (nextPrimaryChildren.memoizedState = + mountSuspenseOffscreenState(renderLanes)), + (nextPrimaryChildren.childLanes = getRemainingWorkInPrimaryTree( current, JSCompiler_temp, renderLanes @@ -6231,13 +6232,14 @@ function updateSuspenseComponent(current, workInProgress, renderLanes) { reuseSuspenseHandlerOnStack(workInProgress), (nextProps = mountSuspenseFallbackChildren( workInProgress, + nextPrimaryChildren, didSuspend, - nextFallbackChildren, renderLanes )), - (showFallback = workInProgress.child), - (showFallback.memoizedState = mountSuspenseOffscreenState(renderLanes)), - (showFallback.childLanes = getRemainingWorkInPrimaryTree( + (nextPrimaryChildren = workInProgress.child), + (nextPrimaryChildren.memoizedState = + mountSuspenseOffscreenState(renderLanes)), + (nextPrimaryChildren.childLanes = getRemainingWorkInPrimaryTree( current, JSCompiler_temp, renderLanes @@ -6247,78 +6249,220 @@ function updateSuspenseComponent(current, workInProgress, renderLanes) { nextProps ); pushPrimaryTreeSuspenseHandler(workInProgress); - return mountSuspensePrimaryChildren(workInProgress, didSuspend); + return mountSuspensePrimaryChildren(workInProgress, nextPrimaryChildren); } - nextFallbackChildren = current.memoizedState; - if (null !== nextFallbackChildren) { - var dehydrated = nextFallbackChildren.dehydrated; - if (null !== dehydrated) - return updateDehydratedSuspenseComponent( + nextPrimaryChildren = current.memoizedState; + if (null !== nextPrimaryChildren && null !== nextPrimaryChildren.dehydrated) { + if (didSuspend) + workInProgress.flags & 256 + ? (pushPrimaryTreeSuspenseHandler(workInProgress), + (workInProgress.flags &= -257), + (JSCompiler_temp = createCapturedValueFromError( + Error( + "There was an error while hydrating this Suspense boundary. Switched to client rendering." + ) + )), + (workInProgress = retrySuspenseComponentWithoutHydrating( + current, + workInProgress, + renderLanes, + JSCompiler_temp + ))) + : null !== workInProgress.memoizedState + ? (reuseSuspenseHandlerOnStack(workInProgress), + (workInProgress.child = current.child), + (workInProgress.flags |= 128), + (workInProgress = null)) + : (reuseSuspenseHandlerOnStack(workInProgress), + (nextPrimaryChildren = nextProps.fallback), + (showFallback = workInProgress.mode), + (nextProps = createFiberFromOffscreen( + { mode: "visible", children: nextProps.children }, + showFallback, + 0, + null + )), + (nextPrimaryChildren = createFiberFromFragment( + nextPrimaryChildren, + showFallback, + renderLanes, + null + )), + (nextPrimaryChildren.flags |= 2), + (nextProps.return = workInProgress), + (nextPrimaryChildren.return = workInProgress), + (nextProps.sibling = nextPrimaryChildren), + (workInProgress.child = nextProps), + 0 !== (workInProgress.mode & 1) && + reconcileChildFibers( + workInProgress, + current.child, + null, + renderLanes + ), + (nextProps = workInProgress.child), + (nextProps.memoizedState = mountSuspenseOffscreenState(renderLanes)), + (nextProps.childLanes = getRemainingWorkInPrimaryTree( + current, + JSCompiler_temp, + renderLanes + )), + (workInProgress.memoizedState = SUSPENDED_MARKER), + (workInProgress = nextPrimaryChildren)); + else if ((pushPrimaryTreeSuspenseHandler(workInProgress), shim$1())) + (JSCompiler_temp = shim$1().digest), + (nextProps = Error( + "The server could not finish this Suspense boundary, likely due to an error during server rendering. Switched to client rendering." + )), + (nextProps.digest = JSCompiler_temp), + (JSCompiler_temp = createCapturedValueFromError( + nextProps, + JSCompiler_temp, + void 0 + )), + (workInProgress = retrySuspenseComponentWithoutHydrating( + current, + workInProgress, + renderLanes, + JSCompiler_temp + )); + else if ( + ((JSCompiler_temp = 0 !== (renderLanes & current.childLanes)), + didReceiveUpdate || JSCompiler_temp) + ) { + JSCompiler_temp = workInProgressRoot; + if (null !== JSCompiler_temp) { + nextProps = renderLanes & -renderLanes; + if (enableUnifiedSyncLane && 0 !== (nextProps & SyncUpdateLanes)) + nextProps = 1; + else + switch (nextProps) { + case 2: + nextProps = 1; + break; + case 8: + nextProps = 4; + break; + case 32: + nextProps = 16; + break; + case 128: + case 256: + case 512: + case 1024: + case 2048: + case 4096: + case 8192: + case 16384: + case 32768: + case 65536: + case 131072: + case 262144: + case 524288: + case 1048576: + case 2097152: + case 4194304: + case 8388608: + case 16777216: + case 33554432: + nextProps = 64; + break; + case 268435456: + nextProps = 134217728; + break; + default: + nextProps = 0; + } + nextProps = + 0 !== (nextProps & (JSCompiler_temp.suspendedLanes | renderLanes)) + ? 0 + : nextProps; + if (0 !== nextProps && nextProps !== nextPrimaryChildren.retryLane) + throw ( + ((nextPrimaryChildren.retryLane = nextProps), + enqueueConcurrentRenderForLane(current, nextProps), + scheduleUpdateOnFiber(JSCompiler_temp, current, nextProps), + SelectiveHydrationException) + ); + } + shim$1() || renderDidSuspendDelayIfPossible(); + workInProgress = retrySuspenseComponentWithoutHydrating( current, workInProgress, - didSuspend, - JSCompiler_temp, - nextProps, - dehydrated, - nextFallbackChildren, - renderLanes + renderLanes, + null ); + } else + shim$1() + ? ((workInProgress.flags |= 128), + (workInProgress.child = current.child), + retryDehydratedSuspenseBoundary.bind(null, current), + shim$1(), + (workInProgress = null)) + : ((workInProgress = mountSuspensePrimaryChildren( + workInProgress, + nextProps.children + )), + (workInProgress.flags |= 4096)); + return workInProgress; } if (showFallback) { reuseSuspenseHandlerOnStack(workInProgress); - showFallback = nextProps.fallback; - didSuspend = workInProgress.mode; - nextFallbackChildren = current.child; - dehydrated = nextFallbackChildren.sibling; - var primaryChildProps = { mode: "hidden", children: nextProps.children }; - 0 === (didSuspend & 1) && workInProgress.child !== nextFallbackChildren + nextPrimaryChildren = nextProps.fallback; + showFallback = workInProgress.mode; + didSuspend = current.child; + var currentFallbackChildFragment = didSuspend.sibling, + primaryChildProps = { mode: "hidden", children: nextProps.children }; + 0 === (showFallback & 1) && workInProgress.child !== didSuspend ? ((nextProps = workInProgress.child), (nextProps.childLanes = 0), (nextProps.pendingProps = primaryChildProps), workInProgress.mode & 2 && ((nextProps.actualDuration = 0), (nextProps.actualStartTime = -1), - (nextProps.selfBaseDuration = nextFallbackChildren.selfBaseDuration), - (nextProps.treeBaseDuration = nextFallbackChildren.treeBaseDuration)), + (nextProps.selfBaseDuration = didSuspend.selfBaseDuration), + (nextProps.treeBaseDuration = didSuspend.treeBaseDuration)), (workInProgress.deletions = null)) - : ((nextProps = createWorkInProgress( - nextFallbackChildren, - primaryChildProps - )), - (nextProps.subtreeFlags = - nextFallbackChildren.subtreeFlags & 31457280)); - null !== dehydrated - ? (showFallback = createWorkInProgress(dehydrated, showFallback)) - : ((showFallback = createFiberFromFragment( + : ((nextProps = createWorkInProgress(didSuspend, primaryChildProps)), + (nextProps.subtreeFlags = didSuspend.subtreeFlags & 31457280)); + null !== currentFallbackChildFragment + ? (nextPrimaryChildren = createWorkInProgress( + currentFallbackChildFragment, + nextPrimaryChildren + )) + : ((nextPrimaryChildren = createFiberFromFragment( + nextPrimaryChildren, showFallback, - didSuspend, renderLanes, null )), - (showFallback.flags |= 2)); - showFallback.return = workInProgress; + (nextPrimaryChildren.flags |= 2)); + nextPrimaryChildren.return = workInProgress; nextProps.return = workInProgress; - nextProps.sibling = showFallback; + nextProps.sibling = nextPrimaryChildren; workInProgress.child = nextProps; - nextProps = showFallback; - showFallback = workInProgress.child; - didSuspend = current.child.memoizedState; - null === didSuspend - ? (didSuspend = mountSuspenseOffscreenState(renderLanes)) - : ((nextFallbackChildren = didSuspend.cachePool), - null !== nextFallbackChildren - ? ((dehydrated = CacheContext._currentValue), - (nextFallbackChildren = - nextFallbackChildren.parent !== dehydrated - ? { parent: dehydrated, pool: dehydrated } - : nextFallbackChildren)) - : (nextFallbackChildren = getSuspendedCache()), - (didSuspend = { - baseLanes: didSuspend.baseLanes | renderLanes, - cachePool: nextFallbackChildren + nextProps = nextPrimaryChildren; + nextPrimaryChildren = workInProgress.child; + showFallback = current.child.memoizedState; + null === showFallback + ? (showFallback = mountSuspenseOffscreenState(renderLanes)) + : ((didSuspend = showFallback.cachePool), + null !== didSuspend + ? ((currentFallbackChildFragment = CacheContext._currentValue), + (didSuspend = + didSuspend.parent !== currentFallbackChildFragment + ? { + parent: currentFallbackChildFragment, + pool: currentFallbackChildFragment + } + : didSuspend)) + : (didSuspend = getSuspendedCache()), + (showFallback = { + baseLanes: showFallback.baseLanes | renderLanes, + cachePool: didSuspend })); - showFallback.memoizedState = didSuspend; - showFallback.childLanes = getRemainingWorkInPrimaryTree( + nextPrimaryChildren.memoizedState = showFallback; + nextPrimaryChildren.childLanes = getRemainingWorkInPrimaryTree( current, JSCompiler_temp, renderLanes @@ -6409,177 +6553,6 @@ function retrySuspenseComponentWithoutHydrating( workInProgress.memoizedState = null; return current; } -function updateDehydratedSuspenseComponent( - current, - workInProgress, - didSuspend, - didPrimaryChildrenDefer, - nextProps, - suspenseInstance, - suspenseState, - renderLanes -) { - if (didSuspend) { - if (workInProgress.flags & 256) - return ( - pushPrimaryTreeSuspenseHandler(workInProgress), - (workInProgress.flags &= -257), - (didPrimaryChildrenDefer = createCapturedValueFromError( - Error( - "There was an error while hydrating this Suspense boundary. Switched to client rendering." - ) - )), - retrySuspenseComponentWithoutHydrating( - current, - workInProgress, - renderLanes, - didPrimaryChildrenDefer - ) - ); - if (null !== workInProgress.memoizedState) - return ( - reuseSuspenseHandlerOnStack(workInProgress), - (workInProgress.child = current.child), - (workInProgress.flags |= 128), - null - ); - reuseSuspenseHandlerOnStack(workInProgress); - suspenseState = nextProps.fallback; - didSuspend = workInProgress.mode; - nextProps = createFiberFromOffscreen( - { mode: "visible", children: nextProps.children }, - didSuspend, - 0, - null - ); - suspenseState = createFiberFromFragment( - suspenseState, - didSuspend, - renderLanes, - null - ); - suspenseState.flags |= 2; - nextProps.return = workInProgress; - suspenseState.return = workInProgress; - nextProps.sibling = suspenseState; - workInProgress.child = nextProps; - 0 !== (workInProgress.mode & 1) && - reconcileChildFibers(workInProgress, current.child, null, renderLanes); - nextProps = workInProgress.child; - nextProps.memoizedState = mountSuspenseOffscreenState(renderLanes); - nextProps.childLanes = getRemainingWorkInPrimaryTree( - current, - didPrimaryChildrenDefer, - renderLanes - ); - workInProgress.memoizedState = SUSPENDED_MARKER; - return suspenseState; - } - pushPrimaryTreeSuspenseHandler(workInProgress); - if (0 === (workInProgress.mode & 1)) - return retrySuspenseComponentWithoutHydrating( - current, - workInProgress, - renderLanes, - null - ); - if (shim$1()) - return ( - (didPrimaryChildrenDefer = shim$1().digest), - (suspenseState = Error( - "The server could not finish this Suspense boundary, likely due to an error during server rendering. Switched to client rendering." - )), - (suspenseState.digest = didPrimaryChildrenDefer), - (didPrimaryChildrenDefer = createCapturedValueFromError( - suspenseState, - didPrimaryChildrenDefer, - void 0 - )), - retrySuspenseComponentWithoutHydrating( - current, - workInProgress, - renderLanes, - didPrimaryChildrenDefer - ) - ); - didPrimaryChildrenDefer = 0 !== (renderLanes & current.childLanes); - if (didReceiveUpdate || didPrimaryChildrenDefer) { - didPrimaryChildrenDefer = workInProgressRoot; - if (null !== didPrimaryChildrenDefer) { - nextProps = renderLanes & -renderLanes; - if (enableUnifiedSyncLane && 0 !== (nextProps & SyncUpdateLanes)) - nextProps = 1; - else - switch (nextProps) { - case 2: - nextProps = 1; - break; - case 8: - nextProps = 4; - break; - case 32: - nextProps = 16; - break; - case 128: - case 256: - case 512: - case 1024: - case 2048: - case 4096: - case 8192: - case 16384: - case 32768: - case 65536: - case 131072: - case 262144: - case 524288: - case 1048576: - case 2097152: - case 4194304: - case 8388608: - case 16777216: - case 33554432: - nextProps = 64; - break; - case 268435456: - nextProps = 134217728; - break; - default: - nextProps = 0; - } - nextProps = - 0 !== - (nextProps & (didPrimaryChildrenDefer.suspendedLanes | renderLanes)) - ? 0 - : nextProps; - if (0 !== nextProps && nextProps !== suspenseState.retryLane) - throw ( - ((suspenseState.retryLane = nextProps), - enqueueConcurrentRenderForLane(current, nextProps), - scheduleUpdateOnFiber(didPrimaryChildrenDefer, current, nextProps), - SelectiveHydrationException) - ); - } - shim$1() || renderDidSuspendDelayIfPossible(); - return retrySuspenseComponentWithoutHydrating( - current, - workInProgress, - renderLanes, - null - ); - } - if (shim$1()) - return ( - (workInProgress.flags |= 128), - (workInProgress.child = current.child), - retryDehydratedSuspenseBoundary.bind(null, current), - shim$1(), - null - ); - current = mountSuspensePrimaryChildren(workInProgress, nextProps.children); - current.flags |= 4096; - return current; -} function scheduleSuspenseWorkOnFiber(fiber, renderLanes, propagationRoot) { fiber.lanes |= renderLanes; var alternate = fiber.alternate; @@ -11558,10 +11531,10 @@ batchedUpdatesImpl = function (fn, a) { } }; var roots = new Map(), - devToolsConfig$jscomp$inline_1253 = { + devToolsConfig$jscomp$inline_1261 = { findFiberByHostInstance: getInstanceFromTag, bundleType: 0, - version: "19.0.0-canary-b85de200", + version: "19.0.0-canary-c84ae24d", rendererPackageName: "react-native-renderer", rendererConfig: { getInspectorDataForInstance: getInspectorDataForInstance, @@ -11591,10 +11564,10 @@ var roots = new Map(), } catch (err) {} return hook.checkDCE ? !0 : !1; })({ - bundleType: devToolsConfig$jscomp$inline_1253.bundleType, - version: devToolsConfig$jscomp$inline_1253.version, - rendererPackageName: devToolsConfig$jscomp$inline_1253.rendererPackageName, - rendererConfig: devToolsConfig$jscomp$inline_1253.rendererConfig, + bundleType: devToolsConfig$jscomp$inline_1261.bundleType, + version: devToolsConfig$jscomp$inline_1261.version, + rendererPackageName: devToolsConfig$jscomp$inline_1261.rendererPackageName, + rendererConfig: devToolsConfig$jscomp$inline_1261.rendererConfig, overrideHookState: null, overrideHookStateDeletePath: null, overrideHookStateRenamePath: null, @@ -11610,14 +11583,14 @@ var roots = new Map(), return null === fiber ? null : fiber.stateNode; }, findFiberByHostInstance: - devToolsConfig$jscomp$inline_1253.findFiberByHostInstance || + devToolsConfig$jscomp$inline_1261.findFiberByHostInstance || emptyFindFiberByHostInstance, findHostInstancesForRefresh: null, scheduleRefresh: null, scheduleRoot: null, setRefreshHandler: null, getCurrentFiber: null, - reconcilerVersion: "19.0.0-canary-b85de200" + reconcilerVersion: "19.0.0-canary-c84ae24d" }); exports.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED = { computeComponentStackForErrorReporting: function (reactTag) {