From 2e4d66918a4ed4e9812440a7a9cc222bcba14548 Mon Sep 17 00:00:00 2001 From: vercel-release-bot Date: Wed, 18 Sep 2024 16:25:35 +0000 Subject: [PATCH] ncc-compiled --- .../cjs/react-dom-client.development.js | 1049 +++++++------- .../cjs/react-dom-client.production.js | 535 ++++---- .../cjs/react-dom-profiling.development.js | 1051 +++++++------- .../cjs/react-dom-profiling.profiling.js | 1206 +++++++++-------- ...t-dom-server-legacy.browser.development.js | 2 +- ...ct-dom-server-legacy.browser.production.js | 2 +- ...eact-dom-server-legacy.node.development.js | 2 +- ...react-dom-server-legacy.node.production.js | 2 +- .../react-dom-server.browser.development.js | 6 +- .../react-dom-server.browser.production.js | 6 +- .../cjs/react-dom-server.bun.production.js | 6 +- .../cjs/react-dom-server.edge.development.js | 6 +- .../cjs/react-dom-server.edge.production.js | 6 +- .../cjs/react-dom-server.node.development.js | 6 +- .../cjs/react-dom-server.node.production.js | 6 +- .../react-dom-unstable_testing.development.js | 1051 +++++++------- .../react-dom-unstable_testing.production.js | 540 ++++---- .../cjs/react-dom.development.js | 2 +- .../cjs/react-dom.production.js | 2 +- .../cjs/react-dom.react-server.development.js | 2 +- .../cjs/react-dom.react-server.production.js | 2 +- .../react-dom-experimental/package.json | 4 +- .../cjs/react-dom-client.development.js | 921 ++++++------- .../cjs/react-dom-client.production.js | 535 ++++---- .../cjs/react-dom-profiling.development.js | 921 ++++++------- .../cjs/react-dom-profiling.profiling.js | 1086 +++++++-------- ...t-dom-server-legacy.browser.development.js | 2 +- ...ct-dom-server-legacy.browser.production.js | 2 +- ...eact-dom-server-legacy.node.development.js | 2 +- ...react-dom-server-legacy.node.production.js | 2 +- .../react-dom-server.browser.development.js | 6 +- .../react-dom-server.browser.production.js | 6 +- .../cjs/react-dom-server.bun.production.js | 6 +- .../cjs/react-dom-server.edge.development.js | 6 +- .../cjs/react-dom-server.edge.production.js | 6 +- .../cjs/react-dom-server.node.development.js | 6 +- .../cjs/react-dom-server.node.production.js | 6 +- .../react-dom/cjs/react-dom.development.js | 2 +- .../react-dom/cjs/react-dom.production.js | 2 +- .../cjs/react-dom.react-server.development.js | 2 +- .../cjs/react-dom.react-server.production.js | 2 +- .../next/src/compiled/react-dom/package.json | 4 +- .../cjs/react.development.js | 11 +- .../cjs/react.production.js | 8 +- .../cjs/react.react-server.development.js | 11 +- .../cjs/react.react-server.production.js | 8 +- .../next/src/compiled/react-is/package.json | 2 +- ...om-turbopack-client.browser.development.js | 4 +- .../package.json | 4 +- ...om-turbopack-client.browser.development.js | 4 +- .../react-server-dom-turbopack/package.json | 4 +- ...-dom-webpack-client.browser.development.js | 4 +- .../package.json | 4 +- ...-dom-webpack-client.browser.development.js | 4 +- .../react-server-dom-webpack/package.json | 4 +- .../compiled/react/cjs/react.development.js | 11 +- .../compiled/react/cjs/react.production.js | 8 +- .../cjs/react.react-server.development.js | 2 +- .../cjs/react.react-server.production.js | 2 +- .../next/src/compiled/unistore/unistore.js | 2 +- 60 files changed, 4582 insertions(+), 4534 deletions(-) diff --git a/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-client.development.js b/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-client.development.js index 4dee6bd20537c..5d051bfeefc5d 100644 --- a/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-client.development.js +++ b/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-client.development.js @@ -3565,43 +3565,43 @@ : !1; } function getActiveElementDeep(containerInfo) { - var $jscomp$optchain$tmpm1418258897$1, $jscomp$nullish$tmp0; + var $jscomp$optchain$tmpm1540785874$1, $jscomp$nullish$tmp0; containerInfo = null != ($jscomp$nullish$tmp0 = null == containerInfo ? void 0 : null == - ($jscomp$optchain$tmpm1418258897$1 = + ($jscomp$optchain$tmpm1540785874$1 = containerInfo.ownerDocument) ? void 0 - : $jscomp$optchain$tmpm1418258897$1.defaultView) + : $jscomp$optchain$tmpm1540785874$1.defaultView) ? $jscomp$nullish$tmp0 : window; for ( - $jscomp$optchain$tmpm1418258897$1 = getActiveElement( + $jscomp$optchain$tmpm1540785874$1 = getActiveElement( containerInfo.document ); - $jscomp$optchain$tmpm1418258897$1 instanceof + $jscomp$optchain$tmpm1540785874$1 instanceof containerInfo.HTMLIFrameElement; ) { try { var JSCompiler_inline_result = "string" === - typeof $jscomp$optchain$tmpm1418258897$1.contentWindow.location + typeof $jscomp$optchain$tmpm1540785874$1.contentWindow.location .href; } catch (err) { JSCompiler_inline_result = !1; } if (JSCompiler_inline_result) - containerInfo = $jscomp$optchain$tmpm1418258897$1.contentWindow; + containerInfo = $jscomp$optchain$tmpm1540785874$1.contentWindow; else break; - $jscomp$optchain$tmpm1418258897$1 = getActiveElement( + $jscomp$optchain$tmpm1540785874$1 = getActiveElement( containerInfo.document ); } - return $jscomp$optchain$tmpm1418258897$1; + return $jscomp$optchain$tmpm1540785874$1; } function hasSelectionCapabilities(elem) { var nodeName = elem && elem.nodeName && elem.nodeName.toLowerCase(); @@ -3977,6 +3977,36 @@ staleFamilies ); } + function pushNestedEffectDurations() { + var prevEffectDuration = profilerEffectDuration; + profilerEffectDuration = 0; + return prevEffectDuration; + } + function popNestedEffectDurations(prevEffectDuration) { + var elapsedTime = profilerEffectDuration; + profilerEffectDuration = prevEffectDuration; + return elapsedTime; + } + function bubbleNestedEffectDurations(prevEffectDuration) { + var elapsedTime = profilerEffectDuration; + profilerEffectDuration += prevEffectDuration; + return elapsedTime; + } + function resetComponentEffectTimers() { + componentEffectEndTime = componentEffectStartTime = -1.1; + } + function pushComponentEffectStart() { + var prevEffectStart = componentEffectStartTime; + componentEffectStartTime = -1.1; + componentEffectDuration = -0; + return prevEffectStart; + } + function popComponentEffectStart(prevEffectStart) { + componentEffectStartTime = + 0 > prevEffectStart + ? componentEffectStartTime - 0.001 + : prevEffectStart; + } function startProfilerTimer(fiber) { profilerStartTime = now(); 0 > fiber.actualStartTime && (fiber.actualStartTime = profilerStartTime); @@ -3996,49 +4026,41 @@ profilerStartTime = -1; } } - function recordLayoutEffectDuration(fiber) { - if (0 <= layoutEffectStartTime) { - var elapsedTime = now() - layoutEffectStartTime; - layoutEffectStartTime = -1; - for (fiber = fiber.return; null !== fiber; ) { - switch (fiber.tag) { - case 3: - fiber.stateNode.effectDuration += elapsedTime; - return; - case 12: - fiber.stateNode.effectDuration += elapsedTime; - return; - } - fiber = fiber.return; - } - } - } - function recordPassiveEffectDuration(fiber) { - if (0 <= passiveEffectStartTime) { - var elapsedTime = now() - passiveEffectStartTime; - passiveEffectStartTime = -1; - for (fiber = fiber.return; null !== fiber; ) { - switch (fiber.tag) { - case 3: - fiber = fiber.stateNode; - null !== fiber && (fiber.passiveEffectDuration += elapsedTime); - return; - case 12: - fiber = fiber.stateNode; - null !== fiber && (fiber.passiveEffectDuration += elapsedTime); - return; - } - fiber = fiber.return; - } + function recordEffectDuration() { + if (0 <= profilerStartTime) { + var endTime = now(), + elapsedTime = endTime - profilerStartTime; + profilerStartTime = -1; + profilerEffectDuration += elapsedTime; + componentEffectDuration += elapsedTime; + componentEffectEndTime = endTime; } } - function startLayoutEffectTimer() { - layoutEffectStartTime = now(); + function startEffectTimer() { + profilerStartTime = now(); + 0 > componentEffectStartTime && + (componentEffectStartTime = profilerStartTime); } function transferActualDuration(fiber) { for (var child = fiber.child; child; ) (fiber.actualDuration += child.actualDuration), (child = child.sibling); } + function logComponentEffect(fiber, startTime, endTime, selfTime) { + fiber = getComponentNameFromFiber(fiber); + null !== fiber && + supportsUserTiming && + ((reusableComponentDevToolDetails.color = + 1 > selfTime + ? "secondary-light" + : 100 > selfTime + ? "secondary" + : 500 > selfTime + ? "secondary-dark" + : "error"), + (reusableComponentOptions.start = startTime), + (reusableComponentOptions.end = endTime), + performance.measure(fiber, reusableComponentOptions)); + } function createCapturedValueAtFiber(value, source) { if ("object" === typeof value && null !== value) { var stack = CapturedStacks.get(value); @@ -8807,33 +8829,33 @@ return current; } function updateSuspenseComponent(current, workInProgress, renderLanes) { - var JSCompiler_object_inline_componentStack_2253; - var JSCompiler_object_inline_stack_2252 = workInProgress.pendingProps; + var JSCompiler_object_inline_componentStack_2239; + var JSCompiler_object_inline_stack_2238 = workInProgress.pendingProps; shouldSuspendImpl(workInProgress) && (workInProgress.flags |= 128); - var JSCompiler_object_inline_message_2250 = !1; + var JSCompiler_object_inline_message_2236 = !1; var didSuspend = 0 !== (workInProgress.flags & 128); - (JSCompiler_object_inline_componentStack_2253 = didSuspend) || - (JSCompiler_object_inline_componentStack_2253 = + (JSCompiler_object_inline_componentStack_2239 = didSuspend) || + (JSCompiler_object_inline_componentStack_2239 = null !== current && null === current.memoizedState ? !1 : 0 !== (suspenseStackCursor.current & ForceSuspenseFallback)); - JSCompiler_object_inline_componentStack_2253 && - ((JSCompiler_object_inline_message_2250 = !0), + JSCompiler_object_inline_componentStack_2239 && + ((JSCompiler_object_inline_message_2236 = !0), (workInProgress.flags &= -129)); - JSCompiler_object_inline_componentStack_2253 = + JSCompiler_object_inline_componentStack_2239 = 0 !== (workInProgress.flags & 32); workInProgress.flags &= -33; if (null === current) { if (isHydrating) { - JSCompiler_object_inline_message_2250 + JSCompiler_object_inline_message_2236 ? pushPrimaryTreeSuspenseHandler(workInProgress) : reuseSuspenseHandlerOnStack(workInProgress); if (isHydrating) { - var JSCompiler_object_inline_digest_2251 = nextHydratableInstance; + var JSCompiler_object_inline_digest_2237 = nextHydratableInstance; var JSCompiler_temp; - if (!(JSCompiler_temp = !JSCompiler_object_inline_digest_2251)) { + if (!(JSCompiler_temp = !JSCompiler_object_inline_digest_2237)) { c: { - var instance = JSCompiler_object_inline_digest_2251; + var instance = JSCompiler_object_inline_digest_2237; for ( JSCompiler_temp = rootOrSingletonContext; 8 !== instance.nodeType; @@ -8874,19 +8896,19 @@ JSCompiler_temp && (warnNonHydratedInstance( workInProgress, - JSCompiler_object_inline_digest_2251 + JSCompiler_object_inline_digest_2237 ), throwOnHydrationMismatch(workInProgress)); } - JSCompiler_object_inline_digest_2251 = workInProgress.memoizedState; + JSCompiler_object_inline_digest_2237 = workInProgress.memoizedState; if ( - null !== JSCompiler_object_inline_digest_2251 && - ((JSCompiler_object_inline_digest_2251 = - JSCompiler_object_inline_digest_2251.dehydrated), - null !== JSCompiler_object_inline_digest_2251) + null !== JSCompiler_object_inline_digest_2237 && + ((JSCompiler_object_inline_digest_2237 = + JSCompiler_object_inline_digest_2237.dehydrated), + null !== JSCompiler_object_inline_digest_2237) ) return ( - JSCompiler_object_inline_digest_2251.data === + JSCompiler_object_inline_digest_2237.data === SUSPENSE_FALLBACK_START_DATA ? (workInProgress.lanes = 16) : (workInProgress.lanes = 536870912), @@ -8894,68 +8916,68 @@ ); popSuspenseHandler(workInProgress); } - JSCompiler_object_inline_digest_2251 = - JSCompiler_object_inline_stack_2252.children; - JSCompiler_temp = JSCompiler_object_inline_stack_2252.fallback; - if (JSCompiler_object_inline_message_2250) + JSCompiler_object_inline_digest_2237 = + JSCompiler_object_inline_stack_2238.children; + JSCompiler_temp = JSCompiler_object_inline_stack_2238.fallback; + if (JSCompiler_object_inline_message_2236) return ( reuseSuspenseHandlerOnStack(workInProgress), - (JSCompiler_object_inline_stack_2252 = + (JSCompiler_object_inline_stack_2238 = mountSuspenseFallbackChildren( workInProgress, - JSCompiler_object_inline_digest_2251, + JSCompiler_object_inline_digest_2237, JSCompiler_temp, renderLanes )), - (JSCompiler_object_inline_message_2250 = workInProgress.child), - (JSCompiler_object_inline_message_2250.memoizedState = + (JSCompiler_object_inline_message_2236 = workInProgress.child), + (JSCompiler_object_inline_message_2236.memoizedState = mountSuspenseOffscreenState(renderLanes)), - (JSCompiler_object_inline_message_2250.childLanes = + (JSCompiler_object_inline_message_2236.childLanes = getRemainingWorkInPrimaryTree( current, - JSCompiler_object_inline_componentStack_2253, + JSCompiler_object_inline_componentStack_2239, renderLanes )), (workInProgress.memoizedState = SUSPENDED_MARKER), - JSCompiler_object_inline_stack_2252 + JSCompiler_object_inline_stack_2238 ); if ( "number" === - typeof JSCompiler_object_inline_stack_2252.unstable_expectedLoadTime + typeof JSCompiler_object_inline_stack_2238.unstable_expectedLoadTime ) return ( reuseSuspenseHandlerOnStack(workInProgress), - (JSCompiler_object_inline_stack_2252 = + (JSCompiler_object_inline_stack_2238 = mountSuspenseFallbackChildren( workInProgress, - JSCompiler_object_inline_digest_2251, + JSCompiler_object_inline_digest_2237, JSCompiler_temp, renderLanes )), - (JSCompiler_object_inline_message_2250 = workInProgress.child), - (JSCompiler_object_inline_message_2250.memoizedState = + (JSCompiler_object_inline_message_2236 = workInProgress.child), + (JSCompiler_object_inline_message_2236.memoizedState = mountSuspenseOffscreenState(renderLanes)), - (JSCompiler_object_inline_message_2250.childLanes = + (JSCompiler_object_inline_message_2236.childLanes = getRemainingWorkInPrimaryTree( current, - JSCompiler_object_inline_componentStack_2253, + JSCompiler_object_inline_componentStack_2239, renderLanes )), (workInProgress.memoizedState = SUSPENDED_MARKER), (workInProgress.lanes = 4194304), - JSCompiler_object_inline_stack_2252 + JSCompiler_object_inline_stack_2238 ); pushPrimaryTreeSuspenseHandler(workInProgress); return mountSuspensePrimaryChildren( workInProgress, - JSCompiler_object_inline_digest_2251 + JSCompiler_object_inline_digest_2237 ); } var prevState = current.memoizedState; if ( null !== prevState && - ((JSCompiler_object_inline_digest_2251 = prevState.dehydrated), - null !== JSCompiler_object_inline_digest_2251) + ((JSCompiler_object_inline_digest_2237 = prevState.dehydrated), + null !== JSCompiler_object_inline_digest_2237) ) { if (didSuspend) workInProgress.flags & 256 @@ -8972,94 +8994,94 @@ (workInProgress.flags |= 128), (workInProgress = null)) : (reuseSuspenseHandlerOnStack(workInProgress), - (JSCompiler_object_inline_message_2250 = - JSCompiler_object_inline_stack_2252.fallback), - (JSCompiler_object_inline_digest_2251 = workInProgress.mode), - (JSCompiler_object_inline_stack_2252 = + (JSCompiler_object_inline_message_2236 = + JSCompiler_object_inline_stack_2238.fallback), + (JSCompiler_object_inline_digest_2237 = workInProgress.mode), + (JSCompiler_object_inline_stack_2238 = mountWorkInProgressOffscreenFiber( { mode: "visible", - children: JSCompiler_object_inline_stack_2252.children + children: JSCompiler_object_inline_stack_2238.children }, - JSCompiler_object_inline_digest_2251 + JSCompiler_object_inline_digest_2237 )), - (JSCompiler_object_inline_message_2250 = + (JSCompiler_object_inline_message_2236 = createFiberFromFragment( - JSCompiler_object_inline_message_2250, - JSCompiler_object_inline_digest_2251, + JSCompiler_object_inline_message_2236, + JSCompiler_object_inline_digest_2237, renderLanes, null )), - (JSCompiler_object_inline_message_2250.flags |= 2), - (JSCompiler_object_inline_stack_2252.return = workInProgress), - (JSCompiler_object_inline_message_2250.return = workInProgress), - (JSCompiler_object_inline_stack_2252.sibling = - JSCompiler_object_inline_message_2250), - (workInProgress.child = JSCompiler_object_inline_stack_2252), + (JSCompiler_object_inline_message_2236.flags |= 2), + (JSCompiler_object_inline_stack_2238.return = workInProgress), + (JSCompiler_object_inline_message_2236.return = workInProgress), + (JSCompiler_object_inline_stack_2238.sibling = + JSCompiler_object_inline_message_2236), + (workInProgress.child = JSCompiler_object_inline_stack_2238), reconcileChildFibers( workInProgress, current.child, null, renderLanes ), - (JSCompiler_object_inline_stack_2252 = workInProgress.child), - (JSCompiler_object_inline_stack_2252.memoizedState = + (JSCompiler_object_inline_stack_2238 = workInProgress.child), + (JSCompiler_object_inline_stack_2238.memoizedState = mountSuspenseOffscreenState(renderLanes)), - (JSCompiler_object_inline_stack_2252.childLanes = + (JSCompiler_object_inline_stack_2238.childLanes = getRemainingWorkInPrimaryTree( current, - JSCompiler_object_inline_componentStack_2253, + JSCompiler_object_inline_componentStack_2239, renderLanes )), (workInProgress.memoizedState = SUSPENDED_MARKER), - (workInProgress = JSCompiler_object_inline_message_2250)); + (workInProgress = JSCompiler_object_inline_message_2236)); else if ( (pushPrimaryTreeSuspenseHandler(workInProgress), isHydrating && console.error( "We should not be hydrating here. This is a bug in React. Please file a bug." ), - JSCompiler_object_inline_digest_2251.data === + JSCompiler_object_inline_digest_2237.data === SUSPENSE_FALLBACK_START_DATA) ) { - JSCompiler_object_inline_componentStack_2253 = - JSCompiler_object_inline_digest_2251.nextSibling && - JSCompiler_object_inline_digest_2251.nextSibling.dataset; - if (JSCompiler_object_inline_componentStack_2253) { - JSCompiler_temp = JSCompiler_object_inline_componentStack_2253.dgst; - var message = JSCompiler_object_inline_componentStack_2253.msg; - instance = JSCompiler_object_inline_componentStack_2253.stck; + JSCompiler_object_inline_componentStack_2239 = + JSCompiler_object_inline_digest_2237.nextSibling && + JSCompiler_object_inline_digest_2237.nextSibling.dataset; + if (JSCompiler_object_inline_componentStack_2239) { + JSCompiler_temp = JSCompiler_object_inline_componentStack_2239.dgst; + var message = JSCompiler_object_inline_componentStack_2239.msg; + instance = JSCompiler_object_inline_componentStack_2239.stck; var componentStack = - JSCompiler_object_inline_componentStack_2253.cstck; + JSCompiler_object_inline_componentStack_2239.cstck; } - JSCompiler_object_inline_message_2250 = message; - JSCompiler_object_inline_digest_2251 = JSCompiler_temp; - JSCompiler_object_inline_stack_2252 = instance; - JSCompiler_object_inline_componentStack_2253 = componentStack; - "POSTPONE" !== JSCompiler_object_inline_digest_2251 && - ((JSCompiler_object_inline_message_2250 = - JSCompiler_object_inline_message_2250 - ? Error(JSCompiler_object_inline_message_2250) + JSCompiler_object_inline_message_2236 = message; + JSCompiler_object_inline_digest_2237 = JSCompiler_temp; + JSCompiler_object_inline_stack_2238 = instance; + JSCompiler_object_inline_componentStack_2239 = componentStack; + "POSTPONE" !== JSCompiler_object_inline_digest_2237 && + ((JSCompiler_object_inline_message_2236 = + JSCompiler_object_inline_message_2236 + ? Error(JSCompiler_object_inline_message_2236) : Error( "The server could not finish this Suspense boundary, likely due to an error during server rendering. Switched to client rendering." )), - (JSCompiler_object_inline_message_2250.stack = - JSCompiler_object_inline_stack_2252 || ""), - (JSCompiler_object_inline_message_2250.digest = - JSCompiler_object_inline_digest_2251), - (JSCompiler_object_inline_componentStack_2253 = - void 0 === JSCompiler_object_inline_componentStack_2253 + (JSCompiler_object_inline_message_2236.stack = + JSCompiler_object_inline_stack_2238 || ""), + (JSCompiler_object_inline_message_2236.digest = + JSCompiler_object_inline_digest_2237), + (JSCompiler_object_inline_componentStack_2239 = + void 0 === JSCompiler_object_inline_componentStack_2239 ? null - : JSCompiler_object_inline_componentStack_2253), - "string" === typeof JSCompiler_object_inline_componentStack_2253 && + : JSCompiler_object_inline_componentStack_2239), + "string" === typeof JSCompiler_object_inline_componentStack_2239 && CapturedStacks.set( - JSCompiler_object_inline_message_2250, - JSCompiler_object_inline_componentStack_2253 + JSCompiler_object_inline_message_2236, + JSCompiler_object_inline_componentStack_2239 ), queueHydrationError({ - value: JSCompiler_object_inline_message_2250, + value: JSCompiler_object_inline_message_2236, source: null, - stack: JSCompiler_object_inline_componentStack_2253 + stack: JSCompiler_object_inline_componentStack_2239 })); workInProgress = retrySuspenseComponentWithoutHydrating( current, @@ -9074,25 +9096,25 @@ renderLanes, !1 ), - (JSCompiler_object_inline_componentStack_2253 = + (JSCompiler_object_inline_componentStack_2239 = 0 !== (renderLanes & current.childLanes)), - didReceiveUpdate || JSCompiler_object_inline_componentStack_2253) + didReceiveUpdate || JSCompiler_object_inline_componentStack_2239) ) { - JSCompiler_object_inline_componentStack_2253 = workInProgressRoot; - if (null !== JSCompiler_object_inline_componentStack_2253) { - JSCompiler_object_inline_stack_2252 = renderLanes & -renderLanes; - if (0 !== (JSCompiler_object_inline_stack_2252 & 42)) - JSCompiler_object_inline_stack_2252 = 1; + JSCompiler_object_inline_componentStack_2239 = workInProgressRoot; + if (null !== JSCompiler_object_inline_componentStack_2239) { + JSCompiler_object_inline_stack_2238 = renderLanes & -renderLanes; + if (0 !== (JSCompiler_object_inline_stack_2238 & 42)) + JSCompiler_object_inline_stack_2238 = 1; else - switch (JSCompiler_object_inline_stack_2252) { + switch (JSCompiler_object_inline_stack_2238) { case 2: - JSCompiler_object_inline_stack_2252 = 1; + JSCompiler_object_inline_stack_2238 = 1; break; case 8: - JSCompiler_object_inline_stack_2252 = 4; + JSCompiler_object_inline_stack_2238 = 4; break; case 32: - JSCompiler_object_inline_stack_2252 = 16; + JSCompiler_object_inline_stack_2238 = 16; break; case 128: case 256: @@ -9113,40 +9135,40 @@ case 8388608: case 16777216: case 33554432: - JSCompiler_object_inline_stack_2252 = 64; + JSCompiler_object_inline_stack_2238 = 64; break; case 268435456: - JSCompiler_object_inline_stack_2252 = 134217728; + JSCompiler_object_inline_stack_2238 = 134217728; break; default: - JSCompiler_object_inline_stack_2252 = 0; + JSCompiler_object_inline_stack_2238 = 0; } - JSCompiler_object_inline_stack_2252 = + JSCompiler_object_inline_stack_2238 = 0 !== - (JSCompiler_object_inline_stack_2252 & - (JSCompiler_object_inline_componentStack_2253.suspendedLanes | + (JSCompiler_object_inline_stack_2238 & + (JSCompiler_object_inline_componentStack_2239.suspendedLanes | renderLanes)) ? 0 - : JSCompiler_object_inline_stack_2252; + : JSCompiler_object_inline_stack_2238; if ( - 0 !== JSCompiler_object_inline_stack_2252 && - JSCompiler_object_inline_stack_2252 !== prevState.retryLane + 0 !== JSCompiler_object_inline_stack_2238 && + JSCompiler_object_inline_stack_2238 !== prevState.retryLane ) throw ( - ((prevState.retryLane = JSCompiler_object_inline_stack_2252), + ((prevState.retryLane = JSCompiler_object_inline_stack_2238), enqueueConcurrentRenderForLane( current, - JSCompiler_object_inline_stack_2252 + JSCompiler_object_inline_stack_2238 ), scheduleUpdateOnFiber( - JSCompiler_object_inline_componentStack_2253, + JSCompiler_object_inline_componentStack_2239, current, - JSCompiler_object_inline_stack_2252 + JSCompiler_object_inline_stack_2238 ), SelectiveHydrationException) ); } - JSCompiler_object_inline_digest_2251.data === + JSCompiler_object_inline_digest_2237.data === SUSPENSE_PENDING_START_DATA || renderDidSuspendDelayIfPossible(); workInProgress = retrySuspenseComponentWithoutHydrating( current, @@ -9154,7 +9176,7 @@ renderLanes ); } else - JSCompiler_object_inline_digest_2251.data === + JSCompiler_object_inline_digest_2237.data === SUSPENSE_PENDING_START_DATA ? ((workInProgress.flags |= 128), (workInProgress.child = current.child), @@ -9162,12 +9184,12 @@ null, current )), - (JSCompiler_object_inline_digest_2251._reactRetry = + (JSCompiler_object_inline_digest_2237._reactRetry = workInProgress), (workInProgress = null)) : ((current = prevState.treeContext), (nextHydratableInstance = getNextHydratable( - JSCompiler_object_inline_digest_2251.nextSibling + JSCompiler_object_inline_digest_2237.nextSibling )), (hydrationParentFiber = workInProgress), (isHydrating = !0), @@ -9185,54 +9207,54 @@ (treeContextProvider = workInProgress)), (workInProgress = mountSuspensePrimaryChildren( workInProgress, - JSCompiler_object_inline_stack_2252.children + JSCompiler_object_inline_stack_2238.children )), (workInProgress.flags |= 4096)); return workInProgress; } - if (JSCompiler_object_inline_message_2250) + if (JSCompiler_object_inline_message_2236) return ( reuseSuspenseHandlerOnStack(workInProgress), - (JSCompiler_object_inline_message_2250 = - JSCompiler_object_inline_stack_2252.fallback), - (JSCompiler_object_inline_digest_2251 = workInProgress.mode), + (JSCompiler_object_inline_message_2236 = + JSCompiler_object_inline_stack_2238.fallback), + (JSCompiler_object_inline_digest_2237 = workInProgress.mode), (JSCompiler_temp = current.child), (instance = JSCompiler_temp.sibling), - (JSCompiler_object_inline_stack_2252 = createWorkInProgress( + (JSCompiler_object_inline_stack_2238 = createWorkInProgress( JSCompiler_temp, { mode: "hidden", - children: JSCompiler_object_inline_stack_2252.children + children: JSCompiler_object_inline_stack_2238.children } )), - (JSCompiler_object_inline_stack_2252.subtreeFlags = + (JSCompiler_object_inline_stack_2238.subtreeFlags = JSCompiler_temp.subtreeFlags & 31457280), null !== instance - ? (JSCompiler_object_inline_message_2250 = createWorkInProgress( + ? (JSCompiler_object_inline_message_2236 = createWorkInProgress( instance, - JSCompiler_object_inline_message_2250 + JSCompiler_object_inline_message_2236 )) - : ((JSCompiler_object_inline_message_2250 = createFiberFromFragment( - JSCompiler_object_inline_message_2250, - JSCompiler_object_inline_digest_2251, + : ((JSCompiler_object_inline_message_2236 = createFiberFromFragment( + JSCompiler_object_inline_message_2236, + JSCompiler_object_inline_digest_2237, renderLanes, null )), - (JSCompiler_object_inline_message_2250.flags |= 2)), - (JSCompiler_object_inline_message_2250.return = workInProgress), - (JSCompiler_object_inline_stack_2252.return = workInProgress), - (JSCompiler_object_inline_stack_2252.sibling = - JSCompiler_object_inline_message_2250), - (workInProgress.child = JSCompiler_object_inline_stack_2252), - (JSCompiler_object_inline_stack_2252 = - JSCompiler_object_inline_message_2250), - (JSCompiler_object_inline_message_2250 = workInProgress.child), - (JSCompiler_object_inline_digest_2251 = current.child.memoizedState), - null === JSCompiler_object_inline_digest_2251 - ? (JSCompiler_object_inline_digest_2251 = + (JSCompiler_object_inline_message_2236.flags |= 2)), + (JSCompiler_object_inline_message_2236.return = workInProgress), + (JSCompiler_object_inline_stack_2238.return = workInProgress), + (JSCompiler_object_inline_stack_2238.sibling = + JSCompiler_object_inline_message_2236), + (workInProgress.child = JSCompiler_object_inline_stack_2238), + (JSCompiler_object_inline_stack_2238 = + JSCompiler_object_inline_message_2236), + (JSCompiler_object_inline_message_2236 = workInProgress.child), + (JSCompiler_object_inline_digest_2237 = current.child.memoizedState), + null === JSCompiler_object_inline_digest_2237 + ? (JSCompiler_object_inline_digest_2237 = mountSuspenseOffscreenState(renderLanes)) : ((JSCompiler_temp = - JSCompiler_object_inline_digest_2251.cachePool), + JSCompiler_object_inline_digest_2237.cachePool), null !== JSCompiler_temp ? ((instance = CacheContext._currentValue), (JSCompiler_temp = @@ -9240,38 +9262,38 @@ ? { parent: instance, pool: instance } : JSCompiler_temp)) : (JSCompiler_temp = getSuspendedCache()), - (JSCompiler_object_inline_digest_2251 = { + (JSCompiler_object_inline_digest_2237 = { baseLanes: - JSCompiler_object_inline_digest_2251.baseLanes | renderLanes, + JSCompiler_object_inline_digest_2237.baseLanes | renderLanes, cachePool: JSCompiler_temp })), - (JSCompiler_object_inline_message_2250.memoizedState = - JSCompiler_object_inline_digest_2251), - (JSCompiler_object_inline_message_2250.childLanes = + (JSCompiler_object_inline_message_2236.memoizedState = + JSCompiler_object_inline_digest_2237), + (JSCompiler_object_inline_message_2236.childLanes = getRemainingWorkInPrimaryTree( current, - JSCompiler_object_inline_componentStack_2253, + JSCompiler_object_inline_componentStack_2239, renderLanes )), (workInProgress.memoizedState = SUSPENDED_MARKER), - JSCompiler_object_inline_stack_2252 + JSCompiler_object_inline_stack_2238 ); pushPrimaryTreeSuspenseHandler(workInProgress); renderLanes = current.child; current = renderLanes.sibling; renderLanes = createWorkInProgress(renderLanes, { mode: "visible", - children: JSCompiler_object_inline_stack_2252.children + children: JSCompiler_object_inline_stack_2238.children }); renderLanes.return = workInProgress; renderLanes.sibling = null; null !== current && - ((JSCompiler_object_inline_componentStack_2253 = + ((JSCompiler_object_inline_componentStack_2239 = workInProgress.deletions), - null === JSCompiler_object_inline_componentStack_2253 + null === JSCompiler_object_inline_componentStack_2239 ? ((workInProgress.deletions = [current]), (workInProgress.flags |= 16)) - : JSCompiler_object_inline_componentStack_2253.push(current)); + : JSCompiler_object_inline_componentStack_2239.push(current)); workInProgress.child = renderLanes; workInProgress.memoizedState = null; return renderLanes; @@ -9622,8 +9644,8 @@ (workInProgress.flags |= 4); workInProgress.flags |= 2048; var stateNode = workInProgress.stateNode; - stateNode.effectDuration = 0; - stateNode.passiveEffectDuration = 0; + stateNode.effectDuration = -0; + stateNode.passiveEffectDuration = -0; break; case 13: stateNode = workInProgress.memoizedState; @@ -10209,8 +10231,8 @@ (workInProgress.flags |= 4), (workInProgress.flags |= 2048), (returnFiber = workInProgress.stateNode), - (returnFiber.effectDuration = 0), - (returnFiber.passiveEffectDuration = 0), + (returnFiber.effectDuration = -0), + (returnFiber.passiveEffectDuration = -0), reconcileChildren( current, workInProgress, @@ -10869,16 +10891,35 @@ ) callCallback(callbacks[updateQueue], context); } - function shouldProfile$1(current) { + function shouldProfile(current) { return (current.mode & ProfileMode) !== NoMode; } function commitHookLayoutEffects(finishedWork, hookFlags) { - shouldProfile$1(finishedWork) - ? (startLayoutEffectTimer(), + shouldProfile(finishedWork) + ? (startEffectTimer(), commitHookEffectListMount(hookFlags, finishedWork), - recordLayoutEffectDuration(finishedWork)) + recordEffectDuration()) : commitHookEffectListMount(hookFlags, finishedWork); } + function commitHookLayoutUnmountEffects( + finishedWork, + nearestMountedAncestor, + hookFlags + ) { + shouldProfile(finishedWork) + ? (startEffectTimer(), + commitHookEffectListUnmount( + hookFlags, + finishedWork, + nearestMountedAncestor + ), + recordEffectDuration()) + : commitHookEffectListUnmount( + hookFlags, + finishedWork, + nearestMountedAncestor + ); + } function commitHookEffectListMount(flags, finishedWork) { try { var updateQueue = finishedWork.updateQueue, @@ -10976,10 +11017,10 @@ } } function commitHookPassiveMountEffects(finishedWork, hookFlags) { - shouldProfile$1(finishedWork) - ? ((passiveEffectStartTime = now()), + shouldProfile(finishedWork) + ? (startEffectTimer(), commitHookEffectListMount(hookFlags, finishedWork), - recordPassiveEffectDuration(finishedWork)) + recordEffectDuration()) : commitHookEffectListMount(hookFlags, finishedWork); } function commitHookPassiveUnmountEffects( @@ -10987,14 +11028,14 @@ nearestMountedAncestor, hookFlags ) { - shouldProfile$1(finishedWork) - ? ((passiveEffectStartTime = now()), + shouldProfile(finishedWork) + ? (startEffectTimer(), commitHookEffectListUnmount( hookFlags, finishedWork, nearestMountedAncestor ), - recordPassiveEffectDuration(finishedWork)) + recordEffectDuration()) : commitHookEffectListUnmount( hookFlags, finishedWork, @@ -11088,8 +11129,8 @@ current.memoizedProps ); instance.state = current.memoizedState; - shouldProfile$1(current) - ? (startLayoutEffectTimer(), + shouldProfile(current) + ? (startEffectTimer(), runWithFiberInDEV( current, callComponentWillUnmountInDEV, @@ -11097,7 +11138,7 @@ nearestMountedAncestor, instance ), - recordLayoutEffectDuration(current)) + recordEffectDuration()) : runWithFiberInDEV( current, callComponentWillUnmountInDEV, @@ -11111,12 +11152,11 @@ if (null !== ref) { var instance = finishedWork.stateNode; if ("function" === typeof ref) - if (shouldProfile$1(finishedWork)) + if (shouldProfile(finishedWork)) try { - startLayoutEffectTimer(), - (finishedWork.refCleanup = ref(instance)); + startEffectTimer(), (finishedWork.refCleanup = ref(instance)); } finally { - recordLayoutEffectDuration(finishedWork); + recordEffectDuration(); } else finishedWork.refCleanup = ref(instance); else @@ -11143,12 +11183,11 @@ if (null !== ref) if ("function" === typeof refCleanup) try { - if (shouldProfile$1(current)) + if (shouldProfile(current)) try { - startLayoutEffectTimer(), - runWithFiberInDEV(current, refCleanup); + startEffectTimer(), runWithFiberInDEV(current, refCleanup); } finally { - recordLayoutEffectDuration(current); + recordEffectDuration(current); } else runWithFiberInDEV(current, refCleanup); } catch (error) { @@ -11160,11 +11199,11 @@ } else if ("function" === typeof ref) try { - if (shouldProfile$1(current)) + if (shouldProfile(current)) try { - startLayoutEffectTimer(), runWithFiberInDEV(current, ref, null); + startEffectTimer(), runWithFiberInDEV(current, ref, null); } finally { - recordLayoutEffectDuration(current); + recordEffectDuration(current); } else runWithFiberInDEV(current, ref, null); } catch (error$7) { @@ -11518,7 +11557,8 @@ return firstChild; } function commitLayoutEffectOnFiber(finishedRoot, current, finishedWork) { - var flags = finishedWork.flags; + var prevEffectStart = pushComponentEffectStart(), + flags = finishedWork.flags; switch (finishedWork.tag) { case 0: case 11: @@ -11544,15 +11584,15 @@ "Expected %s state to match memoized state before componentDidMount. This might either be because of a bug in React, or because a component reassigns its own `this.state`. Please file an issue.", getComponentNameFromFiber(finishedWork) || "instance" )), - shouldProfile$1(finishedWork) - ? (startLayoutEffectTimer(), + shouldProfile(finishedWork) + ? (startEffectTimer(), runWithFiberInDEV( finishedWork, callComponentDidMountInDEV, finishedWork, finishedRoot ), - recordLayoutEffectDuration(finishedWork)) + recordEffectDuration()) : runWithFiberInDEV( finishedWork, callComponentDidMountInDEV, @@ -11578,8 +11618,8 @@ "Expected %s state to match memoized state before componentDidUpdate. This might either be because of a bug in React, or because a component reassigns its own `this.state`. Please file an issue.", getComponentNameFromFiber(finishedWork) || "instance" )); - shouldProfile$1(finishedWork) - ? (startLayoutEffectTimer(), + shouldProfile(finishedWork) + ? (startEffectTimer(), runWithFiberInDEV( finishedWork, callComponentDidUpdateInDEV, @@ -11589,7 +11629,7 @@ current, finishedRoot.__reactInternalSnapshotBeforeUpdate ), - recordLayoutEffectDuration(finishedWork)) + recordEffectDuration()) : runWithFiberInDEV( finishedWork, callComponentDidUpdateInDEV, @@ -11604,32 +11644,34 @@ flags & 512 && safelyAttachRef(finishedWork, finishedWork.return); break; case 3: + current = pushNestedEffectDurations(); recursivelyTraverseLayoutEffects(finishedRoot, finishedWork); if ( flags & 64 && ((flags = finishedWork.updateQueue), null !== flags) ) { - finishedRoot = null; + prevProps = null; if (null !== finishedWork.child) switch (finishedWork.child.tag) { case 27: case 5: - finishedRoot = finishedWork.child.stateNode; + prevProps = finishedWork.child.stateNode; break; case 1: - finishedRoot = finishedWork.child.stateNode; + prevProps = finishedWork.child.stateNode; } try { runWithFiberInDEV( finishedWork, commitCallbacks, flags, - finishedRoot + prevProps ); } catch (error) { captureCommitPhaseError(finishedWork, finishedWork.return, error); } } + finishedRoot.effectDuration += popNestedEffectDurations(current); break; case 26: recursivelyTraverseLayoutEffects(finishedRoot, finishedWork); @@ -11642,9 +11684,11 @@ flags & 512 && safelyAttachRef(finishedWork, finishedWork.return); break; case 12: - recursivelyTraverseLayoutEffects(finishedRoot, finishedWork); if (flags & 4) { - flags = finishedWork.stateNode.effectDuration; + flags = pushNestedEffectDurations(); + recursivelyTraverseLayoutEffects(finishedRoot, finishedWork); + finishedRoot = finishedWork.stateNode; + finishedRoot.effectDuration += bubbleNestedEffectDurations(flags); try { runWithFiberInDEV( finishedWork, @@ -11652,24 +11696,12 @@ finishedWork, current, commitTime, - flags + finishedRoot.effectDuration ); } catch (error) { captureCommitPhaseError(finishedWork, finishedWork.return, error); } - finishedWork = finishedWork.return; - a: for (; null !== finishedWork; ) { - switch (finishedWork.tag) { - case 3: - finishedWork.stateNode.effectDuration += flags; - break a; - case 12: - finishedWork.stateNode.effectDuration += flags; - break a; - } - finishedWork = finishedWork.return; - } - } + } else recursivelyTraverseLayoutEffects(finishedRoot, finishedWork); break; case 13: recursivelyTraverseLayoutEffects(finishedRoot, finishedWork); @@ -11705,6 +11737,16 @@ default: recursivelyTraverseLayoutEffects(finishedRoot, finishedWork); } + (finishedWork.mode & ProfileMode) !== NoMode && + 0 <= componentEffectStartTime && + 0 <= componentEffectEndTime && + logComponentEffect( + finishedWork, + componentEffectStartTime, + componentEffectEndTime, + componentEffectDuration + ); + popComponentEffectStart(prevEffectStart); } function detachFiberAfterEffects(fiber) { var alternate = fiber.alternate; @@ -11866,51 +11908,18 @@ case 11: case 14: case 15: - if ( - !offscreenSubtreeWasHidden && - ((prevHostParent = deletedFiber.updateQueue), - null !== prevHostParent && - ((prevHostParent = prevHostParent.lastEffect), - null !== prevHostParent)) - ) { - prevHostParentIsContainer = prevHostParent = prevHostParent.next; - do { - var _tag = prevHostParentIsContainer.tag, - _inst = prevHostParentIsContainer.inst, - _destroy = _inst.destroy; - void 0 !== _destroy && - ((_tag & Insertion) !== NoFlags - ? ((_inst.destroy = void 0), - runWithFiberInDEV( - deletedFiber, - callDestroyInDEV, - deletedFiber, - nearestMountedAncestor, - _destroy - )) - : (_tag & Layout) !== NoFlags && - ((deletedFiber.mode & ProfileMode) !== NoMode - ? (startLayoutEffectTimer(), - (_inst.destroy = void 0), - runWithFiberInDEV( - deletedFiber, - callDestroyInDEV, - deletedFiber, - nearestMountedAncestor, - _destroy - ), - recordLayoutEffectDuration(deletedFiber)) - : ((_inst.destroy = void 0), - runWithFiberInDEV( - deletedFiber, - callDestroyInDEV, - deletedFiber, - nearestMountedAncestor, - _destroy - )))); - prevHostParentIsContainer = prevHostParentIsContainer.next; - } while (prevHostParentIsContainer !== prevHostParent); - } + offscreenSubtreeWasHidden || + commitHookEffectListUnmount( + Insertion, + deletedFiber, + nearestMountedAncestor + ); + offscreenSubtreeWasHidden || + commitHookLayoutUnmountEffects( + deletedFiber, + nearestMountedAncestor, + Layout + ); recursivelyTraverseDeletionEffects( finishedRoot, nearestMountedAncestor, @@ -12023,6 +12032,7 @@ function commitMutationEffects(root, finishedWork, committedLanes) { inProgressLanes = committedLanes; inProgressRoot = root; + resetComponentEffectTimers(); commitMutationEffectsOnFiber(finishedWork, root); inProgressRoot = inProgressLanes = null; } @@ -12070,7 +12080,8 @@ (parentFiber = parentFiber.sibling); } function commitMutationEffectsOnFiber(finishedWork, root) { - var current = finishedWork.alternate, + var prevEffectStart = pushComponentEffectStart(), + current = finishedWork.alternate, flags = finishedWork.flags; switch (finishedWork.tag) { case 0: @@ -12086,19 +12097,11 @@ finishedWork.return ), commitHookEffectListMount(Insertion | HasEffect, finishedWork), - (finishedWork.mode & ProfileMode) !== NoMode - ? (startLayoutEffectTimer(), - commitHookEffectListUnmount( - Layout | HasEffect, - finishedWork, - finishedWork.return - ), - recordLayoutEffectDuration(finishedWork)) - : commitHookEffectListUnmount( - Layout | HasEffect, - finishedWork, - finishedWork.return - )); + commitHookLayoutUnmountEffects( + finishedWork, + finishedWork.return, + Layout | HasEffect + )); break; case 1: recursivelyTraverseMutationEffects(root, finishedWork); @@ -12108,13 +12111,13 @@ safelyDetachRef(current, current.return); flags & 64 && offscreenSubtreeIsHidden && - ((finishedWork = finishedWork.updateQueue), - null !== finishedWork && - ((flags = finishedWork.callbacks), - null !== flags && - ((current = finishedWork.shared.hiddenCallbacks), - (finishedWork.shared.hiddenCallbacks = - null === current ? flags : current.concat(flags))))); + ((flags = finishedWork.updateQueue), + null !== flags && + ((current = flags.callbacks), + null !== current && + ((root = flags.shared.hiddenCallbacks), + (flags.shared.hiddenCallbacks = + null === root ? current : root.concat(current))))); break; case 26: var hoistableRoot = currentHoistableRoot; @@ -12123,113 +12126,110 @@ flags & 512 && null !== current && safelyDetachRef(current, current.return); - if (flags & 4) { - var currentResource = - null !== current ? current.memoizedState : null; - flags = finishedWork.memoizedState; - if (null === current) + if (flags & 4) + if ( + ((root = null !== current ? current.memoizedState : null), + (flags = finishedWork.memoizedState), + null === current) + ) if (null === flags) if (null === finishedWork.stateNode) { a: { flags = finishedWork.type; current = finishedWork.memoizedProps; - hoistableRoot = - hoistableRoot.ownerDocument || hoistableRoot; + root = hoistableRoot.ownerDocument || hoistableRoot; b: switch (flags) { case "title": - currentResource = - hoistableRoot.getElementsByTagName("title")[0]; + hoistableRoot = root.getElementsByTagName("title")[0]; if ( - !currentResource || - currentResource[internalHoistableMarker] || - currentResource[internalInstanceKey] || - currentResource.namespaceURI === SVG_NAMESPACE || - currentResource.hasAttribute("itemprop") + !hoistableRoot || + hoistableRoot[internalHoistableMarker] || + hoistableRoot[internalInstanceKey] || + hoistableRoot.namespaceURI === SVG_NAMESPACE || + hoistableRoot.hasAttribute("itemprop") ) - (currentResource = - hoistableRoot.createElement(flags)), - hoistableRoot.head.insertBefore( - currentResource, - hoistableRoot.querySelector("head > title") + (hoistableRoot = root.createElement(flags)), + root.head.insertBefore( + hoistableRoot, + root.querySelector("head > title") ); - setInitialProperties(currentResource, flags, current); - currentResource[internalInstanceKey] = finishedWork; - markNodeAsHoistable(currentResource); - flags = currentResource; + setInitialProperties(hoistableRoot, flags, current); + hoistableRoot[internalInstanceKey] = finishedWork; + markNodeAsHoistable(hoistableRoot); + flags = hoistableRoot; break a; case "link": - if ( - (root = getHydratableHoistableCache( - "link", - "href", - hoistableRoot - ).get(flags + (current.href || ""))) - ) - for (var i = 0; i < root.length; i++) + var maybeNodes = getHydratableHoistableCache( + "link", + "href", + root + ).get(flags + (current.href || "")); + if (maybeNodes) + for (var i = 0; i < maybeNodes.length; i++) if ( - ((currentResource = root[i]), - currentResource.getAttribute("href") === + ((hoistableRoot = maybeNodes[i]), + hoistableRoot.getAttribute("href") === (null == current.href ? null : current.href) && - currentResource.getAttribute("rel") === + hoistableRoot.getAttribute("rel") === (null == current.rel ? null : current.rel) && - currentResource.getAttribute("title") === + hoistableRoot.getAttribute("title") === (null == current.title ? null : current.title) && - currentResource.getAttribute("crossorigin") === + hoistableRoot.getAttribute("crossorigin") === (null == current.crossOrigin ? null : current.crossOrigin)) ) { - root.splice(i, 1); + maybeNodes.splice(i, 1); break b; } - currentResource = hoistableRoot.createElement(flags); - setInitialProperties(currentResource, flags, current); - hoistableRoot.head.appendChild(currentResource); + hoistableRoot = root.createElement(flags); + setInitialProperties(hoistableRoot, flags, current); + root.head.appendChild(hoistableRoot); break; case "meta": if ( - (root = getHydratableHoistableCache( + (maybeNodes = getHydratableHoistableCache( "meta", "content", - hoistableRoot + root ).get(flags + (current.content || ""))) ) - for (i = 0; i < root.length; i++) + for (i = 0; i < maybeNodes.length; i++) if ( - ((currentResource = root[i]), + ((hoistableRoot = maybeNodes[i]), checkAttributeStringCoercion( current.content, "content" ), - currentResource.getAttribute("content") === + hoistableRoot.getAttribute("content") === (null == current.content ? null : "" + current.content) && - currentResource.getAttribute("name") === + hoistableRoot.getAttribute("name") === (null == current.name ? null : current.name) && - currentResource.getAttribute("property") === + hoistableRoot.getAttribute("property") === (null == current.property ? null : current.property) && - currentResource.getAttribute("http-equiv") === + hoistableRoot.getAttribute("http-equiv") === (null == current.httpEquiv ? null : current.httpEquiv) && - currentResource.getAttribute("charset") === + hoistableRoot.getAttribute("charset") === (null == current.charSet ? null : current.charSet)) ) { - root.splice(i, 1); + maybeNodes.splice(i, 1); break b; } - currentResource = hoistableRoot.createElement(flags); - setInitialProperties(currentResource, flags, current); - hoistableRoot.head.appendChild(currentResource); + hoistableRoot = root.createElement(flags); + setInitialProperties(hoistableRoot, flags, current); + root.head.appendChild(hoistableRoot); break; default: throw Error( @@ -12238,9 +12238,9 @@ '". This is a bug in React.' ); } - currentResource[internalInstanceKey] = finishedWork; - markNodeAsHoistable(currentResource); - flags = currentResource; + hoistableRoot[internalInstanceKey] = finishedWork; + markNodeAsHoistable(hoistableRoot); + flags = hoistableRoot; } finishedWork.stateNode = flags; } else @@ -12256,12 +12256,12 @@ finishedWork.memoizedProps ); else - currentResource !== flags - ? (null === currentResource + root !== flags + ? (null === root ? null !== current.stateNode && ((current = current.stateNode), current.parentNode.removeChild(current)) - : currentResource.count--, + : root.count--, null === flags ? mountHoistable( hoistableRoot, @@ -12280,12 +12280,11 @@ finishedWork.memoizedProps, current.memoizedProps ); - } break; case 27: if (flags & 4 && null === finishedWork.alternate) { hoistableRoot = finishedWork.stateNode; - currentResource = finishedWork.memoizedProps; + maybeNodes = finishedWork.memoizedProps; try { for (i = hoistableRoot.firstChild; i; ) { var nextNode = i.nextSibling, @@ -12304,7 +12303,7 @@ finishedWork, acquireSingletonInstance, finishedWork.type, - currentResource, + maybeNodes, hoistableRoot, finishedWork ); @@ -12319,20 +12318,20 @@ null !== current && safelyDetachRef(current, current.return); if (finishedWork.flags & 32) { - hoistableRoot = finishedWork.stateNode; + root = finishedWork.stateNode; try { - runWithFiberInDEV(finishedWork, resetTextContent, hoistableRoot); + runWithFiberInDEV(finishedWork, resetTextContent, root); } catch (error) { captureCommitPhaseError(finishedWork, finishedWork.return, error); } } flags & 4 && null != finishedWork.stateNode && - ((hoistableRoot = finishedWork.memoizedProps), + ((root = finishedWork.memoizedProps), commitHostUpdate( finishedWork, - hoistableRoot, - null !== current ? current.memoizedProps : hoistableRoot + root, + null !== current ? current.memoizedProps : root )); flags & 1024 && ((needsFormReset = !0), @@ -12351,12 +12350,12 @@ ); flags = finishedWork.memoizedProps; current = null !== current ? current.memoizedProps : flags; - hoistableRoot = finishedWork.stateNode; + root = finishedWork.stateNode; try { runWithFiberInDEV( finishedWork, commitTextUpdate, - hoistableRoot, + root, current, flags ); @@ -12366,11 +12365,12 @@ } break; case 3: + hoistableRoot = pushNestedEffectDurations(); tagCaches = null; - hoistableRoot = currentHoistableRoot; + maybeNodes = currentHoistableRoot; currentHoistableRoot = getHoistableRoot(root.containerInfo); recursivelyTraverseMutationEffects(root, finishedWork); - currentHoistableRoot = hoistableRoot; + currentHoistableRoot = maybeNodes; commitReconciliationEffects(finishedWork); if ( flags & 4 && @@ -12388,6 +12388,7 @@ } needsFormReset && ((needsFormReset = !1), recursivelyResetForms(finishedWork)); + root.effectDuration += popNestedEffectDurations(hoistableRoot); break; case 4: flags = currentHoistableRoot; @@ -12398,6 +12399,13 @@ commitReconciliationEffects(finishedWork); currentHoistableRoot = flags; break; + case 12: + flags = pushNestedEffectDurations(); + recursivelyTraverseMutationEffects(root, finishedWork); + commitReconciliationEffects(finishedWork); + finishedWork.stateNode.effectDuration += + bubbleNestedEffectDurations(flags); + break; case 13: recursivelyTraverseMutationEffects(root, finishedWork); commitReconciliationEffects(finishedWork); @@ -12469,17 +12477,17 @@ if (null === current) { nextNode = root; try { - (currentResource = nextNode.stateNode), + (maybeNodes = nextNode.stateNode), i ? runWithFiberInDEV( nextNode, hideTextInstance, - currentResource + maybeNodes ) : runWithFiberInDEV( nextNode, unhideTextInstance, - currentResource, + maybeNodes, nextNode.memoizedProps ); } catch (error) { @@ -12530,6 +12538,16 @@ recursivelyTraverseMutationEffects(root, finishedWork), commitReconciliationEffects(finishedWork); } + (finishedWork.mode & ProfileMode) !== NoMode && + 0 <= componentEffectStartTime && + 0 <= componentEffectEndTime && + logComponentEffect( + finishedWork, + componentEffectStartTime, + componentEffectEndTime, + componentEffectDuration + ); + popComponentEffectStart(prevEffectStart); } function commitReconciliationEffects(finishedWork) { var flags = finishedWork.flags; @@ -12555,6 +12573,7 @@ function commitLayoutEffects(finishedWork, root, committedLanes) { inProgressLanes = committedLanes; inProgressRoot = root; + resetComponentEffectTimers(); commitLayoutEffectOnFiber(root, finishedWork.alternate, finishedWork); inProgressRoot = inProgressLanes = null; } @@ -12570,23 +12589,11 @@ case 11: case 14: case 15: - if ((finishedWork.mode & ProfileMode) !== NoMode) - try { - startLayoutEffectTimer(), - commitHookEffectListUnmount( - Layout, - finishedWork, - finishedWork.return - ); - } finally { - recordLayoutEffectDuration(finishedWork); - } - else - commitHookEffectListUnmount( - Layout, - finishedWork, - finishedWork.return - ); + commitHookLayoutUnmountEffects( + finishedWork, + finishedWork.return, + Layout + ); recursivelyTraverseDisappearLayoutEffects(finishedWork); break; case 1: @@ -12686,14 +12693,16 @@ safelyAttachRef(finishedWork, finishedWork.return); break; case 12: - recursivelyTraverseReappearLayoutEffects( - finishedRoot, - finishedWork, - includeWorkInProgressEffects - ); if (includeWorkInProgressEffects && flags & 4) { - includeWorkInProgressEffects = - finishedWork.stateNode.effectDuration; + flags = pushNestedEffectDurations(); + recursivelyTraverseReappearLayoutEffects( + finishedRoot, + finishedWork, + includeWorkInProgressEffects + ); + includeWorkInProgressEffects = finishedWork.stateNode; + includeWorkInProgressEffects.effectDuration += + bubbleNestedEffectDurations(flags); try { runWithFiberInDEV( finishedWork, @@ -12701,26 +12710,17 @@ finishedWork, current, commitTime, - includeWorkInProgressEffects + includeWorkInProgressEffects.effectDuration ); } catch (error) { captureCommitPhaseError(finishedWork, finishedWork.return, error); } - finishedWork = finishedWork.return; - a: for (; null !== finishedWork; ) { - switch (finishedWork.tag) { - case 3: - finishedWork.stateNode.effectDuration += - includeWorkInProgressEffects; - break a; - case 12: - finishedWork.stateNode.effectDuration += - includeWorkInProgressEffects; - break a; - } - finishedWork = finishedWork.return; - } - } + } else + recursivelyTraverseReappearLayoutEffects( + finishedRoot, + finishedWork, + includeWorkInProgressEffects + ); break; case 13: recursivelyTraverseReappearLayoutEffects( @@ -12819,19 +12819,39 @@ committedTransitions, endTime ) { + var prevEffectStart = pushComponentEffectStart(); if ( (finishedWork.mode & ProfileMode) !== NoMode && 0 < finishedWork.actualStartTime ) { var startTime = finishedWork.actualStartTime, name = getComponentNameFromFiber(finishedWork); - null !== name && - supportsUserTiming && - ((reusableComponentOptions.start = startTime), - (reusableComponentOptions.end = endTime), - performance.measure(name, reusableComponentOptions)); + if (null !== name && supportsUserTiming) { + var selfTime = finishedWork.actualDuration; + if ( + null === finishedWork.alternate || + finishedWork.alternate.child !== finishedWork.child + ) + for ( + var child = finishedWork.child; + null !== child; + child = child.sibling + ) + selfTime -= child.actualDuration; + reusableComponentDevToolDetails.color = + 0.5 > selfTime + ? "primary-light" + : 10 > selfTime + ? "primary" + : 100 > selfTime + ? "primary-dark" + : "error"; + reusableComponentOptions.start = startTime; + reusableComponentOptions.end = endTime; + performance.measure(name, reusableComponentOptions); + } } - startTime = finishedWork.flags; + name = finishedWork.flags; switch (finishedWork.tag) { case 0: case 11: @@ -12843,10 +12863,11 @@ committedTransitions, endTime ); - startTime & 2048 && + name & 2048 && commitHookPassiveMountEffects(finishedWork, Passive | HasEffect); break; case 3: + startTime = pushNestedEffectDurations(); recursivelyTraversePassiveMountEffects( finishedRoot, finishedWork, @@ -12854,25 +12875,30 @@ committedTransitions, endTime ); - startTime & 2048 && - ((finishedRoot = null), + name & 2048 && + ((committedLanes = null), null !== finishedWork.alternate && - (finishedRoot = finishedWork.alternate.memoizedState.cache), - (finishedWork = finishedWork.memoizedState.cache), - finishedWork !== finishedRoot && - (retainCache(finishedWork), - null != finishedRoot && releaseCache(finishedRoot))); + (committedLanes = finishedWork.alternate.memoizedState.cache), + (committedTransitions = finishedWork.memoizedState.cache), + committedTransitions !== committedLanes && + (retainCache(committedTransitions), + null != committedLanes && releaseCache(committedLanes))); + finishedRoot.passiveEffectDuration += + popNestedEffectDurations(startTime); break; case 12: - recursivelyTraversePassiveMountEffects( - finishedRoot, - finishedWork, - committedLanes, - committedTransitions, - endTime - ); - if (startTime & 2048) { - finishedRoot = finishedWork.stateNode.passiveEffectDuration; + if (name & 2048) { + startTime = pushNestedEffectDurations(); + recursivelyTraversePassiveMountEffects( + finishedRoot, + finishedWork, + committedLanes, + committedTransitions, + endTime + ); + finishedRoot = finishedWork.stateNode; + finishedRoot.passiveEffectDuration += + bubbleNestedEffectDurations(startTime); try { runWithFiberInDEV( finishedWork, @@ -12880,31 +12906,26 @@ finishedWork, finishedWork.alternate, commitTime, - finishedRoot + finishedRoot.passiveEffectDuration ); } catch (error) { captureCommitPhaseError(finishedWork, finishedWork.return, error); } - finishedWork = finishedWork.return; - a: for (; null !== finishedWork; ) { - switch (finishedWork.tag) { - case 3: - finishedWork.stateNode.passiveEffectDuration += finishedRoot; - break a; - case 12: - finishedWork.stateNode.passiveEffectDuration += finishedRoot; - break a; - } - finishedWork = finishedWork.return; - } - } + } else + recursivelyTraversePassiveMountEffects( + finishedRoot, + finishedWork, + committedLanes, + committedTransitions, + endTime + ); break; case 23: break; case 22: - name = finishedWork.stateNode; + startTime = finishedWork.stateNode; null !== finishedWork.memoizedState - ? name._visibility & OffscreenPassiveEffectsConnected + ? startTime._visibility & OffscreenPassiveEffectsConnected ? recursivelyTraversePassiveMountEffects( finishedRoot, finishedWork, @@ -12916,7 +12937,7 @@ finishedRoot, finishedWork ) - : name._visibility & OffscreenPassiveEffectsConnected + : startTime._visibility & OffscreenPassiveEffectsConnected ? recursivelyTraversePassiveMountEffects( finishedRoot, finishedWork, @@ -12924,7 +12945,7 @@ committedTransitions, endTime ) - : ((name._visibility |= OffscreenPassiveEffectsConnected), + : ((startTime._visibility |= OffscreenPassiveEffectsConnected), recursivelyTraverseReconnectPassiveEffects( finishedRoot, finishedWork, @@ -12932,7 +12953,7 @@ committedTransitions, 0 !== (finishedWork.subtreeFlags & 10256) )); - startTime & 2048 && + name & 2048 && commitOffscreenPassiveMountEffects( finishedWork.alternate, finishedWork @@ -12946,7 +12967,7 @@ committedTransitions, endTime ); - startTime & 2048 && + name & 2048 && commitCachePassiveMountEffect(finishedWork.alternate, finishedWork); break; default: @@ -12958,6 +12979,16 @@ endTime ); } + (finishedWork.mode & ProfileMode) !== NoMode && + 0 <= componentEffectStartTime && + 0 <= componentEffectEndTime && + logComponentEffect( + finishedWork, + componentEffectStartTime, + componentEffectEndTime, + componentEffectDuration + ); + popComponentEffectStart(prevEffectStart); } function recursivelyTraverseReconnectPassiveEffects( finishedRoot, @@ -13174,6 +13205,7 @@ (parentFiber = parentFiber.sibling); } function commitPassiveUnmountOnFiber(finishedWork) { + var prevEffectStart = pushComponentEffectStart(); switch (finishedWork.tag) { case 0: case 11: @@ -13186,18 +13218,41 @@ Passive | HasEffect ); break; + case 3: + var prevEffectDuration = pushNestedEffectDurations(); + recursivelyTraversePassiveUnmountEffects(finishedWork); + finishedWork.stateNode.passiveEffectDuration += + popNestedEffectDurations(prevEffectDuration); + break; + case 12: + prevEffectDuration = pushNestedEffectDurations(); + recursivelyTraversePassiveUnmountEffects(finishedWork); + finishedWork.stateNode.passiveEffectDuration += + bubbleNestedEffectDurations(prevEffectDuration); + break; case 22: - var instance = finishedWork.stateNode; + prevEffectDuration = finishedWork.stateNode; null !== finishedWork.memoizedState && - instance._visibility & OffscreenPassiveEffectsConnected && + prevEffectDuration._visibility & OffscreenPassiveEffectsConnected && (null === finishedWork.return || 13 !== finishedWork.return.tag) - ? ((instance._visibility &= ~OffscreenPassiveEffectsConnected), + ? ((prevEffectDuration._visibility &= + ~OffscreenPassiveEffectsConnected), recursivelyTraverseDisconnectPassiveEffects(finishedWork)) : recursivelyTraversePassiveUnmountEffects(finishedWork); break; default: recursivelyTraversePassiveUnmountEffects(finishedWork); } + (finishedWork.mode & ProfileMode) !== NoMode && + 0 <= componentEffectStartTime && + 0 <= componentEffectEndTime && + logComponentEffect( + finishedWork, + componentEffectStartTime, + componentEffectEndTime, + componentEffectDuration + ); + popComponentEffectStart(prevEffectStart); } function recursivelyTraverseDisconnectPassiveEffects(parentFiber) { var deletions = parentFiber.deletions; @@ -15623,10 +15678,14 @@ didScheduleUpdateDuringPassiveEffects = !1; var prevExecutionContext = executionContext; executionContext |= CommitContext; - commitPassiveUnmountOnFiber(root$jscomp$0.current); + var finishedWork = root$jscomp$0.current; + resetComponentEffectTimers(); + commitPassiveUnmountOnFiber(finishedWork); + var finishedWork$jscomp$0 = root$jscomp$0.current; + resetComponentEffectTimers(); commitPassiveMountOnFiber( root$jscomp$0, - root$jscomp$0.current, + finishedWork$jscomp$0, lanes, priority, completeTime @@ -20291,7 +20350,7 @@ this.pooledCacheLanes = 0; this.formState = formState; this.incompleteTransitions = new Map(); - this.passiveEffectDuration = this.effectDuration = 0; + this.passiveEffectDuration = this.effectDuration = -0; this.memoizedUpdaters = new Set(); containerInfo = this.pendingUpdatersLaneMap = []; for (tag = 0; 31 > tag; tag++) containerInfo.push(new Set()); @@ -22310,11 +22369,13 @@ StrictEffectsMode = 16, NoStrictPassiveEffectsMode = 64, now = Scheduler.unstable_now, - completeTime = 0, - commitTime = 0, - layoutEffectStartTime = -1, - profilerStartTime = -1, - passiveEffectStartTime = -1, + completeTime = -0, + commitTime = -0, + profilerStartTime = -1.1, + profilerEffectDuration = -0, + componentEffectDuration = -0, + componentEffectStartTime = -1.1, + componentEffectEndTime = -1.1, currentUpdateIsNested = !1, nestedUpdateScheduled = !1, supportsUserTiming = @@ -24692,11 +24753,11 @@ }; (function () { var isomorphicReactPackageVersion = React.version; - if ("19.0.0-experimental-a99d8e8d-20240916" !== isomorphicReactPackageVersion) + if ("19.0.0-experimental-5dcb0097-20240918" !== isomorphicReactPackageVersion) throw Error( 'Incompatible React versions: The "react" and "react-dom" packages must have the exact same version. Instead got:\n - react: ' + (isomorphicReactPackageVersion + - "\n - react-dom: 19.0.0-experimental-a99d8e8d-20240916\nLearn more: https://react.dev/warnings/version-mismatch") + "\n - react-dom: 19.0.0-experimental-5dcb0097-20240918\nLearn more: https://react.dev/warnings/version-mismatch") ); })(); ("function" === typeof Map && @@ -24733,11 +24794,11 @@ !(function () { var internals = { bundleType: 1, - version: "19.0.0-experimental-a99d8e8d-20240916", + version: "19.0.0-experimental-5dcb0097-20240918", rendererPackageName: "react-dom", currentDispatcherRef: ReactSharedInternals, findFiberByHostInstance: getClosestInstanceFromNode, - reconcilerVersion: "19.0.0-experimental-a99d8e8d-20240916" + reconcilerVersion: "19.0.0-experimental-5dcb0097-20240918" }; internals.overrideHookState = overrideHookState; internals.overrideHookStateDeletePath = overrideHookStateDeletePath; @@ -24879,7 +24940,7 @@ listenToAllSupportedEvents(container); return new ReactDOMHydrationRoot(initialChildren); }; - exports.version = "19.0.0-experimental-a99d8e8d-20240916"; + exports.version = "19.0.0-experimental-5dcb0097-20240918"; "undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ && "function" === typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStop && diff --git a/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-client.production.js b/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-client.production.js index 0e7004a12b2da..bc14e910f955a 100644 --- a/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-client.production.js +++ b/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-client.production.js @@ -1981,19 +1981,19 @@ function getTargetInstForChangeEvent(domEventName, targetInst) { } var isInputEventSupported = !1; if (canUseDOM) { - var JSCompiler_inline_result$jscomp$284; + var JSCompiler_inline_result$jscomp$282; if (canUseDOM) { - var isSupported$jscomp$inline_419 = "oninput" in document; - if (!isSupported$jscomp$inline_419) { - var element$jscomp$inline_420 = document.createElement("div"); - element$jscomp$inline_420.setAttribute("oninput", "return;"); - isSupported$jscomp$inline_419 = - "function" === typeof element$jscomp$inline_420.oninput; + var isSupported$jscomp$inline_417 = "oninput" in document; + if (!isSupported$jscomp$inline_417) { + var element$jscomp$inline_418 = document.createElement("div"); + element$jscomp$inline_418.setAttribute("oninput", "return;"); + isSupported$jscomp$inline_417 = + "function" === typeof element$jscomp$inline_418.oninput; } - JSCompiler_inline_result$jscomp$284 = isSupported$jscomp$inline_419; - } else JSCompiler_inline_result$jscomp$284 = !1; + JSCompiler_inline_result$jscomp$282 = isSupported$jscomp$inline_417; + } else JSCompiler_inline_result$jscomp$282 = !1; isInputEventSupported = - JSCompiler_inline_result$jscomp$284 && + JSCompiler_inline_result$jscomp$282 && (!document.documentMode || 9 < document.documentMode); } function stopWatchingForValueChange() { @@ -2108,36 +2108,36 @@ function containsNode(outerNode, innerNode) { : !1; } function getActiveElementDeep(containerInfo) { - var $jscomp$optchain$tmp192711978$1, $jscomp$nullish$tmp0; + var $jscomp$optchain$tmpm519113360$1, $jscomp$nullish$tmp0; containerInfo = null != ($jscomp$nullish$tmp0 = null == containerInfo ? void 0 : null == - ($jscomp$optchain$tmp192711978$1 = containerInfo.ownerDocument) + ($jscomp$optchain$tmpm519113360$1 = containerInfo.ownerDocument) ? void 0 - : $jscomp$optchain$tmp192711978$1.defaultView) + : $jscomp$optchain$tmpm519113360$1.defaultView) ? $jscomp$nullish$tmp0 : window; for ( - $jscomp$optchain$tmp192711978$1 = getActiveElement(containerInfo.document); - $jscomp$optchain$tmp192711978$1 instanceof containerInfo.HTMLIFrameElement; + $jscomp$optchain$tmpm519113360$1 = getActiveElement(containerInfo.document); + $jscomp$optchain$tmpm519113360$1 instanceof containerInfo.HTMLIFrameElement; ) { try { var JSCompiler_inline_result = "string" === - typeof $jscomp$optchain$tmp192711978$1.contentWindow.location.href; + typeof $jscomp$optchain$tmpm519113360$1.contentWindow.location.href; } catch (err) { JSCompiler_inline_result = !1; } if (JSCompiler_inline_result) - containerInfo = $jscomp$optchain$tmp192711978$1.contentWindow; + containerInfo = $jscomp$optchain$tmpm519113360$1.contentWindow; else break; - $jscomp$optchain$tmp192711978$1 = getActiveElement(containerInfo.document); + $jscomp$optchain$tmpm519113360$1 = getActiveElement(containerInfo.document); } - return $jscomp$optchain$tmp192711978$1; + return $jscomp$optchain$tmpm519113360$1; } function hasSelectionCapabilities(elem) { var nodeName = elem && elem.nodeName && elem.nodeName.toLowerCase(); @@ -7607,7 +7607,7 @@ function commitHookEffectListMount(flags, finishedWork) { function commitHookEffectListUnmount( flags, finishedWork, - nearestMountedAncestor + nearestMountedAncestor$jscomp$0 ) { try { var updateQueue = finishedWork.updateQueue, @@ -7619,9 +7619,20 @@ function commitHookEffectListUnmount( if ((updateQueue.tag & flags) === flags) { var inst = updateQueue.inst, destroy = inst.destroy; - void 0 !== destroy && - ((inst.destroy = void 0), - safelyCallDestroy(finishedWork, nearestMountedAncestor, destroy)); + if (void 0 !== destroy) { + inst.destroy = void 0; + lastEffect = finishedWork; + var nearestMountedAncestor = nearestMountedAncestor$jscomp$0; + try { + destroy(); + } catch (error) { + captureCommitPhaseError( + lastEffect, + nearestMountedAncestor, + error + ); + } + } } updateQueue = updateQueue.next; } while (updateQueue !== firstEffect); @@ -7701,13 +7712,6 @@ function safelyDetachRef(current, nearestMountedAncestor) { } else ref.current = null; } -function safelyCallDestroy(current, nearestMountedAncestor, destroy) { - try { - destroy(); - } catch (error) { - captureCommitPhaseError(current, nearestMountedAncestor, error); - } -} function commitHostMount(finishedWork) { var type = finishedWork.type, props = finishedWork.memoizedProps, @@ -8056,23 +8060,6 @@ function commitLayoutEffectOnFiber(finishedRoot, current, finishedWork) { break; case 12: recursivelyTraverseLayoutEffects(finishedRoot, finishedWork); - if (flags & 4) - a: for ( - flags = finishedWork.stateNode.effectDuration, - finishedWork = finishedWork.return; - null !== finishedWork; - - ) { - switch (finishedWork.tag) { - case 3: - finishedWork.stateNode.effectDuration += flags; - break a; - case 12: - finishedWork.stateNode.effectDuration += flags; - break a; - } - finishedWork = finishedWork.return; - } break; case 13: recursivelyTraverseLayoutEffects(finishedRoot, finishedWork); @@ -8188,7 +8175,7 @@ function commitDeletionEffectsOnFiber( safelyDetachRef(deletedFiber, nearestMountedAncestor); case 6: prevHostParentIsContainer = hostParent; - var prevHostParentIsContainer$124 = hostParentIsContainer; + var prevHostParentIsContainer$123 = hostParentIsContainer; hostParent = null; recursivelyTraverseDeletionEffects( finishedRoot, @@ -8196,7 +8183,7 @@ function commitDeletionEffectsOnFiber( deletedFiber ); hostParent = prevHostParentIsContainer; - hostParentIsContainer = prevHostParentIsContainer$124; + hostParentIsContainer = prevHostParentIsContainer$123; if (null !== hostParent) if (hostParentIsContainer) try { @@ -8255,36 +8242,10 @@ function commitDeletionEffectsOnFiber( case 11: case 14: case 15: - if ( - !offscreenSubtreeWasHidden && - ((prevHostParent = deletedFiber.updateQueue), - null !== prevHostParent && - ((prevHostParent = prevHostParent.lastEffect), - null !== prevHostParent)) - ) { - prevHostParentIsContainer = prevHostParent = prevHostParent.next; - do { - prevHostParentIsContainer$124 = prevHostParentIsContainer.tag; - var inst = prevHostParentIsContainer.inst, - destroy = inst.destroy; - void 0 !== destroy && - (0 !== (prevHostParentIsContainer$124 & 2) - ? ((inst.destroy = void 0), - safelyCallDestroy( - deletedFiber, - nearestMountedAncestor, - destroy - )) - : 0 !== (prevHostParentIsContainer$124 & 4) && - ((inst.destroy = void 0), - safelyCallDestroy( - deletedFiber, - nearestMountedAncestor, - destroy - ))); - prevHostParentIsContainer = prevHostParentIsContainer.next; - } while (prevHostParentIsContainer !== prevHostParent); - } + offscreenSubtreeWasHidden || + commitHookEffectListUnmount(2, deletedFiber, nearestMountedAncestor); + offscreenSubtreeWasHidden || + commitHookEffectListUnmount(4, deletedFiber, nearestMountedAncestor); recursivelyTraverseDeletionEffects( finishedRoot, nearestMountedAncestor, @@ -8694,6 +8655,10 @@ function commitMutationEffectsOnFiber(finishedWork, root) { commitReconciliationEffects(finishedWork); currentHoistableRoot = flags; break; + case 12: + recursivelyTraverseMutationEffects(root, finishedWork); + commitReconciliationEffects(finishedWork); + break; case 13: recursivelyTraverseMutationEffects(root, finishedWork); commitReconciliationEffects(finishedWork); @@ -9007,23 +8972,6 @@ function recursivelyTraverseReappearLayoutEffects( finishedWork, includeWorkInProgressEffects ); - if (includeWorkInProgressEffects && flags & 4) - a: for ( - flags = finishedWork.stateNode.effectDuration, - finishedWork = finishedWork.return; - null !== finishedWork; - - ) { - switch (finishedWork.tag) { - case 3: - finishedWork.stateNode.effectDuration += flags; - break a; - case 12: - finishedWork.stateNode.effectDuration += flags; - break a; - } - finishedWork = finishedWork.return; - } break; case 13: recursivelyTraverseReappearLayoutEffects( @@ -9128,19 +9076,42 @@ function commitPassiveMountOnFiber( null != finishedRoot && releaseCache(finishedRoot))); break; case 12: - recursivelyTraversePassiveMountEffects( - finishedRoot, - finishedWork, - committedLanes, - committedTransitions - ); + if (flags & 2048) { + recursivelyTraversePassiveMountEffects( + finishedRoot, + finishedWork, + committedLanes, + committedTransitions + ); + finishedRoot = finishedWork.stateNode; + try { + var _finishedWork$memoize2 = finishedWork.memoizedProps, + id = _finishedWork$memoize2.id, + onPostCommit = _finishedWork$memoize2.onPostCommit; + "function" === typeof onPostCommit && + onPostCommit( + id, + null === finishedWork.alternate ? "mount" : "update", + finishedRoot.passiveEffectDuration, + -0 + ); + } catch (error) { + captureCommitPhaseError(finishedWork, finishedWork.return, error); + } + } else + recursivelyTraversePassiveMountEffects( + finishedRoot, + finishedWork, + committedLanes, + committedTransitions + ); break; case 23: break; case 22: - var instance = finishedWork.stateNode; + _finishedWork$memoize2 = finishedWork.stateNode; null !== finishedWork.memoizedState - ? instance._visibility & 4 + ? _finishedWork$memoize2._visibility & 4 ? recursivelyTraversePassiveMountEffects( finishedRoot, finishedWork, @@ -9148,14 +9119,14 @@ function commitPassiveMountOnFiber( committedTransitions ) : recursivelyTraverseAtomicPassiveEffects(finishedRoot, finishedWork) - : instance._visibility & 4 + : _finishedWork$memoize2._visibility & 4 ? recursivelyTraversePassiveMountEffects( finishedRoot, finishedWork, committedLanes, committedTransitions ) - : ((instance._visibility |= 4), + : ((_finishedWork$memoize2._visibility |= 4), recursivelyTraverseReconnectPassiveEffects( finishedRoot, finishedWork, @@ -9387,6 +9358,12 @@ function commitPassiveUnmountOnFiber(finishedWork) { finishedWork.flags & 2048 && commitHookEffectListUnmount(9, finishedWork, finishedWork.return); break; + case 3: + recursivelyTraversePassiveUnmountEffects(finishedWork); + break; + case 12: + recursivelyTraversePassiveUnmountEffects(finishedWork); + break; case 22: var instance = finishedWork.stateNode; null !== finishedWork.memoizedState && @@ -9763,14 +9740,14 @@ function cutOffTailIfNeeded(renderState, hasRenderedATailFallback) { break; case "collapsed": lastTailNode = renderState.tail; - for (var lastTailNode$137 = null; null !== lastTailNode; ) - null !== lastTailNode.alternate && (lastTailNode$137 = lastTailNode), + for (var lastTailNode$135 = null; null !== lastTailNode; ) + null !== lastTailNode.alternate && (lastTailNode$135 = lastTailNode), (lastTailNode = lastTailNode.sibling); - null === lastTailNode$137 + null === lastTailNode$135 ? hasRenderedATailFallback || null === renderState.tail ? (renderState.tail = null) : (renderState.tail.sibling = null) - : (lastTailNode$137.sibling = null); + : (lastTailNode$135.sibling = null); } } function bubbleProperties(completedWork) { @@ -9780,19 +9757,19 @@ function bubbleProperties(completedWork) { newChildLanes = 0, subtreeFlags = 0; if (didBailout) - for (var child$138 = completedWork.child; null !== child$138; ) - (newChildLanes |= child$138.lanes | child$138.childLanes), - (subtreeFlags |= child$138.subtreeFlags & 31457280), - (subtreeFlags |= child$138.flags & 31457280), - (child$138.return = completedWork), - (child$138 = child$138.sibling); + for (var child$136 = completedWork.child; null !== child$136; ) + (newChildLanes |= child$136.lanes | child$136.childLanes), + (subtreeFlags |= child$136.subtreeFlags & 31457280), + (subtreeFlags |= child$136.flags & 31457280), + (child$136.return = completedWork), + (child$136 = child$136.sibling); else - for (child$138 = completedWork.child; null !== child$138; ) - (newChildLanes |= child$138.lanes | child$138.childLanes), - (subtreeFlags |= child$138.subtreeFlags), - (subtreeFlags |= child$138.flags), - (child$138.return = completedWork), - (child$138 = child$138.sibling); + for (child$136 = completedWork.child; null !== child$136; ) + (newChildLanes |= child$136.lanes | child$136.childLanes), + (subtreeFlags |= child$136.subtreeFlags), + (subtreeFlags |= child$136.flags), + (child$136.return = completedWork), + (child$136 = child$136.sibling); completedWork.subtreeFlags |= subtreeFlags; completedWork.childLanes = newChildLanes; return didBailout; @@ -10069,11 +10046,11 @@ function completeWork(current, workInProgress, renderLanes) { null !== newProps.alternate.memoizedState && null !== newProps.alternate.memoizedState.cachePool && (type = newProps.alternate.memoizedState.cachePool.pool); - var cache$150 = null; + var cache$148 = null; null !== newProps.memoizedState && null !== newProps.memoizedState.cachePool && - (cache$150 = newProps.memoizedState.cachePool.pool); - cache$150 !== type && (newProps.flags |= 2048); + (cache$148 = newProps.memoizedState.cachePool.pool); + cache$148 !== type && (newProps.flags |= 2048); } renderLanes !== current && renderLanes && @@ -10098,8 +10075,8 @@ function completeWork(current, workInProgress, renderLanes) { type = workInProgress.memoizedState; if (null === type) return bubbleProperties(workInProgress), null; newProps = 0 !== (workInProgress.flags & 128); - cache$150 = type.rendering; - if (null === cache$150) + cache$148 = type.rendering; + if (null === cache$148) if (newProps) cutOffTailIfNeeded(type, !1); else { if ( @@ -10107,11 +10084,11 @@ function completeWork(current, workInProgress, renderLanes) { (null !== current && 0 !== (current.flags & 128)) ) for (current = workInProgress.child; null !== current; ) { - cache$150 = findFirstSuspended(current); - if (null !== cache$150) { + cache$148 = findFirstSuspended(current); + if (null !== cache$148) { workInProgress.flags |= 128; cutOffTailIfNeeded(type, !1); - current = cache$150.updateQueue; + current = cache$148.updateQueue; workInProgress.updateQueue = current; scheduleRetryEffect(workInProgress, current); workInProgress.subtreeFlags = 0; @@ -10136,7 +10113,7 @@ function completeWork(current, workInProgress, renderLanes) { } else { if (!newProps) - if (((current = findFirstSuspended(cache$150)), null !== current)) { + if (((current = findFirstSuspended(cache$148)), null !== current)) { if ( ((workInProgress.flags |= 128), (newProps = !0), @@ -10146,7 +10123,7 @@ function completeWork(current, workInProgress, renderLanes) { cutOffTailIfNeeded(type, !0), null === type.tail && "hidden" === type.tailMode && - !cache$150.alternate && + !cache$148.alternate && !isHydrating) ) return bubbleProperties(workInProgress), null; @@ -10159,13 +10136,13 @@ function completeWork(current, workInProgress, renderLanes) { cutOffTailIfNeeded(type, !1), (workInProgress.lanes = 4194304)); type.isBackwards - ? ((cache$150.sibling = workInProgress.child), - (workInProgress.child = cache$150)) + ? ((cache$148.sibling = workInProgress.child), + (workInProgress.child = cache$148)) : ((current = type.last), null !== current - ? (current.sibling = cache$150) - : (workInProgress.child = cache$150), - (type.last = cache$150)); + ? (current.sibling = cache$148) + : (workInProgress.child = cache$148), + (type.last = cache$148)); } if (null !== type.tail) return ( @@ -10913,8 +10890,8 @@ function renderRootSync(root, lanes) { } workLoopSync(); break; - } catch (thrownValue$165) { - handleThrow(root, thrownValue$165); + } catch (thrownValue$163) { + handleThrow(root, thrownValue$163); } while (1); lanes && root.shellSuspendCounter++; @@ -11023,8 +11000,8 @@ function renderRootConcurrent(root, lanes) { } workLoopConcurrent(); break; - } catch (thrownValue$167) { - handleThrow(root, thrownValue$167); + } catch (thrownValue$165) { + handleThrow(root, thrownValue$165); } while (1); resetContextDependencies(); @@ -11307,7 +11284,7 @@ function releaseRootPooledCache(root, remainingLanes) { } function flushPassiveEffects() { if (null !== rootWithPendingPassiveEffects) { - var root$171 = rootWithPendingPassiveEffects, + var root$169 = rootWithPendingPassiveEffects, remainingLanes = pendingPassiveEffectsRemainingLanes; pendingPassiveEffectsRemainingLanes = 0; var renderPriority = lanesToEventPriority(pendingPassiveEffectsLanes), @@ -11346,7 +11323,7 @@ function flushPassiveEffects() { } finally { (ReactDOMSharedInternals.p = previousPriority), (ReactSharedInternals.T = prevTransition), - releaseRootPooledCache(root$171, remainingLanes); + releaseRootPooledCache(root$169, remainingLanes); } } return !1; @@ -11505,14 +11482,14 @@ function flushSyncWorkAcrossRoots_impl(syncTransitionLanes, onlyLegacy) { isFlushingWork = !0; do { var didPerformSomeWork = !1; - for (var root$173 = firstScheduledRoot; null !== root$173; ) { + for (var root$171 = firstScheduledRoot; null !== root$171; ) { if (!onlyLegacy) if (0 !== syncTransitionLanes) { - var pendingLanes = root$173.pendingLanes; + var pendingLanes = root$171.pendingLanes; if (0 === pendingLanes) var JSCompiler_inline_result = 0; else { - var suspendedLanes = root$173.suspendedLanes, - pingedLanes = root$173.pingedLanes; + var suspendedLanes = root$171.suspendedLanes, + pingedLanes = root$171.pingedLanes; JSCompiler_inline_result = (1 << (31 - clz32(42 | syncTransitionLanes) + 1)) - 1; JSCompiler_inline_result &= @@ -11526,17 +11503,17 @@ function flushSyncWorkAcrossRoots_impl(syncTransitionLanes, onlyLegacy) { } 0 !== JSCompiler_inline_result && ((didPerformSomeWork = !0), - performSyncWorkOnRoot(root$173, JSCompiler_inline_result)); + performSyncWorkOnRoot(root$171, JSCompiler_inline_result)); } else (JSCompiler_inline_result = workInProgressRootRenderLanes), (JSCompiler_inline_result = getNextLanes( - root$173, - root$173 === workInProgressRoot ? JSCompiler_inline_result : 0 + root$171, + root$171 === workInProgressRoot ? JSCompiler_inline_result : 0 )), 0 !== (JSCompiler_inline_result & 3) && ((didPerformSomeWork = !0), - performSyncWorkOnRoot(root$173, JSCompiler_inline_result)); - root$173 = root$173.next; + performSyncWorkOnRoot(root$171, JSCompiler_inline_result)); + root$171 = root$171.next; } } while (didPerformSomeWork); isFlushingWork = !1; @@ -11746,20 +11723,20 @@ function extractEvents$1( } } for ( - var i$jscomp$inline_1401 = 0; - i$jscomp$inline_1401 < simpleEventPluginEvents.length; - i$jscomp$inline_1401++ + var i$jscomp$inline_1405 = 0; + i$jscomp$inline_1405 < simpleEventPluginEvents.length; + i$jscomp$inline_1405++ ) { - var eventName$jscomp$inline_1402 = - simpleEventPluginEvents[i$jscomp$inline_1401], - domEventName$jscomp$inline_1403 = - eventName$jscomp$inline_1402.toLowerCase(), - capitalizedEvent$jscomp$inline_1404 = - eventName$jscomp$inline_1402[0].toUpperCase() + - eventName$jscomp$inline_1402.slice(1); + var eventName$jscomp$inline_1406 = + simpleEventPluginEvents[i$jscomp$inline_1405], + domEventName$jscomp$inline_1407 = + eventName$jscomp$inline_1406.toLowerCase(), + capitalizedEvent$jscomp$inline_1408 = + eventName$jscomp$inline_1406[0].toUpperCase() + + eventName$jscomp$inline_1406.slice(1); registerSimpleEvent( - domEventName$jscomp$inline_1403, - "on" + capitalizedEvent$jscomp$inline_1404 + domEventName$jscomp$inline_1407, + "on" + capitalizedEvent$jscomp$inline_1408 ); } registerSimpleEvent(ANIMATION_END, "onAnimationEnd"); @@ -12942,34 +12919,34 @@ function setInitialProperties(domElement, tag, props) { defaultChecked = null; for (hasSrc in props) if (props.hasOwnProperty(hasSrc)) { - var propValue$187 = props[hasSrc]; - if (null != propValue$187) + var propValue$185 = props[hasSrc]; + if (null != propValue$185) switch (hasSrc) { case "name": - hasSrcSet = propValue$187; + hasSrcSet = propValue$185; break; case "type": - propValue = propValue$187; + propValue = propValue$185; break; case "checked": - checked = propValue$187; + checked = propValue$185; break; case "defaultChecked": - defaultChecked = propValue$187; + defaultChecked = propValue$185; break; case "value": - propKey = propValue$187; + propKey = propValue$185; break; case "defaultValue": - defaultValue = propValue$187; + defaultValue = propValue$185; break; case "children": case "dangerouslySetInnerHTML": - if (null != propValue$187) + if (null != propValue$185) throw Error(formatProdErrorMessage(137, tag)); break; default: - setProp(domElement, tag, hasSrc, propValue$187, props, null); + setProp(domElement, tag, hasSrc, propValue$185, props, null); } } initInput( @@ -13106,14 +13083,14 @@ function setInitialProperties(domElement, tag, props) { return; default: if (isCustomElement(tag)) { - for (propValue$187 in props) - props.hasOwnProperty(propValue$187) && - ((hasSrc = props[propValue$187]), + for (propValue$185 in props) + props.hasOwnProperty(propValue$185) && + ((hasSrc = props[propValue$185]), void 0 !== hasSrc && setPropOnCustomElement( domElement, tag, - propValue$187, + propValue$185, hasSrc, props, void 0 @@ -13161,14 +13138,14 @@ function updateProperties(domElement, tag, lastProps, nextProps) { setProp(domElement, tag, propKey, null, nextProps, lastProp); } } - for (var propKey$204 in nextProps) { - var propKey = nextProps[propKey$204]; - lastProp = lastProps[propKey$204]; + for (var propKey$202 in nextProps) { + var propKey = nextProps[propKey$202]; + lastProp = lastProps[propKey$202]; if ( - nextProps.hasOwnProperty(propKey$204) && + nextProps.hasOwnProperty(propKey$202) && (null != propKey || null != lastProp) ) - switch (propKey$204) { + switch (propKey$202) { case "type": type = propKey; break; @@ -13197,7 +13174,7 @@ function updateProperties(domElement, tag, lastProps, nextProps) { setProp( domElement, tag, - propKey$204, + propKey$202, propKey, nextProps, lastProp @@ -13216,7 +13193,7 @@ function updateProperties(domElement, tag, lastProps, nextProps) { ); return; case "select": - propKey = value = defaultValue = propKey$204 = null; + propKey = value = defaultValue = propKey$202 = null; for (type in lastProps) if ( ((lastDefaultValue = lastProps[type]), @@ -13247,7 +13224,7 @@ function updateProperties(domElement, tag, lastProps, nextProps) { ) switch (name) { case "value": - propKey$204 = type; + propKey$202 = type; break; case "defaultValue": defaultValue = type; @@ -13268,15 +13245,15 @@ function updateProperties(domElement, tag, lastProps, nextProps) { tag = defaultValue; lastProps = value; nextProps = propKey; - null != propKey$204 - ? updateOptions(domElement, !!lastProps, propKey$204, !1) + null != propKey$202 + ? updateOptions(domElement, !!lastProps, propKey$202, !1) : !!nextProps !== !!lastProps && (null != tag ? updateOptions(domElement, !!lastProps, tag, !0) : updateOptions(domElement, !!lastProps, lastProps ? [] : "", !1)); return; case "textarea": - propKey = propKey$204 = null; + propKey = propKey$202 = null; for (defaultValue in lastProps) if ( ((name = lastProps[defaultValue]), @@ -13300,7 +13277,7 @@ function updateProperties(domElement, tag, lastProps, nextProps) { ) switch (value) { case "value": - propKey$204 = name; + propKey$202 = name; break; case "defaultValue": propKey = name; @@ -13314,17 +13291,17 @@ function updateProperties(domElement, tag, lastProps, nextProps) { name !== type && setProp(domElement, tag, value, name, nextProps, type); } - updateTextarea(domElement, propKey$204, propKey); + updateTextarea(domElement, propKey$202, propKey); return; case "option": - for (var propKey$220 in lastProps) + for (var propKey$218 in lastProps) if ( - ((propKey$204 = lastProps[propKey$220]), - lastProps.hasOwnProperty(propKey$220) && - null != propKey$204 && - !nextProps.hasOwnProperty(propKey$220)) + ((propKey$202 = lastProps[propKey$218]), + lastProps.hasOwnProperty(propKey$218) && + null != propKey$202 && + !nextProps.hasOwnProperty(propKey$218)) ) - switch (propKey$220) { + switch (propKey$218) { case "selected": domElement.selected = !1; break; @@ -13332,33 +13309,33 @@ function updateProperties(domElement, tag, lastProps, nextProps) { setProp( domElement, tag, - propKey$220, + propKey$218, null, nextProps, - propKey$204 + propKey$202 ); } for (lastDefaultValue in nextProps) if ( - ((propKey$204 = nextProps[lastDefaultValue]), + ((propKey$202 = nextProps[lastDefaultValue]), (propKey = lastProps[lastDefaultValue]), nextProps.hasOwnProperty(lastDefaultValue) && - propKey$204 !== propKey && - (null != propKey$204 || null != propKey)) + propKey$202 !== propKey && + (null != propKey$202 || null != propKey)) ) switch (lastDefaultValue) { case "selected": domElement.selected = - propKey$204 && - "function" !== typeof propKey$204 && - "symbol" !== typeof propKey$204; + propKey$202 && + "function" !== typeof propKey$202 && + "symbol" !== typeof propKey$202; break; default: setProp( domElement, tag, lastDefaultValue, - propKey$204, + propKey$202, nextProps, propKey ); @@ -13379,24 +13356,24 @@ function updateProperties(domElement, tag, lastProps, nextProps) { case "track": case "wbr": case "menuitem": - for (var propKey$225 in lastProps) - (propKey$204 = lastProps[propKey$225]), - lastProps.hasOwnProperty(propKey$225) && - null != propKey$204 && - !nextProps.hasOwnProperty(propKey$225) && - setProp(domElement, tag, propKey$225, null, nextProps, propKey$204); + for (var propKey$223 in lastProps) + (propKey$202 = lastProps[propKey$223]), + lastProps.hasOwnProperty(propKey$223) && + null != propKey$202 && + !nextProps.hasOwnProperty(propKey$223) && + setProp(domElement, tag, propKey$223, null, nextProps, propKey$202); for (checked in nextProps) if ( - ((propKey$204 = nextProps[checked]), + ((propKey$202 = nextProps[checked]), (propKey = lastProps[checked]), nextProps.hasOwnProperty(checked) && - propKey$204 !== propKey && - (null != propKey$204 || null != propKey)) + propKey$202 !== propKey && + (null != propKey$202 || null != propKey)) ) switch (checked) { case "children": case "dangerouslySetInnerHTML": - if (null != propKey$204) + if (null != propKey$202) throw Error(formatProdErrorMessage(137, tag)); break; default: @@ -13404,7 +13381,7 @@ function updateProperties(domElement, tag, lastProps, nextProps) { domElement, tag, checked, - propKey$204, + propKey$202, nextProps, propKey ); @@ -13412,49 +13389,49 @@ function updateProperties(domElement, tag, lastProps, nextProps) { return; default: if (isCustomElement(tag)) { - for (var propKey$230 in lastProps) - (propKey$204 = lastProps[propKey$230]), - lastProps.hasOwnProperty(propKey$230) && - void 0 !== propKey$204 && - !nextProps.hasOwnProperty(propKey$230) && + for (var propKey$228 in lastProps) + (propKey$202 = lastProps[propKey$228]), + lastProps.hasOwnProperty(propKey$228) && + void 0 !== propKey$202 && + !nextProps.hasOwnProperty(propKey$228) && setPropOnCustomElement( domElement, tag, - propKey$230, + propKey$228, void 0, nextProps, - propKey$204 + propKey$202 ); for (defaultChecked in nextProps) - (propKey$204 = nextProps[defaultChecked]), + (propKey$202 = nextProps[defaultChecked]), (propKey = lastProps[defaultChecked]), !nextProps.hasOwnProperty(defaultChecked) || - propKey$204 === propKey || - (void 0 === propKey$204 && void 0 === propKey) || + propKey$202 === propKey || + (void 0 === propKey$202 && void 0 === propKey) || setPropOnCustomElement( domElement, tag, defaultChecked, - propKey$204, + propKey$202, nextProps, propKey ); return; } } - for (var propKey$235 in lastProps) - (propKey$204 = lastProps[propKey$235]), - lastProps.hasOwnProperty(propKey$235) && - null != propKey$204 && - !nextProps.hasOwnProperty(propKey$235) && - setProp(domElement, tag, propKey$235, null, nextProps, propKey$204); + for (var propKey$233 in lastProps) + (propKey$202 = lastProps[propKey$233]), + lastProps.hasOwnProperty(propKey$233) && + null != propKey$202 && + !nextProps.hasOwnProperty(propKey$233) && + setProp(domElement, tag, propKey$233, null, nextProps, propKey$202); for (lastProp in nextProps) - (propKey$204 = nextProps[lastProp]), + (propKey$202 = nextProps[lastProp]), (propKey = lastProps[lastProp]), !nextProps.hasOwnProperty(lastProp) || - propKey$204 === propKey || - (null == propKey$204 && null == propKey) || - setProp(domElement, tag, lastProp, propKey$204, nextProps, propKey); + propKey$202 === propKey || + (null == propKey$202 && null == propKey) || + setProp(domElement, tag, lastProp, propKey$202, nextProps, propKey); } var eventsEnabled = null, selectionInformation = null; @@ -13999,26 +13976,26 @@ function getResource(type, currentProps, pendingProps, currentResource) { "string" === typeof pendingProps.precedence ) { type = getStyleKey(pendingProps.href); - var styles$243 = getResourcesFromRoot( + var styles$241 = getResourcesFromRoot( JSCompiler_inline_result ).hoistableStyles, - resource$244 = styles$243.get(type); - resource$244 || + resource$242 = styles$241.get(type); + resource$242 || ((JSCompiler_inline_result = JSCompiler_inline_result.ownerDocument || JSCompiler_inline_result), - (resource$244 = { + (resource$242 = { type: "stylesheet", instance: null, count: 0, state: { loading: 0, preload: null } }), - styles$243.set(type, resource$244), - (styles$243 = JSCompiler_inline_result.querySelector( + styles$241.set(type, resource$242), + (styles$241 = JSCompiler_inline_result.querySelector( getStylesheetSelectorFromKey(type) )) && - !styles$243._p && - ((resource$244.instance = styles$243), - (resource$244.state.loading = 5)), + !styles$241._p && + ((resource$242.instance = styles$241), + (resource$242.state.loading = 5)), preloadPropsMap.has(type) || ((pendingProps = { rel: "preload", @@ -14031,16 +14008,16 @@ function getResource(type, currentProps, pendingProps, currentResource) { referrerPolicy: pendingProps.referrerPolicy }), preloadPropsMap.set(type, pendingProps), - styles$243 || + styles$241 || preloadStylesheet( JSCompiler_inline_result, type, pendingProps, - resource$244.state + resource$242.state ))); if (currentProps && null === currentResource) throw Error(formatProdErrorMessage(528, "")); - return resource$244; + return resource$242; } if (currentProps && null !== currentResource) throw Error(formatProdErrorMessage(529, "")); @@ -14137,37 +14114,37 @@ function acquireResource(hoistableRoot, resource, props) { return (resource.instance = instance); case "stylesheet": styleProps = getStyleKey(props.href); - var instance$249 = hoistableRoot.querySelector( + var instance$247 = hoistableRoot.querySelector( getStylesheetSelectorFromKey(styleProps) ); - if (instance$249) + if (instance$247) return ( (resource.state.loading |= 4), - (resource.instance = instance$249), - markNodeAsHoistable(instance$249), - instance$249 + (resource.instance = instance$247), + markNodeAsHoistable(instance$247), + instance$247 ); instance = stylesheetPropsFromRawProps(props); (styleProps = preloadPropsMap.get(styleProps)) && adoptPreloadPropsForStylesheet(instance, styleProps); - instance$249 = ( + instance$247 = ( hoistableRoot.ownerDocument || hoistableRoot ).createElement("link"); - markNodeAsHoistable(instance$249); - var linkInstance = instance$249; + markNodeAsHoistable(instance$247); + var linkInstance = instance$247; linkInstance._p = new Promise(function (resolve, reject) { linkInstance.onload = resolve; linkInstance.onerror = reject; }); - setInitialProperties(instance$249, "link", instance); + setInitialProperties(instance$247, "link", instance); resource.state.loading |= 4; - insertStylesheet(instance$249, props.precedence, hoistableRoot); - return (resource.instance = instance$249); + insertStylesheet(instance$247, props.precedence, hoistableRoot); + return (resource.instance = instance$247); case "script": - instance$249 = getScriptKey(props.src); + instance$247 = getScriptKey(props.src); if ( (styleProps = hoistableRoot.querySelector( - getScriptSelectorFromKey(instance$249) + getScriptSelectorFromKey(instance$247) )) ) return ( @@ -14176,7 +14153,7 @@ function acquireResource(hoistableRoot, resource, props) { styleProps ); instance = props; - if ((styleProps = preloadPropsMap.get(instance$249))) + if ((styleProps = preloadPropsMap.get(instance$247))) (instance = assign({}, props)), adoptPreloadPropsForScript(instance, styleProps); hoistableRoot = hoistableRoot.ownerDocument || hoistableRoot; @@ -15200,16 +15177,16 @@ ReactDOMHydrationRoot.prototype.unstable_scheduleHydration = function (target) { 0 === i && attemptExplicitHydrationTarget(target); } }; -var isomorphicReactPackageVersion$jscomp$inline_1648 = React.version; +var isomorphicReactPackageVersion$jscomp$inline_1652 = React.version; if ( - "19.0.0-experimental-a99d8e8d-20240916" !== - isomorphicReactPackageVersion$jscomp$inline_1648 + "19.0.0-experimental-5dcb0097-20240918" !== + isomorphicReactPackageVersion$jscomp$inline_1652 ) throw Error( formatProdErrorMessage( 527, - isomorphicReactPackageVersion$jscomp$inline_1648, - "19.0.0-experimental-a99d8e8d-20240916" + isomorphicReactPackageVersion$jscomp$inline_1652, + "19.0.0-experimental-5dcb0097-20240918" ) ); ReactDOMSharedInternals.findDOMNode = function (componentOrElement) { @@ -15229,25 +15206,25 @@ ReactDOMSharedInternals.findDOMNode = function (componentOrElement) { null === componentOrElement ? null : componentOrElement.stateNode; return componentOrElement; }; -var internals$jscomp$inline_2087 = { +var internals$jscomp$inline_2112 = { bundleType: 0, - version: "19.0.0-experimental-a99d8e8d-20240916", + version: "19.0.0-experimental-5dcb0097-20240918", rendererPackageName: "react-dom", currentDispatcherRef: ReactSharedInternals, findFiberByHostInstance: getClosestInstanceFromNode, - reconcilerVersion: "19.0.0-experimental-a99d8e8d-20240916" + reconcilerVersion: "19.0.0-experimental-5dcb0097-20240918" }; if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) { - var hook$jscomp$inline_2088 = __REACT_DEVTOOLS_GLOBAL_HOOK__; + var hook$jscomp$inline_2113 = __REACT_DEVTOOLS_GLOBAL_HOOK__; if ( - !hook$jscomp$inline_2088.isDisabled && - hook$jscomp$inline_2088.supportsFiber + !hook$jscomp$inline_2113.isDisabled && + hook$jscomp$inline_2113.supportsFiber ) try { - (rendererID = hook$jscomp$inline_2088.inject( - internals$jscomp$inline_2087 + (rendererID = hook$jscomp$inline_2113.inject( + internals$jscomp$inline_2112 )), - (injectedHook = hook$jscomp$inline_2088); + (injectedHook = hook$jscomp$inline_2113); } catch (err) {} } exports.createRoot = function (container, options) { @@ -15339,4 +15316,4 @@ exports.hydrateRoot = function (container, initialChildren, options) { listenToAllSupportedEvents(container); return new ReactDOMHydrationRoot(initialChildren); }; -exports.version = "19.0.0-experimental-a99d8e8d-20240916"; +exports.version = "19.0.0-experimental-5dcb0097-20240918"; diff --git a/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-profiling.development.js b/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-profiling.development.js index cacf463374a2b..b9a72c6b5f94c 100644 --- a/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-profiling.development.js +++ b/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-profiling.development.js @@ -3573,43 +3573,41 @@ : !1; } function getActiveElementDeep(containerInfo) { - var $jscomp$optchain$tmpm1878761388$1, $jscomp$nullish$tmp0; + var $jscomp$optchain$tmpm820836342$1, $jscomp$nullish$tmp0; containerInfo = null != ($jscomp$nullish$tmp0 = null == containerInfo ? void 0 : null == - ($jscomp$optchain$tmpm1878761388$1 = - containerInfo.ownerDocument) + ($jscomp$optchain$tmpm820836342$1 = containerInfo.ownerDocument) ? void 0 - : $jscomp$optchain$tmpm1878761388$1.defaultView) + : $jscomp$optchain$tmpm820836342$1.defaultView) ? $jscomp$nullish$tmp0 : window; for ( - $jscomp$optchain$tmpm1878761388$1 = getActiveElement( + $jscomp$optchain$tmpm820836342$1 = getActiveElement( containerInfo.document ); - $jscomp$optchain$tmpm1878761388$1 instanceof + $jscomp$optchain$tmpm820836342$1 instanceof containerInfo.HTMLIFrameElement; ) { try { var JSCompiler_inline_result = "string" === - typeof $jscomp$optchain$tmpm1878761388$1.contentWindow.location - .href; + typeof $jscomp$optchain$tmpm820836342$1.contentWindow.location.href; } catch (err) { JSCompiler_inline_result = !1; } if (JSCompiler_inline_result) - containerInfo = $jscomp$optchain$tmpm1878761388$1.contentWindow; + containerInfo = $jscomp$optchain$tmpm820836342$1.contentWindow; else break; - $jscomp$optchain$tmpm1878761388$1 = getActiveElement( + $jscomp$optchain$tmpm820836342$1 = getActiveElement( containerInfo.document ); } - return $jscomp$optchain$tmpm1878761388$1; + return $jscomp$optchain$tmpm820836342$1; } function hasSelectionCapabilities(elem) { var nodeName = elem && elem.nodeName && elem.nodeName.toLowerCase(); @@ -3985,6 +3983,36 @@ staleFamilies ); } + function pushNestedEffectDurations() { + var prevEffectDuration = profilerEffectDuration; + profilerEffectDuration = 0; + return prevEffectDuration; + } + function popNestedEffectDurations(prevEffectDuration) { + var elapsedTime = profilerEffectDuration; + profilerEffectDuration = prevEffectDuration; + return elapsedTime; + } + function bubbleNestedEffectDurations(prevEffectDuration) { + var elapsedTime = profilerEffectDuration; + profilerEffectDuration += prevEffectDuration; + return elapsedTime; + } + function resetComponentEffectTimers() { + componentEffectEndTime = componentEffectStartTime = -1.1; + } + function pushComponentEffectStart() { + var prevEffectStart = componentEffectStartTime; + componentEffectStartTime = -1.1; + componentEffectDuration = -0; + return prevEffectStart; + } + function popComponentEffectStart(prevEffectStart) { + componentEffectStartTime = + 0 > prevEffectStart + ? componentEffectStartTime - 0.001 + : prevEffectStart; + } function startProfilerTimer(fiber) { profilerStartTime = now(); 0 > fiber.actualStartTime && (fiber.actualStartTime = profilerStartTime); @@ -4004,49 +4032,41 @@ profilerStartTime = -1; } } - function recordLayoutEffectDuration(fiber) { - if (0 <= layoutEffectStartTime) { - var elapsedTime = now() - layoutEffectStartTime; - layoutEffectStartTime = -1; - for (fiber = fiber.return; null !== fiber; ) { - switch (fiber.tag) { - case 3: - fiber.stateNode.effectDuration += elapsedTime; - return; - case 12: - fiber.stateNode.effectDuration += elapsedTime; - return; - } - fiber = fiber.return; - } - } - } - function recordPassiveEffectDuration(fiber) { - if (0 <= passiveEffectStartTime) { - var elapsedTime = now() - passiveEffectStartTime; - passiveEffectStartTime = -1; - for (fiber = fiber.return; null !== fiber; ) { - switch (fiber.tag) { - case 3: - fiber = fiber.stateNode; - null !== fiber && (fiber.passiveEffectDuration += elapsedTime); - return; - case 12: - fiber = fiber.stateNode; - null !== fiber && (fiber.passiveEffectDuration += elapsedTime); - return; - } - fiber = fiber.return; - } + function recordEffectDuration() { + if (0 <= profilerStartTime) { + var endTime = now(), + elapsedTime = endTime - profilerStartTime; + profilerStartTime = -1; + profilerEffectDuration += elapsedTime; + componentEffectDuration += elapsedTime; + componentEffectEndTime = endTime; } } - function startLayoutEffectTimer() { - layoutEffectStartTime = now(); + function startEffectTimer() { + profilerStartTime = now(); + 0 > componentEffectStartTime && + (componentEffectStartTime = profilerStartTime); } function transferActualDuration(fiber) { for (var child = fiber.child; child; ) (fiber.actualDuration += child.actualDuration), (child = child.sibling); } + function logComponentEffect(fiber, startTime, endTime, selfTime) { + fiber = getComponentNameFromFiber(fiber); + null !== fiber && + supportsUserTiming && + ((reusableComponentDevToolDetails.color = + 1 > selfTime + ? "secondary-light" + : 100 > selfTime + ? "secondary" + : 500 > selfTime + ? "secondary-dark" + : "error"), + (reusableComponentOptions.start = startTime), + (reusableComponentOptions.end = endTime), + performance.measure(fiber, reusableComponentOptions)); + } function createCapturedValueAtFiber(value, source) { if ("object" === typeof value && null !== value) { var stack = CapturedStacks.get(value); @@ -8815,33 +8835,33 @@ return current; } function updateSuspenseComponent(current, workInProgress, renderLanes) { - var JSCompiler_object_inline_componentStack_2258; - var JSCompiler_object_inline_stack_2257 = workInProgress.pendingProps; + var JSCompiler_object_inline_componentStack_2244; + var JSCompiler_object_inline_stack_2243 = workInProgress.pendingProps; shouldSuspendImpl(workInProgress) && (workInProgress.flags |= 128); - var JSCompiler_object_inline_message_2255 = !1; + var JSCompiler_object_inline_message_2241 = !1; var didSuspend = 0 !== (workInProgress.flags & 128); - (JSCompiler_object_inline_componentStack_2258 = didSuspend) || - (JSCompiler_object_inline_componentStack_2258 = + (JSCompiler_object_inline_componentStack_2244 = didSuspend) || + (JSCompiler_object_inline_componentStack_2244 = null !== current && null === current.memoizedState ? !1 : 0 !== (suspenseStackCursor.current & ForceSuspenseFallback)); - JSCompiler_object_inline_componentStack_2258 && - ((JSCompiler_object_inline_message_2255 = !0), + JSCompiler_object_inline_componentStack_2244 && + ((JSCompiler_object_inline_message_2241 = !0), (workInProgress.flags &= -129)); - JSCompiler_object_inline_componentStack_2258 = + JSCompiler_object_inline_componentStack_2244 = 0 !== (workInProgress.flags & 32); workInProgress.flags &= -33; if (null === current) { if (isHydrating) { - JSCompiler_object_inline_message_2255 + JSCompiler_object_inline_message_2241 ? pushPrimaryTreeSuspenseHandler(workInProgress) : reuseSuspenseHandlerOnStack(workInProgress); if (isHydrating) { - var JSCompiler_object_inline_digest_2256 = nextHydratableInstance; + var JSCompiler_object_inline_digest_2242 = nextHydratableInstance; var JSCompiler_temp; - if (!(JSCompiler_temp = !JSCompiler_object_inline_digest_2256)) { + if (!(JSCompiler_temp = !JSCompiler_object_inline_digest_2242)) { c: { - var instance = JSCompiler_object_inline_digest_2256; + var instance = JSCompiler_object_inline_digest_2242; for ( JSCompiler_temp = rootOrSingletonContext; 8 !== instance.nodeType; @@ -8882,19 +8902,19 @@ JSCompiler_temp && (warnNonHydratedInstance( workInProgress, - JSCompiler_object_inline_digest_2256 + JSCompiler_object_inline_digest_2242 ), throwOnHydrationMismatch(workInProgress)); } - JSCompiler_object_inline_digest_2256 = workInProgress.memoizedState; + JSCompiler_object_inline_digest_2242 = workInProgress.memoizedState; if ( - null !== JSCompiler_object_inline_digest_2256 && - ((JSCompiler_object_inline_digest_2256 = - JSCompiler_object_inline_digest_2256.dehydrated), - null !== JSCompiler_object_inline_digest_2256) + null !== JSCompiler_object_inline_digest_2242 && + ((JSCompiler_object_inline_digest_2242 = + JSCompiler_object_inline_digest_2242.dehydrated), + null !== JSCompiler_object_inline_digest_2242) ) return ( - JSCompiler_object_inline_digest_2256.data === + JSCompiler_object_inline_digest_2242.data === SUSPENSE_FALLBACK_START_DATA ? (workInProgress.lanes = 16) : (workInProgress.lanes = 536870912), @@ -8902,68 +8922,68 @@ ); popSuspenseHandler(workInProgress); } - JSCompiler_object_inline_digest_2256 = - JSCompiler_object_inline_stack_2257.children; - JSCompiler_temp = JSCompiler_object_inline_stack_2257.fallback; - if (JSCompiler_object_inline_message_2255) + JSCompiler_object_inline_digest_2242 = + JSCompiler_object_inline_stack_2243.children; + JSCompiler_temp = JSCompiler_object_inline_stack_2243.fallback; + if (JSCompiler_object_inline_message_2241) return ( reuseSuspenseHandlerOnStack(workInProgress), - (JSCompiler_object_inline_stack_2257 = + (JSCompiler_object_inline_stack_2243 = mountSuspenseFallbackChildren( workInProgress, - JSCompiler_object_inline_digest_2256, + JSCompiler_object_inline_digest_2242, JSCompiler_temp, renderLanes )), - (JSCompiler_object_inline_message_2255 = workInProgress.child), - (JSCompiler_object_inline_message_2255.memoizedState = + (JSCompiler_object_inline_message_2241 = workInProgress.child), + (JSCompiler_object_inline_message_2241.memoizedState = mountSuspenseOffscreenState(renderLanes)), - (JSCompiler_object_inline_message_2255.childLanes = + (JSCompiler_object_inline_message_2241.childLanes = getRemainingWorkInPrimaryTree( current, - JSCompiler_object_inline_componentStack_2258, + JSCompiler_object_inline_componentStack_2244, renderLanes )), (workInProgress.memoizedState = SUSPENDED_MARKER), - JSCompiler_object_inline_stack_2257 + JSCompiler_object_inline_stack_2243 ); if ( "number" === - typeof JSCompiler_object_inline_stack_2257.unstable_expectedLoadTime + typeof JSCompiler_object_inline_stack_2243.unstable_expectedLoadTime ) return ( reuseSuspenseHandlerOnStack(workInProgress), - (JSCompiler_object_inline_stack_2257 = + (JSCompiler_object_inline_stack_2243 = mountSuspenseFallbackChildren( workInProgress, - JSCompiler_object_inline_digest_2256, + JSCompiler_object_inline_digest_2242, JSCompiler_temp, renderLanes )), - (JSCompiler_object_inline_message_2255 = workInProgress.child), - (JSCompiler_object_inline_message_2255.memoizedState = + (JSCompiler_object_inline_message_2241 = workInProgress.child), + (JSCompiler_object_inline_message_2241.memoizedState = mountSuspenseOffscreenState(renderLanes)), - (JSCompiler_object_inline_message_2255.childLanes = + (JSCompiler_object_inline_message_2241.childLanes = getRemainingWorkInPrimaryTree( current, - JSCompiler_object_inline_componentStack_2258, + JSCompiler_object_inline_componentStack_2244, renderLanes )), (workInProgress.memoizedState = SUSPENDED_MARKER), (workInProgress.lanes = 4194304), - JSCompiler_object_inline_stack_2257 + JSCompiler_object_inline_stack_2243 ); pushPrimaryTreeSuspenseHandler(workInProgress); return mountSuspensePrimaryChildren( workInProgress, - JSCompiler_object_inline_digest_2256 + JSCompiler_object_inline_digest_2242 ); } var prevState = current.memoizedState; if ( null !== prevState && - ((JSCompiler_object_inline_digest_2256 = prevState.dehydrated), - null !== JSCompiler_object_inline_digest_2256) + ((JSCompiler_object_inline_digest_2242 = prevState.dehydrated), + null !== JSCompiler_object_inline_digest_2242) ) { if (didSuspend) workInProgress.flags & 256 @@ -8980,94 +9000,94 @@ (workInProgress.flags |= 128), (workInProgress = null)) : (reuseSuspenseHandlerOnStack(workInProgress), - (JSCompiler_object_inline_message_2255 = - JSCompiler_object_inline_stack_2257.fallback), - (JSCompiler_object_inline_digest_2256 = workInProgress.mode), - (JSCompiler_object_inline_stack_2257 = + (JSCompiler_object_inline_message_2241 = + JSCompiler_object_inline_stack_2243.fallback), + (JSCompiler_object_inline_digest_2242 = workInProgress.mode), + (JSCompiler_object_inline_stack_2243 = mountWorkInProgressOffscreenFiber( { mode: "visible", - children: JSCompiler_object_inline_stack_2257.children + children: JSCompiler_object_inline_stack_2243.children }, - JSCompiler_object_inline_digest_2256 + JSCompiler_object_inline_digest_2242 )), - (JSCompiler_object_inline_message_2255 = + (JSCompiler_object_inline_message_2241 = createFiberFromFragment( - JSCompiler_object_inline_message_2255, - JSCompiler_object_inline_digest_2256, + JSCompiler_object_inline_message_2241, + JSCompiler_object_inline_digest_2242, renderLanes, null )), - (JSCompiler_object_inline_message_2255.flags |= 2), - (JSCompiler_object_inline_stack_2257.return = workInProgress), - (JSCompiler_object_inline_message_2255.return = workInProgress), - (JSCompiler_object_inline_stack_2257.sibling = - JSCompiler_object_inline_message_2255), - (workInProgress.child = JSCompiler_object_inline_stack_2257), + (JSCompiler_object_inline_message_2241.flags |= 2), + (JSCompiler_object_inline_stack_2243.return = workInProgress), + (JSCompiler_object_inline_message_2241.return = workInProgress), + (JSCompiler_object_inline_stack_2243.sibling = + JSCompiler_object_inline_message_2241), + (workInProgress.child = JSCompiler_object_inline_stack_2243), reconcileChildFibers( workInProgress, current.child, null, renderLanes ), - (JSCompiler_object_inline_stack_2257 = workInProgress.child), - (JSCompiler_object_inline_stack_2257.memoizedState = + (JSCompiler_object_inline_stack_2243 = workInProgress.child), + (JSCompiler_object_inline_stack_2243.memoizedState = mountSuspenseOffscreenState(renderLanes)), - (JSCompiler_object_inline_stack_2257.childLanes = + (JSCompiler_object_inline_stack_2243.childLanes = getRemainingWorkInPrimaryTree( current, - JSCompiler_object_inline_componentStack_2258, + JSCompiler_object_inline_componentStack_2244, renderLanes )), (workInProgress.memoizedState = SUSPENDED_MARKER), - (workInProgress = JSCompiler_object_inline_message_2255)); + (workInProgress = JSCompiler_object_inline_message_2241)); else if ( (pushPrimaryTreeSuspenseHandler(workInProgress), isHydrating && console.error( "We should not be hydrating here. This is a bug in React. Please file a bug." ), - JSCompiler_object_inline_digest_2256.data === + JSCompiler_object_inline_digest_2242.data === SUSPENSE_FALLBACK_START_DATA) ) { - JSCompiler_object_inline_componentStack_2258 = - JSCompiler_object_inline_digest_2256.nextSibling && - JSCompiler_object_inline_digest_2256.nextSibling.dataset; - if (JSCompiler_object_inline_componentStack_2258) { - JSCompiler_temp = JSCompiler_object_inline_componentStack_2258.dgst; - var message = JSCompiler_object_inline_componentStack_2258.msg; - instance = JSCompiler_object_inline_componentStack_2258.stck; + JSCompiler_object_inline_componentStack_2244 = + JSCompiler_object_inline_digest_2242.nextSibling && + JSCompiler_object_inline_digest_2242.nextSibling.dataset; + if (JSCompiler_object_inline_componentStack_2244) { + JSCompiler_temp = JSCompiler_object_inline_componentStack_2244.dgst; + var message = JSCompiler_object_inline_componentStack_2244.msg; + instance = JSCompiler_object_inline_componentStack_2244.stck; var componentStack = - JSCompiler_object_inline_componentStack_2258.cstck; + JSCompiler_object_inline_componentStack_2244.cstck; } - JSCompiler_object_inline_message_2255 = message; - JSCompiler_object_inline_digest_2256 = JSCompiler_temp; - JSCompiler_object_inline_stack_2257 = instance; - JSCompiler_object_inline_componentStack_2258 = componentStack; - "POSTPONE" !== JSCompiler_object_inline_digest_2256 && - ((JSCompiler_object_inline_message_2255 = - JSCompiler_object_inline_message_2255 - ? Error(JSCompiler_object_inline_message_2255) + JSCompiler_object_inline_message_2241 = message; + JSCompiler_object_inline_digest_2242 = JSCompiler_temp; + JSCompiler_object_inline_stack_2243 = instance; + JSCompiler_object_inline_componentStack_2244 = componentStack; + "POSTPONE" !== JSCompiler_object_inline_digest_2242 && + ((JSCompiler_object_inline_message_2241 = + JSCompiler_object_inline_message_2241 + ? Error(JSCompiler_object_inline_message_2241) : Error( "The server could not finish this Suspense boundary, likely due to an error during server rendering. Switched to client rendering." )), - (JSCompiler_object_inline_message_2255.stack = - JSCompiler_object_inline_stack_2257 || ""), - (JSCompiler_object_inline_message_2255.digest = - JSCompiler_object_inline_digest_2256), - (JSCompiler_object_inline_componentStack_2258 = - void 0 === JSCompiler_object_inline_componentStack_2258 + (JSCompiler_object_inline_message_2241.stack = + JSCompiler_object_inline_stack_2243 || ""), + (JSCompiler_object_inline_message_2241.digest = + JSCompiler_object_inline_digest_2242), + (JSCompiler_object_inline_componentStack_2244 = + void 0 === JSCompiler_object_inline_componentStack_2244 ? null - : JSCompiler_object_inline_componentStack_2258), - "string" === typeof JSCompiler_object_inline_componentStack_2258 && + : JSCompiler_object_inline_componentStack_2244), + "string" === typeof JSCompiler_object_inline_componentStack_2244 && CapturedStacks.set( - JSCompiler_object_inline_message_2255, - JSCompiler_object_inline_componentStack_2258 + JSCompiler_object_inline_message_2241, + JSCompiler_object_inline_componentStack_2244 ), queueHydrationError({ - value: JSCompiler_object_inline_message_2255, + value: JSCompiler_object_inline_message_2241, source: null, - stack: JSCompiler_object_inline_componentStack_2258 + stack: JSCompiler_object_inline_componentStack_2244 })); workInProgress = retrySuspenseComponentWithoutHydrating( current, @@ -9082,25 +9102,25 @@ renderLanes, !1 ), - (JSCompiler_object_inline_componentStack_2258 = + (JSCompiler_object_inline_componentStack_2244 = 0 !== (renderLanes & current.childLanes)), - didReceiveUpdate || JSCompiler_object_inline_componentStack_2258) + didReceiveUpdate || JSCompiler_object_inline_componentStack_2244) ) { - JSCompiler_object_inline_componentStack_2258 = workInProgressRoot; - if (null !== JSCompiler_object_inline_componentStack_2258) { - JSCompiler_object_inline_stack_2257 = renderLanes & -renderLanes; - if (0 !== (JSCompiler_object_inline_stack_2257 & 42)) - JSCompiler_object_inline_stack_2257 = 1; + JSCompiler_object_inline_componentStack_2244 = workInProgressRoot; + if (null !== JSCompiler_object_inline_componentStack_2244) { + JSCompiler_object_inline_stack_2243 = renderLanes & -renderLanes; + if (0 !== (JSCompiler_object_inline_stack_2243 & 42)) + JSCompiler_object_inline_stack_2243 = 1; else - switch (JSCompiler_object_inline_stack_2257) { + switch (JSCompiler_object_inline_stack_2243) { case 2: - JSCompiler_object_inline_stack_2257 = 1; + JSCompiler_object_inline_stack_2243 = 1; break; case 8: - JSCompiler_object_inline_stack_2257 = 4; + JSCompiler_object_inline_stack_2243 = 4; break; case 32: - JSCompiler_object_inline_stack_2257 = 16; + JSCompiler_object_inline_stack_2243 = 16; break; case 128: case 256: @@ -9121,40 +9141,40 @@ case 8388608: case 16777216: case 33554432: - JSCompiler_object_inline_stack_2257 = 64; + JSCompiler_object_inline_stack_2243 = 64; break; case 268435456: - JSCompiler_object_inline_stack_2257 = 134217728; + JSCompiler_object_inline_stack_2243 = 134217728; break; default: - JSCompiler_object_inline_stack_2257 = 0; + JSCompiler_object_inline_stack_2243 = 0; } - JSCompiler_object_inline_stack_2257 = + JSCompiler_object_inline_stack_2243 = 0 !== - (JSCompiler_object_inline_stack_2257 & - (JSCompiler_object_inline_componentStack_2258.suspendedLanes | + (JSCompiler_object_inline_stack_2243 & + (JSCompiler_object_inline_componentStack_2244.suspendedLanes | renderLanes)) ? 0 - : JSCompiler_object_inline_stack_2257; + : JSCompiler_object_inline_stack_2243; if ( - 0 !== JSCompiler_object_inline_stack_2257 && - JSCompiler_object_inline_stack_2257 !== prevState.retryLane + 0 !== JSCompiler_object_inline_stack_2243 && + JSCompiler_object_inline_stack_2243 !== prevState.retryLane ) throw ( - ((prevState.retryLane = JSCompiler_object_inline_stack_2257), + ((prevState.retryLane = JSCompiler_object_inline_stack_2243), enqueueConcurrentRenderForLane( current, - JSCompiler_object_inline_stack_2257 + JSCompiler_object_inline_stack_2243 ), scheduleUpdateOnFiber( - JSCompiler_object_inline_componentStack_2258, + JSCompiler_object_inline_componentStack_2244, current, - JSCompiler_object_inline_stack_2257 + JSCompiler_object_inline_stack_2243 ), SelectiveHydrationException) ); } - JSCompiler_object_inline_digest_2256.data === + JSCompiler_object_inline_digest_2242.data === SUSPENSE_PENDING_START_DATA || renderDidSuspendDelayIfPossible(); workInProgress = retrySuspenseComponentWithoutHydrating( current, @@ -9162,7 +9182,7 @@ renderLanes ); } else - JSCompiler_object_inline_digest_2256.data === + JSCompiler_object_inline_digest_2242.data === SUSPENSE_PENDING_START_DATA ? ((workInProgress.flags |= 128), (workInProgress.child = current.child), @@ -9170,12 +9190,12 @@ null, current )), - (JSCompiler_object_inline_digest_2256._reactRetry = + (JSCompiler_object_inline_digest_2242._reactRetry = workInProgress), (workInProgress = null)) : ((current = prevState.treeContext), (nextHydratableInstance = getNextHydratable( - JSCompiler_object_inline_digest_2256.nextSibling + JSCompiler_object_inline_digest_2242.nextSibling )), (hydrationParentFiber = workInProgress), (isHydrating = !0), @@ -9193,54 +9213,54 @@ (treeContextProvider = workInProgress)), (workInProgress = mountSuspensePrimaryChildren( workInProgress, - JSCompiler_object_inline_stack_2257.children + JSCompiler_object_inline_stack_2243.children )), (workInProgress.flags |= 4096)); return workInProgress; } - if (JSCompiler_object_inline_message_2255) + if (JSCompiler_object_inline_message_2241) return ( reuseSuspenseHandlerOnStack(workInProgress), - (JSCompiler_object_inline_message_2255 = - JSCompiler_object_inline_stack_2257.fallback), - (JSCompiler_object_inline_digest_2256 = workInProgress.mode), + (JSCompiler_object_inline_message_2241 = + JSCompiler_object_inline_stack_2243.fallback), + (JSCompiler_object_inline_digest_2242 = workInProgress.mode), (JSCompiler_temp = current.child), (instance = JSCompiler_temp.sibling), - (JSCompiler_object_inline_stack_2257 = createWorkInProgress( + (JSCompiler_object_inline_stack_2243 = createWorkInProgress( JSCompiler_temp, { mode: "hidden", - children: JSCompiler_object_inline_stack_2257.children + children: JSCompiler_object_inline_stack_2243.children } )), - (JSCompiler_object_inline_stack_2257.subtreeFlags = + (JSCompiler_object_inline_stack_2243.subtreeFlags = JSCompiler_temp.subtreeFlags & 31457280), null !== instance - ? (JSCompiler_object_inline_message_2255 = createWorkInProgress( + ? (JSCompiler_object_inline_message_2241 = createWorkInProgress( instance, - JSCompiler_object_inline_message_2255 + JSCompiler_object_inline_message_2241 )) - : ((JSCompiler_object_inline_message_2255 = createFiberFromFragment( - JSCompiler_object_inline_message_2255, - JSCompiler_object_inline_digest_2256, + : ((JSCompiler_object_inline_message_2241 = createFiberFromFragment( + JSCompiler_object_inline_message_2241, + JSCompiler_object_inline_digest_2242, renderLanes, null )), - (JSCompiler_object_inline_message_2255.flags |= 2)), - (JSCompiler_object_inline_message_2255.return = workInProgress), - (JSCompiler_object_inline_stack_2257.return = workInProgress), - (JSCompiler_object_inline_stack_2257.sibling = - JSCompiler_object_inline_message_2255), - (workInProgress.child = JSCompiler_object_inline_stack_2257), - (JSCompiler_object_inline_stack_2257 = - JSCompiler_object_inline_message_2255), - (JSCompiler_object_inline_message_2255 = workInProgress.child), - (JSCompiler_object_inline_digest_2256 = current.child.memoizedState), - null === JSCompiler_object_inline_digest_2256 - ? (JSCompiler_object_inline_digest_2256 = + (JSCompiler_object_inline_message_2241.flags |= 2)), + (JSCompiler_object_inline_message_2241.return = workInProgress), + (JSCompiler_object_inline_stack_2243.return = workInProgress), + (JSCompiler_object_inline_stack_2243.sibling = + JSCompiler_object_inline_message_2241), + (workInProgress.child = JSCompiler_object_inline_stack_2243), + (JSCompiler_object_inline_stack_2243 = + JSCompiler_object_inline_message_2241), + (JSCompiler_object_inline_message_2241 = workInProgress.child), + (JSCompiler_object_inline_digest_2242 = current.child.memoizedState), + null === JSCompiler_object_inline_digest_2242 + ? (JSCompiler_object_inline_digest_2242 = mountSuspenseOffscreenState(renderLanes)) : ((JSCompiler_temp = - JSCompiler_object_inline_digest_2256.cachePool), + JSCompiler_object_inline_digest_2242.cachePool), null !== JSCompiler_temp ? ((instance = CacheContext._currentValue), (JSCompiler_temp = @@ -9248,38 +9268,38 @@ ? { parent: instance, pool: instance } : JSCompiler_temp)) : (JSCompiler_temp = getSuspendedCache()), - (JSCompiler_object_inline_digest_2256 = { + (JSCompiler_object_inline_digest_2242 = { baseLanes: - JSCompiler_object_inline_digest_2256.baseLanes | renderLanes, + JSCompiler_object_inline_digest_2242.baseLanes | renderLanes, cachePool: JSCompiler_temp })), - (JSCompiler_object_inline_message_2255.memoizedState = - JSCompiler_object_inline_digest_2256), - (JSCompiler_object_inline_message_2255.childLanes = + (JSCompiler_object_inline_message_2241.memoizedState = + JSCompiler_object_inline_digest_2242), + (JSCompiler_object_inline_message_2241.childLanes = getRemainingWorkInPrimaryTree( current, - JSCompiler_object_inline_componentStack_2258, + JSCompiler_object_inline_componentStack_2244, renderLanes )), (workInProgress.memoizedState = SUSPENDED_MARKER), - JSCompiler_object_inline_stack_2257 + JSCompiler_object_inline_stack_2243 ); pushPrimaryTreeSuspenseHandler(workInProgress); renderLanes = current.child; current = renderLanes.sibling; renderLanes = createWorkInProgress(renderLanes, { mode: "visible", - children: JSCompiler_object_inline_stack_2257.children + children: JSCompiler_object_inline_stack_2243.children }); renderLanes.return = workInProgress; renderLanes.sibling = null; null !== current && - ((JSCompiler_object_inline_componentStack_2258 = + ((JSCompiler_object_inline_componentStack_2244 = workInProgress.deletions), - null === JSCompiler_object_inline_componentStack_2258 + null === JSCompiler_object_inline_componentStack_2244 ? ((workInProgress.deletions = [current]), (workInProgress.flags |= 16)) - : JSCompiler_object_inline_componentStack_2258.push(current)); + : JSCompiler_object_inline_componentStack_2244.push(current)); workInProgress.child = renderLanes; workInProgress.memoizedState = null; return renderLanes; @@ -9630,8 +9650,8 @@ (workInProgress.flags |= 4); workInProgress.flags |= 2048; var stateNode = workInProgress.stateNode; - stateNode.effectDuration = 0; - stateNode.passiveEffectDuration = 0; + stateNode.effectDuration = -0; + stateNode.passiveEffectDuration = -0; break; case 13: stateNode = workInProgress.memoizedState; @@ -10217,8 +10237,8 @@ (workInProgress.flags |= 4), (workInProgress.flags |= 2048), (returnFiber = workInProgress.stateNode), - (returnFiber.effectDuration = 0), - (returnFiber.passiveEffectDuration = 0), + (returnFiber.effectDuration = -0), + (returnFiber.passiveEffectDuration = -0), reconcileChildren( current, workInProgress, @@ -10877,16 +10897,35 @@ ) callCallback(callbacks[updateQueue], context); } - function shouldProfile$1(current) { + function shouldProfile(current) { return (current.mode & ProfileMode) !== NoMode; } function commitHookLayoutEffects(finishedWork, hookFlags) { - shouldProfile$1(finishedWork) - ? (startLayoutEffectTimer(), + shouldProfile(finishedWork) + ? (startEffectTimer(), commitHookEffectListMount(hookFlags, finishedWork), - recordLayoutEffectDuration(finishedWork)) + recordEffectDuration()) : commitHookEffectListMount(hookFlags, finishedWork); } + function commitHookLayoutUnmountEffects( + finishedWork, + nearestMountedAncestor, + hookFlags + ) { + shouldProfile(finishedWork) + ? (startEffectTimer(), + commitHookEffectListUnmount( + hookFlags, + finishedWork, + nearestMountedAncestor + ), + recordEffectDuration()) + : commitHookEffectListUnmount( + hookFlags, + finishedWork, + nearestMountedAncestor + ); + } function commitHookEffectListMount(flags, finishedWork) { try { var updateQueue = finishedWork.updateQueue, @@ -10984,10 +11023,10 @@ } } function commitHookPassiveMountEffects(finishedWork, hookFlags) { - shouldProfile$1(finishedWork) - ? ((passiveEffectStartTime = now()), + shouldProfile(finishedWork) + ? (startEffectTimer(), commitHookEffectListMount(hookFlags, finishedWork), - recordPassiveEffectDuration(finishedWork)) + recordEffectDuration()) : commitHookEffectListMount(hookFlags, finishedWork); } function commitHookPassiveUnmountEffects( @@ -10995,14 +11034,14 @@ nearestMountedAncestor, hookFlags ) { - shouldProfile$1(finishedWork) - ? ((passiveEffectStartTime = now()), + shouldProfile(finishedWork) + ? (startEffectTimer(), commitHookEffectListUnmount( hookFlags, finishedWork, nearestMountedAncestor ), - recordPassiveEffectDuration(finishedWork)) + recordEffectDuration()) : commitHookEffectListUnmount( hookFlags, finishedWork, @@ -11096,8 +11135,8 @@ current.memoizedProps ); instance.state = current.memoizedState; - shouldProfile$1(current) - ? (startLayoutEffectTimer(), + shouldProfile(current) + ? (startEffectTimer(), runWithFiberInDEV( current, callComponentWillUnmountInDEV, @@ -11105,7 +11144,7 @@ nearestMountedAncestor, instance ), - recordLayoutEffectDuration(current)) + recordEffectDuration()) : runWithFiberInDEV( current, callComponentWillUnmountInDEV, @@ -11119,12 +11158,11 @@ if (null !== ref) { var instance = finishedWork.stateNode; if ("function" === typeof ref) - if (shouldProfile$1(finishedWork)) + if (shouldProfile(finishedWork)) try { - startLayoutEffectTimer(), - (finishedWork.refCleanup = ref(instance)); + startEffectTimer(), (finishedWork.refCleanup = ref(instance)); } finally { - recordLayoutEffectDuration(finishedWork); + recordEffectDuration(); } else finishedWork.refCleanup = ref(instance); else @@ -11151,12 +11189,11 @@ if (null !== ref) if ("function" === typeof refCleanup) try { - if (shouldProfile$1(current)) + if (shouldProfile(current)) try { - startLayoutEffectTimer(), - runWithFiberInDEV(current, refCleanup); + startEffectTimer(), runWithFiberInDEV(current, refCleanup); } finally { - recordLayoutEffectDuration(current); + recordEffectDuration(current); } else runWithFiberInDEV(current, refCleanup); } catch (error) { @@ -11168,11 +11205,11 @@ } else if ("function" === typeof ref) try { - if (shouldProfile$1(current)) + if (shouldProfile(current)) try { - startLayoutEffectTimer(), runWithFiberInDEV(current, ref, null); + startEffectTimer(), runWithFiberInDEV(current, ref, null); } finally { - recordLayoutEffectDuration(current); + recordEffectDuration(current); } else runWithFiberInDEV(current, ref, null); } catch (error$7) { @@ -11526,7 +11563,8 @@ return firstChild; } function commitLayoutEffectOnFiber(finishedRoot, current, finishedWork) { - var flags = finishedWork.flags; + var prevEffectStart = pushComponentEffectStart(), + flags = finishedWork.flags; switch (finishedWork.tag) { case 0: case 11: @@ -11552,15 +11590,15 @@ "Expected %s state to match memoized state before componentDidMount. This might either be because of a bug in React, or because a component reassigns its own `this.state`. Please file an issue.", getComponentNameFromFiber(finishedWork) || "instance" )), - shouldProfile$1(finishedWork) - ? (startLayoutEffectTimer(), + shouldProfile(finishedWork) + ? (startEffectTimer(), runWithFiberInDEV( finishedWork, callComponentDidMountInDEV, finishedWork, finishedRoot ), - recordLayoutEffectDuration(finishedWork)) + recordEffectDuration()) : runWithFiberInDEV( finishedWork, callComponentDidMountInDEV, @@ -11586,8 +11624,8 @@ "Expected %s state to match memoized state before componentDidUpdate. This might either be because of a bug in React, or because a component reassigns its own `this.state`. Please file an issue.", getComponentNameFromFiber(finishedWork) || "instance" )); - shouldProfile$1(finishedWork) - ? (startLayoutEffectTimer(), + shouldProfile(finishedWork) + ? (startEffectTimer(), runWithFiberInDEV( finishedWork, callComponentDidUpdateInDEV, @@ -11597,7 +11635,7 @@ current, finishedRoot.__reactInternalSnapshotBeforeUpdate ), - recordLayoutEffectDuration(finishedWork)) + recordEffectDuration()) : runWithFiberInDEV( finishedWork, callComponentDidUpdateInDEV, @@ -11612,32 +11650,34 @@ flags & 512 && safelyAttachRef(finishedWork, finishedWork.return); break; case 3: + current = pushNestedEffectDurations(); recursivelyTraverseLayoutEffects(finishedRoot, finishedWork); if ( flags & 64 && ((flags = finishedWork.updateQueue), null !== flags) ) { - finishedRoot = null; + prevProps = null; if (null !== finishedWork.child) switch (finishedWork.child.tag) { case 27: case 5: - finishedRoot = finishedWork.child.stateNode; + prevProps = finishedWork.child.stateNode; break; case 1: - finishedRoot = finishedWork.child.stateNode; + prevProps = finishedWork.child.stateNode; } try { runWithFiberInDEV( finishedWork, commitCallbacks, flags, - finishedRoot + prevProps ); } catch (error) { captureCommitPhaseError(finishedWork, finishedWork.return, error); } } + finishedRoot.effectDuration += popNestedEffectDurations(current); break; case 26: recursivelyTraverseLayoutEffects(finishedRoot, finishedWork); @@ -11650,9 +11690,11 @@ flags & 512 && safelyAttachRef(finishedWork, finishedWork.return); break; case 12: - recursivelyTraverseLayoutEffects(finishedRoot, finishedWork); if (flags & 4) { - flags = finishedWork.stateNode.effectDuration; + flags = pushNestedEffectDurations(); + recursivelyTraverseLayoutEffects(finishedRoot, finishedWork); + finishedRoot = finishedWork.stateNode; + finishedRoot.effectDuration += bubbleNestedEffectDurations(flags); try { runWithFiberInDEV( finishedWork, @@ -11660,24 +11702,12 @@ finishedWork, current, commitTime, - flags + finishedRoot.effectDuration ); } catch (error) { captureCommitPhaseError(finishedWork, finishedWork.return, error); } - finishedWork = finishedWork.return; - a: for (; null !== finishedWork; ) { - switch (finishedWork.tag) { - case 3: - finishedWork.stateNode.effectDuration += flags; - break a; - case 12: - finishedWork.stateNode.effectDuration += flags; - break a; - } - finishedWork = finishedWork.return; - } - } + } else recursivelyTraverseLayoutEffects(finishedRoot, finishedWork); break; case 13: recursivelyTraverseLayoutEffects(finishedRoot, finishedWork); @@ -11713,6 +11743,16 @@ default: recursivelyTraverseLayoutEffects(finishedRoot, finishedWork); } + (finishedWork.mode & ProfileMode) !== NoMode && + 0 <= componentEffectStartTime && + 0 <= componentEffectEndTime && + logComponentEffect( + finishedWork, + componentEffectStartTime, + componentEffectEndTime, + componentEffectDuration + ); + popComponentEffectStart(prevEffectStart); } function detachFiberAfterEffects(fiber) { var alternate = fiber.alternate; @@ -11874,51 +11914,18 @@ case 11: case 14: case 15: - if ( - !offscreenSubtreeWasHidden && - ((prevHostParent = deletedFiber.updateQueue), - null !== prevHostParent && - ((prevHostParent = prevHostParent.lastEffect), - null !== prevHostParent)) - ) { - prevHostParentIsContainer = prevHostParent = prevHostParent.next; - do { - var _tag = prevHostParentIsContainer.tag, - _inst = prevHostParentIsContainer.inst, - _destroy = _inst.destroy; - void 0 !== _destroy && - ((_tag & Insertion) !== NoFlags - ? ((_inst.destroy = void 0), - runWithFiberInDEV( - deletedFiber, - callDestroyInDEV, - deletedFiber, - nearestMountedAncestor, - _destroy - )) - : (_tag & Layout) !== NoFlags && - ((deletedFiber.mode & ProfileMode) !== NoMode - ? (startLayoutEffectTimer(), - (_inst.destroy = void 0), - runWithFiberInDEV( - deletedFiber, - callDestroyInDEV, - deletedFiber, - nearestMountedAncestor, - _destroy - ), - recordLayoutEffectDuration(deletedFiber)) - : ((_inst.destroy = void 0), - runWithFiberInDEV( - deletedFiber, - callDestroyInDEV, - deletedFiber, - nearestMountedAncestor, - _destroy - )))); - prevHostParentIsContainer = prevHostParentIsContainer.next; - } while (prevHostParentIsContainer !== prevHostParent); - } + offscreenSubtreeWasHidden || + commitHookEffectListUnmount( + Insertion, + deletedFiber, + nearestMountedAncestor + ); + offscreenSubtreeWasHidden || + commitHookLayoutUnmountEffects( + deletedFiber, + nearestMountedAncestor, + Layout + ); recursivelyTraverseDeletionEffects( finishedRoot, nearestMountedAncestor, @@ -12031,6 +12038,7 @@ function commitMutationEffects(root, finishedWork, committedLanes) { inProgressLanes = committedLanes; inProgressRoot = root; + resetComponentEffectTimers(); commitMutationEffectsOnFiber(finishedWork, root); inProgressRoot = inProgressLanes = null; } @@ -12078,7 +12086,8 @@ (parentFiber = parentFiber.sibling); } function commitMutationEffectsOnFiber(finishedWork, root) { - var current = finishedWork.alternate, + var prevEffectStart = pushComponentEffectStart(), + current = finishedWork.alternate, flags = finishedWork.flags; switch (finishedWork.tag) { case 0: @@ -12094,19 +12103,11 @@ finishedWork.return ), commitHookEffectListMount(Insertion | HasEffect, finishedWork), - (finishedWork.mode & ProfileMode) !== NoMode - ? (startLayoutEffectTimer(), - commitHookEffectListUnmount( - Layout | HasEffect, - finishedWork, - finishedWork.return - ), - recordLayoutEffectDuration(finishedWork)) - : commitHookEffectListUnmount( - Layout | HasEffect, - finishedWork, - finishedWork.return - )); + commitHookLayoutUnmountEffects( + finishedWork, + finishedWork.return, + Layout | HasEffect + )); break; case 1: recursivelyTraverseMutationEffects(root, finishedWork); @@ -12116,13 +12117,13 @@ safelyDetachRef(current, current.return); flags & 64 && offscreenSubtreeIsHidden && - ((finishedWork = finishedWork.updateQueue), - null !== finishedWork && - ((flags = finishedWork.callbacks), - null !== flags && - ((current = finishedWork.shared.hiddenCallbacks), - (finishedWork.shared.hiddenCallbacks = - null === current ? flags : current.concat(flags))))); + ((flags = finishedWork.updateQueue), + null !== flags && + ((current = flags.callbacks), + null !== current && + ((root = flags.shared.hiddenCallbacks), + (flags.shared.hiddenCallbacks = + null === root ? current : root.concat(current))))); break; case 26: var hoistableRoot = currentHoistableRoot; @@ -12131,113 +12132,110 @@ flags & 512 && null !== current && safelyDetachRef(current, current.return); - if (flags & 4) { - var currentResource = - null !== current ? current.memoizedState : null; - flags = finishedWork.memoizedState; - if (null === current) + if (flags & 4) + if ( + ((root = null !== current ? current.memoizedState : null), + (flags = finishedWork.memoizedState), + null === current) + ) if (null === flags) if (null === finishedWork.stateNode) { a: { flags = finishedWork.type; current = finishedWork.memoizedProps; - hoistableRoot = - hoistableRoot.ownerDocument || hoistableRoot; + root = hoistableRoot.ownerDocument || hoistableRoot; b: switch (flags) { case "title": - currentResource = - hoistableRoot.getElementsByTagName("title")[0]; + hoistableRoot = root.getElementsByTagName("title")[0]; if ( - !currentResource || - currentResource[internalHoistableMarker] || - currentResource[internalInstanceKey] || - currentResource.namespaceURI === SVG_NAMESPACE || - currentResource.hasAttribute("itemprop") + !hoistableRoot || + hoistableRoot[internalHoistableMarker] || + hoistableRoot[internalInstanceKey] || + hoistableRoot.namespaceURI === SVG_NAMESPACE || + hoistableRoot.hasAttribute("itemprop") ) - (currentResource = - hoistableRoot.createElement(flags)), - hoistableRoot.head.insertBefore( - currentResource, - hoistableRoot.querySelector("head > title") + (hoistableRoot = root.createElement(flags)), + root.head.insertBefore( + hoistableRoot, + root.querySelector("head > title") ); - setInitialProperties(currentResource, flags, current); - currentResource[internalInstanceKey] = finishedWork; - markNodeAsHoistable(currentResource); - flags = currentResource; + setInitialProperties(hoistableRoot, flags, current); + hoistableRoot[internalInstanceKey] = finishedWork; + markNodeAsHoistable(hoistableRoot); + flags = hoistableRoot; break a; case "link": - if ( - (root = getHydratableHoistableCache( - "link", - "href", - hoistableRoot - ).get(flags + (current.href || ""))) - ) - for (var i = 0; i < root.length; i++) + var maybeNodes = getHydratableHoistableCache( + "link", + "href", + root + ).get(flags + (current.href || "")); + if (maybeNodes) + for (var i = 0; i < maybeNodes.length; i++) if ( - ((currentResource = root[i]), - currentResource.getAttribute("href") === + ((hoistableRoot = maybeNodes[i]), + hoistableRoot.getAttribute("href") === (null == current.href ? null : current.href) && - currentResource.getAttribute("rel") === + hoistableRoot.getAttribute("rel") === (null == current.rel ? null : current.rel) && - currentResource.getAttribute("title") === + hoistableRoot.getAttribute("title") === (null == current.title ? null : current.title) && - currentResource.getAttribute("crossorigin") === + hoistableRoot.getAttribute("crossorigin") === (null == current.crossOrigin ? null : current.crossOrigin)) ) { - root.splice(i, 1); + maybeNodes.splice(i, 1); break b; } - currentResource = hoistableRoot.createElement(flags); - setInitialProperties(currentResource, flags, current); - hoistableRoot.head.appendChild(currentResource); + hoistableRoot = root.createElement(flags); + setInitialProperties(hoistableRoot, flags, current); + root.head.appendChild(hoistableRoot); break; case "meta": if ( - (root = getHydratableHoistableCache( + (maybeNodes = getHydratableHoistableCache( "meta", "content", - hoistableRoot + root ).get(flags + (current.content || ""))) ) - for (i = 0; i < root.length; i++) + for (i = 0; i < maybeNodes.length; i++) if ( - ((currentResource = root[i]), + ((hoistableRoot = maybeNodes[i]), checkAttributeStringCoercion( current.content, "content" ), - currentResource.getAttribute("content") === + hoistableRoot.getAttribute("content") === (null == current.content ? null : "" + current.content) && - currentResource.getAttribute("name") === + hoistableRoot.getAttribute("name") === (null == current.name ? null : current.name) && - currentResource.getAttribute("property") === + hoistableRoot.getAttribute("property") === (null == current.property ? null : current.property) && - currentResource.getAttribute("http-equiv") === + hoistableRoot.getAttribute("http-equiv") === (null == current.httpEquiv ? null : current.httpEquiv) && - currentResource.getAttribute("charset") === + hoistableRoot.getAttribute("charset") === (null == current.charSet ? null : current.charSet)) ) { - root.splice(i, 1); + maybeNodes.splice(i, 1); break b; } - currentResource = hoistableRoot.createElement(flags); - setInitialProperties(currentResource, flags, current); - hoistableRoot.head.appendChild(currentResource); + hoistableRoot = root.createElement(flags); + setInitialProperties(hoistableRoot, flags, current); + root.head.appendChild(hoistableRoot); break; default: throw Error( @@ -12246,9 +12244,9 @@ '". This is a bug in React.' ); } - currentResource[internalInstanceKey] = finishedWork; - markNodeAsHoistable(currentResource); - flags = currentResource; + hoistableRoot[internalInstanceKey] = finishedWork; + markNodeAsHoistable(hoistableRoot); + flags = hoistableRoot; } finishedWork.stateNode = flags; } else @@ -12264,12 +12262,12 @@ finishedWork.memoizedProps ); else - currentResource !== flags - ? (null === currentResource + root !== flags + ? (null === root ? null !== current.stateNode && ((current = current.stateNode), current.parentNode.removeChild(current)) - : currentResource.count--, + : root.count--, null === flags ? mountHoistable( hoistableRoot, @@ -12288,12 +12286,11 @@ finishedWork.memoizedProps, current.memoizedProps ); - } break; case 27: if (flags & 4 && null === finishedWork.alternate) { hoistableRoot = finishedWork.stateNode; - currentResource = finishedWork.memoizedProps; + maybeNodes = finishedWork.memoizedProps; try { for (i = hoistableRoot.firstChild; i; ) { var nextNode = i.nextSibling, @@ -12312,7 +12309,7 @@ finishedWork, acquireSingletonInstance, finishedWork.type, - currentResource, + maybeNodes, hoistableRoot, finishedWork ); @@ -12327,20 +12324,20 @@ null !== current && safelyDetachRef(current, current.return); if (finishedWork.flags & 32) { - hoistableRoot = finishedWork.stateNode; + root = finishedWork.stateNode; try { - runWithFiberInDEV(finishedWork, resetTextContent, hoistableRoot); + runWithFiberInDEV(finishedWork, resetTextContent, root); } catch (error) { captureCommitPhaseError(finishedWork, finishedWork.return, error); } } flags & 4 && null != finishedWork.stateNode && - ((hoistableRoot = finishedWork.memoizedProps), + ((root = finishedWork.memoizedProps), commitHostUpdate( finishedWork, - hoistableRoot, - null !== current ? current.memoizedProps : hoistableRoot + root, + null !== current ? current.memoizedProps : root )); flags & 1024 && ((needsFormReset = !0), @@ -12359,12 +12356,12 @@ ); flags = finishedWork.memoizedProps; current = null !== current ? current.memoizedProps : flags; - hoistableRoot = finishedWork.stateNode; + root = finishedWork.stateNode; try { runWithFiberInDEV( finishedWork, commitTextUpdate, - hoistableRoot, + root, current, flags ); @@ -12374,11 +12371,12 @@ } break; case 3: + hoistableRoot = pushNestedEffectDurations(); tagCaches = null; - hoistableRoot = currentHoistableRoot; + maybeNodes = currentHoistableRoot; currentHoistableRoot = getHoistableRoot(root.containerInfo); recursivelyTraverseMutationEffects(root, finishedWork); - currentHoistableRoot = hoistableRoot; + currentHoistableRoot = maybeNodes; commitReconciliationEffects(finishedWork); if ( flags & 4 && @@ -12396,6 +12394,7 @@ } needsFormReset && ((needsFormReset = !1), recursivelyResetForms(finishedWork)); + root.effectDuration += popNestedEffectDurations(hoistableRoot); break; case 4: flags = currentHoistableRoot; @@ -12406,6 +12405,13 @@ commitReconciliationEffects(finishedWork); currentHoistableRoot = flags; break; + case 12: + flags = pushNestedEffectDurations(); + recursivelyTraverseMutationEffects(root, finishedWork); + commitReconciliationEffects(finishedWork); + finishedWork.stateNode.effectDuration += + bubbleNestedEffectDurations(flags); + break; case 13: recursivelyTraverseMutationEffects(root, finishedWork); commitReconciliationEffects(finishedWork); @@ -12477,17 +12483,17 @@ if (null === current) { nextNode = root; try { - (currentResource = nextNode.stateNode), + (maybeNodes = nextNode.stateNode), i ? runWithFiberInDEV( nextNode, hideTextInstance, - currentResource + maybeNodes ) : runWithFiberInDEV( nextNode, unhideTextInstance, - currentResource, + maybeNodes, nextNode.memoizedProps ); } catch (error) { @@ -12538,6 +12544,16 @@ recursivelyTraverseMutationEffects(root, finishedWork), commitReconciliationEffects(finishedWork); } + (finishedWork.mode & ProfileMode) !== NoMode && + 0 <= componentEffectStartTime && + 0 <= componentEffectEndTime && + logComponentEffect( + finishedWork, + componentEffectStartTime, + componentEffectEndTime, + componentEffectDuration + ); + popComponentEffectStart(prevEffectStart); } function commitReconciliationEffects(finishedWork) { var flags = finishedWork.flags; @@ -12563,6 +12579,7 @@ function commitLayoutEffects(finishedWork, root, committedLanes) { inProgressLanes = committedLanes; inProgressRoot = root; + resetComponentEffectTimers(); commitLayoutEffectOnFiber(root, finishedWork.alternate, finishedWork); inProgressRoot = inProgressLanes = null; } @@ -12578,23 +12595,11 @@ case 11: case 14: case 15: - if ((finishedWork.mode & ProfileMode) !== NoMode) - try { - startLayoutEffectTimer(), - commitHookEffectListUnmount( - Layout, - finishedWork, - finishedWork.return - ); - } finally { - recordLayoutEffectDuration(finishedWork); - } - else - commitHookEffectListUnmount( - Layout, - finishedWork, - finishedWork.return - ); + commitHookLayoutUnmountEffects( + finishedWork, + finishedWork.return, + Layout + ); recursivelyTraverseDisappearLayoutEffects(finishedWork); break; case 1: @@ -12694,14 +12699,16 @@ safelyAttachRef(finishedWork, finishedWork.return); break; case 12: - recursivelyTraverseReappearLayoutEffects( - finishedRoot, - finishedWork, - includeWorkInProgressEffects - ); if (includeWorkInProgressEffects && flags & 4) { - includeWorkInProgressEffects = - finishedWork.stateNode.effectDuration; + flags = pushNestedEffectDurations(); + recursivelyTraverseReappearLayoutEffects( + finishedRoot, + finishedWork, + includeWorkInProgressEffects + ); + includeWorkInProgressEffects = finishedWork.stateNode; + includeWorkInProgressEffects.effectDuration += + bubbleNestedEffectDurations(flags); try { runWithFiberInDEV( finishedWork, @@ -12709,26 +12716,17 @@ finishedWork, current, commitTime, - includeWorkInProgressEffects + includeWorkInProgressEffects.effectDuration ); } catch (error) { captureCommitPhaseError(finishedWork, finishedWork.return, error); } - finishedWork = finishedWork.return; - a: for (; null !== finishedWork; ) { - switch (finishedWork.tag) { - case 3: - finishedWork.stateNode.effectDuration += - includeWorkInProgressEffects; - break a; - case 12: - finishedWork.stateNode.effectDuration += - includeWorkInProgressEffects; - break a; - } - finishedWork = finishedWork.return; - } - } + } else + recursivelyTraverseReappearLayoutEffects( + finishedRoot, + finishedWork, + includeWorkInProgressEffects + ); break; case 13: recursivelyTraverseReappearLayoutEffects( @@ -12827,19 +12825,39 @@ committedTransitions, endTime ) { + var prevEffectStart = pushComponentEffectStart(); if ( (finishedWork.mode & ProfileMode) !== NoMode && 0 < finishedWork.actualStartTime ) { var startTime = finishedWork.actualStartTime, name = getComponentNameFromFiber(finishedWork); - null !== name && - supportsUserTiming && - ((reusableComponentOptions.start = startTime), - (reusableComponentOptions.end = endTime), - performance.measure(name, reusableComponentOptions)); + if (null !== name && supportsUserTiming) { + var selfTime = finishedWork.actualDuration; + if ( + null === finishedWork.alternate || + finishedWork.alternate.child !== finishedWork.child + ) + for ( + var child = finishedWork.child; + null !== child; + child = child.sibling + ) + selfTime -= child.actualDuration; + reusableComponentDevToolDetails.color = + 0.5 > selfTime + ? "primary-light" + : 10 > selfTime + ? "primary" + : 100 > selfTime + ? "primary-dark" + : "error"; + reusableComponentOptions.start = startTime; + reusableComponentOptions.end = endTime; + performance.measure(name, reusableComponentOptions); + } } - startTime = finishedWork.flags; + name = finishedWork.flags; switch (finishedWork.tag) { case 0: case 11: @@ -12851,10 +12869,11 @@ committedTransitions, endTime ); - startTime & 2048 && + name & 2048 && commitHookPassiveMountEffects(finishedWork, Passive | HasEffect); break; case 3: + startTime = pushNestedEffectDurations(); recursivelyTraversePassiveMountEffects( finishedRoot, finishedWork, @@ -12862,25 +12881,30 @@ committedTransitions, endTime ); - startTime & 2048 && - ((finishedRoot = null), + name & 2048 && + ((committedLanes = null), null !== finishedWork.alternate && - (finishedRoot = finishedWork.alternate.memoizedState.cache), - (finishedWork = finishedWork.memoizedState.cache), - finishedWork !== finishedRoot && - (retainCache(finishedWork), - null != finishedRoot && releaseCache(finishedRoot))); + (committedLanes = finishedWork.alternate.memoizedState.cache), + (committedTransitions = finishedWork.memoizedState.cache), + committedTransitions !== committedLanes && + (retainCache(committedTransitions), + null != committedLanes && releaseCache(committedLanes))); + finishedRoot.passiveEffectDuration += + popNestedEffectDurations(startTime); break; case 12: - recursivelyTraversePassiveMountEffects( - finishedRoot, - finishedWork, - committedLanes, - committedTransitions, - endTime - ); - if (startTime & 2048) { - finishedRoot = finishedWork.stateNode.passiveEffectDuration; + if (name & 2048) { + startTime = pushNestedEffectDurations(); + recursivelyTraversePassiveMountEffects( + finishedRoot, + finishedWork, + committedLanes, + committedTransitions, + endTime + ); + finishedRoot = finishedWork.stateNode; + finishedRoot.passiveEffectDuration += + bubbleNestedEffectDurations(startTime); try { runWithFiberInDEV( finishedWork, @@ -12888,31 +12912,26 @@ finishedWork, finishedWork.alternate, commitTime, - finishedRoot + finishedRoot.passiveEffectDuration ); } catch (error) { captureCommitPhaseError(finishedWork, finishedWork.return, error); } - finishedWork = finishedWork.return; - a: for (; null !== finishedWork; ) { - switch (finishedWork.tag) { - case 3: - finishedWork.stateNode.passiveEffectDuration += finishedRoot; - break a; - case 12: - finishedWork.stateNode.passiveEffectDuration += finishedRoot; - break a; - } - finishedWork = finishedWork.return; - } - } + } else + recursivelyTraversePassiveMountEffects( + finishedRoot, + finishedWork, + committedLanes, + committedTransitions, + endTime + ); break; case 23: break; case 22: - name = finishedWork.stateNode; + startTime = finishedWork.stateNode; null !== finishedWork.memoizedState - ? name._visibility & OffscreenPassiveEffectsConnected + ? startTime._visibility & OffscreenPassiveEffectsConnected ? recursivelyTraversePassiveMountEffects( finishedRoot, finishedWork, @@ -12924,7 +12943,7 @@ finishedRoot, finishedWork ) - : name._visibility & OffscreenPassiveEffectsConnected + : startTime._visibility & OffscreenPassiveEffectsConnected ? recursivelyTraversePassiveMountEffects( finishedRoot, finishedWork, @@ -12932,7 +12951,7 @@ committedTransitions, endTime ) - : ((name._visibility |= OffscreenPassiveEffectsConnected), + : ((startTime._visibility |= OffscreenPassiveEffectsConnected), recursivelyTraverseReconnectPassiveEffects( finishedRoot, finishedWork, @@ -12940,7 +12959,7 @@ committedTransitions, 0 !== (finishedWork.subtreeFlags & 10256) )); - startTime & 2048 && + name & 2048 && commitOffscreenPassiveMountEffects( finishedWork.alternate, finishedWork @@ -12954,7 +12973,7 @@ committedTransitions, endTime ); - startTime & 2048 && + name & 2048 && commitCachePassiveMountEffect(finishedWork.alternate, finishedWork); break; default: @@ -12966,6 +12985,16 @@ endTime ); } + (finishedWork.mode & ProfileMode) !== NoMode && + 0 <= componentEffectStartTime && + 0 <= componentEffectEndTime && + logComponentEffect( + finishedWork, + componentEffectStartTime, + componentEffectEndTime, + componentEffectDuration + ); + popComponentEffectStart(prevEffectStart); } function recursivelyTraverseReconnectPassiveEffects( finishedRoot, @@ -13182,6 +13211,7 @@ (parentFiber = parentFiber.sibling); } function commitPassiveUnmountOnFiber(finishedWork) { + var prevEffectStart = pushComponentEffectStart(); switch (finishedWork.tag) { case 0: case 11: @@ -13194,18 +13224,41 @@ Passive | HasEffect ); break; + case 3: + var prevEffectDuration = pushNestedEffectDurations(); + recursivelyTraversePassiveUnmountEffects(finishedWork); + finishedWork.stateNode.passiveEffectDuration += + popNestedEffectDurations(prevEffectDuration); + break; + case 12: + prevEffectDuration = pushNestedEffectDurations(); + recursivelyTraversePassiveUnmountEffects(finishedWork); + finishedWork.stateNode.passiveEffectDuration += + bubbleNestedEffectDurations(prevEffectDuration); + break; case 22: - var instance = finishedWork.stateNode; + prevEffectDuration = finishedWork.stateNode; null !== finishedWork.memoizedState && - instance._visibility & OffscreenPassiveEffectsConnected && + prevEffectDuration._visibility & OffscreenPassiveEffectsConnected && (null === finishedWork.return || 13 !== finishedWork.return.tag) - ? ((instance._visibility &= ~OffscreenPassiveEffectsConnected), + ? ((prevEffectDuration._visibility &= + ~OffscreenPassiveEffectsConnected), recursivelyTraverseDisconnectPassiveEffects(finishedWork)) : recursivelyTraversePassiveUnmountEffects(finishedWork); break; default: recursivelyTraversePassiveUnmountEffects(finishedWork); } + (finishedWork.mode & ProfileMode) !== NoMode && + 0 <= componentEffectStartTime && + 0 <= componentEffectEndTime && + logComponentEffect( + finishedWork, + componentEffectStartTime, + componentEffectEndTime, + componentEffectDuration + ); + popComponentEffectStart(prevEffectStart); } function recursivelyTraverseDisconnectPassiveEffects(parentFiber) { var deletions = parentFiber.deletions; @@ -15635,10 +15688,14 @@ didScheduleUpdateDuringPassiveEffects = !1; var prevExecutionContext = executionContext; executionContext |= CommitContext; - commitPassiveUnmountOnFiber(root$jscomp$0.current); + var finishedWork = root$jscomp$0.current; + resetComponentEffectTimers(); + commitPassiveUnmountOnFiber(finishedWork); + var finishedWork$jscomp$0 = root$jscomp$0.current; + resetComponentEffectTimers(); commitPassiveMountOnFiber( root$jscomp$0, - root$jscomp$0.current, + finishedWork$jscomp$0, lanes, priority, completeTime @@ -20303,7 +20360,7 @@ this.pooledCacheLanes = 0; this.formState = formState; this.incompleteTransitions = new Map(); - this.passiveEffectDuration = this.effectDuration = 0; + this.passiveEffectDuration = this.effectDuration = -0; this.memoizedUpdaters = new Set(); containerInfo = this.pendingUpdatersLaneMap = []; for (tag = 0; 31 > tag; tag++) containerInfo.push(new Set()); @@ -22367,11 +22424,13 @@ StrictEffectsMode = 16, NoStrictPassiveEffectsMode = 64, now = Scheduler.unstable_now, - completeTime = 0, - commitTime = 0, - layoutEffectStartTime = -1, - profilerStartTime = -1, - passiveEffectStartTime = -1, + completeTime = -0, + commitTime = -0, + profilerStartTime = -1.1, + profilerEffectDuration = -0, + componentEffectDuration = -0, + componentEffectStartTime = -1.1, + componentEffectEndTime = -1.1, currentUpdateIsNested = !1, nestedUpdateScheduled = !1, supportsUserTiming = @@ -24749,11 +24808,11 @@ }; (function () { var isomorphicReactPackageVersion = React.version; - if ("19.0.0-experimental-a99d8e8d-20240916" !== isomorphicReactPackageVersion) + if ("19.0.0-experimental-5dcb0097-20240918" !== isomorphicReactPackageVersion) throw Error( 'Incompatible React versions: The "react" and "react-dom" packages must have the exact same version. Instead got:\n - react: ' + (isomorphicReactPackageVersion + - "\n - react-dom: 19.0.0-experimental-a99d8e8d-20240916\nLearn more: https://react.dev/warnings/version-mismatch") + "\n - react-dom: 19.0.0-experimental-5dcb0097-20240918\nLearn more: https://react.dev/warnings/version-mismatch") ); })(); ("function" === typeof Map && @@ -24790,11 +24849,11 @@ !(function () { var internals = { bundleType: 1, - version: "19.0.0-experimental-a99d8e8d-20240916", + version: "19.0.0-experimental-5dcb0097-20240918", rendererPackageName: "react-dom", currentDispatcherRef: ReactSharedInternals, findFiberByHostInstance: getClosestInstanceFromNode, - reconcilerVersion: "19.0.0-experimental-a99d8e8d-20240916" + reconcilerVersion: "19.0.0-experimental-5dcb0097-20240918" }; internals.overrideHookState = overrideHookState; internals.overrideHookStateDeletePath = overrideHookStateDeletePath; @@ -25266,7 +25325,7 @@ exports.useFormStatus = function () { return resolveDispatcher().useHostTransitionStatus(); }; - exports.version = "19.0.0-experimental-a99d8e8d-20240916"; + exports.version = "19.0.0-experimental-5dcb0097-20240918"; "undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ && "function" === typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStop && diff --git a/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-profiling.profiling.js b/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-profiling.profiling.js index 044fc453186eb..0d012a7e397e3 100644 --- a/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-profiling.profiling.js +++ b/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-profiling.profiling.js @@ -2089,19 +2089,19 @@ function getTargetInstForChangeEvent(domEventName, targetInst) { } var isInputEventSupported = !1; if (canUseDOM) { - var JSCompiler_inline_result$jscomp$298; + var JSCompiler_inline_result$jscomp$297; if (canUseDOM) { - var isSupported$jscomp$inline_434 = "oninput" in document; - if (!isSupported$jscomp$inline_434) { - var element$jscomp$inline_435 = document.createElement("div"); - element$jscomp$inline_435.setAttribute("oninput", "return;"); - isSupported$jscomp$inline_434 = - "function" === typeof element$jscomp$inline_435.oninput; + var isSupported$jscomp$inline_433 = "oninput" in document; + if (!isSupported$jscomp$inline_433) { + var element$jscomp$inline_434 = document.createElement("div"); + element$jscomp$inline_434.setAttribute("oninput", "return;"); + isSupported$jscomp$inline_433 = + "function" === typeof element$jscomp$inline_434.oninput; } - JSCompiler_inline_result$jscomp$298 = isSupported$jscomp$inline_434; - } else JSCompiler_inline_result$jscomp$298 = !1; + JSCompiler_inline_result$jscomp$297 = isSupported$jscomp$inline_433; + } else JSCompiler_inline_result$jscomp$297 = !1; isInputEventSupported = - JSCompiler_inline_result$jscomp$298 && + JSCompiler_inline_result$jscomp$297 && (!document.documentMode || 9 < document.documentMode); } function stopWatchingForValueChange() { @@ -2216,41 +2216,36 @@ function containsNode(outerNode, innerNode) { : !1; } function getActiveElementDeep(containerInfo) { - var $jscomp$optchain$tmpm2001243351$1, $jscomp$nullish$tmp0; + var $jscomp$optchain$tmpm703203814$1, $jscomp$nullish$tmp0; containerInfo = null != ($jscomp$nullish$tmp0 = null == containerInfo ? void 0 : null == - ($jscomp$optchain$tmpm2001243351$1 = containerInfo.ownerDocument) + ($jscomp$optchain$tmpm703203814$1 = containerInfo.ownerDocument) ? void 0 - : $jscomp$optchain$tmpm2001243351$1.defaultView) + : $jscomp$optchain$tmpm703203814$1.defaultView) ? $jscomp$nullish$tmp0 : window; for ( - $jscomp$optchain$tmpm2001243351$1 = getActiveElement( - containerInfo.document - ); - $jscomp$optchain$tmpm2001243351$1 instanceof - containerInfo.HTMLIFrameElement; + $jscomp$optchain$tmpm703203814$1 = getActiveElement(containerInfo.document); + $jscomp$optchain$tmpm703203814$1 instanceof containerInfo.HTMLIFrameElement; ) { try { var JSCompiler_inline_result = "string" === - typeof $jscomp$optchain$tmpm2001243351$1.contentWindow.location.href; + typeof $jscomp$optchain$tmpm703203814$1.contentWindow.location.href; } catch (err) { JSCompiler_inline_result = !1; } if (JSCompiler_inline_result) - containerInfo = $jscomp$optchain$tmpm2001243351$1.contentWindow; + containerInfo = $jscomp$optchain$tmpm703203814$1.contentWindow; else break; - $jscomp$optchain$tmpm2001243351$1 = getActiveElement( - containerInfo.document - ); + $jscomp$optchain$tmpm703203814$1 = getActiveElement(containerInfo.document); } - return $jscomp$optchain$tmpm2001243351$1; + return $jscomp$optchain$tmpm703203814$1; } function hasSelectionCapabilities(elem) { var nodeName = elem && elem.nodeName && elem.nodeName.toLowerCase(); @@ -2531,12 +2526,42 @@ function getRootForUpdatedFiber(sourceFiber) { } var emptyContextObject = {}, now = Scheduler.unstable_now, - completeTime = 0, - commitTime = 0, - layoutEffectStartTime = -1, - profilerStartTime = -1, - passiveEffectStartTime = -1, - currentUpdateIsNested = !1, + completeTime = -0, + commitTime = -0, + profilerStartTime = -1.1, + profilerEffectDuration = -0, + componentEffectDuration = -0, + componentEffectStartTime = -1.1, + componentEffectEndTime = -1.1; +function pushNestedEffectDurations() { + var prevEffectDuration = profilerEffectDuration; + profilerEffectDuration = 0; + return prevEffectDuration; +} +function popNestedEffectDurations(prevEffectDuration) { + var elapsedTime = profilerEffectDuration; + profilerEffectDuration = prevEffectDuration; + return elapsedTime; +} +function bubbleNestedEffectDurations(prevEffectDuration) { + var elapsedTime = profilerEffectDuration; + profilerEffectDuration += prevEffectDuration; + return elapsedTime; +} +function resetComponentEffectTimers() { + componentEffectEndTime = componentEffectStartTime = -1.1; +} +function pushComponentEffectStart() { + var prevEffectStart = componentEffectStartTime; + componentEffectStartTime = -1.1; + componentEffectDuration = -0; + return prevEffectStart; +} +function popComponentEffectStart(prevEffectStart) { + componentEffectStartTime = + 0 > prevEffectStart ? componentEffectStartTime - 0.001 : prevEffectStart; +} +var currentUpdateIsNested = !1, nestedUpdateScheduled = !1; function startProfilerTimer(fiber) { profilerStartTime = now(); @@ -2557,44 +2582,20 @@ function stopProfilerTimerIfRunningAndRecordIncompleteDuration(fiber) { profilerStartTime = -1; } } -function recordLayoutEffectDuration(fiber) { - if (0 <= layoutEffectStartTime) { - var elapsedTime = now() - layoutEffectStartTime; - layoutEffectStartTime = -1; - for (fiber = fiber.return; null !== fiber; ) { - switch (fiber.tag) { - case 3: - fiber.stateNode.effectDuration += elapsedTime; - return; - case 12: - fiber.stateNode.effectDuration += elapsedTime; - return; - } - fiber = fiber.return; - } - } -} -function recordPassiveEffectDuration(fiber) { - if (0 <= passiveEffectStartTime) { - var elapsedTime = now() - passiveEffectStartTime; - passiveEffectStartTime = -1; - for (fiber = fiber.return; null !== fiber; ) { - switch (fiber.tag) { - case 3: - fiber = fiber.stateNode; - null !== fiber && (fiber.passiveEffectDuration += elapsedTime); - return; - case 12: - fiber = fiber.stateNode; - null !== fiber && (fiber.passiveEffectDuration += elapsedTime); - return; - } - fiber = fiber.return; - } +function recordEffectDuration() { + if (0 <= profilerStartTime) { + var endTime = now(), + elapsedTime = endTime - profilerStartTime; + profilerStartTime = -1; + profilerEffectDuration += elapsedTime; + componentEffectDuration += elapsedTime; + componentEffectEndTime = endTime; } } -function startLayoutEffectTimer() { - layoutEffectStartTime = now(); +function startEffectTimer() { + profilerStartTime = now(); + 0 > componentEffectStartTime && + (componentEffectStartTime = profilerStartTime); } function transferActualDuration(fiber) { for (var child = fiber.child; child; ) @@ -2613,8 +2614,24 @@ var supportsUserTiming = start: -0, end: -0, detail: { devtools: reusableComponentDevToolDetails } - }, - CapturedStacks = new WeakMap(); + }; +function logComponentEffect(fiber, startTime, endTime, selfTime) { + fiber = getComponentNameFromFiber(fiber); + null !== fiber && + supportsUserTiming && + ((reusableComponentDevToolDetails.color = + 1 > selfTime + ? "secondary-light" + : 100 > selfTime + ? "secondary" + : 500 > selfTime + ? "secondary-dark" + : "error"), + (reusableComponentOptions.start = startTime), + (reusableComponentOptions.end = endTime), + performance.measure(fiber, reusableComponentOptions)); +} +var CapturedStacks = new WeakMap(); function createCapturedValueAtFiber(value, source) { if ("object" === typeof value && null !== value) { var stack = CapturedStacks.get(value); @@ -4138,7 +4155,7 @@ function updateReducerImpl(hook, current, reducer) { var newBaseQueueFirst = (baseFirst = null), newBaseQueueLast = null, update = current, - didReadFromEntangledAsyncAction$60 = !1; + didReadFromEntangledAsyncAction$58 = !1; do { var updateLane = update.lane & -536870913; if ( @@ -4159,11 +4176,11 @@ function updateReducerImpl(hook, current, reducer) { next: null }), updateLane === currentEntangledLane && - (didReadFromEntangledAsyncAction$60 = !0); + (didReadFromEntangledAsyncAction$58 = !0); else if ((renderLanes & revertLane) === revertLane) { update = update.next; revertLane === currentEntangledLane && - (didReadFromEntangledAsyncAction$60 = !0); + (didReadFromEntangledAsyncAction$58 = !0); continue; } else (updateLane = { @@ -4209,7 +4226,7 @@ function updateReducerImpl(hook, current, reducer) { if ( !objectIs(pendingQueue, hook.memoizedState) && ((didReceiveUpdate = !0), - didReadFromEntangledAsyncAction$60 && + didReadFromEntangledAsyncAction$58 && ((reducer = currentEntangledActionThenable), null !== reducer)) ) throw reducer; @@ -4407,8 +4424,8 @@ function runActionStateAction(actionQueue, node) { try { (prevTransition = action(prevState, payload)), handleActionReturnValue(actionQueue, node, prevTransition); - } catch (error$66) { - onActionError(actionQueue, node, error$66); + } catch (error$64) { + onActionError(actionQueue, node, error$64); } } function handleActionReturnValue(actionQueue, node, returnValue) { @@ -4845,14 +4862,14 @@ function refreshCache(fiber, seedKey, seedValue) { case 3: var lane = requestUpdateLane(); fiber = createUpdate(lane); - var root$69 = enqueueUpdate(provider, fiber, lane); - null !== root$69 && - (scheduleUpdateOnFiber(root$69, provider, lane), - entangleTransitions(root$69, provider, lane)); + var root$67 = enqueueUpdate(provider, fiber, lane); + null !== root$67 && + (scheduleUpdateOnFiber(root$67, provider, lane), + entangleTransitions(root$67, provider, lane)); provider = createCache(); null !== seedKey && void 0 !== seedKey && - null !== root$69 && + null !== root$67 && provider.data.set(seedKey, seedValue); fiber.payload = { cache: provider }; return; @@ -5375,9 +5392,9 @@ function resolveClassComponentProps(Component, baseProps) { } if ((Component = Component.defaultProps)) { newProps === baseProps && (newProps = assign({}, newProps)); - for (var propName$73 in Component) - void 0 === newProps[propName$73] && - (newProps[propName$73] = Component[propName$73]); + for (var propName$71 in Component) + void 0 === newProps[propName$71] && + (newProps[propName$71] = Component[propName$71]); } return newProps; } @@ -5423,9 +5440,9 @@ function logUncaughtError(root, errorInfo) { try { var onUncaughtError = root.onUncaughtError; onUncaughtError(errorInfo.value, { componentStack: errorInfo.stack }); - } catch (e$74) { + } catch (e$72) { setTimeout(function () { - throw e$74; + throw e$72; }); } } @@ -5436,9 +5453,9 @@ function logCaughtError(root, boundary, errorInfo) { componentStack: errorInfo.stack, errorBoundary: 1 === boundary.tag ? boundary.stateNode : null }); - } catch (e$75) { + } catch (e$73) { setTimeout(function () { - throw e$75; + throw e$73; }); } } @@ -6824,8 +6841,8 @@ function attemptEarlyBailoutIfNoScheduledUpdate( (workInProgress.flags |= 4); workInProgress.flags |= 2048; var stateNode = workInProgress.stateNode; - stateNode.effectDuration = 0; - stateNode.passiveEffectDuration = 0; + stateNode.effectDuration = -0; + stateNode.passiveEffectDuration = -0; break; case 13: stateNode = workInProgress.memoizedState; @@ -7264,8 +7281,8 @@ function beginWork(current, workInProgress, renderLanes) { (workInProgress.flags |= 4), (workInProgress.flags |= 2048), (lazyComponent = workInProgress.stateNode), - (lazyComponent.effectDuration = 0), - (lazyComponent.passiveEffectDuration = 0), + (lazyComponent.effectDuration = -0), + (lazyComponent.passiveEffectDuration = -0), reconcileChildren( current, workInProgress, @@ -7793,16 +7810,35 @@ function commitCallbacks(updateQueue, context) { ) callCallback(callbacks[updateQueue], context); } -function shouldProfile$1(current) { +function shouldProfile(current) { return 0 !== (current.mode & 2); } function commitHookLayoutEffects(finishedWork, hookFlags) { - shouldProfile$1(finishedWork) - ? (startLayoutEffectTimer(), + shouldProfile(finishedWork) + ? (startEffectTimer(), commitHookEffectListMount(hookFlags, finishedWork), - recordLayoutEffectDuration(finishedWork)) + recordEffectDuration()) : commitHookEffectListMount(hookFlags, finishedWork); } +function commitHookLayoutUnmountEffects( + finishedWork, + nearestMountedAncestor, + hookFlags +) { + shouldProfile(finishedWork) + ? (startEffectTimer(), + commitHookEffectListUnmount( + hookFlags, + finishedWork, + nearestMountedAncestor + ), + recordEffectDuration()) + : commitHookEffectListUnmount( + hookFlags, + finishedWork, + nearestMountedAncestor + ); +} function commitHookEffectListMount(flags, finishedWork) { try { var updateQueue = finishedWork.updateQueue, @@ -7828,7 +7864,7 @@ function commitHookEffectListMount(flags, finishedWork) { function commitHookEffectListUnmount( flags, finishedWork, - nearestMountedAncestor + nearestMountedAncestor$jscomp$0 ) { try { var updateQueue = finishedWork.updateQueue, @@ -7840,9 +7876,20 @@ function commitHookEffectListUnmount( if ((updateQueue.tag & flags) === flags) { var inst = updateQueue.inst, destroy = inst.destroy; - void 0 !== destroy && - ((inst.destroy = void 0), - safelyCallDestroy(finishedWork, nearestMountedAncestor, destroy)); + if (void 0 !== destroy) { + inst.destroy = void 0; + lastEffect = finishedWork; + var nearestMountedAncestor = nearestMountedAncestor$jscomp$0; + try { + destroy(); + } catch (error) { + captureCommitPhaseError( + lastEffect, + nearestMountedAncestor, + error + ); + } + } } updateQueue = updateQueue.next; } while (updateQueue !== firstEffect); @@ -7852,10 +7899,10 @@ function commitHookEffectListUnmount( } } function commitHookPassiveMountEffects(finishedWork, hookFlags) { - shouldProfile$1(finishedWork) - ? ((passiveEffectStartTime = now()), + shouldProfile(finishedWork) + ? (startEffectTimer(), commitHookEffectListMount(hookFlags, finishedWork), - recordPassiveEffectDuration(finishedWork)) + recordEffectDuration()) : commitHookEffectListMount(hookFlags, finishedWork); } function commitHookPassiveUnmountEffects( @@ -7863,14 +7910,14 @@ function commitHookPassiveUnmountEffects( nearestMountedAncestor, hookFlags ) { - shouldProfile$1(finishedWork) - ? ((passiveEffectStartTime = now()), + shouldProfile(finishedWork) + ? (startEffectTimer(), commitHookEffectListUnmount( hookFlags, finishedWork, nearestMountedAncestor ), - recordPassiveEffectDuration(finishedWork)) + recordEffectDuration()) : commitHookEffectListUnmount( hookFlags, finishedWork, @@ -7898,19 +7945,19 @@ function safelyCallComponentWillUnmount( current.memoizedProps ); instance.state = current.memoizedState; - if (shouldProfile$1(current)) { - startLayoutEffectTimer(); + if (shouldProfile(current)) { + startEffectTimer(); try { instance.componentWillUnmount(); } catch (error) { captureCommitPhaseError(current, nearestMountedAncestor, error); } - recordLayoutEffectDuration(current); + recordEffectDuration(); } else try { instance.componentWillUnmount(); - } catch (error$123) { - captureCommitPhaseError(current, nearestMountedAncestor, error$123); + } catch (error$121) { + captureCommitPhaseError(current, nearestMountedAncestor, error$121); } } function safelyAttachRef(current, nearestMountedAncestor) { @@ -7928,11 +7975,11 @@ function safelyAttachRef(current, nearestMountedAncestor) { instanceToUse = instance; } if ("function" === typeof ref) - if (shouldProfile$1(current)) + if (shouldProfile(current)) try { - startLayoutEffectTimer(), (current.refCleanup = ref(instanceToUse)); + startEffectTimer(), (current.refCleanup = ref(instanceToUse)); } finally { - recordLayoutEffectDuration(current); + recordEffectDuration(); } else current.refCleanup = ref(instanceToUse); else ref.current = instanceToUse; @@ -7947,11 +7994,11 @@ function safelyDetachRef(current, nearestMountedAncestor) { if (null !== ref) if ("function" === typeof refCleanup) try { - if (shouldProfile$1(current)) + if (shouldProfile(current)) try { - startLayoutEffectTimer(), refCleanup(); + startEffectTimer(), refCleanup(); } finally { - recordLayoutEffectDuration(current); + recordEffectDuration(current); } else refCleanup(); } catch (error) { @@ -7963,25 +8010,18 @@ function safelyDetachRef(current, nearestMountedAncestor) { } else if ("function" === typeof ref) try { - if (shouldProfile$1(current)) + if (shouldProfile(current)) try { - startLayoutEffectTimer(), ref(null); + startEffectTimer(), ref(null); } finally { - recordLayoutEffectDuration(current); + recordEffectDuration(current); } else ref(null); - } catch (error$124) { - captureCommitPhaseError(current, nearestMountedAncestor, error$124); + } catch (error$122) { + captureCommitPhaseError(current, nearestMountedAncestor, error$122); } else ref.current = null; } -function safelyCallDestroy(current, nearestMountedAncestor, destroy) { - try { - destroy(); - } catch (error) { - captureCommitPhaseError(current, nearestMountedAncestor, error); - } -} function commitProfilerUpdate( finishedWork, current, @@ -8293,7 +8333,8 @@ function commitBeforeMutationEffects(root, firstChild) { return resolvedPrevProps; } function commitLayoutEffectOnFiber(finishedRoot, current, finishedWork) { - var flags = finishedWork.flags; + var prevEffectStart = pushComponentEffectStart(), + flags = finishedWork.flags; switch (finishedWork.tag) { case 0: case 11: @@ -8305,22 +8346,22 @@ function commitLayoutEffectOnFiber(finishedRoot, current, finishedWork) { recursivelyTraverseLayoutEffects(finishedRoot, finishedWork); if (flags & 4) if (((finishedRoot = finishedWork.stateNode), null === current)) - if (shouldProfile$1(finishedWork)) { - startLayoutEffectTimer(); + if (shouldProfile(finishedWork)) { + startEffectTimer(); try { finishedRoot.componentDidMount(); } catch (error) { captureCommitPhaseError(finishedWork, finishedWork.return, error); } - recordLayoutEffectDuration(finishedWork); + recordEffectDuration(); } else try { finishedRoot.componentDidMount(); - } catch (error$120) { + } catch (error$118) { captureCommitPhaseError( finishedWork, finishedWork.return, - error$120 + error$118 ); } else { @@ -8329,22 +8370,22 @@ function commitLayoutEffectOnFiber(finishedRoot, current, finishedWork) { current.memoizedProps ); current = current.memoizedState; - if (shouldProfile$1(finishedWork)) { - startLayoutEffectTimer(); + if (shouldProfile(finishedWork)) { + startEffectTimer(); try { finishedRoot.componentDidUpdate( prevProps, current, finishedRoot.__reactInternalSnapshotBeforeUpdate ); - } catch (error$121) { + } catch (error$119) { captureCommitPhaseError( finishedWork, finishedWork.return, - error$121 + error$119 ); } - recordLayoutEffectDuration(finishedWork); + recordEffectDuration(); } else try { finishedRoot.componentDidUpdate( @@ -8352,11 +8393,11 @@ function commitLayoutEffectOnFiber(finishedRoot, current, finishedWork) { current, finishedRoot.__reactInternalSnapshotBeforeUpdate ); - } catch (error$122) { + } catch (error$120) { captureCommitPhaseError( finishedWork, finishedWork.return, - error$122 + error$120 ); } } @@ -8364,24 +8405,26 @@ function commitLayoutEffectOnFiber(finishedRoot, current, finishedWork) { flags & 512 && safelyAttachRef(finishedWork, finishedWork.return); break; case 3: + current = pushNestedEffectDurations(); recursivelyTraverseLayoutEffects(finishedRoot, finishedWork); if (flags & 64 && ((flags = finishedWork.updateQueue), null !== flags)) { - finishedRoot = null; + prevProps = null; if (null !== finishedWork.child) switch (finishedWork.child.tag) { case 27: case 5: - finishedRoot = finishedWork.child.stateNode; + prevProps = finishedWork.child.stateNode; break; case 1: - finishedRoot = finishedWork.child.stateNode; + prevProps = finishedWork.child.stateNode; } try { - commitCallbacks(flags, finishedRoot); + commitCallbacks(flags, prevProps); } catch (error) { captureCommitPhaseError(finishedWork, finishedWork.return, error); } } + finishedRoot.effectDuration += popNestedEffectDurations(current); break; case 26: recursivelyTraverseLayoutEffects(finishedRoot, finishedWork); @@ -8394,25 +8437,18 @@ function commitLayoutEffectOnFiber(finishedRoot, current, finishedWork) { flags & 512 && safelyAttachRef(finishedWork, finishedWork.return); break; case 12: - recursivelyTraverseLayoutEffects(finishedRoot, finishedWork); - if (flags & 4) - a: for ( - flags = finishedWork.stateNode.effectDuration, - commitProfilerUpdate(finishedWork, current, commitTime, flags), - finishedWork = finishedWork.return; - null !== finishedWork; - - ) { - switch (finishedWork.tag) { - case 3: - finishedWork.stateNode.effectDuration += flags; - break a; - case 12: - finishedWork.stateNode.effectDuration += flags; - break a; - } - finishedWork = finishedWork.return; - } + flags & 4 + ? ((flags = pushNestedEffectDurations()), + recursivelyTraverseLayoutEffects(finishedRoot, finishedWork), + (finishedRoot = finishedWork.stateNode), + (finishedRoot.effectDuration += bubbleNestedEffectDurations(flags)), + commitProfilerUpdate( + finishedWork, + current, + commitTime, + finishedRoot.effectDuration + )) + : recursivelyTraverseLayoutEffects(finishedRoot, finishedWork); break; case 13: recursivelyTraverseLayoutEffects(finishedRoot, finishedWork); @@ -8446,6 +8482,16 @@ function commitLayoutEffectOnFiber(finishedRoot, current, finishedWork) { default: recursivelyTraverseLayoutEffects(finishedRoot, finishedWork); } + 0 !== (finishedWork.mode & 2) && + 0 <= componentEffectStartTime && + 0 <= componentEffectEndTime && + logComponentEffect( + finishedWork, + componentEffectStartTime, + componentEffectEndTime, + componentEffectDuration + ); + popComponentEffectStart(prevEffectStart); } function detachFiberAfterEffects(fiber) { var alternate = fiber.alternate; @@ -8528,7 +8574,7 @@ function commitDeletionEffectsOnFiber( safelyDetachRef(deletedFiber, nearestMountedAncestor); case 6: prevHostParentIsContainer = hostParent; - var prevHostParentIsContainer$132 = hostParentIsContainer; + var prevHostParentIsContainer$130 = hostParentIsContainer; hostParent = null; recursivelyTraverseDeletionEffects( finishedRoot, @@ -8536,7 +8582,7 @@ function commitDeletionEffectsOnFiber( deletedFiber ); hostParent = prevHostParentIsContainer; - hostParentIsContainer = prevHostParentIsContainer$132; + hostParentIsContainer = prevHostParentIsContainer$130; if (null !== hostParent) if (hostParentIsContainer) try { @@ -8595,45 +8641,10 @@ function commitDeletionEffectsOnFiber( case 11: case 14: case 15: - if ( - !offscreenSubtreeWasHidden && - ((prevHostParent = deletedFiber.updateQueue), - null !== prevHostParent && - ((prevHostParent = prevHostParent.lastEffect), - null !== prevHostParent)) - ) { - prevHostParentIsContainer = prevHostParent = prevHostParent.next; - do { - prevHostParentIsContainer$132 = prevHostParentIsContainer.tag; - var inst = prevHostParentIsContainer.inst, - destroy = inst.destroy; - void 0 !== destroy && - (0 !== (prevHostParentIsContainer$132 & 2) - ? ((inst.destroy = void 0), - safelyCallDestroy( - deletedFiber, - nearestMountedAncestor, - destroy - )) - : 0 !== (prevHostParentIsContainer$132 & 4) && - (0 !== (deletedFiber.mode & 2) - ? (startLayoutEffectTimer(), - (inst.destroy = void 0), - safelyCallDestroy( - deletedFiber, - nearestMountedAncestor, - destroy - ), - recordLayoutEffectDuration(deletedFiber)) - : ((inst.destroy = void 0), - safelyCallDestroy( - deletedFiber, - nearestMountedAncestor, - destroy - )))); - prevHostParentIsContainer = prevHostParentIsContainer.next; - } while (prevHostParentIsContainer !== prevHostParent); - } + offscreenSubtreeWasHidden || + commitHookEffectListUnmount(2, deletedFiber, nearestMountedAncestor); + offscreenSubtreeWasHidden || + commitHookLayoutUnmountEffects(deletedFiber, nearestMountedAncestor, 4); recursivelyTraverseDeletionEffects( finishedRoot, nearestMountedAncestor, @@ -8735,6 +8746,7 @@ function attachSuspenseRetryListeners(finishedWork, wakeables) { function commitMutationEffects(root, finishedWork, committedLanes) { inProgressLanes = committedLanes; inProgressRoot = root; + resetComponentEffectTimers(); commitMutationEffectsOnFiber(finishedWork, root); inProgressRoot = inProgressLanes = null; } @@ -8779,7 +8791,8 @@ function recursivelyTraverseMutationEffects(root$jscomp$0, parentFiber) { } var currentHoistableRoot = null; function commitMutationEffectsOnFiber(finishedWork, root) { - var current = finishedWork.alternate, + var prevEffectStart = pushComponentEffectStart(), + current = finishedWork.alternate, flags = finishedWork.flags; switch (finishedWork.tag) { case 0: @@ -8791,11 +8804,7 @@ function commitMutationEffectsOnFiber(finishedWork, root) { flags & 4 && (commitHookEffectListUnmount(3, finishedWork, finishedWork.return), commitHookEffectListMount(3, finishedWork), - 0 !== (finishedWork.mode & 2) - ? (startLayoutEffectTimer(), - commitHookEffectListUnmount(5, finishedWork, finishedWork.return), - recordLayoutEffectDuration(finishedWork)) - : commitHookEffectListUnmount(5, finishedWork, finishedWork.return)); + commitHookLayoutUnmountEffects(finishedWork, finishedWork.return, 5)); break; case 1: recursivelyTraverseMutationEffects(root, finishedWork); @@ -8805,13 +8814,13 @@ function commitMutationEffectsOnFiber(finishedWork, root) { safelyDetachRef(current, current.return); flags & 64 && offscreenSubtreeIsHidden && - ((finishedWork = finishedWork.updateQueue), - null !== finishedWork && - ((flags = finishedWork.callbacks), - null !== flags && - ((current = finishedWork.shared.hiddenCallbacks), - (finishedWork.shared.hiddenCallbacks = - null === current ? flags : current.concat(flags))))); + ((flags = finishedWork.updateQueue), + null !== flags && + ((current = flags.callbacks), + null !== current && + ((root = flags.shared.hiddenCallbacks), + (flags.shared.hiddenCallbacks = + null === root ? current : root.concat(current))))); break; case 26: var hoistableRoot = currentHoistableRoot; @@ -8820,55 +8829,56 @@ function commitMutationEffectsOnFiber(finishedWork, root) { flags & 512 && null !== current && safelyDetachRef(current, current.return); - if (flags & 4) { - var currentResource = null !== current ? current.memoizedState : null; - flags = finishedWork.memoizedState; - if (null === current) + if (flags & 4) + if ( + ((root = null !== current ? current.memoizedState : null), + (flags = finishedWork.memoizedState), + null === current) + ) if (null === flags) if (null === finishedWork.stateNode) { a: { flags = finishedWork.type; current = finishedWork.memoizedProps; - hoistableRoot = hoistableRoot.ownerDocument || hoistableRoot; + root = hoistableRoot.ownerDocument || hoistableRoot; b: switch (flags) { case "title": - currentResource = - hoistableRoot.getElementsByTagName("title")[0]; + hoistableRoot = root.getElementsByTagName("title")[0]; if ( - !currentResource || - currentResource[internalHoistableMarker] || - currentResource[internalInstanceKey] || + !hoistableRoot || + hoistableRoot[internalHoistableMarker] || + hoistableRoot[internalInstanceKey] || "http://www.w3.org/2000/svg" === - currentResource.namespaceURI || - currentResource.hasAttribute("itemprop") + hoistableRoot.namespaceURI || + hoistableRoot.hasAttribute("itemprop") ) - (currentResource = hoistableRoot.createElement(flags)), - hoistableRoot.head.insertBefore( - currentResource, - hoistableRoot.querySelector("head > title") + (hoistableRoot = root.createElement(flags)), + root.head.insertBefore( + hoistableRoot, + root.querySelector("head > title") ); - setInitialProperties(currentResource, flags, current); - currentResource[internalInstanceKey] = finishedWork; - markNodeAsHoistable(currentResource); - flags = currentResource; + setInitialProperties(hoistableRoot, flags, current); + hoistableRoot[internalInstanceKey] = finishedWork; + markNodeAsHoistable(hoistableRoot); + flags = hoistableRoot; break a; case "link": var maybeNodes = getHydratableHoistableCache( "link", "href", - hoistableRoot + root ).get(flags + (current.href || "")); if (maybeNodes) for (var i = 0; i < maybeNodes.length; i++) if ( - ((currentResource = maybeNodes[i]), - currentResource.getAttribute("href") === + ((hoistableRoot = maybeNodes[i]), + hoistableRoot.getAttribute("href") === (null == current.href ? null : current.href) && - currentResource.getAttribute("rel") === + hoistableRoot.getAttribute("rel") === (null == current.rel ? null : current.rel) && - currentResource.getAttribute("title") === + hoistableRoot.getAttribute("title") === (null == current.title ? null : current.title) && - currentResource.getAttribute("crossorigin") === + hoistableRoot.getAttribute("crossorigin") === (null == current.crossOrigin ? null : current.crossOrigin)) @@ -8876,36 +8886,36 @@ function commitMutationEffectsOnFiber(finishedWork, root) { maybeNodes.splice(i, 1); break b; } - currentResource = hoistableRoot.createElement(flags); - setInitialProperties(currentResource, flags, current); - hoistableRoot.head.appendChild(currentResource); + hoistableRoot = root.createElement(flags); + setInitialProperties(hoistableRoot, flags, current); + root.head.appendChild(hoistableRoot); break; case "meta": if ( (maybeNodes = getHydratableHoistableCache( "meta", "content", - hoistableRoot + root ).get(flags + (current.content || ""))) ) for (i = 0; i < maybeNodes.length; i++) if ( - ((currentResource = maybeNodes[i]), - currentResource.getAttribute("content") === + ((hoistableRoot = maybeNodes[i]), + hoistableRoot.getAttribute("content") === (null == current.content ? null : "" + current.content) && - currentResource.getAttribute("name") === + hoistableRoot.getAttribute("name") === (null == current.name ? null : current.name) && - currentResource.getAttribute("property") === + hoistableRoot.getAttribute("property") === (null == current.property ? null : current.property) && - currentResource.getAttribute("http-equiv") === + hoistableRoot.getAttribute("http-equiv") === (null == current.httpEquiv ? null : current.httpEquiv) && - currentResource.getAttribute("charset") === + hoistableRoot.getAttribute("charset") === (null == current.charSet ? null : current.charSet)) @@ -8913,16 +8923,16 @@ function commitMutationEffectsOnFiber(finishedWork, root) { maybeNodes.splice(i, 1); break b; } - currentResource = hoistableRoot.createElement(flags); - setInitialProperties(currentResource, flags, current); - hoistableRoot.head.appendChild(currentResource); + hoistableRoot = root.createElement(flags); + setInitialProperties(hoistableRoot, flags, current); + root.head.appendChild(hoistableRoot); break; default: throw Error(formatProdErrorMessage(468, flags)); } - currentResource[internalInstanceKey] = finishedWork; - markNodeAsHoistable(currentResource); - flags = currentResource; + hoistableRoot[internalInstanceKey] = finishedWork; + markNodeAsHoistable(hoistableRoot); + flags = hoistableRoot; } finishedWork.stateNode = flags; } else @@ -8938,12 +8948,12 @@ function commitMutationEffectsOnFiber(finishedWork, root) { finishedWork.memoizedProps ); else - currentResource !== flags - ? (null === currentResource + root !== flags + ? (null === root ? null !== current.stateNode && ((current = current.stateNode), current.parentNode.removeChild(current)) - : currentResource.count--, + : root.count--, null === flags ? mountHoistable( hoistableRoot, @@ -8962,12 +8972,11 @@ function commitMutationEffectsOnFiber(finishedWork, root) { finishedWork.memoizedProps, current.memoizedProps ); - } break; case 27: if (flags & 4 && null === finishedWork.alternate) { hoistableRoot = finishedWork.stateNode; - currentResource = finishedWork.memoizedProps; + maybeNodes = finishedWork.memoizedProps; try { for (var node = hoistableRoot.firstChild; node; ) { var nextNode = node.nextSibling, @@ -8988,9 +8997,9 @@ function commitMutationEffectsOnFiber(finishedWork, root) { ) hoistableRoot.removeAttributeNode(attributes[0]); - setInitialProperties(hoistableRoot, type, currentResource); + setInitialProperties(hoistableRoot, type, maybeNodes); hoistableRoot[internalInstanceKey] = finishedWork; - hoistableRoot[internalPropsKey] = currentResource; + hoistableRoot[internalPropsKey] = maybeNodes; } catch (error) { captureCommitPhaseError(finishedWork, finishedWork.return, error); } @@ -9002,20 +9011,20 @@ function commitMutationEffectsOnFiber(finishedWork, root) { null !== current && safelyDetachRef(current, current.return); if (finishedWork.flags & 32) { - hoistableRoot = finishedWork.stateNode; + root = finishedWork.stateNode; try { - setTextContent(hoistableRoot, ""); + setTextContent(root, ""); } catch (error) { captureCommitPhaseError(finishedWork, finishedWork.return, error); } } flags & 4 && null != finishedWork.stateNode && - ((hoistableRoot = finishedWork.memoizedProps), + ((root = finishedWork.memoizedProps), commitHostUpdate( finishedWork, - hoistableRoot, - null !== current ? current.memoizedProps : hoistableRoot + root, + null !== current ? current.memoizedProps : root )); flags & 1024 && (needsFormReset = !0); break; @@ -9035,11 +9044,12 @@ function commitMutationEffectsOnFiber(finishedWork, root) { } break; case 3: + hoistableRoot = pushNestedEffectDurations(); tagCaches = null; - hoistableRoot = currentHoistableRoot; + maybeNodes = currentHoistableRoot; currentHoistableRoot = getHoistableRoot(root.containerInfo); recursivelyTraverseMutationEffects(root, finishedWork); - currentHoistableRoot = hoistableRoot; + currentHoistableRoot = maybeNodes; commitReconciliationEffects(finishedWork); if (flags & 4 && null !== current && current.memoizedState.isDehydrated) try { @@ -9049,6 +9059,7 @@ function commitMutationEffectsOnFiber(finishedWork, root) { } needsFormReset && ((needsFormReset = !1), recursivelyResetForms(finishedWork)); + root.effectDuration += popNestedEffectDurations(hoistableRoot); break; case 4: flags = currentHoistableRoot; @@ -9059,6 +9070,13 @@ function commitMutationEffectsOnFiber(finishedWork, root) { commitReconciliationEffects(finishedWork); currentHoistableRoot = flags; break; + case 12: + flags = pushNestedEffectDurations(); + recursivelyTraverseMutationEffects(root, finishedWork); + commitReconciliationEffects(finishedWork); + finishedWork.stateNode.effectDuration += + bubbleNestedEffectDurations(flags); + break; case 13: recursivelyTraverseMutationEffects(root, finishedWork); commitReconciliationEffects(finishedWork); @@ -9110,22 +9128,20 @@ function commitMutationEffectsOnFiber(finishedWork, root) { nextNode = current = root; try { if (((hoistableRoot = nextNode.stateNode), node)) - (currentResource = hoistableRoot.style), - "function" === typeof currentResource.setProperty - ? currentResource.setProperty( - "display", - "none", - "important" - ) - : (currentResource.display = "none"); + (maybeNodes = hoistableRoot.style), + "function" === typeof maybeNodes.setProperty + ? maybeNodes.setProperty("display", "none", "important") + : (maybeNodes.display = "none"); else { - maybeNodes = nextNode.stateNode; - i = nextNode.memoizedProps.style; - var display = - void 0 !== i && null !== i && i.hasOwnProperty("display") - ? i.display - : null; - maybeNodes.style.display = + i = nextNode.stateNode; + var styleProp = nextNode.memoizedProps.style, + display = + void 0 !== styleProp && + null !== styleProp && + styleProp.hasOwnProperty("display") + ? styleProp.display + : null; + i.style.display = null == display || "boolean" === typeof display ? "" : ("" + display).trim(); @@ -9188,6 +9204,16 @@ function commitMutationEffectsOnFiber(finishedWork, root) { recursivelyTraverseMutationEffects(root, finishedWork), commitReconciliationEffects(finishedWork); } + 0 !== (finishedWork.mode & 2) && + 0 <= componentEffectStartTime && + 0 <= componentEffectEndTime && + logComponentEffect( + finishedWork, + componentEffectStartTime, + componentEffectEndTime, + componentEffectDuration + ); + popComponentEffectStart(prevEffectStart); } function commitReconciliationEffects(finishedWork) { var flags = finishedWork.flags; @@ -9211,21 +9237,21 @@ function commitReconciliationEffects(finishedWork) { insertOrAppendPlacementNode(finishedWork, before, parent$jscomp$0); break; case 5: - var parent$125 = JSCompiler_inline_result.stateNode; + var parent$123 = JSCompiler_inline_result.stateNode; JSCompiler_inline_result.flags & 32 && - (setTextContent(parent$125, ""), + (setTextContent(parent$123, ""), (JSCompiler_inline_result.flags &= -33)); - var before$126 = getHostSibling(finishedWork); - insertOrAppendPlacementNode(finishedWork, before$126, parent$125); + var before$124 = getHostSibling(finishedWork); + insertOrAppendPlacementNode(finishedWork, before$124, parent$123); break; case 3: case 4: - var parent$127 = JSCompiler_inline_result.stateNode.containerInfo, - before$128 = getHostSibling(finishedWork); + var parent$125 = JSCompiler_inline_result.stateNode.containerInfo, + before$126 = getHostSibling(finishedWork); insertOrAppendPlacementNodeIntoContainer( finishedWork, - before$128, - parent$127 + before$126, + parent$125 ); break; default: @@ -9251,6 +9277,7 @@ function recursivelyResetForms(parentFiber) { function commitLayoutEffects(finishedWork, root, committedLanes) { inProgressLanes = committedLanes; inProgressRoot = root; + resetComponentEffectTimers(); commitLayoutEffectOnFiber(root, finishedWork.alternate, finishedWork); inProgressRoot = inProgressLanes = null; } @@ -9268,14 +9295,7 @@ function recursivelyTraverseDisappearLayoutEffects(parentFiber) { case 11: case 14: case 15: - if (0 !== (finishedWork.mode & 2)) - try { - startLayoutEffectTimer(), - commitHookEffectListUnmount(4, finishedWork, finishedWork.return); - } finally { - recordLayoutEffectDuration(finishedWork); - } - else commitHookEffectListUnmount(4, finishedWork, finishedWork.return); + commitHookLayoutUnmountEffects(finishedWork, finishedWork.return, 4); recursivelyTraverseDisappearLayoutEffects(finishedWork); break; case 1: @@ -9380,29 +9400,26 @@ function recursivelyTraverseReappearLayoutEffects( safelyAttachRef(finishedWork, finishedWork.return); break; case 12: - recursivelyTraverseReappearLayoutEffects( - finishedRoot, - finishedWork, - includeWorkInProgressEffects - ); - if (includeWorkInProgressEffects && flags & 4) - a: for ( - flags = finishedWork.stateNode.effectDuration, - commitProfilerUpdate(finishedWork, current, commitTime, flags), - finishedWork = finishedWork.return; - null !== finishedWork; - - ) { - switch (finishedWork.tag) { - case 3: - finishedWork.stateNode.effectDuration += flags; - break a; - case 12: - finishedWork.stateNode.effectDuration += flags; - break a; - } - finishedWork = finishedWork.return; - } + includeWorkInProgressEffects && flags & 4 + ? ((flags = pushNestedEffectDurations()), + recursivelyTraverseReappearLayoutEffects( + finishedRoot, + finishedWork, + includeWorkInProgressEffects + ), + (finishedRoot = finishedWork.stateNode), + (finishedRoot.effectDuration += bubbleNestedEffectDurations(flags)), + commitProfilerUpdate( + finishedWork, + current, + commitTime, + finishedRoot.effectDuration + )) + : recursivelyTraverseReappearLayoutEffects( + finishedRoot, + finishedWork, + includeWorkInProgressEffects + ); break; case 13: recursivelyTraverseReappearLayoutEffects( @@ -9487,14 +9504,34 @@ function commitPassiveMountOnFiber( committedTransitions, endTime ) { + var prevEffectStart = pushComponentEffectStart(); if (0 !== (finishedWork.mode & 2) && 0 < finishedWork.actualStartTime) { var startTime = finishedWork.actualStartTime, name = getComponentNameFromFiber(finishedWork); - null !== name && - supportsUserTiming && - ((reusableComponentOptions.start = startTime), - (reusableComponentOptions.end = endTime), - performance.measure(name, reusableComponentOptions)); + if (null !== name && supportsUserTiming) { + var selfTime = finishedWork.actualDuration; + if ( + null === finishedWork.alternate || + finishedWork.alternate.child !== finishedWork.child + ) + for ( + var child = finishedWork.child; + null !== child; + child = child.sibling + ) + selfTime -= child.actualDuration; + reusableComponentDevToolDetails.color = + 0.5 > selfTime + ? "primary-light" + : 10 > selfTime + ? "primary" + : 100 > selfTime + ? "primary-dark" + : "error"; + reusableComponentOptions.start = startTime; + reusableComponentOptions.end = endTime; + performance.measure(name, reusableComponentOptions); + } } startTime = finishedWork.flags; switch (finishedWork.tag) { @@ -9511,6 +9548,7 @@ function commitPassiveMountOnFiber( startTime & 2048 && commitHookPassiveMountEffects(finishedWork, 9); break; case 3: + var prevEffectDuration = pushNestedEffectDurations(); recursivelyTraversePassiveMountEffects( finishedRoot, finishedWork, @@ -9519,55 +9557,60 @@ function commitPassiveMountOnFiber( endTime ); startTime & 2048 && - ((finishedRoot = null), + ((committedLanes = null), null !== finishedWork.alternate && - (finishedRoot = finishedWork.alternate.memoizedState.cache), - (finishedWork = finishedWork.memoizedState.cache), - finishedWork !== finishedRoot && - (finishedWork.refCount++, - null != finishedRoot && releaseCache(finishedRoot))); + (committedLanes = finishedWork.alternate.memoizedState.cache), + (committedTransitions = finishedWork.memoizedState.cache), + committedTransitions !== committedLanes && + (committedTransitions.refCount++, + null != committedLanes && releaseCache(committedLanes))); + finishedRoot.passiveEffectDuration += + popNestedEffectDurations(prevEffectDuration); break; case 12: - recursivelyTraversePassiveMountEffects( - finishedRoot, - finishedWork, - committedLanes, - committedTransitions, - endTime - ); if (startTime & 2048) { - finishedRoot = finishedWork.stateNode.passiveEffectDuration; + startTime = pushNestedEffectDurations(); + recursivelyTraversePassiveMountEffects( + finishedRoot, + finishedWork, + committedLanes, + committedTransitions, + endTime + ); + finishedRoot = finishedWork.stateNode; + finishedRoot.passiveEffectDuration += + bubbleNestedEffectDurations(startTime); try { - var _finishedWork$memoize2 = finishedWork.memoizedProps, - id = _finishedWork$memoize2.id, - onPostCommit = _finishedWork$memoize2.onPostCommit, + prevEffectDuration = finishedWork.memoizedProps; + var id = prevEffectDuration.id, + onPostCommit = prevEffectDuration.onPostCommit, phase = null === finishedWork.alternate ? "mount" : "update"; currentUpdateIsNested && (phase = "nested-update"); "function" === typeof onPostCommit && - onPostCommit(id, phase, finishedRoot, commitTime); + onPostCommit( + id, + phase, + finishedRoot.passiveEffectDuration, + commitTime + ); } catch (error) { captureCommitPhaseError(finishedWork, finishedWork.return, error); } - finishedWork = finishedWork.return; - a: for (; null !== finishedWork; ) { - switch (finishedWork.tag) { - case 3: - finishedWork.stateNode.passiveEffectDuration += finishedRoot; - break a; - case 12: - finishedWork.stateNode.passiveEffectDuration += finishedRoot; - break a; - } - finishedWork = finishedWork.return; - } - } + } else + recursivelyTraversePassiveMountEffects( + finishedRoot, + finishedWork, + committedLanes, + committedTransitions, + endTime + ); break; case 23: break; case 22: - _finishedWork$memoize2 = finishedWork.stateNode; + prevEffectDuration = finishedWork.stateNode; null !== finishedWork.memoizedState - ? _finishedWork$memoize2._visibility & 4 + ? prevEffectDuration._visibility & 4 ? recursivelyTraversePassiveMountEffects( finishedRoot, finishedWork, @@ -9576,7 +9619,7 @@ function commitPassiveMountOnFiber( endTime ) : recursivelyTraverseAtomicPassiveEffects(finishedRoot, finishedWork) - : _finishedWork$memoize2._visibility & 4 + : prevEffectDuration._visibility & 4 ? recursivelyTraversePassiveMountEffects( finishedRoot, finishedWork, @@ -9584,7 +9627,7 @@ function commitPassiveMountOnFiber( committedTransitions, endTime ) - : ((_finishedWork$memoize2._visibility |= 4), + : ((prevEffectDuration._visibility |= 4), recursivelyTraverseReconnectPassiveEffects( finishedRoot, finishedWork, @@ -9618,6 +9661,16 @@ function commitPassiveMountOnFiber( endTime ); } + 0 !== (finishedWork.mode & 2) && + 0 <= componentEffectStartTime && + 0 <= componentEffectEndTime && + logComponentEffect( + finishedWork, + componentEffectStartTime, + componentEffectEndTime, + componentEffectDuration + ); + popComponentEffectStart(prevEffectStart); } function recursivelyTraverseReconnectPassiveEffects( finishedRoot$jscomp$0, @@ -9810,6 +9863,7 @@ function recursivelyTraversePassiveUnmountEffects(parentFiber) { (parentFiber = parentFiber.sibling); } function commitPassiveUnmountOnFiber(finishedWork) { + var prevEffectStart = pushComponentEffectStart(); switch (finishedWork.tag) { case 0: case 11: @@ -9818,18 +9872,40 @@ function commitPassiveUnmountOnFiber(finishedWork) { finishedWork.flags & 2048 && commitHookPassiveUnmountEffects(finishedWork, finishedWork.return, 9); break; + case 3: + var prevEffectDuration = pushNestedEffectDurations(); + recursivelyTraversePassiveUnmountEffects(finishedWork); + finishedWork.stateNode.passiveEffectDuration += + popNestedEffectDurations(prevEffectDuration); + break; + case 12: + prevEffectDuration = pushNestedEffectDurations(); + recursivelyTraversePassiveUnmountEffects(finishedWork); + finishedWork.stateNode.passiveEffectDuration += + bubbleNestedEffectDurations(prevEffectDuration); + break; case 22: - var instance = finishedWork.stateNode; + prevEffectDuration = finishedWork.stateNode; null !== finishedWork.memoizedState && - instance._visibility & 4 && + prevEffectDuration._visibility & 4 && (null === finishedWork.return || 13 !== finishedWork.return.tag) - ? ((instance._visibility &= -5), + ? ((prevEffectDuration._visibility &= -5), recursivelyTraverseDisconnectPassiveEffects(finishedWork)) : recursivelyTraversePassiveUnmountEffects(finishedWork); break; default: recursivelyTraversePassiveUnmountEffects(finishedWork); } + 0 !== (finishedWork.mode & 2) && + 0 <= componentEffectStartTime && + 0 <= componentEffectEndTime && + logComponentEffect( + finishedWork, + componentEffectStartTime, + componentEffectEndTime, + componentEffectDuration + ); + popComponentEffectStart(prevEffectStart); } function recursivelyTraverseDisconnectPassiveEffects(parentFiber) { var deletions = parentFiber.deletions; @@ -10206,14 +10282,14 @@ function cutOffTailIfNeeded(renderState, hasRenderedATailFallback) { break; case "collapsed": lastTailNode = renderState.tail; - for (var lastTailNode$146 = null; null !== lastTailNode; ) - null !== lastTailNode.alternate && (lastTailNode$146 = lastTailNode), + for (var lastTailNode$145 = null; null !== lastTailNode; ) + null !== lastTailNode.alternate && (lastTailNode$145 = lastTailNode), (lastTailNode = lastTailNode.sibling); - null === lastTailNode$146 + null === lastTailNode$145 ? hasRenderedATailFallback || null === renderState.tail ? (renderState.tail = null) : (renderState.tail.sibling = null) - : (lastTailNode$146.sibling = null); + : (lastTailNode$145.sibling = null); } } function bubbleProperties(completedWork) { @@ -10225,53 +10301,53 @@ function bubbleProperties(completedWork) { if (didBailout) if (0 !== (completedWork.mode & 2)) { for ( - var treeBaseDuration$148 = completedWork.selfBaseDuration, - child$149 = completedWork.child; - null !== child$149; + var treeBaseDuration$147 = completedWork.selfBaseDuration, + child$148 = completedWork.child; + null !== child$148; ) - (newChildLanes |= child$149.lanes | child$149.childLanes), - (subtreeFlags |= child$149.subtreeFlags & 31457280), - (subtreeFlags |= child$149.flags & 31457280), - (treeBaseDuration$148 += child$149.treeBaseDuration), - (child$149 = child$149.sibling); - completedWork.treeBaseDuration = treeBaseDuration$148; + (newChildLanes |= child$148.lanes | child$148.childLanes), + (subtreeFlags |= child$148.subtreeFlags & 31457280), + (subtreeFlags |= child$148.flags & 31457280), + (treeBaseDuration$147 += child$148.treeBaseDuration), + (child$148 = child$148.sibling); + completedWork.treeBaseDuration = treeBaseDuration$147; } else for ( - treeBaseDuration$148 = completedWork.child; - null !== treeBaseDuration$148; + treeBaseDuration$147 = completedWork.child; + null !== treeBaseDuration$147; ) (newChildLanes |= - treeBaseDuration$148.lanes | treeBaseDuration$148.childLanes), - (subtreeFlags |= treeBaseDuration$148.subtreeFlags & 31457280), - (subtreeFlags |= treeBaseDuration$148.flags & 31457280), - (treeBaseDuration$148.return = completedWork), - (treeBaseDuration$148 = treeBaseDuration$148.sibling); + treeBaseDuration$147.lanes | treeBaseDuration$147.childLanes), + (subtreeFlags |= treeBaseDuration$147.subtreeFlags & 31457280), + (subtreeFlags |= treeBaseDuration$147.flags & 31457280), + (treeBaseDuration$147.return = completedWork), + (treeBaseDuration$147 = treeBaseDuration$147.sibling); else if (0 !== (completedWork.mode & 2)) { - treeBaseDuration$148 = completedWork.actualDuration; - child$149 = completedWork.selfBaseDuration; + treeBaseDuration$147 = completedWork.actualDuration; + child$148 = completedWork.selfBaseDuration; for (var child = completedWork.child; null !== child; ) (newChildLanes |= child.lanes | child.childLanes), (subtreeFlags |= child.subtreeFlags), (subtreeFlags |= child.flags), - (treeBaseDuration$148 += child.actualDuration), - (child$149 += child.treeBaseDuration), + (treeBaseDuration$147 += child.actualDuration), + (child$148 += child.treeBaseDuration), (child = child.sibling); - completedWork.actualDuration = treeBaseDuration$148; - completedWork.treeBaseDuration = child$149; + completedWork.actualDuration = treeBaseDuration$147; + completedWork.treeBaseDuration = child$148; } else for ( - treeBaseDuration$148 = completedWork.child; - null !== treeBaseDuration$148; + treeBaseDuration$147 = completedWork.child; + null !== treeBaseDuration$147; ) (newChildLanes |= - treeBaseDuration$148.lanes | treeBaseDuration$148.childLanes), - (subtreeFlags |= treeBaseDuration$148.subtreeFlags), - (subtreeFlags |= treeBaseDuration$148.flags), - (treeBaseDuration$148.return = completedWork), - (treeBaseDuration$148 = treeBaseDuration$148.sibling); + treeBaseDuration$147.lanes | treeBaseDuration$147.childLanes), + (subtreeFlags |= treeBaseDuration$147.subtreeFlags), + (subtreeFlags |= treeBaseDuration$147.flags), + (treeBaseDuration$147.return = completedWork), + (treeBaseDuration$147 = treeBaseDuration$147.sibling); completedWork.subtreeFlags |= subtreeFlags; completedWork.childLanes = newChildLanes; return didBailout; @@ -10564,11 +10640,11 @@ function completeWork(current, workInProgress, renderLanes) { null !== newProps.alternate.memoizedState && null !== newProps.alternate.memoizedState.cachePool && (type = newProps.alternate.memoizedState.cachePool.pool); - var cache$164 = null; + var cache$163 = null; null !== newProps.memoizedState && null !== newProps.memoizedState.cachePool && - (cache$164 = newProps.memoizedState.cachePool.pool); - cache$164 !== type && (newProps.flags |= 2048); + (cache$163 = newProps.memoizedState.cachePool.pool); + cache$163 !== type && (newProps.flags |= 2048); } renderLanes !== current && renderLanes && @@ -10598,8 +10674,8 @@ function completeWork(current, workInProgress, renderLanes) { type = workInProgress.memoizedState; if (null === type) return bubbleProperties(workInProgress), null; newProps = 0 !== (workInProgress.flags & 128); - cache$164 = type.rendering; - if (null === cache$164) + cache$163 = type.rendering; + if (null === cache$163) if (newProps) cutOffTailIfNeeded(type, !1); else { if ( @@ -10607,11 +10683,11 @@ function completeWork(current, workInProgress, renderLanes) { (null !== current && 0 !== (current.flags & 128)) ) for (current = workInProgress.child; null !== current; ) { - cache$164 = findFirstSuspended(current); - if (null !== cache$164) { + cache$163 = findFirstSuspended(current); + if (null !== cache$163) { workInProgress.flags |= 128; cutOffTailIfNeeded(type, !1); - current = cache$164.updateQueue; + current = cache$163.updateQueue; workInProgress.updateQueue = current; scheduleRetryEffect(workInProgress, current); workInProgress.subtreeFlags = 0; @@ -10636,7 +10712,7 @@ function completeWork(current, workInProgress, renderLanes) { } else { if (!newProps) - if (((current = findFirstSuspended(cache$164)), null !== current)) { + if (((current = findFirstSuspended(cache$163)), null !== current)) { if ( ((workInProgress.flags |= 128), (newProps = !0), @@ -10646,7 +10722,7 @@ function completeWork(current, workInProgress, renderLanes) { cutOffTailIfNeeded(type, !0), null === type.tail && "hidden" === type.tailMode && - !cache$164.alternate && + !cache$163.alternate && !isHydrating) ) return bubbleProperties(workInProgress), null; @@ -10659,13 +10735,13 @@ function completeWork(current, workInProgress, renderLanes) { cutOffTailIfNeeded(type, !1), (workInProgress.lanes = 4194304)); type.isBackwards - ? ((cache$164.sibling = workInProgress.child), - (workInProgress.child = cache$164)) + ? ((cache$163.sibling = workInProgress.child), + (workInProgress.child = cache$163)) : ((current = type.last), null !== current - ? (current.sibling = cache$164) - : (workInProgress.child = cache$164), - (type.last = cache$164)); + ? (current.sibling = cache$163) + : (workInProgress.child = cache$163), + (type.last = cache$163)); } if (null !== type.tail) return ( @@ -11439,8 +11515,8 @@ function renderRootSync(root, lanes) { } workLoopSync(); break; - } catch (thrownValue$179) { - handleThrow(root, thrownValue$179); + } catch (thrownValue$178) { + handleThrow(root, thrownValue$178); } while (1); lanes && root.shellSuspendCounter++; @@ -11558,8 +11634,8 @@ function renderRootConcurrent(root, lanes) { } workLoopConcurrent(); break; - } catch (thrownValue$181) { - handleThrow(root, thrownValue$181); + } catch (thrownValue$180) { + handleThrow(root, thrownValue$180); } while (1); resetContextDependencies(); @@ -11864,7 +11940,7 @@ function releaseRootPooledCache(root, remainingLanes) { } function flushPassiveEffects() { if (null !== rootWithPendingPassiveEffects) { - var root$185 = rootWithPendingPassiveEffects, + var root$184 = rootWithPendingPassiveEffects, remainingLanes = pendingPassiveEffectsRemainingLanes; pendingPassiveEffectsRemainingLanes = 0; var renderPriority = lanesToEventPriority(pendingPassiveEffectsLanes), @@ -11896,10 +11972,14 @@ function flushPassiveEffects() { : "Other"; var prevExecutionContext = executionContext; executionContext |= 4; - commitPassiveUnmountOnFiber(root.current); + var finishedWork = root.current; + resetComponentEffectTimers(); + commitPassiveUnmountOnFiber(finishedWork); + var finishedWork$jscomp$0 = root.current; + resetComponentEffectTimers(); commitPassiveMountOnFiber( root, - root.current, + finishedWork$jscomp$0, lanes, renderPriority, completeTime @@ -11922,7 +12002,7 @@ function flushPassiveEffects() { } finally { (ReactDOMSharedInternals.p = previousPriority), (ReactSharedInternals.T = prevTransition), - releaseRootPooledCache(root$185, remainingLanes); + releaseRootPooledCache(root$184, remainingLanes); } } return !1; @@ -12088,14 +12168,14 @@ function flushSyncWorkAcrossRoots_impl(syncTransitionLanes, onlyLegacy) { isFlushingWork = !0; do { var didPerformSomeWork = !1; - for (var root$187 = firstScheduledRoot; null !== root$187; ) { + for (var root$186 = firstScheduledRoot; null !== root$186; ) { if (!onlyLegacy) if (0 !== syncTransitionLanes) { - var pendingLanes = root$187.pendingLanes; + var pendingLanes = root$186.pendingLanes; if (0 === pendingLanes) var JSCompiler_inline_result = 0; else { - var suspendedLanes = root$187.suspendedLanes, - pingedLanes = root$187.pingedLanes; + var suspendedLanes = root$186.suspendedLanes, + pingedLanes = root$186.pingedLanes; JSCompiler_inline_result = (1 << (31 - clz32(42 | syncTransitionLanes) + 1)) - 1; JSCompiler_inline_result &= @@ -12109,17 +12189,17 @@ function flushSyncWorkAcrossRoots_impl(syncTransitionLanes, onlyLegacy) { } 0 !== JSCompiler_inline_result && ((didPerformSomeWork = !0), - performSyncWorkOnRoot(root$187, JSCompiler_inline_result)); + performSyncWorkOnRoot(root$186, JSCompiler_inline_result)); } else (JSCompiler_inline_result = workInProgressRootRenderLanes), (JSCompiler_inline_result = getNextLanes( - root$187, - root$187 === workInProgressRoot ? JSCompiler_inline_result : 0 + root$186, + root$186 === workInProgressRoot ? JSCompiler_inline_result : 0 )), 0 !== (JSCompiler_inline_result & 3) && ((didPerformSomeWork = !0), - performSyncWorkOnRoot(root$187, JSCompiler_inline_result)); - root$187 = root$187.next; + performSyncWorkOnRoot(root$186, JSCompiler_inline_result)); + root$186 = root$186.next; } } while (didPerformSomeWork); isFlushingWork = !1; @@ -12329,20 +12409,20 @@ function extractEvents$1( } } for ( - var i$jscomp$inline_1454 = 0; - i$jscomp$inline_1454 < simpleEventPluginEvents.length; - i$jscomp$inline_1454++ + var i$jscomp$inline_1453 = 0; + i$jscomp$inline_1453 < simpleEventPluginEvents.length; + i$jscomp$inline_1453++ ) { - var eventName$jscomp$inline_1455 = - simpleEventPluginEvents[i$jscomp$inline_1454], - domEventName$jscomp$inline_1456 = - eventName$jscomp$inline_1455.toLowerCase(), - capitalizedEvent$jscomp$inline_1457 = - eventName$jscomp$inline_1455[0].toUpperCase() + - eventName$jscomp$inline_1455.slice(1); + var eventName$jscomp$inline_1454 = + simpleEventPluginEvents[i$jscomp$inline_1453], + domEventName$jscomp$inline_1455 = + eventName$jscomp$inline_1454.toLowerCase(), + capitalizedEvent$jscomp$inline_1456 = + eventName$jscomp$inline_1454[0].toUpperCase() + + eventName$jscomp$inline_1454.slice(1); registerSimpleEvent( - domEventName$jscomp$inline_1456, - "on" + capitalizedEvent$jscomp$inline_1457 + domEventName$jscomp$inline_1455, + "on" + capitalizedEvent$jscomp$inline_1456 ); } registerSimpleEvent(ANIMATION_END, "onAnimationEnd"); @@ -13525,34 +13605,34 @@ function setInitialProperties(domElement, tag, props) { defaultChecked = null; for (hasSrc in props) if (props.hasOwnProperty(hasSrc)) { - var propValue$201 = props[hasSrc]; - if (null != propValue$201) + var propValue$200 = props[hasSrc]; + if (null != propValue$200) switch (hasSrc) { case "name": - hasSrcSet = propValue$201; + hasSrcSet = propValue$200; break; case "type": - propValue = propValue$201; + propValue = propValue$200; break; case "checked": - checked = propValue$201; + checked = propValue$200; break; case "defaultChecked": - defaultChecked = propValue$201; + defaultChecked = propValue$200; break; case "value": - propKey = propValue$201; + propKey = propValue$200; break; case "defaultValue": - defaultValue = propValue$201; + defaultValue = propValue$200; break; case "children": case "dangerouslySetInnerHTML": - if (null != propValue$201) + if (null != propValue$200) throw Error(formatProdErrorMessage(137, tag)); break; default: - setProp(domElement, tag, hasSrc, propValue$201, props, null); + setProp(domElement, tag, hasSrc, propValue$200, props, null); } } initInput( @@ -13689,14 +13769,14 @@ function setInitialProperties(domElement, tag, props) { return; default: if (isCustomElement(tag)) { - for (propValue$201 in props) - props.hasOwnProperty(propValue$201) && - ((hasSrc = props[propValue$201]), + for (propValue$200 in props) + props.hasOwnProperty(propValue$200) && + ((hasSrc = props[propValue$200]), void 0 !== hasSrc && setPropOnCustomElement( domElement, tag, - propValue$201, + propValue$200, hasSrc, props, void 0 @@ -13744,14 +13824,14 @@ function updateProperties(domElement, tag, lastProps, nextProps) { setProp(domElement, tag, propKey, null, nextProps, lastProp); } } - for (var propKey$218 in nextProps) { - var propKey = nextProps[propKey$218]; - lastProp = lastProps[propKey$218]; + for (var propKey$217 in nextProps) { + var propKey = nextProps[propKey$217]; + lastProp = lastProps[propKey$217]; if ( - nextProps.hasOwnProperty(propKey$218) && + nextProps.hasOwnProperty(propKey$217) && (null != propKey || null != lastProp) ) - switch (propKey$218) { + switch (propKey$217) { case "type": type = propKey; break; @@ -13780,7 +13860,7 @@ function updateProperties(domElement, tag, lastProps, nextProps) { setProp( domElement, tag, - propKey$218, + propKey$217, propKey, nextProps, lastProp @@ -13799,7 +13879,7 @@ function updateProperties(domElement, tag, lastProps, nextProps) { ); return; case "select": - propKey = value = defaultValue = propKey$218 = null; + propKey = value = defaultValue = propKey$217 = null; for (type in lastProps) if ( ((lastDefaultValue = lastProps[type]), @@ -13830,7 +13910,7 @@ function updateProperties(domElement, tag, lastProps, nextProps) { ) switch (name) { case "value": - propKey$218 = type; + propKey$217 = type; break; case "defaultValue": defaultValue = type; @@ -13851,15 +13931,15 @@ function updateProperties(domElement, tag, lastProps, nextProps) { tag = defaultValue; lastProps = value; nextProps = propKey; - null != propKey$218 - ? updateOptions(domElement, !!lastProps, propKey$218, !1) + null != propKey$217 + ? updateOptions(domElement, !!lastProps, propKey$217, !1) : !!nextProps !== !!lastProps && (null != tag ? updateOptions(domElement, !!lastProps, tag, !0) : updateOptions(domElement, !!lastProps, lastProps ? [] : "", !1)); return; case "textarea": - propKey = propKey$218 = null; + propKey = propKey$217 = null; for (defaultValue in lastProps) if ( ((name = lastProps[defaultValue]), @@ -13883,7 +13963,7 @@ function updateProperties(domElement, tag, lastProps, nextProps) { ) switch (value) { case "value": - propKey$218 = name; + propKey$217 = name; break; case "defaultValue": propKey = name; @@ -13897,17 +13977,17 @@ function updateProperties(domElement, tag, lastProps, nextProps) { name !== type && setProp(domElement, tag, value, name, nextProps, type); } - updateTextarea(domElement, propKey$218, propKey); + updateTextarea(domElement, propKey$217, propKey); return; case "option": - for (var propKey$234 in lastProps) + for (var propKey$233 in lastProps) if ( - ((propKey$218 = lastProps[propKey$234]), - lastProps.hasOwnProperty(propKey$234) && - null != propKey$218 && - !nextProps.hasOwnProperty(propKey$234)) + ((propKey$217 = lastProps[propKey$233]), + lastProps.hasOwnProperty(propKey$233) && + null != propKey$217 && + !nextProps.hasOwnProperty(propKey$233)) ) - switch (propKey$234) { + switch (propKey$233) { case "selected": domElement.selected = !1; break; @@ -13915,33 +13995,33 @@ function updateProperties(domElement, tag, lastProps, nextProps) { setProp( domElement, tag, - propKey$234, + propKey$233, null, nextProps, - propKey$218 + propKey$217 ); } for (lastDefaultValue in nextProps) if ( - ((propKey$218 = nextProps[lastDefaultValue]), + ((propKey$217 = nextProps[lastDefaultValue]), (propKey = lastProps[lastDefaultValue]), nextProps.hasOwnProperty(lastDefaultValue) && - propKey$218 !== propKey && - (null != propKey$218 || null != propKey)) + propKey$217 !== propKey && + (null != propKey$217 || null != propKey)) ) switch (lastDefaultValue) { case "selected": domElement.selected = - propKey$218 && - "function" !== typeof propKey$218 && - "symbol" !== typeof propKey$218; + propKey$217 && + "function" !== typeof propKey$217 && + "symbol" !== typeof propKey$217; break; default: setProp( domElement, tag, lastDefaultValue, - propKey$218, + propKey$217, nextProps, propKey ); @@ -13962,24 +14042,24 @@ function updateProperties(domElement, tag, lastProps, nextProps) { case "track": case "wbr": case "menuitem": - for (var propKey$239 in lastProps) - (propKey$218 = lastProps[propKey$239]), - lastProps.hasOwnProperty(propKey$239) && - null != propKey$218 && - !nextProps.hasOwnProperty(propKey$239) && - setProp(domElement, tag, propKey$239, null, nextProps, propKey$218); + for (var propKey$238 in lastProps) + (propKey$217 = lastProps[propKey$238]), + lastProps.hasOwnProperty(propKey$238) && + null != propKey$217 && + !nextProps.hasOwnProperty(propKey$238) && + setProp(domElement, tag, propKey$238, null, nextProps, propKey$217); for (checked in nextProps) if ( - ((propKey$218 = nextProps[checked]), + ((propKey$217 = nextProps[checked]), (propKey = lastProps[checked]), nextProps.hasOwnProperty(checked) && - propKey$218 !== propKey && - (null != propKey$218 || null != propKey)) + propKey$217 !== propKey && + (null != propKey$217 || null != propKey)) ) switch (checked) { case "children": case "dangerouslySetInnerHTML": - if (null != propKey$218) + if (null != propKey$217) throw Error(formatProdErrorMessage(137, tag)); break; default: @@ -13987,7 +14067,7 @@ function updateProperties(domElement, tag, lastProps, nextProps) { domElement, tag, checked, - propKey$218, + propKey$217, nextProps, propKey ); @@ -13995,49 +14075,49 @@ function updateProperties(domElement, tag, lastProps, nextProps) { return; default: if (isCustomElement(tag)) { - for (var propKey$244 in lastProps) - (propKey$218 = lastProps[propKey$244]), - lastProps.hasOwnProperty(propKey$244) && - void 0 !== propKey$218 && - !nextProps.hasOwnProperty(propKey$244) && + for (var propKey$243 in lastProps) + (propKey$217 = lastProps[propKey$243]), + lastProps.hasOwnProperty(propKey$243) && + void 0 !== propKey$217 && + !nextProps.hasOwnProperty(propKey$243) && setPropOnCustomElement( domElement, tag, - propKey$244, + propKey$243, void 0, nextProps, - propKey$218 + propKey$217 ); for (defaultChecked in nextProps) - (propKey$218 = nextProps[defaultChecked]), + (propKey$217 = nextProps[defaultChecked]), (propKey = lastProps[defaultChecked]), !nextProps.hasOwnProperty(defaultChecked) || - propKey$218 === propKey || - (void 0 === propKey$218 && void 0 === propKey) || + propKey$217 === propKey || + (void 0 === propKey$217 && void 0 === propKey) || setPropOnCustomElement( domElement, tag, defaultChecked, - propKey$218, + propKey$217, nextProps, propKey ); return; } } - for (var propKey$249 in lastProps) - (propKey$218 = lastProps[propKey$249]), - lastProps.hasOwnProperty(propKey$249) && - null != propKey$218 && - !nextProps.hasOwnProperty(propKey$249) && - setProp(domElement, tag, propKey$249, null, nextProps, propKey$218); + for (var propKey$248 in lastProps) + (propKey$217 = lastProps[propKey$248]), + lastProps.hasOwnProperty(propKey$248) && + null != propKey$217 && + !nextProps.hasOwnProperty(propKey$248) && + setProp(domElement, tag, propKey$248, null, nextProps, propKey$217); for (lastProp in nextProps) - (propKey$218 = nextProps[lastProp]), + (propKey$217 = nextProps[lastProp]), (propKey = lastProps[lastProp]), !nextProps.hasOwnProperty(lastProp) || - propKey$218 === propKey || - (null == propKey$218 && null == propKey) || - setProp(domElement, tag, lastProp, propKey$218, nextProps, propKey); + propKey$217 === propKey || + (null == propKey$217 && null == propKey) || + setProp(domElement, tag, lastProp, propKey$217, nextProps, propKey); } var eventsEnabled = null, selectionInformation = null; @@ -14582,26 +14662,26 @@ function getResource(type, currentProps, pendingProps, currentResource) { "string" === typeof pendingProps.precedence ) { type = getStyleKey(pendingProps.href); - var styles$257 = getResourcesFromRoot( + var styles$256 = getResourcesFromRoot( JSCompiler_inline_result ).hoistableStyles, - resource$258 = styles$257.get(type); - resource$258 || + resource$257 = styles$256.get(type); + resource$257 || ((JSCompiler_inline_result = JSCompiler_inline_result.ownerDocument || JSCompiler_inline_result), - (resource$258 = { + (resource$257 = { type: "stylesheet", instance: null, count: 0, state: { loading: 0, preload: null } }), - styles$257.set(type, resource$258), - (styles$257 = JSCompiler_inline_result.querySelector( + styles$256.set(type, resource$257), + (styles$256 = JSCompiler_inline_result.querySelector( getStylesheetSelectorFromKey(type) )) && - !styles$257._p && - ((resource$258.instance = styles$257), - (resource$258.state.loading = 5)), + !styles$256._p && + ((resource$257.instance = styles$256), + (resource$257.state.loading = 5)), preloadPropsMap.has(type) || ((pendingProps = { rel: "preload", @@ -14614,16 +14694,16 @@ function getResource(type, currentProps, pendingProps, currentResource) { referrerPolicy: pendingProps.referrerPolicy }), preloadPropsMap.set(type, pendingProps), - styles$257 || + styles$256 || preloadStylesheet( JSCompiler_inline_result, type, pendingProps, - resource$258.state + resource$257.state ))); if (currentProps && null === currentResource) throw Error(formatProdErrorMessage(528, "")); - return resource$258; + return resource$257; } if (currentProps && null !== currentResource) throw Error(formatProdErrorMessage(529, "")); @@ -14720,37 +14800,37 @@ function acquireResource(hoistableRoot, resource, props) { return (resource.instance = instance); case "stylesheet": styleProps = getStyleKey(props.href); - var instance$263 = hoistableRoot.querySelector( + var instance$262 = hoistableRoot.querySelector( getStylesheetSelectorFromKey(styleProps) ); - if (instance$263) + if (instance$262) return ( (resource.state.loading |= 4), - (resource.instance = instance$263), - markNodeAsHoistable(instance$263), - instance$263 + (resource.instance = instance$262), + markNodeAsHoistable(instance$262), + instance$262 ); instance = stylesheetPropsFromRawProps(props); (styleProps = preloadPropsMap.get(styleProps)) && adoptPreloadPropsForStylesheet(instance, styleProps); - instance$263 = ( + instance$262 = ( hoistableRoot.ownerDocument || hoistableRoot ).createElement("link"); - markNodeAsHoistable(instance$263); - var linkInstance = instance$263; + markNodeAsHoistable(instance$262); + var linkInstance = instance$262; linkInstance._p = new Promise(function (resolve, reject) { linkInstance.onload = resolve; linkInstance.onerror = reject; }); - setInitialProperties(instance$263, "link", instance); + setInitialProperties(instance$262, "link", instance); resource.state.loading |= 4; - insertStylesheet(instance$263, props.precedence, hoistableRoot); - return (resource.instance = instance$263); + insertStylesheet(instance$262, props.precedence, hoistableRoot); + return (resource.instance = instance$262); case "script": - instance$263 = getScriptKey(props.src); + instance$262 = getScriptKey(props.src); if ( (styleProps = hoistableRoot.querySelector( - getScriptSelectorFromKey(instance$263) + getScriptSelectorFromKey(instance$262) )) ) return ( @@ -14759,7 +14839,7 @@ function acquireResource(hoistableRoot, resource, props) { styleProps ); instance = props; - if ((styleProps = preloadPropsMap.get(instance$263))) + if ((styleProps = preloadPropsMap.get(instance$262))) (instance = assign({}, props)), adoptPreloadPropsForScript(instance, styleProps); hoistableRoot = hoistableRoot.ownerDocument || hoistableRoot; @@ -15097,7 +15177,7 @@ function FiberRootNode( this.pooledCacheLanes = 0; this.formState = formState; this.incompleteTransitions = new Map(); - this.passiveEffectDuration = this.effectDuration = 0; + this.passiveEffectDuration = this.effectDuration = -0; this.memoizedUpdaters = new Set(); containerInfo = this.pendingUpdatersLaneMap = []; for (tag = 0; 31 > tag; tag++) containerInfo.push(new Set()); @@ -15799,16 +15879,16 @@ ReactDOMHydrationRoot.prototype.unstable_scheduleHydration = function (target) { 0 === i && attemptExplicitHydrationTarget(target); } }; -var isomorphicReactPackageVersion$jscomp$inline_1701 = React.version; +var isomorphicReactPackageVersion$jscomp$inline_1700 = React.version; if ( - "19.0.0-experimental-a99d8e8d-20240916" !== - isomorphicReactPackageVersion$jscomp$inline_1701 + "19.0.0-experimental-5dcb0097-20240918" !== + isomorphicReactPackageVersion$jscomp$inline_1700 ) throw Error( formatProdErrorMessage( 527, - isomorphicReactPackageVersion$jscomp$inline_1701, - "19.0.0-experimental-a99d8e8d-20240916" + isomorphicReactPackageVersion$jscomp$inline_1700, + "19.0.0-experimental-5dcb0097-20240918" ) ); ReactDOMSharedInternals.findDOMNode = function (componentOrElement) { @@ -15828,25 +15908,25 @@ ReactDOMSharedInternals.findDOMNode = function (componentOrElement) { null === componentOrElement ? null : componentOrElement.stateNode; return componentOrElement; }; -var internals$jscomp$inline_2126 = { +var internals$jscomp$inline_2125 = { bundleType: 0, - version: "19.0.0-experimental-a99d8e8d-20240916", + version: "19.0.0-experimental-5dcb0097-20240918", rendererPackageName: "react-dom", currentDispatcherRef: ReactSharedInternals, findFiberByHostInstance: getClosestInstanceFromNode, - reconcilerVersion: "19.0.0-experimental-a99d8e8d-20240916" + reconcilerVersion: "19.0.0-experimental-5dcb0097-20240918" }; if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) { - var hook$jscomp$inline_2127 = __REACT_DEVTOOLS_GLOBAL_HOOK__; + var hook$jscomp$inline_2126 = __REACT_DEVTOOLS_GLOBAL_HOOK__; if ( - !hook$jscomp$inline_2127.isDisabled && - hook$jscomp$inline_2127.supportsFiber + !hook$jscomp$inline_2126.isDisabled && + hook$jscomp$inline_2126.supportsFiber ) try { - (rendererID = hook$jscomp$inline_2127.inject( - internals$jscomp$inline_2126 + (rendererID = hook$jscomp$inline_2126.inject( + internals$jscomp$inline_2125 )), - (injectedHook = hook$jscomp$inline_2127); + (injectedHook = hook$jscomp$inline_2126); } catch (err) {} } function noop() {} @@ -16099,7 +16179,7 @@ exports.useFormState = function (action, initialState, permalink) { exports.useFormStatus = function () { return ReactSharedInternals.H.useHostTransitionStatus(); }; -exports.version = "19.0.0-experimental-a99d8e8d-20240916"; +exports.version = "19.0.0-experimental-5dcb0097-20240918"; "undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ && "function" === typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStop && diff --git a/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server-legacy.browser.development.js b/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server-legacy.browser.development.js index 976c9a913972b..3ee52c00258a6 100644 --- a/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server-legacy.browser.development.js +++ b/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server-legacy.browser.development.js @@ -9290,5 +9290,5 @@ 'The server used "renderToString" which does not support Suspense. If you intended for this Suspense boundary to render the fallback content on the server consider throwing an Error somewhere within the Suspense boundary. If you intended to have the server wait for the suspended component please switch to "renderToReadableStream" which supports Suspense on the server' ); }; - exports.version = "19.0.0-experimental-a99d8e8d-20240916"; + exports.version = "19.0.0-experimental-5dcb0097-20240918"; })(); diff --git a/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server-legacy.browser.production.js b/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server-legacy.browser.production.js index 4cd02b7662484..b282ff566ca6e 100644 --- a/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server-legacy.browser.production.js +++ b/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server-legacy.browser.production.js @@ -6054,4 +6054,4 @@ exports.renderToString = function (children, options) { 'The server used "renderToString" which does not support Suspense. If you intended for this Suspense boundary to render the fallback content on the server consider throwing an Error somewhere within the Suspense boundary. If you intended to have the server wait for the suspended component please switch to "renderToReadableStream" which supports Suspense on the server' ); }; -exports.version = "19.0.0-experimental-a99d8e8d-20240916"; +exports.version = "19.0.0-experimental-5dcb0097-20240918"; diff --git a/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server-legacy.node.development.js b/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server-legacy.node.development.js index cb84b28a24ad0..8823b80e4b24a 100644 --- a/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server-legacy.node.development.js +++ b/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server-legacy.node.development.js @@ -9290,5 +9290,5 @@ 'The server used "renderToString" which does not support Suspense. If you intended for this Suspense boundary to render the fallback content on the server consider throwing an Error somewhere within the Suspense boundary. If you intended to have the server wait for the suspended component please switch to "renderToPipeableStream" which supports Suspense on the server' ); }; - exports.version = "19.0.0-experimental-a99d8e8d-20240916"; + exports.version = "19.0.0-experimental-5dcb0097-20240918"; })(); diff --git a/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server-legacy.node.production.js b/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server-legacy.node.production.js index 90ec6a7028aa0..b5744830c23e3 100644 --- a/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server-legacy.node.production.js +++ b/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server-legacy.node.production.js @@ -6146,4 +6146,4 @@ exports.renderToString = function (children, options) { 'The server used "renderToString" which does not support Suspense. If you intended for this Suspense boundary to render the fallback content on the server consider throwing an Error somewhere within the Suspense boundary. If you intended to have the server wait for the suspended component please switch to "renderToPipeableStream" which supports Suspense on the server' ); }; -exports.version = "19.0.0-experimental-a99d8e8d-20240916"; +exports.version = "19.0.0-experimental-5dcb0097-20240918"; diff --git a/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server.browser.development.js b/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server.browser.development.js index 0604e30a16285..57ed34433a373 100644 --- a/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server.browser.development.js +++ b/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server.browser.development.js @@ -8190,11 +8190,11 @@ } function ensureCorrectIsomorphicReactVersion() { var isomorphicReactPackageVersion = React.version; - if ("19.0.0-experimental-a99d8e8d-20240916" !== isomorphicReactPackageVersion) + if ("19.0.0-experimental-5dcb0097-20240918" !== isomorphicReactPackageVersion) throw Error( 'Incompatible React versions: The "react" and "react-dom" packages must have the exact same version. Instead got:\n - react: ' + (isomorphicReactPackageVersion + - "\n - react-dom: 19.0.0-experimental-a99d8e8d-20240916\nLearn more: https://react.dev/warnings/version-mismatch") + "\n - react-dom: 19.0.0-experimental-5dcb0097-20240918\nLearn more: https://react.dev/warnings/version-mismatch") ); } var React = require("next/dist/compiled/react-experimental"), @@ -9974,5 +9974,5 @@ startWork(request); }); }; - exports.version = "19.0.0-experimental-a99d8e8d-20240916"; + exports.version = "19.0.0-experimental-5dcb0097-20240918"; })(); diff --git a/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server.browser.production.js b/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server.browser.production.js index c9e31ed0ca2e5..b490c9858fbc0 100644 --- a/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server.browser.production.js +++ b/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server.browser.production.js @@ -6585,12 +6585,12 @@ function getPostponedState(request) { } function ensureCorrectIsomorphicReactVersion() { var isomorphicReactPackageVersion = React.version; - if ("19.0.0-experimental-a99d8e8d-20240916" !== isomorphicReactPackageVersion) + if ("19.0.0-experimental-5dcb0097-20240918" !== isomorphicReactPackageVersion) throw Error( formatProdErrorMessage( 527, isomorphicReactPackageVersion, - "19.0.0-experimental-a99d8e8d-20240916" + "19.0.0-experimental-5dcb0097-20240918" ) ); } @@ -6845,4 +6845,4 @@ exports.resumeAndPrerender = function (children, postponedState, options) { startWork(request); }); }; -exports.version = "19.0.0-experimental-a99d8e8d-20240916"; +exports.version = "19.0.0-experimental-5dcb0097-20240918"; diff --git a/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server.bun.production.js b/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server.bun.production.js index 633179286a89e..5c98cad35dabc 100644 --- a/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server.bun.production.js +++ b/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server.bun.production.js @@ -6067,13 +6067,13 @@ function addToReplayParent(node, parentKeyPath, trackedPostpones) { } var isomorphicReactPackageVersion$jscomp$inline_783 = React.version; if ( - "19.0.0-experimental-a99d8e8d-20240916" !== + "19.0.0-experimental-5dcb0097-20240918" !== isomorphicReactPackageVersion$jscomp$inline_783 ) throw Error( 'Incompatible React versions: The "react" and "react-dom" packages must have the exact same version. Instead got:\n - react: ' + (isomorphicReactPackageVersion$jscomp$inline_783 + - "\n - react-dom: 19.0.0-experimental-a99d8e8d-20240916\nLearn more: https://react.dev/warnings/version-mismatch") + "\n - react-dom: 19.0.0-experimental-5dcb0097-20240918\nLearn more: https://react.dev/warnings/version-mismatch") ); exports.renderToReadableStream = function (children, options) { return new Promise(function (resolve, reject) { @@ -6161,4 +6161,4 @@ exports.renderToReadableStream = function (children, options) { startWork(request); }); }; -exports.version = "19.0.0-experimental-a99d8e8d-20240916"; +exports.version = "19.0.0-experimental-5dcb0097-20240918"; diff --git a/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server.edge.development.js b/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server.edge.development.js index 3748821599724..a16f2f6693785 100644 --- a/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server.edge.development.js +++ b/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server.edge.development.js @@ -8213,11 +8213,11 @@ } function ensureCorrectIsomorphicReactVersion() { var isomorphicReactPackageVersion = React.version; - if ("19.0.0-experimental-a99d8e8d-20240916" !== isomorphicReactPackageVersion) + if ("19.0.0-experimental-5dcb0097-20240918" !== isomorphicReactPackageVersion) throw Error( 'Incompatible React versions: The "react" and "react-dom" packages must have the exact same version. Instead got:\n - react: ' + (isomorphicReactPackageVersion + - "\n - react-dom: 19.0.0-experimental-a99d8e8d-20240916\nLearn more: https://react.dev/warnings/version-mismatch") + "\n - react-dom: 19.0.0-experimental-5dcb0097-20240918\nLearn more: https://react.dev/warnings/version-mismatch") ); } var React = require("next/dist/compiled/react-experimental"), @@ -10004,5 +10004,5 @@ const setTimeoutOrImmediate = ? globalThis['set' + 'Immediate'] : setTimeout; - exports.version = "19.0.0-experimental-a99d8e8d-20240916"; + exports.version = "19.0.0-experimental-5dcb0097-20240918"; })(); diff --git a/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server.edge.production.js b/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server.edge.production.js index 2334f07addae6..cd79422a50841 100644 --- a/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server.edge.production.js +++ b/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server.edge.production.js @@ -6693,11 +6693,11 @@ function getPostponedState(request) { } function ensureCorrectIsomorphicReactVersion() { var isomorphicReactPackageVersion = React.version; - if ("19.0.0-experimental-a99d8e8d-20240916" !== isomorphicReactPackageVersion) + if ("19.0.0-experimental-5dcb0097-20240918" !== isomorphicReactPackageVersion) throw Error( 'Incompatible React versions: The "react" and "react-dom" packages must have the exact same version. Instead got:\n - react: ' + (isomorphicReactPackageVersion + - "\n - react-dom: 19.0.0-experimental-a99d8e8d-20240916\nLearn more: https://react.dev/warnings/version-mismatch") + "\n - react-dom: 19.0.0-experimental-5dcb0097-20240918\nLearn more: https://react.dev/warnings/version-mismatch") ); } ensureCorrectIsomorphicReactVersion(); @@ -6962,4 +6962,4 @@ const setTimeoutOrImmediate = ? globalThis['set' + 'Immediate'] : setTimeout; -exports.version = "19.0.0-experimental-a99d8e8d-20240916"; +exports.version = "19.0.0-experimental-5dcb0097-20240918"; diff --git a/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server.node.development.js b/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server.node.development.js index 01949f0e00e39..127bd6c5625bb 100644 --- a/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server.node.development.js +++ b/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server.node.development.js @@ -8071,11 +8071,11 @@ } function ensureCorrectIsomorphicReactVersion() { var isomorphicReactPackageVersion = React.version; - if ("19.0.0-experimental-a99d8e8d-20240916" !== isomorphicReactPackageVersion) + if ("19.0.0-experimental-5dcb0097-20240918" !== isomorphicReactPackageVersion) throw Error( 'Incompatible React versions: The "react" and "react-dom" packages must have the exact same version. Instead got:\n - react: ' + (isomorphicReactPackageVersion + - "\n - react-dom: 19.0.0-experimental-a99d8e8d-20240916\nLearn more: https://react.dev/warnings/version-mismatch") + "\n - react-dom: 19.0.0-experimental-5dcb0097-20240918\nLearn more: https://react.dev/warnings/version-mismatch") ); } function createDrainHandler(destination, request) { @@ -9848,5 +9848,5 @@ } }; }; - exports.version = "19.0.0-experimental-a99d8e8d-20240916"; + exports.version = "19.0.0-experimental-5dcb0097-20240918"; })(); diff --git a/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server.node.production.js b/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server.node.production.js index 25cadc6196fb0..6c992ea580290 100644 --- a/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server.node.production.js +++ b/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server.node.production.js @@ -6566,11 +6566,11 @@ function getPostponedState(request) { } function ensureCorrectIsomorphicReactVersion() { var isomorphicReactPackageVersion = React.version; - if ("19.0.0-experimental-a99d8e8d-20240916" !== isomorphicReactPackageVersion) + if ("19.0.0-experimental-5dcb0097-20240918" !== isomorphicReactPackageVersion) throw Error( 'Incompatible React versions: The "react" and "react-dom" packages must have the exact same version. Instead got:\n - react: ' + (isomorphicReactPackageVersion + - "\n - react-dom: 19.0.0-experimental-a99d8e8d-20240916\nLearn more: https://react.dev/warnings/version-mismatch") + "\n - react-dom: 19.0.0-experimental-5dcb0097-20240918\nLearn more: https://react.dev/warnings/version-mismatch") ); } ensureCorrectIsomorphicReactVersion(); @@ -6821,4 +6821,4 @@ exports.resumeToPipeableStream = function (children, postponedState, options) { } }; }; -exports.version = "19.0.0-experimental-a99d8e8d-20240916"; +exports.version = "19.0.0-experimental-5dcb0097-20240918"; diff --git a/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-unstable_testing.development.js b/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-unstable_testing.development.js index d93e6312211cb..04a9790662b7b 100644 --- a/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-unstable_testing.development.js +++ b/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-unstable_testing.development.js @@ -3606,43 +3606,41 @@ : !1; } function getActiveElementDeep(containerInfo) { - var $jscomp$optchain$tmpm1620391534$1, $jscomp$nullish$tmp0; + var $jscomp$optchain$tmp147699024$1, $jscomp$nullish$tmp0; containerInfo = null != ($jscomp$nullish$tmp0 = null == containerInfo ? void 0 : null == - ($jscomp$optchain$tmpm1620391534$1 = - containerInfo.ownerDocument) + ($jscomp$optchain$tmp147699024$1 = containerInfo.ownerDocument) ? void 0 - : $jscomp$optchain$tmpm1620391534$1.defaultView) + : $jscomp$optchain$tmp147699024$1.defaultView) ? $jscomp$nullish$tmp0 : window; for ( - $jscomp$optchain$tmpm1620391534$1 = getActiveElement( + $jscomp$optchain$tmp147699024$1 = getActiveElement( containerInfo.document ); - $jscomp$optchain$tmpm1620391534$1 instanceof + $jscomp$optchain$tmp147699024$1 instanceof containerInfo.HTMLIFrameElement; ) { try { var JSCompiler_inline_result = "string" === - typeof $jscomp$optchain$tmpm1620391534$1.contentWindow.location - .href; + typeof $jscomp$optchain$tmp147699024$1.contentWindow.location.href; } catch (err) { JSCompiler_inline_result = !1; } if (JSCompiler_inline_result) - containerInfo = $jscomp$optchain$tmpm1620391534$1.contentWindow; + containerInfo = $jscomp$optchain$tmp147699024$1.contentWindow; else break; - $jscomp$optchain$tmpm1620391534$1 = getActiveElement( + $jscomp$optchain$tmp147699024$1 = getActiveElement( containerInfo.document ); } - return $jscomp$optchain$tmpm1620391534$1; + return $jscomp$optchain$tmp147699024$1; } function hasSelectionCapabilities(elem) { var nodeName = elem && elem.nodeName && elem.nodeName.toLowerCase(); @@ -4018,6 +4016,36 @@ staleFamilies ); } + function pushNestedEffectDurations() { + var prevEffectDuration = profilerEffectDuration; + profilerEffectDuration = 0; + return prevEffectDuration; + } + function popNestedEffectDurations(prevEffectDuration) { + var elapsedTime = profilerEffectDuration; + profilerEffectDuration = prevEffectDuration; + return elapsedTime; + } + function bubbleNestedEffectDurations(prevEffectDuration) { + var elapsedTime = profilerEffectDuration; + profilerEffectDuration += prevEffectDuration; + return elapsedTime; + } + function resetComponentEffectTimers() { + componentEffectEndTime = componentEffectStartTime = -1.1; + } + function pushComponentEffectStart() { + var prevEffectStart = componentEffectStartTime; + componentEffectStartTime = -1.1; + componentEffectDuration = -0; + return prevEffectStart; + } + function popComponentEffectStart(prevEffectStart) { + componentEffectStartTime = + 0 > prevEffectStart + ? componentEffectStartTime - 0.001 + : prevEffectStart; + } function startProfilerTimer(fiber) { profilerStartTime = now(); 0 > fiber.actualStartTime && (fiber.actualStartTime = profilerStartTime); @@ -4037,49 +4065,41 @@ profilerStartTime = -1; } } - function recordLayoutEffectDuration(fiber) { - if (0 <= layoutEffectStartTime) { - var elapsedTime = now() - layoutEffectStartTime; - layoutEffectStartTime = -1; - for (fiber = fiber.return; null !== fiber; ) { - switch (fiber.tag) { - case 3: - fiber.stateNode.effectDuration += elapsedTime; - return; - case 12: - fiber.stateNode.effectDuration += elapsedTime; - return; - } - fiber = fiber.return; - } - } - } - function recordPassiveEffectDuration(fiber) { - if (0 <= passiveEffectStartTime) { - var elapsedTime = now() - passiveEffectStartTime; - passiveEffectStartTime = -1; - for (fiber = fiber.return; null !== fiber; ) { - switch (fiber.tag) { - case 3: - fiber = fiber.stateNode; - null !== fiber && (fiber.passiveEffectDuration += elapsedTime); - return; - case 12: - fiber = fiber.stateNode; - null !== fiber && (fiber.passiveEffectDuration += elapsedTime); - return; - } - fiber = fiber.return; - } + function recordEffectDuration() { + if (0 <= profilerStartTime) { + var endTime = now(), + elapsedTime = endTime - profilerStartTime; + profilerStartTime = -1; + profilerEffectDuration += elapsedTime; + componentEffectDuration += elapsedTime; + componentEffectEndTime = endTime; } } - function startLayoutEffectTimer() { - layoutEffectStartTime = now(); + function startEffectTimer() { + profilerStartTime = now(); + 0 > componentEffectStartTime && + (componentEffectStartTime = profilerStartTime); } function transferActualDuration(fiber) { for (var child = fiber.child; child; ) (fiber.actualDuration += child.actualDuration), (child = child.sibling); } + function logComponentEffect(fiber, startTime, endTime, selfTime) { + fiber = getComponentNameFromFiber(fiber); + null !== fiber && + supportsUserTiming && + ((reusableComponentDevToolDetails.color = + 1 > selfTime + ? "secondary-light" + : 100 > selfTime + ? "secondary" + : 500 > selfTime + ? "secondary-dark" + : "error"), + (reusableComponentOptions.start = startTime), + (reusableComponentOptions.end = endTime), + performance.measure(fiber, reusableComponentOptions)); + } function createCapturedValueAtFiber(value, source) { if ("object" === typeof value && null !== value) { var stack = CapturedStacks.get(value); @@ -8848,33 +8868,33 @@ return current; } function updateSuspenseComponent(current, workInProgress, renderLanes) { - var JSCompiler_object_inline_componentStack_2287; - var JSCompiler_object_inline_stack_2286 = workInProgress.pendingProps; + var JSCompiler_object_inline_componentStack_2273; + var JSCompiler_object_inline_stack_2272 = workInProgress.pendingProps; shouldSuspendImpl(workInProgress) && (workInProgress.flags |= 128); - var JSCompiler_object_inline_message_2284 = !1; + var JSCompiler_object_inline_message_2270 = !1; var didSuspend = 0 !== (workInProgress.flags & 128); - (JSCompiler_object_inline_componentStack_2287 = didSuspend) || - (JSCompiler_object_inline_componentStack_2287 = + (JSCompiler_object_inline_componentStack_2273 = didSuspend) || + (JSCompiler_object_inline_componentStack_2273 = null !== current && null === current.memoizedState ? !1 : 0 !== (suspenseStackCursor.current & ForceSuspenseFallback)); - JSCompiler_object_inline_componentStack_2287 && - ((JSCompiler_object_inline_message_2284 = !0), + JSCompiler_object_inline_componentStack_2273 && + ((JSCompiler_object_inline_message_2270 = !0), (workInProgress.flags &= -129)); - JSCompiler_object_inline_componentStack_2287 = + JSCompiler_object_inline_componentStack_2273 = 0 !== (workInProgress.flags & 32); workInProgress.flags &= -33; if (null === current) { if (isHydrating) { - JSCompiler_object_inline_message_2284 + JSCompiler_object_inline_message_2270 ? pushPrimaryTreeSuspenseHandler(workInProgress) : reuseSuspenseHandlerOnStack(workInProgress); if (isHydrating) { - var JSCompiler_object_inline_digest_2285 = nextHydratableInstance; + var JSCompiler_object_inline_digest_2271 = nextHydratableInstance; var JSCompiler_temp; - if (!(JSCompiler_temp = !JSCompiler_object_inline_digest_2285)) { + if (!(JSCompiler_temp = !JSCompiler_object_inline_digest_2271)) { c: { - var instance = JSCompiler_object_inline_digest_2285; + var instance = JSCompiler_object_inline_digest_2271; for ( JSCompiler_temp = rootOrSingletonContext; 8 !== instance.nodeType; @@ -8915,19 +8935,19 @@ JSCompiler_temp && (warnNonHydratedInstance( workInProgress, - JSCompiler_object_inline_digest_2285 + JSCompiler_object_inline_digest_2271 ), throwOnHydrationMismatch(workInProgress)); } - JSCompiler_object_inline_digest_2285 = workInProgress.memoizedState; + JSCompiler_object_inline_digest_2271 = workInProgress.memoizedState; if ( - null !== JSCompiler_object_inline_digest_2285 && - ((JSCompiler_object_inline_digest_2285 = - JSCompiler_object_inline_digest_2285.dehydrated), - null !== JSCompiler_object_inline_digest_2285) + null !== JSCompiler_object_inline_digest_2271 && + ((JSCompiler_object_inline_digest_2271 = + JSCompiler_object_inline_digest_2271.dehydrated), + null !== JSCompiler_object_inline_digest_2271) ) return ( - JSCompiler_object_inline_digest_2285.data === + JSCompiler_object_inline_digest_2271.data === SUSPENSE_FALLBACK_START_DATA ? (workInProgress.lanes = 16) : (workInProgress.lanes = 536870912), @@ -8935,68 +8955,68 @@ ); popSuspenseHandler(workInProgress); } - JSCompiler_object_inline_digest_2285 = - JSCompiler_object_inline_stack_2286.children; - JSCompiler_temp = JSCompiler_object_inline_stack_2286.fallback; - if (JSCompiler_object_inline_message_2284) + JSCompiler_object_inline_digest_2271 = + JSCompiler_object_inline_stack_2272.children; + JSCompiler_temp = JSCompiler_object_inline_stack_2272.fallback; + if (JSCompiler_object_inline_message_2270) return ( reuseSuspenseHandlerOnStack(workInProgress), - (JSCompiler_object_inline_stack_2286 = + (JSCompiler_object_inline_stack_2272 = mountSuspenseFallbackChildren( workInProgress, - JSCompiler_object_inline_digest_2285, + JSCompiler_object_inline_digest_2271, JSCompiler_temp, renderLanes )), - (JSCompiler_object_inline_message_2284 = workInProgress.child), - (JSCompiler_object_inline_message_2284.memoizedState = + (JSCompiler_object_inline_message_2270 = workInProgress.child), + (JSCompiler_object_inline_message_2270.memoizedState = mountSuspenseOffscreenState(renderLanes)), - (JSCompiler_object_inline_message_2284.childLanes = + (JSCompiler_object_inline_message_2270.childLanes = getRemainingWorkInPrimaryTree( current, - JSCompiler_object_inline_componentStack_2287, + JSCompiler_object_inline_componentStack_2273, renderLanes )), (workInProgress.memoizedState = SUSPENDED_MARKER), - JSCompiler_object_inline_stack_2286 + JSCompiler_object_inline_stack_2272 ); if ( "number" === - typeof JSCompiler_object_inline_stack_2286.unstable_expectedLoadTime + typeof JSCompiler_object_inline_stack_2272.unstable_expectedLoadTime ) return ( reuseSuspenseHandlerOnStack(workInProgress), - (JSCompiler_object_inline_stack_2286 = + (JSCompiler_object_inline_stack_2272 = mountSuspenseFallbackChildren( workInProgress, - JSCompiler_object_inline_digest_2285, + JSCompiler_object_inline_digest_2271, JSCompiler_temp, renderLanes )), - (JSCompiler_object_inline_message_2284 = workInProgress.child), - (JSCompiler_object_inline_message_2284.memoizedState = + (JSCompiler_object_inline_message_2270 = workInProgress.child), + (JSCompiler_object_inline_message_2270.memoizedState = mountSuspenseOffscreenState(renderLanes)), - (JSCompiler_object_inline_message_2284.childLanes = + (JSCompiler_object_inline_message_2270.childLanes = getRemainingWorkInPrimaryTree( current, - JSCompiler_object_inline_componentStack_2287, + JSCompiler_object_inline_componentStack_2273, renderLanes )), (workInProgress.memoizedState = SUSPENDED_MARKER), (workInProgress.lanes = 4194304), - JSCompiler_object_inline_stack_2286 + JSCompiler_object_inline_stack_2272 ); pushPrimaryTreeSuspenseHandler(workInProgress); return mountSuspensePrimaryChildren( workInProgress, - JSCompiler_object_inline_digest_2285 + JSCompiler_object_inline_digest_2271 ); } var prevState = current.memoizedState; if ( null !== prevState && - ((JSCompiler_object_inline_digest_2285 = prevState.dehydrated), - null !== JSCompiler_object_inline_digest_2285) + ((JSCompiler_object_inline_digest_2271 = prevState.dehydrated), + null !== JSCompiler_object_inline_digest_2271) ) { if (didSuspend) workInProgress.flags & 256 @@ -9013,94 +9033,94 @@ (workInProgress.flags |= 128), (workInProgress = null)) : (reuseSuspenseHandlerOnStack(workInProgress), - (JSCompiler_object_inline_message_2284 = - JSCompiler_object_inline_stack_2286.fallback), - (JSCompiler_object_inline_digest_2285 = workInProgress.mode), - (JSCompiler_object_inline_stack_2286 = + (JSCompiler_object_inline_message_2270 = + JSCompiler_object_inline_stack_2272.fallback), + (JSCompiler_object_inline_digest_2271 = workInProgress.mode), + (JSCompiler_object_inline_stack_2272 = mountWorkInProgressOffscreenFiber( { mode: "visible", - children: JSCompiler_object_inline_stack_2286.children + children: JSCompiler_object_inline_stack_2272.children }, - JSCompiler_object_inline_digest_2285 + JSCompiler_object_inline_digest_2271 )), - (JSCompiler_object_inline_message_2284 = + (JSCompiler_object_inline_message_2270 = createFiberFromFragment( - JSCompiler_object_inline_message_2284, - JSCompiler_object_inline_digest_2285, + JSCompiler_object_inline_message_2270, + JSCompiler_object_inline_digest_2271, renderLanes, null )), - (JSCompiler_object_inline_message_2284.flags |= 2), - (JSCompiler_object_inline_stack_2286.return = workInProgress), - (JSCompiler_object_inline_message_2284.return = workInProgress), - (JSCompiler_object_inline_stack_2286.sibling = - JSCompiler_object_inline_message_2284), - (workInProgress.child = JSCompiler_object_inline_stack_2286), + (JSCompiler_object_inline_message_2270.flags |= 2), + (JSCompiler_object_inline_stack_2272.return = workInProgress), + (JSCompiler_object_inline_message_2270.return = workInProgress), + (JSCompiler_object_inline_stack_2272.sibling = + JSCompiler_object_inline_message_2270), + (workInProgress.child = JSCompiler_object_inline_stack_2272), reconcileChildFibers( workInProgress, current.child, null, renderLanes ), - (JSCompiler_object_inline_stack_2286 = workInProgress.child), - (JSCompiler_object_inline_stack_2286.memoizedState = + (JSCompiler_object_inline_stack_2272 = workInProgress.child), + (JSCompiler_object_inline_stack_2272.memoizedState = mountSuspenseOffscreenState(renderLanes)), - (JSCompiler_object_inline_stack_2286.childLanes = + (JSCompiler_object_inline_stack_2272.childLanes = getRemainingWorkInPrimaryTree( current, - JSCompiler_object_inline_componentStack_2287, + JSCompiler_object_inline_componentStack_2273, renderLanes )), (workInProgress.memoizedState = SUSPENDED_MARKER), - (workInProgress = JSCompiler_object_inline_message_2284)); + (workInProgress = JSCompiler_object_inline_message_2270)); else if ( (pushPrimaryTreeSuspenseHandler(workInProgress), isHydrating && console.error( "We should not be hydrating here. This is a bug in React. Please file a bug." ), - JSCompiler_object_inline_digest_2285.data === + JSCompiler_object_inline_digest_2271.data === SUSPENSE_FALLBACK_START_DATA) ) { - JSCompiler_object_inline_componentStack_2287 = - JSCompiler_object_inline_digest_2285.nextSibling && - JSCompiler_object_inline_digest_2285.nextSibling.dataset; - if (JSCompiler_object_inline_componentStack_2287) { - JSCompiler_temp = JSCompiler_object_inline_componentStack_2287.dgst; - var message = JSCompiler_object_inline_componentStack_2287.msg; - instance = JSCompiler_object_inline_componentStack_2287.stck; + JSCompiler_object_inline_componentStack_2273 = + JSCompiler_object_inline_digest_2271.nextSibling && + JSCompiler_object_inline_digest_2271.nextSibling.dataset; + if (JSCompiler_object_inline_componentStack_2273) { + JSCompiler_temp = JSCompiler_object_inline_componentStack_2273.dgst; + var message = JSCompiler_object_inline_componentStack_2273.msg; + instance = JSCompiler_object_inline_componentStack_2273.stck; var componentStack = - JSCompiler_object_inline_componentStack_2287.cstck; + JSCompiler_object_inline_componentStack_2273.cstck; } - JSCompiler_object_inline_message_2284 = message; - JSCompiler_object_inline_digest_2285 = JSCompiler_temp; - JSCompiler_object_inline_stack_2286 = instance; - JSCompiler_object_inline_componentStack_2287 = componentStack; - "POSTPONE" !== JSCompiler_object_inline_digest_2285 && - ((JSCompiler_object_inline_message_2284 = - JSCompiler_object_inline_message_2284 - ? Error(JSCompiler_object_inline_message_2284) + JSCompiler_object_inline_message_2270 = message; + JSCompiler_object_inline_digest_2271 = JSCompiler_temp; + JSCompiler_object_inline_stack_2272 = instance; + JSCompiler_object_inline_componentStack_2273 = componentStack; + "POSTPONE" !== JSCompiler_object_inline_digest_2271 && + ((JSCompiler_object_inline_message_2270 = + JSCompiler_object_inline_message_2270 + ? Error(JSCompiler_object_inline_message_2270) : Error( "The server could not finish this Suspense boundary, likely due to an error during server rendering. Switched to client rendering." )), - (JSCompiler_object_inline_message_2284.stack = - JSCompiler_object_inline_stack_2286 || ""), - (JSCompiler_object_inline_message_2284.digest = - JSCompiler_object_inline_digest_2285), - (JSCompiler_object_inline_componentStack_2287 = - void 0 === JSCompiler_object_inline_componentStack_2287 + (JSCompiler_object_inline_message_2270.stack = + JSCompiler_object_inline_stack_2272 || ""), + (JSCompiler_object_inline_message_2270.digest = + JSCompiler_object_inline_digest_2271), + (JSCompiler_object_inline_componentStack_2273 = + void 0 === JSCompiler_object_inline_componentStack_2273 ? null - : JSCompiler_object_inline_componentStack_2287), - "string" === typeof JSCompiler_object_inline_componentStack_2287 && + : JSCompiler_object_inline_componentStack_2273), + "string" === typeof JSCompiler_object_inline_componentStack_2273 && CapturedStacks.set( - JSCompiler_object_inline_message_2284, - JSCompiler_object_inline_componentStack_2287 + JSCompiler_object_inline_message_2270, + JSCompiler_object_inline_componentStack_2273 ), queueHydrationError({ - value: JSCompiler_object_inline_message_2284, + value: JSCompiler_object_inline_message_2270, source: null, - stack: JSCompiler_object_inline_componentStack_2287 + stack: JSCompiler_object_inline_componentStack_2273 })); workInProgress = retrySuspenseComponentWithoutHydrating( current, @@ -9115,25 +9135,25 @@ renderLanes, !1 ), - (JSCompiler_object_inline_componentStack_2287 = + (JSCompiler_object_inline_componentStack_2273 = 0 !== (renderLanes & current.childLanes)), - didReceiveUpdate || JSCompiler_object_inline_componentStack_2287) + didReceiveUpdate || JSCompiler_object_inline_componentStack_2273) ) { - JSCompiler_object_inline_componentStack_2287 = workInProgressRoot; - if (null !== JSCompiler_object_inline_componentStack_2287) { - JSCompiler_object_inline_stack_2286 = renderLanes & -renderLanes; - if (0 !== (JSCompiler_object_inline_stack_2286 & 42)) - JSCompiler_object_inline_stack_2286 = 1; + JSCompiler_object_inline_componentStack_2273 = workInProgressRoot; + if (null !== JSCompiler_object_inline_componentStack_2273) { + JSCompiler_object_inline_stack_2272 = renderLanes & -renderLanes; + if (0 !== (JSCompiler_object_inline_stack_2272 & 42)) + JSCompiler_object_inline_stack_2272 = 1; else - switch (JSCompiler_object_inline_stack_2286) { + switch (JSCompiler_object_inline_stack_2272) { case 2: - JSCompiler_object_inline_stack_2286 = 1; + JSCompiler_object_inline_stack_2272 = 1; break; case 8: - JSCompiler_object_inline_stack_2286 = 4; + JSCompiler_object_inline_stack_2272 = 4; break; case 32: - JSCompiler_object_inline_stack_2286 = 16; + JSCompiler_object_inline_stack_2272 = 16; break; case 128: case 256: @@ -9154,40 +9174,40 @@ case 8388608: case 16777216: case 33554432: - JSCompiler_object_inline_stack_2286 = 64; + JSCompiler_object_inline_stack_2272 = 64; break; case 268435456: - JSCompiler_object_inline_stack_2286 = 134217728; + JSCompiler_object_inline_stack_2272 = 134217728; break; default: - JSCompiler_object_inline_stack_2286 = 0; + JSCompiler_object_inline_stack_2272 = 0; } - JSCompiler_object_inline_stack_2286 = + JSCompiler_object_inline_stack_2272 = 0 !== - (JSCompiler_object_inline_stack_2286 & - (JSCompiler_object_inline_componentStack_2287.suspendedLanes | + (JSCompiler_object_inline_stack_2272 & + (JSCompiler_object_inline_componentStack_2273.suspendedLanes | renderLanes)) ? 0 - : JSCompiler_object_inline_stack_2286; + : JSCompiler_object_inline_stack_2272; if ( - 0 !== JSCompiler_object_inline_stack_2286 && - JSCompiler_object_inline_stack_2286 !== prevState.retryLane + 0 !== JSCompiler_object_inline_stack_2272 && + JSCompiler_object_inline_stack_2272 !== prevState.retryLane ) throw ( - ((prevState.retryLane = JSCompiler_object_inline_stack_2286), + ((prevState.retryLane = JSCompiler_object_inline_stack_2272), enqueueConcurrentRenderForLane( current, - JSCompiler_object_inline_stack_2286 + JSCompiler_object_inline_stack_2272 ), scheduleUpdateOnFiber( - JSCompiler_object_inline_componentStack_2287, + JSCompiler_object_inline_componentStack_2273, current, - JSCompiler_object_inline_stack_2286 + JSCompiler_object_inline_stack_2272 ), SelectiveHydrationException) ); } - JSCompiler_object_inline_digest_2285.data === + JSCompiler_object_inline_digest_2271.data === SUSPENSE_PENDING_START_DATA || renderDidSuspendDelayIfPossible(); workInProgress = retrySuspenseComponentWithoutHydrating( current, @@ -9195,7 +9215,7 @@ renderLanes ); } else - JSCompiler_object_inline_digest_2285.data === + JSCompiler_object_inline_digest_2271.data === SUSPENSE_PENDING_START_DATA ? ((workInProgress.flags |= 128), (workInProgress.child = current.child), @@ -9203,12 +9223,12 @@ null, current )), - (JSCompiler_object_inline_digest_2285._reactRetry = + (JSCompiler_object_inline_digest_2271._reactRetry = workInProgress), (workInProgress = null)) : ((current = prevState.treeContext), (nextHydratableInstance = getNextHydratable( - JSCompiler_object_inline_digest_2285.nextSibling + JSCompiler_object_inline_digest_2271.nextSibling )), (hydrationParentFiber = workInProgress), (isHydrating = !0), @@ -9226,54 +9246,54 @@ (treeContextProvider = workInProgress)), (workInProgress = mountSuspensePrimaryChildren( workInProgress, - JSCompiler_object_inline_stack_2286.children + JSCompiler_object_inline_stack_2272.children )), (workInProgress.flags |= 4096)); return workInProgress; } - if (JSCompiler_object_inline_message_2284) + if (JSCompiler_object_inline_message_2270) return ( reuseSuspenseHandlerOnStack(workInProgress), - (JSCompiler_object_inline_message_2284 = - JSCompiler_object_inline_stack_2286.fallback), - (JSCompiler_object_inline_digest_2285 = workInProgress.mode), + (JSCompiler_object_inline_message_2270 = + JSCompiler_object_inline_stack_2272.fallback), + (JSCompiler_object_inline_digest_2271 = workInProgress.mode), (JSCompiler_temp = current.child), (instance = JSCompiler_temp.sibling), - (JSCompiler_object_inline_stack_2286 = createWorkInProgress( + (JSCompiler_object_inline_stack_2272 = createWorkInProgress( JSCompiler_temp, { mode: "hidden", - children: JSCompiler_object_inline_stack_2286.children + children: JSCompiler_object_inline_stack_2272.children } )), - (JSCompiler_object_inline_stack_2286.subtreeFlags = + (JSCompiler_object_inline_stack_2272.subtreeFlags = JSCompiler_temp.subtreeFlags & 31457280), null !== instance - ? (JSCompiler_object_inline_message_2284 = createWorkInProgress( + ? (JSCompiler_object_inline_message_2270 = createWorkInProgress( instance, - JSCompiler_object_inline_message_2284 + JSCompiler_object_inline_message_2270 )) - : ((JSCompiler_object_inline_message_2284 = createFiberFromFragment( - JSCompiler_object_inline_message_2284, - JSCompiler_object_inline_digest_2285, + : ((JSCompiler_object_inline_message_2270 = createFiberFromFragment( + JSCompiler_object_inline_message_2270, + JSCompiler_object_inline_digest_2271, renderLanes, null )), - (JSCompiler_object_inline_message_2284.flags |= 2)), - (JSCompiler_object_inline_message_2284.return = workInProgress), - (JSCompiler_object_inline_stack_2286.return = workInProgress), - (JSCompiler_object_inline_stack_2286.sibling = - JSCompiler_object_inline_message_2284), - (workInProgress.child = JSCompiler_object_inline_stack_2286), - (JSCompiler_object_inline_stack_2286 = - JSCompiler_object_inline_message_2284), - (JSCompiler_object_inline_message_2284 = workInProgress.child), - (JSCompiler_object_inline_digest_2285 = current.child.memoizedState), - null === JSCompiler_object_inline_digest_2285 - ? (JSCompiler_object_inline_digest_2285 = + (JSCompiler_object_inline_message_2270.flags |= 2)), + (JSCompiler_object_inline_message_2270.return = workInProgress), + (JSCompiler_object_inline_stack_2272.return = workInProgress), + (JSCompiler_object_inline_stack_2272.sibling = + JSCompiler_object_inline_message_2270), + (workInProgress.child = JSCompiler_object_inline_stack_2272), + (JSCompiler_object_inline_stack_2272 = + JSCompiler_object_inline_message_2270), + (JSCompiler_object_inline_message_2270 = workInProgress.child), + (JSCompiler_object_inline_digest_2271 = current.child.memoizedState), + null === JSCompiler_object_inline_digest_2271 + ? (JSCompiler_object_inline_digest_2271 = mountSuspenseOffscreenState(renderLanes)) : ((JSCompiler_temp = - JSCompiler_object_inline_digest_2285.cachePool), + JSCompiler_object_inline_digest_2271.cachePool), null !== JSCompiler_temp ? ((instance = CacheContext._currentValue), (JSCompiler_temp = @@ -9281,38 +9301,38 @@ ? { parent: instance, pool: instance } : JSCompiler_temp)) : (JSCompiler_temp = getSuspendedCache()), - (JSCompiler_object_inline_digest_2285 = { + (JSCompiler_object_inline_digest_2271 = { baseLanes: - JSCompiler_object_inline_digest_2285.baseLanes | renderLanes, + JSCompiler_object_inline_digest_2271.baseLanes | renderLanes, cachePool: JSCompiler_temp })), - (JSCompiler_object_inline_message_2284.memoizedState = - JSCompiler_object_inline_digest_2285), - (JSCompiler_object_inline_message_2284.childLanes = + (JSCompiler_object_inline_message_2270.memoizedState = + JSCompiler_object_inline_digest_2271), + (JSCompiler_object_inline_message_2270.childLanes = getRemainingWorkInPrimaryTree( current, - JSCompiler_object_inline_componentStack_2287, + JSCompiler_object_inline_componentStack_2273, renderLanes )), (workInProgress.memoizedState = SUSPENDED_MARKER), - JSCompiler_object_inline_stack_2286 + JSCompiler_object_inline_stack_2272 ); pushPrimaryTreeSuspenseHandler(workInProgress); renderLanes = current.child; current = renderLanes.sibling; renderLanes = createWorkInProgress(renderLanes, { mode: "visible", - children: JSCompiler_object_inline_stack_2286.children + children: JSCompiler_object_inline_stack_2272.children }); renderLanes.return = workInProgress; renderLanes.sibling = null; null !== current && - ((JSCompiler_object_inline_componentStack_2287 = + ((JSCompiler_object_inline_componentStack_2273 = workInProgress.deletions), - null === JSCompiler_object_inline_componentStack_2287 + null === JSCompiler_object_inline_componentStack_2273 ? ((workInProgress.deletions = [current]), (workInProgress.flags |= 16)) - : JSCompiler_object_inline_componentStack_2287.push(current)); + : JSCompiler_object_inline_componentStack_2273.push(current)); workInProgress.child = renderLanes; workInProgress.memoizedState = null; return renderLanes; @@ -9663,8 +9683,8 @@ (workInProgress.flags |= 4); workInProgress.flags |= 2048; var stateNode = workInProgress.stateNode; - stateNode.effectDuration = 0; - stateNode.passiveEffectDuration = 0; + stateNode.effectDuration = -0; + stateNode.passiveEffectDuration = -0; break; case 13: stateNode = workInProgress.memoizedState; @@ -10250,8 +10270,8 @@ (workInProgress.flags |= 4), (workInProgress.flags |= 2048), (returnFiber = workInProgress.stateNode), - (returnFiber.effectDuration = 0), - (returnFiber.passiveEffectDuration = 0), + (returnFiber.effectDuration = -0), + (returnFiber.passiveEffectDuration = -0), reconcileChildren( current, workInProgress, @@ -10910,16 +10930,35 @@ ) callCallback(callbacks[updateQueue], context); } - function shouldProfile$1(current) { + function shouldProfile(current) { return (current.mode & ProfileMode) !== NoMode; } function commitHookLayoutEffects(finishedWork, hookFlags) { - shouldProfile$1(finishedWork) - ? (startLayoutEffectTimer(), + shouldProfile(finishedWork) + ? (startEffectTimer(), commitHookEffectListMount(hookFlags, finishedWork), - recordLayoutEffectDuration(finishedWork)) + recordEffectDuration()) : commitHookEffectListMount(hookFlags, finishedWork); } + function commitHookLayoutUnmountEffects( + finishedWork, + nearestMountedAncestor, + hookFlags + ) { + shouldProfile(finishedWork) + ? (startEffectTimer(), + commitHookEffectListUnmount( + hookFlags, + finishedWork, + nearestMountedAncestor + ), + recordEffectDuration()) + : commitHookEffectListUnmount( + hookFlags, + finishedWork, + nearestMountedAncestor + ); + } function commitHookEffectListMount(flags, finishedWork) { try { var updateQueue = finishedWork.updateQueue, @@ -11017,10 +11056,10 @@ } } function commitHookPassiveMountEffects(finishedWork, hookFlags) { - shouldProfile$1(finishedWork) - ? ((passiveEffectStartTime = now()), + shouldProfile(finishedWork) + ? (startEffectTimer(), commitHookEffectListMount(hookFlags, finishedWork), - recordPassiveEffectDuration(finishedWork)) + recordEffectDuration()) : commitHookEffectListMount(hookFlags, finishedWork); } function commitHookPassiveUnmountEffects( @@ -11028,14 +11067,14 @@ nearestMountedAncestor, hookFlags ) { - shouldProfile$1(finishedWork) - ? ((passiveEffectStartTime = now()), + shouldProfile(finishedWork) + ? (startEffectTimer(), commitHookEffectListUnmount( hookFlags, finishedWork, nearestMountedAncestor ), - recordPassiveEffectDuration(finishedWork)) + recordEffectDuration()) : commitHookEffectListUnmount( hookFlags, finishedWork, @@ -11129,8 +11168,8 @@ current.memoizedProps ); instance.state = current.memoizedState; - shouldProfile$1(current) - ? (startLayoutEffectTimer(), + shouldProfile(current) + ? (startEffectTimer(), runWithFiberInDEV( current, callComponentWillUnmountInDEV, @@ -11138,7 +11177,7 @@ nearestMountedAncestor, instance ), - recordLayoutEffectDuration(current)) + recordEffectDuration()) : runWithFiberInDEV( current, callComponentWillUnmountInDEV, @@ -11152,12 +11191,11 @@ if (null !== ref) { var instance = finishedWork.stateNode; if ("function" === typeof ref) - if (shouldProfile$1(finishedWork)) + if (shouldProfile(finishedWork)) try { - startLayoutEffectTimer(), - (finishedWork.refCleanup = ref(instance)); + startEffectTimer(), (finishedWork.refCleanup = ref(instance)); } finally { - recordLayoutEffectDuration(finishedWork); + recordEffectDuration(); } else finishedWork.refCleanup = ref(instance); else @@ -11184,12 +11222,11 @@ if (null !== ref) if ("function" === typeof refCleanup) try { - if (shouldProfile$1(current)) + if (shouldProfile(current)) try { - startLayoutEffectTimer(), - runWithFiberInDEV(current, refCleanup); + startEffectTimer(), runWithFiberInDEV(current, refCleanup); } finally { - recordLayoutEffectDuration(current); + recordEffectDuration(current); } else runWithFiberInDEV(current, refCleanup); } catch (error) { @@ -11201,11 +11238,11 @@ } else if ("function" === typeof ref) try { - if (shouldProfile$1(current)) + if (shouldProfile(current)) try { - startLayoutEffectTimer(), runWithFiberInDEV(current, ref, null); + startEffectTimer(), runWithFiberInDEV(current, ref, null); } finally { - recordLayoutEffectDuration(current); + recordEffectDuration(current); } else runWithFiberInDEV(current, ref, null); } catch (error$7) { @@ -11559,7 +11596,8 @@ return firstChild; } function commitLayoutEffectOnFiber(finishedRoot, current, finishedWork) { - var flags = finishedWork.flags; + var prevEffectStart = pushComponentEffectStart(), + flags = finishedWork.flags; switch (finishedWork.tag) { case 0: case 11: @@ -11585,15 +11623,15 @@ "Expected %s state to match memoized state before componentDidMount. This might either be because of a bug in React, or because a component reassigns its own `this.state`. Please file an issue.", getComponentNameFromFiber(finishedWork) || "instance" )), - shouldProfile$1(finishedWork) - ? (startLayoutEffectTimer(), + shouldProfile(finishedWork) + ? (startEffectTimer(), runWithFiberInDEV( finishedWork, callComponentDidMountInDEV, finishedWork, finishedRoot ), - recordLayoutEffectDuration(finishedWork)) + recordEffectDuration()) : runWithFiberInDEV( finishedWork, callComponentDidMountInDEV, @@ -11619,8 +11657,8 @@ "Expected %s state to match memoized state before componentDidUpdate. This might either be because of a bug in React, or because a component reassigns its own `this.state`. Please file an issue.", getComponentNameFromFiber(finishedWork) || "instance" )); - shouldProfile$1(finishedWork) - ? (startLayoutEffectTimer(), + shouldProfile(finishedWork) + ? (startEffectTimer(), runWithFiberInDEV( finishedWork, callComponentDidUpdateInDEV, @@ -11630,7 +11668,7 @@ current, finishedRoot.__reactInternalSnapshotBeforeUpdate ), - recordLayoutEffectDuration(finishedWork)) + recordEffectDuration()) : runWithFiberInDEV( finishedWork, callComponentDidUpdateInDEV, @@ -11645,32 +11683,34 @@ flags & 512 && safelyAttachRef(finishedWork, finishedWork.return); break; case 3: + current = pushNestedEffectDurations(); recursivelyTraverseLayoutEffects(finishedRoot, finishedWork); if ( flags & 64 && ((flags = finishedWork.updateQueue), null !== flags) ) { - finishedRoot = null; + prevProps = null; if (null !== finishedWork.child) switch (finishedWork.child.tag) { case 27: case 5: - finishedRoot = finishedWork.child.stateNode; + prevProps = finishedWork.child.stateNode; break; case 1: - finishedRoot = finishedWork.child.stateNode; + prevProps = finishedWork.child.stateNode; } try { runWithFiberInDEV( finishedWork, commitCallbacks, flags, - finishedRoot + prevProps ); } catch (error) { captureCommitPhaseError(finishedWork, finishedWork.return, error); } } + finishedRoot.effectDuration += popNestedEffectDurations(current); break; case 26: recursivelyTraverseLayoutEffects(finishedRoot, finishedWork); @@ -11683,9 +11723,11 @@ flags & 512 && safelyAttachRef(finishedWork, finishedWork.return); break; case 12: - recursivelyTraverseLayoutEffects(finishedRoot, finishedWork); if (flags & 4) { - flags = finishedWork.stateNode.effectDuration; + flags = pushNestedEffectDurations(); + recursivelyTraverseLayoutEffects(finishedRoot, finishedWork); + finishedRoot = finishedWork.stateNode; + finishedRoot.effectDuration += bubbleNestedEffectDurations(flags); try { runWithFiberInDEV( finishedWork, @@ -11693,24 +11735,12 @@ finishedWork, current, commitTime, - flags + finishedRoot.effectDuration ); } catch (error) { captureCommitPhaseError(finishedWork, finishedWork.return, error); } - finishedWork = finishedWork.return; - a: for (; null !== finishedWork; ) { - switch (finishedWork.tag) { - case 3: - finishedWork.stateNode.effectDuration += flags; - break a; - case 12: - finishedWork.stateNode.effectDuration += flags; - break a; - } - finishedWork = finishedWork.return; - } - } + } else recursivelyTraverseLayoutEffects(finishedRoot, finishedWork); break; case 13: recursivelyTraverseLayoutEffects(finishedRoot, finishedWork); @@ -11746,6 +11776,16 @@ default: recursivelyTraverseLayoutEffects(finishedRoot, finishedWork); } + (finishedWork.mode & ProfileMode) !== NoMode && + 0 <= componentEffectStartTime && + 0 <= componentEffectEndTime && + logComponentEffect( + finishedWork, + componentEffectStartTime, + componentEffectEndTime, + componentEffectDuration + ); + popComponentEffectStart(prevEffectStart); } function detachFiberAfterEffects(fiber) { var alternate = fiber.alternate; @@ -11907,51 +11947,18 @@ case 11: case 14: case 15: - if ( - !offscreenSubtreeWasHidden && - ((prevHostParent = deletedFiber.updateQueue), - null !== prevHostParent && - ((prevHostParent = prevHostParent.lastEffect), - null !== prevHostParent)) - ) { - prevHostParentIsContainer = prevHostParent = prevHostParent.next; - do { - var _tag = prevHostParentIsContainer.tag, - _inst = prevHostParentIsContainer.inst, - _destroy = _inst.destroy; - void 0 !== _destroy && - ((_tag & Insertion) !== NoFlags - ? ((_inst.destroy = void 0), - runWithFiberInDEV( - deletedFiber, - callDestroyInDEV, - deletedFiber, - nearestMountedAncestor, - _destroy - )) - : (_tag & Layout) !== NoFlags && - ((deletedFiber.mode & ProfileMode) !== NoMode - ? (startLayoutEffectTimer(), - (_inst.destroy = void 0), - runWithFiberInDEV( - deletedFiber, - callDestroyInDEV, - deletedFiber, - nearestMountedAncestor, - _destroy - ), - recordLayoutEffectDuration(deletedFiber)) - : ((_inst.destroy = void 0), - runWithFiberInDEV( - deletedFiber, - callDestroyInDEV, - deletedFiber, - nearestMountedAncestor, - _destroy - )))); - prevHostParentIsContainer = prevHostParentIsContainer.next; - } while (prevHostParentIsContainer !== prevHostParent); - } + offscreenSubtreeWasHidden || + commitHookEffectListUnmount( + Insertion, + deletedFiber, + nearestMountedAncestor + ); + offscreenSubtreeWasHidden || + commitHookLayoutUnmountEffects( + deletedFiber, + nearestMountedAncestor, + Layout + ); recursivelyTraverseDeletionEffects( finishedRoot, nearestMountedAncestor, @@ -12064,6 +12071,7 @@ function commitMutationEffects(root, finishedWork, committedLanes) { inProgressLanes = committedLanes; inProgressRoot = root; + resetComponentEffectTimers(); commitMutationEffectsOnFiber(finishedWork, root); inProgressRoot = inProgressLanes = null; } @@ -12111,7 +12119,8 @@ (parentFiber = parentFiber.sibling); } function commitMutationEffectsOnFiber(finishedWork, root) { - var current = finishedWork.alternate, + var prevEffectStart = pushComponentEffectStart(), + current = finishedWork.alternate, flags = finishedWork.flags; switch (finishedWork.tag) { case 0: @@ -12127,19 +12136,11 @@ finishedWork.return ), commitHookEffectListMount(Insertion | HasEffect, finishedWork), - (finishedWork.mode & ProfileMode) !== NoMode - ? (startLayoutEffectTimer(), - commitHookEffectListUnmount( - Layout | HasEffect, - finishedWork, - finishedWork.return - ), - recordLayoutEffectDuration(finishedWork)) - : commitHookEffectListUnmount( - Layout | HasEffect, - finishedWork, - finishedWork.return - )); + commitHookLayoutUnmountEffects( + finishedWork, + finishedWork.return, + Layout | HasEffect + )); break; case 1: recursivelyTraverseMutationEffects(root, finishedWork); @@ -12149,13 +12150,13 @@ safelyDetachRef(current, current.return); flags & 64 && offscreenSubtreeIsHidden && - ((finishedWork = finishedWork.updateQueue), - null !== finishedWork && - ((flags = finishedWork.callbacks), - null !== flags && - ((current = finishedWork.shared.hiddenCallbacks), - (finishedWork.shared.hiddenCallbacks = - null === current ? flags : current.concat(flags))))); + ((flags = finishedWork.updateQueue), + null !== flags && + ((current = flags.callbacks), + null !== current && + ((root = flags.shared.hiddenCallbacks), + (flags.shared.hiddenCallbacks = + null === root ? current : root.concat(current))))); break; case 26: var hoistableRoot = currentHoistableRoot; @@ -12164,113 +12165,110 @@ flags & 512 && null !== current && safelyDetachRef(current, current.return); - if (flags & 4) { - var currentResource = - null !== current ? current.memoizedState : null; - flags = finishedWork.memoizedState; - if (null === current) + if (flags & 4) + if ( + ((root = null !== current ? current.memoizedState : null), + (flags = finishedWork.memoizedState), + null === current) + ) if (null === flags) if (null === finishedWork.stateNode) { a: { flags = finishedWork.type; current = finishedWork.memoizedProps; - hoistableRoot = - hoistableRoot.ownerDocument || hoistableRoot; + root = hoistableRoot.ownerDocument || hoistableRoot; b: switch (flags) { case "title": - currentResource = - hoistableRoot.getElementsByTagName("title")[0]; + hoistableRoot = root.getElementsByTagName("title")[0]; if ( - !currentResource || - currentResource[internalHoistableMarker] || - currentResource[internalInstanceKey] || - currentResource.namespaceURI === SVG_NAMESPACE || - currentResource.hasAttribute("itemprop") + !hoistableRoot || + hoistableRoot[internalHoistableMarker] || + hoistableRoot[internalInstanceKey] || + hoistableRoot.namespaceURI === SVG_NAMESPACE || + hoistableRoot.hasAttribute("itemprop") ) - (currentResource = - hoistableRoot.createElement(flags)), - hoistableRoot.head.insertBefore( - currentResource, - hoistableRoot.querySelector("head > title") + (hoistableRoot = root.createElement(flags)), + root.head.insertBefore( + hoistableRoot, + root.querySelector("head > title") ); - setInitialProperties(currentResource, flags, current); - currentResource[internalInstanceKey] = finishedWork; - markNodeAsHoistable(currentResource); - flags = currentResource; + setInitialProperties(hoistableRoot, flags, current); + hoistableRoot[internalInstanceKey] = finishedWork; + markNodeAsHoistable(hoistableRoot); + flags = hoistableRoot; break a; case "link": - if ( - (root = getHydratableHoistableCache( - "link", - "href", - hoistableRoot - ).get(flags + (current.href || ""))) - ) - for (var i = 0; i < root.length; i++) + var maybeNodes = getHydratableHoistableCache( + "link", + "href", + root + ).get(flags + (current.href || "")); + if (maybeNodes) + for (var i = 0; i < maybeNodes.length; i++) if ( - ((currentResource = root[i]), - currentResource.getAttribute("href") === + ((hoistableRoot = maybeNodes[i]), + hoistableRoot.getAttribute("href") === (null == current.href ? null : current.href) && - currentResource.getAttribute("rel") === + hoistableRoot.getAttribute("rel") === (null == current.rel ? null : current.rel) && - currentResource.getAttribute("title") === + hoistableRoot.getAttribute("title") === (null == current.title ? null : current.title) && - currentResource.getAttribute("crossorigin") === + hoistableRoot.getAttribute("crossorigin") === (null == current.crossOrigin ? null : current.crossOrigin)) ) { - root.splice(i, 1); + maybeNodes.splice(i, 1); break b; } - currentResource = hoistableRoot.createElement(flags); - setInitialProperties(currentResource, flags, current); - hoistableRoot.head.appendChild(currentResource); + hoistableRoot = root.createElement(flags); + setInitialProperties(hoistableRoot, flags, current); + root.head.appendChild(hoistableRoot); break; case "meta": if ( - (root = getHydratableHoistableCache( + (maybeNodes = getHydratableHoistableCache( "meta", "content", - hoistableRoot + root ).get(flags + (current.content || ""))) ) - for (i = 0; i < root.length; i++) + for (i = 0; i < maybeNodes.length; i++) if ( - ((currentResource = root[i]), + ((hoistableRoot = maybeNodes[i]), checkAttributeStringCoercion( current.content, "content" ), - currentResource.getAttribute("content") === + hoistableRoot.getAttribute("content") === (null == current.content ? null : "" + current.content) && - currentResource.getAttribute("name") === + hoistableRoot.getAttribute("name") === (null == current.name ? null : current.name) && - currentResource.getAttribute("property") === + hoistableRoot.getAttribute("property") === (null == current.property ? null : current.property) && - currentResource.getAttribute("http-equiv") === + hoistableRoot.getAttribute("http-equiv") === (null == current.httpEquiv ? null : current.httpEquiv) && - currentResource.getAttribute("charset") === + hoistableRoot.getAttribute("charset") === (null == current.charSet ? null : current.charSet)) ) { - root.splice(i, 1); + maybeNodes.splice(i, 1); break b; } - currentResource = hoistableRoot.createElement(flags); - setInitialProperties(currentResource, flags, current); - hoistableRoot.head.appendChild(currentResource); + hoistableRoot = root.createElement(flags); + setInitialProperties(hoistableRoot, flags, current); + root.head.appendChild(hoistableRoot); break; default: throw Error( @@ -12279,9 +12277,9 @@ '". This is a bug in React.' ); } - currentResource[internalInstanceKey] = finishedWork; - markNodeAsHoistable(currentResource); - flags = currentResource; + hoistableRoot[internalInstanceKey] = finishedWork; + markNodeAsHoistable(hoistableRoot); + flags = hoistableRoot; } finishedWork.stateNode = flags; } else @@ -12297,12 +12295,12 @@ finishedWork.memoizedProps ); else - currentResource !== flags - ? (null === currentResource + root !== flags + ? (null === root ? null !== current.stateNode && ((current = current.stateNode), current.parentNode.removeChild(current)) - : currentResource.count--, + : root.count--, null === flags ? mountHoistable( hoistableRoot, @@ -12321,12 +12319,11 @@ finishedWork.memoizedProps, current.memoizedProps ); - } break; case 27: if (flags & 4 && null === finishedWork.alternate) { hoistableRoot = finishedWork.stateNode; - currentResource = finishedWork.memoizedProps; + maybeNodes = finishedWork.memoizedProps; try { for (i = hoistableRoot.firstChild; i; ) { var nextNode = i.nextSibling, @@ -12345,7 +12342,7 @@ finishedWork, acquireSingletonInstance, finishedWork.type, - currentResource, + maybeNodes, hoistableRoot, finishedWork ); @@ -12360,20 +12357,20 @@ null !== current && safelyDetachRef(current, current.return); if (finishedWork.flags & 32) { - hoistableRoot = finishedWork.stateNode; + root = finishedWork.stateNode; try { - runWithFiberInDEV(finishedWork, resetTextContent, hoistableRoot); + runWithFiberInDEV(finishedWork, resetTextContent, root); } catch (error) { captureCommitPhaseError(finishedWork, finishedWork.return, error); } } flags & 4 && null != finishedWork.stateNode && - ((hoistableRoot = finishedWork.memoizedProps), + ((root = finishedWork.memoizedProps), commitHostUpdate( finishedWork, - hoistableRoot, - null !== current ? current.memoizedProps : hoistableRoot + root, + null !== current ? current.memoizedProps : root )); flags & 1024 && ((needsFormReset = !0), @@ -12392,12 +12389,12 @@ ); flags = finishedWork.memoizedProps; current = null !== current ? current.memoizedProps : flags; - hoistableRoot = finishedWork.stateNode; + root = finishedWork.stateNode; try { runWithFiberInDEV( finishedWork, commitTextUpdate, - hoistableRoot, + root, current, flags ); @@ -12407,11 +12404,12 @@ } break; case 3: + hoistableRoot = pushNestedEffectDurations(); tagCaches = null; - hoistableRoot = currentHoistableRoot; + maybeNodes = currentHoistableRoot; currentHoistableRoot = getHoistableRoot(root.containerInfo); recursivelyTraverseMutationEffects(root, finishedWork); - currentHoistableRoot = hoistableRoot; + currentHoistableRoot = maybeNodes; commitReconciliationEffects(finishedWork); if ( flags & 4 && @@ -12429,6 +12427,7 @@ } needsFormReset && ((needsFormReset = !1), recursivelyResetForms(finishedWork)); + root.effectDuration += popNestedEffectDurations(hoistableRoot); break; case 4: flags = currentHoistableRoot; @@ -12439,6 +12438,13 @@ commitReconciliationEffects(finishedWork); currentHoistableRoot = flags; break; + case 12: + flags = pushNestedEffectDurations(); + recursivelyTraverseMutationEffects(root, finishedWork); + commitReconciliationEffects(finishedWork); + finishedWork.stateNode.effectDuration += + bubbleNestedEffectDurations(flags); + break; case 13: recursivelyTraverseMutationEffects(root, finishedWork); commitReconciliationEffects(finishedWork); @@ -12510,17 +12516,17 @@ if (null === current) { nextNode = root; try { - (currentResource = nextNode.stateNode), + (maybeNodes = nextNode.stateNode), i ? runWithFiberInDEV( nextNode, hideTextInstance, - currentResource + maybeNodes ) : runWithFiberInDEV( nextNode, unhideTextInstance, - currentResource, + maybeNodes, nextNode.memoizedProps ); } catch (error) { @@ -12571,6 +12577,16 @@ recursivelyTraverseMutationEffects(root, finishedWork), commitReconciliationEffects(finishedWork); } + (finishedWork.mode & ProfileMode) !== NoMode && + 0 <= componentEffectStartTime && + 0 <= componentEffectEndTime && + logComponentEffect( + finishedWork, + componentEffectStartTime, + componentEffectEndTime, + componentEffectDuration + ); + popComponentEffectStart(prevEffectStart); } function commitReconciliationEffects(finishedWork) { var flags = finishedWork.flags; @@ -12596,6 +12612,7 @@ function commitLayoutEffects(finishedWork, root, committedLanes) { inProgressLanes = committedLanes; inProgressRoot = root; + resetComponentEffectTimers(); commitLayoutEffectOnFiber(root, finishedWork.alternate, finishedWork); inProgressRoot = inProgressLanes = null; } @@ -12611,23 +12628,11 @@ case 11: case 14: case 15: - if ((finishedWork.mode & ProfileMode) !== NoMode) - try { - startLayoutEffectTimer(), - commitHookEffectListUnmount( - Layout, - finishedWork, - finishedWork.return - ); - } finally { - recordLayoutEffectDuration(finishedWork); - } - else - commitHookEffectListUnmount( - Layout, - finishedWork, - finishedWork.return - ); + commitHookLayoutUnmountEffects( + finishedWork, + finishedWork.return, + Layout + ); recursivelyTraverseDisappearLayoutEffects(finishedWork); break; case 1: @@ -12727,14 +12732,16 @@ safelyAttachRef(finishedWork, finishedWork.return); break; case 12: - recursivelyTraverseReappearLayoutEffects( - finishedRoot, - finishedWork, - includeWorkInProgressEffects - ); if (includeWorkInProgressEffects && flags & 4) { - includeWorkInProgressEffects = - finishedWork.stateNode.effectDuration; + flags = pushNestedEffectDurations(); + recursivelyTraverseReappearLayoutEffects( + finishedRoot, + finishedWork, + includeWorkInProgressEffects + ); + includeWorkInProgressEffects = finishedWork.stateNode; + includeWorkInProgressEffects.effectDuration += + bubbleNestedEffectDurations(flags); try { runWithFiberInDEV( finishedWork, @@ -12742,26 +12749,17 @@ finishedWork, current, commitTime, - includeWorkInProgressEffects + includeWorkInProgressEffects.effectDuration ); } catch (error) { captureCommitPhaseError(finishedWork, finishedWork.return, error); } - finishedWork = finishedWork.return; - a: for (; null !== finishedWork; ) { - switch (finishedWork.tag) { - case 3: - finishedWork.stateNode.effectDuration += - includeWorkInProgressEffects; - break a; - case 12: - finishedWork.stateNode.effectDuration += - includeWorkInProgressEffects; - break a; - } - finishedWork = finishedWork.return; - } - } + } else + recursivelyTraverseReappearLayoutEffects( + finishedRoot, + finishedWork, + includeWorkInProgressEffects + ); break; case 13: recursivelyTraverseReappearLayoutEffects( @@ -12860,19 +12858,39 @@ committedTransitions, endTime ) { + var prevEffectStart = pushComponentEffectStart(); if ( (finishedWork.mode & ProfileMode) !== NoMode && 0 < finishedWork.actualStartTime ) { var startTime = finishedWork.actualStartTime, name = getComponentNameFromFiber(finishedWork); - null !== name && - supportsUserTiming && - ((reusableComponentOptions.start = startTime), - (reusableComponentOptions.end = endTime), - performance.measure(name, reusableComponentOptions)); + if (null !== name && supportsUserTiming) { + var selfTime = finishedWork.actualDuration; + if ( + null === finishedWork.alternate || + finishedWork.alternate.child !== finishedWork.child + ) + for ( + var child = finishedWork.child; + null !== child; + child = child.sibling + ) + selfTime -= child.actualDuration; + reusableComponentDevToolDetails.color = + 0.5 > selfTime + ? "primary-light" + : 10 > selfTime + ? "primary" + : 100 > selfTime + ? "primary-dark" + : "error"; + reusableComponentOptions.start = startTime; + reusableComponentOptions.end = endTime; + performance.measure(name, reusableComponentOptions); + } } - startTime = finishedWork.flags; + name = finishedWork.flags; switch (finishedWork.tag) { case 0: case 11: @@ -12884,10 +12902,11 @@ committedTransitions, endTime ); - startTime & 2048 && + name & 2048 && commitHookPassiveMountEffects(finishedWork, Passive | HasEffect); break; case 3: + startTime = pushNestedEffectDurations(); recursivelyTraversePassiveMountEffects( finishedRoot, finishedWork, @@ -12895,25 +12914,30 @@ committedTransitions, endTime ); - startTime & 2048 && - ((finishedRoot = null), + name & 2048 && + ((committedLanes = null), null !== finishedWork.alternate && - (finishedRoot = finishedWork.alternate.memoizedState.cache), - (finishedWork = finishedWork.memoizedState.cache), - finishedWork !== finishedRoot && - (retainCache(finishedWork), - null != finishedRoot && releaseCache(finishedRoot))); + (committedLanes = finishedWork.alternate.memoizedState.cache), + (committedTransitions = finishedWork.memoizedState.cache), + committedTransitions !== committedLanes && + (retainCache(committedTransitions), + null != committedLanes && releaseCache(committedLanes))); + finishedRoot.passiveEffectDuration += + popNestedEffectDurations(startTime); break; case 12: - recursivelyTraversePassiveMountEffects( - finishedRoot, - finishedWork, - committedLanes, - committedTransitions, - endTime - ); - if (startTime & 2048) { - finishedRoot = finishedWork.stateNode.passiveEffectDuration; + if (name & 2048) { + startTime = pushNestedEffectDurations(); + recursivelyTraversePassiveMountEffects( + finishedRoot, + finishedWork, + committedLanes, + committedTransitions, + endTime + ); + finishedRoot = finishedWork.stateNode; + finishedRoot.passiveEffectDuration += + bubbleNestedEffectDurations(startTime); try { runWithFiberInDEV( finishedWork, @@ -12921,31 +12945,26 @@ finishedWork, finishedWork.alternate, commitTime, - finishedRoot + finishedRoot.passiveEffectDuration ); } catch (error) { captureCommitPhaseError(finishedWork, finishedWork.return, error); } - finishedWork = finishedWork.return; - a: for (; null !== finishedWork; ) { - switch (finishedWork.tag) { - case 3: - finishedWork.stateNode.passiveEffectDuration += finishedRoot; - break a; - case 12: - finishedWork.stateNode.passiveEffectDuration += finishedRoot; - break a; - } - finishedWork = finishedWork.return; - } - } + } else + recursivelyTraversePassiveMountEffects( + finishedRoot, + finishedWork, + committedLanes, + committedTransitions, + endTime + ); break; case 23: break; case 22: - name = finishedWork.stateNode; + startTime = finishedWork.stateNode; null !== finishedWork.memoizedState - ? name._visibility & OffscreenPassiveEffectsConnected + ? startTime._visibility & OffscreenPassiveEffectsConnected ? recursivelyTraversePassiveMountEffects( finishedRoot, finishedWork, @@ -12957,7 +12976,7 @@ finishedRoot, finishedWork ) - : name._visibility & OffscreenPassiveEffectsConnected + : startTime._visibility & OffscreenPassiveEffectsConnected ? recursivelyTraversePassiveMountEffects( finishedRoot, finishedWork, @@ -12965,7 +12984,7 @@ committedTransitions, endTime ) - : ((name._visibility |= OffscreenPassiveEffectsConnected), + : ((startTime._visibility |= OffscreenPassiveEffectsConnected), recursivelyTraverseReconnectPassiveEffects( finishedRoot, finishedWork, @@ -12973,7 +12992,7 @@ committedTransitions, 0 !== (finishedWork.subtreeFlags & 10256) )); - startTime & 2048 && + name & 2048 && commitOffscreenPassiveMountEffects( finishedWork.alternate, finishedWork @@ -12987,7 +13006,7 @@ committedTransitions, endTime ); - startTime & 2048 && + name & 2048 && commitCachePassiveMountEffect(finishedWork.alternate, finishedWork); break; default: @@ -12999,6 +13018,16 @@ endTime ); } + (finishedWork.mode & ProfileMode) !== NoMode && + 0 <= componentEffectStartTime && + 0 <= componentEffectEndTime && + logComponentEffect( + finishedWork, + componentEffectStartTime, + componentEffectEndTime, + componentEffectDuration + ); + popComponentEffectStart(prevEffectStart); } function recursivelyTraverseReconnectPassiveEffects( finishedRoot, @@ -13215,6 +13244,7 @@ (parentFiber = parentFiber.sibling); } function commitPassiveUnmountOnFiber(finishedWork) { + var prevEffectStart = pushComponentEffectStart(); switch (finishedWork.tag) { case 0: case 11: @@ -13227,18 +13257,41 @@ Passive | HasEffect ); break; + case 3: + var prevEffectDuration = pushNestedEffectDurations(); + recursivelyTraversePassiveUnmountEffects(finishedWork); + finishedWork.stateNode.passiveEffectDuration += + popNestedEffectDurations(prevEffectDuration); + break; + case 12: + prevEffectDuration = pushNestedEffectDurations(); + recursivelyTraversePassiveUnmountEffects(finishedWork); + finishedWork.stateNode.passiveEffectDuration += + bubbleNestedEffectDurations(prevEffectDuration); + break; case 22: - var instance = finishedWork.stateNode; + prevEffectDuration = finishedWork.stateNode; null !== finishedWork.memoizedState && - instance._visibility & OffscreenPassiveEffectsConnected && + prevEffectDuration._visibility & OffscreenPassiveEffectsConnected && (null === finishedWork.return || 13 !== finishedWork.return.tag) - ? ((instance._visibility &= ~OffscreenPassiveEffectsConnected), + ? ((prevEffectDuration._visibility &= + ~OffscreenPassiveEffectsConnected), recursivelyTraverseDisconnectPassiveEffects(finishedWork)) : recursivelyTraversePassiveUnmountEffects(finishedWork); break; default: recursivelyTraversePassiveUnmountEffects(finishedWork); } + (finishedWork.mode & ProfileMode) !== NoMode && + 0 <= componentEffectStartTime && + 0 <= componentEffectEndTime && + logComponentEffect( + finishedWork, + componentEffectStartTime, + componentEffectEndTime, + componentEffectDuration + ); + popComponentEffectStart(prevEffectStart); } function recursivelyTraverseDisconnectPassiveEffects(parentFiber) { var deletions = parentFiber.deletions; @@ -15846,10 +15899,14 @@ didScheduleUpdateDuringPassiveEffects = !1; var prevExecutionContext = executionContext; executionContext |= CommitContext; - commitPassiveUnmountOnFiber(root$jscomp$0.current); + var finishedWork = root$jscomp$0.current; + resetComponentEffectTimers(); + commitPassiveUnmountOnFiber(finishedWork); + var finishedWork$jscomp$0 = root$jscomp$0.current; + resetComponentEffectTimers(); commitPassiveMountOnFiber( root$jscomp$0, - root$jscomp$0.current, + finishedWork$jscomp$0, lanes, priority, completeTime @@ -20579,7 +20636,7 @@ this.pooledCacheLanes = 0; this.formState = formState; this.incompleteTransitions = new Map(); - this.passiveEffectDuration = this.effectDuration = 0; + this.passiveEffectDuration = this.effectDuration = -0; this.memoizedUpdaters = new Set(); containerInfo = this.pendingUpdatersLaneMap = []; for (tag = 0; 31 > tag; tag++) containerInfo.push(new Set()); @@ -22639,11 +22696,13 @@ StrictEffectsMode = 16, NoStrictPassiveEffectsMode = 64, now = Scheduler.unstable_now, - completeTime = 0, - commitTime = 0, - layoutEffectStartTime = -1, - profilerStartTime = -1, - passiveEffectStartTime = -1, + completeTime = -0, + commitTime = -0, + profilerStartTime = -1.1, + profilerEffectDuration = -0, + componentEffectDuration = -0, + componentEffectStartTime = -1.1, + componentEffectEndTime = -1.1, currentUpdateIsNested = !1, nestedUpdateScheduled = !1, supportsUserTiming = @@ -25026,11 +25085,11 @@ }; (function () { var isomorphicReactPackageVersion = React.version; - if ("19.0.0-experimental-a99d8e8d-20240916" !== isomorphicReactPackageVersion) + if ("19.0.0-experimental-5dcb0097-20240918" !== isomorphicReactPackageVersion) throw Error( 'Incompatible React versions: The "react" and "react-dom" packages must have the exact same version. Instead got:\n - react: ' + (isomorphicReactPackageVersion + - "\n - react-dom: 19.0.0-experimental-a99d8e8d-20240916\nLearn more: https://react.dev/warnings/version-mismatch") + "\n - react-dom: 19.0.0-experimental-5dcb0097-20240918\nLearn more: https://react.dev/warnings/version-mismatch") ); })(); ("function" === typeof Map && @@ -25067,11 +25126,11 @@ !(function () { var internals = { bundleType: 1, - version: "19.0.0-experimental-a99d8e8d-20240916", + version: "19.0.0-experimental-5dcb0097-20240918", rendererPackageName: "react-dom", currentDispatcherRef: ReactSharedInternals, findFiberByHostInstance: getClosestInstanceFromNode, - reconcilerVersion: "19.0.0-experimental-a99d8e8d-20240916" + reconcilerVersion: "19.0.0-experimental-5dcb0097-20240918" }; internals.overrideHookState = overrideHookState; internals.overrideHookStateDeletePath = overrideHookStateDeletePath; @@ -25379,5 +25438,5 @@ } }; }; - exports.version = "19.0.0-experimental-a99d8e8d-20240916"; + exports.version = "19.0.0-experimental-5dcb0097-20240918"; })(); diff --git a/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-unstable_testing.production.js b/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-unstable_testing.production.js index 7d8a79a57a7db..c488914b3feb5 100644 --- a/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-unstable_testing.production.js +++ b/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-unstable_testing.production.js @@ -2067,19 +2067,19 @@ function getTargetInstForChangeEvent(domEventName, targetInst) { } var isInputEventSupported = !1; if (canUseDOM) { - var JSCompiler_inline_result$jscomp$285; + var JSCompiler_inline_result$jscomp$283; if (canUseDOM) { - var isSupported$jscomp$inline_424 = "oninput" in document; - if (!isSupported$jscomp$inline_424) { - var element$jscomp$inline_425 = document.createElement("div"); - element$jscomp$inline_425.setAttribute("oninput", "return;"); - isSupported$jscomp$inline_424 = - "function" === typeof element$jscomp$inline_425.oninput; + var isSupported$jscomp$inline_422 = "oninput" in document; + if (!isSupported$jscomp$inline_422) { + var element$jscomp$inline_423 = document.createElement("div"); + element$jscomp$inline_423.setAttribute("oninput", "return;"); + isSupported$jscomp$inline_422 = + "function" === typeof element$jscomp$inline_423.oninput; } - JSCompiler_inline_result$jscomp$285 = isSupported$jscomp$inline_424; - } else JSCompiler_inline_result$jscomp$285 = !1; + JSCompiler_inline_result$jscomp$283 = isSupported$jscomp$inline_422; + } else JSCompiler_inline_result$jscomp$283 = !1; isInputEventSupported = - JSCompiler_inline_result$jscomp$285 && + JSCompiler_inline_result$jscomp$283 && (!document.documentMode || 9 < document.documentMode); } function stopWatchingForValueChange() { @@ -2194,41 +2194,36 @@ function containsNode(outerNode, innerNode) { : !1; } function getActiveElementDeep(containerInfo) { - var $jscomp$optchain$tmpm1151878648$1, $jscomp$nullish$tmp0; + var $jscomp$optchain$tmp2021609766$1, $jscomp$nullish$tmp0; containerInfo = null != ($jscomp$nullish$tmp0 = null == containerInfo ? void 0 : null == - ($jscomp$optchain$tmpm1151878648$1 = containerInfo.ownerDocument) + ($jscomp$optchain$tmp2021609766$1 = containerInfo.ownerDocument) ? void 0 - : $jscomp$optchain$tmpm1151878648$1.defaultView) + : $jscomp$optchain$tmp2021609766$1.defaultView) ? $jscomp$nullish$tmp0 : window; for ( - $jscomp$optchain$tmpm1151878648$1 = getActiveElement( - containerInfo.document - ); - $jscomp$optchain$tmpm1151878648$1 instanceof - containerInfo.HTMLIFrameElement; + $jscomp$optchain$tmp2021609766$1 = getActiveElement(containerInfo.document); + $jscomp$optchain$tmp2021609766$1 instanceof containerInfo.HTMLIFrameElement; ) { try { var JSCompiler_inline_result = "string" === - typeof $jscomp$optchain$tmpm1151878648$1.contentWindow.location.href; + typeof $jscomp$optchain$tmp2021609766$1.contentWindow.location.href; } catch (err) { JSCompiler_inline_result = !1; } if (JSCompiler_inline_result) - containerInfo = $jscomp$optchain$tmpm1151878648$1.contentWindow; + containerInfo = $jscomp$optchain$tmp2021609766$1.contentWindow; else break; - $jscomp$optchain$tmpm1151878648$1 = getActiveElement( - containerInfo.document - ); + $jscomp$optchain$tmp2021609766$1 = getActiveElement(containerInfo.document); } - return $jscomp$optchain$tmpm1151878648$1; + return $jscomp$optchain$tmp2021609766$1; } function hasSelectionCapabilities(elem) { var nodeName = elem && elem.nodeName && elem.nodeName.toLowerCase(); @@ -7698,7 +7693,7 @@ function commitHookEffectListMount(flags, finishedWork) { function commitHookEffectListUnmount( flags, finishedWork, - nearestMountedAncestor + nearestMountedAncestor$jscomp$0 ) { try { var updateQueue = finishedWork.updateQueue, @@ -7710,9 +7705,20 @@ function commitHookEffectListUnmount( if ((updateQueue.tag & flags) === flags) { var inst = updateQueue.inst, destroy = inst.destroy; - void 0 !== destroy && - ((inst.destroy = void 0), - safelyCallDestroy(finishedWork, nearestMountedAncestor, destroy)); + if (void 0 !== destroy) { + inst.destroy = void 0; + lastEffect = finishedWork; + var nearestMountedAncestor = nearestMountedAncestor$jscomp$0; + try { + destroy(); + } catch (error) { + captureCommitPhaseError( + lastEffect, + nearestMountedAncestor, + error + ); + } + } } updateQueue = updateQueue.next; } while (updateQueue !== firstEffect); @@ -7792,13 +7798,6 @@ function safelyDetachRef(current, nearestMountedAncestor) { } else ref.current = null; } -function safelyCallDestroy(current, nearestMountedAncestor, destroy) { - try { - destroy(); - } catch (error) { - captureCommitPhaseError(current, nearestMountedAncestor, error); - } -} function commitHostMount(finishedWork) { var type = finishedWork.type, props = finishedWork.memoizedProps, @@ -8147,23 +8146,6 @@ function commitLayoutEffectOnFiber(finishedRoot, current, finishedWork) { break; case 12: recursivelyTraverseLayoutEffects(finishedRoot, finishedWork); - if (flags & 4) - a: for ( - flags = finishedWork.stateNode.effectDuration, - finishedWork = finishedWork.return; - null !== finishedWork; - - ) { - switch (finishedWork.tag) { - case 3: - finishedWork.stateNode.effectDuration += flags; - break a; - case 12: - finishedWork.stateNode.effectDuration += flags; - break a; - } - finishedWork = finishedWork.return; - } break; case 13: recursivelyTraverseLayoutEffects(finishedRoot, finishedWork); @@ -8279,7 +8261,7 @@ function commitDeletionEffectsOnFiber( safelyDetachRef(deletedFiber, nearestMountedAncestor); case 6: prevHostParentIsContainer = hostParent; - var prevHostParentIsContainer$124 = hostParentIsContainer; + var prevHostParentIsContainer$123 = hostParentIsContainer; hostParent = null; recursivelyTraverseDeletionEffects( finishedRoot, @@ -8287,7 +8269,7 @@ function commitDeletionEffectsOnFiber( deletedFiber ); hostParent = prevHostParentIsContainer; - hostParentIsContainer = prevHostParentIsContainer$124; + hostParentIsContainer = prevHostParentIsContainer$123; if (null !== hostParent) if (hostParentIsContainer) try { @@ -8346,36 +8328,10 @@ function commitDeletionEffectsOnFiber( case 11: case 14: case 15: - if ( - !offscreenSubtreeWasHidden && - ((prevHostParent = deletedFiber.updateQueue), - null !== prevHostParent && - ((prevHostParent = prevHostParent.lastEffect), - null !== prevHostParent)) - ) { - prevHostParentIsContainer = prevHostParent = prevHostParent.next; - do { - prevHostParentIsContainer$124 = prevHostParentIsContainer.tag; - var inst = prevHostParentIsContainer.inst, - destroy = inst.destroy; - void 0 !== destroy && - (0 !== (prevHostParentIsContainer$124 & 2) - ? ((inst.destroy = void 0), - safelyCallDestroy( - deletedFiber, - nearestMountedAncestor, - destroy - )) - : 0 !== (prevHostParentIsContainer$124 & 4) && - ((inst.destroy = void 0), - safelyCallDestroy( - deletedFiber, - nearestMountedAncestor, - destroy - ))); - prevHostParentIsContainer = prevHostParentIsContainer.next; - } while (prevHostParentIsContainer !== prevHostParent); - } + offscreenSubtreeWasHidden || + commitHookEffectListUnmount(2, deletedFiber, nearestMountedAncestor); + offscreenSubtreeWasHidden || + commitHookEffectListUnmount(4, deletedFiber, nearestMountedAncestor); recursivelyTraverseDeletionEffects( finishedRoot, nearestMountedAncestor, @@ -8785,6 +8741,10 @@ function commitMutationEffectsOnFiber(finishedWork, root) { commitReconciliationEffects(finishedWork); currentHoistableRoot = flags; break; + case 12: + recursivelyTraverseMutationEffects(root, finishedWork); + commitReconciliationEffects(finishedWork); + break; case 13: recursivelyTraverseMutationEffects(root, finishedWork); commitReconciliationEffects(finishedWork); @@ -9098,23 +9058,6 @@ function recursivelyTraverseReappearLayoutEffects( finishedWork, includeWorkInProgressEffects ); - if (includeWorkInProgressEffects && flags & 4) - a: for ( - flags = finishedWork.stateNode.effectDuration, - finishedWork = finishedWork.return; - null !== finishedWork; - - ) { - switch (finishedWork.tag) { - case 3: - finishedWork.stateNode.effectDuration += flags; - break a; - case 12: - finishedWork.stateNode.effectDuration += flags; - break a; - } - finishedWork = finishedWork.return; - } break; case 13: recursivelyTraverseReappearLayoutEffects( @@ -9219,19 +9162,42 @@ function commitPassiveMountOnFiber( null != finishedRoot && releaseCache(finishedRoot))); break; case 12: - recursivelyTraversePassiveMountEffects( - finishedRoot, - finishedWork, - committedLanes, - committedTransitions - ); + if (flags & 2048) { + recursivelyTraversePassiveMountEffects( + finishedRoot, + finishedWork, + committedLanes, + committedTransitions + ); + finishedRoot = finishedWork.stateNode; + try { + var _finishedWork$memoize2 = finishedWork.memoizedProps, + id = _finishedWork$memoize2.id, + onPostCommit = _finishedWork$memoize2.onPostCommit; + "function" === typeof onPostCommit && + onPostCommit( + id, + null === finishedWork.alternate ? "mount" : "update", + finishedRoot.passiveEffectDuration, + -0 + ); + } catch (error) { + captureCommitPhaseError(finishedWork, finishedWork.return, error); + } + } else + recursivelyTraversePassiveMountEffects( + finishedRoot, + finishedWork, + committedLanes, + committedTransitions + ); break; case 23: break; case 22: - var instance = finishedWork.stateNode; + _finishedWork$memoize2 = finishedWork.stateNode; null !== finishedWork.memoizedState - ? instance._visibility & 4 + ? _finishedWork$memoize2._visibility & 4 ? recursivelyTraversePassiveMountEffects( finishedRoot, finishedWork, @@ -9239,14 +9205,14 @@ function commitPassiveMountOnFiber( committedTransitions ) : recursivelyTraverseAtomicPassiveEffects(finishedRoot, finishedWork) - : instance._visibility & 4 + : _finishedWork$memoize2._visibility & 4 ? recursivelyTraversePassiveMountEffects( finishedRoot, finishedWork, committedLanes, committedTransitions ) - : ((instance._visibility |= 4), + : ((_finishedWork$memoize2._visibility |= 4), recursivelyTraverseReconnectPassiveEffects( finishedRoot, finishedWork, @@ -9478,6 +9444,12 @@ function commitPassiveUnmountOnFiber(finishedWork) { finishedWork.flags & 2048 && commitHookEffectListUnmount(9, finishedWork, finishedWork.return); break; + case 3: + recursivelyTraversePassiveUnmountEffects(finishedWork); + break; + case 12: + recursivelyTraversePassiveUnmountEffects(finishedWork); + break; case 22: var instance = finishedWork.stateNode; null !== finishedWork.memoizedState && @@ -9854,14 +9826,14 @@ function cutOffTailIfNeeded(renderState, hasRenderedATailFallback) { break; case "collapsed": lastTailNode = renderState.tail; - for (var lastTailNode$137 = null; null !== lastTailNode; ) - null !== lastTailNode.alternate && (lastTailNode$137 = lastTailNode), + for (var lastTailNode$135 = null; null !== lastTailNode; ) + null !== lastTailNode.alternate && (lastTailNode$135 = lastTailNode), (lastTailNode = lastTailNode.sibling); - null === lastTailNode$137 + null === lastTailNode$135 ? hasRenderedATailFallback || null === renderState.tail ? (renderState.tail = null) : (renderState.tail.sibling = null) - : (lastTailNode$137.sibling = null); + : (lastTailNode$135.sibling = null); } } function bubbleProperties(completedWork) { @@ -9871,19 +9843,19 @@ function bubbleProperties(completedWork) { newChildLanes = 0, subtreeFlags = 0; if (didBailout) - for (var child$138 = completedWork.child; null !== child$138; ) - (newChildLanes |= child$138.lanes | child$138.childLanes), - (subtreeFlags |= child$138.subtreeFlags & 31457280), - (subtreeFlags |= child$138.flags & 31457280), - (child$138.return = completedWork), - (child$138 = child$138.sibling); + for (var child$136 = completedWork.child; null !== child$136; ) + (newChildLanes |= child$136.lanes | child$136.childLanes), + (subtreeFlags |= child$136.subtreeFlags & 31457280), + (subtreeFlags |= child$136.flags & 31457280), + (child$136.return = completedWork), + (child$136 = child$136.sibling); else - for (child$138 = completedWork.child; null !== child$138; ) - (newChildLanes |= child$138.lanes | child$138.childLanes), - (subtreeFlags |= child$138.subtreeFlags), - (subtreeFlags |= child$138.flags), - (child$138.return = completedWork), - (child$138 = child$138.sibling); + for (child$136 = completedWork.child; null !== child$136; ) + (newChildLanes |= child$136.lanes | child$136.childLanes), + (subtreeFlags |= child$136.subtreeFlags), + (subtreeFlags |= child$136.flags), + (child$136.return = completedWork), + (child$136 = child$136.sibling); completedWork.subtreeFlags |= subtreeFlags; completedWork.childLanes = newChildLanes; return didBailout; @@ -10160,11 +10132,11 @@ function completeWork(current, workInProgress, renderLanes) { null !== newProps.alternate.memoizedState && null !== newProps.alternate.memoizedState.cachePool && (type = newProps.alternate.memoizedState.cachePool.pool); - var cache$150 = null; + var cache$148 = null; null !== newProps.memoizedState && null !== newProps.memoizedState.cachePool && - (cache$150 = newProps.memoizedState.cachePool.pool); - cache$150 !== type && (newProps.flags |= 2048); + (cache$148 = newProps.memoizedState.cachePool.pool); + cache$148 !== type && (newProps.flags |= 2048); } renderLanes !== current && renderLanes && @@ -10189,8 +10161,8 @@ function completeWork(current, workInProgress, renderLanes) { type = workInProgress.memoizedState; if (null === type) return bubbleProperties(workInProgress), null; newProps = 0 !== (workInProgress.flags & 128); - cache$150 = type.rendering; - if (null === cache$150) + cache$148 = type.rendering; + if (null === cache$148) if (newProps) cutOffTailIfNeeded(type, !1); else { if ( @@ -10198,11 +10170,11 @@ function completeWork(current, workInProgress, renderLanes) { (null !== current && 0 !== (current.flags & 128)) ) for (current = workInProgress.child; null !== current; ) { - cache$150 = findFirstSuspended(current); - if (null !== cache$150) { + cache$148 = findFirstSuspended(current); + if (null !== cache$148) { workInProgress.flags |= 128; cutOffTailIfNeeded(type, !1); - current = cache$150.updateQueue; + current = cache$148.updateQueue; workInProgress.updateQueue = current; scheduleRetryEffect(workInProgress, current); workInProgress.subtreeFlags = 0; @@ -10227,7 +10199,7 @@ function completeWork(current, workInProgress, renderLanes) { } else { if (!newProps) - if (((current = findFirstSuspended(cache$150)), null !== current)) { + if (((current = findFirstSuspended(cache$148)), null !== current)) { if ( ((workInProgress.flags |= 128), (newProps = !0), @@ -10237,7 +10209,7 @@ function completeWork(current, workInProgress, renderLanes) { cutOffTailIfNeeded(type, !0), null === type.tail && "hidden" === type.tailMode && - !cache$150.alternate && + !cache$148.alternate && !isHydrating) ) return bubbleProperties(workInProgress), null; @@ -10250,13 +10222,13 @@ function completeWork(current, workInProgress, renderLanes) { cutOffTailIfNeeded(type, !1), (workInProgress.lanes = 4194304)); type.isBackwards - ? ((cache$150.sibling = workInProgress.child), - (workInProgress.child = cache$150)) + ? ((cache$148.sibling = workInProgress.child), + (workInProgress.child = cache$148)) : ((current = type.last), null !== current - ? (current.sibling = cache$150) - : (workInProgress.child = cache$150), - (type.last = cache$150)); + ? (current.sibling = cache$148) + : (workInProgress.child = cache$148), + (type.last = cache$148)); } if (null !== type.tail) return ( @@ -11190,8 +11162,8 @@ function renderRootSync(root, lanes) { } workLoopSync(); break; - } catch (thrownValue$166) { - handleThrow(root, thrownValue$166); + } catch (thrownValue$164) { + handleThrow(root, thrownValue$164); } while (1); lanes && root.shellSuspendCounter++; @@ -11300,8 +11272,8 @@ function renderRootConcurrent(root, lanes) { } workLoopConcurrent(); break; - } catch (thrownValue$168) { - handleThrow(root, thrownValue$168); + } catch (thrownValue$166) { + handleThrow(root, thrownValue$166); } while (1); resetContextDependencies(); @@ -11584,7 +11556,7 @@ function releaseRootPooledCache(root, remainingLanes) { } function flushPassiveEffects() { if (null !== rootWithPendingPassiveEffects) { - var root$172 = rootWithPendingPassiveEffects, + var root$170 = rootWithPendingPassiveEffects, remainingLanes = pendingPassiveEffectsRemainingLanes; pendingPassiveEffectsRemainingLanes = 0; var renderPriority = lanesToEventPriority(pendingPassiveEffectsLanes), @@ -11623,7 +11595,7 @@ function flushPassiveEffects() { } finally { (ReactDOMSharedInternals.p = previousPriority), (ReactSharedInternals.T = prevTransition), - releaseRootPooledCache(root$172, remainingLanes); + releaseRootPooledCache(root$170, remainingLanes); } } return !1; @@ -11782,14 +11754,14 @@ function flushSyncWorkAcrossRoots_impl(syncTransitionLanes, onlyLegacy) { isFlushingWork = !0; do { var didPerformSomeWork = !1; - for (var root$174 = firstScheduledRoot; null !== root$174; ) { + for (var root$172 = firstScheduledRoot; null !== root$172; ) { if (!onlyLegacy) if (0 !== syncTransitionLanes) { - var pendingLanes = root$174.pendingLanes; + var pendingLanes = root$172.pendingLanes; if (0 === pendingLanes) var JSCompiler_inline_result = 0; else { - var suspendedLanes = root$174.suspendedLanes, - pingedLanes = root$174.pingedLanes; + var suspendedLanes = root$172.suspendedLanes, + pingedLanes = root$172.pingedLanes; JSCompiler_inline_result = (1 << (31 - clz32(42 | syncTransitionLanes) + 1)) - 1; JSCompiler_inline_result &= @@ -11803,17 +11775,17 @@ function flushSyncWorkAcrossRoots_impl(syncTransitionLanes, onlyLegacy) { } 0 !== JSCompiler_inline_result && ((didPerformSomeWork = !0), - performSyncWorkOnRoot(root$174, JSCompiler_inline_result)); + performSyncWorkOnRoot(root$172, JSCompiler_inline_result)); } else (JSCompiler_inline_result = workInProgressRootRenderLanes), (JSCompiler_inline_result = getNextLanes( - root$174, - root$174 === workInProgressRoot ? JSCompiler_inline_result : 0 + root$172, + root$172 === workInProgressRoot ? JSCompiler_inline_result : 0 )), 0 !== (JSCompiler_inline_result & 3) && ((didPerformSomeWork = !0), - performSyncWorkOnRoot(root$174, JSCompiler_inline_result)); - root$174 = root$174.next; + performSyncWorkOnRoot(root$172, JSCompiler_inline_result)); + root$172 = root$172.next; } } while (didPerformSomeWork); isFlushingWork = !1; @@ -12023,20 +11995,20 @@ function extractEvents$1( } } for ( - var i$jscomp$inline_1430 = 0; - i$jscomp$inline_1430 < simpleEventPluginEvents.length; - i$jscomp$inline_1430++ + var i$jscomp$inline_1434 = 0; + i$jscomp$inline_1434 < simpleEventPluginEvents.length; + i$jscomp$inline_1434++ ) { - var eventName$jscomp$inline_1431 = - simpleEventPluginEvents[i$jscomp$inline_1430], - domEventName$jscomp$inline_1432 = - eventName$jscomp$inline_1431.toLowerCase(), - capitalizedEvent$jscomp$inline_1433 = - eventName$jscomp$inline_1431[0].toUpperCase() + - eventName$jscomp$inline_1431.slice(1); + var eventName$jscomp$inline_1435 = + simpleEventPluginEvents[i$jscomp$inline_1434], + domEventName$jscomp$inline_1436 = + eventName$jscomp$inline_1435.toLowerCase(), + capitalizedEvent$jscomp$inline_1437 = + eventName$jscomp$inline_1435[0].toUpperCase() + + eventName$jscomp$inline_1435.slice(1); registerSimpleEvent( - domEventName$jscomp$inline_1432, - "on" + capitalizedEvent$jscomp$inline_1433 + domEventName$jscomp$inline_1436, + "on" + capitalizedEvent$jscomp$inline_1437 ); } registerSimpleEvent(ANIMATION_END, "onAnimationEnd"); @@ -13219,34 +13191,34 @@ function setInitialProperties(domElement, tag, props) { defaultChecked = null; for (hasSrc in props) if (props.hasOwnProperty(hasSrc)) { - var propValue$188 = props[hasSrc]; - if (null != propValue$188) + var propValue$186 = props[hasSrc]; + if (null != propValue$186) switch (hasSrc) { case "name": - hasSrcSet = propValue$188; + hasSrcSet = propValue$186; break; case "type": - propValue = propValue$188; + propValue = propValue$186; break; case "checked": - checked = propValue$188; + checked = propValue$186; break; case "defaultChecked": - defaultChecked = propValue$188; + defaultChecked = propValue$186; break; case "value": - propKey = propValue$188; + propKey = propValue$186; break; case "defaultValue": - defaultValue = propValue$188; + defaultValue = propValue$186; break; case "children": case "dangerouslySetInnerHTML": - if (null != propValue$188) + if (null != propValue$186) throw Error(formatProdErrorMessage(137, tag)); break; default: - setProp(domElement, tag, hasSrc, propValue$188, props, null); + setProp(domElement, tag, hasSrc, propValue$186, props, null); } } initInput( @@ -13383,14 +13355,14 @@ function setInitialProperties(domElement, tag, props) { return; default: if (isCustomElement(tag)) { - for (propValue$188 in props) - props.hasOwnProperty(propValue$188) && - ((hasSrc = props[propValue$188]), + for (propValue$186 in props) + props.hasOwnProperty(propValue$186) && + ((hasSrc = props[propValue$186]), void 0 !== hasSrc && setPropOnCustomElement( domElement, tag, - propValue$188, + propValue$186, hasSrc, props, void 0 @@ -13438,14 +13410,14 @@ function updateProperties(domElement, tag, lastProps, nextProps) { setProp(domElement, tag, propKey, null, nextProps, lastProp); } } - for (var propKey$205 in nextProps) { - var propKey = nextProps[propKey$205]; - lastProp = lastProps[propKey$205]; + for (var propKey$203 in nextProps) { + var propKey = nextProps[propKey$203]; + lastProp = lastProps[propKey$203]; if ( - nextProps.hasOwnProperty(propKey$205) && + nextProps.hasOwnProperty(propKey$203) && (null != propKey || null != lastProp) ) - switch (propKey$205) { + switch (propKey$203) { case "type": type = propKey; break; @@ -13474,7 +13446,7 @@ function updateProperties(domElement, tag, lastProps, nextProps) { setProp( domElement, tag, - propKey$205, + propKey$203, propKey, nextProps, lastProp @@ -13493,7 +13465,7 @@ function updateProperties(domElement, tag, lastProps, nextProps) { ); return; case "select": - propKey = value = defaultValue = propKey$205 = null; + propKey = value = defaultValue = propKey$203 = null; for (type in lastProps) if ( ((lastDefaultValue = lastProps[type]), @@ -13524,7 +13496,7 @@ function updateProperties(domElement, tag, lastProps, nextProps) { ) switch (name) { case "value": - propKey$205 = type; + propKey$203 = type; break; case "defaultValue": defaultValue = type; @@ -13545,15 +13517,15 @@ function updateProperties(domElement, tag, lastProps, nextProps) { tag = defaultValue; lastProps = value; nextProps = propKey; - null != propKey$205 - ? updateOptions(domElement, !!lastProps, propKey$205, !1) + null != propKey$203 + ? updateOptions(domElement, !!lastProps, propKey$203, !1) : !!nextProps !== !!lastProps && (null != tag ? updateOptions(domElement, !!lastProps, tag, !0) : updateOptions(domElement, !!lastProps, lastProps ? [] : "", !1)); return; case "textarea": - propKey = propKey$205 = null; + propKey = propKey$203 = null; for (defaultValue in lastProps) if ( ((name = lastProps[defaultValue]), @@ -13577,7 +13549,7 @@ function updateProperties(domElement, tag, lastProps, nextProps) { ) switch (value) { case "value": - propKey$205 = name; + propKey$203 = name; break; case "defaultValue": propKey = name; @@ -13591,17 +13563,17 @@ function updateProperties(domElement, tag, lastProps, nextProps) { name !== type && setProp(domElement, tag, value, name, nextProps, type); } - updateTextarea(domElement, propKey$205, propKey); + updateTextarea(domElement, propKey$203, propKey); return; case "option": - for (var propKey$221 in lastProps) + for (var propKey$219 in lastProps) if ( - ((propKey$205 = lastProps[propKey$221]), - lastProps.hasOwnProperty(propKey$221) && - null != propKey$205 && - !nextProps.hasOwnProperty(propKey$221)) + ((propKey$203 = lastProps[propKey$219]), + lastProps.hasOwnProperty(propKey$219) && + null != propKey$203 && + !nextProps.hasOwnProperty(propKey$219)) ) - switch (propKey$221) { + switch (propKey$219) { case "selected": domElement.selected = !1; break; @@ -13609,33 +13581,33 @@ function updateProperties(domElement, tag, lastProps, nextProps) { setProp( domElement, tag, - propKey$221, + propKey$219, null, nextProps, - propKey$205 + propKey$203 ); } for (lastDefaultValue in nextProps) if ( - ((propKey$205 = nextProps[lastDefaultValue]), + ((propKey$203 = nextProps[lastDefaultValue]), (propKey = lastProps[lastDefaultValue]), nextProps.hasOwnProperty(lastDefaultValue) && - propKey$205 !== propKey && - (null != propKey$205 || null != propKey)) + propKey$203 !== propKey && + (null != propKey$203 || null != propKey)) ) switch (lastDefaultValue) { case "selected": domElement.selected = - propKey$205 && - "function" !== typeof propKey$205 && - "symbol" !== typeof propKey$205; + propKey$203 && + "function" !== typeof propKey$203 && + "symbol" !== typeof propKey$203; break; default: setProp( domElement, tag, lastDefaultValue, - propKey$205, + propKey$203, nextProps, propKey ); @@ -13656,24 +13628,24 @@ function updateProperties(domElement, tag, lastProps, nextProps) { case "track": case "wbr": case "menuitem": - for (var propKey$226 in lastProps) - (propKey$205 = lastProps[propKey$226]), - lastProps.hasOwnProperty(propKey$226) && - null != propKey$205 && - !nextProps.hasOwnProperty(propKey$226) && - setProp(domElement, tag, propKey$226, null, nextProps, propKey$205); + for (var propKey$224 in lastProps) + (propKey$203 = lastProps[propKey$224]), + lastProps.hasOwnProperty(propKey$224) && + null != propKey$203 && + !nextProps.hasOwnProperty(propKey$224) && + setProp(domElement, tag, propKey$224, null, nextProps, propKey$203); for (checked in nextProps) if ( - ((propKey$205 = nextProps[checked]), + ((propKey$203 = nextProps[checked]), (propKey = lastProps[checked]), nextProps.hasOwnProperty(checked) && - propKey$205 !== propKey && - (null != propKey$205 || null != propKey)) + propKey$203 !== propKey && + (null != propKey$203 || null != propKey)) ) switch (checked) { case "children": case "dangerouslySetInnerHTML": - if (null != propKey$205) + if (null != propKey$203) throw Error(formatProdErrorMessage(137, tag)); break; default: @@ -13681,7 +13653,7 @@ function updateProperties(domElement, tag, lastProps, nextProps) { domElement, tag, checked, - propKey$205, + propKey$203, nextProps, propKey ); @@ -13689,49 +13661,49 @@ function updateProperties(domElement, tag, lastProps, nextProps) { return; default: if (isCustomElement(tag)) { - for (var propKey$231 in lastProps) - (propKey$205 = lastProps[propKey$231]), - lastProps.hasOwnProperty(propKey$231) && - void 0 !== propKey$205 && - !nextProps.hasOwnProperty(propKey$231) && + for (var propKey$229 in lastProps) + (propKey$203 = lastProps[propKey$229]), + lastProps.hasOwnProperty(propKey$229) && + void 0 !== propKey$203 && + !nextProps.hasOwnProperty(propKey$229) && setPropOnCustomElement( domElement, tag, - propKey$231, + propKey$229, void 0, nextProps, - propKey$205 + propKey$203 ); for (defaultChecked in nextProps) - (propKey$205 = nextProps[defaultChecked]), + (propKey$203 = nextProps[defaultChecked]), (propKey = lastProps[defaultChecked]), !nextProps.hasOwnProperty(defaultChecked) || - propKey$205 === propKey || - (void 0 === propKey$205 && void 0 === propKey) || + propKey$203 === propKey || + (void 0 === propKey$203 && void 0 === propKey) || setPropOnCustomElement( domElement, tag, defaultChecked, - propKey$205, + propKey$203, nextProps, propKey ); return; } } - for (var propKey$236 in lastProps) - (propKey$205 = lastProps[propKey$236]), - lastProps.hasOwnProperty(propKey$236) && - null != propKey$205 && - !nextProps.hasOwnProperty(propKey$236) && - setProp(domElement, tag, propKey$236, null, nextProps, propKey$205); + for (var propKey$234 in lastProps) + (propKey$203 = lastProps[propKey$234]), + lastProps.hasOwnProperty(propKey$234) && + null != propKey$203 && + !nextProps.hasOwnProperty(propKey$234) && + setProp(domElement, tag, propKey$234, null, nextProps, propKey$203); for (lastProp in nextProps) - (propKey$205 = nextProps[lastProp]), + (propKey$203 = nextProps[lastProp]), (propKey = lastProps[lastProp]), !nextProps.hasOwnProperty(lastProp) || - propKey$205 === propKey || - (null == propKey$205 && null == propKey) || - setProp(domElement, tag, lastProp, propKey$205, nextProps, propKey); + propKey$203 === propKey || + (null == propKey$203 && null == propKey) || + setProp(domElement, tag, lastProp, propKey$203, nextProps, propKey); } var eventsEnabled = null, selectionInformation = null; @@ -14333,26 +14305,26 @@ function getResource(type, currentProps, pendingProps, currentResource) { "string" === typeof pendingProps.precedence ) { type = getStyleKey(pendingProps.href); - var styles$244 = getResourcesFromRoot( + var styles$242 = getResourcesFromRoot( JSCompiler_inline_result ).hoistableStyles, - resource$245 = styles$244.get(type); - resource$245 || + resource$243 = styles$242.get(type); + resource$243 || ((JSCompiler_inline_result = JSCompiler_inline_result.ownerDocument || JSCompiler_inline_result), - (resource$245 = { + (resource$243 = { type: "stylesheet", instance: null, count: 0, state: { loading: 0, preload: null } }), - styles$244.set(type, resource$245), - (styles$244 = JSCompiler_inline_result.querySelector( + styles$242.set(type, resource$243), + (styles$242 = JSCompiler_inline_result.querySelector( getStylesheetSelectorFromKey(type) )) && - !styles$244._p && - ((resource$245.instance = styles$244), - (resource$245.state.loading = 5)), + !styles$242._p && + ((resource$243.instance = styles$242), + (resource$243.state.loading = 5)), preloadPropsMap.has(type) || ((pendingProps = { rel: "preload", @@ -14365,16 +14337,16 @@ function getResource(type, currentProps, pendingProps, currentResource) { referrerPolicy: pendingProps.referrerPolicy }), preloadPropsMap.set(type, pendingProps), - styles$244 || + styles$242 || preloadStylesheet( JSCompiler_inline_result, type, pendingProps, - resource$245.state + resource$243.state ))); if (currentProps && null === currentResource) throw Error(formatProdErrorMessage(528, "")); - return resource$245; + return resource$243; } if (currentProps && null !== currentResource) throw Error(formatProdErrorMessage(529, "")); @@ -14471,37 +14443,37 @@ function acquireResource(hoistableRoot, resource, props) { return (resource.instance = instance); case "stylesheet": styleProps = getStyleKey(props.href); - var instance$250 = hoistableRoot.querySelector( + var instance$248 = hoistableRoot.querySelector( getStylesheetSelectorFromKey(styleProps) ); - if (instance$250) + if (instance$248) return ( (resource.state.loading |= 4), - (resource.instance = instance$250), - markNodeAsHoistable(instance$250), - instance$250 + (resource.instance = instance$248), + markNodeAsHoistable(instance$248), + instance$248 ); instance = stylesheetPropsFromRawProps(props); (styleProps = preloadPropsMap.get(styleProps)) && adoptPreloadPropsForStylesheet(instance, styleProps); - instance$250 = ( + instance$248 = ( hoistableRoot.ownerDocument || hoistableRoot ).createElement("link"); - markNodeAsHoistable(instance$250); - var linkInstance = instance$250; + markNodeAsHoistable(instance$248); + var linkInstance = instance$248; linkInstance._p = new Promise(function (resolve, reject) { linkInstance.onload = resolve; linkInstance.onerror = reject; }); - setInitialProperties(instance$250, "link", instance); + setInitialProperties(instance$248, "link", instance); resource.state.loading |= 4; - insertStylesheet(instance$250, props.precedence, hoistableRoot); - return (resource.instance = instance$250); + insertStylesheet(instance$248, props.precedence, hoistableRoot); + return (resource.instance = instance$248); case "script": - instance$250 = getScriptKey(props.src); + instance$248 = getScriptKey(props.src); if ( (styleProps = hoistableRoot.querySelector( - getScriptSelectorFromKey(instance$250) + getScriptSelectorFromKey(instance$248) )) ) return ( @@ -14510,7 +14482,7 @@ function acquireResource(hoistableRoot, resource, props) { styleProps ); instance = props; - if ((styleProps = preloadPropsMap.get(instance$250))) + if ((styleProps = preloadPropsMap.get(instance$248))) (instance = assign({}, props)), adoptPreloadPropsForScript(instance, styleProps); hoistableRoot = hoistableRoot.ownerDocument || hoistableRoot; @@ -15534,16 +15506,16 @@ ReactDOMHydrationRoot.prototype.unstable_scheduleHydration = function (target) { 0 === i && attemptExplicitHydrationTarget(target); } }; -var isomorphicReactPackageVersion$jscomp$inline_1677 = React.version; +var isomorphicReactPackageVersion$jscomp$inline_1681 = React.version; if ( - "19.0.0-experimental-a99d8e8d-20240916" !== - isomorphicReactPackageVersion$jscomp$inline_1677 + "19.0.0-experimental-5dcb0097-20240918" !== + isomorphicReactPackageVersion$jscomp$inline_1681 ) throw Error( formatProdErrorMessage( 527, - isomorphicReactPackageVersion$jscomp$inline_1677, - "19.0.0-experimental-a99d8e8d-20240916" + isomorphicReactPackageVersion$jscomp$inline_1681, + "19.0.0-experimental-5dcb0097-20240918" ) ); ReactDOMSharedInternals.findDOMNode = function (componentOrElement) { @@ -15563,25 +15535,25 @@ ReactDOMSharedInternals.findDOMNode = function (componentOrElement) { null === componentOrElement ? null : componentOrElement.stateNode; return componentOrElement; }; -var internals$jscomp$inline_2121 = { +var internals$jscomp$inline_2146 = { bundleType: 0, - version: "19.0.0-experimental-a99d8e8d-20240916", + version: "19.0.0-experimental-5dcb0097-20240918", rendererPackageName: "react-dom", currentDispatcherRef: ReactSharedInternals, findFiberByHostInstance: getClosestInstanceFromNode, - reconcilerVersion: "19.0.0-experimental-a99d8e8d-20240916" + reconcilerVersion: "19.0.0-experimental-5dcb0097-20240918" }; if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) { - var hook$jscomp$inline_2122 = __REACT_DEVTOOLS_GLOBAL_HOOK__; + var hook$jscomp$inline_2147 = __REACT_DEVTOOLS_GLOBAL_HOOK__; if ( - !hook$jscomp$inline_2122.isDisabled && - hook$jscomp$inline_2122.supportsFiber + !hook$jscomp$inline_2147.isDisabled && + hook$jscomp$inline_2147.supportsFiber ) try { - (rendererID = hook$jscomp$inline_2122.inject( - internals$jscomp$inline_2121 + (rendererID = hook$jscomp$inline_2147.inject( + internals$jscomp$inline_2146 )), - (injectedHook = hook$jscomp$inline_2122); + (injectedHook = hook$jscomp$inline_2147); } catch (err) {} } exports.createComponentSelector = function (component) { @@ -15824,4 +15796,4 @@ exports.observeVisibleRects = function ( } }; }; -exports.version = "19.0.0-experimental-a99d8e8d-20240916"; +exports.version = "19.0.0-experimental-5dcb0097-20240918"; diff --git a/packages/next/src/compiled/react-dom-experimental/cjs/react-dom.development.js b/packages/next/src/compiled/react-dom-experimental/cjs/react-dom.development.js index 53e8e4b48dcbb..4034269a56893 100644 --- a/packages/next/src/compiled/react-dom-experimental/cjs/react-dom.development.js +++ b/packages/next/src/compiled/react-dom-experimental/cjs/react-dom.development.js @@ -416,7 +416,7 @@ exports.useFormStatus = function () { return resolveDispatcher().useHostTransitionStatus(); }; - exports.version = "19.0.0-experimental-a99d8e8d-20240916"; + exports.version = "19.0.0-experimental-5dcb0097-20240918"; "undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ && "function" === typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStop && diff --git a/packages/next/src/compiled/react-dom-experimental/cjs/react-dom.production.js b/packages/next/src/compiled/react-dom-experimental/cjs/react-dom.production.js index b3d62e41d528e..62edeb96f19aa 100644 --- a/packages/next/src/compiled/react-dom-experimental/cjs/react-dom.production.js +++ b/packages/next/src/compiled/react-dom-experimental/cjs/react-dom.production.js @@ -207,4 +207,4 @@ exports.useFormState = function (action, initialState, permalink) { exports.useFormStatus = function () { return ReactSharedInternals.H.useHostTransitionStatus(); }; -exports.version = "19.0.0-experimental-a99d8e8d-20240916"; +exports.version = "19.0.0-experimental-5dcb0097-20240918"; diff --git a/packages/next/src/compiled/react-dom-experimental/cjs/react-dom.react-server.development.js b/packages/next/src/compiled/react-dom-experimental/cjs/react-dom.react-server.development.js index b3c3776aacce7..a09516f0fbf67 100644 --- a/packages/next/src/compiled/react-dom-experimental/cjs/react-dom.react-server.development.js +++ b/packages/next/src/compiled/react-dom-experimental/cjs/react-dom.react-server.development.js @@ -336,5 +336,5 @@ })) : Internals.d.m(href)); }; - exports.version = "19.0.0-experimental-a99d8e8d-20240916"; + exports.version = "19.0.0-experimental-5dcb0097-20240918"; })(); diff --git a/packages/next/src/compiled/react-dom-experimental/cjs/react-dom.react-server.production.js b/packages/next/src/compiled/react-dom-experimental/cjs/react-dom.react-server.production.js index cc31106d97a7c..933230a2223d3 100644 --- a/packages/next/src/compiled/react-dom-experimental/cjs/react-dom.react-server.production.js +++ b/packages/next/src/compiled/react-dom-experimental/cjs/react-dom.react-server.production.js @@ -149,4 +149,4 @@ exports.preloadModule = function (href, options) { }); } else Internals.d.m(href); }; -exports.version = "19.0.0-experimental-a99d8e8d-20240916"; +exports.version = "19.0.0-experimental-5dcb0097-20240918"; diff --git a/packages/next/src/compiled/react-dom-experimental/package.json b/packages/next/src/compiled/react-dom-experimental/package.json index ca3119f68c14c..c015cc0c49b9a 100644 --- a/packages/next/src/compiled/react-dom-experimental/package.json +++ b/packages/next/src/compiled/react-dom-experimental/package.json @@ -72,10 +72,10 @@ "./package.json": "./package.json" }, "dependencies": { - "scheduler": "0.0.0-experimental-a99d8e8d-20240916" + "scheduler": "0.0.0-experimental-5dcb0097-20240918" }, "peerDependencies": { - "react": "0.0.0-experimental-a99d8e8d-20240916" + "react": "0.0.0-experimental-5dcb0097-20240918" }, "browser": { "./server.js": "./server.browser.js", diff --git a/packages/next/src/compiled/react-dom/cjs/react-dom-client.development.js b/packages/next/src/compiled/react-dom/cjs/react-dom-client.development.js index b4c575d00289c..803b3ec5e15a0 100644 --- a/packages/next/src/compiled/react-dom/cjs/react-dom-client.development.js +++ b/packages/next/src/compiled/react-dom/cjs/react-dom-client.development.js @@ -901,18 +901,6 @@ typeof injectedProfilingHooks.markComponentRenderStopped && injectedProfilingHooks.markComponentRenderStopped(); } - function markComponentLayoutEffectUnmountStarted(fiber) { - null !== injectedProfilingHooks && - "function" === - typeof injectedProfilingHooks.markComponentLayoutEffectUnmountStarted && - injectedProfilingHooks.markComponentLayoutEffectUnmountStarted(fiber); - } - function markComponentLayoutEffectUnmountStopped() { - null !== injectedProfilingHooks && - "function" === - typeof injectedProfilingHooks.markComponentLayoutEffectUnmountStopped && - injectedProfilingHooks.markComponentLayoutEffectUnmountStopped(); - } function markRenderStarted(lanes) { null !== injectedProfilingHooks && "function" === typeof injectedProfilingHooks.markRenderStarted && @@ -3531,41 +3519,43 @@ : !1; } function getActiveElementDeep(containerInfo) { - var $jscomp$optchain$tmpm387105565$1, $jscomp$nullish$tmp0; + var $jscomp$optchain$tmpm1725346839$1, $jscomp$nullish$tmp0; containerInfo = null != ($jscomp$nullish$tmp0 = null == containerInfo ? void 0 : null == - ($jscomp$optchain$tmpm387105565$1 = containerInfo.ownerDocument) + ($jscomp$optchain$tmpm1725346839$1 = + containerInfo.ownerDocument) ? void 0 - : $jscomp$optchain$tmpm387105565$1.defaultView) + : $jscomp$optchain$tmpm1725346839$1.defaultView) ? $jscomp$nullish$tmp0 : window; for ( - $jscomp$optchain$tmpm387105565$1 = getActiveElement( + $jscomp$optchain$tmpm1725346839$1 = getActiveElement( containerInfo.document ); - $jscomp$optchain$tmpm387105565$1 instanceof + $jscomp$optchain$tmpm1725346839$1 instanceof containerInfo.HTMLIFrameElement; ) { try { var JSCompiler_inline_result = "string" === - typeof $jscomp$optchain$tmpm387105565$1.contentWindow.location.href; + typeof $jscomp$optchain$tmpm1725346839$1.contentWindow.location + .href; } catch (err) { JSCompiler_inline_result = !1; } if (JSCompiler_inline_result) - containerInfo = $jscomp$optchain$tmpm387105565$1.contentWindow; + containerInfo = $jscomp$optchain$tmpm1725346839$1.contentWindow; else break; - $jscomp$optchain$tmpm387105565$1 = getActiveElement( + $jscomp$optchain$tmpm1725346839$1 = getActiveElement( containerInfo.document ); } - return $jscomp$optchain$tmpm387105565$1; + return $jscomp$optchain$tmpm1725346839$1; } function hasSelectionCapabilities(elem) { var nodeName = elem && elem.nodeName && elem.nodeName.toLowerCase(); @@ -3941,6 +3931,21 @@ staleFamilies ); } + function pushNestedEffectDurations() { + var prevEffectDuration = profilerEffectDuration; + profilerEffectDuration = 0; + return prevEffectDuration; + } + function popNestedEffectDurations(prevEffectDuration) { + var elapsedTime = profilerEffectDuration; + profilerEffectDuration = prevEffectDuration; + return elapsedTime; + } + function bubbleNestedEffectDurations(prevEffectDuration) { + var elapsedTime = profilerEffectDuration; + profilerEffectDuration += prevEffectDuration; + return elapsedTime; + } function startProfilerTimer(fiber) { profilerStartTime = now(); 0 > fiber.actualStartTime && (fiber.actualStartTime = profilerStartTime); @@ -3960,44 +3965,15 @@ profilerStartTime = -1; } } - function recordLayoutEffectDuration(fiber) { - if (0 <= layoutEffectStartTime) { - var elapsedTime = now() - layoutEffectStartTime; - layoutEffectStartTime = -1; - for (fiber = fiber.return; null !== fiber; ) { - switch (fiber.tag) { - case 3: - fiber.stateNode.effectDuration += elapsedTime; - return; - case 12: - fiber.stateNode.effectDuration += elapsedTime; - return; - } - fiber = fiber.return; - } - } - } - function recordPassiveEffectDuration(fiber) { - if (0 <= passiveEffectStartTime) { - var elapsedTime = now() - passiveEffectStartTime; - passiveEffectStartTime = -1; - for (fiber = fiber.return; null !== fiber; ) { - switch (fiber.tag) { - case 3: - fiber = fiber.stateNode; - null !== fiber && (fiber.passiveEffectDuration += elapsedTime); - return; - case 12: - fiber = fiber.stateNode; - null !== fiber && (fiber.passiveEffectDuration += elapsedTime); - return; - } - fiber = fiber.return; - } + function recordEffectDuration() { + if (0 <= profilerStartTime) { + var elapsedTime = now() - profilerStartTime; + profilerStartTime = -1; + profilerEffectDuration += elapsedTime; } } - function startLayoutEffectTimer() { - layoutEffectStartTime = now(); + function startEffectTimer() { + profilerStartTime = now(); } function transferActualDuration(fiber) { for (var child = fiber.child; child; ) @@ -8657,32 +8633,32 @@ return current; } function updateSuspenseComponent(current, workInProgress, renderLanes) { - var JSCompiler_object_inline_digest_2299; - var JSCompiler_object_inline_stack_2300 = workInProgress.pendingProps; + var JSCompiler_object_inline_digest_2288; + var JSCompiler_object_inline_stack_2289 = workInProgress.pendingProps; shouldSuspendImpl(workInProgress) && (workInProgress.flags |= 128); - var JSCompiler_object_inline_componentStack_2301 = !1; + var JSCompiler_object_inline_componentStack_2290 = !1; var didSuspend = 0 !== (workInProgress.flags & 128); - (JSCompiler_object_inline_digest_2299 = didSuspend) || - (JSCompiler_object_inline_digest_2299 = + (JSCompiler_object_inline_digest_2288 = didSuspend) || + (JSCompiler_object_inline_digest_2288 = null !== current && null === current.memoizedState ? !1 : 0 !== (suspenseStackCursor.current & ForceSuspenseFallback)); - JSCompiler_object_inline_digest_2299 && - ((JSCompiler_object_inline_componentStack_2301 = !0), + JSCompiler_object_inline_digest_2288 && + ((JSCompiler_object_inline_componentStack_2290 = !0), (workInProgress.flags &= -129)); - JSCompiler_object_inline_digest_2299 = 0 !== (workInProgress.flags & 32); + JSCompiler_object_inline_digest_2288 = 0 !== (workInProgress.flags & 32); workInProgress.flags &= -33; if (null === current) { if (isHydrating) { - JSCompiler_object_inline_componentStack_2301 + JSCompiler_object_inline_componentStack_2290 ? pushPrimaryTreeSuspenseHandler(workInProgress) : reuseSuspenseHandlerOnStack(workInProgress); if (isHydrating) { - var JSCompiler_object_inline_message_2298 = nextHydratableInstance; + var JSCompiler_object_inline_message_2287 = nextHydratableInstance; var JSCompiler_temp; - if (!(JSCompiler_temp = !JSCompiler_object_inline_message_2298)) { + if (!(JSCompiler_temp = !JSCompiler_object_inline_message_2287)) { c: { - var instance = JSCompiler_object_inline_message_2298; + var instance = JSCompiler_object_inline_message_2287; for ( JSCompiler_temp = rootOrSingletonContext; 8 !== instance.nodeType; @@ -8723,19 +8699,19 @@ JSCompiler_temp && (warnNonHydratedInstance( workInProgress, - JSCompiler_object_inline_message_2298 + JSCompiler_object_inline_message_2287 ), throwOnHydrationMismatch(workInProgress)); } - JSCompiler_object_inline_message_2298 = workInProgress.memoizedState; + JSCompiler_object_inline_message_2287 = workInProgress.memoizedState; if ( - null !== JSCompiler_object_inline_message_2298 && - ((JSCompiler_object_inline_message_2298 = - JSCompiler_object_inline_message_2298.dehydrated), - null !== JSCompiler_object_inline_message_2298) + null !== JSCompiler_object_inline_message_2287 && + ((JSCompiler_object_inline_message_2287 = + JSCompiler_object_inline_message_2287.dehydrated), + null !== JSCompiler_object_inline_message_2287) ) return ( - JSCompiler_object_inline_message_2298.data === + JSCompiler_object_inline_message_2287.data === SUSPENSE_FALLBACK_START_DATA ? (workInProgress.lanes = 16) : (workInProgress.lanes = 536870912), @@ -8743,58 +8719,58 @@ ); popSuspenseHandler(workInProgress); } - JSCompiler_object_inline_message_2298 = - JSCompiler_object_inline_stack_2300.children; - JSCompiler_object_inline_stack_2300 = - JSCompiler_object_inline_stack_2300.fallback; - if (JSCompiler_object_inline_componentStack_2301) + JSCompiler_object_inline_message_2287 = + JSCompiler_object_inline_stack_2289.children; + JSCompiler_object_inline_stack_2289 = + JSCompiler_object_inline_stack_2289.fallback; + if (JSCompiler_object_inline_componentStack_2290) return ( reuseSuspenseHandlerOnStack(workInProgress), - (JSCompiler_object_inline_componentStack_2301 = + (JSCompiler_object_inline_componentStack_2290 = workInProgress.mode), - (JSCompiler_object_inline_message_2298 = + (JSCompiler_object_inline_message_2287 = mountWorkInProgressOffscreenFiber( { mode: "hidden", - children: JSCompiler_object_inline_message_2298 + children: JSCompiler_object_inline_message_2287 }, - JSCompiler_object_inline_componentStack_2301 + JSCompiler_object_inline_componentStack_2290 )), - (JSCompiler_object_inline_stack_2300 = createFiberFromFragment( - JSCompiler_object_inline_stack_2300, - JSCompiler_object_inline_componentStack_2301, + (JSCompiler_object_inline_stack_2289 = createFiberFromFragment( + JSCompiler_object_inline_stack_2289, + JSCompiler_object_inline_componentStack_2290, renderLanes, null )), - (JSCompiler_object_inline_message_2298.return = workInProgress), - (JSCompiler_object_inline_stack_2300.return = workInProgress), - (JSCompiler_object_inline_message_2298.sibling = - JSCompiler_object_inline_stack_2300), - (workInProgress.child = JSCompiler_object_inline_message_2298), - (JSCompiler_object_inline_componentStack_2301 = + (JSCompiler_object_inline_message_2287.return = workInProgress), + (JSCompiler_object_inline_stack_2289.return = workInProgress), + (JSCompiler_object_inline_message_2287.sibling = + JSCompiler_object_inline_stack_2289), + (workInProgress.child = JSCompiler_object_inline_message_2287), + (JSCompiler_object_inline_componentStack_2290 = workInProgress.child), - (JSCompiler_object_inline_componentStack_2301.memoizedState = + (JSCompiler_object_inline_componentStack_2290.memoizedState = mountSuspenseOffscreenState(renderLanes)), - (JSCompiler_object_inline_componentStack_2301.childLanes = + (JSCompiler_object_inline_componentStack_2290.childLanes = getRemainingWorkInPrimaryTree( current, - JSCompiler_object_inline_digest_2299, + JSCompiler_object_inline_digest_2288, renderLanes )), (workInProgress.memoizedState = SUSPENDED_MARKER), - JSCompiler_object_inline_stack_2300 + JSCompiler_object_inline_stack_2289 ); pushPrimaryTreeSuspenseHandler(workInProgress); return mountSuspensePrimaryChildren( workInProgress, - JSCompiler_object_inline_message_2298 + JSCompiler_object_inline_message_2287 ); } var prevState = current.memoizedState; if ( null !== prevState && - ((JSCompiler_object_inline_message_2298 = prevState.dehydrated), - null !== JSCompiler_object_inline_message_2298) + ((JSCompiler_object_inline_message_2287 = prevState.dehydrated), + null !== JSCompiler_object_inline_message_2287) ) { if (didSuspend) workInProgress.flags & 256 @@ -8811,94 +8787,94 @@ (workInProgress.flags |= 128), (workInProgress = null)) : (reuseSuspenseHandlerOnStack(workInProgress), - (JSCompiler_object_inline_componentStack_2301 = - JSCompiler_object_inline_stack_2300.fallback), - (JSCompiler_object_inline_message_2298 = workInProgress.mode), - (JSCompiler_object_inline_stack_2300 = + (JSCompiler_object_inline_componentStack_2290 = + JSCompiler_object_inline_stack_2289.fallback), + (JSCompiler_object_inline_message_2287 = workInProgress.mode), + (JSCompiler_object_inline_stack_2289 = mountWorkInProgressOffscreenFiber( { mode: "visible", - children: JSCompiler_object_inline_stack_2300.children + children: JSCompiler_object_inline_stack_2289.children }, - JSCompiler_object_inline_message_2298 + JSCompiler_object_inline_message_2287 )), - (JSCompiler_object_inline_componentStack_2301 = + (JSCompiler_object_inline_componentStack_2290 = createFiberFromFragment( - JSCompiler_object_inline_componentStack_2301, - JSCompiler_object_inline_message_2298, + JSCompiler_object_inline_componentStack_2290, + JSCompiler_object_inline_message_2287, renderLanes, null )), - (JSCompiler_object_inline_componentStack_2301.flags |= 2), - (JSCompiler_object_inline_stack_2300.return = workInProgress), - (JSCompiler_object_inline_componentStack_2301.return = + (JSCompiler_object_inline_componentStack_2290.flags |= 2), + (JSCompiler_object_inline_stack_2289.return = workInProgress), + (JSCompiler_object_inline_componentStack_2290.return = workInProgress), - (JSCompiler_object_inline_stack_2300.sibling = - JSCompiler_object_inline_componentStack_2301), - (workInProgress.child = JSCompiler_object_inline_stack_2300), + (JSCompiler_object_inline_stack_2289.sibling = + JSCompiler_object_inline_componentStack_2290), + (workInProgress.child = JSCompiler_object_inline_stack_2289), reconcileChildFibers( workInProgress, current.child, null, renderLanes ), - (JSCompiler_object_inline_stack_2300 = workInProgress.child), - (JSCompiler_object_inline_stack_2300.memoizedState = + (JSCompiler_object_inline_stack_2289 = workInProgress.child), + (JSCompiler_object_inline_stack_2289.memoizedState = mountSuspenseOffscreenState(renderLanes)), - (JSCompiler_object_inline_stack_2300.childLanes = + (JSCompiler_object_inline_stack_2289.childLanes = getRemainingWorkInPrimaryTree( current, - JSCompiler_object_inline_digest_2299, + JSCompiler_object_inline_digest_2288, renderLanes )), (workInProgress.memoizedState = SUSPENDED_MARKER), (workInProgress = - JSCompiler_object_inline_componentStack_2301)); + JSCompiler_object_inline_componentStack_2290)); else if ( (pushPrimaryTreeSuspenseHandler(workInProgress), isHydrating && console.error( "We should not be hydrating here. This is a bug in React. Please file a bug." ), - JSCompiler_object_inline_message_2298.data === + JSCompiler_object_inline_message_2287.data === SUSPENSE_FALLBACK_START_DATA) ) { - JSCompiler_object_inline_digest_2299 = - JSCompiler_object_inline_message_2298.nextSibling && - JSCompiler_object_inline_message_2298.nextSibling.dataset; - if (JSCompiler_object_inline_digest_2299) { - JSCompiler_temp = JSCompiler_object_inline_digest_2299.dgst; - var message = JSCompiler_object_inline_digest_2299.msg; - instance = JSCompiler_object_inline_digest_2299.stck; - var componentStack = JSCompiler_object_inline_digest_2299.cstck; + JSCompiler_object_inline_digest_2288 = + JSCompiler_object_inline_message_2287.nextSibling && + JSCompiler_object_inline_message_2287.nextSibling.dataset; + if (JSCompiler_object_inline_digest_2288) { + JSCompiler_temp = JSCompiler_object_inline_digest_2288.dgst; + var message = JSCompiler_object_inline_digest_2288.msg; + instance = JSCompiler_object_inline_digest_2288.stck; + var componentStack = JSCompiler_object_inline_digest_2288.cstck; } - JSCompiler_object_inline_message_2298 = message; - JSCompiler_object_inline_digest_2299 = JSCompiler_temp; - JSCompiler_object_inline_stack_2300 = instance; - JSCompiler_object_inline_componentStack_2301 = componentStack; - JSCompiler_object_inline_message_2298 = - JSCompiler_object_inline_message_2298 - ? Error(JSCompiler_object_inline_message_2298) + JSCompiler_object_inline_message_2287 = message; + JSCompiler_object_inline_digest_2288 = JSCompiler_temp; + JSCompiler_object_inline_stack_2289 = instance; + JSCompiler_object_inline_componentStack_2290 = componentStack; + JSCompiler_object_inline_message_2287 = + JSCompiler_object_inline_message_2287 + ? Error(JSCompiler_object_inline_message_2287) : Error( "The server could not finish this Suspense boundary, likely due to an error during server rendering. Switched to client rendering." ); - JSCompiler_object_inline_message_2298.stack = - JSCompiler_object_inline_stack_2300 || ""; - JSCompiler_object_inline_message_2298.digest = - JSCompiler_object_inline_digest_2299; - JSCompiler_object_inline_digest_2299 = - void 0 === JSCompiler_object_inline_componentStack_2301 + JSCompiler_object_inline_message_2287.stack = + JSCompiler_object_inline_stack_2289 || ""; + JSCompiler_object_inline_message_2287.digest = + JSCompiler_object_inline_digest_2288; + JSCompiler_object_inline_digest_2288 = + void 0 === JSCompiler_object_inline_componentStack_2290 ? null - : JSCompiler_object_inline_componentStack_2301; - "string" === typeof JSCompiler_object_inline_digest_2299 && + : JSCompiler_object_inline_componentStack_2290; + "string" === typeof JSCompiler_object_inline_digest_2288 && CapturedStacks.set( - JSCompiler_object_inline_message_2298, - JSCompiler_object_inline_digest_2299 + JSCompiler_object_inline_message_2287, + JSCompiler_object_inline_digest_2288 ); queueHydrationError({ - value: JSCompiler_object_inline_message_2298, + value: JSCompiler_object_inline_message_2287, source: null, - stack: JSCompiler_object_inline_digest_2299 + stack: JSCompiler_object_inline_digest_2288 }); workInProgress = retrySuspenseComponentWithoutHydrating( current, @@ -8913,25 +8889,25 @@ renderLanes, !1 ), - (JSCompiler_object_inline_digest_2299 = + (JSCompiler_object_inline_digest_2288 = 0 !== (renderLanes & current.childLanes)), - didReceiveUpdate || JSCompiler_object_inline_digest_2299) + didReceiveUpdate || JSCompiler_object_inline_digest_2288) ) { - JSCompiler_object_inline_digest_2299 = workInProgressRoot; - if (null !== JSCompiler_object_inline_digest_2299) { - JSCompiler_object_inline_stack_2300 = renderLanes & -renderLanes; - if (0 !== (JSCompiler_object_inline_stack_2300 & 42)) - JSCompiler_object_inline_stack_2300 = 1; + JSCompiler_object_inline_digest_2288 = workInProgressRoot; + if (null !== JSCompiler_object_inline_digest_2288) { + JSCompiler_object_inline_stack_2289 = renderLanes & -renderLanes; + if (0 !== (JSCompiler_object_inline_stack_2289 & 42)) + JSCompiler_object_inline_stack_2289 = 1; else - switch (JSCompiler_object_inline_stack_2300) { + switch (JSCompiler_object_inline_stack_2289) { case 2: - JSCompiler_object_inline_stack_2300 = 1; + JSCompiler_object_inline_stack_2289 = 1; break; case 8: - JSCompiler_object_inline_stack_2300 = 4; + JSCompiler_object_inline_stack_2289 = 4; break; case 32: - JSCompiler_object_inline_stack_2300 = 16; + JSCompiler_object_inline_stack_2289 = 16; break; case 128: case 256: @@ -8952,40 +8928,40 @@ case 8388608: case 16777216: case 33554432: - JSCompiler_object_inline_stack_2300 = 64; + JSCompiler_object_inline_stack_2289 = 64; break; case 268435456: - JSCompiler_object_inline_stack_2300 = 134217728; + JSCompiler_object_inline_stack_2289 = 134217728; break; default: - JSCompiler_object_inline_stack_2300 = 0; + JSCompiler_object_inline_stack_2289 = 0; } - JSCompiler_object_inline_stack_2300 = + JSCompiler_object_inline_stack_2289 = 0 !== - (JSCompiler_object_inline_stack_2300 & - (JSCompiler_object_inline_digest_2299.suspendedLanes | + (JSCompiler_object_inline_stack_2289 & + (JSCompiler_object_inline_digest_2288.suspendedLanes | renderLanes)) ? 0 - : JSCompiler_object_inline_stack_2300; + : JSCompiler_object_inline_stack_2289; if ( - 0 !== JSCompiler_object_inline_stack_2300 && - JSCompiler_object_inline_stack_2300 !== prevState.retryLane + 0 !== JSCompiler_object_inline_stack_2289 && + JSCompiler_object_inline_stack_2289 !== prevState.retryLane ) throw ( - ((prevState.retryLane = JSCompiler_object_inline_stack_2300), + ((prevState.retryLane = JSCompiler_object_inline_stack_2289), enqueueConcurrentRenderForLane( current, - JSCompiler_object_inline_stack_2300 + JSCompiler_object_inline_stack_2289 ), scheduleUpdateOnFiber( - JSCompiler_object_inline_digest_2299, + JSCompiler_object_inline_digest_2288, current, - JSCompiler_object_inline_stack_2300 + JSCompiler_object_inline_stack_2289 ), SelectiveHydrationException) ); } - JSCompiler_object_inline_message_2298.data === + JSCompiler_object_inline_message_2287.data === SUSPENSE_PENDING_START_DATA || renderDidSuspendDelayIfPossible(); workInProgress = retrySuspenseComponentWithoutHydrating( current, @@ -8993,7 +8969,7 @@ renderLanes ); } else - JSCompiler_object_inline_message_2298.data === + JSCompiler_object_inline_message_2287.data === SUSPENSE_PENDING_START_DATA ? ((workInProgress.flags |= 128), (workInProgress.child = current.child), @@ -9001,12 +8977,12 @@ null, current )), - (JSCompiler_object_inline_message_2298._reactRetry = + (JSCompiler_object_inline_message_2287._reactRetry = workInProgress), (workInProgress = null)) : ((current = prevState.treeContext), (nextHydratableInstance = getNextHydratable( - JSCompiler_object_inline_message_2298.nextSibling + JSCompiler_object_inline_message_2287.nextSibling )), (hydrationParentFiber = workInProgress), (isHydrating = !0), @@ -9024,57 +9000,57 @@ (treeContextProvider = workInProgress)), (workInProgress = mountSuspensePrimaryChildren( workInProgress, - JSCompiler_object_inline_stack_2300.children + JSCompiler_object_inline_stack_2289.children )), (workInProgress.flags |= 4096)); return workInProgress; } - if (JSCompiler_object_inline_componentStack_2301) + if (JSCompiler_object_inline_componentStack_2290) return ( reuseSuspenseHandlerOnStack(workInProgress), - (JSCompiler_object_inline_componentStack_2301 = - JSCompiler_object_inline_stack_2300.fallback), - (JSCompiler_object_inline_message_2298 = workInProgress.mode), + (JSCompiler_object_inline_componentStack_2290 = + JSCompiler_object_inline_stack_2289.fallback), + (JSCompiler_object_inline_message_2287 = workInProgress.mode), (JSCompiler_temp = current.child), (instance = JSCompiler_temp.sibling), - (JSCompiler_object_inline_stack_2300 = createWorkInProgress( + (JSCompiler_object_inline_stack_2289 = createWorkInProgress( JSCompiler_temp, { mode: "hidden", - children: JSCompiler_object_inline_stack_2300.children + children: JSCompiler_object_inline_stack_2289.children } )), - (JSCompiler_object_inline_stack_2300.subtreeFlags = + (JSCompiler_object_inline_stack_2289.subtreeFlags = JSCompiler_temp.subtreeFlags & 31457280), null !== instance - ? (JSCompiler_object_inline_componentStack_2301 = + ? (JSCompiler_object_inline_componentStack_2290 = createWorkInProgress( instance, - JSCompiler_object_inline_componentStack_2301 + JSCompiler_object_inline_componentStack_2290 )) - : ((JSCompiler_object_inline_componentStack_2301 = + : ((JSCompiler_object_inline_componentStack_2290 = createFiberFromFragment( - JSCompiler_object_inline_componentStack_2301, - JSCompiler_object_inline_message_2298, + JSCompiler_object_inline_componentStack_2290, + JSCompiler_object_inline_message_2287, renderLanes, null )), - (JSCompiler_object_inline_componentStack_2301.flags |= 2)), - (JSCompiler_object_inline_componentStack_2301.return = + (JSCompiler_object_inline_componentStack_2290.flags |= 2)), + (JSCompiler_object_inline_componentStack_2290.return = workInProgress), - (JSCompiler_object_inline_stack_2300.return = workInProgress), - (JSCompiler_object_inline_stack_2300.sibling = - JSCompiler_object_inline_componentStack_2301), - (workInProgress.child = JSCompiler_object_inline_stack_2300), - (JSCompiler_object_inline_stack_2300 = - JSCompiler_object_inline_componentStack_2301), - (JSCompiler_object_inline_componentStack_2301 = workInProgress.child), - (JSCompiler_object_inline_message_2298 = current.child.memoizedState), - null === JSCompiler_object_inline_message_2298 - ? (JSCompiler_object_inline_message_2298 = + (JSCompiler_object_inline_stack_2289.return = workInProgress), + (JSCompiler_object_inline_stack_2289.sibling = + JSCompiler_object_inline_componentStack_2290), + (workInProgress.child = JSCompiler_object_inline_stack_2289), + (JSCompiler_object_inline_stack_2289 = + JSCompiler_object_inline_componentStack_2290), + (JSCompiler_object_inline_componentStack_2290 = workInProgress.child), + (JSCompiler_object_inline_message_2287 = current.child.memoizedState), + null === JSCompiler_object_inline_message_2287 + ? (JSCompiler_object_inline_message_2287 = mountSuspenseOffscreenState(renderLanes)) : ((JSCompiler_temp = - JSCompiler_object_inline_message_2298.cachePool), + JSCompiler_object_inline_message_2287.cachePool), null !== JSCompiler_temp ? ((instance = CacheContext._currentValue), (JSCompiler_temp = @@ -9082,37 +9058,37 @@ ? { parent: instance, pool: instance } : JSCompiler_temp)) : (JSCompiler_temp = getSuspendedCache()), - (JSCompiler_object_inline_message_2298 = { + (JSCompiler_object_inline_message_2287 = { baseLanes: - JSCompiler_object_inline_message_2298.baseLanes | renderLanes, + JSCompiler_object_inline_message_2287.baseLanes | renderLanes, cachePool: JSCompiler_temp })), - (JSCompiler_object_inline_componentStack_2301.memoizedState = - JSCompiler_object_inline_message_2298), - (JSCompiler_object_inline_componentStack_2301.childLanes = + (JSCompiler_object_inline_componentStack_2290.memoizedState = + JSCompiler_object_inline_message_2287), + (JSCompiler_object_inline_componentStack_2290.childLanes = getRemainingWorkInPrimaryTree( current, - JSCompiler_object_inline_digest_2299, + JSCompiler_object_inline_digest_2288, renderLanes )), (workInProgress.memoizedState = SUSPENDED_MARKER), - JSCompiler_object_inline_stack_2300 + JSCompiler_object_inline_stack_2289 ); pushPrimaryTreeSuspenseHandler(workInProgress); renderLanes = current.child; current = renderLanes.sibling; renderLanes = createWorkInProgress(renderLanes, { mode: "visible", - children: JSCompiler_object_inline_stack_2300.children + children: JSCompiler_object_inline_stack_2289.children }); renderLanes.return = workInProgress; renderLanes.sibling = null; null !== current && - ((JSCompiler_object_inline_digest_2299 = workInProgress.deletions), - null === JSCompiler_object_inline_digest_2299 + ((JSCompiler_object_inline_digest_2288 = workInProgress.deletions), + null === JSCompiler_object_inline_digest_2288 ? ((workInProgress.deletions = [current]), (workInProgress.flags |= 16)) - : JSCompiler_object_inline_digest_2299.push(current)); + : JSCompiler_object_inline_digest_2288.push(current)); workInProgress.child = renderLanes; workInProgress.memoizedState = null; return renderLanes; @@ -9440,8 +9416,8 @@ (workInProgress.flags |= 4); workInProgress.flags |= 2048; var stateNode = workInProgress.stateNode; - stateNode.effectDuration = 0; - stateNode.passiveEffectDuration = 0; + stateNode.effectDuration = -0; + stateNode.passiveEffectDuration = -0; break; case 13: stateNode = workInProgress.memoizedState; @@ -10025,8 +10001,8 @@ (workInProgress.flags |= 4), (workInProgress.flags |= 2048), (returnFiber = workInProgress.stateNode), - (returnFiber.effectDuration = 0), - (returnFiber.passiveEffectDuration = 0), + (returnFiber.effectDuration = -0), + (returnFiber.passiveEffectDuration = -0), reconcileChildren( current, workInProgress, @@ -10687,16 +10663,35 @@ ) callCallback(callbacks[updateQueue], context); } - function shouldProfile$1(current) { + function shouldProfile(current) { return (current.mode & ProfileMode) !== NoMode; } function commitHookLayoutEffects(finishedWork, hookFlags) { - shouldProfile$1(finishedWork) - ? (startLayoutEffectTimer(), + shouldProfile(finishedWork) + ? (startEffectTimer(), commitHookEffectListMount(hookFlags, finishedWork), - recordLayoutEffectDuration(finishedWork)) + recordEffectDuration()) : commitHookEffectListMount(hookFlags, finishedWork); } + function commitHookLayoutUnmountEffects( + finishedWork, + nearestMountedAncestor, + hookFlags + ) { + shouldProfile(finishedWork) + ? (startEffectTimer(), + commitHookEffectListUnmount( + hookFlags, + finishedWork, + nearestMountedAncestor + ), + recordEffectDuration()) + : commitHookEffectListUnmount( + hookFlags, + finishedWork, + nearestMountedAncestor + ); + } function commitHookEffectListMount(flags, finishedWork) { try { var updateQueue = finishedWork.updateQueue, @@ -10806,7 +10801,12 @@ finishedWork ) : (flags & Layout) !== NoFlags && - markComponentLayoutEffectUnmountStarted(finishedWork), + null !== injectedProfilingHooks && + "function" === + typeof injectedProfilingHooks.markComponentLayoutEffectUnmountStarted && + injectedProfilingHooks.markComponentLayoutEffectUnmountStarted( + finishedWork + ), (flags & Insertion) !== NoFlags && (isRunningInsertionEffect = !0), runWithFiberInDEV( @@ -10824,7 +10824,10 @@ typeof injectedProfilingHooks.markComponentPassiveEffectUnmountStopped && injectedProfilingHooks.markComponentPassiveEffectUnmountStopped() : (flags & Layout) !== NoFlags && - markComponentLayoutEffectUnmountStopped()); + null !== injectedProfilingHooks && + "function" === + typeof injectedProfilingHooks.markComponentLayoutEffectUnmountStopped && + injectedProfilingHooks.markComponentLayoutEffectUnmountStopped()); } updateQueue = updateQueue.next; } while (updateQueue !== firstEffect); @@ -10834,10 +10837,10 @@ } } function commitHookPassiveMountEffects(finishedWork, hookFlags) { - shouldProfile$1(finishedWork) - ? ((passiveEffectStartTime = now()), + shouldProfile(finishedWork) + ? (startEffectTimer(), commitHookEffectListMount(hookFlags, finishedWork), - recordPassiveEffectDuration(finishedWork)) + recordEffectDuration()) : commitHookEffectListMount(hookFlags, finishedWork); } function commitHookPassiveUnmountEffects( @@ -10845,14 +10848,14 @@ nearestMountedAncestor, hookFlags ) { - shouldProfile$1(finishedWork) - ? ((passiveEffectStartTime = now()), + shouldProfile(finishedWork) + ? (startEffectTimer(), commitHookEffectListUnmount( hookFlags, finishedWork, nearestMountedAncestor ), - recordPassiveEffectDuration(finishedWork)) + recordEffectDuration()) : commitHookEffectListUnmount( hookFlags, finishedWork, @@ -10946,8 +10949,8 @@ current.memoizedProps ); instance.state = current.memoizedState; - shouldProfile$1(current) - ? (startLayoutEffectTimer(), + shouldProfile(current) + ? (startEffectTimer(), runWithFiberInDEV( current, callComponentWillUnmountInDEV, @@ -10955,7 +10958,7 @@ nearestMountedAncestor, instance ), - recordLayoutEffectDuration(current)) + recordEffectDuration()) : runWithFiberInDEV( current, callComponentWillUnmountInDEV, @@ -10969,12 +10972,11 @@ if (null !== ref) { var instance = finishedWork.stateNode; if ("function" === typeof ref) - if (shouldProfile$1(finishedWork)) + if (shouldProfile(finishedWork)) try { - startLayoutEffectTimer(), - (finishedWork.refCleanup = ref(instance)); + startEffectTimer(), (finishedWork.refCleanup = ref(instance)); } finally { - recordLayoutEffectDuration(finishedWork); + recordEffectDuration(); } else finishedWork.refCleanup = ref(instance); else @@ -11001,12 +11003,11 @@ if (null !== ref) if ("function" === typeof refCleanup) try { - if (shouldProfile$1(current)) + if (shouldProfile(current)) try { - startLayoutEffectTimer(), - runWithFiberInDEV(current, refCleanup); + startEffectTimer(), runWithFiberInDEV(current, refCleanup); } finally { - recordLayoutEffectDuration(current); + recordEffectDuration(current); } else runWithFiberInDEV(current, refCleanup); } catch (error) { @@ -11018,11 +11019,11 @@ } else if ("function" === typeof ref) try { - if (shouldProfile$1(current)) + if (shouldProfile(current)) try { - startLayoutEffectTimer(), runWithFiberInDEV(current, ref, null); + startEffectTimer(), runWithFiberInDEV(current, ref, null); } finally { - recordLayoutEffectDuration(current); + recordEffectDuration(current); } else runWithFiberInDEV(current, ref, null); } catch (error$7) { @@ -11389,15 +11390,15 @@ "Expected %s state to match memoized state before componentDidMount. This might either be because of a bug in React, or because a component reassigns its own `this.state`. Please file an issue.", getComponentNameFromFiber(finishedWork) || "instance" )), - shouldProfile$1(finishedWork) - ? (startLayoutEffectTimer(), + shouldProfile(finishedWork) + ? (startEffectTimer(), runWithFiberInDEV( finishedWork, callComponentDidMountInDEV, finishedWork, finishedRoot ), - recordLayoutEffectDuration(finishedWork)) + recordEffectDuration()) : runWithFiberInDEV( finishedWork, callComponentDidMountInDEV, @@ -11423,8 +11424,8 @@ "Expected %s state to match memoized state before componentDidUpdate. This might either be because of a bug in React, or because a component reassigns its own `this.state`. Please file an issue.", getComponentNameFromFiber(finishedWork) || "instance" )); - shouldProfile$1(finishedWork) - ? (startLayoutEffectTimer(), + shouldProfile(finishedWork) + ? (startEffectTimer(), runWithFiberInDEV( finishedWork, callComponentDidUpdateInDEV, @@ -11434,7 +11435,7 @@ current, finishedRoot.__reactInternalSnapshotBeforeUpdate ), - recordLayoutEffectDuration(finishedWork)) + recordEffectDuration()) : runWithFiberInDEV( finishedWork, callComponentDidUpdateInDEV, @@ -11449,32 +11450,34 @@ flags & 512 && safelyAttachRef(finishedWork, finishedWork.return); break; case 3: + current = pushNestedEffectDurations(); recursivelyTraverseLayoutEffects(finishedRoot, finishedWork); if ( flags & 64 && ((flags = finishedWork.updateQueue), null !== flags) ) { - finishedRoot = null; + prevProps = null; if (null !== finishedWork.child) switch (finishedWork.child.tag) { case 27: case 5: - finishedRoot = finishedWork.child.stateNode; + prevProps = finishedWork.child.stateNode; break; case 1: - finishedRoot = finishedWork.child.stateNode; + prevProps = finishedWork.child.stateNode; } try { runWithFiberInDEV( finishedWork, commitCallbacks, flags, - finishedRoot + prevProps ); } catch (error) { captureCommitPhaseError(finishedWork, finishedWork.return, error); } } + finishedRoot.effectDuration += popNestedEffectDurations(current); break; case 26: recursivelyTraverseLayoutEffects(finishedRoot, finishedWork); @@ -11487,9 +11490,11 @@ flags & 512 && safelyAttachRef(finishedWork, finishedWork.return); break; case 12: - recursivelyTraverseLayoutEffects(finishedRoot, finishedWork); if (flags & 4) { - flags = finishedWork.stateNode.effectDuration; + flags = pushNestedEffectDurations(); + recursivelyTraverseLayoutEffects(finishedRoot, finishedWork); + finishedRoot = finishedWork.stateNode; + finishedRoot.effectDuration += bubbleNestedEffectDurations(flags); try { runWithFiberInDEV( finishedWork, @@ -11497,24 +11502,12 @@ finishedWork, current, commitTime, - flags + finishedRoot.effectDuration ); } catch (error) { captureCommitPhaseError(finishedWork, finishedWork.return, error); } - finishedWork = finishedWork.return; - a: for (; null !== finishedWork; ) { - switch (finishedWork.tag) { - case 3: - finishedWork.stateNode.effectDuration += flags; - break a; - case 12: - finishedWork.stateNode.effectDuration += flags; - break a; - } - finishedWork = finishedWork.return; - } - } + } else recursivelyTraverseLayoutEffects(finishedRoot, finishedWork); break; case 13: recursivelyTraverseLayoutEffects(finishedRoot, finishedWork); @@ -11711,53 +11704,18 @@ case 11: case 14: case 15: - if ( - !offscreenSubtreeWasHidden && - ((prevHostParent = deletedFiber.updateQueue), - null !== prevHostParent && - ((prevHostParent = prevHostParent.lastEffect), - null !== prevHostParent)) - ) { - prevHostParentIsContainer = prevHostParent = prevHostParent.next; - do { - var _tag = prevHostParentIsContainer.tag, - _inst = prevHostParentIsContainer.inst, - _destroy = _inst.destroy; - void 0 !== _destroy && - ((_tag & Insertion) !== NoFlags - ? ((_inst.destroy = void 0), - runWithFiberInDEV( - deletedFiber, - callDestroyInDEV, - deletedFiber, - nearestMountedAncestor, - _destroy - )) - : (_tag & Layout) !== NoFlags && - (markComponentLayoutEffectUnmountStarted(deletedFiber), - (deletedFiber.mode & ProfileMode) !== NoMode - ? (startLayoutEffectTimer(), - (_inst.destroy = void 0), - runWithFiberInDEV( - deletedFiber, - callDestroyInDEV, - deletedFiber, - nearestMountedAncestor, - _destroy - ), - recordLayoutEffectDuration(deletedFiber)) - : ((_inst.destroy = void 0), - runWithFiberInDEV( - deletedFiber, - callDestroyInDEV, - deletedFiber, - nearestMountedAncestor, - _destroy - )), - markComponentLayoutEffectUnmountStopped())); - prevHostParentIsContainer = prevHostParentIsContainer.next; - } while (prevHostParentIsContainer !== prevHostParent); - } + offscreenSubtreeWasHidden || + commitHookEffectListUnmount( + Insertion, + deletedFiber, + nearestMountedAncestor + ); + offscreenSubtreeWasHidden || + commitHookLayoutUnmountEffects( + deletedFiber, + nearestMountedAncestor, + Layout + ); recursivelyTraverseDeletionEffects( finishedRoot, nearestMountedAncestor, @@ -11933,19 +11891,11 @@ finishedWork.return ), commitHookEffectListMount(Insertion | HasEffect, finishedWork), - (finishedWork.mode & ProfileMode) !== NoMode - ? (startLayoutEffectTimer(), - commitHookEffectListUnmount( - Layout | HasEffect, - finishedWork, - finishedWork.return - ), - recordLayoutEffectDuration(finishedWork)) - : commitHookEffectListUnmount( - Layout | HasEffect, - finishedWork, - finishedWork.return - )); + commitHookLayoutUnmountEffects( + finishedWork, + finishedWork.return, + Layout | HasEffect + )); break; case 1: recursivelyTraverseMutationEffects(root, finishedWork); @@ -11970,113 +11920,110 @@ flags & 512 && null !== current && safelyDetachRef(current, current.return); - if (flags & 4) { - var currentResource = - null !== current ? current.memoizedState : null; - flags = finishedWork.memoizedState; - if (null === current) + if (flags & 4) + if ( + ((root = null !== current ? current.memoizedState : null), + (flags = finishedWork.memoizedState), + null === current) + ) if (null === flags) if (null === finishedWork.stateNode) { a: { flags = finishedWork.type; current = finishedWork.memoizedProps; - hoistableRoot = - hoistableRoot.ownerDocument || hoistableRoot; + root = hoistableRoot.ownerDocument || hoistableRoot; b: switch (flags) { case "title": - currentResource = - hoistableRoot.getElementsByTagName("title")[0]; + hoistableRoot = root.getElementsByTagName("title")[0]; if ( - !currentResource || - currentResource[internalHoistableMarker] || - currentResource[internalInstanceKey] || - currentResource.namespaceURI === SVG_NAMESPACE || - currentResource.hasAttribute("itemprop") + !hoistableRoot || + hoistableRoot[internalHoistableMarker] || + hoistableRoot[internalInstanceKey] || + hoistableRoot.namespaceURI === SVG_NAMESPACE || + hoistableRoot.hasAttribute("itemprop") ) - (currentResource = - hoistableRoot.createElement(flags)), - hoistableRoot.head.insertBefore( - currentResource, - hoistableRoot.querySelector("head > title") + (hoistableRoot = root.createElement(flags)), + root.head.insertBefore( + hoistableRoot, + root.querySelector("head > title") ); - setInitialProperties(currentResource, flags, current); - currentResource[internalInstanceKey] = finishedWork; - markNodeAsHoistable(currentResource); - flags = currentResource; + setInitialProperties(hoistableRoot, flags, current); + hoistableRoot[internalInstanceKey] = finishedWork; + markNodeAsHoistable(hoistableRoot); + flags = hoistableRoot; break a; case "link": - if ( - (root = getHydratableHoistableCache( - "link", - "href", - hoistableRoot - ).get(flags + (current.href || ""))) - ) - for (var i = 0; i < root.length; i++) + var maybeNodes = getHydratableHoistableCache( + "link", + "href", + root + ).get(flags + (current.href || "")); + if (maybeNodes) + for (var i = 0; i < maybeNodes.length; i++) if ( - ((currentResource = root[i]), - currentResource.getAttribute("href") === + ((hoistableRoot = maybeNodes[i]), + hoistableRoot.getAttribute("href") === (null == current.href ? null : current.href) && - currentResource.getAttribute("rel") === + hoistableRoot.getAttribute("rel") === (null == current.rel ? null : current.rel) && - currentResource.getAttribute("title") === + hoistableRoot.getAttribute("title") === (null == current.title ? null : current.title) && - currentResource.getAttribute("crossorigin") === + hoistableRoot.getAttribute("crossorigin") === (null == current.crossOrigin ? null : current.crossOrigin)) ) { - root.splice(i, 1); + maybeNodes.splice(i, 1); break b; } - currentResource = hoistableRoot.createElement(flags); - setInitialProperties(currentResource, flags, current); - hoistableRoot.head.appendChild(currentResource); + hoistableRoot = root.createElement(flags); + setInitialProperties(hoistableRoot, flags, current); + root.head.appendChild(hoistableRoot); break; case "meta": if ( - (root = getHydratableHoistableCache( + (maybeNodes = getHydratableHoistableCache( "meta", "content", - hoistableRoot + root ).get(flags + (current.content || ""))) ) - for (i = 0; i < root.length; i++) + for (i = 0; i < maybeNodes.length; i++) if ( - ((currentResource = root[i]), + ((hoistableRoot = maybeNodes[i]), checkAttributeStringCoercion( current.content, "content" ), - currentResource.getAttribute("content") === + hoistableRoot.getAttribute("content") === (null == current.content ? null : "" + current.content) && - currentResource.getAttribute("name") === + hoistableRoot.getAttribute("name") === (null == current.name ? null : current.name) && - currentResource.getAttribute("property") === + hoistableRoot.getAttribute("property") === (null == current.property ? null : current.property) && - currentResource.getAttribute("http-equiv") === + hoistableRoot.getAttribute("http-equiv") === (null == current.httpEquiv ? null : current.httpEquiv) && - currentResource.getAttribute("charset") === + hoistableRoot.getAttribute("charset") === (null == current.charSet ? null : current.charSet)) ) { - root.splice(i, 1); + maybeNodes.splice(i, 1); break b; } - currentResource = hoistableRoot.createElement(flags); - setInitialProperties(currentResource, flags, current); - hoistableRoot.head.appendChild(currentResource); + hoistableRoot = root.createElement(flags); + setInitialProperties(hoistableRoot, flags, current); + root.head.appendChild(hoistableRoot); break; default: throw Error( @@ -12085,9 +12032,9 @@ '". This is a bug in React.' ); } - currentResource[internalInstanceKey] = finishedWork; - markNodeAsHoistable(currentResource); - flags = currentResource; + hoistableRoot[internalInstanceKey] = finishedWork; + markNodeAsHoistable(hoistableRoot); + flags = hoistableRoot; } finishedWork.stateNode = flags; } else @@ -12103,12 +12050,12 @@ finishedWork.memoizedProps ); else - currentResource !== flags - ? (null === currentResource + root !== flags + ? (null === root ? null !== current.stateNode && ((current = current.stateNode), current.parentNode.removeChild(current)) - : currentResource.count--, + : root.count--, null === flags ? mountHoistable( hoistableRoot, @@ -12127,12 +12074,11 @@ finishedWork.memoizedProps, current.memoizedProps ); - } break; case 27: if (flags & 4 && null === finishedWork.alternate) { hoistableRoot = finishedWork.stateNode; - currentResource = finishedWork.memoizedProps; + maybeNodes = finishedWork.memoizedProps; try { for (i = hoistableRoot.firstChild; i; ) { var nextNode = i.nextSibling, @@ -12151,7 +12097,7 @@ finishedWork, acquireSingletonInstance, finishedWork.type, - currentResource, + maybeNodes, hoistableRoot, finishedWork ); @@ -12166,20 +12112,20 @@ null !== current && safelyDetachRef(current, current.return); if (finishedWork.flags & 32) { - hoistableRoot = finishedWork.stateNode; + root = finishedWork.stateNode; try { - runWithFiberInDEV(finishedWork, resetTextContent, hoistableRoot); + runWithFiberInDEV(finishedWork, resetTextContent, root); } catch (error) { captureCommitPhaseError(finishedWork, finishedWork.return, error); } } flags & 4 && null != finishedWork.stateNode && - ((hoistableRoot = finishedWork.memoizedProps), + ((root = finishedWork.memoizedProps), commitHostUpdate( finishedWork, - hoistableRoot, - null !== current ? current.memoizedProps : hoistableRoot + root, + null !== current ? current.memoizedProps : root )); flags & 1024 && ((needsFormReset = !0), @@ -12198,12 +12144,12 @@ ); flags = finishedWork.memoizedProps; current = null !== current ? current.memoizedProps : flags; - hoistableRoot = finishedWork.stateNode; + root = finishedWork.stateNode; try { runWithFiberInDEV( finishedWork, commitTextUpdate, - hoistableRoot, + root, current, flags ); @@ -12213,11 +12159,12 @@ } break; case 3: + hoistableRoot = pushNestedEffectDurations(); tagCaches = null; - hoistableRoot = currentHoistableRoot; + maybeNodes = currentHoistableRoot; currentHoistableRoot = getHoistableRoot(root.containerInfo); recursivelyTraverseMutationEffects(root, finishedWork); - currentHoistableRoot = hoistableRoot; + currentHoistableRoot = maybeNodes; commitReconciliationEffects(finishedWork); if ( flags & 4 && @@ -12235,6 +12182,7 @@ } needsFormReset && ((needsFormReset = !1), recursivelyResetForms(finishedWork)); + root.effectDuration += popNestedEffectDurations(hoistableRoot); break; case 4: flags = currentHoistableRoot; @@ -12245,6 +12193,13 @@ commitReconciliationEffects(finishedWork); currentHoistableRoot = flags; break; + case 12: + flags = pushNestedEffectDurations(); + recursivelyTraverseMutationEffects(root, finishedWork); + commitReconciliationEffects(finishedWork); + finishedWork.stateNode.effectDuration += + bubbleNestedEffectDurations(flags); + break; case 13: recursivelyTraverseMutationEffects(root, finishedWork); commitReconciliationEffects(finishedWork); @@ -12316,17 +12271,17 @@ if (null === current) { nextNode = root; try { - (currentResource = nextNode.stateNode), + (maybeNodes = nextNode.stateNode), i ? runWithFiberInDEV( nextNode, hideTextInstance, - currentResource + maybeNodes ) : runWithFiberInDEV( nextNode, unhideTextInstance, - currentResource, + maybeNodes, nextNode.memoizedProps ); } catch (error) { @@ -12417,23 +12372,11 @@ case 11: case 14: case 15: - if ((finishedWork.mode & ProfileMode) !== NoMode) - try { - startLayoutEffectTimer(), - commitHookEffectListUnmount( - Layout, - finishedWork, - finishedWork.return - ); - } finally { - recordLayoutEffectDuration(finishedWork); - } - else - commitHookEffectListUnmount( - Layout, - finishedWork, - finishedWork.return - ); + commitHookLayoutUnmountEffects( + finishedWork, + finishedWork.return, + Layout + ); recursivelyTraverseDisappearLayoutEffects(finishedWork); break; case 1: @@ -12533,14 +12476,16 @@ safelyAttachRef(finishedWork, finishedWork.return); break; case 12: - recursivelyTraverseReappearLayoutEffects( - finishedRoot, - finishedWork, - includeWorkInProgressEffects - ); if (includeWorkInProgressEffects && flags & 4) { - includeWorkInProgressEffects = - finishedWork.stateNode.effectDuration; + flags = pushNestedEffectDurations(); + recursivelyTraverseReappearLayoutEffects( + finishedRoot, + finishedWork, + includeWorkInProgressEffects + ); + includeWorkInProgressEffects = finishedWork.stateNode; + includeWorkInProgressEffects.effectDuration += + bubbleNestedEffectDurations(flags); try { runWithFiberInDEV( finishedWork, @@ -12548,26 +12493,17 @@ finishedWork, current, commitTime, - includeWorkInProgressEffects + includeWorkInProgressEffects.effectDuration ); } catch (error) { captureCommitPhaseError(finishedWork, finishedWork.return, error); } - finishedWork = finishedWork.return; - a: for (; null !== finishedWork; ) { - switch (finishedWork.tag) { - case 3: - finishedWork.stateNode.effectDuration += - includeWorkInProgressEffects; - break a; - case 12: - finishedWork.stateNode.effectDuration += - includeWorkInProgressEffects; - break a; - } - finishedWork = finishedWork.return; - } - } + } else + recursivelyTraverseReappearLayoutEffects( + finishedRoot, + finishedWork, + includeWorkInProgressEffects + ); break; case 13: recursivelyTraverseReappearLayoutEffects( @@ -12671,6 +12607,7 @@ commitHookPassiveMountEffects(finishedWork, Passive | HasEffect); break; case 3: + var prevEffectDuration = pushNestedEffectDurations(); recursivelyTraversePassiveMountEffects( finishedRoot, finishedWork, @@ -12678,23 +12615,28 @@ committedTransitions ); flags & 2048 && - ((finishedRoot = null), + ((committedLanes = null), null !== finishedWork.alternate && - (finishedRoot = finishedWork.alternate.memoizedState.cache), + (committedLanes = finishedWork.alternate.memoizedState.cache), (finishedWork = finishedWork.memoizedState.cache), - finishedWork !== finishedRoot && + finishedWork !== committedLanes && (retainCache(finishedWork), - null != finishedRoot && releaseCache(finishedRoot))); + null != committedLanes && releaseCache(committedLanes))); + finishedRoot.passiveEffectDuration += + popNestedEffectDurations(prevEffectDuration); break; case 12: - recursivelyTraversePassiveMountEffects( - finishedRoot, - finishedWork, - committedLanes, - committedTransitions - ); if (flags & 2048) { - finishedRoot = finishedWork.stateNode.passiveEffectDuration; + prevEffectDuration = pushNestedEffectDurations(); + recursivelyTraversePassiveMountEffects( + finishedRoot, + finishedWork, + committedLanes, + committedTransitions + ); + finishedRoot = finishedWork.stateNode; + finishedRoot.passiveEffectDuration += + bubbleNestedEffectDurations(prevEffectDuration); try { runWithFiberInDEV( finishedWork, @@ -12702,31 +12644,25 @@ finishedWork, finishedWork.alternate, commitTime, - finishedRoot + finishedRoot.passiveEffectDuration ); } catch (error) { captureCommitPhaseError(finishedWork, finishedWork.return, error); } - finishedWork = finishedWork.return; - a: for (; null !== finishedWork; ) { - switch (finishedWork.tag) { - case 3: - finishedWork.stateNode.passiveEffectDuration += finishedRoot; - break a; - case 12: - finishedWork.stateNode.passiveEffectDuration += finishedRoot; - break a; - } - finishedWork = finishedWork.return; - } - } + } else + recursivelyTraversePassiveMountEffects( + finishedRoot, + finishedWork, + committedLanes, + committedTransitions + ); break; case 23: break; case 22: - var _instance = finishedWork.stateNode; + prevEffectDuration = finishedWork.stateNode; null !== finishedWork.memoizedState - ? _instance._visibility & OffscreenPassiveEffectsConnected + ? prevEffectDuration._visibility & OffscreenPassiveEffectsConnected ? recursivelyTraversePassiveMountEffects( finishedRoot, finishedWork, @@ -12737,14 +12673,15 @@ finishedRoot, finishedWork ) - : _instance._visibility & OffscreenPassiveEffectsConnected + : prevEffectDuration._visibility & OffscreenPassiveEffectsConnected ? recursivelyTraversePassiveMountEffects( finishedRoot, finishedWork, committedLanes, committedTransitions ) - : ((_instance._visibility |= OffscreenPassiveEffectsConnected), + : ((prevEffectDuration._visibility |= + OffscreenPassiveEffectsConnected), recursivelyTraverseReconnectPassiveEffects( finishedRoot, finishedWork, @@ -13004,12 +12941,25 @@ Passive | HasEffect ); break; + case 3: + var prevEffectDuration = pushNestedEffectDurations(); + recursivelyTraversePassiveUnmountEffects(finishedWork); + finishedWork.stateNode.passiveEffectDuration += + popNestedEffectDurations(prevEffectDuration); + break; + case 12: + prevEffectDuration = pushNestedEffectDurations(); + recursivelyTraversePassiveUnmountEffects(finishedWork); + finishedWork.stateNode.passiveEffectDuration += + bubbleNestedEffectDurations(prevEffectDuration); + break; case 22: - var instance = finishedWork.stateNode; + prevEffectDuration = finishedWork.stateNode; null !== finishedWork.memoizedState && - instance._visibility & OffscreenPassiveEffectsConnected && + prevEffectDuration._visibility & OffscreenPassiveEffectsConnected && (null === finishedWork.return || 13 !== finishedWork.return.tag) - ? ((instance._visibility &= ~OffscreenPassiveEffectsConnected), + ? ((prevEffectDuration._visibility &= + ~OffscreenPassiveEffectsConnected), recursivelyTraverseDisconnectPassiveEffects(finishedWork)) : recursivelyTraversePassiveUnmountEffects(finishedWork); break; @@ -20161,7 +20111,7 @@ this.pooledCacheLanes = 0; this.formState = formState; this.incompleteTransitions = new Map(); - this.passiveEffectDuration = this.effectDuration = 0; + this.passiveEffectDuration = this.effectDuration = -0; this.memoizedUpdaters = new Set(); containerInfo = this.pendingUpdatersLaneMap = []; for (tag = 0; 31 > tag; tag++) containerInfo.push(new Set()); @@ -22190,10 +22140,9 @@ StrictEffectsMode = 16, NoStrictPassiveEffectsMode = 64, now = Scheduler.unstable_now, - commitTime = 0, - layoutEffectStartTime = -1, - profilerStartTime = -1, - passiveEffectStartTime = -1, + commitTime = -0, + profilerStartTime = -1.1, + profilerEffectDuration = -0, currentUpdateIsNested = !1, nestedUpdateScheduled = !1, ReactStrictModeWarnings = { @@ -24522,11 +24471,11 @@ }; (function () { var isomorphicReactPackageVersion = React.version; - if ("19.0.0-rc-a99d8e8d-20240916" !== isomorphicReactPackageVersion) + if ("19.0.0-rc-5dcb0097-20240918" !== isomorphicReactPackageVersion) throw Error( 'Incompatible React versions: The "react" and "react-dom" packages must have the exact same version. Instead got:\n - react: ' + (isomorphicReactPackageVersion + - "\n - react-dom: 19.0.0-rc-a99d8e8d-20240916\nLearn more: https://react.dev/warnings/version-mismatch") + "\n - react-dom: 19.0.0-rc-5dcb0097-20240918\nLearn more: https://react.dev/warnings/version-mismatch") ); })(); ("function" === typeof Map && @@ -24563,11 +24512,11 @@ !(function () { var internals = { bundleType: 1, - version: "19.0.0-rc-a99d8e8d-20240916", + version: "19.0.0-rc-5dcb0097-20240918", rendererPackageName: "react-dom", currentDispatcherRef: ReactSharedInternals, findFiberByHostInstance: getClosestInstanceFromNode, - reconcilerVersion: "19.0.0-rc-a99d8e8d-20240916" + reconcilerVersion: "19.0.0-rc-5dcb0097-20240918" }; internals.overrideHookState = overrideHookState; internals.overrideHookStateDeletePath = overrideHookStateDeletePath; @@ -24711,7 +24660,7 @@ listenToAllSupportedEvents(container); return new ReactDOMHydrationRoot(initialChildren); }; - exports.version = "19.0.0-rc-a99d8e8d-20240916"; + exports.version = "19.0.0-rc-5dcb0097-20240918"; "undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ && "function" === typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStop && diff --git a/packages/next/src/compiled/react-dom/cjs/react-dom-client.production.js b/packages/next/src/compiled/react-dom/cjs/react-dom-client.production.js index 620135583b2d7..c6dc60e2c7605 100644 --- a/packages/next/src/compiled/react-dom/cjs/react-dom-client.production.js +++ b/packages/next/src/compiled/react-dom/cjs/react-dom-client.production.js @@ -1979,19 +1979,19 @@ function getTargetInstForChangeEvent(domEventName, targetInst) { } var isInputEventSupported = !1; if (canUseDOM) { - var JSCompiler_inline_result$jscomp$281; + var JSCompiler_inline_result$jscomp$279; if (canUseDOM) { - var isSupported$jscomp$inline_417 = "oninput" in document; - if (!isSupported$jscomp$inline_417) { - var element$jscomp$inline_418 = document.createElement("div"); - element$jscomp$inline_418.setAttribute("oninput", "return;"); - isSupported$jscomp$inline_417 = - "function" === typeof element$jscomp$inline_418.oninput; + var isSupported$jscomp$inline_415 = "oninput" in document; + if (!isSupported$jscomp$inline_415) { + var element$jscomp$inline_416 = document.createElement("div"); + element$jscomp$inline_416.setAttribute("oninput", "return;"); + isSupported$jscomp$inline_415 = + "function" === typeof element$jscomp$inline_416.oninput; } - JSCompiler_inline_result$jscomp$281 = isSupported$jscomp$inline_417; - } else JSCompiler_inline_result$jscomp$281 = !1; + JSCompiler_inline_result$jscomp$279 = isSupported$jscomp$inline_415; + } else JSCompiler_inline_result$jscomp$279 = !1; isInputEventSupported = - JSCompiler_inline_result$jscomp$281 && + JSCompiler_inline_result$jscomp$279 && (!document.documentMode || 9 < document.documentMode); } function stopWatchingForValueChange() { @@ -2106,36 +2106,36 @@ function containsNode(outerNode, innerNode) { : !1; } function getActiveElementDeep(containerInfo) { - var $jscomp$optchain$tmpm369125017$1, $jscomp$nullish$tmp0; + var $jscomp$optchain$tmp175290385$1, $jscomp$nullish$tmp0; containerInfo = null != ($jscomp$nullish$tmp0 = null == containerInfo ? void 0 : null == - ($jscomp$optchain$tmpm369125017$1 = containerInfo.ownerDocument) + ($jscomp$optchain$tmp175290385$1 = containerInfo.ownerDocument) ? void 0 - : $jscomp$optchain$tmpm369125017$1.defaultView) + : $jscomp$optchain$tmp175290385$1.defaultView) ? $jscomp$nullish$tmp0 : window; for ( - $jscomp$optchain$tmpm369125017$1 = getActiveElement(containerInfo.document); - $jscomp$optchain$tmpm369125017$1 instanceof containerInfo.HTMLIFrameElement; + $jscomp$optchain$tmp175290385$1 = getActiveElement(containerInfo.document); + $jscomp$optchain$tmp175290385$1 instanceof containerInfo.HTMLIFrameElement; ) { try { var JSCompiler_inline_result = "string" === - typeof $jscomp$optchain$tmpm369125017$1.contentWindow.location.href; + typeof $jscomp$optchain$tmp175290385$1.contentWindow.location.href; } catch (err) { JSCompiler_inline_result = !1; } if (JSCompiler_inline_result) - containerInfo = $jscomp$optchain$tmpm369125017$1.contentWindow; + containerInfo = $jscomp$optchain$tmp175290385$1.contentWindow; else break; - $jscomp$optchain$tmpm369125017$1 = getActiveElement(containerInfo.document); + $jscomp$optchain$tmp175290385$1 = getActiveElement(containerInfo.document); } - return $jscomp$optchain$tmpm369125017$1; + return $jscomp$optchain$tmp175290385$1; } function hasSelectionCapabilities(elem) { var nodeName = elem && elem.nodeName && elem.nodeName.toLowerCase(); @@ -7463,7 +7463,7 @@ function commitHookEffectListMount(flags, finishedWork) { function commitHookEffectListUnmount( flags, finishedWork, - nearestMountedAncestor + nearestMountedAncestor$jscomp$0 ) { try { var updateQueue = finishedWork.updateQueue, @@ -7475,9 +7475,20 @@ function commitHookEffectListUnmount( if ((updateQueue.tag & flags) === flags) { var inst = updateQueue.inst, destroy = inst.destroy; - void 0 !== destroy && - ((inst.destroy = void 0), - safelyCallDestroy(finishedWork, nearestMountedAncestor, destroy)); + if (void 0 !== destroy) { + inst.destroy = void 0; + lastEffect = finishedWork; + var nearestMountedAncestor = nearestMountedAncestor$jscomp$0; + try { + destroy(); + } catch (error) { + captureCommitPhaseError( + lastEffect, + nearestMountedAncestor, + error + ); + } + } } updateQueue = updateQueue.next; } while (updateQueue !== firstEffect); @@ -7557,13 +7568,6 @@ function safelyDetachRef(current, nearestMountedAncestor) { } else ref.current = null; } -function safelyCallDestroy(current, nearestMountedAncestor, destroy) { - try { - destroy(); - } catch (error) { - captureCommitPhaseError(current, nearestMountedAncestor, error); - } -} function commitHostMount(finishedWork) { var type = finishedWork.type, props = finishedWork.memoizedProps, @@ -7899,23 +7903,6 @@ function commitLayoutEffectOnFiber(finishedRoot, current, finishedWork) { break; case 12: recursivelyTraverseLayoutEffects(finishedRoot, finishedWork); - if (flags & 4) - a: for ( - flags = finishedWork.stateNode.effectDuration, - finishedWork = finishedWork.return; - null !== finishedWork; - - ) { - switch (finishedWork.tag) { - case 3: - finishedWork.stateNode.effectDuration += flags; - break a; - case 12: - finishedWork.stateNode.effectDuration += flags; - break a; - } - finishedWork = finishedWork.return; - } break; case 13: recursivelyTraverseLayoutEffects(finishedRoot, finishedWork); @@ -8031,7 +8018,7 @@ function commitDeletionEffectsOnFiber( safelyDetachRef(deletedFiber, nearestMountedAncestor); case 6: prevHostParentIsContainer = hostParent; - var prevHostParentIsContainer$121 = hostParentIsContainer; + var prevHostParentIsContainer$120 = hostParentIsContainer; hostParent = null; recursivelyTraverseDeletionEffects( finishedRoot, @@ -8039,7 +8026,7 @@ function commitDeletionEffectsOnFiber( deletedFiber ); hostParent = prevHostParentIsContainer; - hostParentIsContainer = prevHostParentIsContainer$121; + hostParentIsContainer = prevHostParentIsContainer$120; if (null !== hostParent) if (hostParentIsContainer) try { @@ -8098,36 +8085,10 @@ function commitDeletionEffectsOnFiber( case 11: case 14: case 15: - if ( - !offscreenSubtreeWasHidden && - ((prevHostParent = deletedFiber.updateQueue), - null !== prevHostParent && - ((prevHostParent = prevHostParent.lastEffect), - null !== prevHostParent)) - ) { - prevHostParentIsContainer = prevHostParent = prevHostParent.next; - do { - prevHostParentIsContainer$121 = prevHostParentIsContainer.tag; - var inst = prevHostParentIsContainer.inst, - destroy = inst.destroy; - void 0 !== destroy && - (0 !== (prevHostParentIsContainer$121 & 2) - ? ((inst.destroy = void 0), - safelyCallDestroy( - deletedFiber, - nearestMountedAncestor, - destroy - )) - : 0 !== (prevHostParentIsContainer$121 & 4) && - ((inst.destroy = void 0), - safelyCallDestroy( - deletedFiber, - nearestMountedAncestor, - destroy - ))); - prevHostParentIsContainer = prevHostParentIsContainer.next; - } while (prevHostParentIsContainer !== prevHostParent); - } + offscreenSubtreeWasHidden || + commitHookEffectListUnmount(2, deletedFiber, nearestMountedAncestor); + offscreenSubtreeWasHidden || + commitHookEffectListUnmount(4, deletedFiber, nearestMountedAncestor); recursivelyTraverseDeletionEffects( finishedRoot, nearestMountedAncestor, @@ -8537,6 +8498,10 @@ function commitMutationEffectsOnFiber(finishedWork, root) { commitReconciliationEffects(finishedWork); currentHoistableRoot = flags; break; + case 12: + recursivelyTraverseMutationEffects(root, finishedWork); + commitReconciliationEffects(finishedWork); + break; case 13: recursivelyTraverseMutationEffects(root, finishedWork); commitReconciliationEffects(finishedWork); @@ -8850,23 +8815,6 @@ function recursivelyTraverseReappearLayoutEffects( finishedWork, includeWorkInProgressEffects ); - if (includeWorkInProgressEffects && flags & 4) - a: for ( - flags = finishedWork.stateNode.effectDuration, - finishedWork = finishedWork.return; - null !== finishedWork; - - ) { - switch (finishedWork.tag) { - case 3: - finishedWork.stateNode.effectDuration += flags; - break a; - case 12: - finishedWork.stateNode.effectDuration += flags; - break a; - } - finishedWork = finishedWork.return; - } break; case 13: recursivelyTraverseReappearLayoutEffects( @@ -8971,19 +8919,42 @@ function commitPassiveMountOnFiber( null != finishedRoot && releaseCache(finishedRoot))); break; case 12: - recursivelyTraversePassiveMountEffects( - finishedRoot, - finishedWork, - committedLanes, - committedTransitions - ); + if (flags & 2048) { + recursivelyTraversePassiveMountEffects( + finishedRoot, + finishedWork, + committedLanes, + committedTransitions + ); + finishedRoot = finishedWork.stateNode; + try { + var _finishedWork$memoize2 = finishedWork.memoizedProps, + id = _finishedWork$memoize2.id, + onPostCommit = _finishedWork$memoize2.onPostCommit; + "function" === typeof onPostCommit && + onPostCommit( + id, + null === finishedWork.alternate ? "mount" : "update", + finishedRoot.passiveEffectDuration, + -0 + ); + } catch (error) { + captureCommitPhaseError(finishedWork, finishedWork.return, error); + } + } else + recursivelyTraversePassiveMountEffects( + finishedRoot, + finishedWork, + committedLanes, + committedTransitions + ); break; case 23: break; case 22: - var instance = finishedWork.stateNode; + _finishedWork$memoize2 = finishedWork.stateNode; null !== finishedWork.memoizedState - ? instance._visibility & 4 + ? _finishedWork$memoize2._visibility & 4 ? recursivelyTraversePassiveMountEffects( finishedRoot, finishedWork, @@ -8991,14 +8962,14 @@ function commitPassiveMountOnFiber( committedTransitions ) : recursivelyTraverseAtomicPassiveEffects(finishedRoot, finishedWork) - : instance._visibility & 4 + : _finishedWork$memoize2._visibility & 4 ? recursivelyTraversePassiveMountEffects( finishedRoot, finishedWork, committedLanes, committedTransitions ) - : ((instance._visibility |= 4), + : ((_finishedWork$memoize2._visibility |= 4), recursivelyTraverseReconnectPassiveEffects( finishedRoot, finishedWork, @@ -9230,6 +9201,12 @@ function commitPassiveUnmountOnFiber(finishedWork) { finishedWork.flags & 2048 && commitHookEffectListUnmount(9, finishedWork, finishedWork.return); break; + case 3: + recursivelyTraversePassiveUnmountEffects(finishedWork); + break; + case 12: + recursivelyTraversePassiveUnmountEffects(finishedWork); + break; case 22: var instance = finishedWork.stateNode; null !== finishedWork.memoizedState && @@ -9606,14 +9583,14 @@ function cutOffTailIfNeeded(renderState, hasRenderedATailFallback) { break; case "collapsed": lastTailNode = renderState.tail; - for (var lastTailNode$134 = null; null !== lastTailNode; ) - null !== lastTailNode.alternate && (lastTailNode$134 = lastTailNode), + for (var lastTailNode$132 = null; null !== lastTailNode; ) + null !== lastTailNode.alternate && (lastTailNode$132 = lastTailNode), (lastTailNode = lastTailNode.sibling); - null === lastTailNode$134 + null === lastTailNode$132 ? hasRenderedATailFallback || null === renderState.tail ? (renderState.tail = null) : (renderState.tail.sibling = null) - : (lastTailNode$134.sibling = null); + : (lastTailNode$132.sibling = null); } } function bubbleProperties(completedWork) { @@ -9623,19 +9600,19 @@ function bubbleProperties(completedWork) { newChildLanes = 0, subtreeFlags = 0; if (didBailout) - for (var child$135 = completedWork.child; null !== child$135; ) - (newChildLanes |= child$135.lanes | child$135.childLanes), - (subtreeFlags |= child$135.subtreeFlags & 31457280), - (subtreeFlags |= child$135.flags & 31457280), - (child$135.return = completedWork), - (child$135 = child$135.sibling); + for (var child$133 = completedWork.child; null !== child$133; ) + (newChildLanes |= child$133.lanes | child$133.childLanes), + (subtreeFlags |= child$133.subtreeFlags & 31457280), + (subtreeFlags |= child$133.flags & 31457280), + (child$133.return = completedWork), + (child$133 = child$133.sibling); else - for (child$135 = completedWork.child; null !== child$135; ) - (newChildLanes |= child$135.lanes | child$135.childLanes), - (subtreeFlags |= child$135.subtreeFlags), - (subtreeFlags |= child$135.flags), - (child$135.return = completedWork), - (child$135 = child$135.sibling); + for (child$133 = completedWork.child; null !== child$133; ) + (newChildLanes |= child$133.lanes | child$133.childLanes), + (subtreeFlags |= child$133.subtreeFlags), + (subtreeFlags |= child$133.flags), + (child$133.return = completedWork), + (child$133 = child$133.sibling); completedWork.subtreeFlags |= subtreeFlags; completedWork.childLanes = newChildLanes; return didBailout; @@ -9912,11 +9889,11 @@ function completeWork(current, workInProgress, renderLanes) { null !== newProps.alternate.memoizedState && null !== newProps.alternate.memoizedState.cachePool && (type = newProps.alternate.memoizedState.cachePool.pool); - var cache$147 = null; + var cache$145 = null; null !== newProps.memoizedState && null !== newProps.memoizedState.cachePool && - (cache$147 = newProps.memoizedState.cachePool.pool); - cache$147 !== type && (newProps.flags |= 2048); + (cache$145 = newProps.memoizedState.cachePool.pool); + cache$145 !== type && (newProps.flags |= 2048); } renderLanes !== current && renderLanes && @@ -9941,8 +9918,8 @@ function completeWork(current, workInProgress, renderLanes) { type = workInProgress.memoizedState; if (null === type) return bubbleProperties(workInProgress), null; newProps = 0 !== (workInProgress.flags & 128); - cache$147 = type.rendering; - if (null === cache$147) + cache$145 = type.rendering; + if (null === cache$145) if (newProps) cutOffTailIfNeeded(type, !1); else { if ( @@ -9950,11 +9927,11 @@ function completeWork(current, workInProgress, renderLanes) { (null !== current && 0 !== (current.flags & 128)) ) for (current = workInProgress.child; null !== current; ) { - cache$147 = findFirstSuspended(current); - if (null !== cache$147) { + cache$145 = findFirstSuspended(current); + if (null !== cache$145) { workInProgress.flags |= 128; cutOffTailIfNeeded(type, !1); - current = cache$147.updateQueue; + current = cache$145.updateQueue; workInProgress.updateQueue = current; scheduleRetryEffect(workInProgress, current); workInProgress.subtreeFlags = 0; @@ -9979,7 +9956,7 @@ function completeWork(current, workInProgress, renderLanes) { } else { if (!newProps) - if (((current = findFirstSuspended(cache$147)), null !== current)) { + if (((current = findFirstSuspended(cache$145)), null !== current)) { if ( ((workInProgress.flags |= 128), (newProps = !0), @@ -9989,7 +9966,7 @@ function completeWork(current, workInProgress, renderLanes) { cutOffTailIfNeeded(type, !0), null === type.tail && "hidden" === type.tailMode && - !cache$147.alternate && + !cache$145.alternate && !isHydrating) ) return bubbleProperties(workInProgress), null; @@ -10002,13 +9979,13 @@ function completeWork(current, workInProgress, renderLanes) { cutOffTailIfNeeded(type, !1), (workInProgress.lanes = 4194304)); type.isBackwards - ? ((cache$147.sibling = workInProgress.child), - (workInProgress.child = cache$147)) + ? ((cache$145.sibling = workInProgress.child), + (workInProgress.child = cache$145)) : ((current = type.last), null !== current - ? (current.sibling = cache$147) - : (workInProgress.child = cache$147), - (type.last = cache$147)); + ? (current.sibling = cache$145) + : (workInProgress.child = cache$145), + (type.last = cache$145)); } if (null !== type.tail) return ( @@ -10751,8 +10728,8 @@ function renderRootSync(root, lanes) { } workLoopSync(); break; - } catch (thrownValue$162) { - handleThrow(root, thrownValue$162); + } catch (thrownValue$160) { + handleThrow(root, thrownValue$160); } while (1); lanes && root.shellSuspendCounter++; @@ -10861,8 +10838,8 @@ function renderRootConcurrent(root, lanes) { } workLoopConcurrent(); break; - } catch (thrownValue$164) { - handleThrow(root, thrownValue$164); + } catch (thrownValue$162) { + handleThrow(root, thrownValue$162); } while (1); resetContextDependencies(); @@ -11145,7 +11122,7 @@ function releaseRootPooledCache(root, remainingLanes) { } function flushPassiveEffects() { if (null !== rootWithPendingPassiveEffects) { - var root$168 = rootWithPendingPassiveEffects, + var root$166 = rootWithPendingPassiveEffects, remainingLanes = pendingPassiveEffectsRemainingLanes; pendingPassiveEffectsRemainingLanes = 0; var renderPriority = lanesToEventPriority(pendingPassiveEffectsLanes), @@ -11184,7 +11161,7 @@ function flushPassiveEffects() { } finally { (ReactDOMSharedInternals.p = previousPriority), (ReactSharedInternals.T = prevTransition), - releaseRootPooledCache(root$168, remainingLanes); + releaseRootPooledCache(root$166, remainingLanes); } } return !1; @@ -11343,14 +11320,14 @@ function flushSyncWorkAcrossRoots_impl(syncTransitionLanes, onlyLegacy) { isFlushingWork = !0; do { var didPerformSomeWork = !1; - for (var root$170 = firstScheduledRoot; null !== root$170; ) { + for (var root$168 = firstScheduledRoot; null !== root$168; ) { if (!onlyLegacy) if (0 !== syncTransitionLanes) { - var pendingLanes = root$170.pendingLanes; + var pendingLanes = root$168.pendingLanes; if (0 === pendingLanes) var JSCompiler_inline_result = 0; else { - var suspendedLanes = root$170.suspendedLanes, - pingedLanes = root$170.pingedLanes; + var suspendedLanes = root$168.suspendedLanes, + pingedLanes = root$168.pingedLanes; JSCompiler_inline_result = (1 << (31 - clz32(42 | syncTransitionLanes) + 1)) - 1; JSCompiler_inline_result &= @@ -11364,17 +11341,17 @@ function flushSyncWorkAcrossRoots_impl(syncTransitionLanes, onlyLegacy) { } 0 !== JSCompiler_inline_result && ((didPerformSomeWork = !0), - performSyncWorkOnRoot(root$170, JSCompiler_inline_result)); + performSyncWorkOnRoot(root$168, JSCompiler_inline_result)); } else (JSCompiler_inline_result = workInProgressRootRenderLanes), (JSCompiler_inline_result = getNextLanes( - root$170, - root$170 === workInProgressRoot ? JSCompiler_inline_result : 0 + root$168, + root$168 === workInProgressRoot ? JSCompiler_inline_result : 0 )), 0 !== (JSCompiler_inline_result & 3) && ((didPerformSomeWork = !0), - performSyncWorkOnRoot(root$170, JSCompiler_inline_result)); - root$170 = root$170.next; + performSyncWorkOnRoot(root$168, JSCompiler_inline_result)); + root$168 = root$168.next; } } while (didPerformSomeWork); isFlushingWork = !1; @@ -11584,20 +11561,20 @@ function extractEvents$1( } } for ( - var i$jscomp$inline_1408 = 0; - i$jscomp$inline_1408 < simpleEventPluginEvents.length; - i$jscomp$inline_1408++ + var i$jscomp$inline_1412 = 0; + i$jscomp$inline_1412 < simpleEventPluginEvents.length; + i$jscomp$inline_1412++ ) { - var eventName$jscomp$inline_1409 = - simpleEventPluginEvents[i$jscomp$inline_1408], - domEventName$jscomp$inline_1410 = - eventName$jscomp$inline_1409.toLowerCase(), - capitalizedEvent$jscomp$inline_1411 = - eventName$jscomp$inline_1409[0].toUpperCase() + - eventName$jscomp$inline_1409.slice(1); + var eventName$jscomp$inline_1413 = + simpleEventPluginEvents[i$jscomp$inline_1412], + domEventName$jscomp$inline_1414 = + eventName$jscomp$inline_1413.toLowerCase(), + capitalizedEvent$jscomp$inline_1415 = + eventName$jscomp$inline_1413[0].toUpperCase() + + eventName$jscomp$inline_1413.slice(1); registerSimpleEvent( - domEventName$jscomp$inline_1410, - "on" + capitalizedEvent$jscomp$inline_1411 + domEventName$jscomp$inline_1414, + "on" + capitalizedEvent$jscomp$inline_1415 ); } registerSimpleEvent(ANIMATION_END, "onAnimationEnd"); @@ -12780,34 +12757,34 @@ function setInitialProperties(domElement, tag, props) { defaultChecked = null; for (hasSrc in props) if (props.hasOwnProperty(hasSrc)) { - var propValue$184 = props[hasSrc]; - if (null != propValue$184) + var propValue$182 = props[hasSrc]; + if (null != propValue$182) switch (hasSrc) { case "name": - hasSrcSet = propValue$184; + hasSrcSet = propValue$182; break; case "type": - propValue = propValue$184; + propValue = propValue$182; break; case "checked": - checked = propValue$184; + checked = propValue$182; break; case "defaultChecked": - defaultChecked = propValue$184; + defaultChecked = propValue$182; break; case "value": - propKey = propValue$184; + propKey = propValue$182; break; case "defaultValue": - defaultValue = propValue$184; + defaultValue = propValue$182; break; case "children": case "dangerouslySetInnerHTML": - if (null != propValue$184) + if (null != propValue$182) throw Error(formatProdErrorMessage(137, tag)); break; default: - setProp(domElement, tag, hasSrc, propValue$184, props, null); + setProp(domElement, tag, hasSrc, propValue$182, props, null); } } initInput( @@ -12944,14 +12921,14 @@ function setInitialProperties(domElement, tag, props) { return; default: if (isCustomElement(tag)) { - for (propValue$184 in props) - props.hasOwnProperty(propValue$184) && - ((hasSrc = props[propValue$184]), + for (propValue$182 in props) + props.hasOwnProperty(propValue$182) && + ((hasSrc = props[propValue$182]), void 0 !== hasSrc && setPropOnCustomElement( domElement, tag, - propValue$184, + propValue$182, hasSrc, props, void 0 @@ -12999,14 +12976,14 @@ function updateProperties(domElement, tag, lastProps, nextProps) { setProp(domElement, tag, propKey, null, nextProps, lastProp); } } - for (var propKey$201 in nextProps) { - var propKey = nextProps[propKey$201]; - lastProp = lastProps[propKey$201]; + for (var propKey$199 in nextProps) { + var propKey = nextProps[propKey$199]; + lastProp = lastProps[propKey$199]; if ( - nextProps.hasOwnProperty(propKey$201) && + nextProps.hasOwnProperty(propKey$199) && (null != propKey || null != lastProp) ) - switch (propKey$201) { + switch (propKey$199) { case "type": type = propKey; break; @@ -13035,7 +13012,7 @@ function updateProperties(domElement, tag, lastProps, nextProps) { setProp( domElement, tag, - propKey$201, + propKey$199, propKey, nextProps, lastProp @@ -13054,7 +13031,7 @@ function updateProperties(domElement, tag, lastProps, nextProps) { ); return; case "select": - propKey = value = defaultValue = propKey$201 = null; + propKey = value = defaultValue = propKey$199 = null; for (type in lastProps) if ( ((lastDefaultValue = lastProps[type]), @@ -13085,7 +13062,7 @@ function updateProperties(domElement, tag, lastProps, nextProps) { ) switch (name) { case "value": - propKey$201 = type; + propKey$199 = type; break; case "defaultValue": defaultValue = type; @@ -13106,15 +13083,15 @@ function updateProperties(domElement, tag, lastProps, nextProps) { tag = defaultValue; lastProps = value; nextProps = propKey; - null != propKey$201 - ? updateOptions(domElement, !!lastProps, propKey$201, !1) + null != propKey$199 + ? updateOptions(domElement, !!lastProps, propKey$199, !1) : !!nextProps !== !!lastProps && (null != tag ? updateOptions(domElement, !!lastProps, tag, !0) : updateOptions(domElement, !!lastProps, lastProps ? [] : "", !1)); return; case "textarea": - propKey = propKey$201 = null; + propKey = propKey$199 = null; for (defaultValue in lastProps) if ( ((name = lastProps[defaultValue]), @@ -13138,7 +13115,7 @@ function updateProperties(domElement, tag, lastProps, nextProps) { ) switch (value) { case "value": - propKey$201 = name; + propKey$199 = name; break; case "defaultValue": propKey = name; @@ -13152,17 +13129,17 @@ function updateProperties(domElement, tag, lastProps, nextProps) { name !== type && setProp(domElement, tag, value, name, nextProps, type); } - updateTextarea(domElement, propKey$201, propKey); + updateTextarea(domElement, propKey$199, propKey); return; case "option": - for (var propKey$217 in lastProps) + for (var propKey$215 in lastProps) if ( - ((propKey$201 = lastProps[propKey$217]), - lastProps.hasOwnProperty(propKey$217) && - null != propKey$201 && - !nextProps.hasOwnProperty(propKey$217)) + ((propKey$199 = lastProps[propKey$215]), + lastProps.hasOwnProperty(propKey$215) && + null != propKey$199 && + !nextProps.hasOwnProperty(propKey$215)) ) - switch (propKey$217) { + switch (propKey$215) { case "selected": domElement.selected = !1; break; @@ -13170,33 +13147,33 @@ function updateProperties(domElement, tag, lastProps, nextProps) { setProp( domElement, tag, - propKey$217, + propKey$215, null, nextProps, - propKey$201 + propKey$199 ); } for (lastDefaultValue in nextProps) if ( - ((propKey$201 = nextProps[lastDefaultValue]), + ((propKey$199 = nextProps[lastDefaultValue]), (propKey = lastProps[lastDefaultValue]), nextProps.hasOwnProperty(lastDefaultValue) && - propKey$201 !== propKey && - (null != propKey$201 || null != propKey)) + propKey$199 !== propKey && + (null != propKey$199 || null != propKey)) ) switch (lastDefaultValue) { case "selected": domElement.selected = - propKey$201 && - "function" !== typeof propKey$201 && - "symbol" !== typeof propKey$201; + propKey$199 && + "function" !== typeof propKey$199 && + "symbol" !== typeof propKey$199; break; default: setProp( domElement, tag, lastDefaultValue, - propKey$201, + propKey$199, nextProps, propKey ); @@ -13217,24 +13194,24 @@ function updateProperties(domElement, tag, lastProps, nextProps) { case "track": case "wbr": case "menuitem": - for (var propKey$222 in lastProps) - (propKey$201 = lastProps[propKey$222]), - lastProps.hasOwnProperty(propKey$222) && - null != propKey$201 && - !nextProps.hasOwnProperty(propKey$222) && - setProp(domElement, tag, propKey$222, null, nextProps, propKey$201); + for (var propKey$220 in lastProps) + (propKey$199 = lastProps[propKey$220]), + lastProps.hasOwnProperty(propKey$220) && + null != propKey$199 && + !nextProps.hasOwnProperty(propKey$220) && + setProp(domElement, tag, propKey$220, null, nextProps, propKey$199); for (checked in nextProps) if ( - ((propKey$201 = nextProps[checked]), + ((propKey$199 = nextProps[checked]), (propKey = lastProps[checked]), nextProps.hasOwnProperty(checked) && - propKey$201 !== propKey && - (null != propKey$201 || null != propKey)) + propKey$199 !== propKey && + (null != propKey$199 || null != propKey)) ) switch (checked) { case "children": case "dangerouslySetInnerHTML": - if (null != propKey$201) + if (null != propKey$199) throw Error(formatProdErrorMessage(137, tag)); break; default: @@ -13242,7 +13219,7 @@ function updateProperties(domElement, tag, lastProps, nextProps) { domElement, tag, checked, - propKey$201, + propKey$199, nextProps, propKey ); @@ -13250,49 +13227,49 @@ function updateProperties(domElement, tag, lastProps, nextProps) { return; default: if (isCustomElement(tag)) { - for (var propKey$227 in lastProps) - (propKey$201 = lastProps[propKey$227]), - lastProps.hasOwnProperty(propKey$227) && - void 0 !== propKey$201 && - !nextProps.hasOwnProperty(propKey$227) && + for (var propKey$225 in lastProps) + (propKey$199 = lastProps[propKey$225]), + lastProps.hasOwnProperty(propKey$225) && + void 0 !== propKey$199 && + !nextProps.hasOwnProperty(propKey$225) && setPropOnCustomElement( domElement, tag, - propKey$227, + propKey$225, void 0, nextProps, - propKey$201 + propKey$199 ); for (defaultChecked in nextProps) - (propKey$201 = nextProps[defaultChecked]), + (propKey$199 = nextProps[defaultChecked]), (propKey = lastProps[defaultChecked]), !nextProps.hasOwnProperty(defaultChecked) || - propKey$201 === propKey || - (void 0 === propKey$201 && void 0 === propKey) || + propKey$199 === propKey || + (void 0 === propKey$199 && void 0 === propKey) || setPropOnCustomElement( domElement, tag, defaultChecked, - propKey$201, + propKey$199, nextProps, propKey ); return; } } - for (var propKey$232 in lastProps) - (propKey$201 = lastProps[propKey$232]), - lastProps.hasOwnProperty(propKey$232) && - null != propKey$201 && - !nextProps.hasOwnProperty(propKey$232) && - setProp(domElement, tag, propKey$232, null, nextProps, propKey$201); + for (var propKey$230 in lastProps) + (propKey$199 = lastProps[propKey$230]), + lastProps.hasOwnProperty(propKey$230) && + null != propKey$199 && + !nextProps.hasOwnProperty(propKey$230) && + setProp(domElement, tag, propKey$230, null, nextProps, propKey$199); for (lastProp in nextProps) - (propKey$201 = nextProps[lastProp]), + (propKey$199 = nextProps[lastProp]), (propKey = lastProps[lastProp]), !nextProps.hasOwnProperty(lastProp) || - propKey$201 === propKey || - (null == propKey$201 && null == propKey) || - setProp(domElement, tag, lastProp, propKey$201, nextProps, propKey); + propKey$199 === propKey || + (null == propKey$199 && null == propKey) || + setProp(domElement, tag, lastProp, propKey$199, nextProps, propKey); } var eventsEnabled = null, selectionInformation = null; @@ -13837,26 +13814,26 @@ function getResource(type, currentProps, pendingProps, currentResource) { "string" === typeof pendingProps.precedence ) { type = getStyleKey(pendingProps.href); - var styles$240 = getResourcesFromRoot( + var styles$238 = getResourcesFromRoot( JSCompiler_inline_result ).hoistableStyles, - resource$241 = styles$240.get(type); - resource$241 || + resource$239 = styles$238.get(type); + resource$239 || ((JSCompiler_inline_result = JSCompiler_inline_result.ownerDocument || JSCompiler_inline_result), - (resource$241 = { + (resource$239 = { type: "stylesheet", instance: null, count: 0, state: { loading: 0, preload: null } }), - styles$240.set(type, resource$241), - (styles$240 = JSCompiler_inline_result.querySelector( + styles$238.set(type, resource$239), + (styles$238 = JSCompiler_inline_result.querySelector( getStylesheetSelectorFromKey(type) )) && - !styles$240._p && - ((resource$241.instance = styles$240), - (resource$241.state.loading = 5)), + !styles$238._p && + ((resource$239.instance = styles$238), + (resource$239.state.loading = 5)), preloadPropsMap.has(type) || ((pendingProps = { rel: "preload", @@ -13869,16 +13846,16 @@ function getResource(type, currentProps, pendingProps, currentResource) { referrerPolicy: pendingProps.referrerPolicy }), preloadPropsMap.set(type, pendingProps), - styles$240 || + styles$238 || preloadStylesheet( JSCompiler_inline_result, type, pendingProps, - resource$241.state + resource$239.state ))); if (currentProps && null === currentResource) throw Error(formatProdErrorMessage(528, "")); - return resource$241; + return resource$239; } if (currentProps && null !== currentResource) throw Error(formatProdErrorMessage(529, "")); @@ -13975,37 +13952,37 @@ function acquireResource(hoistableRoot, resource, props) { return (resource.instance = instance); case "stylesheet": styleProps = getStyleKey(props.href); - var instance$246 = hoistableRoot.querySelector( + var instance$244 = hoistableRoot.querySelector( getStylesheetSelectorFromKey(styleProps) ); - if (instance$246) + if (instance$244) return ( (resource.state.loading |= 4), - (resource.instance = instance$246), - markNodeAsHoistable(instance$246), - instance$246 + (resource.instance = instance$244), + markNodeAsHoistable(instance$244), + instance$244 ); instance = stylesheetPropsFromRawProps(props); (styleProps = preloadPropsMap.get(styleProps)) && adoptPreloadPropsForStylesheet(instance, styleProps); - instance$246 = ( + instance$244 = ( hoistableRoot.ownerDocument || hoistableRoot ).createElement("link"); - markNodeAsHoistable(instance$246); - var linkInstance = instance$246; + markNodeAsHoistable(instance$244); + var linkInstance = instance$244; linkInstance._p = new Promise(function (resolve, reject) { linkInstance.onload = resolve; linkInstance.onerror = reject; }); - setInitialProperties(instance$246, "link", instance); + setInitialProperties(instance$244, "link", instance); resource.state.loading |= 4; - insertStylesheet(instance$246, props.precedence, hoistableRoot); - return (resource.instance = instance$246); + insertStylesheet(instance$244, props.precedence, hoistableRoot); + return (resource.instance = instance$244); case "script": - instance$246 = getScriptKey(props.src); + instance$244 = getScriptKey(props.src); if ( (styleProps = hoistableRoot.querySelector( - getScriptSelectorFromKey(instance$246) + getScriptSelectorFromKey(instance$244) )) ) return ( @@ -14014,7 +13991,7 @@ function acquireResource(hoistableRoot, resource, props) { styleProps ); instance = props; - if ((styleProps = preloadPropsMap.get(instance$246))) + if ((styleProps = preloadPropsMap.get(instance$244))) (instance = assign({}, props)), adoptPreloadPropsForScript(instance, styleProps); hoistableRoot = hoistableRoot.ownerDocument || hoistableRoot; @@ -15038,16 +15015,16 @@ ReactDOMHydrationRoot.prototype.unstable_scheduleHydration = function (target) { 0 === i && attemptExplicitHydrationTarget(target); } }; -var isomorphicReactPackageVersion$jscomp$inline_1655 = React.version; +var isomorphicReactPackageVersion$jscomp$inline_1659 = React.version; if ( - "19.0.0-rc-a99d8e8d-20240916" !== - isomorphicReactPackageVersion$jscomp$inline_1655 + "19.0.0-rc-5dcb0097-20240918" !== + isomorphicReactPackageVersion$jscomp$inline_1659 ) throw Error( formatProdErrorMessage( 527, - isomorphicReactPackageVersion$jscomp$inline_1655, - "19.0.0-rc-a99d8e8d-20240916" + isomorphicReactPackageVersion$jscomp$inline_1659, + "19.0.0-rc-5dcb0097-20240918" ) ); ReactDOMSharedInternals.findDOMNode = function (componentOrElement) { @@ -15067,25 +15044,25 @@ ReactDOMSharedInternals.findDOMNode = function (componentOrElement) { null === componentOrElement ? null : componentOrElement.stateNode; return componentOrElement; }; -var internals$jscomp$inline_2100 = { +var internals$jscomp$inline_2125 = { bundleType: 0, - version: "19.0.0-rc-a99d8e8d-20240916", + version: "19.0.0-rc-5dcb0097-20240918", rendererPackageName: "react-dom", currentDispatcherRef: ReactSharedInternals, findFiberByHostInstance: getClosestInstanceFromNode, - reconcilerVersion: "19.0.0-rc-a99d8e8d-20240916" + reconcilerVersion: "19.0.0-rc-5dcb0097-20240918" }; if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) { - var hook$jscomp$inline_2101 = __REACT_DEVTOOLS_GLOBAL_HOOK__; + var hook$jscomp$inline_2126 = __REACT_DEVTOOLS_GLOBAL_HOOK__; if ( - !hook$jscomp$inline_2101.isDisabled && - hook$jscomp$inline_2101.supportsFiber + !hook$jscomp$inline_2126.isDisabled && + hook$jscomp$inline_2126.supportsFiber ) try { - (rendererID = hook$jscomp$inline_2101.inject( - internals$jscomp$inline_2100 + (rendererID = hook$jscomp$inline_2126.inject( + internals$jscomp$inline_2125 )), - (injectedHook = hook$jscomp$inline_2101); + (injectedHook = hook$jscomp$inline_2126); } catch (err) {} } exports.createRoot = function (container, options) { @@ -15177,4 +15154,4 @@ exports.hydrateRoot = function (container, initialChildren, options) { listenToAllSupportedEvents(container); return new ReactDOMHydrationRoot(initialChildren); }; -exports.version = "19.0.0-rc-a99d8e8d-20240916"; +exports.version = "19.0.0-rc-5dcb0097-20240918"; diff --git a/packages/next/src/compiled/react-dom/cjs/react-dom-profiling.development.js b/packages/next/src/compiled/react-dom/cjs/react-dom-profiling.development.js index aac53cd086226..bb804c926eb37 100644 --- a/packages/next/src/compiled/react-dom/cjs/react-dom-profiling.development.js +++ b/packages/next/src/compiled/react-dom/cjs/react-dom-profiling.development.js @@ -909,18 +909,6 @@ typeof injectedProfilingHooks.markComponentRenderStopped && injectedProfilingHooks.markComponentRenderStopped(); } - function markComponentLayoutEffectUnmountStarted(fiber) { - null !== injectedProfilingHooks && - "function" === - typeof injectedProfilingHooks.markComponentLayoutEffectUnmountStarted && - injectedProfilingHooks.markComponentLayoutEffectUnmountStarted(fiber); - } - function markComponentLayoutEffectUnmountStopped() { - null !== injectedProfilingHooks && - "function" === - typeof injectedProfilingHooks.markComponentLayoutEffectUnmountStopped && - injectedProfilingHooks.markComponentLayoutEffectUnmountStopped(); - } function markRenderStarted(lanes) { null !== injectedProfilingHooks && "function" === typeof injectedProfilingHooks.markRenderStarted && @@ -3539,41 +3527,43 @@ : !1; } function getActiveElementDeep(containerInfo) { - var $jscomp$optchain$tmpm838768536$1, $jscomp$nullish$tmp0; + var $jscomp$optchain$tmpm2093859904$1, $jscomp$nullish$tmp0; containerInfo = null != ($jscomp$nullish$tmp0 = null == containerInfo ? void 0 : null == - ($jscomp$optchain$tmpm838768536$1 = containerInfo.ownerDocument) + ($jscomp$optchain$tmpm2093859904$1 = + containerInfo.ownerDocument) ? void 0 - : $jscomp$optchain$tmpm838768536$1.defaultView) + : $jscomp$optchain$tmpm2093859904$1.defaultView) ? $jscomp$nullish$tmp0 : window; for ( - $jscomp$optchain$tmpm838768536$1 = getActiveElement( + $jscomp$optchain$tmpm2093859904$1 = getActiveElement( containerInfo.document ); - $jscomp$optchain$tmpm838768536$1 instanceof + $jscomp$optchain$tmpm2093859904$1 instanceof containerInfo.HTMLIFrameElement; ) { try { var JSCompiler_inline_result = "string" === - typeof $jscomp$optchain$tmpm838768536$1.contentWindow.location.href; + typeof $jscomp$optchain$tmpm2093859904$1.contentWindow.location + .href; } catch (err) { JSCompiler_inline_result = !1; } if (JSCompiler_inline_result) - containerInfo = $jscomp$optchain$tmpm838768536$1.contentWindow; + containerInfo = $jscomp$optchain$tmpm2093859904$1.contentWindow; else break; - $jscomp$optchain$tmpm838768536$1 = getActiveElement( + $jscomp$optchain$tmpm2093859904$1 = getActiveElement( containerInfo.document ); } - return $jscomp$optchain$tmpm838768536$1; + return $jscomp$optchain$tmpm2093859904$1; } function hasSelectionCapabilities(elem) { var nodeName = elem && elem.nodeName && elem.nodeName.toLowerCase(); @@ -3949,6 +3939,21 @@ staleFamilies ); } + function pushNestedEffectDurations() { + var prevEffectDuration = profilerEffectDuration; + profilerEffectDuration = 0; + return prevEffectDuration; + } + function popNestedEffectDurations(prevEffectDuration) { + var elapsedTime = profilerEffectDuration; + profilerEffectDuration = prevEffectDuration; + return elapsedTime; + } + function bubbleNestedEffectDurations(prevEffectDuration) { + var elapsedTime = profilerEffectDuration; + profilerEffectDuration += prevEffectDuration; + return elapsedTime; + } function startProfilerTimer(fiber) { profilerStartTime = now(); 0 > fiber.actualStartTime && (fiber.actualStartTime = profilerStartTime); @@ -3968,44 +3973,15 @@ profilerStartTime = -1; } } - function recordLayoutEffectDuration(fiber) { - if (0 <= layoutEffectStartTime) { - var elapsedTime = now() - layoutEffectStartTime; - layoutEffectStartTime = -1; - for (fiber = fiber.return; null !== fiber; ) { - switch (fiber.tag) { - case 3: - fiber.stateNode.effectDuration += elapsedTime; - return; - case 12: - fiber.stateNode.effectDuration += elapsedTime; - return; - } - fiber = fiber.return; - } - } - } - function recordPassiveEffectDuration(fiber) { - if (0 <= passiveEffectStartTime) { - var elapsedTime = now() - passiveEffectStartTime; - passiveEffectStartTime = -1; - for (fiber = fiber.return; null !== fiber; ) { - switch (fiber.tag) { - case 3: - fiber = fiber.stateNode; - null !== fiber && (fiber.passiveEffectDuration += elapsedTime); - return; - case 12: - fiber = fiber.stateNode; - null !== fiber && (fiber.passiveEffectDuration += elapsedTime); - return; - } - fiber = fiber.return; - } + function recordEffectDuration() { + if (0 <= profilerStartTime) { + var elapsedTime = now() - profilerStartTime; + profilerStartTime = -1; + profilerEffectDuration += elapsedTime; } } - function startLayoutEffectTimer() { - layoutEffectStartTime = now(); + function startEffectTimer() { + profilerStartTime = now(); } function transferActualDuration(fiber) { for (var child = fiber.child; child; ) @@ -8665,32 +8641,32 @@ return current; } function updateSuspenseComponent(current, workInProgress, renderLanes) { - var JSCompiler_object_inline_digest_2304; - var JSCompiler_object_inline_stack_2305 = workInProgress.pendingProps; + var JSCompiler_object_inline_digest_2293; + var JSCompiler_object_inline_stack_2294 = workInProgress.pendingProps; shouldSuspendImpl(workInProgress) && (workInProgress.flags |= 128); - var JSCompiler_object_inline_componentStack_2306 = !1; + var JSCompiler_object_inline_componentStack_2295 = !1; var didSuspend = 0 !== (workInProgress.flags & 128); - (JSCompiler_object_inline_digest_2304 = didSuspend) || - (JSCompiler_object_inline_digest_2304 = + (JSCompiler_object_inline_digest_2293 = didSuspend) || + (JSCompiler_object_inline_digest_2293 = null !== current && null === current.memoizedState ? !1 : 0 !== (suspenseStackCursor.current & ForceSuspenseFallback)); - JSCompiler_object_inline_digest_2304 && - ((JSCompiler_object_inline_componentStack_2306 = !0), + JSCompiler_object_inline_digest_2293 && + ((JSCompiler_object_inline_componentStack_2295 = !0), (workInProgress.flags &= -129)); - JSCompiler_object_inline_digest_2304 = 0 !== (workInProgress.flags & 32); + JSCompiler_object_inline_digest_2293 = 0 !== (workInProgress.flags & 32); workInProgress.flags &= -33; if (null === current) { if (isHydrating) { - JSCompiler_object_inline_componentStack_2306 + JSCompiler_object_inline_componentStack_2295 ? pushPrimaryTreeSuspenseHandler(workInProgress) : reuseSuspenseHandlerOnStack(workInProgress); if (isHydrating) { - var JSCompiler_object_inline_message_2303 = nextHydratableInstance; + var JSCompiler_object_inline_message_2292 = nextHydratableInstance; var JSCompiler_temp; - if (!(JSCompiler_temp = !JSCompiler_object_inline_message_2303)) { + if (!(JSCompiler_temp = !JSCompiler_object_inline_message_2292)) { c: { - var instance = JSCompiler_object_inline_message_2303; + var instance = JSCompiler_object_inline_message_2292; for ( JSCompiler_temp = rootOrSingletonContext; 8 !== instance.nodeType; @@ -8731,19 +8707,19 @@ JSCompiler_temp && (warnNonHydratedInstance( workInProgress, - JSCompiler_object_inline_message_2303 + JSCompiler_object_inline_message_2292 ), throwOnHydrationMismatch(workInProgress)); } - JSCompiler_object_inline_message_2303 = workInProgress.memoizedState; + JSCompiler_object_inline_message_2292 = workInProgress.memoizedState; if ( - null !== JSCompiler_object_inline_message_2303 && - ((JSCompiler_object_inline_message_2303 = - JSCompiler_object_inline_message_2303.dehydrated), - null !== JSCompiler_object_inline_message_2303) + null !== JSCompiler_object_inline_message_2292 && + ((JSCompiler_object_inline_message_2292 = + JSCompiler_object_inline_message_2292.dehydrated), + null !== JSCompiler_object_inline_message_2292) ) return ( - JSCompiler_object_inline_message_2303.data === + JSCompiler_object_inline_message_2292.data === SUSPENSE_FALLBACK_START_DATA ? (workInProgress.lanes = 16) : (workInProgress.lanes = 536870912), @@ -8751,58 +8727,58 @@ ); popSuspenseHandler(workInProgress); } - JSCompiler_object_inline_message_2303 = - JSCompiler_object_inline_stack_2305.children; - JSCompiler_object_inline_stack_2305 = - JSCompiler_object_inline_stack_2305.fallback; - if (JSCompiler_object_inline_componentStack_2306) + JSCompiler_object_inline_message_2292 = + JSCompiler_object_inline_stack_2294.children; + JSCompiler_object_inline_stack_2294 = + JSCompiler_object_inline_stack_2294.fallback; + if (JSCompiler_object_inline_componentStack_2295) return ( reuseSuspenseHandlerOnStack(workInProgress), - (JSCompiler_object_inline_componentStack_2306 = + (JSCompiler_object_inline_componentStack_2295 = workInProgress.mode), - (JSCompiler_object_inline_message_2303 = + (JSCompiler_object_inline_message_2292 = mountWorkInProgressOffscreenFiber( { mode: "hidden", - children: JSCompiler_object_inline_message_2303 + children: JSCompiler_object_inline_message_2292 }, - JSCompiler_object_inline_componentStack_2306 + JSCompiler_object_inline_componentStack_2295 )), - (JSCompiler_object_inline_stack_2305 = createFiberFromFragment( - JSCompiler_object_inline_stack_2305, - JSCompiler_object_inline_componentStack_2306, + (JSCompiler_object_inline_stack_2294 = createFiberFromFragment( + JSCompiler_object_inline_stack_2294, + JSCompiler_object_inline_componentStack_2295, renderLanes, null )), - (JSCompiler_object_inline_message_2303.return = workInProgress), - (JSCompiler_object_inline_stack_2305.return = workInProgress), - (JSCompiler_object_inline_message_2303.sibling = - JSCompiler_object_inline_stack_2305), - (workInProgress.child = JSCompiler_object_inline_message_2303), - (JSCompiler_object_inline_componentStack_2306 = + (JSCompiler_object_inline_message_2292.return = workInProgress), + (JSCompiler_object_inline_stack_2294.return = workInProgress), + (JSCompiler_object_inline_message_2292.sibling = + JSCompiler_object_inline_stack_2294), + (workInProgress.child = JSCompiler_object_inline_message_2292), + (JSCompiler_object_inline_componentStack_2295 = workInProgress.child), - (JSCompiler_object_inline_componentStack_2306.memoizedState = + (JSCompiler_object_inline_componentStack_2295.memoizedState = mountSuspenseOffscreenState(renderLanes)), - (JSCompiler_object_inline_componentStack_2306.childLanes = + (JSCompiler_object_inline_componentStack_2295.childLanes = getRemainingWorkInPrimaryTree( current, - JSCompiler_object_inline_digest_2304, + JSCompiler_object_inline_digest_2293, renderLanes )), (workInProgress.memoizedState = SUSPENDED_MARKER), - JSCompiler_object_inline_stack_2305 + JSCompiler_object_inline_stack_2294 ); pushPrimaryTreeSuspenseHandler(workInProgress); return mountSuspensePrimaryChildren( workInProgress, - JSCompiler_object_inline_message_2303 + JSCompiler_object_inline_message_2292 ); } var prevState = current.memoizedState; if ( null !== prevState && - ((JSCompiler_object_inline_message_2303 = prevState.dehydrated), - null !== JSCompiler_object_inline_message_2303) + ((JSCompiler_object_inline_message_2292 = prevState.dehydrated), + null !== JSCompiler_object_inline_message_2292) ) { if (didSuspend) workInProgress.flags & 256 @@ -8819,94 +8795,94 @@ (workInProgress.flags |= 128), (workInProgress = null)) : (reuseSuspenseHandlerOnStack(workInProgress), - (JSCompiler_object_inline_componentStack_2306 = - JSCompiler_object_inline_stack_2305.fallback), - (JSCompiler_object_inline_message_2303 = workInProgress.mode), - (JSCompiler_object_inline_stack_2305 = + (JSCompiler_object_inline_componentStack_2295 = + JSCompiler_object_inline_stack_2294.fallback), + (JSCompiler_object_inline_message_2292 = workInProgress.mode), + (JSCompiler_object_inline_stack_2294 = mountWorkInProgressOffscreenFiber( { mode: "visible", - children: JSCompiler_object_inline_stack_2305.children + children: JSCompiler_object_inline_stack_2294.children }, - JSCompiler_object_inline_message_2303 + JSCompiler_object_inline_message_2292 )), - (JSCompiler_object_inline_componentStack_2306 = + (JSCompiler_object_inline_componentStack_2295 = createFiberFromFragment( - JSCompiler_object_inline_componentStack_2306, - JSCompiler_object_inline_message_2303, + JSCompiler_object_inline_componentStack_2295, + JSCompiler_object_inline_message_2292, renderLanes, null )), - (JSCompiler_object_inline_componentStack_2306.flags |= 2), - (JSCompiler_object_inline_stack_2305.return = workInProgress), - (JSCompiler_object_inline_componentStack_2306.return = + (JSCompiler_object_inline_componentStack_2295.flags |= 2), + (JSCompiler_object_inline_stack_2294.return = workInProgress), + (JSCompiler_object_inline_componentStack_2295.return = workInProgress), - (JSCompiler_object_inline_stack_2305.sibling = - JSCompiler_object_inline_componentStack_2306), - (workInProgress.child = JSCompiler_object_inline_stack_2305), + (JSCompiler_object_inline_stack_2294.sibling = + JSCompiler_object_inline_componentStack_2295), + (workInProgress.child = JSCompiler_object_inline_stack_2294), reconcileChildFibers( workInProgress, current.child, null, renderLanes ), - (JSCompiler_object_inline_stack_2305 = workInProgress.child), - (JSCompiler_object_inline_stack_2305.memoizedState = + (JSCompiler_object_inline_stack_2294 = workInProgress.child), + (JSCompiler_object_inline_stack_2294.memoizedState = mountSuspenseOffscreenState(renderLanes)), - (JSCompiler_object_inline_stack_2305.childLanes = + (JSCompiler_object_inline_stack_2294.childLanes = getRemainingWorkInPrimaryTree( current, - JSCompiler_object_inline_digest_2304, + JSCompiler_object_inline_digest_2293, renderLanes )), (workInProgress.memoizedState = SUSPENDED_MARKER), (workInProgress = - JSCompiler_object_inline_componentStack_2306)); + JSCompiler_object_inline_componentStack_2295)); else if ( (pushPrimaryTreeSuspenseHandler(workInProgress), isHydrating && console.error( "We should not be hydrating here. This is a bug in React. Please file a bug." ), - JSCompiler_object_inline_message_2303.data === + JSCompiler_object_inline_message_2292.data === SUSPENSE_FALLBACK_START_DATA) ) { - JSCompiler_object_inline_digest_2304 = - JSCompiler_object_inline_message_2303.nextSibling && - JSCompiler_object_inline_message_2303.nextSibling.dataset; - if (JSCompiler_object_inline_digest_2304) { - JSCompiler_temp = JSCompiler_object_inline_digest_2304.dgst; - var message = JSCompiler_object_inline_digest_2304.msg; - instance = JSCompiler_object_inline_digest_2304.stck; - var componentStack = JSCompiler_object_inline_digest_2304.cstck; + JSCompiler_object_inline_digest_2293 = + JSCompiler_object_inline_message_2292.nextSibling && + JSCompiler_object_inline_message_2292.nextSibling.dataset; + if (JSCompiler_object_inline_digest_2293) { + JSCompiler_temp = JSCompiler_object_inline_digest_2293.dgst; + var message = JSCompiler_object_inline_digest_2293.msg; + instance = JSCompiler_object_inline_digest_2293.stck; + var componentStack = JSCompiler_object_inline_digest_2293.cstck; } - JSCompiler_object_inline_message_2303 = message; - JSCompiler_object_inline_digest_2304 = JSCompiler_temp; - JSCompiler_object_inline_stack_2305 = instance; - JSCompiler_object_inline_componentStack_2306 = componentStack; - JSCompiler_object_inline_message_2303 = - JSCompiler_object_inline_message_2303 - ? Error(JSCompiler_object_inline_message_2303) + JSCompiler_object_inline_message_2292 = message; + JSCompiler_object_inline_digest_2293 = JSCompiler_temp; + JSCompiler_object_inline_stack_2294 = instance; + JSCompiler_object_inline_componentStack_2295 = componentStack; + JSCompiler_object_inline_message_2292 = + JSCompiler_object_inline_message_2292 + ? Error(JSCompiler_object_inline_message_2292) : Error( "The server could not finish this Suspense boundary, likely due to an error during server rendering. Switched to client rendering." ); - JSCompiler_object_inline_message_2303.stack = - JSCompiler_object_inline_stack_2305 || ""; - JSCompiler_object_inline_message_2303.digest = - JSCompiler_object_inline_digest_2304; - JSCompiler_object_inline_digest_2304 = - void 0 === JSCompiler_object_inline_componentStack_2306 + JSCompiler_object_inline_message_2292.stack = + JSCompiler_object_inline_stack_2294 || ""; + JSCompiler_object_inline_message_2292.digest = + JSCompiler_object_inline_digest_2293; + JSCompiler_object_inline_digest_2293 = + void 0 === JSCompiler_object_inline_componentStack_2295 ? null - : JSCompiler_object_inline_componentStack_2306; - "string" === typeof JSCompiler_object_inline_digest_2304 && + : JSCompiler_object_inline_componentStack_2295; + "string" === typeof JSCompiler_object_inline_digest_2293 && CapturedStacks.set( - JSCompiler_object_inline_message_2303, - JSCompiler_object_inline_digest_2304 + JSCompiler_object_inline_message_2292, + JSCompiler_object_inline_digest_2293 ); queueHydrationError({ - value: JSCompiler_object_inline_message_2303, + value: JSCompiler_object_inline_message_2292, source: null, - stack: JSCompiler_object_inline_digest_2304 + stack: JSCompiler_object_inline_digest_2293 }); workInProgress = retrySuspenseComponentWithoutHydrating( current, @@ -8921,25 +8897,25 @@ renderLanes, !1 ), - (JSCompiler_object_inline_digest_2304 = + (JSCompiler_object_inline_digest_2293 = 0 !== (renderLanes & current.childLanes)), - didReceiveUpdate || JSCompiler_object_inline_digest_2304) + didReceiveUpdate || JSCompiler_object_inline_digest_2293) ) { - JSCompiler_object_inline_digest_2304 = workInProgressRoot; - if (null !== JSCompiler_object_inline_digest_2304) { - JSCompiler_object_inline_stack_2305 = renderLanes & -renderLanes; - if (0 !== (JSCompiler_object_inline_stack_2305 & 42)) - JSCompiler_object_inline_stack_2305 = 1; + JSCompiler_object_inline_digest_2293 = workInProgressRoot; + if (null !== JSCompiler_object_inline_digest_2293) { + JSCompiler_object_inline_stack_2294 = renderLanes & -renderLanes; + if (0 !== (JSCompiler_object_inline_stack_2294 & 42)) + JSCompiler_object_inline_stack_2294 = 1; else - switch (JSCompiler_object_inline_stack_2305) { + switch (JSCompiler_object_inline_stack_2294) { case 2: - JSCompiler_object_inline_stack_2305 = 1; + JSCompiler_object_inline_stack_2294 = 1; break; case 8: - JSCompiler_object_inline_stack_2305 = 4; + JSCompiler_object_inline_stack_2294 = 4; break; case 32: - JSCompiler_object_inline_stack_2305 = 16; + JSCompiler_object_inline_stack_2294 = 16; break; case 128: case 256: @@ -8960,40 +8936,40 @@ case 8388608: case 16777216: case 33554432: - JSCompiler_object_inline_stack_2305 = 64; + JSCompiler_object_inline_stack_2294 = 64; break; case 268435456: - JSCompiler_object_inline_stack_2305 = 134217728; + JSCompiler_object_inline_stack_2294 = 134217728; break; default: - JSCompiler_object_inline_stack_2305 = 0; + JSCompiler_object_inline_stack_2294 = 0; } - JSCompiler_object_inline_stack_2305 = + JSCompiler_object_inline_stack_2294 = 0 !== - (JSCompiler_object_inline_stack_2305 & - (JSCompiler_object_inline_digest_2304.suspendedLanes | + (JSCompiler_object_inline_stack_2294 & + (JSCompiler_object_inline_digest_2293.suspendedLanes | renderLanes)) ? 0 - : JSCompiler_object_inline_stack_2305; + : JSCompiler_object_inline_stack_2294; if ( - 0 !== JSCompiler_object_inline_stack_2305 && - JSCompiler_object_inline_stack_2305 !== prevState.retryLane + 0 !== JSCompiler_object_inline_stack_2294 && + JSCompiler_object_inline_stack_2294 !== prevState.retryLane ) throw ( - ((prevState.retryLane = JSCompiler_object_inline_stack_2305), + ((prevState.retryLane = JSCompiler_object_inline_stack_2294), enqueueConcurrentRenderForLane( current, - JSCompiler_object_inline_stack_2305 + JSCompiler_object_inline_stack_2294 ), scheduleUpdateOnFiber( - JSCompiler_object_inline_digest_2304, + JSCompiler_object_inline_digest_2293, current, - JSCompiler_object_inline_stack_2305 + JSCompiler_object_inline_stack_2294 ), SelectiveHydrationException) ); } - JSCompiler_object_inline_message_2303.data === + JSCompiler_object_inline_message_2292.data === SUSPENSE_PENDING_START_DATA || renderDidSuspendDelayIfPossible(); workInProgress = retrySuspenseComponentWithoutHydrating( current, @@ -9001,7 +8977,7 @@ renderLanes ); } else - JSCompiler_object_inline_message_2303.data === + JSCompiler_object_inline_message_2292.data === SUSPENSE_PENDING_START_DATA ? ((workInProgress.flags |= 128), (workInProgress.child = current.child), @@ -9009,12 +8985,12 @@ null, current )), - (JSCompiler_object_inline_message_2303._reactRetry = + (JSCompiler_object_inline_message_2292._reactRetry = workInProgress), (workInProgress = null)) : ((current = prevState.treeContext), (nextHydratableInstance = getNextHydratable( - JSCompiler_object_inline_message_2303.nextSibling + JSCompiler_object_inline_message_2292.nextSibling )), (hydrationParentFiber = workInProgress), (isHydrating = !0), @@ -9032,57 +9008,57 @@ (treeContextProvider = workInProgress)), (workInProgress = mountSuspensePrimaryChildren( workInProgress, - JSCompiler_object_inline_stack_2305.children + JSCompiler_object_inline_stack_2294.children )), (workInProgress.flags |= 4096)); return workInProgress; } - if (JSCompiler_object_inline_componentStack_2306) + if (JSCompiler_object_inline_componentStack_2295) return ( reuseSuspenseHandlerOnStack(workInProgress), - (JSCompiler_object_inline_componentStack_2306 = - JSCompiler_object_inline_stack_2305.fallback), - (JSCompiler_object_inline_message_2303 = workInProgress.mode), + (JSCompiler_object_inline_componentStack_2295 = + JSCompiler_object_inline_stack_2294.fallback), + (JSCompiler_object_inline_message_2292 = workInProgress.mode), (JSCompiler_temp = current.child), (instance = JSCompiler_temp.sibling), - (JSCompiler_object_inline_stack_2305 = createWorkInProgress( + (JSCompiler_object_inline_stack_2294 = createWorkInProgress( JSCompiler_temp, { mode: "hidden", - children: JSCompiler_object_inline_stack_2305.children + children: JSCompiler_object_inline_stack_2294.children } )), - (JSCompiler_object_inline_stack_2305.subtreeFlags = + (JSCompiler_object_inline_stack_2294.subtreeFlags = JSCompiler_temp.subtreeFlags & 31457280), null !== instance - ? (JSCompiler_object_inline_componentStack_2306 = + ? (JSCompiler_object_inline_componentStack_2295 = createWorkInProgress( instance, - JSCompiler_object_inline_componentStack_2306 + JSCompiler_object_inline_componentStack_2295 )) - : ((JSCompiler_object_inline_componentStack_2306 = + : ((JSCompiler_object_inline_componentStack_2295 = createFiberFromFragment( - JSCompiler_object_inline_componentStack_2306, - JSCompiler_object_inline_message_2303, + JSCompiler_object_inline_componentStack_2295, + JSCompiler_object_inline_message_2292, renderLanes, null )), - (JSCompiler_object_inline_componentStack_2306.flags |= 2)), - (JSCompiler_object_inline_componentStack_2306.return = + (JSCompiler_object_inline_componentStack_2295.flags |= 2)), + (JSCompiler_object_inline_componentStack_2295.return = workInProgress), - (JSCompiler_object_inline_stack_2305.return = workInProgress), - (JSCompiler_object_inline_stack_2305.sibling = - JSCompiler_object_inline_componentStack_2306), - (workInProgress.child = JSCompiler_object_inline_stack_2305), - (JSCompiler_object_inline_stack_2305 = - JSCompiler_object_inline_componentStack_2306), - (JSCompiler_object_inline_componentStack_2306 = workInProgress.child), - (JSCompiler_object_inline_message_2303 = current.child.memoizedState), - null === JSCompiler_object_inline_message_2303 - ? (JSCompiler_object_inline_message_2303 = + (JSCompiler_object_inline_stack_2294.return = workInProgress), + (JSCompiler_object_inline_stack_2294.sibling = + JSCompiler_object_inline_componentStack_2295), + (workInProgress.child = JSCompiler_object_inline_stack_2294), + (JSCompiler_object_inline_stack_2294 = + JSCompiler_object_inline_componentStack_2295), + (JSCompiler_object_inline_componentStack_2295 = workInProgress.child), + (JSCompiler_object_inline_message_2292 = current.child.memoizedState), + null === JSCompiler_object_inline_message_2292 + ? (JSCompiler_object_inline_message_2292 = mountSuspenseOffscreenState(renderLanes)) : ((JSCompiler_temp = - JSCompiler_object_inline_message_2303.cachePool), + JSCompiler_object_inline_message_2292.cachePool), null !== JSCompiler_temp ? ((instance = CacheContext._currentValue), (JSCompiler_temp = @@ -9090,37 +9066,37 @@ ? { parent: instance, pool: instance } : JSCompiler_temp)) : (JSCompiler_temp = getSuspendedCache()), - (JSCompiler_object_inline_message_2303 = { + (JSCompiler_object_inline_message_2292 = { baseLanes: - JSCompiler_object_inline_message_2303.baseLanes | renderLanes, + JSCompiler_object_inline_message_2292.baseLanes | renderLanes, cachePool: JSCompiler_temp })), - (JSCompiler_object_inline_componentStack_2306.memoizedState = - JSCompiler_object_inline_message_2303), - (JSCompiler_object_inline_componentStack_2306.childLanes = + (JSCompiler_object_inline_componentStack_2295.memoizedState = + JSCompiler_object_inline_message_2292), + (JSCompiler_object_inline_componentStack_2295.childLanes = getRemainingWorkInPrimaryTree( current, - JSCompiler_object_inline_digest_2304, + JSCompiler_object_inline_digest_2293, renderLanes )), (workInProgress.memoizedState = SUSPENDED_MARKER), - JSCompiler_object_inline_stack_2305 + JSCompiler_object_inline_stack_2294 ); pushPrimaryTreeSuspenseHandler(workInProgress); renderLanes = current.child; current = renderLanes.sibling; renderLanes = createWorkInProgress(renderLanes, { mode: "visible", - children: JSCompiler_object_inline_stack_2305.children + children: JSCompiler_object_inline_stack_2294.children }); renderLanes.return = workInProgress; renderLanes.sibling = null; null !== current && - ((JSCompiler_object_inline_digest_2304 = workInProgress.deletions), - null === JSCompiler_object_inline_digest_2304 + ((JSCompiler_object_inline_digest_2293 = workInProgress.deletions), + null === JSCompiler_object_inline_digest_2293 ? ((workInProgress.deletions = [current]), (workInProgress.flags |= 16)) - : JSCompiler_object_inline_digest_2304.push(current)); + : JSCompiler_object_inline_digest_2293.push(current)); workInProgress.child = renderLanes; workInProgress.memoizedState = null; return renderLanes; @@ -9448,8 +9424,8 @@ (workInProgress.flags |= 4); workInProgress.flags |= 2048; var stateNode = workInProgress.stateNode; - stateNode.effectDuration = 0; - stateNode.passiveEffectDuration = 0; + stateNode.effectDuration = -0; + stateNode.passiveEffectDuration = -0; break; case 13: stateNode = workInProgress.memoizedState; @@ -10033,8 +10009,8 @@ (workInProgress.flags |= 4), (workInProgress.flags |= 2048), (returnFiber = workInProgress.stateNode), - (returnFiber.effectDuration = 0), - (returnFiber.passiveEffectDuration = 0), + (returnFiber.effectDuration = -0), + (returnFiber.passiveEffectDuration = -0), reconcileChildren( current, workInProgress, @@ -10695,16 +10671,35 @@ ) callCallback(callbacks[updateQueue], context); } - function shouldProfile$1(current) { + function shouldProfile(current) { return (current.mode & ProfileMode) !== NoMode; } function commitHookLayoutEffects(finishedWork, hookFlags) { - shouldProfile$1(finishedWork) - ? (startLayoutEffectTimer(), + shouldProfile(finishedWork) + ? (startEffectTimer(), commitHookEffectListMount(hookFlags, finishedWork), - recordLayoutEffectDuration(finishedWork)) + recordEffectDuration()) : commitHookEffectListMount(hookFlags, finishedWork); } + function commitHookLayoutUnmountEffects( + finishedWork, + nearestMountedAncestor, + hookFlags + ) { + shouldProfile(finishedWork) + ? (startEffectTimer(), + commitHookEffectListUnmount( + hookFlags, + finishedWork, + nearestMountedAncestor + ), + recordEffectDuration()) + : commitHookEffectListUnmount( + hookFlags, + finishedWork, + nearestMountedAncestor + ); + } function commitHookEffectListMount(flags, finishedWork) { try { var updateQueue = finishedWork.updateQueue, @@ -10814,7 +10809,12 @@ finishedWork ) : (flags & Layout) !== NoFlags && - markComponentLayoutEffectUnmountStarted(finishedWork), + null !== injectedProfilingHooks && + "function" === + typeof injectedProfilingHooks.markComponentLayoutEffectUnmountStarted && + injectedProfilingHooks.markComponentLayoutEffectUnmountStarted( + finishedWork + ), (flags & Insertion) !== NoFlags && (isRunningInsertionEffect = !0), runWithFiberInDEV( @@ -10832,7 +10832,10 @@ typeof injectedProfilingHooks.markComponentPassiveEffectUnmountStopped && injectedProfilingHooks.markComponentPassiveEffectUnmountStopped() : (flags & Layout) !== NoFlags && - markComponentLayoutEffectUnmountStopped()); + null !== injectedProfilingHooks && + "function" === + typeof injectedProfilingHooks.markComponentLayoutEffectUnmountStopped && + injectedProfilingHooks.markComponentLayoutEffectUnmountStopped()); } updateQueue = updateQueue.next; } while (updateQueue !== firstEffect); @@ -10842,10 +10845,10 @@ } } function commitHookPassiveMountEffects(finishedWork, hookFlags) { - shouldProfile$1(finishedWork) - ? ((passiveEffectStartTime = now()), + shouldProfile(finishedWork) + ? (startEffectTimer(), commitHookEffectListMount(hookFlags, finishedWork), - recordPassiveEffectDuration(finishedWork)) + recordEffectDuration()) : commitHookEffectListMount(hookFlags, finishedWork); } function commitHookPassiveUnmountEffects( @@ -10853,14 +10856,14 @@ nearestMountedAncestor, hookFlags ) { - shouldProfile$1(finishedWork) - ? ((passiveEffectStartTime = now()), + shouldProfile(finishedWork) + ? (startEffectTimer(), commitHookEffectListUnmount( hookFlags, finishedWork, nearestMountedAncestor ), - recordPassiveEffectDuration(finishedWork)) + recordEffectDuration()) : commitHookEffectListUnmount( hookFlags, finishedWork, @@ -10954,8 +10957,8 @@ current.memoizedProps ); instance.state = current.memoizedState; - shouldProfile$1(current) - ? (startLayoutEffectTimer(), + shouldProfile(current) + ? (startEffectTimer(), runWithFiberInDEV( current, callComponentWillUnmountInDEV, @@ -10963,7 +10966,7 @@ nearestMountedAncestor, instance ), - recordLayoutEffectDuration(current)) + recordEffectDuration()) : runWithFiberInDEV( current, callComponentWillUnmountInDEV, @@ -10977,12 +10980,11 @@ if (null !== ref) { var instance = finishedWork.stateNode; if ("function" === typeof ref) - if (shouldProfile$1(finishedWork)) + if (shouldProfile(finishedWork)) try { - startLayoutEffectTimer(), - (finishedWork.refCleanup = ref(instance)); + startEffectTimer(), (finishedWork.refCleanup = ref(instance)); } finally { - recordLayoutEffectDuration(finishedWork); + recordEffectDuration(); } else finishedWork.refCleanup = ref(instance); else @@ -11009,12 +11011,11 @@ if (null !== ref) if ("function" === typeof refCleanup) try { - if (shouldProfile$1(current)) + if (shouldProfile(current)) try { - startLayoutEffectTimer(), - runWithFiberInDEV(current, refCleanup); + startEffectTimer(), runWithFiberInDEV(current, refCleanup); } finally { - recordLayoutEffectDuration(current); + recordEffectDuration(current); } else runWithFiberInDEV(current, refCleanup); } catch (error) { @@ -11026,11 +11027,11 @@ } else if ("function" === typeof ref) try { - if (shouldProfile$1(current)) + if (shouldProfile(current)) try { - startLayoutEffectTimer(), runWithFiberInDEV(current, ref, null); + startEffectTimer(), runWithFiberInDEV(current, ref, null); } finally { - recordLayoutEffectDuration(current); + recordEffectDuration(current); } else runWithFiberInDEV(current, ref, null); } catch (error$7) { @@ -11397,15 +11398,15 @@ "Expected %s state to match memoized state before componentDidMount. This might either be because of a bug in React, or because a component reassigns its own `this.state`. Please file an issue.", getComponentNameFromFiber(finishedWork) || "instance" )), - shouldProfile$1(finishedWork) - ? (startLayoutEffectTimer(), + shouldProfile(finishedWork) + ? (startEffectTimer(), runWithFiberInDEV( finishedWork, callComponentDidMountInDEV, finishedWork, finishedRoot ), - recordLayoutEffectDuration(finishedWork)) + recordEffectDuration()) : runWithFiberInDEV( finishedWork, callComponentDidMountInDEV, @@ -11431,8 +11432,8 @@ "Expected %s state to match memoized state before componentDidUpdate. This might either be because of a bug in React, or because a component reassigns its own `this.state`. Please file an issue.", getComponentNameFromFiber(finishedWork) || "instance" )); - shouldProfile$1(finishedWork) - ? (startLayoutEffectTimer(), + shouldProfile(finishedWork) + ? (startEffectTimer(), runWithFiberInDEV( finishedWork, callComponentDidUpdateInDEV, @@ -11442,7 +11443,7 @@ current, finishedRoot.__reactInternalSnapshotBeforeUpdate ), - recordLayoutEffectDuration(finishedWork)) + recordEffectDuration()) : runWithFiberInDEV( finishedWork, callComponentDidUpdateInDEV, @@ -11457,32 +11458,34 @@ flags & 512 && safelyAttachRef(finishedWork, finishedWork.return); break; case 3: + current = pushNestedEffectDurations(); recursivelyTraverseLayoutEffects(finishedRoot, finishedWork); if ( flags & 64 && ((flags = finishedWork.updateQueue), null !== flags) ) { - finishedRoot = null; + prevProps = null; if (null !== finishedWork.child) switch (finishedWork.child.tag) { case 27: case 5: - finishedRoot = finishedWork.child.stateNode; + prevProps = finishedWork.child.stateNode; break; case 1: - finishedRoot = finishedWork.child.stateNode; + prevProps = finishedWork.child.stateNode; } try { runWithFiberInDEV( finishedWork, commitCallbacks, flags, - finishedRoot + prevProps ); } catch (error) { captureCommitPhaseError(finishedWork, finishedWork.return, error); } } + finishedRoot.effectDuration += popNestedEffectDurations(current); break; case 26: recursivelyTraverseLayoutEffects(finishedRoot, finishedWork); @@ -11495,9 +11498,11 @@ flags & 512 && safelyAttachRef(finishedWork, finishedWork.return); break; case 12: - recursivelyTraverseLayoutEffects(finishedRoot, finishedWork); if (flags & 4) { - flags = finishedWork.stateNode.effectDuration; + flags = pushNestedEffectDurations(); + recursivelyTraverseLayoutEffects(finishedRoot, finishedWork); + finishedRoot = finishedWork.stateNode; + finishedRoot.effectDuration += bubbleNestedEffectDurations(flags); try { runWithFiberInDEV( finishedWork, @@ -11505,24 +11510,12 @@ finishedWork, current, commitTime, - flags + finishedRoot.effectDuration ); } catch (error) { captureCommitPhaseError(finishedWork, finishedWork.return, error); } - finishedWork = finishedWork.return; - a: for (; null !== finishedWork; ) { - switch (finishedWork.tag) { - case 3: - finishedWork.stateNode.effectDuration += flags; - break a; - case 12: - finishedWork.stateNode.effectDuration += flags; - break a; - } - finishedWork = finishedWork.return; - } - } + } else recursivelyTraverseLayoutEffects(finishedRoot, finishedWork); break; case 13: recursivelyTraverseLayoutEffects(finishedRoot, finishedWork); @@ -11719,53 +11712,18 @@ case 11: case 14: case 15: - if ( - !offscreenSubtreeWasHidden && - ((prevHostParent = deletedFiber.updateQueue), - null !== prevHostParent && - ((prevHostParent = prevHostParent.lastEffect), - null !== prevHostParent)) - ) { - prevHostParentIsContainer = prevHostParent = prevHostParent.next; - do { - var _tag = prevHostParentIsContainer.tag, - _inst = prevHostParentIsContainer.inst, - _destroy = _inst.destroy; - void 0 !== _destroy && - ((_tag & Insertion) !== NoFlags - ? ((_inst.destroy = void 0), - runWithFiberInDEV( - deletedFiber, - callDestroyInDEV, - deletedFiber, - nearestMountedAncestor, - _destroy - )) - : (_tag & Layout) !== NoFlags && - (markComponentLayoutEffectUnmountStarted(deletedFiber), - (deletedFiber.mode & ProfileMode) !== NoMode - ? (startLayoutEffectTimer(), - (_inst.destroy = void 0), - runWithFiberInDEV( - deletedFiber, - callDestroyInDEV, - deletedFiber, - nearestMountedAncestor, - _destroy - ), - recordLayoutEffectDuration(deletedFiber)) - : ((_inst.destroy = void 0), - runWithFiberInDEV( - deletedFiber, - callDestroyInDEV, - deletedFiber, - nearestMountedAncestor, - _destroy - )), - markComponentLayoutEffectUnmountStopped())); - prevHostParentIsContainer = prevHostParentIsContainer.next; - } while (prevHostParentIsContainer !== prevHostParent); - } + offscreenSubtreeWasHidden || + commitHookEffectListUnmount( + Insertion, + deletedFiber, + nearestMountedAncestor + ); + offscreenSubtreeWasHidden || + commitHookLayoutUnmountEffects( + deletedFiber, + nearestMountedAncestor, + Layout + ); recursivelyTraverseDeletionEffects( finishedRoot, nearestMountedAncestor, @@ -11941,19 +11899,11 @@ finishedWork.return ), commitHookEffectListMount(Insertion | HasEffect, finishedWork), - (finishedWork.mode & ProfileMode) !== NoMode - ? (startLayoutEffectTimer(), - commitHookEffectListUnmount( - Layout | HasEffect, - finishedWork, - finishedWork.return - ), - recordLayoutEffectDuration(finishedWork)) - : commitHookEffectListUnmount( - Layout | HasEffect, - finishedWork, - finishedWork.return - )); + commitHookLayoutUnmountEffects( + finishedWork, + finishedWork.return, + Layout | HasEffect + )); break; case 1: recursivelyTraverseMutationEffects(root, finishedWork); @@ -11978,113 +11928,110 @@ flags & 512 && null !== current && safelyDetachRef(current, current.return); - if (flags & 4) { - var currentResource = - null !== current ? current.memoizedState : null; - flags = finishedWork.memoizedState; - if (null === current) + if (flags & 4) + if ( + ((root = null !== current ? current.memoizedState : null), + (flags = finishedWork.memoizedState), + null === current) + ) if (null === flags) if (null === finishedWork.stateNode) { a: { flags = finishedWork.type; current = finishedWork.memoizedProps; - hoistableRoot = - hoistableRoot.ownerDocument || hoistableRoot; + root = hoistableRoot.ownerDocument || hoistableRoot; b: switch (flags) { case "title": - currentResource = - hoistableRoot.getElementsByTagName("title")[0]; + hoistableRoot = root.getElementsByTagName("title")[0]; if ( - !currentResource || - currentResource[internalHoistableMarker] || - currentResource[internalInstanceKey] || - currentResource.namespaceURI === SVG_NAMESPACE || - currentResource.hasAttribute("itemprop") + !hoistableRoot || + hoistableRoot[internalHoistableMarker] || + hoistableRoot[internalInstanceKey] || + hoistableRoot.namespaceURI === SVG_NAMESPACE || + hoistableRoot.hasAttribute("itemprop") ) - (currentResource = - hoistableRoot.createElement(flags)), - hoistableRoot.head.insertBefore( - currentResource, - hoistableRoot.querySelector("head > title") + (hoistableRoot = root.createElement(flags)), + root.head.insertBefore( + hoistableRoot, + root.querySelector("head > title") ); - setInitialProperties(currentResource, flags, current); - currentResource[internalInstanceKey] = finishedWork; - markNodeAsHoistable(currentResource); - flags = currentResource; + setInitialProperties(hoistableRoot, flags, current); + hoistableRoot[internalInstanceKey] = finishedWork; + markNodeAsHoistable(hoistableRoot); + flags = hoistableRoot; break a; case "link": - if ( - (root = getHydratableHoistableCache( - "link", - "href", - hoistableRoot - ).get(flags + (current.href || ""))) - ) - for (var i = 0; i < root.length; i++) + var maybeNodes = getHydratableHoistableCache( + "link", + "href", + root + ).get(flags + (current.href || "")); + if (maybeNodes) + for (var i = 0; i < maybeNodes.length; i++) if ( - ((currentResource = root[i]), - currentResource.getAttribute("href") === + ((hoistableRoot = maybeNodes[i]), + hoistableRoot.getAttribute("href") === (null == current.href ? null : current.href) && - currentResource.getAttribute("rel") === + hoistableRoot.getAttribute("rel") === (null == current.rel ? null : current.rel) && - currentResource.getAttribute("title") === + hoistableRoot.getAttribute("title") === (null == current.title ? null : current.title) && - currentResource.getAttribute("crossorigin") === + hoistableRoot.getAttribute("crossorigin") === (null == current.crossOrigin ? null : current.crossOrigin)) ) { - root.splice(i, 1); + maybeNodes.splice(i, 1); break b; } - currentResource = hoistableRoot.createElement(flags); - setInitialProperties(currentResource, flags, current); - hoistableRoot.head.appendChild(currentResource); + hoistableRoot = root.createElement(flags); + setInitialProperties(hoistableRoot, flags, current); + root.head.appendChild(hoistableRoot); break; case "meta": if ( - (root = getHydratableHoistableCache( + (maybeNodes = getHydratableHoistableCache( "meta", "content", - hoistableRoot + root ).get(flags + (current.content || ""))) ) - for (i = 0; i < root.length; i++) + for (i = 0; i < maybeNodes.length; i++) if ( - ((currentResource = root[i]), + ((hoistableRoot = maybeNodes[i]), checkAttributeStringCoercion( current.content, "content" ), - currentResource.getAttribute("content") === + hoistableRoot.getAttribute("content") === (null == current.content ? null : "" + current.content) && - currentResource.getAttribute("name") === + hoistableRoot.getAttribute("name") === (null == current.name ? null : current.name) && - currentResource.getAttribute("property") === + hoistableRoot.getAttribute("property") === (null == current.property ? null : current.property) && - currentResource.getAttribute("http-equiv") === + hoistableRoot.getAttribute("http-equiv") === (null == current.httpEquiv ? null : current.httpEquiv) && - currentResource.getAttribute("charset") === + hoistableRoot.getAttribute("charset") === (null == current.charSet ? null : current.charSet)) ) { - root.splice(i, 1); + maybeNodes.splice(i, 1); break b; } - currentResource = hoistableRoot.createElement(flags); - setInitialProperties(currentResource, flags, current); - hoistableRoot.head.appendChild(currentResource); + hoistableRoot = root.createElement(flags); + setInitialProperties(hoistableRoot, flags, current); + root.head.appendChild(hoistableRoot); break; default: throw Error( @@ -12093,9 +12040,9 @@ '". This is a bug in React.' ); } - currentResource[internalInstanceKey] = finishedWork; - markNodeAsHoistable(currentResource); - flags = currentResource; + hoistableRoot[internalInstanceKey] = finishedWork; + markNodeAsHoistable(hoistableRoot); + flags = hoistableRoot; } finishedWork.stateNode = flags; } else @@ -12111,12 +12058,12 @@ finishedWork.memoizedProps ); else - currentResource !== flags - ? (null === currentResource + root !== flags + ? (null === root ? null !== current.stateNode && ((current = current.stateNode), current.parentNode.removeChild(current)) - : currentResource.count--, + : root.count--, null === flags ? mountHoistable( hoistableRoot, @@ -12135,12 +12082,11 @@ finishedWork.memoizedProps, current.memoizedProps ); - } break; case 27: if (flags & 4 && null === finishedWork.alternate) { hoistableRoot = finishedWork.stateNode; - currentResource = finishedWork.memoizedProps; + maybeNodes = finishedWork.memoizedProps; try { for (i = hoistableRoot.firstChild; i; ) { var nextNode = i.nextSibling, @@ -12159,7 +12105,7 @@ finishedWork, acquireSingletonInstance, finishedWork.type, - currentResource, + maybeNodes, hoistableRoot, finishedWork ); @@ -12174,20 +12120,20 @@ null !== current && safelyDetachRef(current, current.return); if (finishedWork.flags & 32) { - hoistableRoot = finishedWork.stateNode; + root = finishedWork.stateNode; try { - runWithFiberInDEV(finishedWork, resetTextContent, hoistableRoot); + runWithFiberInDEV(finishedWork, resetTextContent, root); } catch (error) { captureCommitPhaseError(finishedWork, finishedWork.return, error); } } flags & 4 && null != finishedWork.stateNode && - ((hoistableRoot = finishedWork.memoizedProps), + ((root = finishedWork.memoizedProps), commitHostUpdate( finishedWork, - hoistableRoot, - null !== current ? current.memoizedProps : hoistableRoot + root, + null !== current ? current.memoizedProps : root )); flags & 1024 && ((needsFormReset = !0), @@ -12206,12 +12152,12 @@ ); flags = finishedWork.memoizedProps; current = null !== current ? current.memoizedProps : flags; - hoistableRoot = finishedWork.stateNode; + root = finishedWork.stateNode; try { runWithFiberInDEV( finishedWork, commitTextUpdate, - hoistableRoot, + root, current, flags ); @@ -12221,11 +12167,12 @@ } break; case 3: + hoistableRoot = pushNestedEffectDurations(); tagCaches = null; - hoistableRoot = currentHoistableRoot; + maybeNodes = currentHoistableRoot; currentHoistableRoot = getHoistableRoot(root.containerInfo); recursivelyTraverseMutationEffects(root, finishedWork); - currentHoistableRoot = hoistableRoot; + currentHoistableRoot = maybeNodes; commitReconciliationEffects(finishedWork); if ( flags & 4 && @@ -12243,6 +12190,7 @@ } needsFormReset && ((needsFormReset = !1), recursivelyResetForms(finishedWork)); + root.effectDuration += popNestedEffectDurations(hoistableRoot); break; case 4: flags = currentHoistableRoot; @@ -12253,6 +12201,13 @@ commitReconciliationEffects(finishedWork); currentHoistableRoot = flags; break; + case 12: + flags = pushNestedEffectDurations(); + recursivelyTraverseMutationEffects(root, finishedWork); + commitReconciliationEffects(finishedWork); + finishedWork.stateNode.effectDuration += + bubbleNestedEffectDurations(flags); + break; case 13: recursivelyTraverseMutationEffects(root, finishedWork); commitReconciliationEffects(finishedWork); @@ -12324,17 +12279,17 @@ if (null === current) { nextNode = root; try { - (currentResource = nextNode.stateNode), + (maybeNodes = nextNode.stateNode), i ? runWithFiberInDEV( nextNode, hideTextInstance, - currentResource + maybeNodes ) : runWithFiberInDEV( nextNode, unhideTextInstance, - currentResource, + maybeNodes, nextNode.memoizedProps ); } catch (error) { @@ -12425,23 +12380,11 @@ case 11: case 14: case 15: - if ((finishedWork.mode & ProfileMode) !== NoMode) - try { - startLayoutEffectTimer(), - commitHookEffectListUnmount( - Layout, - finishedWork, - finishedWork.return - ); - } finally { - recordLayoutEffectDuration(finishedWork); - } - else - commitHookEffectListUnmount( - Layout, - finishedWork, - finishedWork.return - ); + commitHookLayoutUnmountEffects( + finishedWork, + finishedWork.return, + Layout + ); recursivelyTraverseDisappearLayoutEffects(finishedWork); break; case 1: @@ -12541,14 +12484,16 @@ safelyAttachRef(finishedWork, finishedWork.return); break; case 12: - recursivelyTraverseReappearLayoutEffects( - finishedRoot, - finishedWork, - includeWorkInProgressEffects - ); if (includeWorkInProgressEffects && flags & 4) { - includeWorkInProgressEffects = - finishedWork.stateNode.effectDuration; + flags = pushNestedEffectDurations(); + recursivelyTraverseReappearLayoutEffects( + finishedRoot, + finishedWork, + includeWorkInProgressEffects + ); + includeWorkInProgressEffects = finishedWork.stateNode; + includeWorkInProgressEffects.effectDuration += + bubbleNestedEffectDurations(flags); try { runWithFiberInDEV( finishedWork, @@ -12556,26 +12501,17 @@ finishedWork, current, commitTime, - includeWorkInProgressEffects + includeWorkInProgressEffects.effectDuration ); } catch (error) { captureCommitPhaseError(finishedWork, finishedWork.return, error); } - finishedWork = finishedWork.return; - a: for (; null !== finishedWork; ) { - switch (finishedWork.tag) { - case 3: - finishedWork.stateNode.effectDuration += - includeWorkInProgressEffects; - break a; - case 12: - finishedWork.stateNode.effectDuration += - includeWorkInProgressEffects; - break a; - } - finishedWork = finishedWork.return; - } - } + } else + recursivelyTraverseReappearLayoutEffects( + finishedRoot, + finishedWork, + includeWorkInProgressEffects + ); break; case 13: recursivelyTraverseReappearLayoutEffects( @@ -12679,6 +12615,7 @@ commitHookPassiveMountEffects(finishedWork, Passive | HasEffect); break; case 3: + var prevEffectDuration = pushNestedEffectDurations(); recursivelyTraversePassiveMountEffects( finishedRoot, finishedWork, @@ -12686,23 +12623,28 @@ committedTransitions ); flags & 2048 && - ((finishedRoot = null), + ((committedLanes = null), null !== finishedWork.alternate && - (finishedRoot = finishedWork.alternate.memoizedState.cache), + (committedLanes = finishedWork.alternate.memoizedState.cache), (finishedWork = finishedWork.memoizedState.cache), - finishedWork !== finishedRoot && + finishedWork !== committedLanes && (retainCache(finishedWork), - null != finishedRoot && releaseCache(finishedRoot))); + null != committedLanes && releaseCache(committedLanes))); + finishedRoot.passiveEffectDuration += + popNestedEffectDurations(prevEffectDuration); break; case 12: - recursivelyTraversePassiveMountEffects( - finishedRoot, - finishedWork, - committedLanes, - committedTransitions - ); if (flags & 2048) { - finishedRoot = finishedWork.stateNode.passiveEffectDuration; + prevEffectDuration = pushNestedEffectDurations(); + recursivelyTraversePassiveMountEffects( + finishedRoot, + finishedWork, + committedLanes, + committedTransitions + ); + finishedRoot = finishedWork.stateNode; + finishedRoot.passiveEffectDuration += + bubbleNestedEffectDurations(prevEffectDuration); try { runWithFiberInDEV( finishedWork, @@ -12710,31 +12652,25 @@ finishedWork, finishedWork.alternate, commitTime, - finishedRoot + finishedRoot.passiveEffectDuration ); } catch (error) { captureCommitPhaseError(finishedWork, finishedWork.return, error); } - finishedWork = finishedWork.return; - a: for (; null !== finishedWork; ) { - switch (finishedWork.tag) { - case 3: - finishedWork.stateNode.passiveEffectDuration += finishedRoot; - break a; - case 12: - finishedWork.stateNode.passiveEffectDuration += finishedRoot; - break a; - } - finishedWork = finishedWork.return; - } - } + } else + recursivelyTraversePassiveMountEffects( + finishedRoot, + finishedWork, + committedLanes, + committedTransitions + ); break; case 23: break; case 22: - var _instance = finishedWork.stateNode; + prevEffectDuration = finishedWork.stateNode; null !== finishedWork.memoizedState - ? _instance._visibility & OffscreenPassiveEffectsConnected + ? prevEffectDuration._visibility & OffscreenPassiveEffectsConnected ? recursivelyTraversePassiveMountEffects( finishedRoot, finishedWork, @@ -12745,14 +12681,15 @@ finishedRoot, finishedWork ) - : _instance._visibility & OffscreenPassiveEffectsConnected + : prevEffectDuration._visibility & OffscreenPassiveEffectsConnected ? recursivelyTraversePassiveMountEffects( finishedRoot, finishedWork, committedLanes, committedTransitions ) - : ((_instance._visibility |= OffscreenPassiveEffectsConnected), + : ((prevEffectDuration._visibility |= + OffscreenPassiveEffectsConnected), recursivelyTraverseReconnectPassiveEffects( finishedRoot, finishedWork, @@ -13012,12 +12949,25 @@ Passive | HasEffect ); break; + case 3: + var prevEffectDuration = pushNestedEffectDurations(); + recursivelyTraversePassiveUnmountEffects(finishedWork); + finishedWork.stateNode.passiveEffectDuration += + popNestedEffectDurations(prevEffectDuration); + break; + case 12: + prevEffectDuration = pushNestedEffectDurations(); + recursivelyTraversePassiveUnmountEffects(finishedWork); + finishedWork.stateNode.passiveEffectDuration += + bubbleNestedEffectDurations(prevEffectDuration); + break; case 22: - var instance = finishedWork.stateNode; + prevEffectDuration = finishedWork.stateNode; null !== finishedWork.memoizedState && - instance._visibility & OffscreenPassiveEffectsConnected && + prevEffectDuration._visibility & OffscreenPassiveEffectsConnected && (null === finishedWork.return || 13 !== finishedWork.return.tag) - ? ((instance._visibility &= ~OffscreenPassiveEffectsConnected), + ? ((prevEffectDuration._visibility &= + ~OffscreenPassiveEffectsConnected), recursivelyTraverseDisconnectPassiveEffects(finishedWork)) : recursivelyTraversePassiveUnmountEffects(finishedWork); break; @@ -20173,7 +20123,7 @@ this.pooledCacheLanes = 0; this.formState = formState; this.incompleteTransitions = new Map(); - this.passiveEffectDuration = this.effectDuration = 0; + this.passiveEffectDuration = this.effectDuration = -0; this.memoizedUpdaters = new Set(); containerInfo = this.pendingUpdatersLaneMap = []; for (tag = 0; 31 > tag; tag++) containerInfo.push(new Set()); @@ -22247,10 +22197,9 @@ StrictEffectsMode = 16, NoStrictPassiveEffectsMode = 64, now = Scheduler.unstable_now, - commitTime = 0, - layoutEffectStartTime = -1, - profilerStartTime = -1, - passiveEffectStartTime = -1, + commitTime = -0, + profilerStartTime = -1.1, + profilerEffectDuration = -0, currentUpdateIsNested = !1, nestedUpdateScheduled = !1, ReactStrictModeWarnings = { @@ -24579,11 +24528,11 @@ }; (function () { var isomorphicReactPackageVersion = React.version; - if ("19.0.0-rc-a99d8e8d-20240916" !== isomorphicReactPackageVersion) + if ("19.0.0-rc-5dcb0097-20240918" !== isomorphicReactPackageVersion) throw Error( 'Incompatible React versions: The "react" and "react-dom" packages must have the exact same version. Instead got:\n - react: ' + (isomorphicReactPackageVersion + - "\n - react-dom: 19.0.0-rc-a99d8e8d-20240916\nLearn more: https://react.dev/warnings/version-mismatch") + "\n - react-dom: 19.0.0-rc-5dcb0097-20240918\nLearn more: https://react.dev/warnings/version-mismatch") ); })(); ("function" === typeof Map && @@ -24620,11 +24569,11 @@ !(function () { var internals = { bundleType: 1, - version: "19.0.0-rc-a99d8e8d-20240916", + version: "19.0.0-rc-5dcb0097-20240918", rendererPackageName: "react-dom", currentDispatcherRef: ReactSharedInternals, findFiberByHostInstance: getClosestInstanceFromNode, - reconcilerVersion: "19.0.0-rc-a99d8e8d-20240916" + reconcilerVersion: "19.0.0-rc-5dcb0097-20240918" }; internals.overrideHookState = overrideHookState; internals.overrideHookStateDeletePath = overrideHookStateDeletePath; @@ -25098,7 +25047,7 @@ exports.useFormStatus = function () { return resolveDispatcher().useHostTransitionStatus(); }; - exports.version = "19.0.0-rc-a99d8e8d-20240916"; + exports.version = "19.0.0-rc-5dcb0097-20240918"; "undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ && "function" === typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStop && diff --git a/packages/next/src/compiled/react-dom/cjs/react-dom-profiling.profiling.js b/packages/next/src/compiled/react-dom/cjs/react-dom-profiling.profiling.js index 73507283680be..7ecbfed14e24f 100644 --- a/packages/next/src/compiled/react-dom/cjs/react-dom-profiling.profiling.js +++ b/packages/next/src/compiled/react-dom/cjs/react-dom-profiling.profiling.js @@ -567,18 +567,6 @@ function markComponentRenderStopped() { "function" === typeof injectedProfilingHooks.markComponentRenderStopped && injectedProfilingHooks.markComponentRenderStopped(); } -function markComponentLayoutEffectUnmountStarted(fiber) { - null !== injectedProfilingHooks && - "function" === - typeof injectedProfilingHooks.markComponentLayoutEffectUnmountStarted && - injectedProfilingHooks.markComponentLayoutEffectUnmountStarted(fiber); -} -function markComponentLayoutEffectUnmountStopped() { - null !== injectedProfilingHooks && - "function" === - typeof injectedProfilingHooks.markComponentLayoutEffectUnmountStopped && - injectedProfilingHooks.markComponentLayoutEffectUnmountStopped(); -} function markRenderStarted(lanes) { null !== injectedProfilingHooks && "function" === typeof injectedProfilingHooks.markRenderStarted && @@ -2090,19 +2078,19 @@ function getTargetInstForChangeEvent(domEventName, targetInst) { } var isInputEventSupported = !1; if (canUseDOM) { - var JSCompiler_inline_result$jscomp$296; + var JSCompiler_inline_result$jscomp$295; if (canUseDOM) { - var isSupported$jscomp$inline_433 = "oninput" in document; - if (!isSupported$jscomp$inline_433) { - var element$jscomp$inline_434 = document.createElement("div"); - element$jscomp$inline_434.setAttribute("oninput", "return;"); - isSupported$jscomp$inline_433 = - "function" === typeof element$jscomp$inline_434.oninput; + var isSupported$jscomp$inline_432 = "oninput" in document; + if (!isSupported$jscomp$inline_432) { + var element$jscomp$inline_433 = document.createElement("div"); + element$jscomp$inline_433.setAttribute("oninput", "return;"); + isSupported$jscomp$inline_432 = + "function" === typeof element$jscomp$inline_433.oninput; } - JSCompiler_inline_result$jscomp$296 = isSupported$jscomp$inline_433; - } else JSCompiler_inline_result$jscomp$296 = !1; + JSCompiler_inline_result$jscomp$295 = isSupported$jscomp$inline_432; + } else JSCompiler_inline_result$jscomp$295 = !1; isInputEventSupported = - JSCompiler_inline_result$jscomp$296 && + JSCompiler_inline_result$jscomp$295 && (!document.documentMode || 9 < document.documentMode); } function stopWatchingForValueChange() { @@ -2217,41 +2205,36 @@ function containsNode(outerNode, innerNode) { : !1; } function getActiveElementDeep(containerInfo) { - var $jscomp$optchain$tmpm2116315595$1, $jscomp$nullish$tmp0; + var $jscomp$optchain$tmp264729013$1, $jscomp$nullish$tmp0; containerInfo = null != ($jscomp$nullish$tmp0 = null == containerInfo ? void 0 : null == - ($jscomp$optchain$tmpm2116315595$1 = containerInfo.ownerDocument) + ($jscomp$optchain$tmp264729013$1 = containerInfo.ownerDocument) ? void 0 - : $jscomp$optchain$tmpm2116315595$1.defaultView) + : $jscomp$optchain$tmp264729013$1.defaultView) ? $jscomp$nullish$tmp0 : window; for ( - $jscomp$optchain$tmpm2116315595$1 = getActiveElement( - containerInfo.document - ); - $jscomp$optchain$tmpm2116315595$1 instanceof - containerInfo.HTMLIFrameElement; + $jscomp$optchain$tmp264729013$1 = getActiveElement(containerInfo.document); + $jscomp$optchain$tmp264729013$1 instanceof containerInfo.HTMLIFrameElement; ) { try { var JSCompiler_inline_result = "string" === - typeof $jscomp$optchain$tmpm2116315595$1.contentWindow.location.href; + typeof $jscomp$optchain$tmp264729013$1.contentWindow.location.href; } catch (err) { JSCompiler_inline_result = !1; } if (JSCompiler_inline_result) - containerInfo = $jscomp$optchain$tmpm2116315595$1.contentWindow; + containerInfo = $jscomp$optchain$tmp264729013$1.contentWindow; else break; - $jscomp$optchain$tmpm2116315595$1 = getActiveElement( - containerInfo.document - ); + $jscomp$optchain$tmp264729013$1 = getActiveElement(containerInfo.document); } - return $jscomp$optchain$tmpm2116315595$1; + return $jscomp$optchain$tmp264729013$1; } function hasSelectionCapabilities(elem) { var nodeName = elem && elem.nodeName && elem.nodeName.toLowerCase(); @@ -2532,11 +2515,25 @@ function getRootForUpdatedFiber(sourceFiber) { } var emptyContextObject = {}, now = Scheduler.unstable_now, - commitTime = 0, - layoutEffectStartTime = -1, - profilerStartTime = -1, - passiveEffectStartTime = -1, - currentUpdateIsNested = !1, + commitTime = -0, + profilerStartTime = -1.1, + profilerEffectDuration = -0; +function pushNestedEffectDurations() { + var prevEffectDuration = profilerEffectDuration; + profilerEffectDuration = 0; + return prevEffectDuration; +} +function popNestedEffectDurations(prevEffectDuration) { + var elapsedTime = profilerEffectDuration; + profilerEffectDuration = prevEffectDuration; + return elapsedTime; +} +function bubbleNestedEffectDurations(prevEffectDuration) { + var elapsedTime = profilerEffectDuration; + profilerEffectDuration += prevEffectDuration; + return elapsedTime; +} +var currentUpdateIsNested = !1, nestedUpdateScheduled = !1; function startProfilerTimer(fiber) { profilerStartTime = now(); @@ -2557,44 +2554,15 @@ function stopProfilerTimerIfRunningAndRecordIncompleteDuration(fiber) { profilerStartTime = -1; } } -function recordLayoutEffectDuration(fiber) { - if (0 <= layoutEffectStartTime) { - var elapsedTime = now() - layoutEffectStartTime; - layoutEffectStartTime = -1; - for (fiber = fiber.return; null !== fiber; ) { - switch (fiber.tag) { - case 3: - fiber.stateNode.effectDuration += elapsedTime; - return; - case 12: - fiber.stateNode.effectDuration += elapsedTime; - return; - } - fiber = fiber.return; - } - } -} -function recordPassiveEffectDuration(fiber) { - if (0 <= passiveEffectStartTime) { - var elapsedTime = now() - passiveEffectStartTime; - passiveEffectStartTime = -1; - for (fiber = fiber.return; null !== fiber; ) { - switch (fiber.tag) { - case 3: - fiber = fiber.stateNode; - null !== fiber && (fiber.passiveEffectDuration += elapsedTime); - return; - case 12: - fiber = fiber.stateNode; - null !== fiber && (fiber.passiveEffectDuration += elapsedTime); - return; - } - fiber = fiber.return; - } +function recordEffectDuration() { + if (0 <= profilerStartTime) { + var elapsedTime = now() - profilerStartTime; + profilerStartTime = -1; + profilerEffectDuration += elapsedTime; } } -function startLayoutEffectTimer() { - layoutEffectStartTime = now(); +function startEffectTimer() { + profilerStartTime = now(); } function transferActualDuration(fiber) { for (var child = fiber.child; child; ) @@ -4086,7 +4054,7 @@ function updateReducerImpl(hook, current, reducer) { var newBaseQueueFirst = (baseFirst = null), newBaseQueueLast = null, update = current, - didReadFromEntangledAsyncAction$59 = !1; + didReadFromEntangledAsyncAction$57 = !1; do { var updateLane = update.lane & -536870913; if ( @@ -4107,11 +4075,11 @@ function updateReducerImpl(hook, current, reducer) { next: null }), updateLane === currentEntangledLane && - (didReadFromEntangledAsyncAction$59 = !0); + (didReadFromEntangledAsyncAction$57 = !0); else if ((renderLanes & revertLane) === revertLane) { update = update.next; revertLane === currentEntangledLane && - (didReadFromEntangledAsyncAction$59 = !0); + (didReadFromEntangledAsyncAction$57 = !0); continue; } else (updateLane = { @@ -4157,7 +4125,7 @@ function updateReducerImpl(hook, current, reducer) { if ( !objectIs(pendingQueue, hook.memoizedState) && ((didReceiveUpdate = !0), - didReadFromEntangledAsyncAction$59 && + didReadFromEntangledAsyncAction$57 && ((reducer = currentEntangledActionThenable), null !== reducer)) ) throw reducer; @@ -4355,8 +4323,8 @@ function runActionStateAction(actionQueue, node) { try { (prevTransition = action(prevState, payload)), handleActionReturnValue(actionQueue, node, prevTransition); - } catch (error$65) { - onActionError(actionQueue, node, error$65); + } catch (error$63) { + onActionError(actionQueue, node, error$63); } } function handleActionReturnValue(actionQueue, node, returnValue) { @@ -4771,10 +4739,10 @@ function refreshCache(fiber) { case 3: var lane = requestUpdateLane(); fiber = createUpdate(lane); - var root$68 = enqueueUpdate(provider, fiber, lane); - null !== root$68 && - (scheduleUpdateOnFiber(root$68, provider, lane), - entangleTransitions(root$68, provider, lane)); + var root$66 = enqueueUpdate(provider, fiber, lane); + null !== root$66 && + (scheduleUpdateOnFiber(root$66, provider, lane), + entangleTransitions(root$66, provider, lane)); provider = { cache: createCache() }; fiber.payload = provider; return; @@ -5293,9 +5261,9 @@ function resolveClassComponentProps(Component, baseProps) { } if ((Component = Component.defaultProps)) { newProps === baseProps && (newProps = assign({}, newProps)); - for (var propName$72 in Component) - void 0 === newProps[propName$72] && - (newProps[propName$72] = Component[propName$72]); + for (var propName$70 in Component) + void 0 === newProps[propName$70] && + (newProps[propName$70] = Component[propName$70]); } return newProps; } @@ -5341,9 +5309,9 @@ function logUncaughtError(root, errorInfo) { try { var onUncaughtError = root.onUncaughtError; onUncaughtError(errorInfo.value, { componentStack: errorInfo.stack }); - } catch (e$73) { + } catch (e$71) { setTimeout(function () { - throw e$73; + throw e$71; }); } } @@ -5354,9 +5322,9 @@ function logCaughtError(root, boundary, errorInfo) { componentStack: errorInfo.stack, errorBoundary: 1 === boundary.tag ? boundary.stateNode : null }); - } catch (e$74) { + } catch (e$72) { setTimeout(function () { - throw e$74; + throw e$72; }); } } @@ -6684,8 +6652,8 @@ function attemptEarlyBailoutIfNoScheduledUpdate( (workInProgress.flags |= 4); workInProgress.flags |= 2048; var stateNode = workInProgress.stateNode; - stateNode.effectDuration = 0; - stateNode.passiveEffectDuration = 0; + stateNode.effectDuration = -0; + stateNode.passiveEffectDuration = -0; break; case 13: stateNode = workInProgress.memoizedState; @@ -7124,8 +7092,8 @@ function beginWork(current, workInProgress, renderLanes) { (workInProgress.flags |= 4), (workInProgress.flags |= 2048), (lazyComponent = workInProgress.stateNode), - (lazyComponent.effectDuration = 0), - (lazyComponent.passiveEffectDuration = 0), + (lazyComponent.effectDuration = -0), + (lazyComponent.passiveEffectDuration = -0), reconcileChildren( current, workInProgress, @@ -7655,16 +7623,35 @@ function commitCallbacks(updateQueue, context) { ) callCallback(callbacks[updateQueue], context); } -function shouldProfile$1(current) { +function shouldProfile(current) { return 0 !== (current.mode & 2); } function commitHookLayoutEffects(finishedWork, hookFlags) { - shouldProfile$1(finishedWork) - ? (startLayoutEffectTimer(), + shouldProfile(finishedWork) + ? (startEffectTimer(), commitHookEffectListMount(hookFlags, finishedWork), - recordLayoutEffectDuration(finishedWork)) + recordEffectDuration()) : commitHookEffectListMount(hookFlags, finishedWork); } +function commitHookLayoutUnmountEffects( + finishedWork, + nearestMountedAncestor, + hookFlags +) { + shouldProfile(finishedWork) + ? (startEffectTimer(), + commitHookEffectListUnmount( + hookFlags, + finishedWork, + nearestMountedAncestor + ), + recordEffectDuration()) + : commitHookEffectListUnmount( + hookFlags, + finishedWork, + nearestMountedAncestor + ); +} function commitHookEffectListMount(flags, finishedWork) { try { var updateQueue = finishedWork.updateQueue, @@ -7714,7 +7701,7 @@ function commitHookEffectListMount(flags, finishedWork) { function commitHookEffectListUnmount( flags, finishedWork, - nearestMountedAncestor + nearestMountedAncestor$jscomp$0 ) { try { var updateQueue = finishedWork.updateQueue, @@ -7726,8 +7713,8 @@ function commitHookEffectListUnmount( if ((updateQueue.tag & flags) === flags) { var inst = updateQueue.inst, destroy = inst.destroy; - void 0 !== destroy && - ((inst.destroy = void 0), + if (void 0 !== destroy) { + inst.destroy = void 0; 0 !== (flags & 8) ? null !== injectedProfilingHooks && "function" === @@ -7736,14 +7723,34 @@ function commitHookEffectListUnmount( finishedWork ) : 0 !== (flags & 4) && - markComponentLayoutEffectUnmountStarted(finishedWork), - safelyCallDestroy(finishedWork, nearestMountedAncestor, destroy), + null !== injectedProfilingHooks && + "function" === + typeof injectedProfilingHooks.markComponentLayoutEffectUnmountStarted && + injectedProfilingHooks.markComponentLayoutEffectUnmountStarted( + finishedWork + ); + lastEffect = finishedWork; + var nearestMountedAncestor = nearestMountedAncestor$jscomp$0; + try { + destroy(); + } catch (error) { + captureCommitPhaseError( + lastEffect, + nearestMountedAncestor, + error + ); + } 0 !== (flags & 8) ? null !== injectedProfilingHooks && "function" === typeof injectedProfilingHooks.markComponentPassiveEffectUnmountStopped && injectedProfilingHooks.markComponentPassiveEffectUnmountStopped() - : 0 !== (flags & 4) && markComponentLayoutEffectUnmountStopped()); + : 0 !== (flags & 4) && + null !== injectedProfilingHooks && + "function" === + typeof injectedProfilingHooks.markComponentLayoutEffectUnmountStopped && + injectedProfilingHooks.markComponentLayoutEffectUnmountStopped(); + } } updateQueue = updateQueue.next; } while (updateQueue !== firstEffect); @@ -7753,10 +7760,10 @@ function commitHookEffectListUnmount( } } function commitHookPassiveMountEffects(finishedWork, hookFlags) { - shouldProfile$1(finishedWork) - ? ((passiveEffectStartTime = now()), + shouldProfile(finishedWork) + ? (startEffectTimer(), commitHookEffectListMount(hookFlags, finishedWork), - recordPassiveEffectDuration(finishedWork)) + recordEffectDuration()) : commitHookEffectListMount(hookFlags, finishedWork); } function commitHookPassiveUnmountEffects( @@ -7764,14 +7771,14 @@ function commitHookPassiveUnmountEffects( nearestMountedAncestor, hookFlags ) { - shouldProfile$1(finishedWork) - ? ((passiveEffectStartTime = now()), + shouldProfile(finishedWork) + ? (startEffectTimer(), commitHookEffectListUnmount( hookFlags, finishedWork, nearestMountedAncestor ), - recordPassiveEffectDuration(finishedWork)) + recordEffectDuration()) : commitHookEffectListUnmount( hookFlags, finishedWork, @@ -7799,19 +7806,19 @@ function safelyCallComponentWillUnmount( current.memoizedProps ); instance.state = current.memoizedState; - if (shouldProfile$1(current)) { - startLayoutEffectTimer(); + if (shouldProfile(current)) { + startEffectTimer(); try { instance.componentWillUnmount(); } catch (error) { captureCommitPhaseError(current, nearestMountedAncestor, error); } - recordLayoutEffectDuration(current); + recordEffectDuration(); } else try { instance.componentWillUnmount(); - } catch (error$120) { - captureCommitPhaseError(current, nearestMountedAncestor, error$120); + } catch (error$118) { + captureCommitPhaseError(current, nearestMountedAncestor, error$118); } } function safelyAttachRef(current, nearestMountedAncestor) { @@ -7829,11 +7836,11 @@ function safelyAttachRef(current, nearestMountedAncestor) { instanceToUse = instance; } if ("function" === typeof ref) - if (shouldProfile$1(current)) + if (shouldProfile(current)) try { - startLayoutEffectTimer(), (current.refCleanup = ref(instanceToUse)); + startEffectTimer(), (current.refCleanup = ref(instanceToUse)); } finally { - recordLayoutEffectDuration(current); + recordEffectDuration(); } else current.refCleanup = ref(instanceToUse); else ref.current = instanceToUse; @@ -7848,11 +7855,11 @@ function safelyDetachRef(current, nearestMountedAncestor) { if (null !== ref) if ("function" === typeof refCleanup) try { - if (shouldProfile$1(current)) + if (shouldProfile(current)) try { - startLayoutEffectTimer(), refCleanup(); + startEffectTimer(), refCleanup(); } finally { - recordLayoutEffectDuration(current); + recordEffectDuration(current); } else refCleanup(); } catch (error) { @@ -7864,25 +7871,18 @@ function safelyDetachRef(current, nearestMountedAncestor) { } else if ("function" === typeof ref) try { - if (shouldProfile$1(current)) + if (shouldProfile(current)) try { - startLayoutEffectTimer(), ref(null); + startEffectTimer(), ref(null); } finally { - recordLayoutEffectDuration(current); + recordEffectDuration(current); } else ref(null); - } catch (error$121) { - captureCommitPhaseError(current, nearestMountedAncestor, error$121); + } catch (error$119) { + captureCommitPhaseError(current, nearestMountedAncestor, error$119); } else ref.current = null; } -function safelyCallDestroy(current, nearestMountedAncestor, destroy) { - try { - destroy(); - } catch (error) { - captureCommitPhaseError(current, nearestMountedAncestor, error); - } -} function commitProfilerUpdate( finishedWork, current, @@ -8193,22 +8193,22 @@ function commitLayoutEffectOnFiber(finishedRoot, current, finishedWork) { recursivelyTraverseLayoutEffects(finishedRoot, finishedWork); if (flags & 4) if (((finishedRoot = finishedWork.stateNode), null === current)) - if (shouldProfile$1(finishedWork)) { - startLayoutEffectTimer(); + if (shouldProfile(finishedWork)) { + startEffectTimer(); try { finishedRoot.componentDidMount(); } catch (error) { captureCommitPhaseError(finishedWork, finishedWork.return, error); } - recordLayoutEffectDuration(finishedWork); + recordEffectDuration(); } else try { finishedRoot.componentDidMount(); - } catch (error$117) { + } catch (error$115) { captureCommitPhaseError( finishedWork, finishedWork.return, - error$117 + error$115 ); } else { @@ -8217,22 +8217,22 @@ function commitLayoutEffectOnFiber(finishedRoot, current, finishedWork) { current.memoizedProps ); current = current.memoizedState; - if (shouldProfile$1(finishedWork)) { - startLayoutEffectTimer(); + if (shouldProfile(finishedWork)) { + startEffectTimer(); try { finishedRoot.componentDidUpdate( prevProps, current, finishedRoot.__reactInternalSnapshotBeforeUpdate ); - } catch (error$118) { + } catch (error$116) { captureCommitPhaseError( finishedWork, finishedWork.return, - error$118 + error$116 ); } - recordLayoutEffectDuration(finishedWork); + recordEffectDuration(); } else try { finishedRoot.componentDidUpdate( @@ -8240,11 +8240,11 @@ function commitLayoutEffectOnFiber(finishedRoot, current, finishedWork) { current, finishedRoot.__reactInternalSnapshotBeforeUpdate ); - } catch (error$119) { + } catch (error$117) { captureCommitPhaseError( finishedWork, finishedWork.return, - error$119 + error$117 ); } } @@ -8252,24 +8252,26 @@ function commitLayoutEffectOnFiber(finishedRoot, current, finishedWork) { flags & 512 && safelyAttachRef(finishedWork, finishedWork.return); break; case 3: + current = pushNestedEffectDurations(); recursivelyTraverseLayoutEffects(finishedRoot, finishedWork); if (flags & 64 && ((flags = finishedWork.updateQueue), null !== flags)) { - finishedRoot = null; + prevProps = null; if (null !== finishedWork.child) switch (finishedWork.child.tag) { case 27: case 5: - finishedRoot = finishedWork.child.stateNode; + prevProps = finishedWork.child.stateNode; break; case 1: - finishedRoot = finishedWork.child.stateNode; + prevProps = finishedWork.child.stateNode; } try { - commitCallbacks(flags, finishedRoot); + commitCallbacks(flags, prevProps); } catch (error) { captureCommitPhaseError(finishedWork, finishedWork.return, error); } } + finishedRoot.effectDuration += popNestedEffectDurations(current); break; case 26: recursivelyTraverseLayoutEffects(finishedRoot, finishedWork); @@ -8282,25 +8284,18 @@ function commitLayoutEffectOnFiber(finishedRoot, current, finishedWork) { flags & 512 && safelyAttachRef(finishedWork, finishedWork.return); break; case 12: - recursivelyTraverseLayoutEffects(finishedRoot, finishedWork); - if (flags & 4) - a: for ( - flags = finishedWork.stateNode.effectDuration, - commitProfilerUpdate(finishedWork, current, commitTime, flags), - finishedWork = finishedWork.return; - null !== finishedWork; - - ) { - switch (finishedWork.tag) { - case 3: - finishedWork.stateNode.effectDuration += flags; - break a; - case 12: - finishedWork.stateNode.effectDuration += flags; - break a; - } - finishedWork = finishedWork.return; - } + flags & 4 + ? ((flags = pushNestedEffectDurations()), + recursivelyTraverseLayoutEffects(finishedRoot, finishedWork), + (finishedRoot = finishedWork.stateNode), + (finishedRoot.effectDuration += bubbleNestedEffectDurations(flags)), + commitProfilerUpdate( + finishedWork, + current, + commitTime, + finishedRoot.effectDuration + )) + : recursivelyTraverseLayoutEffects(finishedRoot, finishedWork); break; case 13: recursivelyTraverseLayoutEffects(finishedRoot, finishedWork); @@ -8416,7 +8411,7 @@ function commitDeletionEffectsOnFiber( safelyDetachRef(deletedFiber, nearestMountedAncestor); case 6: prevHostParentIsContainer = hostParent; - var prevHostParentIsContainer$129 = hostParentIsContainer; + var prevHostParentIsContainer$127 = hostParentIsContainer; hostParent = null; recursivelyTraverseDeletionEffects( finishedRoot, @@ -8424,7 +8419,7 @@ function commitDeletionEffectsOnFiber( deletedFiber ); hostParent = prevHostParentIsContainer; - hostParentIsContainer = prevHostParentIsContainer$129; + hostParentIsContainer = prevHostParentIsContainer$127; if (null !== hostParent) if (hostParentIsContainer) try { @@ -8483,47 +8478,10 @@ function commitDeletionEffectsOnFiber( case 11: case 14: case 15: - if ( - !offscreenSubtreeWasHidden && - ((prevHostParent = deletedFiber.updateQueue), - null !== prevHostParent && - ((prevHostParent = prevHostParent.lastEffect), - null !== prevHostParent)) - ) { - prevHostParentIsContainer = prevHostParent = prevHostParent.next; - do { - prevHostParentIsContainer$129 = prevHostParentIsContainer.tag; - var inst = prevHostParentIsContainer.inst, - destroy = inst.destroy; - void 0 !== destroy && - (0 !== (prevHostParentIsContainer$129 & 2) - ? ((inst.destroy = void 0), - safelyCallDestroy( - deletedFiber, - nearestMountedAncestor, - destroy - )) - : 0 !== (prevHostParentIsContainer$129 & 4) && - (markComponentLayoutEffectUnmountStarted(deletedFiber), - 0 !== (deletedFiber.mode & 2) - ? (startLayoutEffectTimer(), - (inst.destroy = void 0), - safelyCallDestroy( - deletedFiber, - nearestMountedAncestor, - destroy - ), - recordLayoutEffectDuration(deletedFiber)) - : ((inst.destroy = void 0), - safelyCallDestroy( - deletedFiber, - nearestMountedAncestor, - destroy - )), - markComponentLayoutEffectUnmountStopped())); - prevHostParentIsContainer = prevHostParentIsContainer.next; - } while (prevHostParentIsContainer !== prevHostParent); - } + offscreenSubtreeWasHidden || + commitHookEffectListUnmount(2, deletedFiber, nearestMountedAncestor); + offscreenSubtreeWasHidden || + commitHookLayoutUnmountEffects(deletedFiber, nearestMountedAncestor, 4); recursivelyTraverseDeletionEffects( finishedRoot, nearestMountedAncestor, @@ -8681,11 +8639,7 @@ function commitMutationEffectsOnFiber(finishedWork, root) { flags & 4 && (commitHookEffectListUnmount(3, finishedWork, finishedWork.return), commitHookEffectListMount(3, finishedWork), - 0 !== (finishedWork.mode & 2) - ? (startLayoutEffectTimer(), - commitHookEffectListUnmount(5, finishedWork, finishedWork.return), - recordLayoutEffectDuration(finishedWork)) - : commitHookEffectListUnmount(5, finishedWork, finishedWork.return)); + commitHookLayoutUnmountEffects(finishedWork, finishedWork.return, 5)); break; case 1: recursivelyTraverseMutationEffects(root, finishedWork); @@ -8710,55 +8664,56 @@ function commitMutationEffectsOnFiber(finishedWork, root) { flags & 512 && null !== current && safelyDetachRef(current, current.return); - if (flags & 4) { - var currentResource = null !== current ? current.memoizedState : null; - flags = finishedWork.memoizedState; - if (null === current) + if (flags & 4) + if ( + ((root = null !== current ? current.memoizedState : null), + (flags = finishedWork.memoizedState), + null === current) + ) if (null === flags) if (null === finishedWork.stateNode) { a: { flags = finishedWork.type; current = finishedWork.memoizedProps; - hoistableRoot = hoistableRoot.ownerDocument || hoistableRoot; + root = hoistableRoot.ownerDocument || hoistableRoot; b: switch (flags) { case "title": - currentResource = - hoistableRoot.getElementsByTagName("title")[0]; + hoistableRoot = root.getElementsByTagName("title")[0]; if ( - !currentResource || - currentResource[internalHoistableMarker] || - currentResource[internalInstanceKey] || + !hoistableRoot || + hoistableRoot[internalHoistableMarker] || + hoistableRoot[internalInstanceKey] || "http://www.w3.org/2000/svg" === - currentResource.namespaceURI || - currentResource.hasAttribute("itemprop") + hoistableRoot.namespaceURI || + hoistableRoot.hasAttribute("itemprop") ) - (currentResource = hoistableRoot.createElement(flags)), - hoistableRoot.head.insertBefore( - currentResource, - hoistableRoot.querySelector("head > title") + (hoistableRoot = root.createElement(flags)), + root.head.insertBefore( + hoistableRoot, + root.querySelector("head > title") ); - setInitialProperties(currentResource, flags, current); - currentResource[internalInstanceKey] = finishedWork; - markNodeAsHoistable(currentResource); - flags = currentResource; + setInitialProperties(hoistableRoot, flags, current); + hoistableRoot[internalInstanceKey] = finishedWork; + markNodeAsHoistable(hoistableRoot); + flags = hoistableRoot; break a; case "link": var maybeNodes = getHydratableHoistableCache( "link", "href", - hoistableRoot + root ).get(flags + (current.href || "")); if (maybeNodes) for (var i = 0; i < maybeNodes.length; i++) if ( - ((currentResource = maybeNodes[i]), - currentResource.getAttribute("href") === + ((hoistableRoot = maybeNodes[i]), + hoistableRoot.getAttribute("href") === (null == current.href ? null : current.href) && - currentResource.getAttribute("rel") === + hoistableRoot.getAttribute("rel") === (null == current.rel ? null : current.rel) && - currentResource.getAttribute("title") === + hoistableRoot.getAttribute("title") === (null == current.title ? null : current.title) && - currentResource.getAttribute("crossorigin") === + hoistableRoot.getAttribute("crossorigin") === (null == current.crossOrigin ? null : current.crossOrigin)) @@ -8766,36 +8721,36 @@ function commitMutationEffectsOnFiber(finishedWork, root) { maybeNodes.splice(i, 1); break b; } - currentResource = hoistableRoot.createElement(flags); - setInitialProperties(currentResource, flags, current); - hoistableRoot.head.appendChild(currentResource); + hoistableRoot = root.createElement(flags); + setInitialProperties(hoistableRoot, flags, current); + root.head.appendChild(hoistableRoot); break; case "meta": if ( (maybeNodes = getHydratableHoistableCache( "meta", "content", - hoistableRoot + root ).get(flags + (current.content || ""))) ) for (i = 0; i < maybeNodes.length; i++) if ( - ((currentResource = maybeNodes[i]), - currentResource.getAttribute("content") === + ((hoistableRoot = maybeNodes[i]), + hoistableRoot.getAttribute("content") === (null == current.content ? null : "" + current.content) && - currentResource.getAttribute("name") === + hoistableRoot.getAttribute("name") === (null == current.name ? null : current.name) && - currentResource.getAttribute("property") === + hoistableRoot.getAttribute("property") === (null == current.property ? null : current.property) && - currentResource.getAttribute("http-equiv") === + hoistableRoot.getAttribute("http-equiv") === (null == current.httpEquiv ? null : current.httpEquiv) && - currentResource.getAttribute("charset") === + hoistableRoot.getAttribute("charset") === (null == current.charSet ? null : current.charSet)) @@ -8803,16 +8758,16 @@ function commitMutationEffectsOnFiber(finishedWork, root) { maybeNodes.splice(i, 1); break b; } - currentResource = hoistableRoot.createElement(flags); - setInitialProperties(currentResource, flags, current); - hoistableRoot.head.appendChild(currentResource); + hoistableRoot = root.createElement(flags); + setInitialProperties(hoistableRoot, flags, current); + root.head.appendChild(hoistableRoot); break; default: throw Error(formatProdErrorMessage(468, flags)); } - currentResource[internalInstanceKey] = finishedWork; - markNodeAsHoistable(currentResource); - flags = currentResource; + hoistableRoot[internalInstanceKey] = finishedWork; + markNodeAsHoistable(hoistableRoot); + flags = hoistableRoot; } finishedWork.stateNode = flags; } else @@ -8828,12 +8783,12 @@ function commitMutationEffectsOnFiber(finishedWork, root) { finishedWork.memoizedProps ); else - currentResource !== flags - ? (null === currentResource + root !== flags + ? (null === root ? null !== current.stateNode && ((current = current.stateNode), current.parentNode.removeChild(current)) - : currentResource.count--, + : root.count--, null === flags ? mountHoistable( hoistableRoot, @@ -8852,12 +8807,11 @@ function commitMutationEffectsOnFiber(finishedWork, root) { finishedWork.memoizedProps, current.memoizedProps ); - } break; case 27: if (flags & 4 && null === finishedWork.alternate) { hoistableRoot = finishedWork.stateNode; - currentResource = finishedWork.memoizedProps; + maybeNodes = finishedWork.memoizedProps; try { for (var node = hoistableRoot.firstChild; node; ) { var nextNode = node.nextSibling, @@ -8878,9 +8832,9 @@ function commitMutationEffectsOnFiber(finishedWork, root) { ) hoistableRoot.removeAttributeNode(attributes[0]); - setInitialProperties(hoistableRoot, type, currentResource); + setInitialProperties(hoistableRoot, type, maybeNodes); hoistableRoot[internalInstanceKey] = finishedWork; - hoistableRoot[internalPropsKey] = currentResource; + hoistableRoot[internalPropsKey] = maybeNodes; } catch (error) { captureCommitPhaseError(finishedWork, finishedWork.return, error); } @@ -8892,20 +8846,20 @@ function commitMutationEffectsOnFiber(finishedWork, root) { null !== current && safelyDetachRef(current, current.return); if (finishedWork.flags & 32) { - hoistableRoot = finishedWork.stateNode; + root = finishedWork.stateNode; try { - setTextContent(hoistableRoot, ""); + setTextContent(root, ""); } catch (error) { captureCommitPhaseError(finishedWork, finishedWork.return, error); } } flags & 4 && null != finishedWork.stateNode && - ((hoistableRoot = finishedWork.memoizedProps), + ((root = finishedWork.memoizedProps), commitHostUpdate( finishedWork, - hoistableRoot, - null !== current ? current.memoizedProps : hoistableRoot + root, + null !== current ? current.memoizedProps : root )); flags & 1024 && (needsFormReset = !0); break; @@ -8925,11 +8879,12 @@ function commitMutationEffectsOnFiber(finishedWork, root) { } break; case 3: + hoistableRoot = pushNestedEffectDurations(); tagCaches = null; - hoistableRoot = currentHoistableRoot; + maybeNodes = currentHoistableRoot; currentHoistableRoot = getHoistableRoot(root.containerInfo); recursivelyTraverseMutationEffects(root, finishedWork); - currentHoistableRoot = hoistableRoot; + currentHoistableRoot = maybeNodes; commitReconciliationEffects(finishedWork); if (flags & 4 && null !== current && current.memoizedState.isDehydrated) try { @@ -8939,6 +8894,7 @@ function commitMutationEffectsOnFiber(finishedWork, root) { } needsFormReset && ((needsFormReset = !1), recursivelyResetForms(finishedWork)); + root.effectDuration += popNestedEffectDurations(hoistableRoot); break; case 4: flags = currentHoistableRoot; @@ -8949,6 +8905,13 @@ function commitMutationEffectsOnFiber(finishedWork, root) { commitReconciliationEffects(finishedWork); currentHoistableRoot = flags; break; + case 12: + flags = pushNestedEffectDurations(); + recursivelyTraverseMutationEffects(root, finishedWork); + commitReconciliationEffects(finishedWork); + finishedWork.stateNode.effectDuration += + bubbleNestedEffectDurations(flags); + break; case 13: recursivelyTraverseMutationEffects(root, finishedWork); commitReconciliationEffects(finishedWork); @@ -9000,22 +8963,20 @@ function commitMutationEffectsOnFiber(finishedWork, root) { nextNode = current = root; try { if (((hoistableRoot = nextNode.stateNode), node)) - (currentResource = hoistableRoot.style), - "function" === typeof currentResource.setProperty - ? currentResource.setProperty( - "display", - "none", - "important" - ) - : (currentResource.display = "none"); + (maybeNodes = hoistableRoot.style), + "function" === typeof maybeNodes.setProperty + ? maybeNodes.setProperty("display", "none", "important") + : (maybeNodes.display = "none"); else { - maybeNodes = nextNode.stateNode; - i = nextNode.memoizedProps.style; - var display = - void 0 !== i && null !== i && i.hasOwnProperty("display") - ? i.display - : null; - maybeNodes.style.display = + i = nextNode.stateNode; + var styleProp = nextNode.memoizedProps.style, + display = + void 0 !== styleProp && + null !== styleProp && + styleProp.hasOwnProperty("display") + ? styleProp.display + : null; + i.style.display = null == display || "boolean" === typeof display ? "" : ("" + display).trim(); @@ -9101,21 +9062,21 @@ function commitReconciliationEffects(finishedWork) { insertOrAppendPlacementNode(finishedWork, before, parent$jscomp$0); break; case 5: - var parent$122 = JSCompiler_inline_result.stateNode; + var parent$120 = JSCompiler_inline_result.stateNode; JSCompiler_inline_result.flags & 32 && - (setTextContent(parent$122, ""), + (setTextContent(parent$120, ""), (JSCompiler_inline_result.flags &= -33)); - var before$123 = getHostSibling(finishedWork); - insertOrAppendPlacementNode(finishedWork, before$123, parent$122); + var before$121 = getHostSibling(finishedWork); + insertOrAppendPlacementNode(finishedWork, before$121, parent$120); break; case 3: case 4: - var parent$124 = JSCompiler_inline_result.stateNode.containerInfo, - before$125 = getHostSibling(finishedWork); + var parent$122 = JSCompiler_inline_result.stateNode.containerInfo, + before$123 = getHostSibling(finishedWork); insertOrAppendPlacementNodeIntoContainer( finishedWork, - before$125, - parent$124 + before$123, + parent$122 ); break; default: @@ -9158,14 +9119,7 @@ function recursivelyTraverseDisappearLayoutEffects(parentFiber) { case 11: case 14: case 15: - if (0 !== (finishedWork.mode & 2)) - try { - startLayoutEffectTimer(), - commitHookEffectListUnmount(4, finishedWork, finishedWork.return); - } finally { - recordLayoutEffectDuration(finishedWork); - } - else commitHookEffectListUnmount(4, finishedWork, finishedWork.return); + commitHookLayoutUnmountEffects(finishedWork, finishedWork.return, 4); recursivelyTraverseDisappearLayoutEffects(finishedWork); break; case 1: @@ -9270,29 +9224,26 @@ function recursivelyTraverseReappearLayoutEffects( safelyAttachRef(finishedWork, finishedWork.return); break; case 12: - recursivelyTraverseReappearLayoutEffects( - finishedRoot, - finishedWork, - includeWorkInProgressEffects - ); - if (includeWorkInProgressEffects && flags & 4) - a: for ( - flags = finishedWork.stateNode.effectDuration, - commitProfilerUpdate(finishedWork, current, commitTime, flags), - finishedWork = finishedWork.return; - null !== finishedWork; - - ) { - switch (finishedWork.tag) { - case 3: - finishedWork.stateNode.effectDuration += flags; - break a; - case 12: - finishedWork.stateNode.effectDuration += flags; - break a; - } - finishedWork = finishedWork.return; - } + includeWorkInProgressEffects && flags & 4 + ? ((flags = pushNestedEffectDurations()), + recursivelyTraverseReappearLayoutEffects( + finishedRoot, + finishedWork, + includeWorkInProgressEffects + ), + (finishedRoot = finishedWork.stateNode), + (finishedRoot.effectDuration += bubbleNestedEffectDurations(flags)), + commitProfilerUpdate( + finishedWork, + current, + commitTime, + finishedRoot.effectDuration + )) + : recursivelyTraverseReappearLayoutEffects( + finishedRoot, + finishedWork, + includeWorkInProgressEffects + ); break; case 13: recursivelyTraverseReappearLayoutEffects( @@ -9381,6 +9332,7 @@ function commitPassiveMountOnFiber( flags & 2048 && commitHookPassiveMountEffects(finishedWork, 9); break; case 3: + var prevEffectDuration = pushNestedEffectDurations(); recursivelyTraversePassiveMountEffects( finishedRoot, finishedWork, @@ -9388,54 +9340,58 @@ function commitPassiveMountOnFiber( committedTransitions ); flags & 2048 && - ((finishedRoot = null), + ((committedLanes = null), null !== finishedWork.alternate && - (finishedRoot = finishedWork.alternate.memoizedState.cache), + (committedLanes = finishedWork.alternate.memoizedState.cache), (finishedWork = finishedWork.memoizedState.cache), - finishedWork !== finishedRoot && + finishedWork !== committedLanes && (finishedWork.refCount++, - null != finishedRoot && releaseCache(finishedRoot))); + null != committedLanes && releaseCache(committedLanes))); + finishedRoot.passiveEffectDuration += + popNestedEffectDurations(prevEffectDuration); break; case 12: - recursivelyTraversePassiveMountEffects( - finishedRoot, - finishedWork, - committedLanes, - committedTransitions - ); if (flags & 2048) { - finishedRoot = finishedWork.stateNode.passiveEffectDuration; + flags = pushNestedEffectDurations(); + recursivelyTraversePassiveMountEffects( + finishedRoot, + finishedWork, + committedLanes, + committedTransitions + ); + finishedRoot = finishedWork.stateNode; + finishedRoot.passiveEffectDuration += + bubbleNestedEffectDurations(flags); try { - var _finishedWork$memoize2 = finishedWork.memoizedProps, - id = _finishedWork$memoize2.id, - onPostCommit = _finishedWork$memoize2.onPostCommit, + prevEffectDuration = finishedWork.memoizedProps; + var id = prevEffectDuration.id, + onPostCommit = prevEffectDuration.onPostCommit, phase = null === finishedWork.alternate ? "mount" : "update"; currentUpdateIsNested && (phase = "nested-update"); "function" === typeof onPostCommit && - onPostCommit(id, phase, finishedRoot, commitTime); + onPostCommit( + id, + phase, + finishedRoot.passiveEffectDuration, + commitTime + ); } catch (error) { captureCommitPhaseError(finishedWork, finishedWork.return, error); } - finishedWork = finishedWork.return; - a: for (; null !== finishedWork; ) { - switch (finishedWork.tag) { - case 3: - finishedWork.stateNode.passiveEffectDuration += finishedRoot; - break a; - case 12: - finishedWork.stateNode.passiveEffectDuration += finishedRoot; - break a; - } - finishedWork = finishedWork.return; - } - } + } else + recursivelyTraversePassiveMountEffects( + finishedRoot, + finishedWork, + committedLanes, + committedTransitions + ); break; case 23: break; case 22: - _finishedWork$memoize2 = finishedWork.stateNode; + prevEffectDuration = finishedWork.stateNode; null !== finishedWork.memoizedState - ? _finishedWork$memoize2._visibility & 4 + ? prevEffectDuration._visibility & 4 ? recursivelyTraversePassiveMountEffects( finishedRoot, finishedWork, @@ -9443,14 +9399,14 @@ function commitPassiveMountOnFiber( committedTransitions ) : recursivelyTraverseAtomicPassiveEffects(finishedRoot, finishedWork) - : _finishedWork$memoize2._visibility & 4 + : prevEffectDuration._visibility & 4 ? recursivelyTraversePassiveMountEffects( finishedRoot, finishedWork, committedLanes, committedTransitions ) - : ((_finishedWork$memoize2._visibility |= 4), + : ((prevEffectDuration._visibility |= 4), recursivelyTraverseReconnectPassiveEffects( finishedRoot, finishedWork, @@ -9682,12 +9638,24 @@ function commitPassiveUnmountOnFiber(finishedWork) { finishedWork.flags & 2048 && commitHookPassiveUnmountEffects(finishedWork, finishedWork.return, 9); break; + case 3: + var prevEffectDuration = pushNestedEffectDurations(); + recursivelyTraversePassiveUnmountEffects(finishedWork); + finishedWork.stateNode.passiveEffectDuration += + popNestedEffectDurations(prevEffectDuration); + break; + case 12: + prevEffectDuration = pushNestedEffectDurations(); + recursivelyTraversePassiveUnmountEffects(finishedWork); + finishedWork.stateNode.passiveEffectDuration += + bubbleNestedEffectDurations(prevEffectDuration); + break; case 22: - var instance = finishedWork.stateNode; + prevEffectDuration = finishedWork.stateNode; null !== finishedWork.memoizedState && - instance._visibility & 4 && + prevEffectDuration._visibility & 4 && (null === finishedWork.return || 13 !== finishedWork.return.tag) - ? ((instance._visibility &= -5), + ? ((prevEffectDuration._visibility &= -5), recursivelyTraverseDisconnectPassiveEffects(finishedWork)) : recursivelyTraversePassiveUnmountEffects(finishedWork); break; @@ -10070,14 +10038,14 @@ function cutOffTailIfNeeded(renderState, hasRenderedATailFallback) { break; case "collapsed": lastTailNode = renderState.tail; - for (var lastTailNode$143 = null; null !== lastTailNode; ) - null !== lastTailNode.alternate && (lastTailNode$143 = lastTailNode), + for (var lastTailNode$142 = null; null !== lastTailNode; ) + null !== lastTailNode.alternate && (lastTailNode$142 = lastTailNode), (lastTailNode = lastTailNode.sibling); - null === lastTailNode$143 + null === lastTailNode$142 ? hasRenderedATailFallback || null === renderState.tail ? (renderState.tail = null) : (renderState.tail.sibling = null) - : (lastTailNode$143.sibling = null); + : (lastTailNode$142.sibling = null); } } function bubbleProperties(completedWork) { @@ -10089,53 +10057,53 @@ function bubbleProperties(completedWork) { if (didBailout) if (0 !== (completedWork.mode & 2)) { for ( - var treeBaseDuration$145 = completedWork.selfBaseDuration, - child$146 = completedWork.child; - null !== child$146; + var treeBaseDuration$144 = completedWork.selfBaseDuration, + child$145 = completedWork.child; + null !== child$145; ) - (newChildLanes |= child$146.lanes | child$146.childLanes), - (subtreeFlags |= child$146.subtreeFlags & 31457280), - (subtreeFlags |= child$146.flags & 31457280), - (treeBaseDuration$145 += child$146.treeBaseDuration), - (child$146 = child$146.sibling); - completedWork.treeBaseDuration = treeBaseDuration$145; + (newChildLanes |= child$145.lanes | child$145.childLanes), + (subtreeFlags |= child$145.subtreeFlags & 31457280), + (subtreeFlags |= child$145.flags & 31457280), + (treeBaseDuration$144 += child$145.treeBaseDuration), + (child$145 = child$145.sibling); + completedWork.treeBaseDuration = treeBaseDuration$144; } else for ( - treeBaseDuration$145 = completedWork.child; - null !== treeBaseDuration$145; + treeBaseDuration$144 = completedWork.child; + null !== treeBaseDuration$144; ) (newChildLanes |= - treeBaseDuration$145.lanes | treeBaseDuration$145.childLanes), - (subtreeFlags |= treeBaseDuration$145.subtreeFlags & 31457280), - (subtreeFlags |= treeBaseDuration$145.flags & 31457280), - (treeBaseDuration$145.return = completedWork), - (treeBaseDuration$145 = treeBaseDuration$145.sibling); + treeBaseDuration$144.lanes | treeBaseDuration$144.childLanes), + (subtreeFlags |= treeBaseDuration$144.subtreeFlags & 31457280), + (subtreeFlags |= treeBaseDuration$144.flags & 31457280), + (treeBaseDuration$144.return = completedWork), + (treeBaseDuration$144 = treeBaseDuration$144.sibling); else if (0 !== (completedWork.mode & 2)) { - treeBaseDuration$145 = completedWork.actualDuration; - child$146 = completedWork.selfBaseDuration; + treeBaseDuration$144 = completedWork.actualDuration; + child$145 = completedWork.selfBaseDuration; for (var child = completedWork.child; null !== child; ) (newChildLanes |= child.lanes | child.childLanes), (subtreeFlags |= child.subtreeFlags), (subtreeFlags |= child.flags), - (treeBaseDuration$145 += child.actualDuration), - (child$146 += child.treeBaseDuration), + (treeBaseDuration$144 += child.actualDuration), + (child$145 += child.treeBaseDuration), (child = child.sibling); - completedWork.actualDuration = treeBaseDuration$145; - completedWork.treeBaseDuration = child$146; + completedWork.actualDuration = treeBaseDuration$144; + completedWork.treeBaseDuration = child$145; } else for ( - treeBaseDuration$145 = completedWork.child; - null !== treeBaseDuration$145; + treeBaseDuration$144 = completedWork.child; + null !== treeBaseDuration$144; ) (newChildLanes |= - treeBaseDuration$145.lanes | treeBaseDuration$145.childLanes), - (subtreeFlags |= treeBaseDuration$145.subtreeFlags), - (subtreeFlags |= treeBaseDuration$145.flags), - (treeBaseDuration$145.return = completedWork), - (treeBaseDuration$145 = treeBaseDuration$145.sibling); + treeBaseDuration$144.lanes | treeBaseDuration$144.childLanes), + (subtreeFlags |= treeBaseDuration$144.subtreeFlags), + (subtreeFlags |= treeBaseDuration$144.flags), + (treeBaseDuration$144.return = completedWork), + (treeBaseDuration$144 = treeBaseDuration$144.sibling); completedWork.subtreeFlags |= subtreeFlags; completedWork.childLanes = newChildLanes; return didBailout; @@ -10428,11 +10396,11 @@ function completeWork(current, workInProgress, renderLanes) { null !== newProps.alternate.memoizedState && null !== newProps.alternate.memoizedState.cachePool && (type = newProps.alternate.memoizedState.cachePool.pool); - var cache$161 = null; + var cache$160 = null; null !== newProps.memoizedState && null !== newProps.memoizedState.cachePool && - (cache$161 = newProps.memoizedState.cachePool.pool); - cache$161 !== type && (newProps.flags |= 2048); + (cache$160 = newProps.memoizedState.cachePool.pool); + cache$160 !== type && (newProps.flags |= 2048); } renderLanes !== current && renderLanes && @@ -10462,8 +10430,8 @@ function completeWork(current, workInProgress, renderLanes) { type = workInProgress.memoizedState; if (null === type) return bubbleProperties(workInProgress), null; newProps = 0 !== (workInProgress.flags & 128); - cache$161 = type.rendering; - if (null === cache$161) + cache$160 = type.rendering; + if (null === cache$160) if (newProps) cutOffTailIfNeeded(type, !1); else { if ( @@ -10471,11 +10439,11 @@ function completeWork(current, workInProgress, renderLanes) { (null !== current && 0 !== (current.flags & 128)) ) for (current = workInProgress.child; null !== current; ) { - cache$161 = findFirstSuspended(current); - if (null !== cache$161) { + cache$160 = findFirstSuspended(current); + if (null !== cache$160) { workInProgress.flags |= 128; cutOffTailIfNeeded(type, !1); - current = cache$161.updateQueue; + current = cache$160.updateQueue; workInProgress.updateQueue = current; scheduleRetryEffect(workInProgress, current); workInProgress.subtreeFlags = 0; @@ -10500,7 +10468,7 @@ function completeWork(current, workInProgress, renderLanes) { } else { if (!newProps) - if (((current = findFirstSuspended(cache$161)), null !== current)) { + if (((current = findFirstSuspended(cache$160)), null !== current)) { if ( ((workInProgress.flags |= 128), (newProps = !0), @@ -10510,7 +10478,7 @@ function completeWork(current, workInProgress, renderLanes) { cutOffTailIfNeeded(type, !0), null === type.tail && "hidden" === type.tailMode && - !cache$161.alternate && + !cache$160.alternate && !isHydrating) ) return bubbleProperties(workInProgress), null; @@ -10523,13 +10491,13 @@ function completeWork(current, workInProgress, renderLanes) { cutOffTailIfNeeded(type, !1), (workInProgress.lanes = 4194304)); type.isBackwards - ? ((cache$161.sibling = workInProgress.child), - (workInProgress.child = cache$161)) + ? ((cache$160.sibling = workInProgress.child), + (workInProgress.child = cache$160)) : ((current = type.last), null !== current - ? (current.sibling = cache$161) - : (workInProgress.child = cache$161), - (type.last = cache$161)); + ? (current.sibling = cache$160) + : (workInProgress.child = cache$160), + (type.last = cache$160)); } if (null !== type.tail) return ( @@ -11324,8 +11292,8 @@ function renderRootSync(root, lanes) { } workLoopSync(); break; - } catch (thrownValue$176) { - handleThrow(root, thrownValue$176); + } catch (thrownValue$175) { + handleThrow(root, thrownValue$175); } while (1); lanes && root.shellSuspendCounter++; @@ -11445,8 +11413,8 @@ function renderRootConcurrent(root, lanes) { } workLoopConcurrent(); break; - } catch (thrownValue$178) { - handleThrow(root, thrownValue$178); + } catch (thrownValue$177) { + handleThrow(root, thrownValue$177); } while (1); resetContextDependencies(); @@ -11767,7 +11735,7 @@ function releaseRootPooledCache(root, remainingLanes) { } function flushPassiveEffects() { if (null !== rootWithPendingPassiveEffects) { - var root$182 = rootWithPendingPassiveEffects, + var root$181 = rootWithPendingPassiveEffects, remainingLanes = pendingPassiveEffectsRemainingLanes; pendingPassiveEffectsRemainingLanes = 0; var renderPriority = lanesToEventPriority(pendingPassiveEffectsLanes), @@ -11817,7 +11785,7 @@ function flushPassiveEffects() { } finally { (ReactDOMSharedInternals.p = previousPriority), (ReactSharedInternals.T = prevTransition), - releaseRootPooledCache(root$182, remainingLanes); + releaseRootPooledCache(root$181, remainingLanes); } } return !1; @@ -11983,14 +11951,14 @@ function flushSyncWorkAcrossRoots_impl(syncTransitionLanes, onlyLegacy) { isFlushingWork = !0; do { var didPerformSomeWork = !1; - for (var root$184 = firstScheduledRoot; null !== root$184; ) { + for (var root$183 = firstScheduledRoot; null !== root$183; ) { if (!onlyLegacy) if (0 !== syncTransitionLanes) { - var pendingLanes = root$184.pendingLanes; + var pendingLanes = root$183.pendingLanes; if (0 === pendingLanes) var JSCompiler_inline_result = 0; else { - var suspendedLanes = root$184.suspendedLanes, - pingedLanes = root$184.pingedLanes; + var suspendedLanes = root$183.suspendedLanes, + pingedLanes = root$183.pingedLanes; JSCompiler_inline_result = (1 << (31 - clz32(42 | syncTransitionLanes) + 1)) - 1; JSCompiler_inline_result &= @@ -12004,17 +11972,17 @@ function flushSyncWorkAcrossRoots_impl(syncTransitionLanes, onlyLegacy) { } 0 !== JSCompiler_inline_result && ((didPerformSomeWork = !0), - performSyncWorkOnRoot(root$184, JSCompiler_inline_result)); + performSyncWorkOnRoot(root$183, JSCompiler_inline_result)); } else (JSCompiler_inline_result = workInProgressRootRenderLanes), (JSCompiler_inline_result = getNextLanes( - root$184, - root$184 === workInProgressRoot ? JSCompiler_inline_result : 0 + root$183, + root$183 === workInProgressRoot ? JSCompiler_inline_result : 0 )), 0 !== (JSCompiler_inline_result & 3) && ((didPerformSomeWork = !0), - performSyncWorkOnRoot(root$184, JSCompiler_inline_result)); - root$184 = root$184.next; + performSyncWorkOnRoot(root$183, JSCompiler_inline_result)); + root$183 = root$183.next; } } while (didPerformSomeWork); isFlushingWork = !1; @@ -12224,20 +12192,20 @@ function extractEvents$1( } } for ( - var i$jscomp$inline_1500 = 0; - i$jscomp$inline_1500 < simpleEventPluginEvents.length; - i$jscomp$inline_1500++ + var i$jscomp$inline_1502 = 0; + i$jscomp$inline_1502 < simpleEventPluginEvents.length; + i$jscomp$inline_1502++ ) { - var eventName$jscomp$inline_1501 = - simpleEventPluginEvents[i$jscomp$inline_1500], - domEventName$jscomp$inline_1502 = - eventName$jscomp$inline_1501.toLowerCase(), - capitalizedEvent$jscomp$inline_1503 = - eventName$jscomp$inline_1501[0].toUpperCase() + - eventName$jscomp$inline_1501.slice(1); + var eventName$jscomp$inline_1503 = + simpleEventPluginEvents[i$jscomp$inline_1502], + domEventName$jscomp$inline_1504 = + eventName$jscomp$inline_1503.toLowerCase(), + capitalizedEvent$jscomp$inline_1505 = + eventName$jscomp$inline_1503[0].toUpperCase() + + eventName$jscomp$inline_1503.slice(1); registerSimpleEvent( - domEventName$jscomp$inline_1502, - "on" + capitalizedEvent$jscomp$inline_1503 + domEventName$jscomp$inline_1504, + "on" + capitalizedEvent$jscomp$inline_1505 ); } registerSimpleEvent(ANIMATION_END, "onAnimationEnd"); @@ -13420,34 +13388,34 @@ function setInitialProperties(domElement, tag, props) { defaultChecked = null; for (hasSrc in props) if (props.hasOwnProperty(hasSrc)) { - var propValue$198 = props[hasSrc]; - if (null != propValue$198) + var propValue$197 = props[hasSrc]; + if (null != propValue$197) switch (hasSrc) { case "name": - hasSrcSet = propValue$198; + hasSrcSet = propValue$197; break; case "type": - propValue = propValue$198; + propValue = propValue$197; break; case "checked": - checked = propValue$198; + checked = propValue$197; break; case "defaultChecked": - defaultChecked = propValue$198; + defaultChecked = propValue$197; break; case "value": - propKey = propValue$198; + propKey = propValue$197; break; case "defaultValue": - defaultValue = propValue$198; + defaultValue = propValue$197; break; case "children": case "dangerouslySetInnerHTML": - if (null != propValue$198) + if (null != propValue$197) throw Error(formatProdErrorMessage(137, tag)); break; default: - setProp(domElement, tag, hasSrc, propValue$198, props, null); + setProp(domElement, tag, hasSrc, propValue$197, props, null); } } initInput( @@ -13584,14 +13552,14 @@ function setInitialProperties(domElement, tag, props) { return; default: if (isCustomElement(tag)) { - for (propValue$198 in props) - props.hasOwnProperty(propValue$198) && - ((hasSrc = props[propValue$198]), + for (propValue$197 in props) + props.hasOwnProperty(propValue$197) && + ((hasSrc = props[propValue$197]), void 0 !== hasSrc && setPropOnCustomElement( domElement, tag, - propValue$198, + propValue$197, hasSrc, props, void 0 @@ -13639,14 +13607,14 @@ function updateProperties(domElement, tag, lastProps, nextProps) { setProp(domElement, tag, propKey, null, nextProps, lastProp); } } - for (var propKey$215 in nextProps) { - var propKey = nextProps[propKey$215]; - lastProp = lastProps[propKey$215]; + for (var propKey$214 in nextProps) { + var propKey = nextProps[propKey$214]; + lastProp = lastProps[propKey$214]; if ( - nextProps.hasOwnProperty(propKey$215) && + nextProps.hasOwnProperty(propKey$214) && (null != propKey || null != lastProp) ) - switch (propKey$215) { + switch (propKey$214) { case "type": type = propKey; break; @@ -13675,7 +13643,7 @@ function updateProperties(domElement, tag, lastProps, nextProps) { setProp( domElement, tag, - propKey$215, + propKey$214, propKey, nextProps, lastProp @@ -13694,7 +13662,7 @@ function updateProperties(domElement, tag, lastProps, nextProps) { ); return; case "select": - propKey = value = defaultValue = propKey$215 = null; + propKey = value = defaultValue = propKey$214 = null; for (type in lastProps) if ( ((lastDefaultValue = lastProps[type]), @@ -13725,7 +13693,7 @@ function updateProperties(domElement, tag, lastProps, nextProps) { ) switch (name) { case "value": - propKey$215 = type; + propKey$214 = type; break; case "defaultValue": defaultValue = type; @@ -13746,15 +13714,15 @@ function updateProperties(domElement, tag, lastProps, nextProps) { tag = defaultValue; lastProps = value; nextProps = propKey; - null != propKey$215 - ? updateOptions(domElement, !!lastProps, propKey$215, !1) + null != propKey$214 + ? updateOptions(domElement, !!lastProps, propKey$214, !1) : !!nextProps !== !!lastProps && (null != tag ? updateOptions(domElement, !!lastProps, tag, !0) : updateOptions(domElement, !!lastProps, lastProps ? [] : "", !1)); return; case "textarea": - propKey = propKey$215 = null; + propKey = propKey$214 = null; for (defaultValue in lastProps) if ( ((name = lastProps[defaultValue]), @@ -13778,7 +13746,7 @@ function updateProperties(domElement, tag, lastProps, nextProps) { ) switch (value) { case "value": - propKey$215 = name; + propKey$214 = name; break; case "defaultValue": propKey = name; @@ -13792,17 +13760,17 @@ function updateProperties(domElement, tag, lastProps, nextProps) { name !== type && setProp(domElement, tag, value, name, nextProps, type); } - updateTextarea(domElement, propKey$215, propKey); + updateTextarea(domElement, propKey$214, propKey); return; case "option": - for (var propKey$231 in lastProps) + for (var propKey$230 in lastProps) if ( - ((propKey$215 = lastProps[propKey$231]), - lastProps.hasOwnProperty(propKey$231) && - null != propKey$215 && - !nextProps.hasOwnProperty(propKey$231)) + ((propKey$214 = lastProps[propKey$230]), + lastProps.hasOwnProperty(propKey$230) && + null != propKey$214 && + !nextProps.hasOwnProperty(propKey$230)) ) - switch (propKey$231) { + switch (propKey$230) { case "selected": domElement.selected = !1; break; @@ -13810,33 +13778,33 @@ function updateProperties(domElement, tag, lastProps, nextProps) { setProp( domElement, tag, - propKey$231, + propKey$230, null, nextProps, - propKey$215 + propKey$214 ); } for (lastDefaultValue in nextProps) if ( - ((propKey$215 = nextProps[lastDefaultValue]), + ((propKey$214 = nextProps[lastDefaultValue]), (propKey = lastProps[lastDefaultValue]), nextProps.hasOwnProperty(lastDefaultValue) && - propKey$215 !== propKey && - (null != propKey$215 || null != propKey)) + propKey$214 !== propKey && + (null != propKey$214 || null != propKey)) ) switch (lastDefaultValue) { case "selected": domElement.selected = - propKey$215 && - "function" !== typeof propKey$215 && - "symbol" !== typeof propKey$215; + propKey$214 && + "function" !== typeof propKey$214 && + "symbol" !== typeof propKey$214; break; default: setProp( domElement, tag, lastDefaultValue, - propKey$215, + propKey$214, nextProps, propKey ); @@ -13857,24 +13825,24 @@ function updateProperties(domElement, tag, lastProps, nextProps) { case "track": case "wbr": case "menuitem": - for (var propKey$236 in lastProps) - (propKey$215 = lastProps[propKey$236]), - lastProps.hasOwnProperty(propKey$236) && - null != propKey$215 && - !nextProps.hasOwnProperty(propKey$236) && - setProp(domElement, tag, propKey$236, null, nextProps, propKey$215); + for (var propKey$235 in lastProps) + (propKey$214 = lastProps[propKey$235]), + lastProps.hasOwnProperty(propKey$235) && + null != propKey$214 && + !nextProps.hasOwnProperty(propKey$235) && + setProp(domElement, tag, propKey$235, null, nextProps, propKey$214); for (checked in nextProps) if ( - ((propKey$215 = nextProps[checked]), + ((propKey$214 = nextProps[checked]), (propKey = lastProps[checked]), nextProps.hasOwnProperty(checked) && - propKey$215 !== propKey && - (null != propKey$215 || null != propKey)) + propKey$214 !== propKey && + (null != propKey$214 || null != propKey)) ) switch (checked) { case "children": case "dangerouslySetInnerHTML": - if (null != propKey$215) + if (null != propKey$214) throw Error(formatProdErrorMessage(137, tag)); break; default: @@ -13882,7 +13850,7 @@ function updateProperties(domElement, tag, lastProps, nextProps) { domElement, tag, checked, - propKey$215, + propKey$214, nextProps, propKey ); @@ -13890,49 +13858,49 @@ function updateProperties(domElement, tag, lastProps, nextProps) { return; default: if (isCustomElement(tag)) { - for (var propKey$241 in lastProps) - (propKey$215 = lastProps[propKey$241]), - lastProps.hasOwnProperty(propKey$241) && - void 0 !== propKey$215 && - !nextProps.hasOwnProperty(propKey$241) && + for (var propKey$240 in lastProps) + (propKey$214 = lastProps[propKey$240]), + lastProps.hasOwnProperty(propKey$240) && + void 0 !== propKey$214 && + !nextProps.hasOwnProperty(propKey$240) && setPropOnCustomElement( domElement, tag, - propKey$241, + propKey$240, void 0, nextProps, - propKey$215 + propKey$214 ); for (defaultChecked in nextProps) - (propKey$215 = nextProps[defaultChecked]), + (propKey$214 = nextProps[defaultChecked]), (propKey = lastProps[defaultChecked]), !nextProps.hasOwnProperty(defaultChecked) || - propKey$215 === propKey || - (void 0 === propKey$215 && void 0 === propKey) || + propKey$214 === propKey || + (void 0 === propKey$214 && void 0 === propKey) || setPropOnCustomElement( domElement, tag, defaultChecked, - propKey$215, + propKey$214, nextProps, propKey ); return; } } - for (var propKey$246 in lastProps) - (propKey$215 = lastProps[propKey$246]), - lastProps.hasOwnProperty(propKey$246) && - null != propKey$215 && - !nextProps.hasOwnProperty(propKey$246) && - setProp(domElement, tag, propKey$246, null, nextProps, propKey$215); + for (var propKey$245 in lastProps) + (propKey$214 = lastProps[propKey$245]), + lastProps.hasOwnProperty(propKey$245) && + null != propKey$214 && + !nextProps.hasOwnProperty(propKey$245) && + setProp(domElement, tag, propKey$245, null, nextProps, propKey$214); for (lastProp in nextProps) - (propKey$215 = nextProps[lastProp]), + (propKey$214 = nextProps[lastProp]), (propKey = lastProps[lastProp]), !nextProps.hasOwnProperty(lastProp) || - propKey$215 === propKey || - (null == propKey$215 && null == propKey) || - setProp(domElement, tag, lastProp, propKey$215, nextProps, propKey); + propKey$214 === propKey || + (null == propKey$214 && null == propKey) || + setProp(domElement, tag, lastProp, propKey$214, nextProps, propKey); } var eventsEnabled = null, selectionInformation = null; @@ -14477,26 +14445,26 @@ function getResource(type, currentProps, pendingProps, currentResource) { "string" === typeof pendingProps.precedence ) { type = getStyleKey(pendingProps.href); - var styles$254 = getResourcesFromRoot( + var styles$253 = getResourcesFromRoot( JSCompiler_inline_result ).hoistableStyles, - resource$255 = styles$254.get(type); - resource$255 || + resource$254 = styles$253.get(type); + resource$254 || ((JSCompiler_inline_result = JSCompiler_inline_result.ownerDocument || JSCompiler_inline_result), - (resource$255 = { + (resource$254 = { type: "stylesheet", instance: null, count: 0, state: { loading: 0, preload: null } }), - styles$254.set(type, resource$255), - (styles$254 = JSCompiler_inline_result.querySelector( + styles$253.set(type, resource$254), + (styles$253 = JSCompiler_inline_result.querySelector( getStylesheetSelectorFromKey(type) )) && - !styles$254._p && - ((resource$255.instance = styles$254), - (resource$255.state.loading = 5)), + !styles$253._p && + ((resource$254.instance = styles$253), + (resource$254.state.loading = 5)), preloadPropsMap.has(type) || ((pendingProps = { rel: "preload", @@ -14509,16 +14477,16 @@ function getResource(type, currentProps, pendingProps, currentResource) { referrerPolicy: pendingProps.referrerPolicy }), preloadPropsMap.set(type, pendingProps), - styles$254 || + styles$253 || preloadStylesheet( JSCompiler_inline_result, type, pendingProps, - resource$255.state + resource$254.state ))); if (currentProps && null === currentResource) throw Error(formatProdErrorMessage(528, "")); - return resource$255; + return resource$254; } if (currentProps && null !== currentResource) throw Error(formatProdErrorMessage(529, "")); @@ -14615,37 +14583,37 @@ function acquireResource(hoistableRoot, resource, props) { return (resource.instance = instance); case "stylesheet": styleProps = getStyleKey(props.href); - var instance$260 = hoistableRoot.querySelector( + var instance$259 = hoistableRoot.querySelector( getStylesheetSelectorFromKey(styleProps) ); - if (instance$260) + if (instance$259) return ( (resource.state.loading |= 4), - (resource.instance = instance$260), - markNodeAsHoistable(instance$260), - instance$260 + (resource.instance = instance$259), + markNodeAsHoistable(instance$259), + instance$259 ); instance = stylesheetPropsFromRawProps(props); (styleProps = preloadPropsMap.get(styleProps)) && adoptPreloadPropsForStylesheet(instance, styleProps); - instance$260 = ( + instance$259 = ( hoistableRoot.ownerDocument || hoistableRoot ).createElement("link"); - markNodeAsHoistable(instance$260); - var linkInstance = instance$260; + markNodeAsHoistable(instance$259); + var linkInstance = instance$259; linkInstance._p = new Promise(function (resolve, reject) { linkInstance.onload = resolve; linkInstance.onerror = reject; }); - setInitialProperties(instance$260, "link", instance); + setInitialProperties(instance$259, "link", instance); resource.state.loading |= 4; - insertStylesheet(instance$260, props.precedence, hoistableRoot); - return (resource.instance = instance$260); + insertStylesheet(instance$259, props.precedence, hoistableRoot); + return (resource.instance = instance$259); case "script": - instance$260 = getScriptKey(props.src); + instance$259 = getScriptKey(props.src); if ( (styleProps = hoistableRoot.querySelector( - getScriptSelectorFromKey(instance$260) + getScriptSelectorFromKey(instance$259) )) ) return ( @@ -14654,7 +14622,7 @@ function acquireResource(hoistableRoot, resource, props) { styleProps ); instance = props; - if ((styleProps = preloadPropsMap.get(instance$260))) + if ((styleProps = preloadPropsMap.get(instance$259))) (instance = assign({}, props)), adoptPreloadPropsForScript(instance, styleProps); hoistableRoot = hoistableRoot.ownerDocument || hoistableRoot; @@ -14992,7 +14960,7 @@ function FiberRootNode( this.pooledCacheLanes = 0; this.formState = formState; this.incompleteTransitions = new Map(); - this.passiveEffectDuration = this.effectDuration = 0; + this.passiveEffectDuration = this.effectDuration = -0; this.memoizedUpdaters = new Set(); containerInfo = this.pendingUpdatersLaneMap = []; for (tag = 0; 31 > tag; tag++) containerInfo.push(new Set()); @@ -15697,16 +15665,16 @@ ReactDOMHydrationRoot.prototype.unstable_scheduleHydration = function (target) { 0 === i && attemptExplicitHydrationTarget(target); } }; -var isomorphicReactPackageVersion$jscomp$inline_1749 = React.version; +var isomorphicReactPackageVersion$jscomp$inline_1751 = React.version; if ( - "19.0.0-rc-a99d8e8d-20240916" !== - isomorphicReactPackageVersion$jscomp$inline_1749 + "19.0.0-rc-5dcb0097-20240918" !== + isomorphicReactPackageVersion$jscomp$inline_1751 ) throw Error( formatProdErrorMessage( 527, - isomorphicReactPackageVersion$jscomp$inline_1749, - "19.0.0-rc-a99d8e8d-20240916" + isomorphicReactPackageVersion$jscomp$inline_1751, + "19.0.0-rc-5dcb0097-20240918" ) ); ReactDOMSharedInternals.findDOMNode = function (componentOrElement) { @@ -15726,18 +15694,18 @@ ReactDOMSharedInternals.findDOMNode = function (componentOrElement) { null === componentOrElement ? null : componentOrElement.stateNode; return componentOrElement; }; -var internals$jscomp$inline_1756 = { +var internals$jscomp$inline_1758 = { bundleType: 0, - version: "19.0.0-rc-a99d8e8d-20240916", + version: "19.0.0-rc-5dcb0097-20240918", rendererPackageName: "react-dom", currentDispatcherRef: ReactSharedInternals, findFiberByHostInstance: getClosestInstanceFromNode, - reconcilerVersion: "19.0.0-rc-a99d8e8d-20240916", + reconcilerVersion: "19.0.0-rc-5dcb0097-20240918", getLaneLabelMap: function () { for ( - var map = new Map(), lane = 1, index$277 = 0; - 31 > index$277; - index$277++ + var map = new Map(), lane = 1, index$276 = 0; + 31 > index$276; + index$276++ ) { var label = getLabelForLane(lane); map.set(lane, label); @@ -15750,16 +15718,16 @@ var internals$jscomp$inline_1756 = { } }; if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) { - var hook$jscomp$inline_2180 = __REACT_DEVTOOLS_GLOBAL_HOOK__; + var hook$jscomp$inline_2182 = __REACT_DEVTOOLS_GLOBAL_HOOK__; if ( - !hook$jscomp$inline_2180.isDisabled && - hook$jscomp$inline_2180.supportsFiber + !hook$jscomp$inline_2182.isDisabled && + hook$jscomp$inline_2182.supportsFiber ) try { - (rendererID = hook$jscomp$inline_2180.inject( - internals$jscomp$inline_1756 + (rendererID = hook$jscomp$inline_2182.inject( + internals$jscomp$inline_1758 )), - (injectedHook = hook$jscomp$inline_2180); + (injectedHook = hook$jscomp$inline_2182); } catch (err) {} } function noop() {} @@ -16012,7 +15980,7 @@ exports.useFormState = function (action, initialState, permalink) { exports.useFormStatus = function () { return ReactSharedInternals.H.useHostTransitionStatus(); }; -exports.version = "19.0.0-rc-a99d8e8d-20240916"; +exports.version = "19.0.0-rc-5dcb0097-20240918"; "undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ && "function" === typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStop && diff --git a/packages/next/src/compiled/react-dom/cjs/react-dom-server-legacy.browser.development.js b/packages/next/src/compiled/react-dom/cjs/react-dom-server-legacy.browser.development.js index ef69f21ae22f8..ceede0e90b9b8 100644 --- a/packages/next/src/compiled/react-dom/cjs/react-dom-server-legacy.browser.development.js +++ b/packages/next/src/compiled/react-dom/cjs/react-dom-server-legacy.browser.development.js @@ -8565,5 +8565,5 @@ 'The server used "renderToString" which does not support Suspense. If you intended for this Suspense boundary to render the fallback content on the server consider throwing an Error somewhere within the Suspense boundary. If you intended to have the server wait for the suspended component please switch to "renderToReadableStream" which supports Suspense on the server' ); }; - exports.version = "19.0.0-rc-a99d8e8d-20240916"; + exports.version = "19.0.0-rc-5dcb0097-20240918"; })(); diff --git a/packages/next/src/compiled/react-dom/cjs/react-dom-server-legacy.browser.production.js b/packages/next/src/compiled/react-dom/cjs/react-dom-server-legacy.browser.production.js index 0d4122e22ed50..e94c8e0a3b691 100644 --- a/packages/next/src/compiled/react-dom/cjs/react-dom-server-legacy.browser.production.js +++ b/packages/next/src/compiled/react-dom/cjs/react-dom-server-legacy.browser.production.js @@ -5621,4 +5621,4 @@ exports.renderToString = function (children, options) { 'The server used "renderToString" which does not support Suspense. If you intended for this Suspense boundary to render the fallback content on the server consider throwing an Error somewhere within the Suspense boundary. If you intended to have the server wait for the suspended component please switch to "renderToReadableStream" which supports Suspense on the server' ); }; -exports.version = "19.0.0-rc-a99d8e8d-20240916"; +exports.version = "19.0.0-rc-5dcb0097-20240918"; diff --git a/packages/next/src/compiled/react-dom/cjs/react-dom-server-legacy.node.development.js b/packages/next/src/compiled/react-dom/cjs/react-dom-server-legacy.node.development.js index 257846958f188..a752682993df2 100644 --- a/packages/next/src/compiled/react-dom/cjs/react-dom-server-legacy.node.development.js +++ b/packages/next/src/compiled/react-dom/cjs/react-dom-server-legacy.node.development.js @@ -8565,5 +8565,5 @@ 'The server used "renderToString" which does not support Suspense. If you intended for this Suspense boundary to render the fallback content on the server consider throwing an Error somewhere within the Suspense boundary. If you intended to have the server wait for the suspended component please switch to "renderToPipeableStream" which supports Suspense on the server' ); }; - exports.version = "19.0.0-rc-a99d8e8d-20240916"; + exports.version = "19.0.0-rc-5dcb0097-20240918"; })(); diff --git a/packages/next/src/compiled/react-dom/cjs/react-dom-server-legacy.node.production.js b/packages/next/src/compiled/react-dom/cjs/react-dom-server-legacy.node.production.js index 509bfda647e13..3d4d5380383d0 100644 --- a/packages/next/src/compiled/react-dom/cjs/react-dom-server-legacy.node.production.js +++ b/packages/next/src/compiled/react-dom/cjs/react-dom-server-legacy.node.production.js @@ -5699,4 +5699,4 @@ exports.renderToString = function (children, options) { 'The server used "renderToString" which does not support Suspense. If you intended for this Suspense boundary to render the fallback content on the server consider throwing an Error somewhere within the Suspense boundary. If you intended to have the server wait for the suspended component please switch to "renderToPipeableStream" which supports Suspense on the server' ); }; -exports.version = "19.0.0-rc-a99d8e8d-20240916"; +exports.version = "19.0.0-rc-5dcb0097-20240918"; diff --git a/packages/next/src/compiled/react-dom/cjs/react-dom-server.browser.development.js b/packages/next/src/compiled/react-dom/cjs/react-dom-server.browser.development.js index 79a0fc5e98212..6c8ee96bc883e 100644 --- a/packages/next/src/compiled/react-dom/cjs/react-dom-server.browser.development.js +++ b/packages/next/src/compiled/react-dom/cjs/react-dom-server.browser.development.js @@ -8752,11 +8752,11 @@ didWarnAboutMaps = !1; (function () { var isomorphicReactPackageVersion = React.version; - if ("19.0.0-rc-a99d8e8d-20240916" !== isomorphicReactPackageVersion) + if ("19.0.0-rc-5dcb0097-20240918" !== isomorphicReactPackageVersion) throw Error( 'Incompatible React versions: The "react" and "react-dom" packages must have the exact same version. Instead got:\n - react: ' + (isomorphicReactPackageVersion + - "\n - react-dom: 19.0.0-rc-a99d8e8d-20240916\nLearn more: https://react.dev/warnings/version-mismatch") + "\n - react-dom: 19.0.0-rc-5dcb0097-20240918\nLearn more: https://react.dev/warnings/version-mismatch") ); })(); exports.renderToReadableStream = function (children, options) { @@ -8849,5 +8849,5 @@ startWork(request$jscomp$0); }); }; - exports.version = "19.0.0-rc-a99d8e8d-20240916"; + exports.version = "19.0.0-rc-5dcb0097-20240918"; })(); diff --git a/packages/next/src/compiled/react-dom/cjs/react-dom-server.browser.production.js b/packages/next/src/compiled/react-dom/cjs/react-dom-server.browser.production.js index c2d11058cd229..51578fd4b931c 100644 --- a/packages/next/src/compiled/react-dom/cjs/react-dom-server.browser.production.js +++ b/packages/next/src/compiled/react-dom/cjs/react-dom-server.browser.production.js @@ -5910,14 +5910,14 @@ function abort(request, reason) { } var isomorphicReactPackageVersion$jscomp$inline_731 = React.version; if ( - "19.0.0-rc-a99d8e8d-20240916" !== + "19.0.0-rc-5dcb0097-20240918" !== isomorphicReactPackageVersion$jscomp$inline_731 ) throw Error( formatProdErrorMessage( 527, isomorphicReactPackageVersion$jscomp$inline_731, - "19.0.0-rc-a99d8e8d-20240916" + "19.0.0-rc-5dcb0097-20240918" ) ); exports.renderToReadableStream = function (children, options) { @@ -6006,4 +6006,4 @@ exports.renderToReadableStream = function (children, options) { startWork(request); }); }; -exports.version = "19.0.0-rc-a99d8e8d-20240916"; +exports.version = "19.0.0-rc-5dcb0097-20240918"; diff --git a/packages/next/src/compiled/react-dom/cjs/react-dom-server.bun.production.js b/packages/next/src/compiled/react-dom/cjs/react-dom-server.bun.production.js index e23385cce7a7c..347cf72d4c0d0 100644 --- a/packages/next/src/compiled/react-dom/cjs/react-dom-server.bun.production.js +++ b/packages/next/src/compiled/react-dom/cjs/react-dom-server.bun.production.js @@ -5594,13 +5594,13 @@ function abort(request, reason) { } var isomorphicReactPackageVersion$jscomp$inline_735 = React.version; if ( - "19.0.0-rc-a99d8e8d-20240916" !== + "19.0.0-rc-5dcb0097-20240918" !== isomorphicReactPackageVersion$jscomp$inline_735 ) throw Error( 'Incompatible React versions: The "react" and "react-dom" packages must have the exact same version. Instead got:\n - react: ' + (isomorphicReactPackageVersion$jscomp$inline_735 + - "\n - react-dom: 19.0.0-rc-a99d8e8d-20240916\nLearn more: https://react.dev/warnings/version-mismatch") + "\n - react-dom: 19.0.0-rc-5dcb0097-20240918\nLearn more: https://react.dev/warnings/version-mismatch") ); exports.renderToReadableStream = function (children, options) { return new Promise(function (resolve, reject) { @@ -5688,4 +5688,4 @@ exports.renderToReadableStream = function (children, options) { startWork(request); }); }; -exports.version = "19.0.0-rc-a99d8e8d-20240916"; +exports.version = "19.0.0-rc-5dcb0097-20240918"; diff --git a/packages/next/src/compiled/react-dom/cjs/react-dom-server.edge.development.js b/packages/next/src/compiled/react-dom/cjs/react-dom-server.edge.development.js index bee14dae8eed3..9ed2251cdc8b7 100644 --- a/packages/next/src/compiled/react-dom/cjs/react-dom-server.edge.development.js +++ b/packages/next/src/compiled/react-dom/cjs/react-dom-server.edge.development.js @@ -8771,11 +8771,11 @@ didWarnAboutMaps = !1; (function () { var isomorphicReactPackageVersion = React.version; - if ("19.0.0-rc-a99d8e8d-20240916" !== isomorphicReactPackageVersion) + if ("19.0.0-rc-5dcb0097-20240918" !== isomorphicReactPackageVersion) throw Error( 'Incompatible React versions: The "react" and "react-dom" packages must have the exact same version. Instead got:\n - react: ' + (isomorphicReactPackageVersion + - "\n - react-dom: 19.0.0-rc-a99d8e8d-20240916\nLearn more: https://react.dev/warnings/version-mismatch") + "\n - react-dom: 19.0.0-rc-5dcb0097-20240918\nLearn more: https://react.dev/warnings/version-mismatch") ); })(); exports.renderToReadableStream = function (children, options) { @@ -8879,5 +8879,5 @@ const setTimeoutOrImmediate = ? globalThis['set' + 'Immediate'] : setTimeout; - exports.version = "19.0.0-rc-a99d8e8d-20240916"; + exports.version = "19.0.0-rc-5dcb0097-20240918"; })(); diff --git a/packages/next/src/compiled/react-dom/cjs/react-dom-server.edge.production.js b/packages/next/src/compiled/react-dom/cjs/react-dom-server.edge.production.js index 2ce3474fdba42..24713e50e373e 100644 --- a/packages/next/src/compiled/react-dom/cjs/react-dom-server.edge.production.js +++ b/packages/next/src/compiled/react-dom/cjs/react-dom-server.edge.production.js @@ -6004,13 +6004,13 @@ function abort(request, reason) { } var isomorphicReactPackageVersion$jscomp$inline_739 = React.version; if ( - "19.0.0-rc-a99d8e8d-20240916" !== + "19.0.0-rc-5dcb0097-20240918" !== isomorphicReactPackageVersion$jscomp$inline_739 ) throw Error( 'Incompatible React versions: The "react" and "react-dom" packages must have the exact same version. Instead got:\n - react: ' + (isomorphicReactPackageVersion$jscomp$inline_739 + - "\n - react-dom: 19.0.0-rc-a99d8e8d-20240916\nLearn more: https://react.dev/warnings/version-mismatch") + "\n - react-dom: 19.0.0-rc-5dcb0097-20240918\nLearn more: https://react.dev/warnings/version-mismatch") ); exports.renderToReadableStream = function (children, options) { return new Promise(function (resolve, reject) { @@ -6109,4 +6109,4 @@ const setTimeoutOrImmediate = ? globalThis['set' + 'Immediate'] : setTimeout; -exports.version = "19.0.0-rc-a99d8e8d-20240916"; +exports.version = "19.0.0-rc-5dcb0097-20240918"; diff --git a/packages/next/src/compiled/react-dom/cjs/react-dom-server.node.development.js b/packages/next/src/compiled/react-dom/cjs/react-dom-server.node.development.js index d6dac12aad8db..b1e8253103fc1 100644 --- a/packages/next/src/compiled/react-dom/cjs/react-dom-server.node.development.js +++ b/packages/next/src/compiled/react-dom/cjs/react-dom-server.node.development.js @@ -8622,11 +8622,11 @@ didWarnAboutMaps = !1; (function () { var isomorphicReactPackageVersion = React.version; - if ("19.0.0-rc-a99d8e8d-20240916" !== isomorphicReactPackageVersion) + if ("19.0.0-rc-5dcb0097-20240918" !== isomorphicReactPackageVersion) throw Error( 'Incompatible React versions: The "react" and "react-dom" packages must have the exact same version. Instead got:\n - react: ' + (isomorphicReactPackageVersion + - "\n - react-dom: 19.0.0-rc-a99d8e8d-20240916\nLearn more: https://react.dev/warnings/version-mismatch") + "\n - react-dom: 19.0.0-rc-5dcb0097-20240918\nLearn more: https://react.dev/warnings/version-mismatch") ); })(); exports.renderToPipeableStream = function (children, options) { @@ -8668,5 +8668,5 @@ } }; }; - exports.version = "19.0.0-rc-a99d8e8d-20240916"; + exports.version = "19.0.0-rc-5dcb0097-20240918"; })(); diff --git a/packages/next/src/compiled/react-dom/cjs/react-dom-server.node.production.js b/packages/next/src/compiled/react-dom/cjs/react-dom-server.node.production.js index 1c7bc89168b9c..5184a0bd27781 100644 --- a/packages/next/src/compiled/react-dom/cjs/react-dom-server.node.production.js +++ b/packages/next/src/compiled/react-dom/cjs/react-dom-server.node.production.js @@ -5626,13 +5626,13 @@ function abort(request, reason) { } var isomorphicReactPackageVersion$jscomp$inline_762 = React.version; if ( - "19.0.0-rc-a99d8e8d-20240916" !== + "19.0.0-rc-5dcb0097-20240918" !== isomorphicReactPackageVersion$jscomp$inline_762 ) throw Error( 'Incompatible React versions: The "react" and "react-dom" packages must have the exact same version. Instead got:\n - react: ' + (isomorphicReactPackageVersion$jscomp$inline_762 + - "\n - react-dom: 19.0.0-rc-a99d8e8d-20240916\nLearn more: https://react.dev/warnings/version-mismatch") + "\n - react-dom: 19.0.0-rc-5dcb0097-20240918\nLearn more: https://react.dev/warnings/version-mismatch") ); function createDrainHandler(destination, request) { return function () { @@ -5934,4 +5934,4 @@ exports.renderToPipeableStream = function (children, options) { } }; }; -exports.version = "19.0.0-rc-a99d8e8d-20240916"; +exports.version = "19.0.0-rc-5dcb0097-20240918"; diff --git a/packages/next/src/compiled/react-dom/cjs/react-dom.development.js b/packages/next/src/compiled/react-dom/cjs/react-dom.development.js index e06c8615fd021..ff667812dacb4 100644 --- a/packages/next/src/compiled/react-dom/cjs/react-dom.development.js +++ b/packages/next/src/compiled/react-dom/cjs/react-dom.development.js @@ -416,7 +416,7 @@ exports.useFormStatus = function () { return resolveDispatcher().useHostTransitionStatus(); }; - exports.version = "19.0.0-rc-a99d8e8d-20240916"; + exports.version = "19.0.0-rc-5dcb0097-20240918"; "undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ && "function" === typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStop && diff --git a/packages/next/src/compiled/react-dom/cjs/react-dom.production.js b/packages/next/src/compiled/react-dom/cjs/react-dom.production.js index 1ecd730e52d0f..9491fc98c4fb0 100644 --- a/packages/next/src/compiled/react-dom/cjs/react-dom.production.js +++ b/packages/next/src/compiled/react-dom/cjs/react-dom.production.js @@ -207,4 +207,4 @@ exports.useFormState = function (action, initialState, permalink) { exports.useFormStatus = function () { return ReactSharedInternals.H.useHostTransitionStatus(); }; -exports.version = "19.0.0-rc-a99d8e8d-20240916"; +exports.version = "19.0.0-rc-5dcb0097-20240918"; diff --git a/packages/next/src/compiled/react-dom/cjs/react-dom.react-server.development.js b/packages/next/src/compiled/react-dom/cjs/react-dom.react-server.development.js index feffc79c4e770..00169d1658f5a 100644 --- a/packages/next/src/compiled/react-dom/cjs/react-dom.react-server.development.js +++ b/packages/next/src/compiled/react-dom/cjs/react-dom.react-server.development.js @@ -336,5 +336,5 @@ })) : Internals.d.m(href)); }; - exports.version = "19.0.0-rc-a99d8e8d-20240916"; + exports.version = "19.0.0-rc-5dcb0097-20240918"; })(); diff --git a/packages/next/src/compiled/react-dom/cjs/react-dom.react-server.production.js b/packages/next/src/compiled/react-dom/cjs/react-dom.react-server.production.js index 124dbb3f0fd9f..b88e1961eff96 100644 --- a/packages/next/src/compiled/react-dom/cjs/react-dom.react-server.production.js +++ b/packages/next/src/compiled/react-dom/cjs/react-dom.react-server.production.js @@ -149,4 +149,4 @@ exports.preloadModule = function (href, options) { }); } else Internals.d.m(href); }; -exports.version = "19.0.0-rc-a99d8e8d-20240916"; +exports.version = "19.0.0-rc-5dcb0097-20240918"; diff --git a/packages/next/src/compiled/react-dom/package.json b/packages/next/src/compiled/react-dom/package.json index d3bfa64eb74a9..29b4e8c0d0c71 100644 --- a/packages/next/src/compiled/react-dom/package.json +++ b/packages/next/src/compiled/react-dom/package.json @@ -67,10 +67,10 @@ "./package.json": "./package.json" }, "dependencies": { - "scheduler": "0.25.0-rc-a99d8e8d-20240916" + "scheduler": "0.25.0-rc-5dcb0097-20240918" }, "peerDependencies": { - "react": "19.0.0-rc-a99d8e8d-20240916" + "react": "19.0.0-rc-5dcb0097-20240918" }, "browser": { "./server.js": "./server.browser.js", diff --git a/packages/next/src/compiled/react-experimental/cjs/react.development.js b/packages/next/src/compiled/react-experimental/cjs/react.development.js index c70327ad0cda7..86a6fc1afe8c4 100644 --- a/packages/next/src/compiled/react-experimental/cjs/react.development.js +++ b/packages/next/src/compiled/react-experimental/cjs/react.development.js @@ -1120,15 +1120,14 @@ }; exports.startTransition = function (scope) { var prevTransition = ReactSharedInternals.T, - transition = {}; - ReactSharedInternals.T = transition; - var currentTransition = ReactSharedInternals.T; - ReactSharedInternals.T._updatedFibers = new Set(); + currentTransition = {}; + ReactSharedInternals.T = currentTransition; + currentTransition._updatedFibers = new Set(); try { var returnValue = scope(), onStartTransitionFinish = ReactSharedInternals.S; null !== onStartTransitionFinish && - onStartTransitionFinish(transition, returnValue); + onStartTransitionFinish(currentTransition, returnValue); "object" === typeof returnValue && null !== returnValue && "function" === typeof returnValue.then && @@ -1233,7 +1232,7 @@ exports.useTransition = function () { return resolveDispatcher().useTransition(); }; - exports.version = "19.0.0-experimental-a99d8e8d-20240916"; + exports.version = "19.0.0-experimental-5dcb0097-20240918"; "undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ && "function" === typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStop && diff --git a/packages/next/src/compiled/react-experimental/cjs/react.production.js b/packages/next/src/compiled/react-experimental/cjs/react.production.js index 1ffc526314663..c8ef11079408d 100644 --- a/packages/next/src/compiled/react-experimental/cjs/react.production.js +++ b/packages/next/src/compiled/react-experimental/cjs/react.production.js @@ -472,13 +472,13 @@ exports.memo = function (type, compare) { }; exports.startTransition = function (scope) { var prevTransition = ReactSharedInternals.T, - transition = {}; - ReactSharedInternals.T = transition; + currentTransition = {}; + ReactSharedInternals.T = currentTransition; try { var returnValue = scope(), onStartTransitionFinish = ReactSharedInternals.S; null !== onStartTransitionFinish && - onStartTransitionFinish(transition, returnValue); + onStartTransitionFinish(currentTransition, returnValue); "object" === typeof returnValue && null !== returnValue && "function" === typeof returnValue.then && @@ -562,4 +562,4 @@ exports.useSyncExternalStore = function ( exports.useTransition = function () { return ReactSharedInternals.H.useTransition(); }; -exports.version = "19.0.0-experimental-a99d8e8d-20240916"; +exports.version = "19.0.0-experimental-5dcb0097-20240918"; diff --git a/packages/next/src/compiled/react-experimental/cjs/react.react-server.development.js b/packages/next/src/compiled/react-experimental/cjs/react.react-server.development.js index f50886b2376ab..bde193e7d7d6f 100644 --- a/packages/next/src/compiled/react-experimental/cjs/react.react-server.development.js +++ b/packages/next/src/compiled/react-experimental/cjs/react.react-server.development.js @@ -917,15 +917,14 @@ }; exports.startTransition = function (scope) { var prevTransition = ReactSharedInternals.T, - transition = {}; - ReactSharedInternals.T = transition; - var currentTransition = ReactSharedInternals.T; - ReactSharedInternals.T._updatedFibers = new Set(); + currentTransition = {}; + ReactSharedInternals.T = currentTransition; + currentTransition._updatedFibers = new Set(); try { var returnValue = scope(), onStartTransitionFinish = ReactSharedInternals.S; null !== onStartTransitionFinish && - onStartTransitionFinish(transition, returnValue); + onStartTransitionFinish(currentTransition, returnValue); "object" === typeof returnValue && null !== returnValue && "function" === typeof returnValue.then && @@ -979,5 +978,5 @@ exports.useMemo = function (create, deps) { return resolveDispatcher().useMemo(create, deps); }; - exports.version = "19.0.0-experimental-a99d8e8d-20240916"; + exports.version = "19.0.0-experimental-5dcb0097-20240918"; })(); diff --git a/packages/next/src/compiled/react-experimental/cjs/react.react-server.production.js b/packages/next/src/compiled/react-experimental/cjs/react.react-server.production.js index 14895c6747d05..9ef1937129f15 100644 --- a/packages/next/src/compiled/react-experimental/cjs/react.react-server.production.js +++ b/packages/next/src/compiled/react-experimental/cjs/react.react-server.production.js @@ -523,13 +523,13 @@ exports.memo = function (type, compare) { }; exports.startTransition = function (scope) { var prevTransition = ReactSharedInternals.T, - transition = {}; - ReactSharedInternals.T = transition; + currentTransition = {}; + ReactSharedInternals.T = currentTransition; try { var returnValue = scope(), onStartTransitionFinish = ReactSharedInternals.S; null !== onStartTransitionFinish && - onStartTransitionFinish(transition, returnValue); + onStartTransitionFinish(currentTransition, returnValue); "object" === typeof returnValue && null !== returnValue && "function" === typeof returnValue.then && @@ -567,4 +567,4 @@ exports.useId = function () { exports.useMemo = function (create, deps) { return ReactSharedInternals.H.useMemo(create, deps); }; -exports.version = "19.0.0-experimental-a99d8e8d-20240916"; +exports.version = "19.0.0-experimental-5dcb0097-20240918"; diff --git a/packages/next/src/compiled/react-is/package.json b/packages/next/src/compiled/react-is/package.json index c33ea4d6bd4f7..ffd26cdbaa865 100644 --- a/packages/next/src/compiled/react-is/package.json +++ b/packages/next/src/compiled/react-is/package.json @@ -1,6 +1,6 @@ { "name": "react-is", - "version": "19.0.0-rc-a99d8e8d-20240916", + "version": "19.0.0-rc-5dcb0097-20240918", "description": "Brand checking of React Elements.", "main": "index.js", "sideEffects": false, diff --git a/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-client.browser.development.js b/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-client.browser.development.js index 6f1cec8d52edf..becf8584b026c 100644 --- a/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-client.browser.development.js +++ b/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-client.browser.development.js @@ -2494,10 +2494,10 @@ return hook.checkDCE ? !0 : !1; })({ bundleType: 1, - version: "19.0.0-experimental-a99d8e8d-20240916", + version: "19.0.0-experimental-5dcb0097-20240918", rendererPackageName: "react-server-dom-turbopack", currentDispatcherRef: ReactSharedInternals, - reconcilerVersion: "19.0.0-experimental-a99d8e8d-20240916", + reconcilerVersion: "19.0.0-experimental-5dcb0097-20240918", getCurrentComponentInfo: function () { return currentOwnerInDEV; } diff --git a/packages/next/src/compiled/react-server-dom-turbopack-experimental/package.json b/packages/next/src/compiled/react-server-dom-turbopack-experimental/package.json index 9a41c0d1d430f..8675647536c15 100644 --- a/packages/next/src/compiled/react-server-dom-turbopack-experimental/package.json +++ b/packages/next/src/compiled/react-server-dom-turbopack-experimental/package.json @@ -48,7 +48,7 @@ "neo-async": "^2.6.1" }, "peerDependencies": { - "react": "0.0.0-experimental-a99d8e8d-20240916", - "react-dom": "0.0.0-experimental-a99d8e8d-20240916" + "react": "0.0.0-experimental-5dcb0097-20240918", + "react-dom": "0.0.0-experimental-5dcb0097-20240918" } } \ No newline at end of file diff --git a/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-client.browser.development.js b/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-client.browser.development.js index 6b229e8e05d1e..6f7568fd62905 100644 --- a/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-client.browser.development.js +++ b/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-client.browser.development.js @@ -2294,10 +2294,10 @@ return hook.checkDCE ? !0 : !1; })({ bundleType: 1, - version: "19.0.0-rc-a99d8e8d-20240916", + version: "19.0.0-rc-5dcb0097-20240918", rendererPackageName: "react-server-dom-turbopack", currentDispatcherRef: ReactSharedInternals, - reconcilerVersion: "19.0.0-rc-a99d8e8d-20240916", + reconcilerVersion: "19.0.0-rc-5dcb0097-20240918", getCurrentComponentInfo: function () { return currentOwnerInDEV; } diff --git a/packages/next/src/compiled/react-server-dom-turbopack/package.json b/packages/next/src/compiled/react-server-dom-turbopack/package.json index 4afafe5e609db..7fb94a6ca8322 100644 --- a/packages/next/src/compiled/react-server-dom-turbopack/package.json +++ b/packages/next/src/compiled/react-server-dom-turbopack/package.json @@ -48,7 +48,7 @@ "neo-async": "^2.6.1" }, "peerDependencies": { - "react": "19.0.0-rc-a99d8e8d-20240916", - "react-dom": "19.0.0-rc-a99d8e8d-20240916" + "react": "19.0.0-rc-5dcb0097-20240918", + "react-dom": "19.0.0-rc-5dcb0097-20240918" } } \ No newline at end of file diff --git a/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-client.browser.development.js b/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-client.browser.development.js index f1b0bb9b0af5e..459df09e6af00 100644 --- a/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-client.browser.development.js +++ b/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-client.browser.development.js @@ -2507,10 +2507,10 @@ return hook.checkDCE ? !0 : !1; })({ bundleType: 1, - version: "19.0.0-experimental-a99d8e8d-20240916", + version: "19.0.0-experimental-5dcb0097-20240918", rendererPackageName: "react-server-dom-webpack", currentDispatcherRef: ReactSharedInternals, - reconcilerVersion: "19.0.0-experimental-a99d8e8d-20240916", + reconcilerVersion: "19.0.0-experimental-5dcb0097-20240918", getCurrentComponentInfo: function () { return currentOwnerInDEV; } diff --git a/packages/next/src/compiled/react-server-dom-webpack-experimental/package.json b/packages/next/src/compiled/react-server-dom-webpack-experimental/package.json index 6b44ff5f00a41..436a9f4031ff6 100644 --- a/packages/next/src/compiled/react-server-dom-webpack-experimental/package.json +++ b/packages/next/src/compiled/react-server-dom-webpack-experimental/package.json @@ -64,8 +64,8 @@ "webpack-sources": "^3.2.0" }, "peerDependencies": { - "react": "0.0.0-experimental-a99d8e8d-20240916", - "react-dom": "0.0.0-experimental-a99d8e8d-20240916", + "react": "0.0.0-experimental-5dcb0097-20240918", + "react-dom": "0.0.0-experimental-5dcb0097-20240918", "webpack": "^5.59.0" } } \ No newline at end of file diff --git a/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-client.browser.development.js b/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-client.browser.development.js index 1120cded21db8..c3446714ab774 100644 --- a/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-client.browser.development.js +++ b/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-client.browser.development.js @@ -2307,10 +2307,10 @@ return hook.checkDCE ? !0 : !1; })({ bundleType: 1, - version: "19.0.0-rc-a99d8e8d-20240916", + version: "19.0.0-rc-5dcb0097-20240918", rendererPackageName: "react-server-dom-webpack", currentDispatcherRef: ReactSharedInternals, - reconcilerVersion: "19.0.0-rc-a99d8e8d-20240916", + reconcilerVersion: "19.0.0-rc-5dcb0097-20240918", getCurrentComponentInfo: function () { return currentOwnerInDEV; } diff --git a/packages/next/src/compiled/react-server-dom-webpack/package.json b/packages/next/src/compiled/react-server-dom-webpack/package.json index 6ea0fdd6d1790..8c0ea1962dfed 100644 --- a/packages/next/src/compiled/react-server-dom-webpack/package.json +++ b/packages/next/src/compiled/react-server-dom-webpack/package.json @@ -64,8 +64,8 @@ "webpack-sources": "^3.2.0" }, "peerDependencies": { - "react": "19.0.0-rc-a99d8e8d-20240916", - "react-dom": "19.0.0-rc-a99d8e8d-20240916", + "react": "19.0.0-rc-5dcb0097-20240918", + "react-dom": "19.0.0-rc-5dcb0097-20240918", "webpack": "^5.59.0" } } \ No newline at end of file diff --git a/packages/next/src/compiled/react/cjs/react.development.js b/packages/next/src/compiled/react/cjs/react.development.js index 9ec7fa7625263..d91709b14e29e 100644 --- a/packages/next/src/compiled/react/cjs/react.development.js +++ b/packages/next/src/compiled/react/cjs/react.development.js @@ -1416,15 +1416,14 @@ }; exports.startTransition = function (scope) { var prevTransition = ReactSharedInternals.T, - transition = {}; - ReactSharedInternals.T = transition; - var currentTransition = ReactSharedInternals.T; - ReactSharedInternals.T._updatedFibers = new Set(); + currentTransition = {}; + ReactSharedInternals.T = currentTransition; + currentTransition._updatedFibers = new Set(); try { var returnValue = scope(), onStartTransitionFinish = ReactSharedInternals.S; null !== onStartTransitionFinish && - onStartTransitionFinish(transition, returnValue); + onStartTransitionFinish(currentTransition, returnValue); "object" === typeof returnValue && null !== returnValue && "function" === typeof returnValue.then && @@ -1517,7 +1516,7 @@ exports.useTransition = function () { return resolveDispatcher().useTransition(); }; - exports.version = "19.0.0-rc-a99d8e8d-20240916"; + exports.version = "19.0.0-rc-5dcb0097-20240918"; "undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ && "function" === typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStop && diff --git a/packages/next/src/compiled/react/cjs/react.production.js b/packages/next/src/compiled/react/cjs/react.production.js index 80a5194adad86..8d76b2a171f99 100644 --- a/packages/next/src/compiled/react/cjs/react.production.js +++ b/packages/next/src/compiled/react/cjs/react.production.js @@ -456,13 +456,13 @@ exports.memo = function (type, compare) { }; exports.startTransition = function (scope) { var prevTransition = ReactSharedInternals.T, - transition = {}; - ReactSharedInternals.T = transition; + currentTransition = {}; + ReactSharedInternals.T = currentTransition; try { var returnValue = scope(), onStartTransitionFinish = ReactSharedInternals.S; null !== onStartTransitionFinish && - onStartTransitionFinish(transition, returnValue); + onStartTransitionFinish(currentTransition, returnValue); "object" === typeof returnValue && null !== returnValue && "function" === typeof returnValue.then && @@ -536,4 +536,4 @@ exports.useSyncExternalStore = function ( exports.useTransition = function () { return ReactSharedInternals.H.useTransition(); }; -exports.version = "19.0.0-rc-a99d8e8d-20240916"; +exports.version = "19.0.0-rc-5dcb0097-20240918"; diff --git a/packages/next/src/compiled/react/cjs/react.react-server.development.js b/packages/next/src/compiled/react/cjs/react.react-server.development.js index e18011613c94c..39da00c3176fc 100644 --- a/packages/next/src/compiled/react/cjs/react.react-server.development.js +++ b/packages/next/src/compiled/react/cjs/react.react-server.development.js @@ -1113,5 +1113,5 @@ exports.useMemo = function (create, deps) { return resolveDispatcher().useMemo(create, deps); }; - exports.version = "19.0.0-rc-a99d8e8d-20240916"; + exports.version = "19.0.0-rc-5dcb0097-20240918"; })(); diff --git a/packages/next/src/compiled/react/cjs/react.react-server.production.js b/packages/next/src/compiled/react/cjs/react.react-server.production.js index 1b840ef8935d1..2ce544587cf08 100644 --- a/packages/next/src/compiled/react/cjs/react.react-server.production.js +++ b/packages/next/src/compiled/react/cjs/react.react-server.production.js @@ -424,4 +424,4 @@ exports.useId = function () { exports.useMemo = function (create, deps) { return ReactSharedInternals.H.useMemo(create, deps); }; -exports.version = "19.0.0-rc-a99d8e8d-20240916"; +exports.version = "19.0.0-rc-5dcb0097-20240918"; diff --git a/packages/next/src/compiled/unistore/unistore.js b/packages/next/src/compiled/unistore/unistore.js index 61e74ca13c155..936831b1372dc 100644 --- a/packages/next/src/compiled/unistore/unistore.js +++ b/packages/next/src/compiled/unistore/unistore.js @@ -1 +1 @@ -(()=>{var t={858:t=>{function n(t,i){for(var _ in i)t[_]=i[_];return t}t.exports=function(t){var i=[];function u(t){for(var _=[],a=0;a{var t={601:t=>{function n(t,i){for(var _ in i)t[_]=i[_];return t}t.exports=function(t){var i=[];function u(t){for(var _=[],a=0;a