react-native-screen-transitions 4.0.0-alpha.1 → 4.0.0-alpha.3

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

@@ -9,7 +9,6 @@ var _reactNative = require("react-native");
 var _reactNativeReanimated = _interopRequireDefault(require("react-native-reanimated"));
 var _descriptors = require("../../../../../../providers/screen/descriptors");
 var _styles = require("../../../../../../providers/screen/styles");
-var _system = require("../../../../../../stores/system.store");
 var _teleport = require("../../../teleport");
 var _useHostMeasurement = require("../hooks/use-host-measurement");
 var _hostRegistry = require("../stores/host-registry.store");
@@ -23,9 +22,6 @@ function HostImpl({
   style
 }) {
   const screenKey = (0, _descriptors.useDescriptorsStore)(s => s.derivations.currentScreenKey);
-  const {
-    unblockLifecycleStart
-  } = _system.SystemStore.getBag(screenKey).actions;
   const generatedHostKeyRef = (0, _react.useRef)(null);
   if (generatedHostKeyRef.current === null) {
     generatedHostKeyRef.current = `${screenKey}-host-${nextHostId++}`;
@@ -51,7 +47,6 @@ function HostImpl({
   });
   (0, _react.useLayoutEffect)(() => {
     (0, _hostRegistry.registerHost)({
-      capturesScroll,
       fallback,
       hostKey,
       screenKey
@@ -59,24 +54,18 @@ function HostImpl({
     return () => {
       (0, _hostRegistry.unregisterHost)(screenKey, hostKey);
     };
-  }, [capturesScroll, fallback, hostKey, screenKey]);
-  const handleUnblocking = (0, _react.useCallback)(() => {
-    // Each destination boundary contributes one lifecycle start block. Release
-    // only this host's block so unrelated boundary and user blocks stay intact.
-    unblockLifecycleStart();
-  }, [unblockLifecycleStart]);
-  const boundaryHosts = measurement.canRenderHosts ? activeBoundaryHosts.map(host => /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.View, {
+  }, [fallback, hostKey, screenKey]);
+  const boundaryHosts = activeBoundaryHosts.map(host => /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.View, {
     pointerEvents: _teleport.PORTAL_POINTER_EVENTS,
     style: [styles.boundaryHostViewport, {
       width: viewportWidth,
       height: viewportHeight
     }],
-    onLayout: handleUnblocking,
     children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_portalBoundaryHost2.PortalBoundaryHost, {
       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,

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

@@ -1 +1 @@
-{"version":3,"names":["_react","require","_reactNative","_reactNativeReanimated","_interopRequireDefault","_descriptors","_styles","_system","_teleport","_useHostMeasurement","_hostRegistry","_portalBoundaryHost","_portalBoundaryHost2","_jsxRuntime","e","__esModule","default","nextHostId","HostImpl","fallback","style","screenKey","useDescriptorsStore","s","derivations","currentScreenKey","unblockLifecycleStart","SystemStore","getBag","actions","generatedHostKeyRef","useRef","current","hostKey","capturesScroll","activeBoundaryHosts","useActivePortalBoundaryHosts","visibilityBlocked","useScreenSlots","height","viewportHeight","width","viewportWidth","useWindowDimensions","measurement","useHostMeasurement","enabled","length","useLayoutEffect","registerHost","unregisterHost","handleUnblocking","useCallback","boundaryHosts","canRenderHosts","map","host","jsx","View","pointerEvents","PORTAL_POINTER_EVENTS","styles","boundaryHostViewport","onLayout","children","PortalBoundaryHost","StyleSheet","absoluteFill","portalHostName","ref","hostRef","collapsable","Host","exports","memo","props","ScreenFallbackHost","create","elevation","left","overflow","position","top","zIndex"],"sourceRoot":"../../../../../../../../src","sources":["components/boundary/portal/components/boundary-portal/components/host.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_react","require","_reactNative","_reactNativeReanimated","_interopRequireDefault","_descriptors","_styles","_teleport","_useHostMeasurement","_hostRegistry","_portalBoundaryHost","_portalBoundaryHost2","_jsxRuntime","e","__esModule","default","nextHostId","HostImpl","fallback","style","screenKey","useDescriptorsStore","s","derivations","currentScreenKey","generatedHostKeyRef","useRef","current","hostKey","capturesScroll","activeBoundaryHosts","useActivePortalBoundaryHosts","visibilityBlocked","useScreenSlots","height","viewportHeight","width","viewportWidth","useWindowDimensions","measurement","useHostMeasurement","enabled","length","useLayoutEffect","registerHost","unregisterHost","boundaryHosts","map","host","jsx","View","pointerEvents","PORTAL_POINTER_EVENTS","styles","boundaryHostViewport","children","PortalBoundaryHost","StyleSheet","absoluteFill","portalHostName","ref","hostRef","collapsable","Host","exports","memo","props","ScreenFallbackHost","create","elevation","left","overflow","position","top","zIndex"],"sourceRoot":"../../../../../../../../src","sources":["components/boundary/portal/components/boundary-portal/components/host.tsx"],"mappings":"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","ignoreList":[]}

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

@@ -9,13 +9,12 @@ var _reactNative = require("react-native");
 var _reactNativeReanimated = _interopRequireWildcard(require("react-native-reanimated"));
 var _constants = require("../../../../../../constants");
 var _composeSlotStyle = require("../../../../../../providers/screen/styles/helpers/compose-slot-style");
-var _animation = require("../../../../../../stores/animation.store");
-var _linkPairs = require("../../../../../../stores/bounds/helpers/link-pairs.helpers");
 var _links = require("../../../../../../stores/bounds/internals/links");
-var _scroll = require("../../../../../../stores/scroll.store");
+var _system = require("../../../../../../stores/system.store");
 var _teleport = require("../../../teleport");
 var _hasLocalSlot = require("../helpers/has-local-slot");
 var _offsetStyle = require("../helpers/offset-style");
+var _hostBounds = require("../stores/host-bounds.store");
 var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 const AnimatedPortalBoundaryHost = _teleport.NativePortalHost ? _reactNativeReanimated.default.createAnimatedComponent(_teleport.NativePortalHost) : null;
@@ -23,13 +22,32 @@ const PortalBoundaryHost = exports.PortalBoundaryHost = /*#__PURE__*/(0, _react.
   host,
   style
 }) {
-  // Cross-screen landing-rect scroll tracking: the flight interpolates toward
-  // the source rect stored at measure time, but the source screen stays
-  // scrollable while the pair closes (destination pointer events are
-  // released). These are read per-frame so the landing point follows the
-  // live source scroll instead of the stale snapshot.
-  const sourceScrollMetadata = _scroll.ScrollStore.getValue((0, _linkPairs.getSourceScreenKeyFromPairKey)(host.pairKey), "metadata");
-  const hostVisualProgress = _animation.AnimationStore.getValue(host.screenKey, "visualProgress");
+  const geometryReadyFrames = (0, _reactNativeReanimated.useSharedValue)(0);
+  const {
+    unblockLifecycleStart
+  } = _system.SystemStore.getBag(host.screenKey).actions;
+  const handleFrame = (0, _react.useCallback)(() => {
+    "worklet";
+
+    if (host.portalHostReady.get()) {
+      return;
+    }
+    const link = (0, _links.getLink)(host.pairKey, host.boundaryId);
+    const hasGeometry = link?.source !== null && link !== undefined && (0, _hostBounds.getPortalHostBounds)(host.hostKey) !== null && (0, _hasLocalSlot.hasLocalSlot)(host.localStylesMaps.get(), host.boundaryId);
+    if (!hasGeometry) {
+      geometryReadyFrames.set(0);
+      return;
+    }
+    if (geometryReadyFrames.get() === 0) {
+      // Give the source frame, host offset, and slot style one UI frame to
+      // reach native before Teleport targets this receiver.
+      geometryReadyFrames.set(1);
+      return;
+    }
+    host.portalHostReady.set(true);
+    unblockLifecycleStart();
+  }, [geometryReadyFrames, host, unblockLifecycleStart]);
+  (0, _reactNativeReanimated.useFrameCallback)(handleFrame, true);
   const hostStyle = (0, _reactNativeReanimated.useAnimatedStyle)(() => {
     "worklet";
 
@@ -41,30 +59,10 @@ const PortalBoundaryHost = exports.PortalBoundaryHost = /*#__PURE__*/(0, _react.
     }
     const sourceBounds = link.source.bounds;
     const isCrossScreenPortal = link.source.screenKey !== host.screenKey;
-    let landingShift;
-    if (isCrossScreenPortal) {
-      // Weight by distance-to-landing so the destination end of the flight
-      // stays pinned: no correction while the content sits over the
-      // destination rect (progress 1), full correction at touchdown on the
-      // source rect (progress 0).
-      const landingWeight = 1 - Math.min(Math.max(hostVisualProgress.get(), 0), 1);
-      if (landingWeight > 0) {
-        const liveScroll = sourceScrollMetadata.get();
-        const capturedScroll = sourceBounds.scroll ?? null;
-
-        // Scroll offset grows as content moves up/left, so the rect's
-        // on-screen position shifts by the negative delta.
-        landingShift = {
-          x: -(0, _scroll.getClampedScrollAxisDelta)(liveScroll, capturedScroll, "horizontal") * landingWeight,
-          y: -(0, _scroll.getClampedScrollAxisDelta)(liveScroll, capturedScroll, "vertical") * landingWeight
-        };
-      }
-    }
     return (0, _offsetStyle.resolvePortalOffsetStyle)({
       bounds: sourceBounds,
       hostKey: host.hostKey,
-      placement: isCrossScreenPortal ? "cross-screen" : "same-screen",
-      landingShift
+      placement: isCrossScreenPortal ? "cross-screen" : "same-screen"
     });
   });
   const contentFrameStyle = (0, _reactNativeReanimated.useAnimatedStyle)(() => {
@@ -93,7 +91,7 @@ const PortalBoundaryHost = exports.PortalBoundaryHost = /*#__PURE__*/(0, _react.
     // cleanup frame. If the current local interpolator layers did not emit this
     // boundary id, any resolved style here is cleanup/stale residue and should
     // not be drawn by the host.
-    if (host.escapeClipping && !(0, _hasLocalSlot.hasLocalSlot)(host.localStylesMaps.get(), host.boundaryId)) {
+    if (!(0, _hasLocalSlot.hasLocalSlot)(host.localStylesMaps.get(), host.boundaryId)) {
       return _constants.NO_STYLES;
     }
     const slot = host.slotsMap.get()[host.boundaryId];
@@ -116,8 +114,17 @@ const PortalBoundaryHost = exports.PortalBoundaryHost = /*#__PURE__*/(0, _react.
     })
   });
 });
+
+// The teleport offset is a physical page delta measured from the screen's
+// left edge, so the content box must anchor there too. Under native RTL,
+// `left: 0` swaps to a right-edge anchor; `end: 0` is the physical left edge
+// in RTL regardless of the swap setting.
 const styles = _reactNative.StyleSheet.create({
-  content: {
+  content: _reactNative.I18nManager.isRTL ? {
+    end: 0,
+    position: "absolute",
+    top: 0
+  } : {
     left: 0,
     position: "absolute",
     top: 0

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

@@ -1 +1 @@
-{"version":3,"names":["_react","require","_reactNative","_reactNativeReanimated","_interopRequireWildcard","_constants","_composeSlotStyle","_animation","_linkPairs","_links","_scroll","_teleport","_hasLocalSlot","_offsetStyle","_jsxRuntime","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","AnimatedPortalBoundaryHost","NativePortalHost","Animated","createAnimatedComponent","PortalBoundaryHost","exports","memo","host","style","sourceScrollMetadata","ScrollStore","getValue","getSourceScreenKeyFromPairKey","pairKey","hostVisualProgress","AnimationStore","screenKey","hostStyle","useAnimatedStyle","link","getLink","boundaryId","source","NO_STYLES","sourceBounds","bounds","isCrossScreenPortal","landingShift","landingWeight","Math","min","max","liveScroll","capturedScroll","scroll","x","getClampedScrollAxisDelta","y","resolvePortalOffsetStyle","hostKey","placement","contentFrameStyle","height","width","slotStyle","escapeClipping","hasLocalSlot","localStylesMaps","slot","slotsMap","composeSlotStyleWithLocalTransform","undefined","boundsLocalTransform","jsx","View","pointerEvents","PORTAL_POINTER_EVENTS","collapsable","children","name","portalHostName","styles","content","StyleSheet","create","left","position","top"],"sourceRoot":"../../../../../../../../src","sources":["components/boundary/portal/components/boundary-portal/components/portal-boundary-host.tsx"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,OAAA;AACA,IAAAC,YAAA,GAAAD,OAAA;AACA,IAAAE,sBAAA,GAAAC,uBAAA,CAAAH,OAAA;AACA,IAAAI,UAAA,GAAAJ,OAAA;AACA,IAAAK,iBAAA,GAAAL,OAAA;AACA,IAAAM,UAAA,GAAAN,OAAA;AACA,IAAAO,UAAA,GAAAP,OAAA;AACA,IAAAQ,MAAA,GAAAR,OAAA;AACA,IAAAS,OAAA,GAAAT,OAAA;AAKA,IAAAU,SAAA,GAAAV,OAAA;AACA,IAAAW,aAAA,GAAAX,OAAA;AACA,IAAAY,YAAA,GAAAZ,OAAA;AAAmE,IAAAa,WAAA,GAAAb,OAAA;AAAA,SAAAG,wBAAAW,CAAA,EAAAC,CAAA,6BAAAC,OAAA,MAAAC,CAAA,OAAAD,OAAA,IAAAE,CAAA,OAAAF,OAAA,YAAAb,uBAAA,YAAAA,CAAAW,CAAA,EAAAC,CAAA,SAAAA,CAAA,IAAAD,CAAA,IAAAA,CAAA,CAAAK,UAAA,SAAAL,CAAA,MAAAM,CAAA,EAAAC,CAAA,EAAAC,CAAA,KAAAC,SAAA,QAAAC,OAAA,EAAAV,CAAA,iBAAAA,CAAA,uBAAAA,CAAA,yBAAAA,CAAA,SAAAQ,CAAA,MAAAF,CAAA,GAAAL,CAAA,GAAAG,CAAA,GAAAD,CAAA,QAAAG,CAAA,CAAAK,GAAA,CAAAX,CAAA,UAAAM,CAAA,CAAAM,GAAA,CAAAZ,CAAA,GAAAM,CAAA,CAAAO,GAAA,CAAAb,CAAA,EAAAQ,CAAA,gBAAAP,CAAA,IAAAD,CAAA,gBAAAC,CAAA,OAAAa,cAAA,CAAAC,IAAA,CAAAf,CAAA,EAAAC,CAAA,OAAAM,CAAA,IAAAD,CAAA,GAAAU,MAAA,CAAAC,cAAA,KAAAD,MAAA,CAAAE,wBAAA,CAAAlB,CAAA,EAAAC,CAAA,OAAAM,CAAA,CAAAK,GAAA,IAAAL,CAAA,CAAAM,GAAA,IAAAP,CAAA,CAAAE,CAAA,EAAAP,CAAA,EAAAM,CAAA,IAAAC,CAAA,CAAAP,CAAA,IAAAD,CAAA,CAAAC,CAAA,WAAAO,CAAA,KAAAR,CAAA,EAAAC,CAAA;AAGnE,MAAMkB,0BAA0B,GAAGC,0BAAgB,GAChDC,8BAAQ,CAACC,uBAAuB,CAACF,0BAAgB,CAAC,GAClD,IAAI;AAOA,MAAMG,kBAAkB,GAAAC,OAAA,CAAAD,kBAAA,gBAAG,IAAAE,WAAI,EAAC,SAASF,kBAAkBA,CAAC;EAClEG,IAAI;EACJC;AACwB,CAAC,EAAE;EAC3B;EACA;EACA;EACA;EACA;EACA,MAAMC,oBAAoB,GAAGC,mBAAW,CAACC,QAAQ,CAChD,IAAAC,wCAA6B,EAACL,IAAI,CAACM,OAAO,CAAC,EAC3C,UACD,CAAC;EACD,MAAMC,kBAAkB,GAAGC,yBAAc,CAACJ,QAAQ,CACjDJ,IAAI,CAACS,SAAS,EACd,gBACD,CAAC;EAED,MAAMC,SAAS,GAAG,IAAAC,uCAAgB,EAAC,MAAM;IACxC,SAAS;;IACT;IACA;IACA,MAAMC,IAAI,GAAG,IAAAC,cAAO,EAACb,IAAI,CAACM,OAAO,EAAEN,IAAI,CAACc,UAAU,CAAC;IACnD,IAAI,CAACF,IAAI,EAAEG,MAAM,EAAE;MAClB,OAAOC,oBAAS;IACjB;IAEA,MAAMC,YAAY,GAAGL,IAAI,CAACG,MAAM,CAACG,MAAkC;IACnE,MAAMC,mBAAmB,GAAGP,IAAI,CAACG,MAAM,CAACN,SAAS,KAAKT,IAAI,CAACS,SAAS;IAEpE,IAAIW,YAAkD;IAEtD,IAAID,mBAAmB,EAAE;MACxB;MACA;MACA;MACA;MACA,MAAME,aAAa,GAClB,CAAC,GAAGC,IAAI,CAACC,GAAG,CAACD,IAAI,CAACE,GAAG,CAACjB,kBAAkB,CAACrB,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;MAEvD,IAAImC,aAAa,GAAG,CAAC,EAAE;QACtB,MAAMI,UAAU,GAAGvB,oBAAoB,CAAChB,GAAG,CAAC,CAAC;QAC7C,MAAMwC,cAAc,GAAGT,YAAY,CAACU,MAAM,IAAI,IAAI;;QAElD;QACA;QACAP,YAAY,GAAG;UACdQ,CAAC,EACA,CAAC,IAAAC,iCAAyB,EACzBJ,UAAU,EACVC,cAAc,EACd,YACD,CAAC,GAAGL,aAAa;UAClBS,CAAC,EACA,CAAC,IAAAD,iCAAyB,EAACJ,UAAU,EAAEC,cAAc,EAAE,UAAU,CAAC,GAClEL;QACF,CAAC;MACF;IACD;IAEA,OAAO,IAAAU,qCAAwB,EAAC;MAC/Bb,MAAM,EAAED,YAAY;MACpBe,OAAO,EAAEhC,IAAI,CAACgC,OAAO;MACrBC,SAAS,EAAEd,mBAAmB,GAAG,cAAc,GAAG,aAAa;MAC/DC;IACD,CAAC,CAAC;EACH,CAAC,CAAC;EACF,MAAMc,iBAAiB,GAAG,IAAAvB,uCAAgB,EAAC,MAAM;IAChD,SAAS;;IACT,MAAMC,IAAI,GAAG,IAAAC,cAAO,EAACb,IAAI,CAACM,OAAO,EAAEN,IAAI,CAACc,UAAU,CAAC;IACnD,IAAI,CAACF,IAAI,EAAEG,MAAM,EAAE;MAClB,OAAOC,oBAAS;IACjB;IAEA,MAAMC,YAAY,GAAGL,IAAI,CAACG,MAAM,CAACG,MAAkC;IAEnE,OAAO;MACNiB,MAAM,EAAElB,YAAY,CAACkB,MAAM;MAC3BC,KAAK,EAAEnB,YAAY,CAACmB;IACrB,CAAC;EACF,CAAC,CAAC;EACF,MAAMC,SAAS,GAAG,IAAA1B,uCAAgB,EAAC,MAAM;IACxC,SAAS;;IACT;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA,IACCX,IAAI,CAACsC,cAAc,IACnB,CAAC,IAAAC,0BAAY,EAACvC,IAAI,CAACwC,eAAe,CAACtD,GAAG,CAAC,CAAC,EAAEc,IAAI,CAACc,UAAU,CAAC,EACzD;MACD,OAAOE,oBAAS;IACjB;IAEA,MAAMyB,IAAI,GAAGzC,IAAI,CAAC0C,QAAQ,CAACxD,GAAG,CAAC,CAAC,CAACc,IAAI,CAACc,UAAU,CAAC;IAEjD,OAAO,IAAA6B,oDAAkC,EACxCF,IAAI,EAAExC,KAAK,IAAIe,oBAAS,EACxB4B,SAAS,EACTH,IAAI,EAAEI,oBACP,CAAC;EACF,CAAC,CAAC;;EAEF;EACA;EACA,IAAI,CAACpD,0BAA0B,EAAE;IAChC,OAAO,IAAI;EACZ;EAEA,oBACC,IAAApB,WAAA,CAAAyE,GAAA,EAACpF,sBAAA,CAAAsB,OAAQ,CAAC+D,IAAI;IACbC,aAAa,EAAEC,+BAAsB;IACrChD,KAAK,EAAE,CAACA,KAAK,EAAES,SAAS,CAAE;IAC1BwC,WAAW,EAAE,KAAM;IAAAC,QAAA,eAEnB,IAAA9E,WAAA,CAAAyE,GAAA,EAACrD,0BAA0B;MAC1B2D,IAAI,EAAEpD,IAAI,CAACqD,cAAe;MAC1BL,aAAa,EAAEC,+BAAsB;MACrChD,KAAK,EAAE,CAACqD,MAAM,CAACC,OAAO,EAAErB,iBAAiB,EAAEG,SAAS;IAAE,CACtD;EAAC,CACY,CAAC;AAElB,CAAC,CAAC;AAEF,MAAMiB,MAAM,GAAGE,uBAAU,CAACC,MAAM,CAAC;EAChCF,OAAO,EAAE;IACRG,IAAI,EAAE,CAAC;IACPC,QAAQ,EAAE,UAAU;IACpBC,GAAG,EAAE;EACN;AACD,CAAC,CAAC","ignoreList":[]}
+{"version":3,"names":["_react","require","_reactNative","_reactNativeReanimated","_interopRequireWildcard","_constants","_composeSlotStyle","_links","_system","_teleport","_hasLocalSlot","_offsetStyle","_hostBounds","_jsxRuntime","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","AnimatedPortalBoundaryHost","NativePortalHost","Animated","createAnimatedComponent","PortalBoundaryHost","exports","memo","host","style","geometryReadyFrames","useSharedValue","unblockLifecycleStart","SystemStore","getBag","screenKey","actions","handleFrame","useCallback","portalHostReady","link","getLink","pairKey","boundaryId","hasGeometry","source","undefined","getPortalHostBounds","hostKey","hasLocalSlot","localStylesMaps","useFrameCallback","hostStyle","useAnimatedStyle","NO_STYLES","sourceBounds","bounds","isCrossScreenPortal","resolvePortalOffsetStyle","placement","contentFrameStyle","height","width","slotStyle","slot","slotsMap","composeSlotStyleWithLocalTransform","boundsLocalTransform","jsx","View","pointerEvents","PORTAL_POINTER_EVENTS","collapsable","children","name","portalHostName","styles","content","StyleSheet","create","I18nManager","isRTL","end","position","top","left"],"sourceRoot":"../../../../../../../../src","sources":["components/boundary/portal/components/boundary-portal/components/portal-boundary-host.tsx"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,OAAA;AACA,IAAAC,YAAA,GAAAD,OAAA;AAMA,IAAAE,sBAAA,GAAAC,uBAAA,CAAAH,OAAA;AAKA,IAAAI,UAAA,GAAAJ,OAAA;AACA,IAAAK,iBAAA,GAAAL,OAAA;AACA,IAAAM,MAAA,GAAAN,OAAA;AACA,IAAAO,OAAA,GAAAP,OAAA;AAEA,IAAAQ,SAAA,GAAAR,OAAA;AACA,IAAAS,aAAA,GAAAT,OAAA;AACA,IAAAU,YAAA,GAAAV,OAAA;AACA,IAAAW,WAAA,GAAAX,OAAA;AAAkE,IAAAY,WAAA,GAAAZ,OAAA;AAAA,SAAAG,wBAAAU,CAAA,EAAAC,CAAA,6BAAAC,OAAA,MAAAC,CAAA,OAAAD,OAAA,IAAAE,CAAA,OAAAF,OAAA,YAAAZ,uBAAA,YAAAA,CAAAU,CAAA,EAAAC,CAAA,SAAAA,CAAA,IAAAD,CAAA,IAAAA,CAAA,CAAAK,UAAA,SAAAL,CAAA,MAAAM,CAAA,EAAAC,CAAA,EAAAC,CAAA,KAAAC,SAAA,QAAAC,OAAA,EAAAV,CAAA,iBAAAA,CAAA,uBAAAA,CAAA,yBAAAA,CAAA,SAAAQ,CAAA,MAAAF,CAAA,GAAAL,CAAA,GAAAG,CAAA,GAAAD,CAAA,QAAAG,CAAA,CAAAK,GAAA,CAAAX,CAAA,UAAAM,CAAA,CAAAM,GAAA,CAAAZ,CAAA,GAAAM,CAAA,CAAAO,GAAA,CAAAb,CAAA,EAAAQ,CAAA,gBAAAP,CAAA,IAAAD,CAAA,gBAAAC,CAAA,OAAAa,cAAA,CAAAC,IAAA,CAAAf,CAAA,EAAAC,CAAA,OAAAM,CAAA,IAAAD,CAAA,GAAAU,MAAA,CAAAC,cAAA,KAAAD,MAAA,CAAAE,wBAAA,CAAAlB,CAAA,EAAAC,CAAA,OAAAM,CAAA,CAAAK,GAAA,IAAAL,CAAA,CAAAM,GAAA,IAAAP,CAAA,CAAAE,CAAA,EAAAP,CAAA,EAAAM,CAAA,IAAAC,CAAA,CAAAP,CAAA,IAAAD,CAAA,CAAAC,CAAA,WAAAO,CAAA,KAAAR,CAAA,EAAAC,CAAA;AAGlE,MAAMkB,0BAA0B,GAAGC,0BAAgB,GAChDC,8BAAQ,CAACC,uBAAuB,CAACF,0BAAgB,CAAC,GAClD,IAAI;AAOA,MAAMG,kBAAkB,GAAAC,OAAA,CAAAD,kBAAA,gBAAG,IAAAE,WAAI,EAAC,SAASF,kBAAkBA,CAAC;EAClEG,IAAI;EACJC;AACwB,CAAC,EAAE;EAC3B,MAAMC,mBAAmB,GAAG,IAAAC,qCAAc,EAAC,CAAC,CAAC;EAC7C,MAAM;IAAEC;EAAsB,CAAC,GAAGC,mBAAW,CAACC,MAAM,CAACN,IAAI,CAACO,SAAS,CAAC,CAACC,OAAO;EAE5E,MAAMC,WAAW,GAAG,IAAAC,kBAAW,EAAC,MAAM;IACrC,SAAS;;IACT,IAAIV,IAAI,CAACW,eAAe,CAACzB,GAAG,CAAC,CAAC,EAAE;MAC/B;IACD;IAEA,MAAM0B,IAAI,GAAG,IAAAC,cAAO,EAACb,IAAI,CAACc,OAAO,EAAEd,IAAI,CAACe,UAAU,CAAC;IACnD,MAAMC,WAAW,GAChBJ,IAAI,EAAEK,MAAM,KAAK,IAAI,IACrBL,IAAI,KAAKM,SAAS,IAClB,IAAAC,+BAAmB,EAACnB,IAAI,CAACoB,OAAO,CAAC,KAAK,IAAI,IAC1C,IAAAC,0BAAY,EAACrB,IAAI,CAACsB,eAAe,CAACpC,GAAG,CAAC,CAAC,EAAEc,IAAI,CAACe,UAAU,CAAC;IAE1D,IAAI,CAACC,WAAW,EAAE;MACjBd,mBAAmB,CAACf,GAAG,CAAC,CAAC,CAAC;MAC1B;IACD;IAEA,IAAIe,mBAAmB,CAAChB,GAAG,CAAC,CAAC,KAAK,CAAC,EAAE;MACpC;MACA;MACAgB,mBAAmB,CAACf,GAAG,CAAC,CAAC,CAAC;MAC1B;IACD;IAEAa,IAAI,CAACW,eAAe,CAACxB,GAAG,CAAC,IAAI,CAAC;IAC9BiB,qBAAqB,CAAC,CAAC;EACxB,CAAC,EAAE,CAACF,mBAAmB,EAAEF,IAAI,EAAEI,qBAAqB,CAAC,CAAC;EAEtD,IAAAmB,uCAAgB,EAACd,WAAW,EAAE,IAAI,CAAC;EAEnC,MAAMe,SAAS,GAAG,IAAAC,uCAAgB,EAAC,MAAM;IACxC,SAAS;;IACT;IACA;IACA,MAAMb,IAAI,GAAG,IAAAC,cAAO,EAACb,IAAI,CAACc,OAAO,EAAEd,IAAI,CAACe,UAAU,CAAC;IACnD,IAAI,CAACH,IAAI,EAAEK,MAAM,EAAE;MAClB,OAAOS,oBAAS;IACjB;IAEA,MAAMC,YAAY,GAAGf,IAAI,CAACK,MAAM,CAACW,MAAkC;IACnE,MAAMC,mBAAmB,GAAGjB,IAAI,CAACK,MAAM,CAACV,SAAS,KAAKP,IAAI,CAACO,SAAS;IAEpE,OAAO,IAAAuB,qCAAwB,EAAC;MAC/BF,MAAM,EAAED,YAAY;MACpBP,OAAO,EAAEpB,IAAI,CAACoB,OAAO;MACrBW,SAAS,EAAEF,mBAAmB,GAAG,cAAc,GAAG;IACnD,CAAC,CAAC;EACH,CAAC,CAAC;EAEF,MAAMG,iBAAiB,GAAG,IAAAP,uCAAgB,EAAC,MAAM;IAChD,SAAS;;IACT,MAAMb,IAAI,GAAG,IAAAC,cAAO,EAACb,IAAI,CAACc,OAAO,EAAEd,IAAI,CAACe,UAAU,CAAC;IACnD,IAAI,CAACH,IAAI,EAAEK,MAAM,EAAE;MAClB,OAAOS,oBAAS;IACjB;IAEA,MAAMC,YAAY,GAAGf,IAAI,CAACK,MAAM,CAACW,MAAkC;IAEnE,OAAO;MACNK,MAAM,EAAEN,YAAY,CAACM,MAAM;MAC3BC,KAAK,EAAEP,YAAY,CAACO;IACrB,CAAC;EACF,CAAC,CAAC;EACF,MAAMC,SAAS,GAAG,IAAAV,uCAAgB,EAAC,MAAM;IACxC,SAAS;;IACT;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA,IAAI,CAAC,IAAAJ,0BAAY,EAACrB,IAAI,CAACsB,eAAe,CAACpC,GAAG,CAAC,CAAC,EAAEc,IAAI,CAACe,UAAU,CAAC,EAAE;MAC/D,OAAOW,oBAAS;IACjB;IAEA,MAAMU,IAAI,GAAGpC,IAAI,CAACqC,QAAQ,CAACnD,GAAG,CAAC,CAAC,CAACc,IAAI,CAACe,UAAU,CAAC;IAEjD,OAAO,IAAAuB,oDAAkC,EACxCF,IAAI,EAAEnC,KAAK,IAAIyB,oBAAS,EACxBR,SAAS,EACTkB,IAAI,EAAEG,oBACP,CAAC;EACF,CAAC,CAAC;;EAEF;EACA;EACA,IAAI,CAAC9C,0BAA0B,EAAE;IAChC,OAAO,IAAI;EACZ;EAEA,oBACC,IAAApB,WAAA,CAAAmE,GAAA,EAAC7E,sBAAA,CAAAqB,OAAQ,CAACyD,IAAI;IACbC,aAAa,EAAEC,+BAAsB;IACrC1C,KAAK,EAAE,CAACA,KAAK,EAAEuB,SAAS,CAAE;IAC1BoB,WAAW,EAAE,KAAM;IAAAC,QAAA,eAEnB,IAAAxE,WAAA,CAAAmE,GAAA,EAAC/C,0BAA0B;MAC1BqD,IAAI,EAAE9C,IAAI,CAAC+C,cAAe;MAC1BL,aAAa,EAAEC,+BAAsB;MACrC1C,KAAK,EAAE,CAAC+C,MAAM,CAACC,OAAO,EAAEjB,iBAAiB,EAAEG,SAAS;IAAE,CACtD;EAAC,CACY,CAAC;AAElB,CAAC,CAAC;;AAEF;AACA;AACA;AACA;AACA,MAAMa,MAAM,GAAGE,uBAAU,CAACC,MAAM,CAAC;EAChCF,OAAO,EAAEG,wBAAW,CAACC,KAAK,GACvB;IACAC,GAAG,EAAE,CAAC;IACNC,QAAQ,EAAE,UAAU;IACpBC,GAAG,EAAE;EACN,CAAC,GACA;IACAC,IAAI,EAAE,CAAC;IACPF,QAAQ,EAAE,UAAU;IACpBC,GAAG,EAAE;EACN;AACH,CAAC,CAAC","ignoreList":[]}

package/lib/commonjs/components/boundary/portal/components/boundary-portal/helpers/active-pair.js

@@ -0,0 +1,30 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.hasActiveBoundaryPortalLink = void 0;
+var _linkPairs = require("../../../../../../stores/bounds/helpers/link-pairs.helpers");
+const hasActiveBoundaryPortalLink = ({
+  boundaryId,
+  pairsState,
+  sourcePairKey
+}) => {
+  "worklet";
+
+  if (!sourcePairKey) {
+    return false;
+  }
+  const pair = pairsState[sourcePairKey];
+  const linkKey = (0, _linkPairs.getLinkKeyFromTag)(boundaryId);
+  const link = pair?.links[linkKey];
+  if (!link?.source) {
+    return false;
+  }
+  if (link.group && pair.groups[link.group]?.activeId !== linkKey) {
+    return false;
+  }
+  return true;
+};
+exports.hasActiveBoundaryPortalLink = hasActiveBoundaryPortalLink;
+//# sourceMappingURL=active-pair.js.map

package/lib/commonjs/components/boundary/portal/components/boundary-portal/helpers/active-pair.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["_linkPairs","require","hasActiveBoundaryPortalLink","boundaryId","pairsState","sourcePairKey","pair","linkKey","getLinkKeyFromTag","link","links","source","group","groups","activeId","exports"],"sourceRoot":"../../../../../../../../src","sources":["components/boundary/portal/components/boundary-portal/helpers/active-pair.ts"],"mappings":";;;;;;AAAA,IAAAA,UAAA,GAAAC,OAAA;AAYO,MAAMC,2BAA2B,GAAGA,CAAC;EAC3CC,UAAU;EACVC,UAAU;EACVC;AACkC,CAAC,KAAc;EACjD,SAAS;;EACT,IAAI,CAACA,aAAa,EAAE;IACnB,OAAO,KAAK;EACb;EAEA,MAAMC,IAAI,GAAGF,UAAU,CAACC,aAAa,CAAC;EACtC,MAAME,OAAO,GAAG,IAAAC,4BAAiB,EAACL,UAAU,CAAC;EAC7C,MAAMM,IAAI,GAAGH,IAAI,EAAEI,KAAK,CAACH,OAAO,CAAC;EAEjC,IAAI,CAACE,IAAI,EAAEE,MAAM,EAAE;IAClB,OAAO,KAAK;EACb;EAEA,IAAIF,IAAI,CAACG,KAAK,IAAIN,IAAI,CAACO,MAAM,CAACJ,IAAI,CAACG,KAAK,CAAC,EAAEE,QAAQ,KAAKP,OAAO,EAAE;IAChE,OAAO,KAAK;EACb;EAEA,OAAO,IAAI;AACZ,CAAC;AAACQ,OAAA,CAAAb,2BAAA,GAAAA,2BAAA","ignoreList":[]}

package/lib/commonjs/components/boundary/portal/components/boundary-portal/helpers/offset-style.js

@@ -19,8 +19,7 @@ var _hostBounds = require("../stores/host-bounds.store");
 const resolvePortalOffsetStyle = ({
   bounds,
   hostKey,
-  placement,
-  landingShift
+  placement
 }) => {
   "worklet";
 
@@ -41,9 +40,9 @@ const resolvePortalOffsetStyle = ({
   const adjustedHostPageY = hostBounds ? hostBounds.pageY - hostSnapshotDeltaY : 0;
   return {
     transform: [{
-      translateY: bounds.pageY - adjustedHostPageY + (landingShift?.y ?? 0)
+      translateY: bounds.pageY - adjustedHostPageY
     }, {
-      translateX: bounds.pageX - adjustedHostPageX + (landingShift?.x ?? 0)
+      translateX: bounds.pageX - adjustedHostPageX
     }]
   };
 };

package/lib/commonjs/components/boundary/portal/components/boundary-portal/helpers/offset-style.js.map

@@ -1 +1 @@
-{"version":3,"names":["_scroll","require","_hostBounds","resolvePortalOffsetStyle","bounds","hostKey","placement","landingShift","hostBounds","getPortalHostBounds","boundsScrollSnapshot","scroll","hostBoundsScrollSnapshot","alignHostToBoundsScroll","hostSnapshotDeltaX","getClampedScrollAxisDelta","hostSnapshotDeltaY","adjustedHostPageX","pageX","adjustedHostPageY","pageY","transform","translateY","y","translateX","x","exports"],"sourceRoot":"../../../../../../../../src","sources":["components/boundary/portal/components/boundary-portal/helpers/offset-style.ts"],"mappings":";;;;;;AACA,IAAAA,OAAA,GAAAC,OAAA;AAEA,IAAAC,WAAA,GAAAD,OAAA;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAgBO,MAAME,wBAAwB,GAAGA,CAAC;EACxCC,MAAM;EACNC,OAAO;EACPC,SAAS;EACTC;AAC+B,CAAC,KAAiB;EACjD,SAAS;;EACT,MAAMC,UAAU,GAAG,IAAAC,+BAAmB,EAACJ,OAAO,CAAC;EAC/C,MAAMK,oBAAoB,GAAGN,MAAM,CAACO,MAAM,IAAI,IAAI;EAClD,MAAMC,wBAAwB,GAAGJ,UAAU,EAAEG,MAAM,IAAI,IAAI;;EAE3D;EACA;EACA;EACA,MAAME,uBAAuB,GAAGP,SAAS,KAAK,aAAa;EAE3D,MAAMQ,kBAAkB,GAAGD,uBAAuB,GAC/C,IAAAE,iCAAyB,EACzBL,oBAAoB,EACpBE,wBAAwB,EACxB,YACD,CAAC,GACA,CAAC;EACJ,MAAMI,kBAAkB,GAAGH,uBAAuB,GAC/C,IAAAE,iCAAyB,EACzBL,oBAAoB,EACpBE,wBAAwB,EACxB,UACD,CAAC,GACA,CAAC;;EAEJ;EACA;EACA,MAAMK,iBAAiB,GAAGT,UAAU,GACjCA,UAAU,CAACU,KAAK,GAAGJ,kBAAkB,GACrC,CAAC;EACJ,MAAMK,iBAAiB,GAAGX,UAAU,GACjCA,UAAU,CAACY,KAAK,GAAGJ,kBAAkB,GACrC,CAAC;EAEJ,OAAO;IACNK,SAAS,EAAE,CACV;MAAEC,UAAU,EAAElB,MAAM,CAACgB,KAAK,GAAGD,iBAAiB,IAAIZ,YAAY,EAAEgB,CAAC,IAAI,CAAC;IAAE,CAAC,EACzE;MAAEC,UAAU,EAAEpB,MAAM,CAACc,KAAK,GAAGD,iBAAiB,IAAIV,YAAY,EAAEkB,CAAC,IAAI,CAAC;IAAE,CAAC;EAE3E,CAAC;AACF,CAAC;AAACC,OAAA,CAAAvB,wBAAA,GAAAA,wBAAA","ignoreList":[]}
+{"version":3,"names":["_scroll","require","_hostBounds","resolvePortalOffsetStyle","bounds","hostKey","placement","hostBounds","getPortalHostBounds","boundsScrollSnapshot","scroll","hostBoundsScrollSnapshot","alignHostToBoundsScroll","hostSnapshotDeltaX","getClampedScrollAxisDelta","hostSnapshotDeltaY","adjustedHostPageX","pageX","adjustedHostPageY","pageY","transform","translateY","translateX","exports"],"sourceRoot":"../../../../../../../../src","sources":["components/boundary/portal/components/boundary-portal/helpers/offset-style.ts"],"mappings":";;;;;;AACA,IAAAA,OAAA,GAAAC,OAAA;AAEA,IAAAC,WAAA,GAAAD,OAAA;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAUO,MAAME,wBAAwB,GAAGA,CAAC;EACxCC,MAAM;EACNC,OAAO;EACPC;AAC+B,CAAC,KAAiB;EACjD,SAAS;;EACT,MAAMC,UAAU,GAAG,IAAAC,+BAAmB,EAACH,OAAO,CAAC;EAC/C,MAAMI,oBAAoB,GAAGL,MAAM,CAACM,MAAM,IAAI,IAAI;EAClD,MAAMC,wBAAwB,GAAGJ,UAAU,EAAEG,MAAM,IAAI,IAAI;;EAE3D;EACA;EACA;EACA,MAAME,uBAAuB,GAAGN,SAAS,KAAK,aAAa;EAE3D,MAAMO,kBAAkB,GAAGD,uBAAuB,GAC/C,IAAAE,iCAAyB,EACzBL,oBAAoB,EACpBE,wBAAwB,EACxB,YACD,CAAC,GACA,CAAC;EACJ,MAAMI,kBAAkB,GAAGH,uBAAuB,GAC/C,IAAAE,iCAAyB,EACzBL,oBAAoB,EACpBE,wBAAwB,EACxB,UACD,CAAC,GACA,CAAC;;EAEJ;EACA;EACA,MAAMK,iBAAiB,GAAGT,UAAU,GACjCA,UAAU,CAACU,KAAK,GAAGJ,kBAAkB,GACrC,CAAC;EACJ,MAAMK,iBAAiB,GAAGX,UAAU,GACjCA,UAAU,CAACY,KAAK,GAAGJ,kBAAkB,GACrC,CAAC;EAEJ,OAAO;IACNK,SAAS,EAAE,CACV;MAAEC,UAAU,EAAEjB,MAAM,CAACe,KAAK,GAAGD;IAAkB,CAAC,EAChD;MAAEI,UAAU,EAAElB,MAAM,CAACa,KAAK,GAAGD;IAAkB,CAAC;EAElD,CAAC;AACF,CAAC;AAACO,OAAA,CAAApB,wBAAA,GAAAA,wBAAA","ignoreList":[]}

package/lib/commonjs/components/boundary/portal/components/boundary-portal/hooks/use-active-portal-boundary-host.js

@@ -0,0 +1,75 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.useActivePortalBoundaryHost = void 0;
+var _react = require("react");
+var _reactNativeReanimated = require("react-native-reanimated");
+var _reactNativeWorklets = require("react-native-worklets");
+var _state = require("../../../../../../stores/bounds/internals/state");
+var _naming = require("../../../utils/naming");
+var _activePair = require("../helpers/active-pair");
+var _portalBoundaryHost = require("../stores/portal-boundary-host.store");
+const useActivePortalBoundaryHost = ({
+  boundaryId,
+  currentScreenKey,
+  escapeHostKey,
+  localStylesMaps,
+  portalHostName,
+  portalHostReady,
+  slotsMap,
+  sourcePairKey
+}) => {
+  const [hasActiveLink, setHasActiveLink] = (0, _react.useState)(false);
+  const sourcePairKeyRef = (0, _react.useRef)(sourcePairKey);
+  sourcePairKeyRef.current = sourcePairKey;
+  const updateActiveLink = (0, _react.useCallback)((observedSourcePairKey, nextHasActiveLink) => {
+    if (sourcePairKeyRef.current !== observedSourcePairKey) {
+      return;
+    }
+    setHasActiveLink(nextHasActiveLink);
+  }, []);
+  (0, _reactNativeReanimated.useAnimatedReaction)(() => {
+    "worklet";
+
+    return (0, _activePair.hasActiveBoundaryPortalLink)({
+      boundaryId,
+      pairsState: _state.pairs.get(),
+      sourcePairKey
+    });
+  }, (nextHasActiveLink, previousHasActiveLink) => {
+    "worklet";
+
+    if (nextHasActiveLink === previousHasActiveLink) {
+      return;
+    }
+    (0, _reactNativeWorklets.scheduleOnRN)(updateActiveLink, sourcePairKey, nextHasActiveLink);
+  });
+  (0, _react.useLayoutEffect)(() => {
+    if (!hasActiveLink || !sourcePairKey || !escapeHostKey) {
+      portalHostName.set(null);
+      portalHostReady.set(false);
+      return;
+    }
+    const nextPortalHostName = (0, _naming.createBoundaryPortalHostName)(escapeHostKey, boundaryId, sourcePairKey);
+    (0, _portalBoundaryHost.mountPortalBoundaryHost)({
+      boundaryId,
+      hostKey: escapeHostKey,
+      localStylesMaps,
+      pairKey: sourcePairKey,
+      portalHostName: nextPortalHostName,
+      portalHostReady,
+      screenKey: currentScreenKey,
+      slotsMap
+    });
+    portalHostName.set(nextPortalHostName);
+    return () => {
+      portalHostName.set(null);
+      portalHostReady.set(false);
+      (0, _portalBoundaryHost.unmountPortalBoundaryHostByName)(nextPortalHostName);
+    };
+  }, [boundaryId, currentScreenKey, escapeHostKey, localStylesMaps, portalHostName, portalHostReady, sourcePairKey, slotsMap, hasActiveLink]);
+};
+exports.useActivePortalBoundaryHost = useActivePortalBoundaryHost;
+//# sourceMappingURL=use-active-portal-boundary-host.js.map

package/lib/commonjs/components/boundary/portal/components/boundary-portal/hooks/use-active-portal-boundary-host.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["_react","require","_reactNativeReanimated","_reactNativeWorklets","_state","_naming","_activePair","_portalBoundaryHost","useActivePortalBoundaryHost","boundaryId","currentScreenKey","escapeHostKey","localStylesMaps","portalHostName","portalHostReady","slotsMap","sourcePairKey","hasActiveLink","setHasActiveLink","useState","sourcePairKeyRef","useRef","current","updateActiveLink","useCallback","observedSourcePairKey","nextHasActiveLink","useAnimatedReaction","hasActiveBoundaryPortalLink","pairsState","pairs","get","previousHasActiveLink","scheduleOnRN","useLayoutEffect","set","nextPortalHostName","createBoundaryPortalHostName","mountPortalBoundaryHost","hostKey","pairKey","screenKey","unmountPortalBoundaryHostByName","exports"],"sourceRoot":"../../../../../../../../src","sources":["components/boundary/portal/components/boundary-portal/hooks/use-active-portal-boundary-host.ts"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,OAAA;AACA,IAAAC,sBAAA,GAAAD,OAAA;AACA,IAAAE,oBAAA,GAAAF,OAAA;AAEA,IAAAG,MAAA,GAAAH,OAAA;AAGA,IAAAI,OAAA,GAAAJ,OAAA;AACA,IAAAK,WAAA,GAAAL,OAAA;AACA,IAAAM,mBAAA,GAAAN,OAAA;AAgBO,MAAMO,2BAA2B,GAAGA,CAAC;EAC3CC,UAAU;EACVC,gBAAgB;EAChBC,aAAa;EACbC,eAAe;EACfC,cAAc;EACdC,eAAe;EACfC,QAAQ;EACRC;AACkC,CAAC,KAAK;EACxC,MAAM,CAACC,aAAa,EAAEC,gBAAgB,CAAC,GAAG,IAAAC,eAAQ,EAAC,KAAK,CAAC;EACzD,MAAMC,gBAAgB,GAAG,IAAAC,aAAM,EAACL,aAAa,CAAC;EAC9CI,gBAAgB,CAACE,OAAO,GAAGN,aAAa;EAExC,MAAMO,gBAAgB,GAAG,IAAAC,kBAAW,EACnC,CACCC,qBAAgD,EAChDC,iBAA0B,KACtB;IACJ,IAAIN,gBAAgB,CAACE,OAAO,KAAKG,qBAAqB,EAAE;MACvD;IACD;IAEAP,gBAAgB,CAACQ,iBAAiB,CAAC;EACpC,CAAC,EACD,EACD,CAAC;EAED,IAAAC,0CAAmB,EAClB,MAAM;IACL,SAAS;;IACT,OAAO,IAAAC,uCAA2B,EAAC;MAClCnB,UAAU;MACVoB,UAAU,EAAEC,YAAK,CAACC,GAAG,CAAC,CAAC;MACvBf;IACD,CAAC,CAAC;EACH,CAAC,EACD,CAACU,iBAAiB,EAAEM,qBAAqB,KAAK;IAC7C,SAAS;;IACT,IAAIN,iBAAiB,KAAKM,qBAAqB,EAAE;MAChD;IACD;IAEA,IAAAC,iCAAY,EAACV,gBAAgB,EAAEP,aAAa,EAAEU,iBAAiB,CAAC;EACjE,CACD,CAAC;EAED,IAAAQ,sBAAe,EAAC,MAAM;IACrB,IAAI,CAACjB,aAAa,IAAI,CAACD,aAAa,IAAI,CAACL,aAAa,EAAE;MACvDE,cAAc,CAACsB,GAAG,CAAC,IAAI,CAAC;MACxBrB,eAAe,CAACqB,GAAG,CAAC,KAAK,CAAC;MAC1B;IACD;IAEA,MAAMC,kBAAkB,GAAG,IAAAC,oCAA4B,EACtD1B,aAAa,EACbF,UAAU,EACVO,aACD,CAAC;IAED,IAAAsB,2CAAuB,EAAC;MACvB7B,UAAU;MACV8B,OAAO,EAAE5B,aAAa;MACtBC,eAAe;MACf4B,OAAO,EAAExB,aAAa;MACtBH,cAAc,EAAEuB,kBAAkB;MAClCtB,eAAe;MACf2B,SAAS,EAAE/B,gBAAgB;MAC3BK;IACD,CAAC,CAAC;IACFF,cAAc,CAACsB,GAAG,CAACC,kBAAkB,CAAC;IAEtC,OAAO,MAAM;MACZvB,cAAc,CAACsB,GAAG,CAAC,IAAI,CAAC;MACxBrB,eAAe,CAACqB,GAAG,CAAC,KAAK,CAAC;MAC1B,IAAAO,mDAA+B,EAACN,kBAAkB,CAAC;IACpD,CAAC;EACF,CAAC,EAAE,CACF3B,UAAU,EACVC,gBAAgB,EAChBC,aAAa,EACbC,eAAe,EACfC,cAAc,EACdC,eAAe,EACfE,aAAa,EACbD,QAAQ,EACRE,aAAa,CACb,CAAC;AACH,CAAC;AAAC0B,OAAA,CAAAnC,2BAAA,GAAAA,2BAAA","ignoreList":[]}

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

@@ -4,159 +4,44 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.useBoundaryPortalAttachment = 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 _transitionVisualState = require("../../../../../../providers/screen/styles/helpers/transition-visual-state");
+var _animation = require("../../../../../../stores/animation.store");
 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 _hostName = require("../helpers/host-name");
+var _activePair = require("../helpers/active-pair");
 var _hostRegistry = require("../stores/host-registry.store");
-var _portalBoundaryHost = require("../stores/portal-boundary-host.store");
+var _useActivePortalBoundaryHost = require("./use-active-portal-boundary-host");
 const useBoundaryPortalAttachment = ({
-  boundaryId,
-  enabled
+  boundaryId
 }) => {
   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");
   const {
     localStylesMaps,
-    nextInterpolatorReady,
     slotsMap
   } = (0, _styles.useScreenSlots)();
-  const [ownership, setOwnership] = (0, _react.useState)(null);
-  const requestedPortalHostName = (0, _reactNativeReanimated.useSharedValue)(null);
-  const visiblePortalHostName = (0, _reactNativeReanimated.useSharedValue)(null);
-  const mountedPortalBoundaryHostNamesRef = (0, _react.useRef)(new Set());
-  const escapeHostKey = (0, _hostRegistry.useActiveHostKey)(enabled ? currentScreenKey : 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);
-  }, []);
-  const unmountOwnedPortalBoundaryHosts = (0, _react.useCallback)(() => {
-    for (const portalHostName of mountedPortalBoundaryHostNamesRef.current) {
-      (0, _portalBoundaryHost.unmountPortalBoundaryHostByName)(portalHostName);
-    }
-    mountedPortalBoundaryHostNamesRef.current.clear();
-  }, []);
-  (0, _react.useLayoutEffect)(() => {
-    if (!enabled || !ownership || !escapeHostKey) {
-      requestedPortalHostName.set(null);
-      visiblePortalHostName.set(null);
-      unmountOwnedPortalBoundaryHosts();
-      return;
-    }
-    const portalHostName = (0, _hostName.createBoundaryPortalHostName)(escapeHostKey, boundaryId, ownership.ownerPairKey);
-    (0, _portalBoundaryHost.mountPortalBoundaryHost)({
-      boundaryId,
-      escapeClipping: true,
-      hostKey: escapeHostKey,
-      localStylesMaps,
-      pairKey: ownership.ownerPairKey,
-      portalHostName,
-      screenKey: currentScreenKey,
-      slotsMap
-    });
-    mountedPortalBoundaryHostNamesRef.current.add(portalHostName);
-
-    // Request the new receiver immediately, but keep the currently visible
-    // receiver until the new interpolator is ready. This avoids a no-host gap
-    // during rapid close/open retargets.
-    requestedPortalHostName.set(portalHostName);
-  }, [boundaryId, currentScreenKey, enabled, escapeHostKey, localStylesMaps, ownership, requestedPortalHostName, slotsMap, unmountOwnedPortalBoundaryHosts, visiblePortalHostName]);
-  (0, _react.useLayoutEffect)(() => {
-    return () => {
-      requestedPortalHostName.set(null);
-      visiblePortalHostName.set(null);
-      unmountOwnedPortalBoundaryHosts();
-    };
-  }, [requestedPortalHostName, unmountOwnedPortalBoundaryHosts, visiblePortalHostName]);
-  (0, _reactNativeReanimated.useAnimatedReaction)(() => {
-    "worklet";
-
-    if (!enabled || !sourcePairKey) {
-      return {
-        hostScreenKey: null,
-        ownerPairKey: sourcePairKey,
-        ownerScreenKey: null,
-        status: "clear"
-      };
-    }
-    return (0, _ownership.resolveBoundaryPortalOwnership)({
-      boundaryId,
-      currentScreenKey,
-      handoff: false,
-      pairsState: _state.pairs.get(),
-      sourcePairKey
-    });
-  }, (signal, previousSignal) => {
-    "worklet";
-
-    if ((0, _shallowEqual.shallowEqual)(previousSignal, signal)) {
-      return;
-    }
-    (0, _reactNativeWorklets.scheduleOnRN)(updatePortalOwnership, signal.hostScreenKey, signal.ownerPairKey, signal.ownerScreenKey ?? undefined);
-  });
-  (0, _reactNativeReanimated.useAnimatedReaction)(() => {
-    "worklet";
-
-    const slot = slotsMap.get()[boundaryId];
-    const teleport = slot?.props?.teleport;
-    const shouldTeleport = (0, _teleportControl.shouldAttachBoundaryPortal)({
-      enabled,
-      teleport
-    });
-    const requestedName = requestedPortalHostName.get();
-    const visibleName = visiblePortalHostName.get();
-    const isInterpolatorReady = nextInterpolatorReady.get();
-    const nextVisibleName = (0, _visibleHost.resolveNextVisiblePortalHostName)({
-      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);
-      return;
-    }
-    if (state.visibleName && state.visibleName === state.requestedName) {
-      (0, _reactNativeWorklets.scheduleOnRN)(_portalBoundaryHost.dropStalePortalBoundaryHosts, {
-        boundaryId,
-        keepPortalHostName: state.visibleName
-      });
-    }
+  const portalHostName = (0, _reactNativeReanimated.useSharedValue)(null);
+  const portalHostReady = (0, _reactNativeReanimated.useSharedValue)(false);
+  const attachedDestination = (0, _reactNativeReanimated.useSharedValue)(null);
+  const escapeHostKey = (0, _hostRegistry.useActiveHostKey)(currentScreenKey);
+  (0, _useActivePortalBoundaryHost.useActivePortalBoundaryHost)({
+    boundaryId,
+    currentScreenKey,
+    escapeHostKey,
+    localStylesMaps,
+    portalHostName,
+    portalHostReady,
+    sourcePairKey,
+    slotsMap
   });
   const teleportProps = (0, _reactNativeReanimated.useAnimatedProps)(() => {
     "worklet";
@@ -167,19 +52,34 @@ const useBoundaryPortalAttachment = ({
       teleport,
       ...slotProps
     } = slot?.props ?? {};
-    const shouldTeleport = (0, _teleportControl.shouldAttachBoundaryPortal)({
-      enabled,
-      teleport
+    const shouldTeleport = (0, _teleportControl.isTeleportEnabled)(teleport);
+    const hostName = portalHostName.get();
+    const hasActiveLink = (0, _activePair.hasActiveBoundaryPortalLink)({
+      boundaryId,
+      pairsState: _state.pairs.get(),
+      sourcePairKey
+    });
+    const hasAttachableHost = shouldTeleport && hasActiveLink && portalHostReady.get() && hostName;
+    if (hasAttachableHost) {
+      attachedDestination.set({
+        animationProgress: destinationAnimationProgress,
+        closing: destinationClosing
+      });
+    }
+    const attached = attachedDestination.get();
+    const hasAttachedCloseFinished = attached !== null && (0, _transitionVisualState.hasCloseTransitionFinished)({
+      animationProgress: attached.animationProgress.get(),
+      closing: attached.closing.get()
     });
-    const visibleName = visiblePortalHostName.get();
+    const canAttach = hasAttachableHost && !hasAttachedCloseFinished;
+    const targetHostName = canAttach ? hostName : _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.useBoundaryPortalAttachment = useBoundaryPortalAttachment;