react-native-screen-transitions 4.0.0-alpha.0 → 4.0.0-alpha.10

package/lib/commonjs/components/boundary/hooks/use-boundary-measurement.js

@@ -23,9 +23,9 @@ const useBoundaryMeasurement = ({
   currentScreenKey,
   measuredRef,
   style,
-  targetPreparedStyles,
   handoff,
   escapeClipping,
+  localMeasurement,
   config
 }) => {
   const {
@@ -40,8 +40,7 @@ const useBoundaryMeasurement = ({
     target,
     method
   }), [anchor, scaleMode, target, method]);
-  const rootPreparedStyles = (0, _react.useMemo)(() => (0, _styles.prepareStyleForBounds)(style), [style]);
-  const preparedStyles = targetPreparedStyles ?? rootPreparedStyles;
+  const preparedStyles = (0, _react.useMemo)(() => (0, _styles.prepareStyleForBounds)(style), [style]);
   const measureBoundary = (0, _useMeasurer.useMeasurer)({
     enabled,
     boundTag,
@@ -49,13 +48,15 @@ const useBoundaryMeasurement = ({
     preparedStyles,
     measuredAnimatedRef: measuredRef,
     handoff,
-    escapeClipping
+    escapeClipping,
+    localMeasurement
   });
 
-  // Register/unregister this boundary in the presence map so source/destination
-  // matching can resolve across concrete screen keys.
+  // Presence and source capture must not depend on this screen owning an
+  // interpolator: a nested source can participate in a transition owned by a
+  // different navigator.
   (0, _useBoundaryPresence.useBoundaryPresence)({
-    enabled: runtimeEnabled,
+    enabled,
     boundTag,
     currentScreenKey,
     boundaryConfig,
@@ -63,14 +64,13 @@ const useBoundaryMeasurement = ({
     escapeClipping
   });
   (0, _useInitialSourceMeasurement.useInitialSourceMeasurement)({
-    enabled: runtimeEnabled,
+    enabled,
     measureBoundary,
     boundTag
   });
   (0, _useInitialDestinationMeasurement.useInitialDestinationMeasurement)({
     boundTag,
     enabled: runtimeEnabled,
-    escapeClipping,
     measureBoundary
   });
   (0, _useRefreshBoundary.useRefreshBoundary)({

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

@@ -1 +1 @@
-{"version":3,"names":["_react","require","_styles","_useBoundaryPresence","_useInitialDestinationMeasurement","_useInitialSourceMeasurement","_useRefreshBoundary","_useMeasurer","useBoundaryMeasurement","boundTag","enabled","runtimeEnabled","currentScreenKey","measuredRef","style","targetPreparedStyles","handoff","escapeClipping","config","anchor","scaleMode","target","method","boundaryConfig","useMemo","rootPreparedStyles","prepareStyleForBounds","preparedStyles","measureBoundary","useMeasurer","measuredAnimatedRef","useBoundaryPresence","useInitialSourceMeasurement","useInitialDestinationMeasurement","useRefreshBoundary","exports"],"sourceRoot":"../../../../../src","sources":["components/boundary/hooks/use-boundary-measurement.ts"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,OAAA;AAIA,IAAAC,OAAA,GAAAD,OAAA;AAEA,IAAAE,oBAAA,GAAAF,OAAA;AACA,IAAAG,iCAAA,GAAAH,OAAA;AACA,IAAAI,4BAAA,GAAAJ,OAAA;AACA,IAAAK,mBAAA,GAAAL,OAAA;AACA,IAAAM,YAAA,GAAAN,OAAA;AAmBA;AACA;AACA;AACA;AACA;AACO,MAAMO,sBAAsB,GAAGA,CAAC;EACtCC,QAAQ;EACRC,OAAO;EACPC,cAAc;EACdC,gBAAgB;EAChBC,WAAW;EACXC,KAAK;EACLC,oBAAoB;EACpBC,OAAO;EACPC,cAAc;EACdC;AAC6B,CAAC,KAAK;EACnC,MAAM;IAAEC,MAAM;IAAEC,SAAS;IAAEC,MAAM;IAAEC;EAAO,CAAC,GAAGJ,MAAM;EACpD,MAAMK,cAAc,GAAG,IAAAC,cAAO,EAC7B,OAAO;IAAEL,MAAM;IAAEC,SAAS;IAAEC,MAAM;IAAEC;EAAO,CAAC,CAAC,EAC7C,CAACH,MAAM,EAAEC,SAAS,EAAEC,MAAM,EAAEC,MAAM,CACnC,CAAC;EAED,MAAMG,kBAAkB,GAAG,IAAAD,cAAO,EACjC,MAAM,IAAAE,6BAAqB,EAACZ,KAAK,CAAC,EAClC,CAACA,KAAK,CACP,CAAC;EACD,MAAMa,cAAc,GAAGZ,oBAAoB,IAAIU,kBAAkB;EAEjE,MAAMG,eAAe,GAAG,IAAAC,wBAAW,EAAC;IACnCnB,OAAO;IACPD,QAAQ;IACRG,gBAAgB;IAChBe,cAAc;IACdG,mBAAmB,EAAEjB,WAAW;IAChCG,OAAO;IACPC;EACD,CAAC,CAAC;;EAEF;EACA;EACA,IAAAc,wCAAmB,EAAC;IACnBrB,OAAO,EAAEC,cAAc;IACvBF,QAAQ;IACRG,gBAAgB;IAChBW,cAAc;IACdP,OAAO;IACPC;EACD,CAAC,CAAC;EAEF,IAAAe,wDAA2B,EAAC;IAC3BtB,OAAO,EAAEC,cAAc;IACvBiB,eAAe;IACfnB;EACD,CAAC,CAAC;EAEF,IAAAwB,kEAAgC,EAAC;IAChCxB,QAAQ;IACRC,OAAO,EAAEC,cAAc;IACvBM,cAAc;IACdW;EACD,CAAC,CAAC;EAEF,IAAAM,sCAAkB,EAAC;IAClBxB,OAAO,EAAEC,cAAc;IACvBF,QAAQ;IACRmB;EACD,CAAC,CAAC;AACH,CAAC;AAACO,OAAA,CAAA3B,sBAAA,GAAAA,sBAAA","ignoreList":[]}
+{"version":3,"names":["_react","require","_styles","_useBoundaryPresence","_useInitialDestinationMeasurement","_useInitialSourceMeasurement","_useRefreshBoundary","_useMeasurer","useBoundaryMeasurement","boundTag","enabled","runtimeEnabled","currentScreenKey","measuredRef","style","handoff","escapeClipping","localMeasurement","config","anchor","scaleMode","target","method","boundaryConfig","useMemo","preparedStyles","prepareStyleForBounds","measureBoundary","useMeasurer","measuredAnimatedRef","useBoundaryPresence","useInitialSourceMeasurement","useInitialDestinationMeasurement","useRefreshBoundary","exports"],"sourceRoot":"../../../../../src","sources":["components/boundary/hooks/use-boundary-measurement.ts"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,OAAA;AAIA,IAAAC,OAAA,GAAAD,OAAA;AAKA,IAAAE,oBAAA,GAAAF,OAAA;AACA,IAAAG,iCAAA,GAAAH,OAAA;AACA,IAAAI,4BAAA,GAAAJ,OAAA;AACA,IAAAK,mBAAA,GAAAL,OAAA;AACA,IAAAM,YAAA,GAAAN,OAAA;AAmBA;AACA;AACA;AACA;AACA;AACO,MAAMO,sBAAsB,GAAGA,CAAC;EACtCC,QAAQ;EACRC,OAAO;EACPC,cAAc;EACdC,gBAAgB;EAChBC,WAAW;EACXC,KAAK;EACLC,OAAO;EACPC,cAAc;EACdC,gBAAgB;EAChBC;AAC6B,CAAC,KAAK;EACnC,MAAM;IAAEC,MAAM;IAAEC,SAAS;IAAEC,MAAM;IAAEC;EAAO,CAAC,GAAGJ,MAAM;EACpD,MAAMK,cAAc,GAAG,IAAAC,cAAO,EAC7B,OAAO;IAAEL,MAAM;IAAEC,SAAS;IAAEC,MAAM;IAAEC;EAAO,CAAC,CAAC,EAC7C,CAACH,MAAM,EAAEC,SAAS,EAAEC,MAAM,EAAEC,MAAM,CACnC,CAAC;EAED,MAAMG,cAAc,GAAG,IAAAD,cAAO,EAAC,MAAM,IAAAE,6BAAqB,EAACZ,KAAK,CAAC,EAAE,CAACA,KAAK,CAAC,CAAC;EAE3E,MAAMa,eAAe,GAAG,IAAAC,wBAAW,EAAC;IACnClB,OAAO;IACPD,QAAQ;IACRG,gBAAgB;IAChBa,cAAc;IACdI,mBAAmB,EAAEhB,WAAW;IAChCE,OAAO;IACPC,cAAc;IACdC;EACD,CAAC,CAAC;;EAEF;EACA;EACA;EACA,IAAAa,wCAAmB,EAAC;IACnBpB,OAAO;IACPD,QAAQ;IACRG,gBAAgB;IAChBW,cAAc;IACdR,OAAO;IACPC;EACD,CAAC,CAAC;EAEF,IAAAe,wDAA2B,EAAC;IAC3BrB,OAAO;IACPiB,eAAe;IACflB;EACD,CAAC,CAAC;EAEF,IAAAuB,kEAAgC,EAAC;IAChCvB,QAAQ;IACRC,OAAO,EAAEC,cAAc;IACvBgB;EACD,CAAC,CAAC;EAEF,IAAAM,sCAAkB,EAAC;IAClBvB,OAAO,EAAEC,cAAc;IACvBF,QAAQ;IACRkB;EACD,CAAC,CAAC;AACH,CAAC;AAACO,OAAA,CAAA1B,sBAAA,GAAAA,sBAAA","ignoreList":[]}

package/lib/commonjs/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");
@@ -21,7 +19,8 @@ const useMeasurer = ({
   preparedStyles,
   measuredAnimatedRef,
   handoff,
-  escapeClipping
+  escapeClipping,
+  localMeasurement
 }) => {
   const {
     width: viewportWidth,
@@ -30,27 +29,26 @@ 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)();
+  const visibilityBlocked = (0, _styles.useScreenSlotStore)(store => store.visibilityBlocked);
   return (0, _react.useCallback)(target => {
     "worklet";
 
     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
     });
+    if (escapeClipping && target.type === "source") {
+      localMeasurement.set({
+        bounds: measured,
+        pairKey: target.pairKey
+      });
+    }
 
     /**
      * - Destination Pass -
@@ -60,9 +58,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 +72,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, localMeasurement, viewportWidth, viewportHeight, scrollState, scrollMetadata, pendingLifecycleStartBlockCount, visibilityBlocked]);
 };
 exports.useMeasurer = useMeasurer;
 //# sourceMappingURL=use-measurer.js.map

package/lib/commonjs/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":["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","localMeasurement","width","viewportWidth","height","viewportHeight","useWindowDimensions","scrollState","ScrollStore","getValue","scrollMetadata","pendingLifecycleStartBlockCount","SystemStore","visibilityBlocked","useScreenSlotStore","store","useCallback","target","measured","measureWithOverscrollAwareness","get","correctedMeasured","correctMeasuredBoundsForVisibilityGate","visibilityBlockOffset","getVisibilityBlockOffset","type","set","bounds","pairKey","shouldGuardDestinationViewport","group","viewportAllowsDestinationWrite","isMeasurementInViewport","measuredWithScroll","attachScrollSnapshotToMeasuredBounds","applyMeasuredBoundsWrites","entryTag","tag","linkId","linkKey","linkWrite","exports"],"sourceRoot":"../../../../../src","sources":["components/boundary/hooks/use-measurer.ts"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/components/boundary/index.js

@@ -12,12 +12,13 @@ Object.defineProperty(exports, "createBoundaryComponent", {
 });
 var _react = require("react");
 var _reactNative = require("react-native");
+var _reactNativeGestureHandler = require("react-native-gesture-handler");
 var _boundaryTarget = require("./components/boundary-target");
 var _createBoundaryComponent = require("./create-boundary-component");
 var _portal = require("./portal");
 var _jsxRuntime = require("react/jsx-runtime");
 const BoundaryPrimitive = /*#__PURE__*/(0, _react.forwardRef)((props, ref) => {
-  const Component = "onPress" in props ? _reactNative.Pressable : _reactNative.View;
+  const Component = "onPress" in props ? _reactNativeGestureHandler.Pressable : _reactNative.View;
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(Component, {
     ...props,
     ref: ref
@@ -25,11 +26,7 @@ const BoundaryPrimitive = /*#__PURE__*/(0, _react.forwardRef)((props, ref) => {
 });
 BoundaryPrimitive.displayName = "Transition.Boundary.Primitive";
 const BoundaryRoot = (0, _createBoundaryComponent.createBoundaryComponent)(BoundaryPrimitive);
-const BoundaryView = (0, _createBoundaryComponent.createBoundaryComponent)(_reactNative.View);
-const BoundaryTrigger = (0, _createBoundaryComponent.createBoundaryComponent)(_reactNative.Pressable);
 BoundaryRoot.displayName = "Transition.Boundary";
-BoundaryView.displayName = "Transition.Boundary.View";
-BoundaryTrigger.displayName = "Transition.Boundary.Trigger";
 _boundaryTarget.BoundaryTarget.displayName = "Transition.Boundary.Target";
 _portal.Host.displayName = "Transition.Boundary.Host";
 
@@ -47,14 +44,12 @@ _portal.Host.displayName = "Transition.Boundary.Host";
  *
  * Use:
  * - `Boundary` for passive and pressable shared elements.
- * - `Boundary.Target` to measure a nested descendant instead of the root.
+ * - `Boundary.Target` as a direct child to measure it instead of the root.
  * - `Boundary.Host` to make clipping-escape host placement explicit.
  */
 
 const Boundary = exports.Boundary = Object.assign(BoundaryRoot, {
   Target: _boundaryTarget.BoundaryTarget,
-  Host: _portal.Host,
-  View: BoundaryView,
-  Trigger: BoundaryTrigger
+  Host: _portal.Host
 });
 //# sourceMappingURL=index.js.map

package/lib/commonjs/components/boundary/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["_react","require","_reactNative","_boundaryTarget","_createBoundaryComponent","_portal","_jsxRuntime","BoundaryPrimitive","forwardRef","props","ref","Component","Pressable","View","jsx","displayName","BoundaryRoot","createBoundaryComponent","BoundaryView","BoundaryTrigger","BoundaryTarget","Host","Boundary","exports","Object","assign","Target","Trigger"],"sourceRoot":"../../../../src","sources":["components/boundary/index.tsx"],"mappings":";;;;;;;;;;;;AAAA,IAAAA,MAAA,GAAAC,OAAA;AACA,IAAAC,YAAA,GAAAD,OAAA;AAMA,IAAAE,eAAA,GAAAF,OAAA;AACA,IAAAG,wBAAA,GAAAH,OAAA;AACA,IAAAI,OAAA,GAAAJ,OAAA;AAAgC,IAAAK,WAAA,GAAAL,OAAA;AAUhC,MAAMM,iBAAiB,gBAAG,IAAAC,iBAAU,EACnC,CAACC,KAAK,EAAEC,GAAG,KAAK;EACf,MAAMC,SAAS,GAAG,SAAS,IAAIF,KAAK,GAAGG,sBAAS,GAAGC,iBAAI;EAEvD,oBAAO,IAAAP,WAAA,CAAAQ,GAAA,EAACH,SAAS;IAAA,GAAMF,KAAK;IAAUC,GAAG,EAAEA;EAAW,CAAE,CAAC;AAC1D,CACD,CAAC;AAEDH,iBAAiB,CAACQ,WAAW,GAAG,+BAA+B;AAE/D,MAAMC,YAAY,GAAG,IAAAC,gDAAuB,EAACV,iBAAiB,CAAC;AAC/D,MAAMW,YAAY,GAAG,IAAAD,gDAAuB,EAACJ,iBAAI,CAAC;AAClD,MAAMM,eAAe,GAAG,IAAAF,gDAAuB,EAACL,sBAAS,CAAC;AAC1DI,YAAY,CAACD,WAAW,GAAG,qBAAqB;AAChDG,YAAY,CAACH,WAAW,GAAG,0BAA0B;AACrDI,eAAe,CAACJ,WAAW,GAAG,6BAA6B;AAC3DK,8BAAc,CAACL,WAAW,GAAG,4BAA4B;AACzDM,YAAI,CAACN,WAAW,GAAG,0BAA0B;;AAI7C;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAsBO,MAAMO,QAAQ,GAAAC,OAAA,CAAAD,QAAA,GAAGE,MAAM,CAACC,MAAM,CAACT,YAAY,EAAE;EACnDU,MAAM,EAAEN,8BAAc;EACtBC,IAAI,EAAJA,YAAI;EACJR,IAAI,EAAEK,YAAY;EAClBS,OAAO,EAAER;AACV,CAAC,CAAsB","ignoreList":[]}
+{"version":3,"names":["_react","require","_reactNative","_reactNativeGestureHandler","_boundaryTarget","_createBoundaryComponent","_portal","_jsxRuntime","BoundaryPrimitive","forwardRef","props","ref","Component","Pressable","View","jsx","displayName","BoundaryRoot","createBoundaryComponent","BoundaryTarget","Host","Boundary","exports","Object","assign","Target"],"sourceRoot":"../../../../src","sources":["components/boundary/index.tsx"],"mappings":";;;;;;;;;;;;AAAA,IAAAA,MAAA,GAAAC,OAAA;AACA,IAAAC,YAAA,GAAAD,OAAA;AACA,IAAAE,0BAAA,GAAAF,OAAA;AACA,IAAAG,eAAA,GAAAH,OAAA;AACA,IAAAI,wBAAA,GAAAJ,OAAA;AACA,IAAAK,OAAA,GAAAL,OAAA;AAAgC,IAAAM,WAAA,GAAAN,OAAA;AAUhC,MAAMO,iBAAiB,gBAAG,IAAAC,iBAAU,EACnC,CAACC,KAAK,EAAEC,GAAG,KAAK;EACf,MAAMC,SAAS,GAAG,SAAS,IAAIF,KAAK,GAAGG,oCAAS,GAAGC,iBAAI;EAEvD,oBAAO,IAAAP,WAAA,CAAAQ,GAAA,EAACH,SAAS;IAAA,GAAMF,KAAK;IAAUC,GAAG,EAAEA;EAAW,CAAE,CAAC;AAC1D,CACD,CAAC;AAEDH,iBAAiB,CAACQ,WAAW,GAAG,+BAA+B;AAE/D,MAAMC,YAAY,GAAG,IAAAC,gDAAuB,EAACV,iBAAiB,CAAC;AAC/DS,YAAY,CAACD,WAAW,GAAG,qBAAqB;AAChDG,8BAAc,CAACH,WAAW,GAAG,4BAA4B;AACzDI,YAAI,CAACJ,WAAW,GAAG,0BAA0B;;AAI7C;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAcO,MAAMK,QAAQ,GAAAC,OAAA,CAAAD,QAAA,GAAGE,MAAM,CAACC,MAAM,CAACP,YAAY,EAAE;EACnDQ,MAAM,EAAEN,8BAAc;EACtBC,IAAI,EAAJA;AACD,CAAC,CAAsB","ignoreList":[]}

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

@@ -34,7 +34,11 @@ const BoundaryContentPortalHost = exports.BoundaryContentPortalHost = /*#__PURE_
 });
 const styles = _reactNative.StyleSheet.create({
   host: {
-    ..._reactNative.StyleSheet.absoluteFillObject,
+    position: "absolute",
+    top: 0,
+    right: 0,
+    bottom: 0,
+    left: 0,
     overflow: "visible"
   }
 });

package/lib/commonjs/components/boundary/portal/components/boundary-content-portal/components/host.js.map

@@ -1 +1 @@
-{"version":3,"names":["_react","require","_reactNative","_reactNativeReanimated","_interopRequireDefault","_teleport","_hostName","_jsxRuntime","e","__esModule","default","AnimatedPortalHost","NativePortalHost","Animated","createAnimatedComponent","BoundaryContentPortalHost","exports","memo","boundaryId","children","enabled","screenKey","jsx","Fragment","portalHostName","createBoundaryContentPortalHostName","jsxs","name","pointerEvents","PORTAL_POINTER_EVENTS","style","styles","host","StyleSheet","create","absoluteFillObject","overflow"],"sourceRoot":"../../../../../../../../src","sources":["components/boundary/portal/components/boundary-content-portal/components/host.tsx"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,OAAA;AACA,IAAAC,YAAA,GAAAD,OAAA;AACA,IAAAE,sBAAA,GAAAC,sBAAA,CAAAH,OAAA;AACA,IAAAI,SAAA,GAAAJ,OAAA;AACA,IAAAK,SAAA,GAAAL,OAAA;AAA2E,IAAAM,WAAA,GAAAN,OAAA;AAAA,SAAAG,uBAAAI,CAAA,WAAAA,CAAA,IAAAA,CAAA,CAAAC,UAAA,GAAAD,CAAA,KAAAE,OAAA,EAAAF,CAAA;AAE3E,MAAMG,kBAAkB,GAAGC,0BAAgB,GACxCC,8BAAQ,CAACC,uBAAuB,CAACF,0BAAgB,CAAC,GAClD,IAAI;AASA,MAAMG,yBAAyB,GAAAC,OAAA,CAAAD,yBAAA,gBAAG,IAAAE,WAAI,EAC5C,SAASF,yBAAyBA,CAAC;EAClCG,UAAU;EACVC,QAAQ;EACRC,OAAO;EACPC;AAC+B,CAAC,EAAE;EAClC,IAAI,CAACD,OAAO,IAAI,CAACT,kBAAkB,EAAE;IACpC,oBAAO,IAAAJ,WAAA,CAAAe,GAAA,EAAAf,WAAA,CAAAgB,QAAA;MAAAJ,QAAA,EAAGA;IAAQ,CAAG,CAAC;EACvB;EAEA,MAAMK,cAAc,GAAG,IAAAC,6CAAmC,EACzDJ,SAAS,EACTH,UACD,CAAC;EAED,oBACC,IAAAX,WAAA,CAAAmB,IAAA,EAAAnB,WAAA,CAAAgB,QAAA;IAAAJ,QAAA,GACEA,QAAQ,eACT,IAAAZ,WAAA,CAAAe,GAAA,EAACX,kBAAkB;MAClBgB,IAAI,EAAEH,cAAe;MACrBI,aAAa,EAAEC,+BAAsB;MACrCC,KAAK,EAAEC,MAAM,CAACC;IAAK,CACnB,CAAC;EAAA,CACD,CAAC;AAEL,CACD,CAAC;AAED,MAAMD,MAAM,GAAGE,uBAAU,CAACC,MAAM,CAAC;EAChCF,IAAI,EAAE;IACL,GAAGC,uBAAU,CAACE,kBAAkB;IAChCC,QAAQ,EAAE;EACX;AACD,CAAC,CAAC","ignoreList":[]}
+{"version":3,"names":["_react","require","_reactNative","_reactNativeReanimated","_interopRequireDefault","_teleport","_hostName","_jsxRuntime","e","__esModule","default","AnimatedPortalHost","NativePortalHost","Animated","createAnimatedComponent","BoundaryContentPortalHost","exports","memo","boundaryId","children","enabled","screenKey","jsx","Fragment","portalHostName","createBoundaryContentPortalHostName","jsxs","name","pointerEvents","PORTAL_POINTER_EVENTS","style","styles","host","StyleSheet","create","position","top","right","bottom","left","overflow"],"sourceRoot":"../../../../../../../../src","sources":["components/boundary/portal/components/boundary-content-portal/components/host.tsx"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,OAAA;AACA,IAAAC,YAAA,GAAAD,OAAA;AACA,IAAAE,sBAAA,GAAAC,sBAAA,CAAAH,OAAA;AACA,IAAAI,SAAA,GAAAJ,OAAA;AACA,IAAAK,SAAA,GAAAL,OAAA;AAA2E,IAAAM,WAAA,GAAAN,OAAA;AAAA,SAAAG,uBAAAI,CAAA,WAAAA,CAAA,IAAAA,CAAA,CAAAC,UAAA,GAAAD,CAAA,KAAAE,OAAA,EAAAF,CAAA;AAE3E,MAAMG,kBAAkB,GAAGC,0BAAgB,GACxCC,8BAAQ,CAACC,uBAAuB,CAACF,0BAAgB,CAAC,GAClD,IAAI;AASA,MAAMG,yBAAyB,GAAAC,OAAA,CAAAD,yBAAA,gBAAG,IAAAE,WAAI,EAC5C,SAASF,yBAAyBA,CAAC;EAClCG,UAAU;EACVC,QAAQ;EACRC,OAAO;EACPC;AAC+B,CAAC,EAAE;EAClC,IAAI,CAACD,OAAO,IAAI,CAACT,kBAAkB,EAAE;IACpC,oBAAO,IAAAJ,WAAA,CAAAe,GAAA,EAAAf,WAAA,CAAAgB,QAAA;MAAAJ,QAAA,EAAGA;IAAQ,CAAG,CAAC;EACvB;EAEA,MAAMK,cAAc,GAAG,IAAAC,6CAAmC,EACzDJ,SAAS,EACTH,UACD,CAAC;EAED,oBACC,IAAAX,WAAA,CAAAmB,IAAA,EAAAnB,WAAA,CAAAgB,QAAA;IAAAJ,QAAA,GACEA,QAAQ,eACT,IAAAZ,WAAA,CAAAe,GAAA,EAACX,kBAAkB;MAClBgB,IAAI,EAAEH,cAAe;MACrBI,aAAa,EAAEC,+BAAsB;MACrCC,KAAK,EAAEC,MAAM,CAACC;IAAK,CACnB,CAAC;EAAA,CACD,CAAC;AAEL,CACD,CAAC;AAED,MAAMD,MAAM,GAAGE,uBAAU,CAACC,MAAM,CAAC;EAChCF,IAAI,EAAE;IACLG,QAAQ,EAAE,UAAU;IACpBC,GAAG,EAAE,CAAC;IACNC,KAAK,EAAE,CAAC;IACRC,MAAM,EAAE,CAAC;IACTC,IAAI,EAAE,CAAC;IACPC,QAAQ,EAAE;EACX;AACD,CAAC,CAAC","ignoreList":[]}

package/lib/commonjs/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/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":["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/components/boundary/portal/components/boundary-content-portal/hooks/use-boundary-content-portal-attachment.js

@@ -4,221 +4,88 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.useBoundaryContentPortalAttachment = void 0;
-var _react = require("react");
 var _reactNativeReanimated = require("react-native-reanimated");
-var _reactNativeWorklets = require("react-native-worklets");
 var _descriptors = require("../../../../../../providers/screen/descriptors");
 var _styles = require("../../../../../../providers/screen/styles");
-var _slotReferences = require("../../../../../../providers/screen/styles/stores/slot-references.store");
+var _transitionVisualState = require("../../../../../../providers/screen/styles/helpers/transition-visual-state");
+var _blankStack = require("../../../../../../providers/stack/blank-stack.provider");
 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 _naming = require("../../../utils/naming");
-var _ownership = require("../../../utils/ownership");
-var _shallowEqual = require("../../../utils/shallow-equal");
 var _teleportControl = require("../../../utils/teleport-control");
-var _visibleHost = require("../../../utils/visible-host");
+var _activeHandoffReceiver = require("../helpers/active-handoff-receiver");
 var _hostName = require("../helpers/host-name");
 const useBoundaryContentPortalAttachment = ({
-  boundaryId,
-  enabled
+  boundaryId
 }) => {
-  const ownScreenSlots = (0, _styles.useScreenSlots)();
-  const sourcePairKey = (0, _descriptors.useDescriptorsStore)(s => s.derivations.sourcePairKey);
+  const slotsMap = (0, _styles.useScreenSlotStore)(store => store.slotsMap);
   const currentScreenKey = (0, _descriptors.useDescriptorsStore)(s => s.derivations.currentScreenKey);
-  const [ownership, setOwnership] = (0, _react.useState)(null);
-  const styleOwnerScreenKey = ownership?.ownerScreenKey ?? currentScreenKey;
-  const ownerScreenSlots = (0, _slotReferences.useRegisteredScreenSlots)(styleOwnerScreenKey);
-  const activeScreenSlots = ownerScreenSlots ?? ownScreenSlots;
-  const {
-    nextInterpolatorReady: activeNextInterpolatorReady,
-    slotsMap: activeSlotsMap
-  } = activeScreenSlots;
-  const requestedPortalHostName = (0, _reactNativeReanimated.useSharedValue)(null);
-  const visiblePortalHostName = (0, _reactNativeReanimated.useSharedValue)(null);
-  const canSwitchPortalHostImmediately = (0, _reactNativeReanimated.useSharedValue)(0);
-  const targetScreenKey = ownership ? ownership.hostScreenKey : null;
-  const settledHostScreenKey = ownership?.hostScreenKey ?? null;
-  const settledHostProgress = _animation.AnimationStore.getValue(settledHostScreenKey ?? currentScreenKey, "progressSettled");
-  const settledHostAnimating = _animation.AnimationStore.getValue(settledHostScreenKey ?? currentScreenKey, "progressAnimating");
-  const settledHostWillAnimate = _animation.AnimationStore.getValue(settledHostScreenKey ?? currentScreenKey, "willAnimate");
-  const settledHostClosing = _animation.AnimationStore.getValue(settledHostScreenKey ?? currentScreenKey, "closing");
-  const handoffHostName = targetScreenKey !== null ? (0, _hostName.createBoundaryContentPortalHostName)(targetScreenKey, boundaryId) : null;
-  const updatePortalOwnership = (0, _react.useCallback)((hostScreenKey, ownerPairKey, ownerScreenKey) => {
-    if (hostScreenKey && ownerPairKey && ownerScreenKey) {
-      setOwnership(current => {
-        if (current?.hostScreenKey === hostScreenKey && current.ownerPairKey === ownerPairKey && current.ownerScreenKey === ownerScreenKey) {
-          return current;
-        }
-        return {
-          hostScreenKey,
-          ownerPairKey,
-          ownerScreenKey,
-          status: "complete"
-        };
-      });
-      return;
-    }
-    setOwnership(current => current ? null : current);
-  }, []);
-  (0, _react.useLayoutEffect)(() => {
-    if (!enabled || !ownership || !handoffHostName) {
-      requestedPortalHostName.set(null);
-      visiblePortalHostName.set(null);
-      return;
-    }
-    requestedPortalHostName.set(handoffHostName);
-  }, [enabled, handoffHostName, ownership, requestedPortalHostName, visiblePortalHostName]);
-  (0, _react.useLayoutEffect)(() => {
-    return () => {
-      requestedPortalHostName.set(null);
-      visiblePortalHostName.set(null);
-    };
-  }, [requestedPortalHostName, visiblePortalHostName]);
-  (0, _reactNativeReanimated.useAnimatedReaction)(() => {
-    "worklet";
-
-    if (!enabled) {
-      return {
-        hostScreenKey: null,
-        ownerPairKey: sourcePairKey,
-        ownerScreenKey: null,
-        status: "clear"
-      };
-    }
-    const progressAnimating = settledHostAnimating.get();
-    const progressSettled = settledHostProgress.get();
-    const willAnimate = settledHostWillAnimate.get();
-    const closing = settledHostClosing.get();
-    const isOwnedHostClosing = !!closing && !!ownership && settledHostScreenKey === ownership.hostScreenKey;
-    if (isOwnedHostClosing && ownership) {
-      const isClosingComplete = (0, _ownership.isHandoffHostClosingComplete)({
-        closing,
-        progressAnimating,
-        progressSettled,
-        willAnimate
-      });
-      if (!isClosingComplete) {
-        return ownership;
-      }
-      const sourceScreenKey = (0, _linkPairs.getSourceScreenKeyFromPairKey)(ownership.ownerPairKey);
-      return {
-        hostScreenKey: sourceScreenKey,
-        ownerPairKey: ownership.ownerPairKey,
-        ownerScreenKey: sourceScreenKey,
-        status: "complete"
-      };
-    }
-    if (!sourcePairKey) {
-      return {
-        hostScreenKey: null,
-        ownerPairKey: sourcePairKey,
-        ownerScreenKey: null,
-        status: "clear"
-      };
-    }
-    return (0, _ownership.resolveBoundaryPortalOwnership)({
-      boundaryId,
-      currentScreenKey,
-      handoff: true,
-      isSettledHostClosingComplete: (0, _ownership.isHandoffHostClosingComplete)({
-        closing,
-        progressAnimating,
-        progressSettled,
-        willAnimate
-      }),
-      isSettledHostReady: progressSettled === 1 && progressAnimating === 0,
-      pairsState: _state.pairs.get(),
-      settledHostScreenKey,
-      sourcePairKey
-    });
-  }, (signal, previousSignal) => {
-    "worklet";
-
-    if ((0, _shallowEqual.shallowEqual)(previousSignal, signal)) {
-      return;
-    }
-    if (signal.status === "pending") {
-      canSwitchPortalHostImmediately.set(0);
-      return;
-    }
-    const hostScreenKey = signal.status === "complete" ? signal.hostScreenKey : null;
-    let previousOwnerPairKey;
-    if (previousSignal?.status === "complete") {
-      previousOwnerPairKey = previousSignal.ownerPairKey ?? undefined;
-    }
-    const canSwitchImmediately = (0, _ownership.canSwitchHandoffHostImmediately)({
-      hostScreenKey,
-      ownerPairKey: signal.status === "complete" ? signal.ownerPairKey : undefined,
-      previousOwnerPairKey
-    });
-    canSwitchPortalHostImmediately.set(canSwitchImmediately ? 1 : 0);
-    if (canSwitchImmediately && hostScreenKey) {
-      const hostName = (0, _hostName.createBoundaryContentPortalHostName)(hostScreenKey, boundaryId);
-      requestedPortalHostName.set(hostName);
-      visiblePortalHostName.set(hostName);
-    }
-    (0, _reactNativeWorklets.scheduleOnRN)(updatePortalOwnership, signal.hostScreenKey, signal.ownerPairKey, signal.ownerScreenKey ?? undefined);
-  });
-  (0, _reactNativeReanimated.useAnimatedReaction)(() => {
-    "worklet";
-
-    const slot = activeSlotsMap.get()[boundaryId];
-    const teleport = slot?.props?.teleport;
-    const shouldTeleport = (0, _teleportControl.shouldAttachBoundaryPortal)({
-      enabled,
-      teleport
-    });
-    const requestedName = requestedPortalHostName.get();
-    const visibleName = visiblePortalHostName.get();
-    const isInterpolatorReady = activeNextInterpolatorReady.get();
-    const nextVisibleName = (0, _visibleHost.resolveNextVisiblePortalHostName)({
-      canSwitchImmediately: canSwitchPortalHostImmediately.get() === 1,
-      isInterpolatorReady: isInterpolatorReady === 1,
-      requestedName,
-      shouldTeleport,
-      visibleName
-    });
-    return {
-      isInterpolatorReady,
-      nextVisibleName,
-      requestedName,
-      shouldTeleport,
-      teleport,
-      visibleName
-    };
-  }, (state, previousState) => {
-    "worklet";
-
-    if ((0, _shallowEqual.shallowEqual)(previousState, state)) {
-      return;
-    }
-    if (state.nextVisibleName !== state.visibleName) {
-      visiblePortalHostName.set(state.nextVisibleName);
-    }
-  });
+  const nextScreenKey = (0, _descriptors.useDescriptorsStore)(s => s.derivations.nextScreenKey);
+  const sourcePairKey = (0, _descriptors.useDescriptorsStore)(s => s.derivations.sourcePairKey);
+  const destinationSlots = (0, _styles.useOptionalScreenSlotStore)(nextScreenKey ?? currentScreenKey);
+  const unavailableInterpolatorReady = (0, _reactNativeReanimated.useSharedValue)(0);
+  const interpolatorReady = destinationSlots?.interpolatorReady ?? unavailableInterpolatorReady;
+  const activeReceiverScreenKey = (0, _blankStack.useBlankStackStore)(_activeHandoffReceiver.resolveActiveHandoffReceiver);
+  const previousReceiverScreenKey = (0, _blankStack.useBlankStackStore)(_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";
 
-    const slot = activeSlotsMap.get()[boundaryId];
+    const slot = slotsMap.get()[boundaryId];
     const {
       pointerEvents: _pointerEvents,
       teleport,
       ...slotProps
     } = slot?.props ?? {};
-    const shouldTeleport = (0, _teleportControl.shouldAttachBoundaryPortal)({
-      enabled,
-      teleport
+    const shouldTeleport = (0, _teleportControl.isTeleportEnabled)(teleport);
+    const closing = activeReceiverClosing.get();
+    const animationProgress = activeReceiverAnimationProgress.get();
+    if (!closing) {
+      sourcePairBeforeClose.set(sourcePairKey ?? null);
+    }
+    const pairChangedDuringClose = !!closing && !!sourcePairKey && sourcePairKey !== sourcePairBeforeClose.get();
+    const hasActiveCloseFinished = (0, _transitionVisualState.hasCloseTransitionFinished)({
+      closing,
+      animationProgress
     });
-    const visibleName = visiblePortalHostName.get();
+    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 isInterpolatorReady = interpolatorReady.get();
+    const attachedScreenKey = attachedReceiverScreenKey.get();
+    const nextReceiverScreenKey = (0, _activeHandoffReceiver.resolveHandoffAttachmentCandidate)({
+      activeReceiverClosing: !!closing,
+      activeReceiverScreenKey,
+      attachedReceiverScreenKey: attachedScreenKey,
+      hasActiveCloseFinished,
+      interpolatorReady: !!isInterpolatorReady,
+      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 && !!isInterpolatorReady && 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,
-      hostName: shouldTeleport && visibleName ? visibleName : _naming.PORTAL_HOST_NAME_RESET_VALUE
+      hostName: targetHostName
     };
   });
   return {
-    teleportProps,
-    visiblePortalHostName
+    teleportProps
   };
 };
 exports.useBoundaryContentPortalAttachment = useBoundaryContentPortalAttachment;