From c67e7ff680614b2991679ec0c160fb0da15950e2 Mon Sep 17 00:00:00 2001 From: acdlite Date: Tue, 11 Apr 2023 04:24:27 +0000 Subject: [PATCH] Remove JND delay for non-transition updates (#26597) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Updates that are marked as part of a transition are allowed to block a render from committing. Generally, other updates cannot — however, there's one exception that's leftover from a previous iteration of our Suspense architecture. If an update is not the result of a known urgent event type — known as "Default" updates — then we allow it to suspend briefly, as long as the delay is short enough that the user won't notice. We refer to this delay as a "Just Noticable Difference" (JND) delay. To illustrate, if the user has already waited 400ms for an update to be reflected on the screen, the theory is that they won't notice if you wait an additional 100ms. So React can suspend for a bit longer in case more data comes in. The longer the user has already waited, the longer the JND. While we still believe this theory is sound from a UX perspective, we no longer think the implementation complexity is worth it. The main thing that's changed is how we handle Default updates. We used to render Default updates concurrently (i.e. they were time sliced, and were scheduled with postTask), but now they are blocking. Soon, they will also be scheduled with rAF, too, which means by the end of the next rAF, they will have either finished rendering or the main thread will be blocked until they do. There are various motivations for this but part of the rationale is that anything that can be made non-blocking should be marked as a Transition, anyway, so it's not worth adding implementation complexity to Default. This commit removes the JND delay for Default updates. They will now commit immediately once the render phase is complete, even if a component suspends. DiffTrain build for commit https://github.com/facebook/react/commit/0b931f90e8964183f08ac328e7350d847abb08f9. --- .../cjs/ReactTestRenderer-dev.js | 77 +--- .../cjs/ReactTestRenderer-prod.js | 346 +++++++-------- .../cjs/ReactTestRenderer-profiling.js | 404 ++++++++---------- .../RKJSModules/vendor/react/cjs/React-dev.js | 2 +- .../vendor/react/cjs/React-prod.js | 2 +- .../vendor/react/cjs/React-profiling.js | 2 +- .../Libraries/Renderer/REVISION | 2 +- .../implementations/ReactFabric-dev.fb.js | 77 +--- .../implementations/ReactFabric-prod.fb.js | 314 ++++++-------- .../ReactFabric-profiling.fb.js | 376 ++++++++-------- .../ReactNativeRenderer-dev.fb.js | 77 +--- .../ReactNativeRenderer-prod.fb.js | 300 ++++++------- .../ReactNativeRenderer-profiling.fb.js | 362 +++++++--------- 13 files changed, 938 insertions(+), 1403 deletions(-) diff --git a/compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react-test-renderer/cjs/ReactTestRenderer-dev.js b/compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react-test-renderer/cjs/ReactTestRenderer-dev.js index 793088f6b8..83fd1d18b4 100644 --- a/compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react-test-renderer/cjs/ReactTestRenderer-dev.js +++ b/compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react-test-renderer/cjs/ReactTestRenderer-dev.js @@ -1342,24 +1342,6 @@ function getNextLanes(root, wipLanes) { return nextLanes; } -function getMostRecentEventTime(root, lanes) { - var eventTimes = root.eventTimes; - var mostRecentEventTime = NoTimestamp; - - while (lanes > 0) { - var index = pickArbitraryLaneIndex(lanes); - var lane = 1 << index; - var eventTime = eventTimes[index]; - - if (eventTime > mostRecentEventTime) { - mostRecentEventTime = eventTime; - } - - lanes &= ~lane; - } - - return mostRecentEventTime; -} function computeExpirationTime(lane, currentTime) { switch (lane) { @@ -19771,7 +19753,6 @@ function scheduleImmediateTask(cb) { } } -var ceil = Math.ceil; var PossiblyWeakMap = typeof WeakMap === "function" ? WeakMap : Map; var ReactCurrentDispatcher = ReactSharedInternals.ReactCurrentDispatcher, ReactCurrentCache = ReactSharedInternals.ReactCurrentCache, @@ -20395,37 +20376,6 @@ function finishConcurrentRender(root, exitStatus, finishedWork, lanes) { // placeholder and without scheduling a timeout. Delay indefinitely // until we receive more data. break; - } - - if (!shouldForceFlushFallbacksInDEV()) { - // This is not a transition, but we did trigger an avoided state. - // Schedule a placeholder to display after a short delay, using the Just - // Noticeable Difference. - // TODO: Is the JND optimization worth the added complexity? If this is - // the only reason we track the event time, then probably not. - // Consider removing. - var mostRecentEventTime = getMostRecentEventTime(root, lanes); - var eventTimeMs = mostRecentEventTime; - var timeElapsedMs = now$1() - eventTimeMs; - - var _msUntilTimeout = jnd(timeElapsedMs) - timeElapsedMs; // Don't bother with a very short suspense time. - - if (_msUntilTimeout > 10) { - // Instead of committing the fallback immediately, wait for more data - // to arrive. - root.timeoutHandle = scheduleTimeout( - commitRootWhenReady.bind( - null, - root, - finishedWork, - workInProgressRootRecoverableErrors, - workInProgressTransitions, - lanes - ), - _msUntilTimeout - ); - break; - } } // Commit the placeholder. commitRootWhenReady( @@ -22365,32 +22315,7 @@ function resolveRetryWakeable(boundaryFiber, wakeable) { } retryTimedOutBoundary(boundaryFiber, retryLane); -} // Computes the next Just Noticeable Difference (JND) boundary. -// The theory is that a person can't tell the difference between small differences in time. -// Therefore, if we wait a bit longer than necessary that won't translate to a noticeable -// difference in the experience. However, waiting for longer might mean that we can avoid -// showing an intermediate loading state. The longer we have already waited, the harder it -// is to tell small differences in time. Therefore, the longer we've already waited, -// the longer we can wait additionally. At some point we have to give up though. -// We pick a train model where the next boundary commits at a consistent schedule. -// These particular numbers are vague estimates. We expect to adjust them based on research. - -function jnd(timeElapsed) { - return timeElapsed < 120 - ? 120 - : timeElapsed < 480 - ? 480 - : timeElapsed < 1080 - ? 1080 - : timeElapsed < 1920 - ? 1920 - : timeElapsed < 3000 - ? 3000 - : timeElapsed < 4320 - ? 4320 - : ceil(timeElapsed / 1960) * 1960; } - function throwIfInfiniteUpdateLoopDetected() { if (nestedUpdateCount > NESTED_UPDATE_LIMIT) { nestedUpdateCount = 0; @@ -23872,7 +23797,7 @@ function createFiberRoot( return root; } -var ReactVersion = "18.3.0-next-ac43bf687-20230410"; +var ReactVersion = "18.3.0-next-0b931f90e-20230411"; // Might add PROFILE later. diff --git a/compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react-test-renderer/cjs/ReactTestRenderer-prod.js b/compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react-test-renderer/cjs/ReactTestRenderer-prod.js index 9375ed093d..6444526baf 100644 --- a/compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react-test-renderer/cjs/ReactTestRenderer-prod.js +++ b/compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react-test-renderer/cjs/ReactTestRenderer-prod.js @@ -487,19 +487,19 @@ function markRootFinished(root, remainingLanes) { var eventTimes = root.eventTimes, expirationTimes = root.expirationTimes; for (root = root.hiddenUpdates; 0 < noLongerPendingLanes; ) { - var index$5 = 31 - clz32(noLongerPendingLanes), - lane = 1 << index$5; - remainingLanes[index$5] = 0; - eventTimes[index$5] = -1; - expirationTimes[index$5] = -1; - var hiddenUpdatesForLane = root[index$5]; + var index$4 = 31 - clz32(noLongerPendingLanes), + lane = 1 << index$4; + remainingLanes[index$4] = 0; + eventTimes[index$4] = -1; + expirationTimes[index$4] = -1; + var hiddenUpdatesForLane = root[index$4]; if (null !== hiddenUpdatesForLane) for ( - root[index$5] = null, index$5 = 0; - index$5 < hiddenUpdatesForLane.length; - index$5++ + root[index$4] = null, index$4 = 0; + index$4 < hiddenUpdatesForLane.length; + index$4++ ) { - var update = hiddenUpdatesForLane[index$5]; + var update = hiddenUpdatesForLane[index$4]; null !== update && (update.lane &= -1073741825); } noLongerPendingLanes &= ~lane; @@ -508,10 +508,10 @@ function markRootFinished(root, remainingLanes) { function markRootEntangled(root, entangledLanes) { var rootEntangledLanes = (root.entangledLanes |= entangledLanes); for (root = root.entanglements; rootEntangledLanes; ) { - var index$6 = 31 - clz32(rootEntangledLanes), - lane = 1 << index$6; - (lane & entangledLanes) | (root[index$6] & entangledLanes) && - (root[index$6] |= entangledLanes); + var index$5 = 31 - clz32(rootEntangledLanes), + lane = 1 << index$5; + (lane & entangledLanes) | (root[index$5] & entangledLanes) && + (root[index$5] |= entangledLanes); rootEntangledLanes &= ~lane; } } @@ -2126,10 +2126,10 @@ createFunctionComponentUpdateQueue = function () { function use(usable) { if (null !== usable && "object" === typeof usable) { if ("function" === typeof usable.then) { - var index$23 = thenableIndexCounter; + var index$22 = thenableIndexCounter; thenableIndexCounter += 1; null === thenableState && (thenableState = []); - usable = trackUsedThenable(thenableState, usable, index$23); + usable = trackUsedThenable(thenableState, usable, index$22); null === currentlyRenderingFiber$1.alternate && (null === workInProgressHook ? null === currentlyRenderingFiber$1.memoizedState @@ -4283,14 +4283,14 @@ function cutOffTailIfNeeded(renderState, hasRenderedATailFallback) { break; case "collapsed": lastTailNode = renderState.tail; - for (var lastTailNode$59 = null; null !== lastTailNode; ) - null !== lastTailNode.alternate && (lastTailNode$59 = lastTailNode), + for (var lastTailNode$58 = null; null !== lastTailNode; ) + null !== lastTailNode.alternate && (lastTailNode$58 = lastTailNode), (lastTailNode = lastTailNode.sibling); - null === lastTailNode$59 + null === lastTailNode$58 ? hasRenderedATailFallback || null === renderState.tail ? (renderState.tail = null) : (renderState.tail.sibling = null) - : (lastTailNode$59.sibling = null); + : (lastTailNode$58.sibling = null); } } function bubbleProperties(completedWork) { @@ -4300,19 +4300,19 @@ function bubbleProperties(completedWork) { newChildLanes = 0, subtreeFlags = 0; if (didBailout) - for (var child$60 = completedWork.child; null !== child$60; ) - (newChildLanes |= child$60.lanes | child$60.childLanes), - (subtreeFlags |= child$60.subtreeFlags & 31457280), - (subtreeFlags |= child$60.flags & 31457280), - (child$60.return = completedWork), - (child$60 = child$60.sibling); + for (var child$59 = completedWork.child; null !== child$59; ) + (newChildLanes |= child$59.lanes | child$59.childLanes), + (subtreeFlags |= child$59.subtreeFlags & 31457280), + (subtreeFlags |= child$59.flags & 31457280), + (child$59.return = completedWork), + (child$59 = child$59.sibling); else - for (child$60 = completedWork.child; null !== child$60; ) - (newChildLanes |= child$60.lanes | child$60.childLanes), - (subtreeFlags |= child$60.subtreeFlags), - (subtreeFlags |= child$60.flags), - (child$60.return = completedWork), - (child$60 = child$60.sibling); + for (child$59 = completedWork.child; null !== child$59; ) + (newChildLanes |= child$59.lanes | child$59.childLanes), + (subtreeFlags |= child$59.subtreeFlags), + (subtreeFlags |= child$59.flags), + (child$59.return = completedWork), + (child$59 = child$59.sibling); completedWork.subtreeFlags |= subtreeFlags; completedWork.childLanes = newChildLanes; return didBailout; @@ -4474,11 +4474,11 @@ function completeWork(current, workInProgress, renderLanes) { null !== newProps.alternate.memoizedState && null !== newProps.alternate.memoizedState.cachePool && (index = newProps.alternate.memoizedState.cachePool.pool); - var cache$64 = null; + var cache$63 = null; null !== newProps.memoizedState && null !== newProps.memoizedState.cachePool && - (cache$64 = newProps.memoizedState.cachePool.pool); - cache$64 !== index && (newProps.flags |= 2048); + (cache$63 = newProps.memoizedState.cachePool.pool); + cache$63 !== index && (newProps.flags |= 2048); } renderLanes !== current && renderLanes && @@ -4505,8 +4505,8 @@ function completeWork(current, workInProgress, renderLanes) { index = workInProgress.memoizedState; if (null === index) return bubbleProperties(workInProgress), null; newProps = 0 !== (workInProgress.flags & 128); - cache$64 = index.rendering; - if (null === cache$64) + cache$63 = index.rendering; + if (null === cache$63) if (newProps) cutOffTailIfNeeded(index, !1); else { if ( @@ -4514,11 +4514,11 @@ function completeWork(current, workInProgress, renderLanes) { (null !== current && 0 !== (current.flags & 128)) ) for (current = workInProgress.child; null !== current; ) { - cache$64 = findFirstSuspended(current); - if (null !== cache$64) { + cache$63 = findFirstSuspended(current); + if (null !== cache$63) { workInProgress.flags |= 128; cutOffTailIfNeeded(index, !1); - current = cache$64.updateQueue; + current = cache$63.updateQueue; workInProgress.updateQueue = current; scheduleRetryEffect(workInProgress, current); workInProgress.subtreeFlags = 0; @@ -4543,7 +4543,7 @@ function completeWork(current, workInProgress, renderLanes) { } else { if (!newProps) - if (((current = findFirstSuspended(cache$64)), null !== current)) { + if (((current = findFirstSuspended(cache$63)), null !== current)) { if ( ((workInProgress.flags |= 128), (newProps = !0), @@ -4553,7 +4553,7 @@ function completeWork(current, workInProgress, renderLanes) { cutOffTailIfNeeded(index, !0), null === index.tail && "hidden" === index.tailMode && - !cache$64.alternate) + !cache$63.alternate) ) return bubbleProperties(workInProgress), null; } else @@ -4565,13 +4565,13 @@ function completeWork(current, workInProgress, renderLanes) { cutOffTailIfNeeded(index, !1), (workInProgress.lanes = 8388608)); index.isBackwards - ? ((cache$64.sibling = workInProgress.child), - (workInProgress.child = cache$64)) + ? ((cache$63.sibling = workInProgress.child), + (workInProgress.child = cache$63)) : ((current = index.last), null !== current - ? (current.sibling = cache$64) - : (workInProgress.child = cache$64), - (index.last = cache$64)); + ? (current.sibling = cache$63) + : (workInProgress.child = cache$63), + (index.last = cache$63)); } if (null !== index.tail) return ( @@ -4786,8 +4786,8 @@ function safelyDetachRef(current, nearestMountedAncestor) { else if ("function" === typeof ref) try { ref(null); - } catch (error$80) { - captureCommitPhaseError(current, nearestMountedAncestor, error$80); + } catch (error$79) { + captureCommitPhaseError(current, nearestMountedAncestor, error$79); } else ref.current = null; } @@ -4893,10 +4893,10 @@ function commitHookEffectListMount(flags, finishedWork) { var effect = (finishedWork = finishedWork.next); do { if ((effect.tag & flags) === flags) { - var create$81 = effect.create, + var create$80 = effect.create, inst = effect.inst; - create$81 = create$81(); - inst.destroy = create$81; + create$80 = create$80(); + inst.destroy = create$80; } effect = effect.next; } while (effect !== finishedWork); @@ -4950,11 +4950,11 @@ function commitLayoutEffectOnFiber(finishedRoot, current, finishedWork) { current, finishedRoot.__reactInternalSnapshotBeforeUpdate ); - } catch (error$82) { + } catch (error$81) { captureCommitPhaseError( finishedWork, finishedWork.return, - error$82 + error$81 ); } } @@ -5331,8 +5331,8 @@ function commitMutationEffectsOnFiber(finishedWork, root) { } try { commitHookEffectListUnmount(5, finishedWork, finishedWork.return); - } catch (error$90) { - captureCommitPhaseError(finishedWork, finishedWork.return, error$90); + } catch (error$89) { + captureCommitPhaseError(finishedWork, finishedWork.return, error$89); } } break; @@ -5370,8 +5370,8 @@ function commitMutationEffectsOnFiber(finishedWork, root) { finishedWork.updateQueue = null; try { (flags.type = type), (flags.props = existingHiddenCallbacks); - } catch (error$93) { - captureCommitPhaseError(finishedWork, finishedWork.return, error$93); + } catch (error$92) { + captureCommitPhaseError(finishedWork, finishedWork.return, error$92); } } break; @@ -5387,8 +5387,8 @@ function commitMutationEffectsOnFiber(finishedWork, root) { existingHiddenCallbacks = finishedWork.memoizedProps; try { flags.text = existingHiddenCallbacks; - } catch (error$94) { - captureCommitPhaseError(finishedWork, finishedWork.return, error$94); + } catch (error$93) { + captureCommitPhaseError(finishedWork, finishedWork.return, error$93); } } break; @@ -5420,14 +5420,14 @@ function commitMutationEffectsOnFiber(finishedWork, root) { null !== current && safelyDetachRef(current, current.return); existingHiddenCallbacks = null !== finishedWork.memoizedState; - var wasHidden$98 = null !== current && null !== current.memoizedState; + var wasHidden$97 = null !== current && null !== current.memoizedState; if (finishedWork.mode & 1) { var prevOffscreenSubtreeIsHidden = offscreenSubtreeIsHidden, prevOffscreenSubtreeWasHidden = offscreenSubtreeWasHidden; offscreenSubtreeIsHidden = prevOffscreenSubtreeIsHidden || existingHiddenCallbacks; offscreenSubtreeWasHidden = - prevOffscreenSubtreeWasHidden || wasHidden$98; + prevOffscreenSubtreeWasHidden || wasHidden$97; recursivelyTraverseMutationEffects(root, finishedWork); offscreenSubtreeWasHidden = prevOffscreenSubtreeWasHidden; offscreenSubtreeIsHidden = prevOffscreenSubtreeIsHidden; @@ -5445,22 +5445,22 @@ function commitMutationEffectsOnFiber(finishedWork, root) { existingHiddenCallbacks && ((root = offscreenSubtreeIsHidden || offscreenSubtreeWasHidden), null === current || - wasHidden$98 || + wasHidden$97 || root || (0 !== (finishedWork.mode & 1) && recursivelyTraverseDisappearLayoutEffects(finishedWork))), null === finishedWork.memoizedProps || "manual" !== finishedWork.memoizedProps.mode) ) - a: for (current = null, wasHidden$98 = finishedWork; ; ) { - if (5 === wasHidden$98.tag) { + a: for (current = null, wasHidden$97 = finishedWork; ; ) { + if (5 === wasHidden$97.tag) { if (null === current) { - current = wasHidden$98; + current = wasHidden$97; try { - (type = wasHidden$98.stateNode), + (type = wasHidden$97.stateNode), existingHiddenCallbacks ? (type.isHidden = !0) - : (wasHidden$98.stateNode.isHidden = !1); + : (wasHidden$97.stateNode.isHidden = !1); } catch (error) { captureCommitPhaseError( finishedWork, @@ -5469,42 +5469,42 @@ function commitMutationEffectsOnFiber(finishedWork, root) { ); } } - } else if (6 === wasHidden$98.tag) { + } else if (6 === wasHidden$97.tag) { if (null === current) try { - wasHidden$98.stateNode.isHidden = existingHiddenCallbacks + wasHidden$97.stateNode.isHidden = existingHiddenCallbacks ? !0 : !1; - } catch (error$84) { + } catch (error$83) { captureCommitPhaseError( finishedWork, finishedWork.return, - error$84 + error$83 ); } } else if ( - ((22 !== wasHidden$98.tag && 23 !== wasHidden$98.tag) || - null === wasHidden$98.memoizedState || - wasHidden$98 === finishedWork) && - null !== wasHidden$98.child + ((22 !== wasHidden$97.tag && 23 !== wasHidden$97.tag) || + null === wasHidden$97.memoizedState || + wasHidden$97 === finishedWork) && + null !== wasHidden$97.child ) { - wasHidden$98.child.return = wasHidden$98; - wasHidden$98 = wasHidden$98.child; + wasHidden$97.child.return = wasHidden$97; + wasHidden$97 = wasHidden$97.child; continue; } - if (wasHidden$98 === finishedWork) break a; - for (; null === wasHidden$98.sibling; ) { + if (wasHidden$97 === finishedWork) break a; + for (; null === wasHidden$97.sibling; ) { if ( - null === wasHidden$98.return || - wasHidden$98.return === finishedWork + null === wasHidden$97.return || + wasHidden$97.return === finishedWork ) break a; - current === wasHidden$98 && (current = null); - wasHidden$98 = wasHidden$98.return; + current === wasHidden$97 && (current = null); + wasHidden$97 = wasHidden$97.return; } - current === wasHidden$98 && (current = null); - wasHidden$98.sibling.return = wasHidden$98.return; - wasHidden$98 = wasHidden$98.sibling; + current === wasHidden$97 && (current = null); + wasHidden$97.sibling.return = wasHidden$97.return; + wasHidden$97 = wasHidden$97.sibling; } flags & 4 && ((flags = finishedWork.updateQueue), @@ -5560,12 +5560,12 @@ function commitReconciliationEffects(finishedWork) { break; case 3: case 4: - var parent$85 = JSCompiler_inline_result.stateNode.containerInfo, - before$86 = getHostSibling(finishedWork); + var parent$84 = JSCompiler_inline_result.stateNode.containerInfo, + before$85 = getHostSibling(finishedWork); insertOrAppendPlacementNodeIntoContainer( finishedWork, - before$86, - parent$85 + before$85, + parent$84 ); break; default: @@ -6307,12 +6307,12 @@ function scheduleTaskForRootDuringMicrotask(root, currentTime) { 0 < lanes; ) { - var index$3 = 31 - clz32(lanes), - lane = 1 << index$3, - expirationTime = expirationTimes[index$3]; + var index$2 = 31 - clz32(lanes), + lane = 1 << index$2, + expirationTime = expirationTimes[index$2]; if (-1 === expirationTime) { if (0 === (lane & suspendedLanes) || 0 !== (lane & pingedLanes)) - expirationTimes[index$3] = computeExpirationTime(lane, currentTime); + expirationTimes[index$2] = computeExpirationTime(lane, currentTime); } else expirationTime <= currentTime && (root.expiredLanes |= lane); lanes &= ~lane; } @@ -6369,8 +6369,7 @@ function scheduleTaskForRootDuringMicrotask(root, currentTime) { root.callbackNode = suspendedLanes; return currentTime; } -var ceil = Math.ceil, - PossiblyWeakMap = "function" === typeof WeakMap ? WeakMap : Map, +var PossiblyWeakMap = "function" === typeof WeakMap ? WeakMap : Map, ReactCurrentDispatcher = ReactSharedInternals.ReactCurrentDispatcher, ReactCurrentCache = ReactSharedInternals.ReactCurrentCache, ReactCurrentOwner = ReactSharedInternals.ReactCurrentOwner, @@ -6459,28 +6458,28 @@ function performConcurrentWorkOnRoot(root, didTimeout) { root === workInProgressRoot ? workInProgressRootRenderLanes : 0 ); if (0 === lanes) return null; - var exitStatus = + didTimeout = includesBlockingLane(root, lanes) || 0 !== (lanes & root.expiredLanes) || didTimeout ? renderRootSync(root, lanes) : renderRootConcurrent(root, lanes); - if (0 !== exitStatus) { - if (2 === exitStatus) { - didTimeout = lanes; - var errorRetryLanes = getLanesToRetrySynchronouslyOnError( - root, - didTimeout - ); + if (0 !== didTimeout) { + if (2 === didTimeout) { + var originallyAttemptedLanes = lanes, + errorRetryLanes = getLanesToRetrySynchronouslyOnError( + root, + originallyAttemptedLanes + ); 0 !== errorRetryLanes && ((lanes = errorRetryLanes), - (exitStatus = recoverFromConcurrentError( + (didTimeout = recoverFromConcurrentError( root, - didTimeout, + originallyAttemptedLanes, errorRetryLanes ))); } - if (1 === exitStatus) + if (1 === didTimeout) throw ( ((originalCallbackNode = workInProgressRootFatalError), prepareFreshStack(root, 0), @@ -6488,30 +6487,30 @@ function performConcurrentWorkOnRoot(root, didTimeout) { ensureRootIsScheduled(root), originalCallbackNode) ); - if (6 === exitStatus) markRootSuspended(root, lanes); + if (6 === didTimeout) markRootSuspended(root, lanes); else { errorRetryLanes = !includesBlockingLane(root, lanes); - didTimeout = root.current.alternate; + originallyAttemptedLanes = root.current.alternate; if ( errorRetryLanes && - !isRenderConsistentWithExternalStores(didTimeout) + !isRenderConsistentWithExternalStores(originallyAttemptedLanes) ) { - exitStatus = renderRootSync(root, lanes); - if (2 === exitStatus) { + didTimeout = renderRootSync(root, lanes); + if (2 === didTimeout) { errorRetryLanes = lanes; - var errorRetryLanes$107 = getLanesToRetrySynchronouslyOnError( + var errorRetryLanes$106 = getLanesToRetrySynchronouslyOnError( root, errorRetryLanes ); - 0 !== errorRetryLanes$107 && - ((lanes = errorRetryLanes$107), - (exitStatus = recoverFromConcurrentError( + 0 !== errorRetryLanes$106 && + ((lanes = errorRetryLanes$106), + (didTimeout = recoverFromConcurrentError( root, errorRetryLanes, - errorRetryLanes$107 + errorRetryLanes$106 ))); } - if (1 === exitStatus) + if (1 === didTimeout) throw ( ((originalCallbackNode = workInProgressRootFatalError), prepareFreshStack(root, 0), @@ -6520,16 +6519,16 @@ function performConcurrentWorkOnRoot(root, didTimeout) { originalCallbackNode) ); } - root.finishedWork = didTimeout; + root.finishedWork = originallyAttemptedLanes; root.finishedLanes = lanes; - switch (exitStatus) { + switch (didTimeout) { case 0: case 1: throw Error("Root did not complete. This is a bug in React."); case 2: commitRootWhenReady( root, - didTimeout, + originallyAttemptedLanes, workInProgressRootRecoverableErrors, workInProgressTransitions, lanes @@ -6539,26 +6538,26 @@ function performConcurrentWorkOnRoot(root, didTimeout) { markRootSuspended(root, lanes); if ( (lanes & 125829120) === lanes && - ((exitStatus = globalMostRecentFallbackTime + 500 - now()), - 10 < exitStatus) + ((didTimeout = globalMostRecentFallbackTime + 500 - now()), + 10 < didTimeout) ) { if (0 !== getNextLanes(root, 0)) break; root.timeoutHandle = scheduleTimeout( commitRootWhenReady.bind( null, root, - didTimeout, + originallyAttemptedLanes, workInProgressRootRecoverableErrors, workInProgressTransitions, lanes ), - exitStatus + didTimeout ); break; } commitRootWhenReady( root, - didTimeout, + originallyAttemptedLanes, workInProgressRootRecoverableErrors, workInProgressTransitions, lanes @@ -6567,48 +6566,9 @@ function performConcurrentWorkOnRoot(root, didTimeout) { case 4: markRootSuspended(root, lanes); if ((lanes & 8388480) === lanes) break; - exitStatus = lanes; - errorRetryLanes = root.eventTimes; - for (errorRetryLanes$107 = -1; 0 < exitStatus; ) { - var index$2 = 31 - clz32(exitStatus), - lane = 1 << index$2; - index$2 = errorRetryLanes[index$2]; - index$2 > errorRetryLanes$107 && (errorRetryLanes$107 = index$2); - exitStatus &= ~lane; - } - exitStatus = errorRetryLanes$107; - exitStatus = now() - exitStatus; - exitStatus = - (120 > exitStatus - ? 120 - : 480 > exitStatus - ? 480 - : 1080 > exitStatus - ? 1080 - : 1920 > exitStatus - ? 1920 - : 3e3 > exitStatus - ? 3e3 - : 4320 > exitStatus - ? 4320 - : 1960 * ceil(exitStatus / 1960)) - exitStatus; - if (10 < exitStatus) { - root.timeoutHandle = scheduleTimeout( - commitRootWhenReady.bind( - null, - root, - didTimeout, - workInProgressRootRecoverableErrors, - workInProgressTransitions, - lanes - ), - exitStatus - ); - break; - } commitRootWhenReady( root, - didTimeout, + originallyAttemptedLanes, workInProgressRootRecoverableErrors, workInProgressTransitions, lanes @@ -6617,7 +6577,7 @@ function performConcurrentWorkOnRoot(root, didTimeout) { case 5: commitRootWhenReady( root, - didTimeout, + originallyAttemptedLanes, workInProgressRootRecoverableErrors, workInProgressTransitions, lanes @@ -6721,9 +6681,9 @@ function markRootSuspended(root, suspendedLanes) { root.suspendedLanes |= suspendedLanes; root.pingedLanes &= ~suspendedLanes; for (root = root.expirationTimes; 0 < suspendedLanes; ) { - var index$4 = 31 - clz32(suspendedLanes), - lane = 1 << index$4; - root[index$4] = -1; + var index$3 = 31 - clz32(suspendedLanes), + lane = 1 << index$3; + root[index$3] = -1; suspendedLanes &= ~lane; } } @@ -6873,8 +6833,8 @@ function renderRootSync(root, lanes) { } workLoopSync(); break; - } catch (thrownValue$110) { - handleThrow(root, thrownValue$110); + } catch (thrownValue$108) { + handleThrow(root, thrownValue$108); } while (1); resetContextDependencies(); @@ -6981,8 +6941,8 @@ function renderRootConcurrent(root, lanes) { } workLoopConcurrent(); break; - } catch (thrownValue$112) { - handleThrow(root, thrownValue$112); + } catch (thrownValue$110) { + handleThrow(root, thrownValue$110); } while (1); resetContextDependencies(); @@ -7149,10 +7109,10 @@ function throwAndUnwindWorkLoop(unitOfWork, thrownValue) { }; suspenseBoundary.updateQueue = newOffscreenQueue; } else { - var retryQueue$29 = offscreenQueue.retryQueue; - null === retryQueue$29 + var retryQueue$28 = offscreenQueue.retryQueue; + null === retryQueue$28 ? (offscreenQueue.retryQueue = new Set([wakeable])) - : retryQueue$29.add(wakeable); + : retryQueue$28.add(wakeable); } } break; @@ -8674,19 +8634,19 @@ function wrapFiber(fiber) { fiberToWrapper.set(fiber, wrapper)); return wrapper; } -var devToolsConfig$jscomp$inline_1027 = { +var devToolsConfig$jscomp$inline_1021 = { findFiberByHostInstance: function () { throw Error("TestRenderer does not support findFiberByHostInstance()"); }, bundleType: 0, - version: "18.3.0-next-ac43bf687-20230410", + version: "18.3.0-next-0b931f90e-20230411", rendererPackageName: "react-test-renderer" }; -var internals$jscomp$inline_1219 = { - bundleType: devToolsConfig$jscomp$inline_1027.bundleType, - version: devToolsConfig$jscomp$inline_1027.version, - rendererPackageName: devToolsConfig$jscomp$inline_1027.rendererPackageName, - rendererConfig: devToolsConfig$jscomp$inline_1027.rendererConfig, +var internals$jscomp$inline_1204 = { + bundleType: devToolsConfig$jscomp$inline_1021.bundleType, + version: devToolsConfig$jscomp$inline_1021.version, + rendererPackageName: devToolsConfig$jscomp$inline_1021.rendererPackageName, + rendererConfig: devToolsConfig$jscomp$inline_1021.rendererConfig, overrideHookState: null, overrideHookStateDeletePath: null, overrideHookStateRenamePath: null, @@ -8703,26 +8663,26 @@ var internals$jscomp$inline_1219 = { return null === fiber ? null : fiber.stateNode; }, findFiberByHostInstance: - devToolsConfig$jscomp$inline_1027.findFiberByHostInstance || + devToolsConfig$jscomp$inline_1021.findFiberByHostInstance || emptyFindFiberByHostInstance, findHostInstancesForRefresh: null, scheduleRefresh: null, scheduleRoot: null, setRefreshHandler: null, getCurrentFiber: null, - reconcilerVersion: "18.3.0-next-ac43bf687-20230410" + reconcilerVersion: "18.3.0-next-0b931f90e-20230411" }; if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) { - var hook$jscomp$inline_1220 = __REACT_DEVTOOLS_GLOBAL_HOOK__; + var hook$jscomp$inline_1205 = __REACT_DEVTOOLS_GLOBAL_HOOK__; if ( - !hook$jscomp$inline_1220.isDisabled && - hook$jscomp$inline_1220.supportsFiber + !hook$jscomp$inline_1205.isDisabled && + hook$jscomp$inline_1205.supportsFiber ) try { - (rendererID = hook$jscomp$inline_1220.inject( - internals$jscomp$inline_1219 + (rendererID = hook$jscomp$inline_1205.inject( + internals$jscomp$inline_1204 )), - (injectedHook = hook$jscomp$inline_1220); + (injectedHook = hook$jscomp$inline_1205); } catch (err) {} } exports._Scheduler = Scheduler; diff --git a/compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react-test-renderer/cjs/ReactTestRenderer-profiling.js b/compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react-test-renderer/cjs/ReactTestRenderer-profiling.js index ab8d3b47d0..ed5a5e3044 100644 --- a/compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react-test-renderer/cjs/ReactTestRenderer-profiling.js +++ b/compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react-test-renderer/cjs/ReactTestRenderer-profiling.js @@ -505,19 +505,19 @@ function markRootFinished(root, remainingLanes) { var eventTimes = root.eventTimes, expirationTimes = root.expirationTimes; for (root = root.hiddenUpdates; 0 < noLongerPendingLanes; ) { - var index$5 = 31 - clz32(noLongerPendingLanes), - lane = 1 << index$5; - remainingLanes[index$5] = 0; - eventTimes[index$5] = -1; - expirationTimes[index$5] = -1; - var hiddenUpdatesForLane = root[index$5]; + var index$4 = 31 - clz32(noLongerPendingLanes), + lane = 1 << index$4; + remainingLanes[index$4] = 0; + eventTimes[index$4] = -1; + expirationTimes[index$4] = -1; + var hiddenUpdatesForLane = root[index$4]; if (null !== hiddenUpdatesForLane) for ( - root[index$5] = null, index$5 = 0; - index$5 < hiddenUpdatesForLane.length; - index$5++ + root[index$4] = null, index$4 = 0; + index$4 < hiddenUpdatesForLane.length; + index$4++ ) { - var update = hiddenUpdatesForLane[index$5]; + var update = hiddenUpdatesForLane[index$4]; null !== update && (update.lane &= -1073741825); } noLongerPendingLanes &= ~lane; @@ -526,10 +526,10 @@ function markRootFinished(root, remainingLanes) { function markRootEntangled(root, entangledLanes) { var rootEntangledLanes = (root.entangledLanes |= entangledLanes); for (root = root.entanglements; rootEntangledLanes; ) { - var index$6 = 31 - clz32(rootEntangledLanes), - lane = 1 << index$6; - (lane & entangledLanes) | (root[index$6] & entangledLanes) && - (root[index$6] |= entangledLanes); + var index$5 = 31 - clz32(rootEntangledLanes), + lane = 1 << index$5; + (lane & entangledLanes) | (root[index$5] & entangledLanes) && + (root[index$5] |= entangledLanes); rootEntangledLanes &= ~lane; } } @@ -2144,10 +2144,10 @@ createFunctionComponentUpdateQueue = function () { function use(usable) { if (null !== usable && "object" === typeof usable) { if ("function" === typeof usable.then) { - var index$23 = thenableIndexCounter; + var index$22 = thenableIndexCounter; thenableIndexCounter += 1; null === thenableState && (thenableState = []); - usable = trackUsedThenable(thenableState, usable, index$23); + usable = trackUsedThenable(thenableState, usable, index$22); null === currentlyRenderingFiber$1.alternate && (null === workInProgressHook ? null === currentlyRenderingFiber$1.memoizedState @@ -4385,14 +4385,14 @@ function cutOffTailIfNeeded(renderState, hasRenderedATailFallback) { break; case "collapsed": lastTailNode = renderState.tail; - for (var lastTailNode$60 = null; null !== lastTailNode; ) - null !== lastTailNode.alternate && (lastTailNode$60 = lastTailNode), + for (var lastTailNode$59 = null; null !== lastTailNode; ) + null !== lastTailNode.alternate && (lastTailNode$59 = lastTailNode), (lastTailNode = lastTailNode.sibling); - null === lastTailNode$60 + null === lastTailNode$59 ? hasRenderedATailFallback || null === renderState.tail ? (renderState.tail = null) : (renderState.tail.sibling = null) - : (lastTailNode$60.sibling = null); + : (lastTailNode$59.sibling = null); } } function bubbleProperties(completedWork) { @@ -4404,53 +4404,53 @@ function bubbleProperties(completedWork) { if (didBailout) if (0 !== (completedWork.mode & 2)) { for ( - var treeBaseDuration$62 = completedWork.selfBaseDuration, - child$63 = completedWork.child; - null !== child$63; + var treeBaseDuration$61 = completedWork.selfBaseDuration, + child$62 = completedWork.child; + null !== child$62; ) - (newChildLanes |= child$63.lanes | child$63.childLanes), - (subtreeFlags |= child$63.subtreeFlags & 31457280), - (subtreeFlags |= child$63.flags & 31457280), - (treeBaseDuration$62 += child$63.treeBaseDuration), - (child$63 = child$63.sibling); - completedWork.treeBaseDuration = treeBaseDuration$62; + (newChildLanes |= child$62.lanes | child$62.childLanes), + (subtreeFlags |= child$62.subtreeFlags & 31457280), + (subtreeFlags |= child$62.flags & 31457280), + (treeBaseDuration$61 += child$62.treeBaseDuration), + (child$62 = child$62.sibling); + completedWork.treeBaseDuration = treeBaseDuration$61; } else for ( - treeBaseDuration$62 = completedWork.child; - null !== treeBaseDuration$62; + treeBaseDuration$61 = completedWork.child; + null !== treeBaseDuration$61; ) (newChildLanes |= - treeBaseDuration$62.lanes | treeBaseDuration$62.childLanes), - (subtreeFlags |= treeBaseDuration$62.subtreeFlags & 31457280), - (subtreeFlags |= treeBaseDuration$62.flags & 31457280), - (treeBaseDuration$62.return = completedWork), - (treeBaseDuration$62 = treeBaseDuration$62.sibling); + treeBaseDuration$61.lanes | treeBaseDuration$61.childLanes), + (subtreeFlags |= treeBaseDuration$61.subtreeFlags & 31457280), + (subtreeFlags |= treeBaseDuration$61.flags & 31457280), + (treeBaseDuration$61.return = completedWork), + (treeBaseDuration$61 = treeBaseDuration$61.sibling); else if (0 !== (completedWork.mode & 2)) { - treeBaseDuration$62 = completedWork.actualDuration; - child$63 = completedWork.selfBaseDuration; + treeBaseDuration$61 = completedWork.actualDuration; + child$62 = completedWork.selfBaseDuration; for (var child = completedWork.child; null !== child; ) (newChildLanes |= child.lanes | child.childLanes), (subtreeFlags |= child.subtreeFlags), (subtreeFlags |= child.flags), - (treeBaseDuration$62 += child.actualDuration), - (child$63 += child.treeBaseDuration), + (treeBaseDuration$61 += child.actualDuration), + (child$62 += child.treeBaseDuration), (child = child.sibling); - completedWork.actualDuration = treeBaseDuration$62; - completedWork.treeBaseDuration = child$63; + completedWork.actualDuration = treeBaseDuration$61; + completedWork.treeBaseDuration = child$62; } else for ( - treeBaseDuration$62 = completedWork.child; - null !== treeBaseDuration$62; + treeBaseDuration$61 = completedWork.child; + null !== treeBaseDuration$61; ) (newChildLanes |= - treeBaseDuration$62.lanes | treeBaseDuration$62.childLanes), - (subtreeFlags |= treeBaseDuration$62.subtreeFlags), - (subtreeFlags |= treeBaseDuration$62.flags), - (treeBaseDuration$62.return = completedWork), - (treeBaseDuration$62 = treeBaseDuration$62.sibling); + treeBaseDuration$61.lanes | treeBaseDuration$61.childLanes), + (subtreeFlags |= treeBaseDuration$61.subtreeFlags), + (subtreeFlags |= treeBaseDuration$61.flags), + (treeBaseDuration$61.return = completedWork), + (treeBaseDuration$61 = treeBaseDuration$61.sibling); completedWork.subtreeFlags |= subtreeFlags; completedWork.childLanes = newChildLanes; return didBailout; @@ -4622,11 +4622,11 @@ function completeWork(current, workInProgress, renderLanes) { null !== newProps.alternate.memoizedState && null !== newProps.alternate.memoizedState.cachePool && (index = newProps.alternate.memoizedState.cachePool.pool); - var cache$70 = null; + var cache$69 = null; null !== newProps.memoizedState && null !== newProps.memoizedState.cachePool && - (cache$70 = newProps.memoizedState.cachePool.pool); - cache$70 !== index && (newProps.flags |= 2048); + (cache$69 = newProps.memoizedState.cachePool.pool); + cache$69 !== index && (newProps.flags |= 2048); } renderLanes !== current && renderLanes && @@ -4658,8 +4658,8 @@ function completeWork(current, workInProgress, renderLanes) { index = workInProgress.memoizedState; if (null === index) return bubbleProperties(workInProgress), null; newProps = 0 !== (workInProgress.flags & 128); - cache$70 = index.rendering; - if (null === cache$70) + cache$69 = index.rendering; + if (null === cache$69) if (newProps) cutOffTailIfNeeded(index, !1); else { if ( @@ -4667,11 +4667,11 @@ function completeWork(current, workInProgress, renderLanes) { (null !== current && 0 !== (current.flags & 128)) ) for (current = workInProgress.child; null !== current; ) { - cache$70 = findFirstSuspended(current); - if (null !== cache$70) { + cache$69 = findFirstSuspended(current); + if (null !== cache$69) { workInProgress.flags |= 128; cutOffTailIfNeeded(index, !1); - current = cache$70.updateQueue; + current = cache$69.updateQueue; workInProgress.updateQueue = current; scheduleRetryEffect(workInProgress, current); workInProgress.subtreeFlags = 0; @@ -4696,7 +4696,7 @@ function completeWork(current, workInProgress, renderLanes) { } else { if (!newProps) - if (((current = findFirstSuspended(cache$70)), null !== current)) { + if (((current = findFirstSuspended(cache$69)), null !== current)) { if ( ((workInProgress.flags |= 128), (newProps = !0), @@ -4706,7 +4706,7 @@ function completeWork(current, workInProgress, renderLanes) { cutOffTailIfNeeded(index, !0), null === index.tail && "hidden" === index.tailMode && - !cache$70.alternate) + !cache$69.alternate) ) return bubbleProperties(workInProgress), null; } else @@ -4718,13 +4718,13 @@ function completeWork(current, workInProgress, renderLanes) { cutOffTailIfNeeded(index, !1), (workInProgress.lanes = 8388608)); index.isBackwards - ? ((cache$70.sibling = workInProgress.child), - (workInProgress.child = cache$70)) + ? ((cache$69.sibling = workInProgress.child), + (workInProgress.child = cache$69)) : ((current = index.last), null !== current - ? (current.sibling = cache$70) - : (workInProgress.child = cache$70), - (index.last = cache$70)); + ? (current.sibling = cache$69) + : (workInProgress.child = cache$69), + (index.last = cache$69)); } if (null !== index.tail) return ( @@ -4980,8 +4980,8 @@ function safelyDetachRef(current, nearestMountedAncestor) { recordLayoutEffectDuration(current); } else ref(null); - } catch (error$86) { - captureCommitPhaseError(current, nearestMountedAncestor, error$86); + } catch (error$85) { + captureCommitPhaseError(current, nearestMountedAncestor, error$85); } else ref.current = null; } @@ -5087,10 +5087,10 @@ function commitHookEffectListMount(flags, finishedWork) { var effect = (finishedWork = finishedWork.next); do { if ((effect.tag & flags) === flags) { - var create$87 = effect.create, + var create$86 = effect.create, inst = effect.inst; - create$87 = create$87(); - inst.destroy = create$87; + create$86 = create$86(); + inst.destroy = create$86; } effect = effect.next; } while (effect !== finishedWork); @@ -5108,8 +5108,8 @@ function commitHookLayoutEffects(finishedWork, hookFlags) { } else try { commitHookEffectListMount(hookFlags, finishedWork); - } catch (error$89) { - captureCommitPhaseError(finishedWork, finishedWork.return, error$89); + } catch (error$88) { + captureCommitPhaseError(finishedWork, finishedWork.return, error$88); } } function commitClassCallbacks(finishedWork) { @@ -5189,11 +5189,11 @@ function commitLayoutEffectOnFiber(finishedRoot, current, finishedWork) { } else try { finishedRoot.componentDidMount(); - } catch (error$90) { + } catch (error$89) { captureCommitPhaseError( finishedWork, finishedWork.return, - error$90 + error$89 ); } else { @@ -5210,11 +5210,11 @@ function commitLayoutEffectOnFiber(finishedRoot, current, finishedWork) { current, finishedRoot.__reactInternalSnapshotBeforeUpdate ); - } catch (error$91) { + } catch (error$90) { captureCommitPhaseError( finishedWork, finishedWork.return, - error$91 + error$90 ); } recordLayoutEffectDuration(finishedWork); @@ -5225,11 +5225,11 @@ function commitLayoutEffectOnFiber(finishedRoot, current, finishedWork) { current, finishedRoot.__reactInternalSnapshotBeforeUpdate ); - } catch (error$92) { + } catch (error$91) { captureCommitPhaseError( finishedWork, finishedWork.return, - error$92 + error$91 ); } } @@ -5616,22 +5616,22 @@ function commitMutationEffectsOnFiber(finishedWork, root) { try { startLayoutEffectTimer(), commitHookEffectListUnmount(5, finishedWork, finishedWork.return); - } catch (error$101) { + } catch (error$100) { captureCommitPhaseError( finishedWork, finishedWork.return, - error$101 + error$100 ); } recordLayoutEffectDuration(finishedWork); } else try { commitHookEffectListUnmount(5, finishedWork, finishedWork.return); - } catch (error$102) { + } catch (error$101) { captureCommitPhaseError( finishedWork, finishedWork.return, - error$102 + error$101 ); } } @@ -5670,8 +5670,8 @@ function commitMutationEffectsOnFiber(finishedWork, root) { finishedWork.updateQueue = null; try { (flags.type = type), (flags.props = existingHiddenCallbacks); - } catch (error$105) { - captureCommitPhaseError(finishedWork, finishedWork.return, error$105); + } catch (error$104) { + captureCommitPhaseError(finishedWork, finishedWork.return, error$104); } } break; @@ -5687,8 +5687,8 @@ function commitMutationEffectsOnFiber(finishedWork, root) { existingHiddenCallbacks = finishedWork.memoizedProps; try { flags.text = existingHiddenCallbacks; - } catch (error$106) { - captureCommitPhaseError(finishedWork, finishedWork.return, error$106); + } catch (error$105) { + captureCommitPhaseError(finishedWork, finishedWork.return, error$105); } } break; @@ -5720,14 +5720,14 @@ function commitMutationEffectsOnFiber(finishedWork, root) { null !== current && safelyDetachRef(current, current.return); existingHiddenCallbacks = null !== finishedWork.memoizedState; - var wasHidden$110 = null !== current && null !== current.memoizedState; + var wasHidden$109 = null !== current && null !== current.memoizedState; if (finishedWork.mode & 1) { var prevOffscreenSubtreeIsHidden = offscreenSubtreeIsHidden, prevOffscreenSubtreeWasHidden = offscreenSubtreeWasHidden; offscreenSubtreeIsHidden = prevOffscreenSubtreeIsHidden || existingHiddenCallbacks; offscreenSubtreeWasHidden = - prevOffscreenSubtreeWasHidden || wasHidden$110; + prevOffscreenSubtreeWasHidden || wasHidden$109; recursivelyTraverseMutationEffects(root, finishedWork); offscreenSubtreeWasHidden = prevOffscreenSubtreeWasHidden; offscreenSubtreeIsHidden = prevOffscreenSubtreeIsHidden; @@ -5745,22 +5745,22 @@ function commitMutationEffectsOnFiber(finishedWork, root) { existingHiddenCallbacks && ((root = offscreenSubtreeIsHidden || offscreenSubtreeWasHidden), null === current || - wasHidden$110 || + wasHidden$109 || root || (0 !== (finishedWork.mode & 1) && recursivelyTraverseDisappearLayoutEffects(finishedWork))), null === finishedWork.memoizedProps || "manual" !== finishedWork.memoizedProps.mode) ) - a: for (current = null, wasHidden$110 = finishedWork; ; ) { - if (5 === wasHidden$110.tag) { + a: for (current = null, wasHidden$109 = finishedWork; ; ) { + if (5 === wasHidden$109.tag) { if (null === current) { - current = wasHidden$110; + current = wasHidden$109; try { - (type = wasHidden$110.stateNode), + (type = wasHidden$109.stateNode), existingHiddenCallbacks ? (type.isHidden = !0) - : (wasHidden$110.stateNode.isHidden = !1); + : (wasHidden$109.stateNode.isHidden = !1); } catch (error) { captureCommitPhaseError( finishedWork, @@ -5769,42 +5769,42 @@ function commitMutationEffectsOnFiber(finishedWork, root) { ); } } - } else if (6 === wasHidden$110.tag) { + } else if (6 === wasHidden$109.tag) { if (null === current) try { - wasHidden$110.stateNode.isHidden = existingHiddenCallbacks + wasHidden$109.stateNode.isHidden = existingHiddenCallbacks ? !0 : !1; - } catch (error$95) { + } catch (error$94) { captureCommitPhaseError( finishedWork, finishedWork.return, - error$95 + error$94 ); } } else if ( - ((22 !== wasHidden$110.tag && 23 !== wasHidden$110.tag) || - null === wasHidden$110.memoizedState || - wasHidden$110 === finishedWork) && - null !== wasHidden$110.child + ((22 !== wasHidden$109.tag && 23 !== wasHidden$109.tag) || + null === wasHidden$109.memoizedState || + wasHidden$109 === finishedWork) && + null !== wasHidden$109.child ) { - wasHidden$110.child.return = wasHidden$110; - wasHidden$110 = wasHidden$110.child; + wasHidden$109.child.return = wasHidden$109; + wasHidden$109 = wasHidden$109.child; continue; } - if (wasHidden$110 === finishedWork) break a; - for (; null === wasHidden$110.sibling; ) { + if (wasHidden$109 === finishedWork) break a; + for (; null === wasHidden$109.sibling; ) { if ( - null === wasHidden$110.return || - wasHidden$110.return === finishedWork + null === wasHidden$109.return || + wasHidden$109.return === finishedWork ) break a; - current === wasHidden$110 && (current = null); - wasHidden$110 = wasHidden$110.return; + current === wasHidden$109 && (current = null); + wasHidden$109 = wasHidden$109.return; } - current === wasHidden$110 && (current = null); - wasHidden$110.sibling.return = wasHidden$110.return; - wasHidden$110 = wasHidden$110.sibling; + current === wasHidden$109 && (current = null); + wasHidden$109.sibling.return = wasHidden$109.return; + wasHidden$109 = wasHidden$109.sibling; } flags & 4 && ((flags = finishedWork.updateQueue), @@ -5860,12 +5860,12 @@ function commitReconciliationEffects(finishedWork) { break; case 3: case 4: - var parent$96 = JSCompiler_inline_result.stateNode.containerInfo, - before$97 = getHostSibling(finishedWork); + var parent$95 = JSCompiler_inline_result.stateNode.containerInfo, + before$96 = getHostSibling(finishedWork); insertOrAppendPlacementNodeIntoContainer( finishedWork, - before$97, - parent$96 + before$96, + parent$95 ); break; default: @@ -6045,8 +6045,8 @@ function commitHookPassiveMountEffects(finishedWork, hookFlags) { } else try { commitHookEffectListMount(hookFlags, finishedWork); - } catch (error$113) { - captureCommitPhaseError(finishedWork, finishedWork.return, error$113); + } catch (error$112) { + captureCommitPhaseError(finishedWork, finishedWork.return, error$112); } } function commitOffscreenPassiveMountEffects(current, finishedWork) { @@ -6645,12 +6645,12 @@ function scheduleTaskForRootDuringMicrotask(root, currentTime) { 0 < lanes; ) { - var index$3 = 31 - clz32(lanes), - lane = 1 << index$3, - expirationTime = expirationTimes[index$3]; + var index$2 = 31 - clz32(lanes), + lane = 1 << index$2, + expirationTime = expirationTimes[index$2]; if (-1 === expirationTime) { if (0 === (lane & suspendedLanes) || 0 !== (lane & pingedLanes)) - expirationTimes[index$3] = computeExpirationTime(lane, currentTime); + expirationTimes[index$2] = computeExpirationTime(lane, currentTime); } else expirationTime <= currentTime && (root.expiredLanes |= lane); lanes &= ~lane; } @@ -6707,8 +6707,7 @@ function scheduleTaskForRootDuringMicrotask(root, currentTime) { root.callbackNode = suspendedLanes; return currentTime; } -var ceil = Math.ceil, - PossiblyWeakMap = "function" === typeof WeakMap ? WeakMap : Map, +var PossiblyWeakMap = "function" === typeof WeakMap ? WeakMap : Map, ReactCurrentDispatcher = ReactSharedInternals.ReactCurrentDispatcher, ReactCurrentCache = ReactSharedInternals.ReactCurrentCache, ReactCurrentOwner = ReactSharedInternals.ReactCurrentOwner, @@ -6799,28 +6798,28 @@ function performConcurrentWorkOnRoot(root, didTimeout) { root === workInProgressRoot ? workInProgressRootRenderLanes : 0 ); if (0 === lanes) return null; - var exitStatus = + didTimeout = includesBlockingLane(root, lanes) || 0 !== (lanes & root.expiredLanes) || didTimeout ? renderRootSync(root, lanes) : renderRootConcurrent(root, lanes); - if (0 !== exitStatus) { - if (2 === exitStatus) { - didTimeout = lanes; - var errorRetryLanes = getLanesToRetrySynchronouslyOnError( - root, - didTimeout - ); + if (0 !== didTimeout) { + if (2 === didTimeout) { + var originallyAttemptedLanes = lanes, + errorRetryLanes = getLanesToRetrySynchronouslyOnError( + root, + originallyAttemptedLanes + ); 0 !== errorRetryLanes && ((lanes = errorRetryLanes), - (exitStatus = recoverFromConcurrentError( + (didTimeout = recoverFromConcurrentError( root, - didTimeout, + originallyAttemptedLanes, errorRetryLanes ))); } - if (1 === exitStatus) + if (1 === didTimeout) throw ( ((originalCallbackNode = workInProgressRootFatalError), prepareFreshStack(root, 0), @@ -6828,30 +6827,30 @@ function performConcurrentWorkOnRoot(root, didTimeout) { ensureRootIsScheduled(root), originalCallbackNode) ); - if (6 === exitStatus) markRootSuspended(root, lanes); + if (6 === didTimeout) markRootSuspended(root, lanes); else { errorRetryLanes = !includesBlockingLane(root, lanes); - didTimeout = root.current.alternate; + originallyAttemptedLanes = root.current.alternate; if ( errorRetryLanes && - !isRenderConsistentWithExternalStores(didTimeout) + !isRenderConsistentWithExternalStores(originallyAttemptedLanes) ) { - exitStatus = renderRootSync(root, lanes); - if (2 === exitStatus) { + didTimeout = renderRootSync(root, lanes); + if (2 === didTimeout) { errorRetryLanes = lanes; - var errorRetryLanes$120 = getLanesToRetrySynchronouslyOnError( + var errorRetryLanes$119 = getLanesToRetrySynchronouslyOnError( root, errorRetryLanes ); - 0 !== errorRetryLanes$120 && - ((lanes = errorRetryLanes$120), - (exitStatus = recoverFromConcurrentError( + 0 !== errorRetryLanes$119 && + ((lanes = errorRetryLanes$119), + (didTimeout = recoverFromConcurrentError( root, errorRetryLanes, - errorRetryLanes$120 + errorRetryLanes$119 ))); } - if (1 === exitStatus) + if (1 === didTimeout) throw ( ((originalCallbackNode = workInProgressRootFatalError), prepareFreshStack(root, 0), @@ -6860,16 +6859,16 @@ function performConcurrentWorkOnRoot(root, didTimeout) { originalCallbackNode) ); } - root.finishedWork = didTimeout; + root.finishedWork = originallyAttemptedLanes; root.finishedLanes = lanes; - switch (exitStatus) { + switch (didTimeout) { case 0: case 1: throw Error("Root did not complete. This is a bug in React."); case 2: commitRootWhenReady( root, - didTimeout, + originallyAttemptedLanes, workInProgressRootRecoverableErrors, workInProgressTransitions, lanes @@ -6879,26 +6878,26 @@ function performConcurrentWorkOnRoot(root, didTimeout) { markRootSuspended(root, lanes); if ( (lanes & 125829120) === lanes && - ((exitStatus = globalMostRecentFallbackTime + 500 - now$1()), - 10 < exitStatus) + ((didTimeout = globalMostRecentFallbackTime + 500 - now$1()), + 10 < didTimeout) ) { if (0 !== getNextLanes(root, 0)) break; root.timeoutHandle = scheduleTimeout( commitRootWhenReady.bind( null, root, - didTimeout, + originallyAttemptedLanes, workInProgressRootRecoverableErrors, workInProgressTransitions, lanes ), - exitStatus + didTimeout ); break; } commitRootWhenReady( root, - didTimeout, + originallyAttemptedLanes, workInProgressRootRecoverableErrors, workInProgressTransitions, lanes @@ -6907,48 +6906,9 @@ function performConcurrentWorkOnRoot(root, didTimeout) { case 4: markRootSuspended(root, lanes); if ((lanes & 8388480) === lanes) break; - exitStatus = lanes; - errorRetryLanes = root.eventTimes; - for (errorRetryLanes$120 = -1; 0 < exitStatus; ) { - var index$2 = 31 - clz32(exitStatus), - lane = 1 << index$2; - index$2 = errorRetryLanes[index$2]; - index$2 > errorRetryLanes$120 && (errorRetryLanes$120 = index$2); - exitStatus &= ~lane; - } - exitStatus = errorRetryLanes$120; - exitStatus = now$1() - exitStatus; - exitStatus = - (120 > exitStatus - ? 120 - : 480 > exitStatus - ? 480 - : 1080 > exitStatus - ? 1080 - : 1920 > exitStatus - ? 1920 - : 3e3 > exitStatus - ? 3e3 - : 4320 > exitStatus - ? 4320 - : 1960 * ceil(exitStatus / 1960)) - exitStatus; - if (10 < exitStatus) { - root.timeoutHandle = scheduleTimeout( - commitRootWhenReady.bind( - null, - root, - didTimeout, - workInProgressRootRecoverableErrors, - workInProgressTransitions, - lanes - ), - exitStatus - ); - break; - } commitRootWhenReady( root, - didTimeout, + originallyAttemptedLanes, workInProgressRootRecoverableErrors, workInProgressTransitions, lanes @@ -6957,7 +6917,7 @@ function performConcurrentWorkOnRoot(root, didTimeout) { case 5: commitRootWhenReady( root, - didTimeout, + originallyAttemptedLanes, workInProgressRootRecoverableErrors, workInProgressTransitions, lanes @@ -7061,9 +7021,9 @@ function markRootSuspended(root, suspendedLanes) { root.suspendedLanes |= suspendedLanes; root.pingedLanes &= ~suspendedLanes; for (root = root.expirationTimes; 0 < suspendedLanes; ) { - var index$4 = 31 - clz32(suspendedLanes), - lane = 1 << index$4; - root[index$4] = -1; + var index$3 = 31 - clz32(suspendedLanes), + lane = 1 << index$3; + root[index$3] = -1; suspendedLanes &= ~lane; } } @@ -7215,8 +7175,8 @@ function renderRootSync(root, lanes) { } workLoopSync(); break; - } catch (thrownValue$123) { - handleThrow(root, thrownValue$123); + } catch (thrownValue$121) { + handleThrow(root, thrownValue$121); } while (1); resetContextDependencies(); @@ -7323,8 +7283,8 @@ function renderRootConcurrent(root, lanes) { } workLoopConcurrent(); break; - } catch (thrownValue$125) { - handleThrow(root, thrownValue$125); + } catch (thrownValue$123) { + handleThrow(root, thrownValue$123); } while (1); resetContextDependencies(); @@ -7501,10 +7461,10 @@ function throwAndUnwindWorkLoop(unitOfWork, thrownValue) { }; suspenseBoundary.updateQueue = newOffscreenQueue; } else { - var retryQueue$29 = offscreenQueue.retryQueue; - null === retryQueue$29 + var retryQueue$28 = offscreenQueue.retryQueue; + null === retryQueue$28 ? (offscreenQueue.retryQueue = new Set([wakeable])) - : retryQueue$29.add(wakeable); + : retryQueue$28.add(wakeable); } } break; @@ -7794,11 +7754,11 @@ function flushPassiveEffects() { _finishedWork$memoize = finishedWork.memoizedProps, id = _finishedWork$memoize.id, onPostCommit = _finishedWork$memoize.onPostCommit, - commitTime$88 = commitTime, + commitTime$87 = commitTime, phase = null === finishedWork.alternate ? "mount" : "update"; currentUpdateIsNested && (phase = "nested-update"); "function" === typeof onPostCommit && - onPostCommit(id, phase, passiveEffectDuration, commitTime$88); + onPostCommit(id, phase, passiveEffectDuration, commitTime$87); var parentFiber = finishedWork.return; b: for (; null !== parentFiber; ) { switch (parentFiber.tag) { @@ -9100,19 +9060,19 @@ function wrapFiber(fiber) { fiberToWrapper.set(fiber, wrapper)); return wrapper; } -var devToolsConfig$jscomp$inline_1069 = { +var devToolsConfig$jscomp$inline_1063 = { findFiberByHostInstance: function () { throw Error("TestRenderer does not support findFiberByHostInstance()"); }, bundleType: 0, - version: "18.3.0-next-ac43bf687-20230410", + version: "18.3.0-next-0b931f90e-20230411", rendererPackageName: "react-test-renderer" }; -var internals$jscomp$inline_1260 = { - bundleType: devToolsConfig$jscomp$inline_1069.bundleType, - version: devToolsConfig$jscomp$inline_1069.version, - rendererPackageName: devToolsConfig$jscomp$inline_1069.rendererPackageName, - rendererConfig: devToolsConfig$jscomp$inline_1069.rendererConfig, +var internals$jscomp$inline_1245 = { + bundleType: devToolsConfig$jscomp$inline_1063.bundleType, + version: devToolsConfig$jscomp$inline_1063.version, + rendererPackageName: devToolsConfig$jscomp$inline_1063.rendererPackageName, + rendererConfig: devToolsConfig$jscomp$inline_1063.rendererConfig, overrideHookState: null, overrideHookStateDeletePath: null, overrideHookStateRenamePath: null, @@ -9129,26 +9089,26 @@ var internals$jscomp$inline_1260 = { return null === fiber ? null : fiber.stateNode; }, findFiberByHostInstance: - devToolsConfig$jscomp$inline_1069.findFiberByHostInstance || + devToolsConfig$jscomp$inline_1063.findFiberByHostInstance || emptyFindFiberByHostInstance, findHostInstancesForRefresh: null, scheduleRefresh: null, scheduleRoot: null, setRefreshHandler: null, getCurrentFiber: null, - reconcilerVersion: "18.3.0-next-ac43bf687-20230410" + reconcilerVersion: "18.3.0-next-0b931f90e-20230411" }; if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) { - var hook$jscomp$inline_1261 = __REACT_DEVTOOLS_GLOBAL_HOOK__; + var hook$jscomp$inline_1246 = __REACT_DEVTOOLS_GLOBAL_HOOK__; if ( - !hook$jscomp$inline_1261.isDisabled && - hook$jscomp$inline_1261.supportsFiber + !hook$jscomp$inline_1246.isDisabled && + hook$jscomp$inline_1246.supportsFiber ) try { - (rendererID = hook$jscomp$inline_1261.inject( - internals$jscomp$inline_1260 + (rendererID = hook$jscomp$inline_1246.inject( + internals$jscomp$inline_1245 )), - (injectedHook = hook$jscomp$inline_1261); + (injectedHook = hook$jscomp$inline_1246); } catch (err) {} } exports._Scheduler = Scheduler; diff --git a/compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react/cjs/React-dev.js b/compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react/cjs/React-dev.js index 87999d061f..75cfa6120d 100644 --- a/compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react/cjs/React-dev.js +++ b/compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react/cjs/React-dev.js @@ -27,7 +27,7 @@ if ( } "use strict"; -var ReactVersion = "18.3.0-next-ac43bf687-20230410"; +var ReactVersion = "18.3.0-next-0b931f90e-20230411"; // ATTENTION // When adding new symbols to this file, diff --git a/compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react/cjs/React-prod.js b/compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react/cjs/React-prod.js index 8cce145224..c2d7608f89 100644 --- a/compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react/cjs/React-prod.js +++ b/compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react/cjs/React-prod.js @@ -639,4 +639,4 @@ exports.useSyncExternalStore = function ( ); }; exports.useTransition = useTransition; -exports.version = "18.3.0-next-ac43bf687-20230410"; +exports.version = "18.3.0-next-0b931f90e-20230411"; diff --git a/compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react/cjs/React-profiling.js b/compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react/cjs/React-profiling.js index cfc92feb82..1309468f31 100644 --- a/compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react/cjs/React-profiling.js +++ b/compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react/cjs/React-profiling.js @@ -642,7 +642,7 @@ exports.useSyncExternalStore = function ( ); }; exports.useTransition = useTransition; -exports.version = "18.3.0-next-ac43bf687-20230410"; +exports.version = "18.3.0-next-0b931f90e-20230411"; /* global __REACT_DEVTOOLS_GLOBAL_HOOK__ */ if ( diff --git a/compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/REVISION b/compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/REVISION index 33a28b915b..3133e22f42 100644 --- a/compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/REVISION +++ b/compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/REVISION @@ -1 +1 @@ -ac43bf6870a15566507477a4504f22160835c8d3 +0b931f90e8964183f08ac328e7350d847abb08f9 diff --git a/compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/implementations/ReactFabric-dev.fb.js b/compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/implementations/ReactFabric-dev.fb.js index 88ccb6f23e..f877a3e5c0 100644 --- a/compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/implementations/ReactFabric-dev.fb.js +++ b/compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/implementations/ReactFabric-dev.fb.js @@ -4271,24 +4271,6 @@ function getNextLanes(root, wipLanes) { return nextLanes; } -function getMostRecentEventTime(root, lanes) { - var eventTimes = root.eventTimes; - var mostRecentEventTime = NoTimestamp; - - while (lanes > 0) { - var index = pickArbitraryLaneIndex(lanes); - var lane = 1 << index; - var eventTime = eventTimes[index]; - - if (eventTime > mostRecentEventTime) { - mostRecentEventTime = eventTime; - } - - lanes &= ~lane; - } - - return mostRecentEventTime; -} function computeExpirationTime(lane, currentTime) { switch (lane) { @@ -22870,7 +22852,6 @@ function scheduleImmediateTask(cb) { } } -var ceil = Math.ceil; var PossiblyWeakMap = typeof WeakMap === "function" ? WeakMap : Map; var ReactCurrentDispatcher = ReactSharedInternals.ReactCurrentDispatcher, ReactCurrentOwner$1 = ReactSharedInternals.ReactCurrentOwner, @@ -23499,37 +23480,6 @@ function finishConcurrentRender(root, exitStatus, finishedWork, lanes) { // placeholder and without scheduling a timeout. Delay indefinitely // until we receive more data. break; - } - - if (!shouldForceFlushFallbacksInDEV()) { - // This is not a transition, but we did trigger an avoided state. - // Schedule a placeholder to display after a short delay, using the Just - // Noticeable Difference. - // TODO: Is the JND optimization worth the added complexity? If this is - // the only reason we track the event time, then probably not. - // Consider removing. - var mostRecentEventTime = getMostRecentEventTime(root, lanes); - var eventTimeMs = mostRecentEventTime; - var timeElapsedMs = now$1() - eventTimeMs; - - var _msUntilTimeout = jnd(timeElapsedMs) - timeElapsedMs; // Don't bother with a very short suspense time. - - if (_msUntilTimeout > 10) { - // Instead of committing the fallback immediately, wait for more data - // to arrive. - root.timeoutHandle = scheduleTimeout( - commitRootWhenReady.bind( - null, - root, - finishedWork, - workInProgressRootRecoverableErrors, - workInProgressTransitions, - lanes - ), - _msUntilTimeout - ); - break; - } } // Commit the placeholder. commitRootWhenReady( @@ -25530,32 +25480,7 @@ function resolveRetryWakeable(boundaryFiber, wakeable) { } retryTimedOutBoundary(boundaryFiber, retryLane); -} // Computes the next Just Noticeable Difference (JND) boundary. -// The theory is that a person can't tell the difference between small differences in time. -// Therefore, if we wait a bit longer than necessary that won't translate to a noticeable -// difference in the experience. However, waiting for longer might mean that we can avoid -// showing an intermediate loading state. The longer we have already waited, the harder it -// is to tell small differences in time. Therefore, the longer we've already waited, -// the longer we can wait additionally. At some point we have to give up though. -// We pick a train model where the next boundary commits at a consistent schedule. -// These particular numbers are vague estimates. We expect to adjust them based on research. - -function jnd(timeElapsed) { - return timeElapsed < 120 - ? 120 - : timeElapsed < 480 - ? 480 - : timeElapsed < 1080 - ? 1080 - : timeElapsed < 1920 - ? 1920 - : timeElapsed < 3000 - ? 3000 - : timeElapsed < 4320 - ? 4320 - : ceil(timeElapsed / 1960) * 1960; } - function throwIfInfiniteUpdateLoopDetected() { if (nestedUpdateCount > NESTED_UPDATE_LIMIT) { nestedUpdateCount = 0; @@ -27178,7 +27103,7 @@ function createFiberRoot( return root; } -var ReactVersion = "18.3.0-next-ac43bf687-20230410"; +var ReactVersion = "18.3.0-next-0b931f90e-20230411"; function createPortal$1( children, diff --git a/compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/implementations/ReactFabric-prod.fb.js b/compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/implementations/ReactFabric-prod.fb.js index b0802880b0..4ea9362c47 100644 --- a/compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/implementations/ReactFabric-prod.fb.js +++ b/compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/implementations/ReactFabric-prod.fb.js @@ -940,7 +940,7 @@ eventPluginOrder = Array.prototype.slice.call([ "ReactNativeBridgeEventPlugin" ]); recomputePluginOrdering(); -var injectedNamesToPlugins$jscomp$inline_244 = { +var injectedNamesToPlugins$jscomp$inline_242 = { ResponderEventPlugin: ResponderEventPlugin, ReactNativeBridgeEventPlugin: { eventTypes: {}, @@ -986,32 +986,32 @@ var injectedNamesToPlugins$jscomp$inline_244 = { } } }, - isOrderingDirty$jscomp$inline_245 = !1, - pluginName$jscomp$inline_246; -for (pluginName$jscomp$inline_246 in injectedNamesToPlugins$jscomp$inline_244) + isOrderingDirty$jscomp$inline_243 = !1, + pluginName$jscomp$inline_244; +for (pluginName$jscomp$inline_244 in injectedNamesToPlugins$jscomp$inline_242) if ( - injectedNamesToPlugins$jscomp$inline_244.hasOwnProperty( - pluginName$jscomp$inline_246 + injectedNamesToPlugins$jscomp$inline_242.hasOwnProperty( + pluginName$jscomp$inline_244 ) ) { - var pluginModule$jscomp$inline_247 = - injectedNamesToPlugins$jscomp$inline_244[pluginName$jscomp$inline_246]; + var pluginModule$jscomp$inline_245 = + injectedNamesToPlugins$jscomp$inline_242[pluginName$jscomp$inline_244]; if ( - !namesToPlugins.hasOwnProperty(pluginName$jscomp$inline_246) || - namesToPlugins[pluginName$jscomp$inline_246] !== - pluginModule$jscomp$inline_247 + !namesToPlugins.hasOwnProperty(pluginName$jscomp$inline_244) || + namesToPlugins[pluginName$jscomp$inline_244] !== + pluginModule$jscomp$inline_245 ) { - if (namesToPlugins[pluginName$jscomp$inline_246]) + if (namesToPlugins[pluginName$jscomp$inline_244]) throw Error( "EventPluginRegistry: Cannot inject two different event plugins using the same name, `" + - (pluginName$jscomp$inline_246 + "`.") + (pluginName$jscomp$inline_244 + "`.") ); - namesToPlugins[pluginName$jscomp$inline_246] = - pluginModule$jscomp$inline_247; - isOrderingDirty$jscomp$inline_245 = !0; + namesToPlugins[pluginName$jscomp$inline_244] = + pluginModule$jscomp$inline_245; + isOrderingDirty$jscomp$inline_243 = !0; } } -isOrderingDirty$jscomp$inline_245 && recomputePluginOrdering(); +isOrderingDirty$jscomp$inline_243 && recomputePluginOrdering(); var emptyObject$1 = {}, removedKeys = null, removedKeyCount = 0, @@ -1529,19 +1529,19 @@ function markRootFinished(root, remainingLanes) { var eventTimes = root.eventTimes, expirationTimes = root.expirationTimes; for (root = root.hiddenUpdates; 0 < noLongerPendingLanes; ) { - var index$6 = 31 - clz32(noLongerPendingLanes), - lane = 1 << index$6; - remainingLanes[index$6] = 0; - eventTimes[index$6] = -1; - expirationTimes[index$6] = -1; - var hiddenUpdatesForLane = root[index$6]; + var index$5 = 31 - clz32(noLongerPendingLanes), + lane = 1 << index$5; + remainingLanes[index$5] = 0; + eventTimes[index$5] = -1; + expirationTimes[index$5] = -1; + var hiddenUpdatesForLane = root[index$5]; if (null !== hiddenUpdatesForLane) for ( - root[index$6] = null, index$6 = 0; - index$6 < hiddenUpdatesForLane.length; - index$6++ + root[index$5] = null, index$5 = 0; + index$5 < hiddenUpdatesForLane.length; + index$5++ ) { - var update = hiddenUpdatesForLane[index$6]; + var update = hiddenUpdatesForLane[index$5]; null !== update && (update.lane &= -1073741825); } noLongerPendingLanes &= ~lane; @@ -1550,10 +1550,10 @@ function markRootFinished(root, remainingLanes) { function markRootEntangled(root, entangledLanes) { var rootEntangledLanes = (root.entangledLanes |= entangledLanes); for (root = root.entanglements; rootEntangledLanes; ) { - var index$7 = 31 - clz32(rootEntangledLanes), - lane = 1 << index$7; - (lane & entangledLanes) | (root[index$7] & entangledLanes) && - (root[index$7] |= entangledLanes); + var index$6 = 31 - clz32(rootEntangledLanes), + lane = 1 << index$6; + (lane & entangledLanes) | (root[index$6] & entangledLanes) && + (root[index$6] |= entangledLanes); rootEntangledLanes &= ~lane; } } @@ -1854,36 +1854,36 @@ function findCurrentFiberUsingSlowPath(fiber) { } if (a.return !== b.return) (a = parentA), (b = parentB); else { - for (var didFindChild = !1, child$8 = parentA.child; child$8; ) { - if (child$8 === a) { + for (var didFindChild = !1, child$7 = parentA.child; child$7; ) { + if (child$7 === a) { didFindChild = !0; a = parentA; b = parentB; break; } - if (child$8 === b) { + if (child$7 === b) { didFindChild = !0; b = parentA; a = parentB; break; } - child$8 = child$8.sibling; + child$7 = child$7.sibling; } if (!didFindChild) { - for (child$8 = parentB.child; child$8; ) { - if (child$8 === a) { + for (child$7 = parentB.child; child$7; ) { + if (child$7 === a) { didFindChild = !0; a = parentB; b = parentA; break; } - if (child$8 === b) { + if (child$7 === b) { didFindChild = !0; b = parentB; a = parentA; break; } - child$8 = child$8.sibling; + child$7 = child$7.sibling; } if (!didFindChild) throw Error( @@ -3493,10 +3493,10 @@ createFunctionComponentUpdateQueue = function () { function use(usable) { if (null !== usable && "object" === typeof usable) { if ("function" === typeof usable.then) { - var index$25 = thenableIndexCounter; + var index$24 = thenableIndexCounter; thenableIndexCounter += 1; null === thenableState && (thenableState = []); - usable = trackUsedThenable(thenableState, usable, index$25); + usable = trackUsedThenable(thenableState, usable, index$24); null === currentlyRenderingFiber$1.alternate && (null === workInProgressHook ? null === currentlyRenderingFiber$1.memoizedState @@ -5747,14 +5747,14 @@ function cutOffTailIfNeeded(renderState, hasRenderedATailFallback) { break; case "collapsed": lastTailNode = renderState.tail; - for (var lastTailNode$64 = null; null !== lastTailNode; ) - null !== lastTailNode.alternate && (lastTailNode$64 = lastTailNode), + for (var lastTailNode$63 = null; null !== lastTailNode; ) + null !== lastTailNode.alternate && (lastTailNode$63 = lastTailNode), (lastTailNode = lastTailNode.sibling); - null === lastTailNode$64 + null === lastTailNode$63 ? hasRenderedATailFallback || null === renderState.tail ? (renderState.tail = null) : (renderState.tail.sibling = null) - : (lastTailNode$64.sibling = null); + : (lastTailNode$63.sibling = null); } } function bubbleProperties(completedWork) { @@ -5764,19 +5764,19 @@ function bubbleProperties(completedWork) { newChildLanes = 0, subtreeFlags = 0; if (didBailout) - for (var child$65 = completedWork.child; null !== child$65; ) - (newChildLanes |= child$65.lanes | child$65.childLanes), - (subtreeFlags |= child$65.subtreeFlags & 31457280), - (subtreeFlags |= child$65.flags & 31457280), - (child$65.return = completedWork), - (child$65 = child$65.sibling); + for (var child$64 = completedWork.child; null !== child$64; ) + (newChildLanes |= child$64.lanes | child$64.childLanes), + (subtreeFlags |= child$64.subtreeFlags & 31457280), + (subtreeFlags |= child$64.flags & 31457280), + (child$64.return = completedWork), + (child$64 = child$64.sibling); else - for (child$65 = completedWork.child; null !== child$65; ) - (newChildLanes |= child$65.lanes | child$65.childLanes), - (subtreeFlags |= child$65.subtreeFlags), - (subtreeFlags |= child$65.flags), - (child$65.return = completedWork), - (child$65 = child$65.sibling); + for (child$64 = completedWork.child; null !== child$64; ) + (newChildLanes |= child$64.lanes | child$64.childLanes), + (subtreeFlags |= child$64.subtreeFlags), + (subtreeFlags |= child$64.flags), + (child$64.return = completedWork), + (child$64 = child$64.sibling); completedWork.subtreeFlags |= subtreeFlags; completedWork.childLanes = newChildLanes; return didBailout; @@ -6259,8 +6259,8 @@ function safelyDetachRef(current, nearestMountedAncestor) { else if ("function" === typeof ref) try { ref(null); - } catch (error$80) { - captureCommitPhaseError(current, nearestMountedAncestor, error$80); + } catch (error$79) { + captureCommitPhaseError(current, nearestMountedAncestor, error$79); } else ref.current = null; } @@ -6364,10 +6364,10 @@ function commitHookEffectListMount(flags, finishedWork) { var effect = (finishedWork = finishedWork.next); do { if ((effect.tag & flags) === flags) { - var create$81 = effect.create, + var create$80 = effect.create, inst = effect.inst; - create$81 = create$81(); - inst.destroy = create$81; + create$80 = create$80(); + inst.destroy = create$80; } effect = effect.next; } while (effect !== finishedWork); @@ -6430,11 +6430,11 @@ function commitLayoutEffectOnFiber(finishedRoot, current, finishedWork) { current, finishedRoot.__reactInternalSnapshotBeforeUpdate ); - } catch (error$82) { + } catch (error$81) { captureCommitPhaseError( finishedWork, finishedWork.return, - error$82 + error$81 ); } } @@ -6754,8 +6754,8 @@ function commitMutationEffectsOnFiber(finishedWork, root) { } try { commitHookEffectListUnmount(5, finishedWork, finishedWork.return); - } catch (error$84) { - captureCommitPhaseError(finishedWork, finishedWork.return, error$84); + } catch (error$83) { + captureCommitPhaseError(finishedWork, finishedWork.return, error$83); } } break; @@ -6815,14 +6815,14 @@ function commitMutationEffectsOnFiber(finishedWork, root) { flags & 512 && null !== current && safelyDetachRef(current, current.return); - var isHidden$91 = null !== finishedWork.memoizedState, - wasHidden$92 = null !== current && null !== current.memoizedState; + var isHidden$90 = null !== finishedWork.memoizedState, + wasHidden$91 = null !== current && null !== current.memoizedState; if (finishedWork.mode & 1) { var prevOffscreenSubtreeIsHidden = offscreenSubtreeIsHidden, prevOffscreenSubtreeWasHidden = offscreenSubtreeWasHidden; - offscreenSubtreeIsHidden = prevOffscreenSubtreeIsHidden || isHidden$91; + offscreenSubtreeIsHidden = prevOffscreenSubtreeIsHidden || isHidden$90; offscreenSubtreeWasHidden = - prevOffscreenSubtreeWasHidden || wasHidden$92; + prevOffscreenSubtreeWasHidden || wasHidden$91; recursivelyTraverseMutationEffects(root, finishedWork); offscreenSubtreeWasHidden = prevOffscreenSubtreeWasHidden; offscreenSubtreeIsHidden = prevOffscreenSubtreeIsHidden; @@ -6833,15 +6833,15 @@ function commitMutationEffectsOnFiber(finishedWork, root) { root._visibility &= -3; root._visibility |= root._pendingVisibility & 2; flags & 8192 && - ((root._visibility = isHidden$91 + ((root._visibility = isHidden$90 ? root._visibility & -2 : root._visibility | 1), - isHidden$91 && - ((isHidden$91 = + isHidden$90 && + ((isHidden$90 = offscreenSubtreeIsHidden || offscreenSubtreeWasHidden), null === current || - wasHidden$92 || - isHidden$91 || + wasHidden$91 || + isHidden$90 || (0 !== (finishedWork.mode & 1) && recursivelyTraverseDisappearLayoutEffects(finishedWork)))); flags & 4 && @@ -7415,12 +7415,12 @@ function scheduleTaskForRootDuringMicrotask(root, currentTime) { 0 < lanes; ) { - var index$4 = 31 - clz32(lanes), - lane = 1 << index$4, - expirationTime = expirationTimes[index$4]; + var index$3 = 31 - clz32(lanes), + lane = 1 << index$3, + expirationTime = expirationTimes[index$3]; if (-1 === expirationTime) { if (0 === (lane & suspendedLanes) || 0 !== (lane & pingedLanes)) - expirationTimes[index$4] = computeExpirationTime(lane, currentTime); + expirationTimes[index$3] = computeExpirationTime(lane, currentTime); } else expirationTime <= currentTime && (root.expiredLanes |= lane); lanes &= ~lane; } @@ -7477,8 +7477,7 @@ function scheduleTaskForRootDuringMicrotask(root, currentTime) { root.callbackNode = suspendedLanes; return currentTime; } -var ceil = Math.ceil, - PossiblyWeakMap = "function" === typeof WeakMap ? WeakMap : Map, +var PossiblyWeakMap = "function" === typeof WeakMap ? WeakMap : Map, ReactCurrentDispatcher = ReactSharedInternals.ReactCurrentDispatcher, ReactCurrentOwner = ReactSharedInternals.ReactCurrentOwner, ReactCurrentBatchConfig = ReactSharedInternals.ReactCurrentBatchConfig, @@ -7577,28 +7576,28 @@ function performConcurrentWorkOnRoot(root, didTimeout) { root === workInProgressRoot ? workInProgressRootRenderLanes : 0 ); if (0 === lanes) return null; - var exitStatus = + didTimeout = includesBlockingLane(root, lanes) || 0 !== (lanes & root.expiredLanes) || didTimeout ? renderRootSync(root, lanes) : renderRootConcurrent(root, lanes); - if (0 !== exitStatus) { - if (2 === exitStatus) { - didTimeout = lanes; - var errorRetryLanes = getLanesToRetrySynchronouslyOnError( - root, - didTimeout - ); + if (0 !== didTimeout) { + if (2 === didTimeout) { + var originallyAttemptedLanes = lanes, + errorRetryLanes = getLanesToRetrySynchronouslyOnError( + root, + originallyAttemptedLanes + ); 0 !== errorRetryLanes && ((lanes = errorRetryLanes), - (exitStatus = recoverFromConcurrentError( + (didTimeout = recoverFromConcurrentError( root, - didTimeout, + originallyAttemptedLanes, errorRetryLanes ))); } - if (1 === exitStatus) + if (1 === didTimeout) throw ( ((originalCallbackNode = workInProgressRootFatalError), prepareFreshStack(root, 0), @@ -7606,30 +7605,30 @@ function performConcurrentWorkOnRoot(root, didTimeout) { ensureRootIsScheduled(root), originalCallbackNode) ); - if (6 === exitStatus) markRootSuspended(root, lanes); + if (6 === didTimeout) markRootSuspended(root, lanes); else { errorRetryLanes = !includesBlockingLane(root, lanes); - didTimeout = root.current.alternate; + originallyAttemptedLanes = root.current.alternate; if ( errorRetryLanes && - !isRenderConsistentWithExternalStores(didTimeout) + !isRenderConsistentWithExternalStores(originallyAttemptedLanes) ) { - exitStatus = renderRootSync(root, lanes); - if (2 === exitStatus) { + didTimeout = renderRootSync(root, lanes); + if (2 === didTimeout) { errorRetryLanes = lanes; - var errorRetryLanes$97 = getLanesToRetrySynchronouslyOnError( + var errorRetryLanes$96 = getLanesToRetrySynchronouslyOnError( root, errorRetryLanes ); - 0 !== errorRetryLanes$97 && - ((lanes = errorRetryLanes$97), - (exitStatus = recoverFromConcurrentError( + 0 !== errorRetryLanes$96 && + ((lanes = errorRetryLanes$96), + (didTimeout = recoverFromConcurrentError( root, errorRetryLanes, - errorRetryLanes$97 + errorRetryLanes$96 ))); } - if (1 === exitStatus) + if (1 === didTimeout) throw ( ((originalCallbackNode = workInProgressRootFatalError), prepareFreshStack(root, 0), @@ -7638,16 +7637,16 @@ function performConcurrentWorkOnRoot(root, didTimeout) { originalCallbackNode) ); } - root.finishedWork = didTimeout; + root.finishedWork = originallyAttemptedLanes; root.finishedLanes = lanes; - switch (exitStatus) { + switch (didTimeout) { case 0: case 1: throw Error("Root did not complete. This is a bug in React."); case 2: commitRootWhenReady( root, - didTimeout, + originallyAttemptedLanes, workInProgressRootRecoverableErrors, workInProgressTransitions, lanes @@ -7657,26 +7656,26 @@ function performConcurrentWorkOnRoot(root, didTimeout) { markRootSuspended(root, lanes); if ( (lanes & 125829120) === lanes && - ((exitStatus = globalMostRecentFallbackTime + 500 - now()), - 10 < exitStatus) + ((didTimeout = globalMostRecentFallbackTime + 500 - now()), + 10 < didTimeout) ) { if (0 !== getNextLanes(root, 0)) break; root.timeoutHandle = scheduleTimeout( commitRootWhenReady.bind( null, root, - didTimeout, + originallyAttemptedLanes, workInProgressRootRecoverableErrors, workInProgressTransitions, lanes ), - exitStatus + didTimeout ); break; } commitRootWhenReady( root, - didTimeout, + originallyAttemptedLanes, workInProgressRootRecoverableErrors, workInProgressTransitions, lanes @@ -7685,48 +7684,9 @@ function performConcurrentWorkOnRoot(root, didTimeout) { case 4: markRootSuspended(root, lanes); if ((lanes & 8388480) === lanes) break; - exitStatus = lanes; - errorRetryLanes = root.eventTimes; - for (errorRetryLanes$97 = -1; 0 < exitStatus; ) { - var index$3 = 31 - clz32(exitStatus), - lane = 1 << index$3; - index$3 = errorRetryLanes[index$3]; - index$3 > errorRetryLanes$97 && (errorRetryLanes$97 = index$3); - exitStatus &= ~lane; - } - exitStatus = errorRetryLanes$97; - exitStatus = now() - exitStatus; - exitStatus = - (120 > exitStatus - ? 120 - : 480 > exitStatus - ? 480 - : 1080 > exitStatus - ? 1080 - : 1920 > exitStatus - ? 1920 - : 3e3 > exitStatus - ? 3e3 - : 4320 > exitStatus - ? 4320 - : 1960 * ceil(exitStatus / 1960)) - exitStatus; - if (10 < exitStatus) { - root.timeoutHandle = scheduleTimeout( - commitRootWhenReady.bind( - null, - root, - didTimeout, - workInProgressRootRecoverableErrors, - workInProgressTransitions, - lanes - ), - exitStatus - ); - break; - } commitRootWhenReady( root, - didTimeout, + originallyAttemptedLanes, workInProgressRootRecoverableErrors, workInProgressTransitions, lanes @@ -7735,7 +7695,7 @@ function performConcurrentWorkOnRoot(root, didTimeout) { case 5: commitRootWhenReady( root, - didTimeout, + originallyAttemptedLanes, workInProgressRootRecoverableErrors, workInProgressTransitions, lanes @@ -7839,9 +7799,9 @@ function markRootSuspended(root, suspendedLanes) { root.suspendedLanes |= suspendedLanes; root.pingedLanes &= ~suspendedLanes; for (root = root.expirationTimes; 0 < suspendedLanes; ) { - var index$5 = 31 - clz32(suspendedLanes), - lane = 1 << index$5; - root[index$5] = -1; + var index$4 = 31 - clz32(suspendedLanes), + lane = 1 << index$4; + root[index$4] = -1; suspendedLanes &= ~lane; } } @@ -7962,8 +7922,8 @@ function renderRootSync(root, lanes) { } workLoopSync(); break; - } catch (thrownValue$100) { - handleThrow(root, thrownValue$100); + } catch (thrownValue$98) { + handleThrow(root, thrownValue$98); } while (1); resetContextDependencies(); @@ -8068,8 +8028,8 @@ function renderRootConcurrent(root, lanes) { } workLoopConcurrent(); break; - } catch (thrownValue$102) { - handleThrow(root, thrownValue$102); + } catch (thrownValue$100) { + handleThrow(root, thrownValue$100); } while (1); resetContextDependencies(); @@ -8235,10 +8195,10 @@ function throwAndUnwindWorkLoop(unitOfWork, thrownValue) { }; suspenseBoundary.updateQueue = newOffscreenQueue; } else { - var retryQueue$32 = offscreenQueue.retryQueue; - null === retryQueue$32 + var retryQueue$31 = offscreenQueue.retryQueue; + null === retryQueue$31 ? (offscreenQueue.retryQueue = new Set([wakeable])) - : retryQueue$32.add(wakeable); + : retryQueue$31.add(wakeable); } } break; @@ -9543,10 +9503,10 @@ batchedUpdatesImpl = function (fn, a) { } }; var roots = new Map(), - devToolsConfig$jscomp$inline_1051 = { + devToolsConfig$jscomp$inline_1045 = { findFiberByHostInstance: getInstanceFromNode, bundleType: 0, - version: "18.3.0-next-ac43bf687-20230410", + version: "18.3.0-next-0b931f90e-20230411", rendererPackageName: "react-native-renderer", rendererConfig: { getInspectorDataForViewTag: function () { @@ -9561,11 +9521,11 @@ var roots = new Map(), }.bind(null, findNodeHandle) } }; -var internals$jscomp$inline_1289 = { - bundleType: devToolsConfig$jscomp$inline_1051.bundleType, - version: devToolsConfig$jscomp$inline_1051.version, - rendererPackageName: devToolsConfig$jscomp$inline_1051.rendererPackageName, - rendererConfig: devToolsConfig$jscomp$inline_1051.rendererConfig, +var internals$jscomp$inline_1274 = { + bundleType: devToolsConfig$jscomp$inline_1045.bundleType, + version: devToolsConfig$jscomp$inline_1045.version, + rendererPackageName: devToolsConfig$jscomp$inline_1045.rendererPackageName, + rendererConfig: devToolsConfig$jscomp$inline_1045.rendererConfig, overrideHookState: null, overrideHookStateDeletePath: null, overrideHookStateRenamePath: null, @@ -9581,26 +9541,26 @@ var internals$jscomp$inline_1289 = { return null === fiber ? null : fiber.stateNode; }, findFiberByHostInstance: - devToolsConfig$jscomp$inline_1051.findFiberByHostInstance || + devToolsConfig$jscomp$inline_1045.findFiberByHostInstance || emptyFindFiberByHostInstance, findHostInstancesForRefresh: null, scheduleRefresh: null, scheduleRoot: null, setRefreshHandler: null, getCurrentFiber: null, - reconcilerVersion: "18.3.0-next-ac43bf687-20230410" + reconcilerVersion: "18.3.0-next-0b931f90e-20230411" }; if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) { - var hook$jscomp$inline_1290 = __REACT_DEVTOOLS_GLOBAL_HOOK__; + var hook$jscomp$inline_1275 = __REACT_DEVTOOLS_GLOBAL_HOOK__; if ( - !hook$jscomp$inline_1290.isDisabled && - hook$jscomp$inline_1290.supportsFiber + !hook$jscomp$inline_1275.isDisabled && + hook$jscomp$inline_1275.supportsFiber ) try { - (rendererID = hook$jscomp$inline_1290.inject( - internals$jscomp$inline_1289 + (rendererID = hook$jscomp$inline_1275.inject( + internals$jscomp$inline_1274 )), - (injectedHook = hook$jscomp$inline_1290); + (injectedHook = hook$jscomp$inline_1275); } catch (err) {} } exports.createPortal = function (children, containerTag) { diff --git a/compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/implementations/ReactFabric-profiling.fb.js b/compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/implementations/ReactFabric-profiling.fb.js index e25c1281ef..64d4c3ca3f 100644 --- a/compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/implementations/ReactFabric-profiling.fb.js +++ b/compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/implementations/ReactFabric-profiling.fb.js @@ -951,7 +951,7 @@ eventPluginOrder = Array.prototype.slice.call([ "ReactNativeBridgeEventPlugin" ]); recomputePluginOrdering(); -var injectedNamesToPlugins$jscomp$inline_260 = { +var injectedNamesToPlugins$jscomp$inline_258 = { ResponderEventPlugin: ResponderEventPlugin, ReactNativeBridgeEventPlugin: { eventTypes: {}, @@ -997,32 +997,32 @@ var injectedNamesToPlugins$jscomp$inline_260 = { } } }, - isOrderingDirty$jscomp$inline_261 = !1, - pluginName$jscomp$inline_262; -for (pluginName$jscomp$inline_262 in injectedNamesToPlugins$jscomp$inline_260) + isOrderingDirty$jscomp$inline_259 = !1, + pluginName$jscomp$inline_260; +for (pluginName$jscomp$inline_260 in injectedNamesToPlugins$jscomp$inline_258) if ( - injectedNamesToPlugins$jscomp$inline_260.hasOwnProperty( - pluginName$jscomp$inline_262 + injectedNamesToPlugins$jscomp$inline_258.hasOwnProperty( + pluginName$jscomp$inline_260 ) ) { - var pluginModule$jscomp$inline_263 = - injectedNamesToPlugins$jscomp$inline_260[pluginName$jscomp$inline_262]; + var pluginModule$jscomp$inline_261 = + injectedNamesToPlugins$jscomp$inline_258[pluginName$jscomp$inline_260]; if ( - !namesToPlugins.hasOwnProperty(pluginName$jscomp$inline_262) || - namesToPlugins[pluginName$jscomp$inline_262] !== - pluginModule$jscomp$inline_263 + !namesToPlugins.hasOwnProperty(pluginName$jscomp$inline_260) || + namesToPlugins[pluginName$jscomp$inline_260] !== + pluginModule$jscomp$inline_261 ) { - if (namesToPlugins[pluginName$jscomp$inline_262]) + if (namesToPlugins[pluginName$jscomp$inline_260]) throw Error( "EventPluginRegistry: Cannot inject two different event plugins using the same name, `" + - (pluginName$jscomp$inline_262 + "`.") + (pluginName$jscomp$inline_260 + "`.") ); - namesToPlugins[pluginName$jscomp$inline_262] = - pluginModule$jscomp$inline_263; - isOrderingDirty$jscomp$inline_261 = !0; + namesToPlugins[pluginName$jscomp$inline_260] = + pluginModule$jscomp$inline_261; + isOrderingDirty$jscomp$inline_259 = !0; } } -isOrderingDirty$jscomp$inline_261 && recomputePluginOrdering(); +isOrderingDirty$jscomp$inline_259 && recomputePluginOrdering(); var emptyObject$1 = {}, removedKeys = null, removedKeyCount = 0, @@ -1627,19 +1627,19 @@ function markRootFinished(root, remainingLanes) { var eventTimes = root.eventTimes, expirationTimes = root.expirationTimes; for (root = root.hiddenUpdates; 0 < noLongerPendingLanes; ) { - var index$7 = 31 - clz32(noLongerPendingLanes), - lane = 1 << index$7; - remainingLanes[index$7] = 0; - eventTimes[index$7] = -1; - expirationTimes[index$7] = -1; - var hiddenUpdatesForLane = root[index$7]; + var index$6 = 31 - clz32(noLongerPendingLanes), + lane = 1 << index$6; + remainingLanes[index$6] = 0; + eventTimes[index$6] = -1; + expirationTimes[index$6] = -1; + var hiddenUpdatesForLane = root[index$6]; if (null !== hiddenUpdatesForLane) for ( - root[index$7] = null, index$7 = 0; - index$7 < hiddenUpdatesForLane.length; - index$7++ + root[index$6] = null, index$6 = 0; + index$6 < hiddenUpdatesForLane.length; + index$6++ ) { - var update = hiddenUpdatesForLane[index$7]; + var update = hiddenUpdatesForLane[index$6]; null !== update && (update.lane &= -1073741825); } noLongerPendingLanes &= ~lane; @@ -1648,19 +1648,19 @@ function markRootFinished(root, remainingLanes) { function markRootEntangled(root, entangledLanes) { var rootEntangledLanes = (root.entangledLanes |= entangledLanes); for (root = root.entanglements; rootEntangledLanes; ) { - var index$8 = 31 - clz32(rootEntangledLanes), - lane = 1 << index$8; - (lane & entangledLanes) | (root[index$8] & entangledLanes) && - (root[index$8] |= entangledLanes); + var index$7 = 31 - clz32(rootEntangledLanes), + lane = 1 << index$7; + (lane & entangledLanes) | (root[index$7] & entangledLanes) && + (root[index$7] |= entangledLanes); rootEntangledLanes &= ~lane; } } function addFiberToLanesMap(root, fiber, lanes) { if (isDevToolsPresent) for (root = root.pendingUpdatersLaneMap; 0 < lanes; ) { - var index$9 = 31 - clz32(lanes), - lane = 1 << index$9; - root[index$9].add(fiber); + var index$8 = 31 - clz32(lanes), + lane = 1 << index$8; + root[index$8].add(fiber); lanes &= ~lane; } } @@ -1672,16 +1672,16 @@ function movePendingFibersToMemoized(root, lanes) { 0 < lanes; ) { - var index$10 = 31 - clz32(lanes); - root = 1 << index$10; - index$10 = pendingUpdatersLaneMap[index$10]; - 0 < index$10.size && - (index$10.forEach(function (fiber) { + var index$9 = 31 - clz32(lanes); + root = 1 << index$9; + index$9 = pendingUpdatersLaneMap[index$9]; + 0 < index$9.size && + (index$9.forEach(function (fiber) { var alternate = fiber.alternate; (null !== alternate && memoizedUpdaters.has(alternate)) || memoizedUpdaters.add(fiber); }), - index$10.clear()); + index$9.clear()); lanes &= ~root; } } @@ -1982,36 +1982,36 @@ function findCurrentFiberUsingSlowPath(fiber) { } if (a.return !== b.return) (a = parentA), (b = parentB); else { - for (var didFindChild = !1, child$11 = parentA.child; child$11; ) { - if (child$11 === a) { + for (var didFindChild = !1, child$10 = parentA.child; child$10; ) { + if (child$10 === a) { didFindChild = !0; a = parentA; b = parentB; break; } - if (child$11 === b) { + if (child$10 === b) { didFindChild = !0; b = parentA; a = parentB; break; } - child$11 = child$11.sibling; + child$10 = child$10.sibling; } if (!didFindChild) { - for (child$11 = parentB.child; child$11; ) { - if (child$11 === a) { + for (child$10 = parentB.child; child$10; ) { + if (child$10 === a) { didFindChild = !0; a = parentB; b = parentA; break; } - if (child$11 === b) { + if (child$10 === b) { didFindChild = !0; b = parentB; a = parentA; break; } - child$11 = child$11.sibling; + child$10 = child$10.sibling; } if (!didFindChild) throw Error( @@ -3621,10 +3621,10 @@ createFunctionComponentUpdateQueue = function () { function use(usable) { if (null !== usable && "object" === typeof usable) { if ("function" === typeof usable.then) { - var index$28 = thenableIndexCounter; + var index$27 = thenableIndexCounter; thenableIndexCounter += 1; null === thenableState && (thenableState = []); - usable = trackUsedThenable(thenableState, usable, index$28); + usable = trackUsedThenable(thenableState, usable, index$27); null === currentlyRenderingFiber$1.alternate && (null === workInProgressHook ? null === currentlyRenderingFiber$1.memoizedState @@ -5975,14 +5975,14 @@ function cutOffTailIfNeeded(renderState, hasRenderedATailFallback) { break; case "collapsed": lastTailNode = renderState.tail; - for (var lastTailNode$68 = null; null !== lastTailNode; ) - null !== lastTailNode.alternate && (lastTailNode$68 = lastTailNode), + for (var lastTailNode$67 = null; null !== lastTailNode; ) + null !== lastTailNode.alternate && (lastTailNode$67 = lastTailNode), (lastTailNode = lastTailNode.sibling); - null === lastTailNode$68 + null === lastTailNode$67 ? hasRenderedATailFallback || null === renderState.tail ? (renderState.tail = null) : (renderState.tail.sibling = null) - : (lastTailNode$68.sibling = null); + : (lastTailNode$67.sibling = null); } } function bubbleProperties(completedWork) { @@ -5994,53 +5994,53 @@ function bubbleProperties(completedWork) { if (didBailout) if (0 !== (completedWork.mode & 2)) { for ( - var treeBaseDuration$70 = completedWork.selfBaseDuration, - child$71 = completedWork.child; - null !== child$71; + var treeBaseDuration$69 = completedWork.selfBaseDuration, + child$70 = completedWork.child; + null !== child$70; ) - (newChildLanes |= child$71.lanes | child$71.childLanes), - (subtreeFlags |= child$71.subtreeFlags & 31457280), - (subtreeFlags |= child$71.flags & 31457280), - (treeBaseDuration$70 += child$71.treeBaseDuration), - (child$71 = child$71.sibling); - completedWork.treeBaseDuration = treeBaseDuration$70; + (newChildLanes |= child$70.lanes | child$70.childLanes), + (subtreeFlags |= child$70.subtreeFlags & 31457280), + (subtreeFlags |= child$70.flags & 31457280), + (treeBaseDuration$69 += child$70.treeBaseDuration), + (child$70 = child$70.sibling); + completedWork.treeBaseDuration = treeBaseDuration$69; } else for ( - treeBaseDuration$70 = completedWork.child; - null !== treeBaseDuration$70; + treeBaseDuration$69 = completedWork.child; + null !== treeBaseDuration$69; ) (newChildLanes |= - treeBaseDuration$70.lanes | treeBaseDuration$70.childLanes), - (subtreeFlags |= treeBaseDuration$70.subtreeFlags & 31457280), - (subtreeFlags |= treeBaseDuration$70.flags & 31457280), - (treeBaseDuration$70.return = completedWork), - (treeBaseDuration$70 = treeBaseDuration$70.sibling); + treeBaseDuration$69.lanes | treeBaseDuration$69.childLanes), + (subtreeFlags |= treeBaseDuration$69.subtreeFlags & 31457280), + (subtreeFlags |= treeBaseDuration$69.flags & 31457280), + (treeBaseDuration$69.return = completedWork), + (treeBaseDuration$69 = treeBaseDuration$69.sibling); else if (0 !== (completedWork.mode & 2)) { - treeBaseDuration$70 = completedWork.actualDuration; - child$71 = completedWork.selfBaseDuration; + treeBaseDuration$69 = completedWork.actualDuration; + child$70 = completedWork.selfBaseDuration; for (var child = completedWork.child; null !== child; ) (newChildLanes |= child.lanes | child.childLanes), (subtreeFlags |= child.subtreeFlags), (subtreeFlags |= child.flags), - (treeBaseDuration$70 += child.actualDuration), - (child$71 += child.treeBaseDuration), + (treeBaseDuration$69 += child.actualDuration), + (child$70 += child.treeBaseDuration), (child = child.sibling); - completedWork.actualDuration = treeBaseDuration$70; - completedWork.treeBaseDuration = child$71; + completedWork.actualDuration = treeBaseDuration$69; + completedWork.treeBaseDuration = child$70; } else for ( - treeBaseDuration$70 = completedWork.child; - null !== treeBaseDuration$70; + treeBaseDuration$69 = completedWork.child; + null !== treeBaseDuration$69; ) (newChildLanes |= - treeBaseDuration$70.lanes | treeBaseDuration$70.childLanes), - (subtreeFlags |= treeBaseDuration$70.subtreeFlags), - (subtreeFlags |= treeBaseDuration$70.flags), - (treeBaseDuration$70.return = completedWork), - (treeBaseDuration$70 = treeBaseDuration$70.sibling); + treeBaseDuration$69.lanes | treeBaseDuration$69.childLanes), + (subtreeFlags |= treeBaseDuration$69.subtreeFlags), + (subtreeFlags |= treeBaseDuration$69.flags), + (treeBaseDuration$69.return = completedWork), + (treeBaseDuration$69 = treeBaseDuration$69.sibling); completedWork.subtreeFlags |= subtreeFlags; completedWork.childLanes = newChildLanes; return didBailout; @@ -6582,8 +6582,8 @@ function safelyDetachRef(current, nearestMountedAncestor) { recordLayoutEffectDuration(current); } else ref(null); - } catch (error$89) { - captureCommitPhaseError(current, nearestMountedAncestor, error$89); + } catch (error$88) { + captureCommitPhaseError(current, nearestMountedAncestor, error$88); } else ref.current = null; } @@ -6716,10 +6716,10 @@ function commitHookEffectListMount(flags, finishedWork) { injectedProfilingHooks.markComponentLayoutEffectMountStarted( finishedWork ); - var create$90 = effect.create, + var create$89 = effect.create, inst = effect.inst; - create$90 = create$90(); - inst.destroy = create$90; + create$89 = create$89(); + inst.destroy = create$89; 0 !== (flags & 8) ? null !== injectedProfilingHooks && "function" === @@ -6747,8 +6747,8 @@ function commitHookLayoutEffects(finishedWork, hookFlags) { } else try { commitHookEffectListMount(hookFlags, finishedWork); - } catch (error$92) { - captureCommitPhaseError(finishedWork, finishedWork.return, error$92); + } catch (error$91) { + captureCommitPhaseError(finishedWork, finishedWork.return, error$91); } } function commitClassCallbacks(finishedWork) { @@ -6837,11 +6837,11 @@ function commitLayoutEffectOnFiber(finishedRoot, current, finishedWork) { } else try { finishedRoot.componentDidMount(); - } catch (error$93) { + } catch (error$92) { captureCommitPhaseError( finishedWork, finishedWork.return, - error$93 + error$92 ); } else { @@ -6858,11 +6858,11 @@ function commitLayoutEffectOnFiber(finishedRoot, current, finishedWork) { current, finishedRoot.__reactInternalSnapshotBeforeUpdate ); - } catch (error$94) { + } catch (error$93) { captureCommitPhaseError( finishedWork, finishedWork.return, - error$94 + error$93 ); } recordLayoutEffectDuration(finishedWork); @@ -6873,11 +6873,11 @@ function commitLayoutEffectOnFiber(finishedRoot, current, finishedWork) { current, finishedRoot.__reactInternalSnapshotBeforeUpdate ); - } catch (error$95) { + } catch (error$94) { captureCommitPhaseError( finishedWork, finishedWork.return, - error$95 + error$94 ); } } @@ -7224,22 +7224,22 @@ function commitMutationEffectsOnFiber(finishedWork, root) { try { startLayoutEffectTimer(), commitHookEffectListUnmount(5, finishedWork, finishedWork.return); - } catch (error$98) { + } catch (error$97) { captureCommitPhaseError( finishedWork, finishedWork.return, - error$98 + error$97 ); } recordLayoutEffectDuration(finishedWork); } else try { commitHookEffectListUnmount(5, finishedWork, finishedWork.return); - } catch (error$99) { + } catch (error$98) { captureCommitPhaseError( finishedWork, finishedWork.return, - error$99 + error$98 ); } } @@ -7300,14 +7300,14 @@ function commitMutationEffectsOnFiber(finishedWork, root) { flags & 512 && null !== current && safelyDetachRef(current, current.return); - var isHidden$106 = null !== finishedWork.memoizedState, - wasHidden$107 = null !== current && null !== current.memoizedState; + var isHidden$105 = null !== finishedWork.memoizedState, + wasHidden$106 = null !== current && null !== current.memoizedState; if (finishedWork.mode & 1) { var prevOffscreenSubtreeIsHidden = offscreenSubtreeIsHidden, prevOffscreenSubtreeWasHidden = offscreenSubtreeWasHidden; - offscreenSubtreeIsHidden = prevOffscreenSubtreeIsHidden || isHidden$106; + offscreenSubtreeIsHidden = prevOffscreenSubtreeIsHidden || isHidden$105; offscreenSubtreeWasHidden = - prevOffscreenSubtreeWasHidden || wasHidden$107; + prevOffscreenSubtreeWasHidden || wasHidden$106; recursivelyTraverseMutationEffects(root, finishedWork); offscreenSubtreeWasHidden = prevOffscreenSubtreeWasHidden; offscreenSubtreeIsHidden = prevOffscreenSubtreeIsHidden; @@ -7318,15 +7318,15 @@ function commitMutationEffectsOnFiber(finishedWork, root) { root._visibility &= -3; root._visibility |= root._pendingVisibility & 2; flags & 8192 && - ((root._visibility = isHidden$106 + ((root._visibility = isHidden$105 ? root._visibility & -2 : root._visibility | 1), - isHidden$106 && - ((isHidden$106 = + isHidden$105 && + ((isHidden$105 = offscreenSubtreeIsHidden || offscreenSubtreeWasHidden), null === current || - wasHidden$107 || - isHidden$106 || + wasHidden$106 || + isHidden$105 || (0 !== (finishedWork.mode & 1) && recursivelyTraverseDisappearLayoutEffects(finishedWork)))); flags & 4 && @@ -7533,8 +7533,8 @@ function commitHookPassiveMountEffects(finishedWork, hookFlags) { } else try { commitHookEffectListMount(hookFlags, finishedWork); - } catch (error$110) { - captureCommitPhaseError(finishedWork, finishedWork.return, error$110); + } catch (error$109) { + captureCommitPhaseError(finishedWork, finishedWork.return, error$109); } } function recursivelyTraversePassiveMountEffects(root, parentFiber) { @@ -7943,12 +7943,12 @@ function scheduleTaskForRootDuringMicrotask(root, currentTime) { 0 < lanes; ) { - var index$5 = 31 - clz32(lanes), - lane = 1 << index$5, - expirationTime = expirationTimes[index$5]; + var index$4 = 31 - clz32(lanes), + lane = 1 << index$4, + expirationTime = expirationTimes[index$4]; if (-1 === expirationTime) { if (0 === (lane & suspendedLanes) || 0 !== (lane & pingedLanes)) - expirationTimes[index$5] = computeExpirationTime(lane, currentTime); + expirationTimes[index$4] = computeExpirationTime(lane, currentTime); } else expirationTime <= currentTime && (root.expiredLanes |= lane); lanes &= ~lane; } @@ -8005,8 +8005,7 @@ function scheduleTaskForRootDuringMicrotask(root, currentTime) { root.callbackNode = suspendedLanes; return currentTime; } -var ceil = Math.ceil, - PossiblyWeakMap = "function" === typeof WeakMap ? WeakMap : Map, +var PossiblyWeakMap = "function" === typeof WeakMap ? WeakMap : Map, ReactCurrentDispatcher = ReactSharedInternals.ReactCurrentDispatcher, ReactCurrentOwner = ReactSharedInternals.ReactCurrentOwner, ReactCurrentBatchConfig = ReactSharedInternals.ReactCurrentBatchConfig, @@ -8108,28 +8107,28 @@ function performConcurrentWorkOnRoot(root, didTimeout) { root === workInProgressRoot ? workInProgressRootRenderLanes : 0 ); if (0 === lanes) return null; - var exitStatus = + didTimeout = includesBlockingLane(root, lanes) || 0 !== (lanes & root.expiredLanes) || didTimeout ? renderRootSync(root, lanes) : renderRootConcurrent(root, lanes); - if (0 !== exitStatus) { - if (2 === exitStatus) { - didTimeout = lanes; - var errorRetryLanes = getLanesToRetrySynchronouslyOnError( - root, - didTimeout - ); + if (0 !== didTimeout) { + if (2 === didTimeout) { + var originallyAttemptedLanes = lanes, + errorRetryLanes = getLanesToRetrySynchronouslyOnError( + root, + originallyAttemptedLanes + ); 0 !== errorRetryLanes && ((lanes = errorRetryLanes), - (exitStatus = recoverFromConcurrentError( + (didTimeout = recoverFromConcurrentError( root, - didTimeout, + originallyAttemptedLanes, errorRetryLanes ))); } - if (1 === exitStatus) + if (1 === didTimeout) throw ( ((originalCallbackNode = workInProgressRootFatalError), prepareFreshStack(root, 0), @@ -8137,30 +8136,30 @@ function performConcurrentWorkOnRoot(root, didTimeout) { ensureRootIsScheduled(root), originalCallbackNode) ); - if (6 === exitStatus) markRootSuspended(root, lanes); + if (6 === didTimeout) markRootSuspended(root, lanes); else { errorRetryLanes = !includesBlockingLane(root, lanes); - didTimeout = root.current.alternate; + originallyAttemptedLanes = root.current.alternate; if ( errorRetryLanes && - !isRenderConsistentWithExternalStores(didTimeout) + !isRenderConsistentWithExternalStores(originallyAttemptedLanes) ) { - exitStatus = renderRootSync(root, lanes); - if (2 === exitStatus) { + didTimeout = renderRootSync(root, lanes); + if (2 === didTimeout) { errorRetryLanes = lanes; - var errorRetryLanes$113 = getLanesToRetrySynchronouslyOnError( + var errorRetryLanes$112 = getLanesToRetrySynchronouslyOnError( root, errorRetryLanes ); - 0 !== errorRetryLanes$113 && - ((lanes = errorRetryLanes$113), - (exitStatus = recoverFromConcurrentError( + 0 !== errorRetryLanes$112 && + ((lanes = errorRetryLanes$112), + (didTimeout = recoverFromConcurrentError( root, errorRetryLanes, - errorRetryLanes$113 + errorRetryLanes$112 ))); } - if (1 === exitStatus) + if (1 === didTimeout) throw ( ((originalCallbackNode = workInProgressRootFatalError), prepareFreshStack(root, 0), @@ -8169,16 +8168,16 @@ function performConcurrentWorkOnRoot(root, didTimeout) { originalCallbackNode) ); } - root.finishedWork = didTimeout; + root.finishedWork = originallyAttemptedLanes; root.finishedLanes = lanes; - switch (exitStatus) { + switch (didTimeout) { case 0: case 1: throw Error("Root did not complete. This is a bug in React."); case 2: commitRootWhenReady( root, - didTimeout, + originallyAttemptedLanes, workInProgressRootRecoverableErrors, workInProgressTransitions, lanes @@ -8188,26 +8187,26 @@ function performConcurrentWorkOnRoot(root, didTimeout) { markRootSuspended(root, lanes); if ( (lanes & 125829120) === lanes && - ((exitStatus = globalMostRecentFallbackTime + 500 - now$1()), - 10 < exitStatus) + ((didTimeout = globalMostRecentFallbackTime + 500 - now$1()), + 10 < didTimeout) ) { if (0 !== getNextLanes(root, 0)) break; root.timeoutHandle = scheduleTimeout( commitRootWhenReady.bind( null, root, - didTimeout, + originallyAttemptedLanes, workInProgressRootRecoverableErrors, workInProgressTransitions, lanes ), - exitStatus + didTimeout ); break; } commitRootWhenReady( root, - didTimeout, + originallyAttemptedLanes, workInProgressRootRecoverableErrors, workInProgressTransitions, lanes @@ -8216,48 +8215,9 @@ function performConcurrentWorkOnRoot(root, didTimeout) { case 4: markRootSuspended(root, lanes); if ((lanes & 8388480) === lanes) break; - exitStatus = lanes; - errorRetryLanes = root.eventTimes; - for (errorRetryLanes$113 = -1; 0 < exitStatus; ) { - var index$4 = 31 - clz32(exitStatus), - lane = 1 << index$4; - index$4 = errorRetryLanes[index$4]; - index$4 > errorRetryLanes$113 && (errorRetryLanes$113 = index$4); - exitStatus &= ~lane; - } - exitStatus = errorRetryLanes$113; - exitStatus = now$1() - exitStatus; - exitStatus = - (120 > exitStatus - ? 120 - : 480 > exitStatus - ? 480 - : 1080 > exitStatus - ? 1080 - : 1920 > exitStatus - ? 1920 - : 3e3 > exitStatus - ? 3e3 - : 4320 > exitStatus - ? 4320 - : 1960 * ceil(exitStatus / 1960)) - exitStatus; - if (10 < exitStatus) { - root.timeoutHandle = scheduleTimeout( - commitRootWhenReady.bind( - null, - root, - didTimeout, - workInProgressRootRecoverableErrors, - workInProgressTransitions, - lanes - ), - exitStatus - ); - break; - } commitRootWhenReady( root, - didTimeout, + originallyAttemptedLanes, workInProgressRootRecoverableErrors, workInProgressTransitions, lanes @@ -8266,7 +8226,7 @@ function performConcurrentWorkOnRoot(root, didTimeout) { case 5: commitRootWhenReady( root, - didTimeout, + originallyAttemptedLanes, workInProgressRootRecoverableErrors, workInProgressTransitions, lanes @@ -8370,9 +8330,9 @@ function markRootSuspended(root, suspendedLanes) { root.suspendedLanes |= suspendedLanes; root.pingedLanes &= ~suspendedLanes; for (root = root.expirationTimes; 0 < suspendedLanes; ) { - var index$6 = 31 - clz32(suspendedLanes), - lane = 1 << index$6; - root[index$6] = -1; + var index$5 = 31 - clz32(suspendedLanes), + lane = 1 << index$5; + root[index$5] = -1; suspendedLanes &= ~lane; } } @@ -8532,8 +8492,8 @@ function renderRootSync(root, lanes) { } workLoopSync(); break; - } catch (thrownValue$116) { - handleThrow(root, thrownValue$116); + } catch (thrownValue$114) { + handleThrow(root, thrownValue$114); } while (1); resetContextDependencies(); @@ -8649,8 +8609,8 @@ function renderRootConcurrent(root, lanes) { } workLoopConcurrent(); break; - } catch (thrownValue$118) { - handleThrow(root, thrownValue$118); + } catch (thrownValue$116) { + handleThrow(root, thrownValue$116); } while (1); resetContextDependencies(); @@ -8834,10 +8794,10 @@ function throwAndUnwindWorkLoop(unitOfWork, thrownValue) { }; suspenseBoundary.updateQueue = newOffscreenQueue; } else { - var retryQueue$35 = offscreenQueue.retryQueue; - null === retryQueue$35 + var retryQueue$34 = offscreenQueue.retryQueue; + null === retryQueue$34 ? (offscreenQueue.retryQueue = new Set([wakeable])) - : retryQueue$35.add(wakeable); + : retryQueue$34.add(wakeable); } } break; @@ -9122,11 +9082,11 @@ function flushPassiveEffects() { _finishedWork$memoize = finishedWork.memoizedProps, id = _finishedWork$memoize.id, onPostCommit = _finishedWork$memoize.onPostCommit, - commitTime$91 = commitTime, + commitTime$90 = commitTime, phase = null === finishedWork.alternate ? "mount" : "update"; currentUpdateIsNested && (phase = "nested-update"); "function" === typeof onPostCommit && - onPostCommit(id, phase, passiveEffectDuration, commitTime$91); + onPostCommit(id, phase, passiveEffectDuration, commitTime$90); var parentFiber = finishedWork.return; b: for (; null !== parentFiber; ) { switch (parentFiber.tag) { @@ -10252,10 +10212,10 @@ batchedUpdatesImpl = function (fn, a) { } }; var roots = new Map(), - devToolsConfig$jscomp$inline_1129 = { + devToolsConfig$jscomp$inline_1123 = { findFiberByHostInstance: getInstanceFromNode, bundleType: 0, - version: "18.3.0-next-ac43bf687-20230410", + version: "18.3.0-next-0b931f90e-20230411", rendererPackageName: "react-native-renderer", rendererConfig: { getInspectorDataForViewTag: function () { @@ -10284,10 +10244,10 @@ var roots = new Map(), } catch (err) {} return hook.checkDCE ? !0 : !1; })({ - bundleType: devToolsConfig$jscomp$inline_1129.bundleType, - version: devToolsConfig$jscomp$inline_1129.version, - rendererPackageName: devToolsConfig$jscomp$inline_1129.rendererPackageName, - rendererConfig: devToolsConfig$jscomp$inline_1129.rendererConfig, + bundleType: devToolsConfig$jscomp$inline_1123.bundleType, + version: devToolsConfig$jscomp$inline_1123.version, + rendererPackageName: devToolsConfig$jscomp$inline_1123.rendererPackageName, + rendererConfig: devToolsConfig$jscomp$inline_1123.rendererConfig, overrideHookState: null, overrideHookStateDeletePath: null, overrideHookStateRenamePath: null, @@ -10303,14 +10263,14 @@ var roots = new Map(), return null === fiber ? null : fiber.stateNode; }, findFiberByHostInstance: - devToolsConfig$jscomp$inline_1129.findFiberByHostInstance || + devToolsConfig$jscomp$inline_1123.findFiberByHostInstance || emptyFindFiberByHostInstance, findHostInstancesForRefresh: null, scheduleRefresh: null, scheduleRoot: null, setRefreshHandler: null, getCurrentFiber: null, - reconcilerVersion: "18.3.0-next-ac43bf687-20230410" + reconcilerVersion: "18.3.0-next-0b931f90e-20230411" }); exports.createPortal = function (children, containerTag) { return createPortal$1( diff --git a/compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/implementations/ReactNativeRenderer-dev.fb.js b/compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/implementations/ReactNativeRenderer-dev.fb.js index e7789da1c1..bdbffc2bdb 100644 --- a/compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/implementations/ReactNativeRenderer-dev.fb.js +++ b/compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/implementations/ReactNativeRenderer-dev.fb.js @@ -5132,24 +5132,6 @@ function getNextLanes(root, wipLanes) { return nextLanes; } -function getMostRecentEventTime(root, lanes) { - var eventTimes = root.eventTimes; - var mostRecentEventTime = NoTimestamp; - - while (lanes > 0) { - var index = pickArbitraryLaneIndex(lanes); - var lane = 1 << index; - var eventTime = eventTimes[index]; - - if (eventTime > mostRecentEventTime) { - mostRecentEventTime = eventTime; - } - - lanes &= ~lane; - } - - return mostRecentEventTime; -} function computeExpirationTime(lane, currentTime) { switch (lane) { @@ -23383,7 +23365,6 @@ function scheduleImmediateTask(cb) { } } -var ceil = Math.ceil; var PossiblyWeakMap = typeof WeakMap === "function" ? WeakMap : Map; var ReactCurrentDispatcher = ReactSharedInternals.ReactCurrentDispatcher, ReactCurrentOwner$1 = ReactSharedInternals.ReactCurrentOwner, @@ -24012,37 +23993,6 @@ function finishConcurrentRender(root, exitStatus, finishedWork, lanes) { // placeholder and without scheduling a timeout. Delay indefinitely // until we receive more data. break; - } - - if (!shouldForceFlushFallbacksInDEV()) { - // This is not a transition, but we did trigger an avoided state. - // Schedule a placeholder to display after a short delay, using the Just - // Noticeable Difference. - // TODO: Is the JND optimization worth the added complexity? If this is - // the only reason we track the event time, then probably not. - // Consider removing. - var mostRecentEventTime = getMostRecentEventTime(root, lanes); - var eventTimeMs = mostRecentEventTime; - var timeElapsedMs = now$1() - eventTimeMs; - - var _msUntilTimeout = jnd(timeElapsedMs) - timeElapsedMs; // Don't bother with a very short suspense time. - - if (_msUntilTimeout > 10) { - // Instead of committing the fallback immediately, wait for more data - // to arrive. - root.timeoutHandle = scheduleTimeout( - commitRootWhenReady.bind( - null, - root, - finishedWork, - workInProgressRootRecoverableErrors, - workInProgressTransitions, - lanes - ), - _msUntilTimeout - ); - break; - } } // Commit the placeholder. commitRootWhenReady( @@ -26043,32 +25993,7 @@ function resolveRetryWakeable(boundaryFiber, wakeable) { } retryTimedOutBoundary(boundaryFiber, retryLane); -} // Computes the next Just Noticeable Difference (JND) boundary. -// The theory is that a person can't tell the difference between small differences in time. -// Therefore, if we wait a bit longer than necessary that won't translate to a noticeable -// difference in the experience. However, waiting for longer might mean that we can avoid -// showing an intermediate loading state. The longer we have already waited, the harder it -// is to tell small differences in time. Therefore, the longer we've already waited, -// the longer we can wait additionally. At some point we have to give up though. -// We pick a train model where the next boundary commits at a consistent schedule. -// These particular numbers are vague estimates. We expect to adjust them based on research. - -function jnd(timeElapsed) { - return timeElapsed < 120 - ? 120 - : timeElapsed < 480 - ? 480 - : timeElapsed < 1080 - ? 1080 - : timeElapsed < 1920 - ? 1920 - : timeElapsed < 3000 - ? 3000 - : timeElapsed < 4320 - ? 4320 - : ceil(timeElapsed / 1960) * 1960; } - function throwIfInfiniteUpdateLoopDetected() { if (nestedUpdateCount > NESTED_UPDATE_LIMIT) { nestedUpdateCount = 0; @@ -27691,7 +27616,7 @@ function createFiberRoot( return root; } -var ReactVersion = "18.3.0-next-ac43bf687-20230410"; +var ReactVersion = "18.3.0-next-0b931f90e-20230411"; function createPortal$1( children, diff --git a/compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/implementations/ReactNativeRenderer-prod.fb.js b/compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/implementations/ReactNativeRenderer-prod.fb.js index bd8a132475..0be1e4025e 100644 --- a/compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/implementations/ReactNativeRenderer-prod.fb.js +++ b/compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/implementations/ReactNativeRenderer-prod.fb.js @@ -940,7 +940,7 @@ eventPluginOrder = Array.prototype.slice.call([ "ReactNativeBridgeEventPlugin" ]); recomputePluginOrdering(); -var injectedNamesToPlugins$jscomp$inline_250 = { +var injectedNamesToPlugins$jscomp$inline_248 = { ResponderEventPlugin: ResponderEventPlugin, ReactNativeBridgeEventPlugin: { eventTypes: {}, @@ -986,32 +986,32 @@ var injectedNamesToPlugins$jscomp$inline_250 = { } } }, - isOrderingDirty$jscomp$inline_251 = !1, - pluginName$jscomp$inline_252; -for (pluginName$jscomp$inline_252 in injectedNamesToPlugins$jscomp$inline_250) + isOrderingDirty$jscomp$inline_249 = !1, + pluginName$jscomp$inline_250; +for (pluginName$jscomp$inline_250 in injectedNamesToPlugins$jscomp$inline_248) if ( - injectedNamesToPlugins$jscomp$inline_250.hasOwnProperty( - pluginName$jscomp$inline_252 + injectedNamesToPlugins$jscomp$inline_248.hasOwnProperty( + pluginName$jscomp$inline_250 ) ) { - var pluginModule$jscomp$inline_253 = - injectedNamesToPlugins$jscomp$inline_250[pluginName$jscomp$inline_252]; + var pluginModule$jscomp$inline_251 = + injectedNamesToPlugins$jscomp$inline_248[pluginName$jscomp$inline_250]; if ( - !namesToPlugins.hasOwnProperty(pluginName$jscomp$inline_252) || - namesToPlugins[pluginName$jscomp$inline_252] !== - pluginModule$jscomp$inline_253 + !namesToPlugins.hasOwnProperty(pluginName$jscomp$inline_250) || + namesToPlugins[pluginName$jscomp$inline_250] !== + pluginModule$jscomp$inline_251 ) { - if (namesToPlugins[pluginName$jscomp$inline_252]) + if (namesToPlugins[pluginName$jscomp$inline_250]) throw Error( "EventPluginRegistry: Cannot inject two different event plugins using the same name, `" + - (pluginName$jscomp$inline_252 + "`.") + (pluginName$jscomp$inline_250 + "`.") ); - namesToPlugins[pluginName$jscomp$inline_252] = - pluginModule$jscomp$inline_253; - isOrderingDirty$jscomp$inline_251 = !0; + namesToPlugins[pluginName$jscomp$inline_250] = + pluginModule$jscomp$inline_251; + isOrderingDirty$jscomp$inline_249 = !0; } } -isOrderingDirty$jscomp$inline_251 && recomputePluginOrdering(); +isOrderingDirty$jscomp$inline_249 && recomputePluginOrdering(); var instanceCache = new Map(), instanceProps = new Map(); function getInstanceFromTag(tag) { @@ -1911,19 +1911,19 @@ function markRootFinished(root, remainingLanes) { var eventTimes = root.eventTimes, expirationTimes = root.expirationTimes; for (root = root.hiddenUpdates; 0 < noLongerPendingLanes; ) { - var index$8 = 31 - clz32(noLongerPendingLanes), - lane = 1 << index$8; - remainingLanes[index$8] = 0; - eventTimes[index$8] = -1; - expirationTimes[index$8] = -1; - var hiddenUpdatesForLane = root[index$8]; + var index$7 = 31 - clz32(noLongerPendingLanes), + lane = 1 << index$7; + remainingLanes[index$7] = 0; + eventTimes[index$7] = -1; + expirationTimes[index$7] = -1; + var hiddenUpdatesForLane = root[index$7]; if (null !== hiddenUpdatesForLane) for ( - root[index$8] = null, index$8 = 0; - index$8 < hiddenUpdatesForLane.length; - index$8++ + root[index$7] = null, index$7 = 0; + index$7 < hiddenUpdatesForLane.length; + index$7++ ) { - var update = hiddenUpdatesForLane[index$8]; + var update = hiddenUpdatesForLane[index$7]; null !== update && (update.lane &= -1073741825); } noLongerPendingLanes &= ~lane; @@ -1932,10 +1932,10 @@ function markRootFinished(root, remainingLanes) { function markRootEntangled(root, entangledLanes) { var rootEntangledLanes = (root.entangledLanes |= entangledLanes); for (root = root.entanglements; rootEntangledLanes; ) { - var index$9 = 31 - clz32(rootEntangledLanes), - lane = 1 << index$9; - (lane & entangledLanes) | (root[index$9] & entangledLanes) && - (root[index$9] |= entangledLanes); + var index$8 = 31 - clz32(rootEntangledLanes), + lane = 1 << index$8; + (lane & entangledLanes) | (root[index$8] & entangledLanes) && + (root[index$8] |= entangledLanes); rootEntangledLanes &= ~lane; } } @@ -3583,10 +3583,10 @@ createFunctionComponentUpdateQueue = function () { function use(usable) { if (null !== usable && "object" === typeof usable) { if ("function" === typeof usable.then) { - var index$27 = thenableIndexCounter; + var index$26 = thenableIndexCounter; thenableIndexCounter += 1; null === thenableState && (thenableState = []); - usable = trackUsedThenable(thenableState, usable, index$27); + usable = trackUsedThenable(thenableState, usable, index$26); null === currentlyRenderingFiber$1.alternate && (null === workInProgressHook ? null === currentlyRenderingFiber$1.memoizedState @@ -5724,14 +5724,14 @@ function cutOffTailIfNeeded(renderState, hasRenderedATailFallback) { break; case "collapsed": lastTailNode = renderState.tail; - for (var lastTailNode$64 = null; null !== lastTailNode; ) - null !== lastTailNode.alternate && (lastTailNode$64 = lastTailNode), + for (var lastTailNode$63 = null; null !== lastTailNode; ) + null !== lastTailNode.alternate && (lastTailNode$63 = lastTailNode), (lastTailNode = lastTailNode.sibling); - null === lastTailNode$64 + null === lastTailNode$63 ? hasRenderedATailFallback || null === renderState.tail ? (renderState.tail = null) : (renderState.tail.sibling = null) - : (lastTailNode$64.sibling = null); + : (lastTailNode$63.sibling = null); } } function bubbleProperties(completedWork) { @@ -5741,19 +5741,19 @@ function bubbleProperties(completedWork) { newChildLanes = 0, subtreeFlags = 0; if (didBailout) - for (var child$65 = completedWork.child; null !== child$65; ) - (newChildLanes |= child$65.lanes | child$65.childLanes), - (subtreeFlags |= child$65.subtreeFlags & 31457280), - (subtreeFlags |= child$65.flags & 31457280), - (child$65.return = completedWork), - (child$65 = child$65.sibling); + for (var child$64 = completedWork.child; null !== child$64; ) + (newChildLanes |= child$64.lanes | child$64.childLanes), + (subtreeFlags |= child$64.subtreeFlags & 31457280), + (subtreeFlags |= child$64.flags & 31457280), + (child$64.return = completedWork), + (child$64 = child$64.sibling); else - for (child$65 = completedWork.child; null !== child$65; ) - (newChildLanes |= child$65.lanes | child$65.childLanes), - (subtreeFlags |= child$65.subtreeFlags), - (subtreeFlags |= child$65.flags), - (child$65.return = completedWork), - (child$65 = child$65.sibling); + for (child$64 = completedWork.child; null !== child$64; ) + (newChildLanes |= child$64.lanes | child$64.childLanes), + (subtreeFlags |= child$64.subtreeFlags), + (subtreeFlags |= child$64.flags), + (child$64.return = completedWork), + (child$64 = child$64.sibling); completedWork.subtreeFlags |= subtreeFlags; completedWork.childLanes = newChildLanes; return didBailout; @@ -6208,8 +6208,8 @@ function safelyDetachRef(current, nearestMountedAncestor) { else if ("function" === typeof ref) try { ref(null); - } catch (error$80) { - captureCommitPhaseError(current, nearestMountedAncestor, error$80); + } catch (error$79) { + captureCommitPhaseError(current, nearestMountedAncestor, error$79); } else ref.current = null; } @@ -6313,10 +6313,10 @@ function commitHookEffectListMount(flags, finishedWork) { var effect = (finishedWork = finishedWork.next); do { if ((effect.tag & flags) === flags) { - var create$81 = effect.create, + var create$80 = effect.create, inst = effect.inst; - create$81 = create$81(); - inst.destroy = create$81; + create$80 = create$80(); + inst.destroy = create$80; } effect = effect.next; } while (effect !== finishedWork); @@ -6370,11 +6370,11 @@ function commitLayoutEffectOnFiber(finishedRoot, current, finishedWork) { current, finishedRoot.__reactInternalSnapshotBeforeUpdate ); - } catch (error$82) { + } catch (error$81) { captureCommitPhaseError( finishedWork, finishedWork.return, - error$82 + error$81 ); } } @@ -6863,8 +6863,8 @@ function commitMutationEffectsOnFiber(finishedWork, root) { } try { commitHookEffectListUnmount(5, finishedWork, finishedWork.return); - } catch (error$90) { - captureCommitPhaseError(finishedWork, finishedWork.return, error$90); + } catch (error$89) { + captureCommitPhaseError(finishedWork, finishedWork.return, error$89); } } break; @@ -6911,8 +6911,8 @@ function commitMutationEffectsOnFiber(finishedWork, root) { viewConfig.uiViewClassName, updatePayload ); - } catch (error$93) { - captureCommitPhaseError(finishedWork, finishedWork.return, error$93); + } catch (error$92) { + captureCommitPhaseError(finishedWork, finishedWork.return, error$92); } } break; @@ -6932,8 +6932,8 @@ function commitMutationEffectsOnFiber(finishedWork, root) { "RCTRawText", { text: current } ); - } catch (error$94) { - captureCommitPhaseError(finishedWork, finishedWork.return, error$94); + } catch (error$93) { + captureCommitPhaseError(finishedWork, finishedWork.return, error$93); } } break; @@ -7045,11 +7045,11 @@ function commitMutationEffectsOnFiber(finishedWork, root) { if (null === current) try { throw Error("Not yet implemented."); - } catch (error$84) { + } catch (error$83) { captureCommitPhaseError( finishedWork, finishedWork.return, - error$84 + error$83 ); } } else if ( @@ -7123,12 +7123,12 @@ function commitReconciliationEffects(finishedWork) { break; case 3: case 4: - var parent$85 = JSCompiler_inline_result.stateNode.containerInfo, - before$86 = getHostSibling(finishedWork); + var parent$84 = JSCompiler_inline_result.stateNode.containerInfo, + before$85 = getHostSibling(finishedWork); insertOrAppendPlacementNodeIntoContainer( finishedWork, - before$86, - parent$85 + before$85, + parent$84 ); break; default: @@ -7680,12 +7680,12 @@ function scheduleTaskForRootDuringMicrotask(root, currentTime) { 0 < lanes; ) { - var index$6 = 31 - clz32(lanes), - lane = 1 << index$6, - expirationTime = expirationTimes[index$6]; + var index$5 = 31 - clz32(lanes), + lane = 1 << index$5, + expirationTime = expirationTimes[index$5]; if (-1 === expirationTime) { if (0 === (lane & suspendedLanes) || 0 !== (lane & pingedLanes)) - expirationTimes[index$6] = computeExpirationTime(lane, currentTime); + expirationTimes[index$5] = computeExpirationTime(lane, currentTime); } else expirationTime <= currentTime && (root.expiredLanes |= lane); lanes &= ~lane; } @@ -7742,8 +7742,7 @@ function scheduleTaskForRootDuringMicrotask(root, currentTime) { root.callbackNode = suspendedLanes; return currentTime; } -var ceil = Math.ceil, - PossiblyWeakMap = "function" === typeof WeakMap ? WeakMap : Map, +var PossiblyWeakMap = "function" === typeof WeakMap ? WeakMap : Map, ReactCurrentDispatcher = ReactSharedInternals.ReactCurrentDispatcher, ReactCurrentOwner = ReactSharedInternals.ReactCurrentOwner, ReactCurrentBatchConfig = ReactSharedInternals.ReactCurrentBatchConfig, @@ -7829,28 +7828,28 @@ function performConcurrentWorkOnRoot(root, didTimeout) { root === workInProgressRoot ? workInProgressRootRenderLanes : 0 ); if (0 === lanes) return null; - var exitStatus = + didTimeout = includesBlockingLane(root, lanes) || 0 !== (lanes & root.expiredLanes) || didTimeout ? renderRootSync(root, lanes) : renderRootConcurrent(root, lanes); - if (0 !== exitStatus) { - if (2 === exitStatus) { - didTimeout = lanes; - var errorRetryLanes = getLanesToRetrySynchronouslyOnError( - root, - didTimeout - ); + if (0 !== didTimeout) { + if (2 === didTimeout) { + var originallyAttemptedLanes = lanes, + errorRetryLanes = getLanesToRetrySynchronouslyOnError( + root, + originallyAttemptedLanes + ); 0 !== errorRetryLanes && ((lanes = errorRetryLanes), - (exitStatus = recoverFromConcurrentError( + (didTimeout = recoverFromConcurrentError( root, - didTimeout, + originallyAttemptedLanes, errorRetryLanes ))); } - if (1 === exitStatus) + if (1 === didTimeout) throw ( ((originalCallbackNode = workInProgressRootFatalError), prepareFreshStack(root, 0), @@ -7858,30 +7857,30 @@ function performConcurrentWorkOnRoot(root, didTimeout) { ensureRootIsScheduled(root), originalCallbackNode) ); - if (6 === exitStatus) markRootSuspended(root, lanes); + if (6 === didTimeout) markRootSuspended(root, lanes); else { errorRetryLanes = !includesBlockingLane(root, lanes); - didTimeout = root.current.alternate; + originallyAttemptedLanes = root.current.alternate; if ( errorRetryLanes && - !isRenderConsistentWithExternalStores(didTimeout) + !isRenderConsistentWithExternalStores(originallyAttemptedLanes) ) { - exitStatus = renderRootSync(root, lanes); - if (2 === exitStatus) { + didTimeout = renderRootSync(root, lanes); + if (2 === didTimeout) { errorRetryLanes = lanes; - var errorRetryLanes$103 = getLanesToRetrySynchronouslyOnError( + var errorRetryLanes$102 = getLanesToRetrySynchronouslyOnError( root, errorRetryLanes ); - 0 !== errorRetryLanes$103 && - ((lanes = errorRetryLanes$103), - (exitStatus = recoverFromConcurrentError( + 0 !== errorRetryLanes$102 && + ((lanes = errorRetryLanes$102), + (didTimeout = recoverFromConcurrentError( root, errorRetryLanes, - errorRetryLanes$103 + errorRetryLanes$102 ))); } - if (1 === exitStatus) + if (1 === didTimeout) throw ( ((originalCallbackNode = workInProgressRootFatalError), prepareFreshStack(root, 0), @@ -7890,16 +7889,16 @@ function performConcurrentWorkOnRoot(root, didTimeout) { originalCallbackNode) ); } - root.finishedWork = didTimeout; + root.finishedWork = originallyAttemptedLanes; root.finishedLanes = lanes; - switch (exitStatus) { + switch (didTimeout) { case 0: case 1: throw Error("Root did not complete. This is a bug in React."); case 2: commitRootWhenReady( root, - didTimeout, + originallyAttemptedLanes, workInProgressRootRecoverableErrors, workInProgressTransitions, lanes @@ -7909,26 +7908,26 @@ function performConcurrentWorkOnRoot(root, didTimeout) { markRootSuspended(root, lanes); if ( (lanes & 125829120) === lanes && - ((exitStatus = globalMostRecentFallbackTime + 500 - now()), - 10 < exitStatus) + ((didTimeout = globalMostRecentFallbackTime + 500 - now()), + 10 < didTimeout) ) { if (0 !== getNextLanes(root, 0)) break; root.timeoutHandle = scheduleTimeout( commitRootWhenReady.bind( null, root, - didTimeout, + originallyAttemptedLanes, workInProgressRootRecoverableErrors, workInProgressTransitions, lanes ), - exitStatus + didTimeout ); break; } commitRootWhenReady( root, - didTimeout, + originallyAttemptedLanes, workInProgressRootRecoverableErrors, workInProgressTransitions, lanes @@ -7937,48 +7936,9 @@ function performConcurrentWorkOnRoot(root, didTimeout) { case 4: markRootSuspended(root, lanes); if ((lanes & 8388480) === lanes) break; - exitStatus = lanes; - errorRetryLanes = root.eventTimes; - for (errorRetryLanes$103 = -1; 0 < exitStatus; ) { - var index$5 = 31 - clz32(exitStatus), - lane = 1 << index$5; - index$5 = errorRetryLanes[index$5]; - index$5 > errorRetryLanes$103 && (errorRetryLanes$103 = index$5); - exitStatus &= ~lane; - } - exitStatus = errorRetryLanes$103; - exitStatus = now() - exitStatus; - exitStatus = - (120 > exitStatus - ? 120 - : 480 > exitStatus - ? 480 - : 1080 > exitStatus - ? 1080 - : 1920 > exitStatus - ? 1920 - : 3e3 > exitStatus - ? 3e3 - : 4320 > exitStatus - ? 4320 - : 1960 * ceil(exitStatus / 1960)) - exitStatus; - if (10 < exitStatus) { - root.timeoutHandle = scheduleTimeout( - commitRootWhenReady.bind( - null, - root, - didTimeout, - workInProgressRootRecoverableErrors, - workInProgressTransitions, - lanes - ), - exitStatus - ); - break; - } commitRootWhenReady( root, - didTimeout, + originallyAttemptedLanes, workInProgressRootRecoverableErrors, workInProgressTransitions, lanes @@ -7987,7 +7947,7 @@ function performConcurrentWorkOnRoot(root, didTimeout) { case 5: commitRootWhenReady( root, - didTimeout, + originallyAttemptedLanes, workInProgressRootRecoverableErrors, workInProgressTransitions, lanes @@ -8091,9 +8051,9 @@ function markRootSuspended(root, suspendedLanes) { root.suspendedLanes |= suspendedLanes; root.pingedLanes &= ~suspendedLanes; for (root = root.expirationTimes; 0 < suspendedLanes; ) { - var index$7 = 31 - clz32(suspendedLanes), - lane = 1 << index$7; - root[index$7] = -1; + var index$6 = 31 - clz32(suspendedLanes), + lane = 1 << index$6; + root[index$6] = -1; suspendedLanes &= ~lane; } } @@ -8214,8 +8174,8 @@ function renderRootSync(root, lanes) { } workLoopSync(); break; - } catch (thrownValue$106) { - handleThrow(root, thrownValue$106); + } catch (thrownValue$104) { + handleThrow(root, thrownValue$104); } while (1); resetContextDependencies(); @@ -8320,8 +8280,8 @@ function renderRootConcurrent(root, lanes) { } workLoopConcurrent(); break; - } catch (thrownValue$108) { - handleThrow(root, thrownValue$108); + } catch (thrownValue$106) { + handleThrow(root, thrownValue$106); } while (1); resetContextDependencies(); @@ -8487,10 +8447,10 @@ function throwAndUnwindWorkLoop(unitOfWork, thrownValue) { }; suspenseBoundary.updateQueue = newOffscreenQueue; } else { - var retryQueue$34 = offscreenQueue.retryQueue; - null === retryQueue$34 + var retryQueue$33 = offscreenQueue.retryQueue; + null === retryQueue$33 ? (offscreenQueue.retryQueue = new Set([wakeable])) - : retryQueue$34.add(wakeable); + : retryQueue$33.add(wakeable); } } break; @@ -9802,10 +9762,10 @@ batchedUpdatesImpl = function (fn, a) { } }; var roots = new Map(), - devToolsConfig$jscomp$inline_1106 = { + devToolsConfig$jscomp$inline_1100 = { findFiberByHostInstance: getInstanceFromTag, bundleType: 0, - version: "18.3.0-next-ac43bf687-20230410", + version: "18.3.0-next-0b931f90e-20230411", rendererPackageName: "react-native-renderer", rendererConfig: { getInspectorDataForViewTag: function () { @@ -9820,11 +9780,11 @@ var roots = new Map(), }.bind(null, findNodeHandle) } }; -var internals$jscomp$inline_1358 = { - bundleType: devToolsConfig$jscomp$inline_1106.bundleType, - version: devToolsConfig$jscomp$inline_1106.version, - rendererPackageName: devToolsConfig$jscomp$inline_1106.rendererPackageName, - rendererConfig: devToolsConfig$jscomp$inline_1106.rendererConfig, +var internals$jscomp$inline_1343 = { + bundleType: devToolsConfig$jscomp$inline_1100.bundleType, + version: devToolsConfig$jscomp$inline_1100.version, + rendererPackageName: devToolsConfig$jscomp$inline_1100.rendererPackageName, + rendererConfig: devToolsConfig$jscomp$inline_1100.rendererConfig, overrideHookState: null, overrideHookStateDeletePath: null, overrideHookStateRenamePath: null, @@ -9840,26 +9800,26 @@ var internals$jscomp$inline_1358 = { return null === fiber ? null : fiber.stateNode; }, findFiberByHostInstance: - devToolsConfig$jscomp$inline_1106.findFiberByHostInstance || + devToolsConfig$jscomp$inline_1100.findFiberByHostInstance || emptyFindFiberByHostInstance, findHostInstancesForRefresh: null, scheduleRefresh: null, scheduleRoot: null, setRefreshHandler: null, getCurrentFiber: null, - reconcilerVersion: "18.3.0-next-ac43bf687-20230410" + reconcilerVersion: "18.3.0-next-0b931f90e-20230411" }; if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) { - var hook$jscomp$inline_1359 = __REACT_DEVTOOLS_GLOBAL_HOOK__; + var hook$jscomp$inline_1344 = __REACT_DEVTOOLS_GLOBAL_HOOK__; if ( - !hook$jscomp$inline_1359.isDisabled && - hook$jscomp$inline_1359.supportsFiber + !hook$jscomp$inline_1344.isDisabled && + hook$jscomp$inline_1344.supportsFiber ) try { - (rendererID = hook$jscomp$inline_1359.inject( - internals$jscomp$inline_1358 + (rendererID = hook$jscomp$inline_1344.inject( + internals$jscomp$inline_1343 )), - (injectedHook = hook$jscomp$inline_1359); + (injectedHook = hook$jscomp$inline_1344); } catch (err) {} } exports.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED = { diff --git a/compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/implementations/ReactNativeRenderer-profiling.fb.js b/compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/implementations/ReactNativeRenderer-profiling.fb.js index be08847214..6781954ae5 100644 --- a/compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/implementations/ReactNativeRenderer-profiling.fb.js +++ b/compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/implementations/ReactNativeRenderer-profiling.fb.js @@ -951,7 +951,7 @@ eventPluginOrder = Array.prototype.slice.call([ "ReactNativeBridgeEventPlugin" ]); recomputePluginOrdering(); -var injectedNamesToPlugins$jscomp$inline_266 = { +var injectedNamesToPlugins$jscomp$inline_264 = { ResponderEventPlugin: ResponderEventPlugin, ReactNativeBridgeEventPlugin: { eventTypes: {}, @@ -997,32 +997,32 @@ var injectedNamesToPlugins$jscomp$inline_266 = { } } }, - isOrderingDirty$jscomp$inline_267 = !1, - pluginName$jscomp$inline_268; -for (pluginName$jscomp$inline_268 in injectedNamesToPlugins$jscomp$inline_266) + isOrderingDirty$jscomp$inline_265 = !1, + pluginName$jscomp$inline_266; +for (pluginName$jscomp$inline_266 in injectedNamesToPlugins$jscomp$inline_264) if ( - injectedNamesToPlugins$jscomp$inline_266.hasOwnProperty( - pluginName$jscomp$inline_268 + injectedNamesToPlugins$jscomp$inline_264.hasOwnProperty( + pluginName$jscomp$inline_266 ) ) { - var pluginModule$jscomp$inline_269 = - injectedNamesToPlugins$jscomp$inline_266[pluginName$jscomp$inline_268]; + var pluginModule$jscomp$inline_267 = + injectedNamesToPlugins$jscomp$inline_264[pluginName$jscomp$inline_266]; if ( - !namesToPlugins.hasOwnProperty(pluginName$jscomp$inline_268) || - namesToPlugins[pluginName$jscomp$inline_268] !== - pluginModule$jscomp$inline_269 + !namesToPlugins.hasOwnProperty(pluginName$jscomp$inline_266) || + namesToPlugins[pluginName$jscomp$inline_266] !== + pluginModule$jscomp$inline_267 ) { - if (namesToPlugins[pluginName$jscomp$inline_268]) + if (namesToPlugins[pluginName$jscomp$inline_266]) throw Error( "EventPluginRegistry: Cannot inject two different event plugins using the same name, `" + - (pluginName$jscomp$inline_268 + "`.") + (pluginName$jscomp$inline_266 + "`.") ); - namesToPlugins[pluginName$jscomp$inline_268] = - pluginModule$jscomp$inline_269; - isOrderingDirty$jscomp$inline_267 = !0; + namesToPlugins[pluginName$jscomp$inline_266] = + pluginModule$jscomp$inline_267; + isOrderingDirty$jscomp$inline_265 = !0; } } -isOrderingDirty$jscomp$inline_267 && recomputePluginOrdering(); +isOrderingDirty$jscomp$inline_265 && recomputePluginOrdering(); var instanceCache = new Map(), instanceProps = new Map(); function getInstanceFromTag(tag) { @@ -2009,19 +2009,19 @@ function markRootFinished(root, remainingLanes) { var eventTimes = root.eventTimes, expirationTimes = root.expirationTimes; for (root = root.hiddenUpdates; 0 < noLongerPendingLanes; ) { - var index$9 = 31 - clz32(noLongerPendingLanes), - lane = 1 << index$9; - remainingLanes[index$9] = 0; - eventTimes[index$9] = -1; - expirationTimes[index$9] = -1; - var hiddenUpdatesForLane = root[index$9]; + var index$8 = 31 - clz32(noLongerPendingLanes), + lane = 1 << index$8; + remainingLanes[index$8] = 0; + eventTimes[index$8] = -1; + expirationTimes[index$8] = -1; + var hiddenUpdatesForLane = root[index$8]; if (null !== hiddenUpdatesForLane) for ( - root[index$9] = null, index$9 = 0; - index$9 < hiddenUpdatesForLane.length; - index$9++ + root[index$8] = null, index$8 = 0; + index$8 < hiddenUpdatesForLane.length; + index$8++ ) { - var update = hiddenUpdatesForLane[index$9]; + var update = hiddenUpdatesForLane[index$8]; null !== update && (update.lane &= -1073741825); } noLongerPendingLanes &= ~lane; @@ -2030,19 +2030,19 @@ function markRootFinished(root, remainingLanes) { function markRootEntangled(root, entangledLanes) { var rootEntangledLanes = (root.entangledLanes |= entangledLanes); for (root = root.entanglements; rootEntangledLanes; ) { - var index$10 = 31 - clz32(rootEntangledLanes), - lane = 1 << index$10; - (lane & entangledLanes) | (root[index$10] & entangledLanes) && - (root[index$10] |= entangledLanes); + var index$9 = 31 - clz32(rootEntangledLanes), + lane = 1 << index$9; + (lane & entangledLanes) | (root[index$9] & entangledLanes) && + (root[index$9] |= entangledLanes); rootEntangledLanes &= ~lane; } } function addFiberToLanesMap(root, fiber, lanes) { if (isDevToolsPresent) for (root = root.pendingUpdatersLaneMap; 0 < lanes; ) { - var index$11 = 31 - clz32(lanes), - lane = 1 << index$11; - root[index$11].add(fiber); + var index$10 = 31 - clz32(lanes), + lane = 1 << index$10; + root[index$10].add(fiber); lanes &= ~lane; } } @@ -2054,16 +2054,16 @@ function movePendingFibersToMemoized(root, lanes) { 0 < lanes; ) { - var index$12 = 31 - clz32(lanes); - root = 1 << index$12; - index$12 = pendingUpdatersLaneMap[index$12]; - 0 < index$12.size && - (index$12.forEach(function (fiber) { + var index$11 = 31 - clz32(lanes); + root = 1 << index$11; + index$11 = pendingUpdatersLaneMap[index$11]; + 0 < index$11.size && + (index$11.forEach(function (fiber) { var alternate = fiber.alternate; (null !== alternate && memoizedUpdaters.has(alternate)) || memoizedUpdaters.add(fiber); }), - index$12.clear()); + index$11.clear()); lanes &= ~root; } } @@ -3711,10 +3711,10 @@ createFunctionComponentUpdateQueue = function () { function use(usable) { if (null !== usable && "object" === typeof usable) { if ("function" === typeof usable.then) { - var index$30 = thenableIndexCounter; + var index$29 = thenableIndexCounter; thenableIndexCounter += 1; null === thenableState && (thenableState = []); - usable = trackUsedThenable(thenableState, usable, index$30); + usable = trackUsedThenable(thenableState, usable, index$29); null === currentlyRenderingFiber$1.alternate && (null === workInProgressHook ? null === currentlyRenderingFiber$1.memoizedState @@ -5952,14 +5952,14 @@ function cutOffTailIfNeeded(renderState, hasRenderedATailFallback) { break; case "collapsed": lastTailNode = renderState.tail; - for (var lastTailNode$68 = null; null !== lastTailNode; ) - null !== lastTailNode.alternate && (lastTailNode$68 = lastTailNode), + for (var lastTailNode$67 = null; null !== lastTailNode; ) + null !== lastTailNode.alternate && (lastTailNode$67 = lastTailNode), (lastTailNode = lastTailNode.sibling); - null === lastTailNode$68 + null === lastTailNode$67 ? hasRenderedATailFallback || null === renderState.tail ? (renderState.tail = null) : (renderState.tail.sibling = null) - : (lastTailNode$68.sibling = null); + : (lastTailNode$67.sibling = null); } } function bubbleProperties(completedWork) { @@ -5971,53 +5971,53 @@ function bubbleProperties(completedWork) { if (didBailout) if (0 !== (completedWork.mode & 2)) { for ( - var treeBaseDuration$70 = completedWork.selfBaseDuration, - child$71 = completedWork.child; - null !== child$71; + var treeBaseDuration$69 = completedWork.selfBaseDuration, + child$70 = completedWork.child; + null !== child$70; ) - (newChildLanes |= child$71.lanes | child$71.childLanes), - (subtreeFlags |= child$71.subtreeFlags & 31457280), - (subtreeFlags |= child$71.flags & 31457280), - (treeBaseDuration$70 += child$71.treeBaseDuration), - (child$71 = child$71.sibling); - completedWork.treeBaseDuration = treeBaseDuration$70; + (newChildLanes |= child$70.lanes | child$70.childLanes), + (subtreeFlags |= child$70.subtreeFlags & 31457280), + (subtreeFlags |= child$70.flags & 31457280), + (treeBaseDuration$69 += child$70.treeBaseDuration), + (child$70 = child$70.sibling); + completedWork.treeBaseDuration = treeBaseDuration$69; } else for ( - treeBaseDuration$70 = completedWork.child; - null !== treeBaseDuration$70; + treeBaseDuration$69 = completedWork.child; + null !== treeBaseDuration$69; ) (newChildLanes |= - treeBaseDuration$70.lanes | treeBaseDuration$70.childLanes), - (subtreeFlags |= treeBaseDuration$70.subtreeFlags & 31457280), - (subtreeFlags |= treeBaseDuration$70.flags & 31457280), - (treeBaseDuration$70.return = completedWork), - (treeBaseDuration$70 = treeBaseDuration$70.sibling); + treeBaseDuration$69.lanes | treeBaseDuration$69.childLanes), + (subtreeFlags |= treeBaseDuration$69.subtreeFlags & 31457280), + (subtreeFlags |= treeBaseDuration$69.flags & 31457280), + (treeBaseDuration$69.return = completedWork), + (treeBaseDuration$69 = treeBaseDuration$69.sibling); else if (0 !== (completedWork.mode & 2)) { - treeBaseDuration$70 = completedWork.actualDuration; - child$71 = completedWork.selfBaseDuration; + treeBaseDuration$69 = completedWork.actualDuration; + child$70 = completedWork.selfBaseDuration; for (var child = completedWork.child; null !== child; ) (newChildLanes |= child.lanes | child.childLanes), (subtreeFlags |= child.subtreeFlags), (subtreeFlags |= child.flags), - (treeBaseDuration$70 += child.actualDuration), - (child$71 += child.treeBaseDuration), + (treeBaseDuration$69 += child.actualDuration), + (child$70 += child.treeBaseDuration), (child = child.sibling); - completedWork.actualDuration = treeBaseDuration$70; - completedWork.treeBaseDuration = child$71; + completedWork.actualDuration = treeBaseDuration$69; + completedWork.treeBaseDuration = child$70; } else for ( - treeBaseDuration$70 = completedWork.child; - null !== treeBaseDuration$70; + treeBaseDuration$69 = completedWork.child; + null !== treeBaseDuration$69; ) (newChildLanes |= - treeBaseDuration$70.lanes | treeBaseDuration$70.childLanes), - (subtreeFlags |= treeBaseDuration$70.subtreeFlags), - (subtreeFlags |= treeBaseDuration$70.flags), - (treeBaseDuration$70.return = completedWork), - (treeBaseDuration$70 = treeBaseDuration$70.sibling); + treeBaseDuration$69.lanes | treeBaseDuration$69.childLanes), + (subtreeFlags |= treeBaseDuration$69.subtreeFlags), + (subtreeFlags |= treeBaseDuration$69.flags), + (treeBaseDuration$69.return = completedWork), + (treeBaseDuration$69 = treeBaseDuration$69.sibling); completedWork.subtreeFlags |= subtreeFlags; completedWork.childLanes = newChildLanes; return didBailout; @@ -6530,8 +6530,8 @@ function safelyDetachRef(current, nearestMountedAncestor) { recordLayoutEffectDuration(current); } else ref(null); - } catch (error$89) { - captureCommitPhaseError(current, nearestMountedAncestor, error$89); + } catch (error$88) { + captureCommitPhaseError(current, nearestMountedAncestor, error$88); } else ref.current = null; } @@ -6664,10 +6664,10 @@ function commitHookEffectListMount(flags, finishedWork) { injectedProfilingHooks.markComponentLayoutEffectMountStarted( finishedWork ); - var create$90 = effect.create, + var create$89 = effect.create, inst = effect.inst; - create$90 = create$90(); - inst.destroy = create$90; + create$89 = create$89(); + inst.destroy = create$89; 0 !== (flags & 8) ? null !== injectedProfilingHooks && "function" === @@ -6695,8 +6695,8 @@ function commitHookLayoutEffects(finishedWork, hookFlags) { } else try { commitHookEffectListMount(hookFlags, finishedWork); - } catch (error$92) { - captureCommitPhaseError(finishedWork, finishedWork.return, error$92); + } catch (error$91) { + captureCommitPhaseError(finishedWork, finishedWork.return, error$91); } } function commitClassCallbacks(finishedWork) { @@ -6776,11 +6776,11 @@ function commitLayoutEffectOnFiber(finishedRoot, current, finishedWork) { } else try { finishedRoot.componentDidMount(); - } catch (error$93) { + } catch (error$92) { captureCommitPhaseError( finishedWork, finishedWork.return, - error$93 + error$92 ); } else { @@ -6797,11 +6797,11 @@ function commitLayoutEffectOnFiber(finishedRoot, current, finishedWork) { current, finishedRoot.__reactInternalSnapshotBeforeUpdate ); - } catch (error$94) { + } catch (error$93) { captureCommitPhaseError( finishedWork, finishedWork.return, - error$94 + error$93 ); } recordLayoutEffectDuration(finishedWork); @@ -6812,11 +6812,11 @@ function commitLayoutEffectOnFiber(finishedRoot, current, finishedWork) { current, finishedRoot.__reactInternalSnapshotBeforeUpdate ); - } catch (error$95) { + } catch (error$94) { captureCommitPhaseError( finishedWork, finishedWork.return, - error$95 + error$94 ); } } @@ -7332,22 +7332,22 @@ function commitMutationEffectsOnFiber(finishedWork, root) { try { startLayoutEffectTimer(), commitHookEffectListUnmount(5, finishedWork, finishedWork.return); - } catch (error$104) { + } catch (error$103) { captureCommitPhaseError( finishedWork, finishedWork.return, - error$104 + error$103 ); } recordLayoutEffectDuration(finishedWork); } else try { commitHookEffectListUnmount(5, finishedWork, finishedWork.return); - } catch (error$105) { + } catch (error$104) { captureCommitPhaseError( finishedWork, finishedWork.return, - error$105 + error$104 ); } } @@ -7395,8 +7395,8 @@ function commitMutationEffectsOnFiber(finishedWork, root) { viewConfig.uiViewClassName, updatePayload ); - } catch (error$108) { - captureCommitPhaseError(finishedWork, finishedWork.return, error$108); + } catch (error$107) { + captureCommitPhaseError(finishedWork, finishedWork.return, error$107); } } break; @@ -7416,8 +7416,8 @@ function commitMutationEffectsOnFiber(finishedWork, root) { "RCTRawText", { text: current } ); - } catch (error$109) { - captureCommitPhaseError(finishedWork, finishedWork.return, error$109); + } catch (error$108) { + captureCommitPhaseError(finishedWork, finishedWork.return, error$108); } } break; @@ -7529,11 +7529,11 @@ function commitMutationEffectsOnFiber(finishedWork, root) { if (null === current) try { throw Error("Not yet implemented."); - } catch (error$98) { + } catch (error$97) { captureCommitPhaseError( finishedWork, finishedWork.return, - error$98 + error$97 ); } } else if ( @@ -7607,12 +7607,12 @@ function commitReconciliationEffects(finishedWork) { break; case 3: case 4: - var parent$99 = JSCompiler_inline_result.stateNode.containerInfo, - before$100 = getHostSibling(finishedWork); + var parent$98 = JSCompiler_inline_result.stateNode.containerInfo, + before$99 = getHostSibling(finishedWork); insertOrAppendPlacementNodeIntoContainer( finishedWork, - before$100, - parent$99 + before$99, + parent$98 ); break; default: @@ -7798,8 +7798,8 @@ function commitHookPassiveMountEffects(finishedWork, hookFlags) { } else try { commitHookEffectListMount(hookFlags, finishedWork); - } catch (error$116) { - captureCommitPhaseError(finishedWork, finishedWork.return, error$116); + } catch (error$115) { + captureCommitPhaseError(finishedWork, finishedWork.return, error$115); } } function recursivelyTraversePassiveMountEffects(root, parentFiber) { @@ -8208,12 +8208,12 @@ function scheduleTaskForRootDuringMicrotask(root, currentTime) { 0 < lanes; ) { - var index$7 = 31 - clz32(lanes), - lane = 1 << index$7, - expirationTime = expirationTimes[index$7]; + var index$6 = 31 - clz32(lanes), + lane = 1 << index$6, + expirationTime = expirationTimes[index$6]; if (-1 === expirationTime) { if (0 === (lane & suspendedLanes) || 0 !== (lane & pingedLanes)) - expirationTimes[index$7] = computeExpirationTime(lane, currentTime); + expirationTimes[index$6] = computeExpirationTime(lane, currentTime); } else expirationTime <= currentTime && (root.expiredLanes |= lane); lanes &= ~lane; } @@ -8270,8 +8270,7 @@ function scheduleTaskForRootDuringMicrotask(root, currentTime) { root.callbackNode = suspendedLanes; return currentTime; } -var ceil = Math.ceil, - PossiblyWeakMap = "function" === typeof WeakMap ? WeakMap : Map, +var PossiblyWeakMap = "function" === typeof WeakMap ? WeakMap : Map, ReactCurrentDispatcher = ReactSharedInternals.ReactCurrentDispatcher, ReactCurrentOwner = ReactSharedInternals.ReactCurrentOwner, ReactCurrentBatchConfig = ReactSharedInternals.ReactCurrentBatchConfig, @@ -8360,28 +8359,28 @@ function performConcurrentWorkOnRoot(root, didTimeout) { root === workInProgressRoot ? workInProgressRootRenderLanes : 0 ); if (0 === lanes) return null; - var exitStatus = + didTimeout = includesBlockingLane(root, lanes) || 0 !== (lanes & root.expiredLanes) || didTimeout ? renderRootSync(root, lanes) : renderRootConcurrent(root, lanes); - if (0 !== exitStatus) { - if (2 === exitStatus) { - didTimeout = lanes; - var errorRetryLanes = getLanesToRetrySynchronouslyOnError( - root, - didTimeout - ); + if (0 !== didTimeout) { + if (2 === didTimeout) { + var originallyAttemptedLanes = lanes, + errorRetryLanes = getLanesToRetrySynchronouslyOnError( + root, + originallyAttemptedLanes + ); 0 !== errorRetryLanes && ((lanes = errorRetryLanes), - (exitStatus = recoverFromConcurrentError( + (didTimeout = recoverFromConcurrentError( root, - didTimeout, + originallyAttemptedLanes, errorRetryLanes ))); } - if (1 === exitStatus) + if (1 === didTimeout) throw ( ((originalCallbackNode = workInProgressRootFatalError), prepareFreshStack(root, 0), @@ -8389,30 +8388,30 @@ function performConcurrentWorkOnRoot(root, didTimeout) { ensureRootIsScheduled(root), originalCallbackNode) ); - if (6 === exitStatus) markRootSuspended(root, lanes); + if (6 === didTimeout) markRootSuspended(root, lanes); else { errorRetryLanes = !includesBlockingLane(root, lanes); - didTimeout = root.current.alternate; + originallyAttemptedLanes = root.current.alternate; if ( errorRetryLanes && - !isRenderConsistentWithExternalStores(didTimeout) + !isRenderConsistentWithExternalStores(originallyAttemptedLanes) ) { - exitStatus = renderRootSync(root, lanes); - if (2 === exitStatus) { + didTimeout = renderRootSync(root, lanes); + if (2 === didTimeout) { errorRetryLanes = lanes; - var errorRetryLanes$119 = getLanesToRetrySynchronouslyOnError( + var errorRetryLanes$118 = getLanesToRetrySynchronouslyOnError( root, errorRetryLanes ); - 0 !== errorRetryLanes$119 && - ((lanes = errorRetryLanes$119), - (exitStatus = recoverFromConcurrentError( + 0 !== errorRetryLanes$118 && + ((lanes = errorRetryLanes$118), + (didTimeout = recoverFromConcurrentError( root, errorRetryLanes, - errorRetryLanes$119 + errorRetryLanes$118 ))); } - if (1 === exitStatus) + if (1 === didTimeout) throw ( ((originalCallbackNode = workInProgressRootFatalError), prepareFreshStack(root, 0), @@ -8421,16 +8420,16 @@ function performConcurrentWorkOnRoot(root, didTimeout) { originalCallbackNode) ); } - root.finishedWork = didTimeout; + root.finishedWork = originallyAttemptedLanes; root.finishedLanes = lanes; - switch (exitStatus) { + switch (didTimeout) { case 0: case 1: throw Error("Root did not complete. This is a bug in React."); case 2: commitRootWhenReady( root, - didTimeout, + originallyAttemptedLanes, workInProgressRootRecoverableErrors, workInProgressTransitions, lanes @@ -8440,26 +8439,26 @@ function performConcurrentWorkOnRoot(root, didTimeout) { markRootSuspended(root, lanes); if ( (lanes & 125829120) === lanes && - ((exitStatus = globalMostRecentFallbackTime + 500 - now$1()), - 10 < exitStatus) + ((didTimeout = globalMostRecentFallbackTime + 500 - now$1()), + 10 < didTimeout) ) { if (0 !== getNextLanes(root, 0)) break; root.timeoutHandle = scheduleTimeout( commitRootWhenReady.bind( null, root, - didTimeout, + originallyAttemptedLanes, workInProgressRootRecoverableErrors, workInProgressTransitions, lanes ), - exitStatus + didTimeout ); break; } commitRootWhenReady( root, - didTimeout, + originallyAttemptedLanes, workInProgressRootRecoverableErrors, workInProgressTransitions, lanes @@ -8468,48 +8467,9 @@ function performConcurrentWorkOnRoot(root, didTimeout) { case 4: markRootSuspended(root, lanes); if ((lanes & 8388480) === lanes) break; - exitStatus = lanes; - errorRetryLanes = root.eventTimes; - for (errorRetryLanes$119 = -1; 0 < exitStatus; ) { - var index$6 = 31 - clz32(exitStatus), - lane = 1 << index$6; - index$6 = errorRetryLanes[index$6]; - index$6 > errorRetryLanes$119 && (errorRetryLanes$119 = index$6); - exitStatus &= ~lane; - } - exitStatus = errorRetryLanes$119; - exitStatus = now$1() - exitStatus; - exitStatus = - (120 > exitStatus - ? 120 - : 480 > exitStatus - ? 480 - : 1080 > exitStatus - ? 1080 - : 1920 > exitStatus - ? 1920 - : 3e3 > exitStatus - ? 3e3 - : 4320 > exitStatus - ? 4320 - : 1960 * ceil(exitStatus / 1960)) - exitStatus; - if (10 < exitStatus) { - root.timeoutHandle = scheduleTimeout( - commitRootWhenReady.bind( - null, - root, - didTimeout, - workInProgressRootRecoverableErrors, - workInProgressTransitions, - lanes - ), - exitStatus - ); - break; - } commitRootWhenReady( root, - didTimeout, + originallyAttemptedLanes, workInProgressRootRecoverableErrors, workInProgressTransitions, lanes @@ -8518,7 +8478,7 @@ function performConcurrentWorkOnRoot(root, didTimeout) { case 5: commitRootWhenReady( root, - didTimeout, + originallyAttemptedLanes, workInProgressRootRecoverableErrors, workInProgressTransitions, lanes @@ -8622,9 +8582,9 @@ function markRootSuspended(root, suspendedLanes) { root.suspendedLanes |= suspendedLanes; root.pingedLanes &= ~suspendedLanes; for (root = root.expirationTimes; 0 < suspendedLanes; ) { - var index$8 = 31 - clz32(suspendedLanes), - lane = 1 << index$8; - root[index$8] = -1; + var index$7 = 31 - clz32(suspendedLanes), + lane = 1 << index$7; + root[index$7] = -1; suspendedLanes &= ~lane; } } @@ -8784,8 +8744,8 @@ function renderRootSync(root, lanes) { } workLoopSync(); break; - } catch (thrownValue$122) { - handleThrow(root, thrownValue$122); + } catch (thrownValue$120) { + handleThrow(root, thrownValue$120); } while (1); resetContextDependencies(); @@ -8901,8 +8861,8 @@ function renderRootConcurrent(root, lanes) { } workLoopConcurrent(); break; - } catch (thrownValue$124) { - handleThrow(root, thrownValue$124); + } catch (thrownValue$122) { + handleThrow(root, thrownValue$122); } while (1); resetContextDependencies(); @@ -9086,10 +9046,10 @@ function throwAndUnwindWorkLoop(unitOfWork, thrownValue) { }; suspenseBoundary.updateQueue = newOffscreenQueue; } else { - var retryQueue$37 = offscreenQueue.retryQueue; - null === retryQueue$37 + var retryQueue$36 = offscreenQueue.retryQueue; + null === retryQueue$36 ? (offscreenQueue.retryQueue = new Set([wakeable])) - : retryQueue$37.add(wakeable); + : retryQueue$36.add(wakeable); } } break; @@ -9374,11 +9334,11 @@ function flushPassiveEffects() { _finishedWork$memoize = finishedWork.memoizedProps, id = _finishedWork$memoize.id, onPostCommit = _finishedWork$memoize.onPostCommit, - commitTime$91 = commitTime, + commitTime$90 = commitTime, phase = null === finishedWork.alternate ? "mount" : "update"; currentUpdateIsNested && (phase = "nested-update"); "function" === typeof onPostCommit && - onPostCommit(id, phase, passiveEffectDuration, commitTime$91); + onPostCommit(id, phase, passiveEffectDuration, commitTime$90); var parentFiber = finishedWork.return; b: for (; null !== parentFiber; ) { switch (parentFiber.tag) { @@ -10511,10 +10471,10 @@ batchedUpdatesImpl = function (fn, a) { } }; var roots = new Map(), - devToolsConfig$jscomp$inline_1184 = { + devToolsConfig$jscomp$inline_1178 = { findFiberByHostInstance: getInstanceFromTag, bundleType: 0, - version: "18.3.0-next-ac43bf687-20230410", + version: "18.3.0-next-0b931f90e-20230411", rendererPackageName: "react-native-renderer", rendererConfig: { getInspectorDataForViewTag: function () { @@ -10543,10 +10503,10 @@ var roots = new Map(), } catch (err) {} return hook.checkDCE ? !0 : !1; })({ - bundleType: devToolsConfig$jscomp$inline_1184.bundleType, - version: devToolsConfig$jscomp$inline_1184.version, - rendererPackageName: devToolsConfig$jscomp$inline_1184.rendererPackageName, - rendererConfig: devToolsConfig$jscomp$inline_1184.rendererConfig, + bundleType: devToolsConfig$jscomp$inline_1178.bundleType, + version: devToolsConfig$jscomp$inline_1178.version, + rendererPackageName: devToolsConfig$jscomp$inline_1178.rendererPackageName, + rendererConfig: devToolsConfig$jscomp$inline_1178.rendererConfig, overrideHookState: null, overrideHookStateDeletePath: null, overrideHookStateRenamePath: null, @@ -10562,14 +10522,14 @@ var roots = new Map(), return null === fiber ? null : fiber.stateNode; }, findFiberByHostInstance: - devToolsConfig$jscomp$inline_1184.findFiberByHostInstance || + devToolsConfig$jscomp$inline_1178.findFiberByHostInstance || emptyFindFiberByHostInstance, findHostInstancesForRefresh: null, scheduleRefresh: null, scheduleRoot: null, setRefreshHandler: null, getCurrentFiber: null, - reconcilerVersion: "18.3.0-next-ac43bf687-20230410" + reconcilerVersion: "18.3.0-next-0b931f90e-20230411" }); exports.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED = { computeComponentStackForErrorReporting: function (reactTag) {