react-native-screen-transitions 3.10.0 → 3.11.0

package/lib/commonjs/shared/components/activity/variants/activity-screen.js

@@ -11,6 +11,7 @@ var _reactNativeScreens = require("react-native-screens");
 var _constants = require("../../../constants");
 var _useStack = require("../../../hooks/navigation/use-stack");
 var _useSharedValueState = require("../../../hooks/reanimated/use-shared-value-state");
+var _blankStack = require("../../../providers/stack/blank-stack.provider");
 var _animation = require("../../../stores/animation.store");
 var _helpers = require("../helpers");
 var _jsxRuntime = require("react/jsx-runtime");
@@ -29,12 +30,27 @@ const PointerEventsByActivity = {
 const ActivityScreen = exports.ActivityScreen = /*#__PURE__*/(0, _react.memo)(function ActivityScreen({
   activity,
   children,
-  inactiveBehavior = _helpers.DEFAULT_INACTIVE_BEHAVIOR,
+  inactiveBehavior,
   paintDriverRouteKey,
-  hasNestedState
+  hasNestedState,
+  routeKey
 }) {
+  const stackActivity = (0, _blankStack.useBlankStackStore)(store => routeKey ? store?.scenesByKey[routeKey]?.activity : undefined);
+  const stackInactiveBehavior = (0, _blankStack.useBlankStackStore)(store => routeKey ? store?.scenesByKey[routeKey]?.descriptor.options?.inactiveBehavior : undefined);
+  const stackRoute = (0, _blankStack.useBlankStackStore)(store => routeKey ? store?.scenesByKey[routeKey]?.route : undefined);
+  const stackPaintDriverRouteKey = (0, _blankStack.useBlankStackStore)(store => {
+    if (!routeKey || !store) {
+      return undefined;
+    }
+    const routeIndex = store.routeKeys.indexOf(routeKey);
+    return store.routeKeys[routeIndex + 2];
+  });
+  const resolvedActivity = activity ?? stackActivity ?? "active";
+  const resolvedInactiveBehavior = inactiveBehavior ?? stackInactiveBehavior ?? _helpers.DEFAULT_INACTIVE_BEHAVIOR;
+  const resolvedPaintDriverRouteKey = paintDriverRouteKey ?? stackPaintDriverRouteKey;
+  const resolvedHasNestedState = hasNestedState ?? (stackRoute ? "state" in stackRoute : false);
   const nativeScreenDisabled = (0, _useStack.useStack)(s => s.flags.DISABLE_NATIVE_SCREENS);
-  const paintDriverAnimations = paintDriverRouteKey ? _animation.AnimationStore.getBag(paintDriverRouteKey) : undefined;
+  const paintDriverAnimations = resolvedPaintDriverRouteKey ? _animation.AnimationStore.getBag(resolvedPaintDriverRouteKey) : undefined;
 
   /**
    * Avoid hiding inactive content until the screen that exposes it has settled.
@@ -52,12 +68,12 @@ const ActivityScreen = exports.ActivityScreen = /*#__PURE__*/(0, _react.memo)(fu
     return paintDriverAnimations.transitionProgress.get() >= 1;
   });
   const isPaintDriverSettledOnJS = (0, _useSharedValueState.useSharedValueState)(isPaintDriverSettled);
-  let activityState = ActivityStateByActivity[activity];
+  let activityState = ActivityStateByActivity[resolvedActivity];
   let shouldFreeze = false;
-  let visible = activity !== "inactive";
+  let visible = resolvedActivity !== "inactive";
   const shouldWaitForPaintDriver = !isPaintDriverSettledOnJS;
-  if (activity === "inactive") {
-    if (inactiveBehavior === "keep") {
+  if (resolvedActivity === "inactive") {
+    if (resolvedInactiveBehavior === "keep") {
       activityState = 1;
       visible = true;
     } else if (shouldWaitForPaintDriver) {
@@ -65,7 +81,7 @@ const ActivityScreen = exports.ActivityScreen = /*#__PURE__*/(0, _react.memo)(fu
       // a blank frame during the transition.
       activityState = 1;
       visible = true;
-    } else if (inactiveBehavior === "pause") {
+    } else if (resolvedInactiveBehavior === "pause") {
       activityState = 1;
       shouldFreeze = true;
       visible = true;
@@ -77,8 +93,8 @@ const ActivityScreen = exports.ActivityScreen = /*#__PURE__*/(0, _react.memo)(fu
       visible = false;
     }
   }
-  const shouldUnmount = inactiveBehavior === "unmount" && activity === "inactive" && !hasNestedState && isPaintDriverSettledOnJS;
-  const pointerEvents = PointerEventsByActivity[activity];
+  const shouldUnmount = resolvedInactiveBehavior === "unmount" && resolvedActivity === "inactive" && !resolvedHasNestedState && isPaintDriverSettledOnJS;
+  const pointerEvents = PointerEventsByActivity[resolvedActivity];
   if (shouldUnmount) {
     return null;
   }

package/lib/commonjs/shared/components/activity/variants/activity-screen.js.map

@@ -1 +1 @@
-{"version":3,"names":["_react","require","_reactNative","_reactNativeReanimated","_reactNativeScreens","_constants","_useStack","_useSharedValueState","_animation","_helpers","_jsxRuntime","ActivityStateByActivity","active","inert","inactive","closing","PointerEventsByActivity","ActivityScreen","exports","memo","activity","children","inactiveBehavior","DEFAULT_INACTIVE_BEHAVIOR","paintDriverRouteKey","hasNestedState","nativeScreenDisabled","useStack","s","flags","DISABLE_NATIVE_SCREENS","paintDriverAnimations","AnimationStore","getBag","undefined","isPaintDriverSettled","useDerivedValue","transitionProgress","get","isPaintDriverSettledOnJS","useSharedValueState","activityState","shouldFreeze","visible","shouldWaitForPaintDriver","shouldUnmount","pointerEvents","style","StyleSheet","absoluteFill","styles","hidden","IS_WEB","jsx","View","collapsable","Screen","HIDDEN_SCREEN_OFFSET","create","transform","translateY"],"sourceRoot":"../../../../../../src","sources":["shared/components/activity/variants/activity-screen.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_react","require","_reactNative","_reactNativeReanimated","_reactNativeScreens","_constants","_useStack","_useSharedValueState","_blankStack","_animation","_helpers","_jsxRuntime","ActivityStateByActivity","active","inert","inactive","closing","PointerEventsByActivity","ActivityScreen","exports","memo","activity","children","inactiveBehavior","paintDriverRouteKey","hasNestedState","routeKey","stackActivity","useBlankStackStore","store","scenesByKey","undefined","stackInactiveBehavior","descriptor","options","stackRoute","route","stackPaintDriverRouteKey","routeIndex","routeKeys","indexOf","resolvedActivity","resolvedInactiveBehavior","DEFAULT_INACTIVE_BEHAVIOR","resolvedPaintDriverRouteKey","resolvedHasNestedState","nativeScreenDisabled","useStack","s","flags","DISABLE_NATIVE_SCREENS","paintDriverAnimations","AnimationStore","getBag","isPaintDriverSettled","useDerivedValue","transitionProgress","get","isPaintDriverSettledOnJS","useSharedValueState","activityState","shouldFreeze","visible","shouldWaitForPaintDriver","shouldUnmount","pointerEvents","style","StyleSheet","absoluteFill","styles","hidden","IS_WEB","jsx","View","collapsable","Screen","HIDDEN_SCREEN_OFFSET","create","transform","translateY"],"sourceRoot":"../../../../../../src","sources":["shared/components/activity/variants/activity-screen.tsx"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/shared/components/boundary/components/boundary-target.js

@@ -22,7 +22,7 @@ const BoundaryTargetInner = props => {
     style,
     ...rest
   } = props;
-  const rootContext = (0, _boundaryRoot.useBoundaryRootContext)();
+  const rootContext = (0, _boundaryRoot.useBoundaryRootStore)();
   const boundaryId = rootContext?.boundTag.tag;
   const isActiveTarget = active === true && rootContext !== null;
   const portalRuntime = rootContext?.portalRuntime;

package/lib/commonjs/shared/components/boundary/components/boundary-target.js.map

@@ -1 +1 @@
-{"version":3,"names":["_react","require","_reactNativeReanimated","_interopRequireDefault","_styles","_logger","_boundaryContentPortal","_boundaryPortal","_boundaryRoot","_jsxRuntime","e","__esModule","default","BOUNDARY_TARGET_ACTIVE_PROP","exports","BoundaryTargetInner","props","active","children","pointerEvents","style","rest","rootContext","useBoundaryRootContext","boundaryId","boundTag","tag","isActiveTarget","portalRuntime","handoffEnabled","shouldEscapeTargetToScreenHost","escapeClipping","shouldApplyAssociatedStyleInline","shouldApplyPortalLayoutStyle","associatedTargetStyles","useComposedSlotStyles","portalLayoutStyle","useSlotLayoutStyles","measurementRef","undefined","useLayoutEffect","__DEV__","logger","warn","TARGET_OUTSIDE_ROOT_WARNING","jsx","BoundaryPortal","enabled","placeholderRef","View","ref","collapsable","BoundaryContentPortalHost","screenKey","currentScreenKey","BoundaryContentPortal","BoundaryTarget","memo"],"sourceRoot":"../../../../../../src","sources":["shared/components/boundary/components/boundary-target.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_react","require","_reactNativeReanimated","_interopRequireDefault","_styles","_logger","_boundaryContentPortal","_boundaryPortal","_boundaryRoot","_jsxRuntime","e","__esModule","default","BOUNDARY_TARGET_ACTIVE_PROP","exports","BoundaryTargetInner","props","active","children","pointerEvents","style","rest","rootContext","useBoundaryRootStore","boundaryId","boundTag","tag","isActiveTarget","portalRuntime","handoffEnabled","shouldEscapeTargetToScreenHost","escapeClipping","shouldApplyAssociatedStyleInline","shouldApplyPortalLayoutStyle","associatedTargetStyles","useComposedSlotStyles","portalLayoutStyle","useSlotLayoutStyles","measurementRef","undefined","useLayoutEffect","__DEV__","logger","warn","TARGET_OUTSIDE_ROOT_WARNING","jsx","BoundaryPortal","enabled","placeholderRef","View","ref","collapsable","BoundaryContentPortalHost","screenKey","currentScreenKey","BoundaryContentPortal","BoundaryTarget","memo"],"sourceRoot":"../../../../../../src","sources":["shared/components/boundary/components/boundary-target.tsx"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/shared/components/boundary/hooks/lifecycles/use-initial-destination-measurement.js

@@ -15,7 +15,9 @@ var _state = require("../../../../stores/bounds/internals/state");
 var _system = require("../../../../stores/system.store");
 var _logger = require("../../../../utils/logger");
 var _destinationSignals = require("../../utils/destination-signals");
-const HANDSHAKE_RETRY_DELAY_MS = 100;
+// A missed layout should be retried on the next frame. The previous 100 ms
+// interval made each ordinary Android layout miss visibly delay navigation.
+const HANDSHAKE_RETRY_DELAY_MS = 16;
 /**
  * A destination whose initial handshake never completes must not hold the
  * transition gate forever. After this budget, release the block with a warning
@@ -91,23 +93,32 @@ const useInitialDestinationMeasurement = ({
   (0, _reactNativeReanimated.useAnimatedReaction)(() => {
     "worklet";
 
+    if (!destinationEnabled || !initialDestinationPairKey || isBlockingLifecycleStart.get() <= 0) {
+      return null;
+    }
+    if (progress.get() > 0) {
+      return null;
+    }
     const retryTick = retryToken.get();
-    const isWaitingForOpenToStart = progress.get() <= 0;
-    const sourceScreenKey = initialDestinationPairKey ? (0, _linkPairs.getSourceScreenKeyFromPairKey)(initialDestinationPairKey) : undefined;
+    const sourceScreenKey = (0, _linkPairs.getSourceScreenKeyFromPairKey)(initialDestinationPairKey);
     const signal = (0, _destinationSignals.getInitialDestinationMeasurementSignal)({
-      enabled: destinationEnabled && isWaitingForOpenToStart && isBlockingLifecycleStart.get() > 0,
+      enabled: destinationEnabled,
       destinationPairKey,
       ancestorDestinationPairKey,
       linkId: linkKey,
       group,
       destinationPresent: (0, _entries.getEntry)(tag, currentScreenKey) !== null,
-      sourcePresent: sourceScreenKey !== undefined && (0, _entries.getEntry)(tag, sourceScreenKey) !== null,
-      linkState: initialDestinationPairKey ? _state.pairs.get() : undefined
+      sourcePresent: (0, _entries.getEntry)(tag, sourceScreenKey) !== null,
+      linkState: _state.pairs.get()
     });
     return [signal?.pairKey ?? null, signal?.action ?? null, retryTick];
-  }, ([measurePairKey, action, retryTick], previous) => {
+  }, (next, previous) => {
     "worklet";
 
+    if (!next) {
+      return;
+    }
+    const [measurePairKey, action, retryTick] = next;
     if (!measurePairKey || !action) {
       return;
     }

package/lib/commonjs/shared/components/boundary/hooks/lifecycles/use-initial-destination-measurement.js.map

@@ -1 +1 @@
-{"version":3,"names":["_react","require","_reactNativeReanimated","_descriptors","_animation","_linkPairs","_entries","_links","_state","_system","_logger","_destinationSignals","HANDSHAKE_RETRY_DELAY_MS","MAX_HANDSHAKE_RETRIES","useInitialDestinationMeasurement","boundTag","enabled","escapeClipping","measureBoundary","tag","linkKey","group","currentScreenKey","useDescriptorsStore","s","derivations","nextScreenKey","destinationPairKey","ancestorDestinationPairKey","destinationEnabled","initialDestinationPairKey","progress","AnimationStore","getValue","actions","blockLifecycleStart","unblockLifecycleStart","SystemStore","getBag","isBlockingLifecycleStart","useSharedValue","retryToken","handshakeRetries","hasGivenUp","releaseLifecycleStartBlock","useCallback","cancelAnimation","get","set","claimLifecycleStartBlock","useLayoutEffect","runOnUI","useAnimatedReaction","retryTick","isWaitingForOpenToStart","sourceScreenKey","getSourceScreenKeyFromPairKey","undefined","signal","getInitialDestinationMeasurementSignal","linkId","destinationPresent","getEntry","sourcePresent","linkState","pairs","pairKey","action","measurePairKey","previous","previousMeasurePairKey","previousAction","previousRetryTick","shouldHandleSignal","type","link","getLink","linkComplete","source","destination","logger","warn","withDelay","withTiming","duration","exports"],"sourceRoot":"../../../../../../../src","sources":["shared/components/boundary/hooks/lifecycles/use-initial-destination-measurement.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_react","require","_reactNativeReanimated","_descriptors","_animation","_linkPairs","_entries","_links","_state","_system","_logger","_destinationSignals","HANDSHAKE_RETRY_DELAY_MS","MAX_HANDSHAKE_RETRIES","useInitialDestinationMeasurement","boundTag","enabled","escapeClipping","measureBoundary","tag","linkKey","group","currentScreenKey","useDescriptorsStore","s","derivations","nextScreenKey","destinationPairKey","ancestorDestinationPairKey","destinationEnabled","initialDestinationPairKey","progress","AnimationStore","getValue","actions","blockLifecycleStart","unblockLifecycleStart","SystemStore","getBag","isBlockingLifecycleStart","useSharedValue","retryToken","handshakeRetries","hasGivenUp","releaseLifecycleStartBlock","useCallback","cancelAnimation","get","set","claimLifecycleStartBlock","useLayoutEffect","runOnUI","useAnimatedReaction","retryTick","sourceScreenKey","getSourceScreenKeyFromPairKey","signal","getInitialDestinationMeasurementSignal","linkId","destinationPresent","getEntry","sourcePresent","linkState","pairs","pairKey","action","next","previous","measurePairKey","previousMeasurePairKey","previousAction","previousRetryTick","shouldHandleSignal","type","link","getLink","linkComplete","source","destination","logger","warn","withDelay","withTiming","duration","exports"],"sourceRoot":"../../../../../../../src","sources":["shared/components/boundary/hooks/lifecycles/use-initial-destination-measurement.ts"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/shared/components/boundary/hooks/lifecycles/use-refresh-boundary.js

@@ -8,7 +8,6 @@ var _reactNativeReanimated = require("react-native-reanimated");
 var _descriptors = require("../../../../providers/screen/descriptors");
 var _animation = require("../../../../stores/animation.store");
 var _state = require("../../../../stores/bounds/internals/state");
-var _gesture = require("../../../../stores/gesture.store");
 var _refreshSignals = require("../../utils/refresh-signals");
 const useRefreshBoundary = ({
   enabled,
@@ -29,15 +28,13 @@ const useRefreshBoundary = ({
   const refreshScreenKey = nextScreenKey ?? currentScreenKey;
   const refreshWillAnimate = _animation.AnimationStore.getValue(refreshScreenKey, "willAnimate");
   const refreshClosing = _animation.AnimationStore.getValue(refreshScreenKey, "closing");
-  const refreshEntering = _animation.AnimationStore.getValue(refreshScreenKey, "entering");
-  const refreshAnimating = _animation.AnimationStore.getValue(refreshScreenKey, "progressAnimating");
-  const refreshProgress = _animation.AnimationStore.getValue(refreshScreenKey, "transitionProgress");
-  const refreshDragging = _gesture.GestureStore.getValue(refreshScreenKey, "dragging");
-  const refreshDismissing = _gesture.GestureStore.getValue(refreshScreenKey, "dismissing");
-  const refreshSettling = _gesture.GestureStore.getValue(refreshScreenKey, "settling");
   (0, _reactNativeReanimated.useAnimatedReaction)(() => {
     "worklet";
 
+    const shouldRefresh = enabled && !!refreshWillAnimate.get();
+    if (!shouldRefresh) {
+      return null;
+    }
     return (0, _refreshSignals.getRefreshBoundarySignal)({
       enabled,
       currentScreenKey,
@@ -47,12 +44,8 @@ const useRefreshBoundary = ({
       nextScreenKey,
       linkId: linkKey,
       group,
-      shouldRefresh: !!refreshWillAnimate.get(),
+      shouldRefresh,
       closing: !!refreshClosing.get(),
-      entering: !!refreshEntering.get(),
-      animating: !!refreshAnimating.get(),
-      progress: refreshProgress.get(),
-      gestureInProgress: !!refreshDragging.get() || !!refreshDismissing.get() || !!refreshSettling.get(),
       linkState: _state.pairs.get()
     });
   }, (refreshSignal, prevRefreshSignal) => {

package/lib/commonjs/shared/components/boundary/hooks/lifecycles/use-refresh-boundary.js.map

@@ -1 +1 @@
-{"version":3,"names":["_reactNativeReanimated","require","_descriptors","_animation","_state","_gesture","_refreshSignals","useRefreshBoundary","enabled","boundTag","measureBoundary","linkKey","group","currentScreenKey","useDescriptorsStore","s","derivations","nextScreenKey","sourcePairKey","destinationPairKey","ancestorDestinationPairKey","refreshScreenKey","refreshWillAnimate","AnimationStore","getValue","refreshClosing","refreshEntering","refreshAnimating","refreshProgress","refreshDragging","GestureStore","refreshDismissing","refreshSettling","useAnimatedReaction","getRefreshBoundarySignal","linkId","shouldRefresh","get","closing","entering","animating","progress","gestureInProgress","linkState","pairs","refreshSignal","prevRefreshSignal","signal","type","pairKey","exports"],"sourceRoot":"../../../../../../../src","sources":["shared/components/boundary/hooks/lifecycles/use-refresh-boundary.ts"],"mappings":";;;;;;AAAA,IAAAA,sBAAA,GAAAC,OAAA;AACA,IAAAC,YAAA,GAAAD,OAAA;AACA,IAAAE,UAAA,GAAAF,OAAA;AACA,IAAAG,MAAA,GAAAH,OAAA;AAEA,IAAAI,QAAA,GAAAJ,OAAA;AAEA,IAAAK,eAAA,GAAAL,OAAA;AAQO,MAAMM,kBAAkB,GAAGA,CAAC;EAClCC,OAAO;EACPC,QAAQ;EACRC;AACyB,CAAC,KAAK;EAC/B,MAAM;IAAEC,OAAO;IAAEC;EAAM,CAAC,GAAGH,QAAQ;EACnC,MAAMI,gBAAgB,GAAG,IAAAC,gCAAmB,EAC1CC,CAAC,IAAKA,CAAC,CAACC,WAAW,CAACH,gBACtB,CAAC;EACD,MAAMI,aAAa,GAAG,IAAAH,gCAAmB,EAAEC,CAAC,IAAKA,CAAC,CAACC,WAAW,CAACC,aAAa,CAAC;EAC7E,MAAMC,aAAa,GAAG,IAAAJ,gCAAmB,EAAEC,CAAC,IAAKA,CAAC,CAACC,WAAW,CAACE,aAAa,CAAC;EAC7E,MAAMC,kBAAkB,GAAG,IAAAL,gCAAmB,EAC5CC,CAAC,IAAKA,CAAC,CAACC,WAAW,CAACG,kBACtB,CAAC;EACD,MAAMC,0BAA0B,GAAG,IAAAN,gCAAmB,EACpDC,CAAC,IAAKA,CAAC,CAACC,WAAW,CAACI,0BACtB,CAAC;EACD;EACA;EACA,MAAMC,gBAAgB,GAAGJ,aAAa,IAAIJ,gBAAgB;EAC1D,MAAMS,kBAAkB,GAAGC,yBAAc,CAACC,QAAQ,CACjDH,gBAAgB,EAChB,aACD,CAAC;EACD,MAAMI,cAAc,GAAGF,yBAAc,CAACC,QAAQ,CAACH,gBAAgB,EAAE,SAAS,CAAC;EAC3E,MAAMK,eAAe,GAAGH,yBAAc,CAACC,QAAQ,CAACH,gBAAgB,EAAE,UAAU,CAAC;EAC7E,MAAMM,gBAAgB,GAAGJ,yBAAc,CAACC,QAAQ,CAC/CH,gBAAgB,EAChB,mBACD,CAAC;EACD,MAAMO,eAAe,GAAGL,yBAAc,CAACC,QAAQ,CAC9CH,gBAAgB,EAChB,oBACD,CAAC;EACD,MAAMQ,eAAe,GAAGC,qBAAY,CAACN,QAAQ,CAACH,gBAAgB,EAAE,UAAU,CAAC;EAC3E,MAAMU,iBAAiB,GAAGD,qBAAY,CAACN,QAAQ,CAC9CH,gBAAgB,EAChB,YACD,CAAC;EACD,MAAMW,eAAe,GAAGF,qBAAY,CAACN,QAAQ,CAACH,gBAAgB,EAAE,UAAU,CAAC;EAE3E,IAAAY,0CAAmB,EAClB,MAAM;IACL,SAAS;;IACT,OAAO,IAAAC,wCAAwB,EAAC;MAC/B1B,OAAO;MACPK,gBAAgB;MAChBK,aAAa;MACbC,kBAAkB;MAClBC,0BAA0B;MAC1BH,aAAa;MACbkB,MAAM,EAAExB,OAAO;MACfC,KAAK;MACLwB,aAAa,EAAE,CAAC,CAACd,kBAAkB,CAACe,GAAG,CAAC,CAAC;MACzCC,OAAO,EAAE,CAAC,CAACb,cAAc,CAACY,GAAG,CAAC,CAAC;MAC/BE,QAAQ,EAAE,CAAC,CAACb,eAAe,CAACW,GAAG,CAAC,CAAC;MACjCG,SAAS,EAAE,CAAC,CAACb,gBAAgB,CAACU,GAAG,CAAC,CAAC;MACnCI,QAAQ,EAAEb,eAAe,CAACS,GAAG,CAAC,CAAC;MAC/BK,iBAAiB,EAChB,CAAC,CAACb,eAAe,CAACQ,GAAG,CAAC,CAAC,IACvB,CAAC,CAACN,iBAAiB,CAACM,GAAG,CAAC,CAAC,IACzB,CAAC,CAACL,eAAe,CAACK,GAAG,CAAC,CAAC;MACxBM,SAAS,EAAEC,YAAK,CAACP,GAAG,CAAC;IACtB,CAAC,CAAC;EACH,CAAC,EACD,CAACQ,aAAa,EAAEC,iBAAiB,KAAK;IACrC,SAAS;;IAET,IACC,CAACD,aAAa,IACdA,aAAa,CAACE,MAAM,KAAKD,iBAAiB,EAAEC,MAAM,EACjD;MACD;IACD;IAEArC,eAAe,CAAC;MACfsC,IAAI,EAAEH,aAAa,CAACG,IAAI;MACxBC,OAAO,EAAEJ,aAAa,CAACI;IACxB,CAAC,CAAC;EACH,CACD,CAAC;AACF,CAAC;AAACC,OAAA,CAAA3C,kBAAA,GAAAA,kBAAA","ignoreList":[]}
+{"version":3,"names":["_reactNativeReanimated","require","_descriptors","_animation","_state","_refreshSignals","useRefreshBoundary","enabled","boundTag","measureBoundary","linkKey","group","currentScreenKey","useDescriptorsStore","s","derivations","nextScreenKey","sourcePairKey","destinationPairKey","ancestorDestinationPairKey","refreshScreenKey","refreshWillAnimate","AnimationStore","getValue","refreshClosing","useAnimatedReaction","shouldRefresh","get","getRefreshBoundarySignal","linkId","closing","linkState","pairs","refreshSignal","prevRefreshSignal","signal","type","pairKey","exports"],"sourceRoot":"../../../../../../../src","sources":["shared/components/boundary/hooks/lifecycles/use-refresh-boundary.ts"],"mappings":";;;;;;AAAA,IAAAA,sBAAA,GAAAC,OAAA;AACA,IAAAC,YAAA,GAAAD,OAAA;AACA,IAAAE,UAAA,GAAAF,OAAA;AACA,IAAAG,MAAA,GAAAH,OAAA;AAGA,IAAAI,eAAA,GAAAJ,OAAA;AAQO,MAAMK,kBAAkB,GAAGA,CAAC;EAClCC,OAAO;EACPC,QAAQ;EACRC;AACyB,CAAC,KAAK;EAC/B,MAAM;IAAEC,OAAO;IAAEC;EAAM,CAAC,GAAGH,QAAQ;EACnC,MAAMI,gBAAgB,GAAG,IAAAC,gCAAmB,EAC1CC,CAAC,IAAKA,CAAC,CAACC,WAAW,CAACH,gBACtB,CAAC;EACD,MAAMI,aAAa,GAAG,IAAAH,gCAAmB,EAAEC,CAAC,IAAKA,CAAC,CAACC,WAAW,CAACC,aAAa,CAAC;EAC7E,MAAMC,aAAa,GAAG,IAAAJ,gCAAmB,EAAEC,CAAC,IAAKA,CAAC,CAACC,WAAW,CAACE,aAAa,CAAC;EAC7E,MAAMC,kBAAkB,GAAG,IAAAL,gCAAmB,EAC5CC,CAAC,IAAKA,CAAC,CAACC,WAAW,CAACG,kBACtB,CAAC;EACD,MAAMC,0BAA0B,GAAG,IAAAN,gCAAmB,EACpDC,CAAC,IAAKA,CAAC,CAACC,WAAW,CAACI,0BACtB,CAAC;EACD;EACA;EACA,MAAMC,gBAAgB,GAAGJ,aAAa,IAAIJ,gBAAgB;EAC1D,MAAMS,kBAAkB,GAAGC,yBAAc,CAACC,QAAQ,CACjDH,gBAAgB,EAChB,aACD,CAAC;EACD,MAAMI,cAAc,GAAGF,yBAAc,CAACC,QAAQ,CAACH,gBAAgB,EAAE,SAAS,CAAC;EAE3E,IAAAK,0CAAmB,EAClB,MAAM;IACL,SAAS;;IAET,MAAMC,aAAa,GAAGnB,OAAO,IAAI,CAAC,CAACc,kBAAkB,CAACM,GAAG,CAAC,CAAC;IAC3D,IAAI,CAACD,aAAa,EAAE;MACnB,OAAO,IAAI;IACZ;IAEA,OAAO,IAAAE,wCAAwB,EAAC;MAC/BrB,OAAO;MACPK,gBAAgB;MAChBK,aAAa;MACbC,kBAAkB;MAClBC,0BAA0B;MAC1BH,aAAa;MACba,MAAM,EAAEnB,OAAO;MACfC,KAAK;MACLe,aAAa;MACbI,OAAO,EAAE,CAAC,CAACN,cAAc,CAACG,GAAG,CAAC,CAAC;MAC/BI,SAAS,EAAEC,YAAK,CAACL,GAAG,CAAC;IACtB,CAAC,CAAC;EACH,CAAC,EACD,CAACM,aAAa,EAAEC,iBAAiB,KAAK;IACrC,SAAS;;IAET,IACC,CAACD,aAAa,IACdA,aAAa,CAACE,MAAM,KAAKD,iBAAiB,EAAEC,MAAM,EACjD;MACD;IACD;IAEA1B,eAAe,CAAC;MACf2B,IAAI,EAAEH,aAAa,CAACG,IAAI;MACxBC,OAAO,EAAEJ,aAAa,CAACI;IACxB,CAAC,CAAC;EACH,CACD,CAAC;AACF,CAAC;AAACC,OAAA,CAAAhC,kBAAA,GAAAA,kBAAA","ignoreList":[]}

package/lib/commonjs/shared/components/boundary/hooks/use-measurer.js

@@ -6,9 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.useMeasurer = void 0;
 var _react = require("react");
 var _reactNative = require("react-native");
-var _reactNativeReanimated = require("react-native-reanimated");
 var _measuredBoundsWrites = require("../../../providers/helpers/measured-bounds-writes");
-var _origin = require("../../../providers/screen/origin.provider");
 var _styles = require("../../../providers/screen/styles");
 var _scroll = require("../../../stores/scroll.store");
 var _system = require("../../../stores/system.store");
@@ -30,9 +28,6 @@ const useMeasurer = ({
   const scrollState = _scroll.ScrollStore.getValue(currentScreenKey, "coordination");
   const scrollMetadata = _scroll.ScrollStore.getValue(currentScreenKey, "metadata");
   const pendingLifecycleStartBlockCount = _system.SystemStore.getValue(currentScreenKey, "pendingLifecycleStartBlockCount");
-  const {
-    originRef
-  } = (0, _origin.useOriginContext)();
   const {
     visibilityBlocked
   } = (0, _styles.useScreenSlots)();
@@ -41,12 +36,10 @@ const useMeasurer = ({
 
     if (!enabled) return;
     const measured = (0, _measuredBounds.measureWithOverscrollAwareness)(measuredAnimatedRef, scrollState.get());
-    const measuredOrigin = (0, _reactNativeReanimated.measure)(originRef);
-    if (!measured || !measuredOrigin) return;
-    const normalizedMeasured = (0, _measuredBounds.normalizeMeasuredBoundsWithVisibilityGate)({
+    if (!measured) return;
+    const correctedMeasured = (0, _measuredBounds.correctMeasuredBoundsForVisibilityGate)({
       measured,
-      origin: measuredOrigin,
-      visibilityBlocked: escapeClipping && visibilityBlocked.get(),
+      visibilityBlocked: visibilityBlocked.get(),
       visibilityBlockOffset: (0, _visibilityBlockOffset.getVisibilityBlockOffset)(viewportHeight),
       viewportWidth,
       viewportHeight
@@ -60,9 +53,9 @@ const useMeasurer = ({
      * lifecycle blocked until a valid retry lands.
      */
     const shouldGuardDestinationViewport = pendingLifecycleStartBlockCount.get() > 0 || !!boundTag.group;
-    const viewportAllowsDestinationWrite = target.type !== "destination" || !shouldGuardDestinationViewport || (0, _measuredBounds.isMeasurementInViewport)(normalizedMeasured, viewportWidth, viewportHeight);
+    const viewportAllowsDestinationWrite = target.type !== "destination" || !shouldGuardDestinationViewport || (0, _measuredBounds.isMeasurementInViewport)(correctedMeasured, viewportWidth, viewportHeight);
     if (!viewportAllowsDestinationWrite) return;
-    const measuredWithScroll = (0, _measuredBounds.attachScrollSnapshotToMeasuredBounds)(normalizedMeasured, scrollMetadata.get());
+    const measuredWithScroll = (0, _measuredBounds.attachScrollSnapshotToMeasuredBounds)(correctedMeasured, scrollMetadata.get());
     (0, _measuredBoundsWrites.applyMeasuredBoundsWrites)({
       entryTag: boundTag.tag,
       linkId: boundTag.linkKey,
@@ -74,7 +67,7 @@ const useMeasurer = ({
       handoff,
       escapeClipping
     });
-  }, [enabled, boundTag, currentScreenKey, preparedStyles, measuredAnimatedRef, handoff, escapeClipping, viewportWidth, viewportHeight, scrollState, scrollMetadata, pendingLifecycleStartBlockCount, originRef, visibilityBlocked]);
+  }, [enabled, boundTag, currentScreenKey, preparedStyles, measuredAnimatedRef, handoff, escapeClipping, viewportWidth, viewportHeight, scrollState, scrollMetadata, pendingLifecycleStartBlockCount, visibilityBlocked]);
 };
 exports.useMeasurer = useMeasurer;
 //# sourceMappingURL=use-measurer.js.map

package/lib/commonjs/shared/components/boundary/hooks/use-measurer.js.map

@@ -1 +1 @@
-{"version":3,"names":["_react","require","_reactNative","_reactNativeReanimated","_measuredBoundsWrites","_origin","_styles","_scroll","_system","_visibilityBlockOffset","_measuredBounds","useMeasurer","enabled","boundTag","currentScreenKey","preparedStyles","measuredAnimatedRef","handoff","escapeClipping","width","viewportWidth","height","viewportHeight","useWindowDimensions","scrollState","ScrollStore","getValue","scrollMetadata","pendingLifecycleStartBlockCount","SystemStore","originRef","useOriginContext","visibilityBlocked","useScreenSlots","useCallback","target","measured","measureWithOverscrollAwareness","get","measuredOrigin","measure","normalizedMeasured","normalizeMeasuredBoundsWithVisibilityGate","origin","visibilityBlockOffset","getVisibilityBlockOffset","shouldGuardDestinationViewport","group","viewportAllowsDestinationWrite","type","isMeasurementInViewport","measuredWithScroll","attachScrollSnapshotToMeasuredBounds","applyMeasuredBoundsWrites","entryTag","tag","linkId","linkKey","linkWrite","exports"],"sourceRoot":"../../../../../../src","sources":["shared/components/boundary/hooks/use-measurer.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_react","require","_reactNative","_measuredBoundsWrites","_styles","_scroll","_system","_visibilityBlockOffset","_measuredBounds","useMeasurer","enabled","boundTag","currentScreenKey","preparedStyles","measuredAnimatedRef","handoff","escapeClipping","width","viewportWidth","height","viewportHeight","useWindowDimensions","scrollState","ScrollStore","getValue","scrollMetadata","pendingLifecycleStartBlockCount","SystemStore","visibilityBlocked","useScreenSlots","useCallback","target","measured","measureWithOverscrollAwareness","get","correctedMeasured","correctMeasuredBoundsForVisibilityGate","visibilityBlockOffset","getVisibilityBlockOffset","shouldGuardDestinationViewport","group","viewportAllowsDestinationWrite","type","isMeasurementInViewport","measuredWithScroll","attachScrollSnapshotToMeasuredBounds","applyMeasuredBoundsWrites","entryTag","tag","linkId","linkKey","linkWrite","exports"],"sourceRoot":"../../../../../../src","sources":["shared/components/boundary/hooks/use-measurer.ts"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,OAAA;AAEA,IAAAC,YAAA,GAAAD,OAAA;AAEA,IAAAE,qBAAA,GAAAF,OAAA;AACA,IAAAG,OAAA,GAAAH,OAAA;AAEA,IAAAI,OAAA,GAAAJ,OAAA;AACA,IAAAK,OAAA,GAAAL,OAAA;AACA,IAAAM,sBAAA,GAAAN,OAAA;AAEA,IAAAO,eAAA,GAAAP,OAAA;AAiBO,MAAMQ,WAAW,GAAGA,CAAC;EAC3BC,OAAO;EACPC,QAAQ;EACRC,gBAAgB;EAChBC,cAAc;EACdC,mBAAmB;EACnBC,OAAO;EACPC;AACkB,CAAC,KAAsB;EACzC,MAAM;IAAEC,KAAK,EAAEC,aAAa;IAAEC,MAAM,EAAEC;EAAe,CAAC,GACrD,IAAAC,gCAAmB,EAAC,CAAC;EAEtB,MAAMC,WAAW,GAAGC,mBAAW,CAACC,QAAQ,CAACZ,gBAAgB,EAAE,cAAc,CAAC;EAC1E,MAAMa,cAAc,GAAGF,mBAAW,CAACC,QAAQ,CAACZ,gBAAgB,EAAE,UAAU,CAAC;EACzE,MAAMc,+BAA+B,GAAGC,mBAAW,CAACH,QAAQ,CAC3DZ,gBAAgB,EAChB,iCACD,CAAC;EACD,MAAM;IAAEgB;EAAkB,CAAC,GAAG,IAAAC,sBAAc,EAAC,CAAC;EAE9C,OAAO,IAAAC,kBAAW,EAChBC,MAAM,IAAK;IACX,SAAS;;IACT,IAAI,CAACrB,OAAO,EAAE;IAEd,MAAMsB,QAAQ,GAAG,IAAAC,8CAA8B,EAC9CnB,mBAAmB,EACnBQ,WAAW,CAACY,GAAG,CAAC,CACjB,CAAC;IAED,IAAI,CAACF,QAAQ,EAAE;IAEf,MAAMG,iBAAiB,GAAG,IAAAC,sDAAsC,EAAC;MAChEJ,QAAQ;MACRJ,iBAAiB,EAAEA,iBAAiB,CAACM,GAAG,CAAC,CAAC;MAC1CG,qBAAqB,EAAE,IAAAC,+CAAwB,EAAClB,cAAc,CAAC;MAC/DF,aAAa;MACbE;IACD,CAAC,CAAC;;IAEF;AACH;AACA;AACA;AACA;AACA;AACA;IACG,MAAMmB,8BAA8B,GACnCb,+BAA+B,CAACQ,GAAG,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,CAACvB,QAAQ,CAAC6B,KAAK;IAE9D,MAAMC,8BAA8B,GACnCV,MAAM,CAACW,IAAI,KAAK,aAAa,IAC7B,CAACH,8BAA8B,IAC/B,IAAAI,uCAAuB,EACtBR,iBAAiB,EACjBjB,aAAa,EACbE,cACD,CAAC;IAEF,IAAI,CAACqB,8BAA8B,EAAE;IAErC,MAAMG,kBAAkB,GAAG,IAAAC,oDAAoC,EAC9DV,iBAAiB,EACjBV,cAAc,CAACS,GAAG,CAAC,CACpB,CAAC;IAED,IAAAY,+CAAyB,EAAC;MACzBC,QAAQ,EAAEpC,QAAQ,CAACqC,GAAG;MACtBC,MAAM,EAAEtC,QAAQ,CAACuC,OAAO;MACxBV,KAAK,EAAE7B,QAAQ,CAAC6B,KAAK;MACrB5B,gBAAgB;MAChBoB,QAAQ,EAAEY,kBAAkB;MAC5B/B,cAAc;MACdsC,SAAS,EAAEpB,MAAM;MACjBhB,OAAO;MACPC;IACD,CAAC,CAAC;EACH,CAAC,EACD,CACCN,OAAO,EACPC,QAAQ,EACRC,gBAAgB,EAChBC,cAAc,EACdC,mBAAmB,EACnBC,OAAO,EACPC,cAAc,EACdE,aAAa,EACbE,cAAc,EACdE,WAAW,EACXG,cAAc,EACdC,+BAA+B,EAC/BE,iBAAiB,CAEnB,CAAC;AACF,CAAC;AAACwB,OAAA,CAAA3C,WAAA,GAAAA,WAAA","ignoreList":[]}

package/lib/commonjs/shared/components/boundary/portal/components/boundary-content-portal/helpers/active-handoff-receiver.js

@@ -0,0 +1,67 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.resolvePreviousHandoffReceiver = exports.resolveHandoffAttachmentCandidate = exports.resolveActiveHandoffReceiver = void 0;
+const resolveActiveHandoffReceiver = ({
+  focusedIndex,
+  routes,
+  scenes
+}) => {
+  for (let index = scenes.length - 1; index >= 0; index--) {
+    const scene = scenes[index];
+    if (scene?.activity === "closing") {
+      return scene.route.key;
+    }
+  }
+  return routes[focusedIndex]?.key ?? null;
+};
+exports.resolveActiveHandoffReceiver = resolveActiveHandoffReceiver;
+const resolvePreviousHandoffReceiver = ({
+  focusedIndex,
+  routes,
+  scenes
+}) => {
+  for (let index = scenes.length - 1; index >= 0; index--) {
+    if (scenes[index]?.activity !== "closing") {
+      continue;
+    }
+    for (let previousIndex = index - 1; previousIndex >= 0; previousIndex--) {
+      const previousScene = scenes[previousIndex];
+      if (previousScene?.activity !== "closing") {
+        return previousScene?.route.key ?? null;
+      }
+    }
+  }
+  return routes[focusedIndex]?.key ?? null;
+};
+exports.resolvePreviousHandoffReceiver = resolvePreviousHandoffReceiver;
+const resolveHandoffAttachmentCandidate = ({
+  activeReceiverClosing,
+  activeReceiverScreenKey,
+  attachedReceiverScreenKey,
+  hasActiveCloseFinished,
+  interpolatorReady,
+  pairChangedDuringClose = false,
+  pairDestinationScreenKey,
+  previousReceiverScreenKey
+}) => {
+  "worklet";
+
+  if (activeReceiverClosing && interpolatorReady && pairDestinationScreenKey && pairChangedDuringClose) {
+    return pairDestinationScreenKey;
+  }
+  if (hasActiveCloseFinished && attachedReceiverScreenKey === activeReceiverScreenKey) {
+    return previousReceiverScreenKey;
+  }
+  if (hasActiveCloseFinished) {
+    return attachedReceiverScreenKey;
+  }
+  if (activeReceiverClosing && attachedReceiverScreenKey !== activeReceiverScreenKey && interpolatorReady && pairDestinationScreenKey) {
+    return pairDestinationScreenKey;
+  }
+  return activeReceiverScreenKey;
+};
+exports.resolveHandoffAttachmentCandidate = resolveHandoffAttachmentCandidate;
+//# sourceMappingURL=active-handoff-receiver.js.map

package/lib/commonjs/shared/components/boundary/portal/components/boundary-content-portal/helpers/active-handoff-receiver.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["resolveActiveHandoffReceiver","focusedIndex","routes","scenes","index","length","scene","activity","route","key","exports","resolvePreviousHandoffReceiver","previousIndex","previousScene","resolveHandoffAttachmentCandidate","activeReceiverClosing","activeReceiverScreenKey","attachedReceiverScreenKey","hasActiveCloseFinished","interpolatorReady","pairChangedDuringClose","pairDestinationScreenKey","previousReceiverScreenKey"],"sourceRoot":"../../../../../../../../../src","sources":["shared/components/boundary/portal/components/boundary-content-portal/helpers/active-handoff-receiver.ts"],"mappings":";;;;;;AAeO,MAAMA,4BAA4B,GAAGA,CAAC;EAC5CC,YAAY;EACZC,MAAM;EACNC;AACmC,CAAC,KAAoB;EACxD,KAAK,IAAIC,KAAK,GAAGD,MAAM,CAACE,MAAM,GAAG,CAAC,EAAED,KAAK,IAAI,CAAC,EAAEA,KAAK,EAAE,EAAE;IACxD,MAAME,KAAK,GAAGH,MAAM,CAACC,KAAK,CAAC;IAC3B,IAAIE,KAAK,EAAEC,QAAQ,KAAK,SAAS,EAAE;MAClC,OAAOD,KAAK,CAACE,KAAK,CAACC,GAAG;IACvB;EACD;EAEA,OAAOP,MAAM,CAACD,YAAY,CAAC,EAAEQ,GAAG,IAAI,IAAI;AACzC,CAAC;AAACC,OAAA,CAAAV,4BAAA,GAAAA,4BAAA;AAEK,MAAMW,8BAA8B,GAAGA,CAAC;EAC9CV,YAAY;EACZC,MAAM;EACNC;AACmC,CAAC,KAAoB;EACxD,KAAK,IAAIC,KAAK,GAAGD,MAAM,CAACE,MAAM,GAAG,CAAC,EAAED,KAAK,IAAI,CAAC,EAAEA,KAAK,EAAE,EAAE;IACxD,IAAID,MAAM,CAACC,KAAK,CAAC,EAAEG,QAAQ,KAAK,SAAS,EAAE;MAC1C;IACD;IAEA,KAAK,IAAIK,aAAa,GAAGR,KAAK,GAAG,CAAC,EAAEQ,aAAa,IAAI,CAAC,EAAEA,aAAa,EAAE,EAAE;MACxE,MAAMC,aAAa,GAAGV,MAAM,CAACS,aAAa,CAAC;MAC3C,IAAIC,aAAa,EAAEN,QAAQ,KAAK,SAAS,EAAE;QAC1C,OAAOM,aAAa,EAAEL,KAAK,CAACC,GAAG,IAAI,IAAI;MACxC;IACD;EACD;EAEA,OAAOP,MAAM,CAACD,YAAY,CAAC,EAAEQ,GAAG,IAAI,IAAI;AACzC,CAAC;AAACC,OAAA,CAAAC,8BAAA,GAAAA,8BAAA;AAEK,MAAMG,iCAAiC,GAAGA,CAAC;EACjDC,qBAAqB;EACrBC,uBAAuB;EACvBC,yBAAyB;EACzBC,sBAAsB;EACtBC,iBAAiB;EACjBC,sBAAsB,GAAG,KAAK;EAC9BC,wBAAwB;EACxBC;AAUD,CAAC,KAAK;EACL,SAAS;;EAET,IACCP,qBAAqB,IACrBI,iBAAiB,IACjBE,wBAAwB,IACxBD,sBAAsB,EACrB;IACD,OAAOC,wBAAwB;EAChC;EAEA,IACCH,sBAAsB,IACtBD,yBAAyB,KAAKD,uBAAuB,EACpD;IACD,OAAOM,yBAAyB;EACjC;EAEA,IAAIJ,sBAAsB,EAAE;IAC3B,OAAOD,yBAAyB;EACjC;EAEA,IACCF,qBAAqB,IACrBE,yBAAyB,KAAKD,uBAAuB,IACrDG,iBAAiB,IACjBE,wBAAwB,EACvB;IACD,OAAOA,wBAAwB;EAChC;EAEA,OAAOL,uBAAuB;AAC/B,CAAC;AAACN,OAAA,CAAAI,iCAAA,GAAAA,iCAAA","ignoreList":[]}

package/lib/commonjs/shared/components/boundary/portal/components/boundary-content-portal/hooks/use-boundary-content-portal-attachment.js

@@ -5,33 +5,34 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.useBoundaryContentPortalAttachment = void 0;
 var _reactNativeReanimated = require("react-native-reanimated");
+var _useStack = require("../../../../../../hooks/navigation/use-stack");
 var _descriptors = require("../../../../../../providers/screen/descriptors");
 var _styles = require("../../../../../../providers/screen/styles");
 var _transitionVisualState = require("../../../../../../providers/screen/styles/helpers/transition-visual-state");
 var _animation = require("../../../../../../stores/animation.store");
+var _linkPairs = require("../../../../../../stores/bounds/helpers/link-pairs.helpers");
+var _entries = require("../../../../../../stores/bounds/internals/entries");
 var _state = require("../../../../../../stores/bounds/internals/state");
 var _system = require("../../../../../../stores/system.store");
-var _handoffTarget = require("../../../utils/handoff-target");
 var _naming = require("../../../utils/naming");
 var _teleportControl = require("../../../utils/teleport-control");
+var _activeHandoffReceiver = require("../helpers/active-handoff-receiver");
 var _hostName = require("../helpers/host-name");
 const useBoundaryContentPortalAttachment = ({
   boundaryId
 }) => {
   const {
+    nextInterpolatorReady,
     slotsMap
   } = (0, _styles.useScreenSlots)();
-  const sourcePairKey = (0, _descriptors.useDescriptorsStore)(s => s.derivations.sourcePairKey);
   const currentScreenKey = (0, _descriptors.useDescriptorsStore)(s => s.derivations.currentScreenKey);
-  const nextScreenKey = (0, _descriptors.useDescriptorsStore)(s => s.derivations.nextScreenKey);
-  const destinationScreenKey = nextScreenKey ?? currentScreenKey;
-  const destinationAnimationProgress = _system.SystemStore.getValue(destinationScreenKey, "animationProgress");
-  const destinationClosing = _animation.AnimationStore.getValue(destinationScreenKey, "closing");
-
-  // `nextScreenKey` can change while the previously attached destination is
-  // still closing. Retain that destination's lifecycle shared values so this
-  // payload follows the screen that actually hosts it, not the newest route.
-  const attachedDestination = (0, _reactNativeReanimated.useSharedValue)(null);
+  const sourcePairKey = (0, _descriptors.useDescriptorsStore)(s => s.derivations.sourcePairKey);
+  const activeReceiverScreenKey = (0, _useStack.useStack)(_activeHandoffReceiver.resolveActiveHandoffReceiver);
+  const previousReceiverScreenKey = (0, _useStack.useStack)(_activeHandoffReceiver.resolvePreviousHandoffReceiver);
+  const activeReceiverAnimationProgress = _system.SystemStore.getValue(activeReceiverScreenKey ?? currentScreenKey, "animationProgress");
+  const activeReceiverClosing = _animation.AnimationStore.getValue(activeReceiverScreenKey ?? currentScreenKey, "closing");
+  const attachedReceiverScreenKey = (0, _reactNativeReanimated.useSharedValue)(currentScreenKey);
+  const sourcePairBeforeClose = (0, _reactNativeReanimated.useSharedValue)(null);
   const teleportProps = (0, _reactNativeReanimated.useAnimatedProps)(() => {
     "worklet";
 
@@ -41,35 +42,41 @@ const useBoundaryContentPortalAttachment = ({
       teleport,
       ...slotProps
     } = slot?.props ?? {};
-    const animationProgress = destinationAnimationProgress.get();
     const shouldTeleport = (0, _teleportControl.isTeleportEnabled)(teleport);
-    const pairsState = _state.pairs.get();
-    const enteringTargetScreenKey = shouldTeleport ? (0, _handoffTarget.resolveEnteringHandoffTarget)({
-      animationProgress,
-      boundaryId,
-      currentScreenKey,
-      pairsState,
-      sourcePairKey
-    }) : null;
-    if (enteringTargetScreenKey) {
-      // A valid entering pair is the only event that replaces the current
-      // attachment and its lifecycle owner.
-      attachedDestination.set({
-        animationProgress: destinationAnimationProgress,
-        closing: destinationClosing,
-        screenKey: enteringTargetScreenKey
-      });
+    const closing = activeReceiverClosing.get();
+    const animationProgress = activeReceiverAnimationProgress.get();
+    if (!closing) {
+      sourcePairBeforeClose.set(sourcePairKey ?? null);
     }
-    const attached = attachedDestination.get();
-    const hasAttachedCloseFinished = attached !== null && (0, _transitionVisualState.hasCloseTransitionFinished)({
-      animationProgress: attached.animationProgress.get(),
-      closing: attached.closing.get()
+    const pairChangedDuringClose = !!closing && !!sourcePairKey && sourcePairKey !== sourcePairBeforeClose.get();
+    const hasActiveCloseFinished = (0, _transitionVisualState.hasCloseTransitionFinished)({
+      closing,
+      animationProgress
     });
-
-    // Missing or changing pairs do not imply a return: keep the current host
-    // until its own screen visually closes. At that point, target the source
-    // host explicitly instead of `null` so Teleport restores source dimensions.
-    const targetScreenKey = enteringTargetScreenKey ? enteringTargetScreenKey : shouldTeleport ? hasAttachedCloseFinished ? currentScreenKey : attached?.screenKey ?? null : null;
+    const pair = sourcePairKey ? _state.pairs.get()[sourcePairKey] : null;
+    const link = pair?.links[(0, _linkPairs.getLinkKeyFromTag)(boundaryId)];
+    const pairDestination = link?.status === "complete" && (!link.group || pair?.groups[link.group]?.activeId === (0, _linkPairs.getLinkKeyFromTag)(boundaryId)) ? link.destination.screenKey : null;
+    const interpolatorReady = nextInterpolatorReady.get();
+    const attachedScreenKey = attachedReceiverScreenKey.get();
+    const nextReceiverScreenKey = (0, _activeHandoffReceiver.resolveHandoffAttachmentCandidate)({
+      activeReceiverClosing: !!closing,
+      activeReceiverScreenKey,
+      attachedReceiverScreenKey: attachedScreenKey,
+      hasActiveCloseFinished,
+      interpolatorReady: !!interpolatorReady,
+      pairChangedDuringClose,
+      pairDestinationScreenKey: pairDestination,
+      previousReceiverScreenKey
+    });
+    const receiverEntry = nextReceiverScreenKey ? (0, _entries.getEntry)(boundaryId, nextReceiverScreenKey) : null;
+    const receiverReady = receiverEntry?.handoff === true;
+    const returningFromActiveClose = hasActiveCloseFinished && attachedScreenKey === activeReceiverScreenKey;
+    const activatingPairDestination = !!pairDestination && !!interpolatorReady && nextReceiverScreenKey === pairDestination;
+    const canActivateReceiver = returningFromActiveClose || activatingPairDestination || animationProgress > 0;
+    if (nextReceiverScreenKey && receiverReady && canActivateReceiver) {
+      attachedReceiverScreenKey.set(nextReceiverScreenKey);
+    }
+    const targetScreenKey = shouldTeleport ? attachedReceiverScreenKey.get() : null;
     const targetHostName = targetScreenKey ? (0, _hostName.createBoundaryContentPortalHostName)(targetScreenKey, boundaryId) : _naming.PORTAL_HOST_NAME_RESET_VALUE;
     return {
       ...slotProps,

package/lib/commonjs/shared/components/boundary/portal/components/boundary-content-portal/hooks/use-boundary-content-portal-attachment.js.map

@@ -1 +1 @@
-{"version":3,"names":["_reactNativeReanimated","require","_descriptors","_styles","_transitionVisualState","_animation","_state","_system","_handoffTarget","_naming","_teleportControl","_hostName","useBoundaryContentPortalAttachment","boundaryId","slotsMap","useScreenSlots","sourcePairKey","useDescriptorsStore","s","derivations","currentScreenKey","nextScreenKey","destinationScreenKey","destinationAnimationProgress","SystemStore","getValue","destinationClosing","AnimationStore","attachedDestination","useSharedValue","teleportProps","useAnimatedProps","slot","get","pointerEvents","_pointerEvents","teleport","slotProps","props","animationProgress","shouldTeleport","isTeleportEnabled","pairsState","pairs","enteringTargetScreenKey","resolveEnteringHandoffTarget","set","closing","screenKey","attached","hasAttachedCloseFinished","hasCloseTransitionFinished","targetScreenKey","targetHostName","createBoundaryContentPortalHostName","PORTAL_HOST_NAME_RESET_VALUE","hostName","exports"],"sourceRoot":"../../../../../../../../../src","sources":["shared/components/boundary/portal/components/boundary-content-portal/hooks/use-boundary-content-portal-attachment.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_reactNativeReanimated","require","_useStack","_descriptors","_styles","_transitionVisualState","_animation","_linkPairs","_entries","_state","_system","_naming","_teleportControl","_activeHandoffReceiver","_hostName","useBoundaryContentPortalAttachment","boundaryId","nextInterpolatorReady","slotsMap","useScreenSlots","currentScreenKey","useDescriptorsStore","s","derivations","sourcePairKey","activeReceiverScreenKey","useStack","resolveActiveHandoffReceiver","previousReceiverScreenKey","resolvePreviousHandoffReceiver","activeReceiverAnimationProgress","SystemStore","getValue","activeReceiverClosing","AnimationStore","attachedReceiverScreenKey","useSharedValue","sourcePairBeforeClose","teleportProps","useAnimatedProps","slot","get","pointerEvents","_pointerEvents","teleport","slotProps","props","shouldTeleport","isTeleportEnabled","closing","animationProgress","set","pairChangedDuringClose","hasActiveCloseFinished","hasCloseTransitionFinished","pair","pairs","link","links","getLinkKeyFromTag","pairDestination","status","group","groups","activeId","destination","screenKey","interpolatorReady","attachedScreenKey","nextReceiverScreenKey","resolveHandoffAttachmentCandidate","pairDestinationScreenKey","receiverEntry","getEntry","receiverReady","handoff","returningFromActiveClose","activatingPairDestination","canActivateReceiver","targetScreenKey","targetHostName","createBoundaryContentPortalHostName","PORTAL_HOST_NAME_RESET_VALUE","hostName","exports"],"sourceRoot":"../../../../../../../../../src","sources":["shared/components/boundary/portal/components/boundary-content-portal/hooks/use-boundary-content-portal-attachment.ts"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/shared/components/boundary/portal/components/boundary-portal/components/host.js

@@ -55,7 +55,7 @@ function HostImpl({
       (0, _hostRegistry.unregisterHost)(screenKey, hostKey);
     };
   }, [fallback, hostKey, screenKey]);
-  const boundaryHosts = measurement.canRenderHosts ? activeBoundaryHosts.map(host => /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.View, {
+  const boundaryHosts = activeBoundaryHosts.map(host => /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.View, {
     pointerEvents: _teleport.PORTAL_POINTER_EVENTS,
     style: [styles.boundaryHostViewport, {
       width: viewportWidth,
@@ -65,7 +65,7 @@ function HostImpl({
       host: host,
       style: _reactNative.StyleSheet.absoluteFill
     })
-  }, host.portalHostName)) : null;
+  }, host.portalHostName));
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNativeReanimated.default.View, {
     ref: measurement.hostRef,
     pointerEvents: _teleport.PORTAL_POINTER_EVENTS,