react-native-screen-transitions 3.11.1 → 3.11.3

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

@@ -1,78 +1,60 @@
 "use strict";
 
-import { memo, useCallback } from "react";
+import { memo } from "react";
 import { I18nManager, StyleSheet } from "react-native";
-import Animated, { useAnimatedStyle, useFrameCallback, useSharedValue } from "react-native-reanimated";
+import Animated, { useAnimatedReaction, useAnimatedStyle } from "react-native-reanimated";
 import { NO_STYLES } from "../../../../../../constants";
 import { composeSlotStyleWithLocalTransform } from "../../../../../../providers/screen/styles/helpers/compose-slot-style";
-import { getLink } from "../../../../../../stores/bounds/internals/links";
-import { SystemStore } from "../../../../../../stores/system.store";
 import { NativePortalHost, PORTAL_POINTER_EVENTS } from "../../../teleport";
+import { resolveBoundaryLocalMeasurement } from "../helpers/local-measurement";
 import { resolvePortalOffsetStyle } from "../helpers/offset-style";
-import { getPortalHostBounds } from "../stores/host-bounds.store";
 import { jsx as _jsx } from "react/jsx-runtime";
 const AnimatedPortalBoundaryHost = NativePortalHost ? Animated.createAnimatedComponent(NativePortalHost) : null;
+const getCurrentBoundaryBounds = host => {
+  "worklet";
+
+  return resolveBoundaryLocalMeasurement(host.localMeasurement.get(), host.pairKey);
+};
 export const PortalBoundaryHost = /*#__PURE__*/memo(function PortalBoundaryHost({
   host,
+  hostBounds,
+  hostMeasurementKey,
+  measuredHostKey,
   style
 }) {
-  const geometryReadyFrames = useSharedValue(0);
-  const {
-    unblockLifecycleStart
-  } = SystemStore.getBag(host.screenKey).actions;
-  const handleFrame = useCallback(() => {
+  useAnimatedReaction(() => {
     "worklet";
 
-    if (host.portalHostReady.get()) {
-      return;
-    }
-    const link = getLink(host.pairKey, host.boundaryId);
-    const hasSource = !!link?.source;
-    const hasHostBounds = getPortalHostBounds(host.hostKey) !== null;
-    const hasSlot = host.slotsMap.get()[host.boundaryId] !== undefined;
-    const hasGeometry = hasSource && hasHostBounds && hasSlot;
-    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;
+    return getCurrentBoundaryBounds(host) !== null && hostBounds.get() !== null && !!hostMeasurementKey && measuredHostKey.get() === hostMeasurementKey;
+  }, ready => {
+    "worklet";
+
+    if (ready) {
+      host.portalHostReady.set(true);
     }
-    host.portalHostReady.set(true);
-    unblockLifecycleStart();
-  }, [geometryReadyFrames, host, unblockLifecycleStart]);
-  useFrameCallback(handleFrame, true);
+  });
   const hostStyle = useAnimatedStyle(() => {
     "worklet";
 
-    // Strict per-member lookup - a fallback member's source rect would
-    // misplace this host's teleported content.
-    const link = getLink(host.pairKey, host.boundaryId);
-    if (!link?.source) {
+    const boundaryBounds = getCurrentBoundaryBounds(host);
+    if (!boundaryBounds) {
       return NO_STYLES;
     }
-    const sourceBounds = link.source.bounds;
-    const isCrossScreenPortal = link.source.screenKey !== host.screenKey;
     return resolvePortalOffsetStyle({
-      bounds: sourceBounds,
-      hostKey: host.hostKey,
-      placement: isCrossScreenPortal ? "cross-screen" : "same-screen"
+      bounds: boundaryBounds,
+      hostBounds: hostBounds.get()
     });
   });
   const contentFrameStyle = useAnimatedStyle(() => {
     "worklet";
 
-    const link = getLink(host.pairKey, host.boundaryId);
-    if (!link?.source) {
+    const boundaryBounds = getCurrentBoundaryBounds(host);
+    if (!boundaryBounds) {
       return NO_STYLES;
     }
-    const sourceBounds = link.source.bounds;
     return {
-      height: sourceBounds.height,
-      width: sourceBounds.width
+      height: boundaryBounds.height,
+      width: boundaryBounds.width
     };
   });
   const slotStyle = useAnimatedStyle(() => {

package/lib/module/shared/components/boundary/portal/components/boundary-portal/components/portal-boundary-host.js.map

@@ -1 +1 @@
-{"version":3,"names":["memo","useCallback","I18nManager","StyleSheet","Animated","useAnimatedStyle","useFrameCallback","useSharedValue","NO_STYLES","composeSlotStyleWithLocalTransform","getLink","SystemStore","NativePortalHost","PORTAL_POINTER_EVENTS","resolvePortalOffsetStyle","getPortalHostBounds","jsx","_jsx","AnimatedPortalBoundaryHost","createAnimatedComponent","PortalBoundaryHost","host","style","geometryReadyFrames","unblockLifecycleStart","getBag","screenKey","actions","handleFrame","portalHostReady","get","link","pairKey","boundaryId","hasSource","source","hasHostBounds","hostKey","hasSlot","slotsMap","undefined","hasGeometry","set","hostStyle","sourceBounds","bounds","isCrossScreenPortal","placement","contentFrameStyle","height","width","slotStyle","slot","boundsLocalTransform","View","pointerEvents","collapsable","children","name","portalHostName","styles","content","create","isRTL","end","position","top","left"],"sourceRoot":"../../../../../../../../../src","sources":["shared/components/boundary/portal/components/boundary-portal/components/portal-boundary-host.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["memo","I18nManager","StyleSheet","Animated","useAnimatedReaction","useAnimatedStyle","NO_STYLES","composeSlotStyleWithLocalTransform","NativePortalHost","PORTAL_POINTER_EVENTS","resolveBoundaryLocalMeasurement","resolvePortalOffsetStyle","jsx","_jsx","AnimatedPortalBoundaryHost","createAnimatedComponent","getCurrentBoundaryBounds","host","localMeasurement","get","pairKey","PortalBoundaryHost","hostBounds","hostMeasurementKey","measuredHostKey","style","ready","portalHostReady","set","hostStyle","boundaryBounds","bounds","contentFrameStyle","height","width","slotStyle","slot","slotsMap","boundaryId","undefined","boundsLocalTransform","View","pointerEvents","collapsable","children","name","portalHostName","styles","content","create","isRTL","end","position","top","left"],"sourceRoot":"../../../../../../../../../src","sources":["shared/components/boundary/portal/components/boundary-portal/components/portal-boundary-host.tsx"],"mappings":"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","ignoreList":[]}

package/lib/module/shared/components/boundary/portal/components/boundary-portal/helpers/local-measurement.js

@@ -0,0 +1,8 @@
+"use strict";
+
+export const resolveBoundaryLocalMeasurement = (measurement, pairKey) => {
+  "worklet";
+
+  return measurement?.pairKey === pairKey ? measurement.bounds : null;
+};
+//# sourceMappingURL=local-measurement.js.map

package/lib/module/shared/components/boundary/portal/components/boundary-portal/helpers/local-measurement.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["resolveBoundaryLocalMeasurement","measurement","pairKey","bounds"],"sourceRoot":"../../../../../../../../../src","sources":["shared/components/boundary/portal/components/boundary-portal/helpers/local-measurement.ts"],"mappings":";;AAGA,OAAO,MAAMA,+BAA+B,GAAGA,CAC9CC,WAA4C,EAC5CC,OAAsB,KAClB;EACJ,SAAS;;EACT,OAAOD,WAAW,EAAEC,OAAO,KAAKA,OAAO,GAAGD,WAAW,CAACE,MAAM,GAAG,IAAI;AACpE,CAAC","ignoreList":[]}

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

@@ -1,45 +1,21 @@
 "use strict";
 
-import { getClampedScrollAxisDelta } from "../../../../../../stores/scroll.store";
-import { getPortalHostBounds } from "../stores/host-bounds.store";
-
-/**
- * The two portal coordinate cases we support:
- *
- * - same-screen: source and host live on the same screen; re-base the stored
- *   host frame onto the source measurement's scroll snapshot.
- * - cross-screen: source and host live on different screens; the host is the
- *   replacement coordinate space, so destination scroll is inherited naturally
- *   from host placement instead of manually propagated.
- */
-
 export const resolvePortalOffsetStyle = ({
   bounds,
-  hostKey,
-  placement
+  hostBounds
 }) => {
   "worklet";
 
-  const hostBounds = getPortalHostBounds(hostKey);
-  const boundsScrollSnapshot = bounds.scroll ?? null;
-  const hostBoundsScrollSnapshot = hostBounds?.scroll ?? null;
-
-  // same-screen re-bases the static host frame onto the source scroll snapshot.
-  // Cross-screen hosts are the chosen replacement coordinate space, so their
-  // destination scroll is represented by where the host itself is mounted.
-  const alignHostToBoundsScroll = placement === "same-screen";
-  const hostSnapshotDeltaX = alignHostToBoundsScroll ? getClampedScrollAxisDelta(boundsScrollSnapshot, hostBoundsScrollSnapshot, "horizontal") : 0;
-  const hostSnapshotDeltaY = alignHostToBoundsScroll ? getClampedScrollAxisDelta(boundsScrollSnapshot, hostBoundsScrollSnapshot, "vertical") : 0;
-
-  // Without registered host bounds the host frame is the origin, so the source
-  // page position becomes the offset directly.
-  const adjustedHostPageX = hostBounds ? hostBounds.pageX - hostSnapshotDeltaX : 0;
-  const adjustedHostPageY = hostBounds ? hostBounds.pageY - hostSnapshotDeltaY : 0;
+  // Both values are measured in page coordinates. Subtracting the host origin
+  // gives the boundary's local position inside that host, independent of which
+  // scroll container owns either view.
+  const hostPageX = hostBounds?.pageX ?? 0;
+  const hostPageY = hostBounds?.pageY ?? 0;
   return {
     transform: [{
-      translateY: bounds.pageY - adjustedHostPageY
+      translateY: bounds.pageY - hostPageY
     }, {
-      translateX: bounds.pageX - adjustedHostPageX
+      translateX: bounds.pageX - hostPageX
     }]
   };
 };

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

@@ -1 +1 @@
-{"version":3,"names":["getClampedScrollAxisDelta","getPortalHostBounds","resolvePortalOffsetStyle","bounds","hostKey","placement","hostBounds","boundsScrollSnapshot","scroll","hostBoundsScrollSnapshot","alignHostToBoundsScroll","hostSnapshotDeltaX","hostSnapshotDeltaY","adjustedHostPageX","pageX","adjustedHostPageY","pageY","transform","translateY","translateX"],"sourceRoot":"../../../../../../../../../src","sources":["shared/components/boundary/portal/components/boundary-portal/helpers/offset-style.ts"],"mappings":";;AACA,SAASA,yBAAyB,QAAQ,uCAAuC;AAEjF,SAASC,mBAAmB,QAAQ,6BAA6B;;AAEjE;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAUA,OAAO,MAAMC,wBAAwB,GAAGA,CAAC;EACxCC,MAAM;EACNC,OAAO;EACPC;AAC+B,CAAC,KAAiB;EACjD,SAAS;;EACT,MAAMC,UAAU,GAAGL,mBAAmB,CAACG,OAAO,CAAC;EAC/C,MAAMG,oBAAoB,GAAGJ,MAAM,CAACK,MAAM,IAAI,IAAI;EAClD,MAAMC,wBAAwB,GAAGH,UAAU,EAAEE,MAAM,IAAI,IAAI;;EAE3D;EACA;EACA;EACA,MAAME,uBAAuB,GAAGL,SAAS,KAAK,aAAa;EAE3D,MAAMM,kBAAkB,GAAGD,uBAAuB,GAC/CV,yBAAyB,CACzBO,oBAAoB,EACpBE,wBAAwB,EACxB,YACD,CAAC,GACA,CAAC;EACJ,MAAMG,kBAAkB,GAAGF,uBAAuB,GAC/CV,yBAAyB,CACzBO,oBAAoB,EACpBE,wBAAwB,EACxB,UACD,CAAC,GACA,CAAC;;EAEJ;EACA;EACA,MAAMI,iBAAiB,GAAGP,UAAU,GACjCA,UAAU,CAACQ,KAAK,GAAGH,kBAAkB,GACrC,CAAC;EACJ,MAAMI,iBAAiB,GAAGT,UAAU,GACjCA,UAAU,CAACU,KAAK,GAAGJ,kBAAkB,GACrC,CAAC;EAEJ,OAAO;IACNK,SAAS,EAAE,CACV;MAAEC,UAAU,EAAEf,MAAM,CAACa,KAAK,GAAGD;IAAkB,CAAC,EAChD;MAAEI,UAAU,EAAEhB,MAAM,CAACW,KAAK,GAAGD;IAAkB,CAAC;EAElD,CAAC;AACF,CAAC","ignoreList":[]}
+{"version":3,"names":["resolvePortalOffsetStyle","bounds","hostBounds","hostPageX","pageX","hostPageY","pageY","transform","translateY","translateX"],"sourceRoot":"../../../../../../../../../src","sources":["shared/components/boundary/portal/components/boundary-portal/helpers/offset-style.ts"],"mappings":";;AAOA,OAAO,MAAMA,wBAAwB,GAAGA,CAAC;EACxCC,MAAM;EACNC;AAC+B,CAAC,KAAiB;EACjD,SAAS;;EACT;EACA;EACA;EACA,MAAMC,SAAS,GAAGD,UAAU,EAAEE,KAAK,IAAI,CAAC;EACxC,MAAMC,SAAS,GAAGH,UAAU,EAAEI,KAAK,IAAI,CAAC;EAExC,OAAO;IACNC,SAAS,EAAE,CACV;MAAEC,UAAU,EAAEP,MAAM,CAACK,KAAK,GAAGD;IAAU,CAAC,EACxC;MAAEI,UAAU,EAAER,MAAM,CAACG,KAAK,GAAGD;IAAU,CAAC;EAE1C,CAAC;AACF,CAAC","ignoreList":[]}

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

@@ -1,6 +1,6 @@
 "use strict";
 
-import { useCallback, useLayoutEffect, useRef, useState } from "react";
+import { useCallback, useLayoutEffect, useState } from "react";
 import { runOnJS, useAnimatedReaction } from "react-native-reanimated";
 import { getPairKeyForSource } from "../../../../../../stores/bounds/internals/links";
 import { createBoundaryPortalHostName } from "../../../utils/naming";
@@ -9,51 +9,46 @@ export const useActivePortalBoundaryHost = ({
   boundaryId,
   currentScreenKey,
   escapeHostKey,
+  localMeasurement,
   portalHostName,
   portalHostReady,
   slotsMap
 }) => {
-  const [activePortal, setActivePortal] = useState(null);
-  const activePairKeyRef = useRef(null);
-  const updateActivePortal = useCallback(pairKey => {
-    if (activePairKeyRef.current === pairKey) {
-      return;
-    }
-    activePairKeyRef.current = pairKey;
-    setActivePortal(pairKey ? {
-      pairKey
-    } : null);
+  const [activePairKey, setActivePairKey] = useState(null);
+  const updateActivePairKey = useCallback(pairKey => {
+    setActivePairKey(pairKey);
   }, []);
   useAnimatedReaction(() => {
     "worklet";
 
-    const isBoundaryAnimating = slotsMap.get()[boundaryId] !== undefined;
-    if (!isBoundaryAnimating) {
+    const pairKey = getPairKeyForSource(boundaryId, currentScreenKey);
+    const measurement = localMeasurement.get();
+    if (!pairKey || measurement?.pairKey !== pairKey) {
       return null;
     }
-    return getPairKeyForSource(boundaryId, currentScreenKey);
+    return pairKey;
   }, (pairKey, previousPairKey) => {
     "worklet";
 
     if (pairKey === previousPairKey) {
       return;
     }
-    runOnJS(updateActivePortal)(pairKey);
+    runOnJS(updateActivePairKey)(pairKey);
   });
   useLayoutEffect(() => {
-    if (!activePortal || !escapeHostKey) {
+    if (!activePairKey || !escapeHostKey) {
       portalHostName.set(null);
       portalHostReady.set(false);
       return;
     }
-    const nextPortalHostName = createBoundaryPortalHostName(escapeHostKey, boundaryId, activePortal.pairKey);
+    const nextPortalHostName = createBoundaryPortalHostName(escapeHostKey, boundaryId, activePairKey);
     mountPortalBoundaryHost({
       boundaryId,
       hostKey: escapeHostKey,
-      pairKey: activePortal.pairKey,
+      localMeasurement,
+      pairKey: activePairKey,
       portalHostName: nextPortalHostName,
       portalHostReady,
-      screenKey: currentScreenKey,
       slotsMap
     });
     portalHostName.set(nextPortalHostName);
@@ -62,6 +57,6 @@ export const useActivePortalBoundaryHost = ({
       portalHostReady.set(false);
       unmountPortalBoundaryHostByName(nextPortalHostName);
     };
-  }, [activePortal, boundaryId, currentScreenKey, escapeHostKey, portalHostName, portalHostReady, slotsMap]);
+  }, [activePairKey, boundaryId, escapeHostKey, localMeasurement, portalHostName, portalHostReady, slotsMap]);
 };
 //# sourceMappingURL=use-active-portal-boundary-host.js.map

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

@@ -1 +1 @@
-{"version":3,"names":["useCallback","useLayoutEffect","useRef","useState","runOnJS","useAnimatedReaction","getPairKeyForSource","createBoundaryPortalHostName","mountPortalBoundaryHost","unmountPortalBoundaryHostByName","useActivePortalBoundaryHost","boundaryId","currentScreenKey","escapeHostKey","portalHostName","portalHostReady","slotsMap","activePortal","setActivePortal","activePairKeyRef","updateActivePortal","pairKey","current","isBoundaryAnimating","get","undefined","previousPairKey","set","nextPortalHostName","hostKey","screenKey"],"sourceRoot":"../../../../../../../../../src","sources":["shared/components/boundary/portal/components/boundary-portal/hooks/use-active-portal-boundary-host.ts"],"mappings":";;AAAA,SAASA,WAAW,EAAEC,eAAe,EAAEC,MAAM,EAAEC,QAAQ,QAAQ,OAAO;AACtE,SACCC,OAAO,EAEPC,mBAAmB,QACb,yBAAyB;AAChC,SAASC,mBAAmB,QAAQ,iDAAiD;AAGrF,SAASC,4BAA4B,QAAQ,uBAAuB;AACpE,SACCC,uBAAuB,EACvBC,+BAA+B,QACzB,sCAAsC;AAe7C,OAAO,MAAMC,2BAA2B,GAAGA,CAAC;EAC3CC,UAAU;EACVC,gBAAgB;EAChBC,aAAa;EACbC,cAAc;EACdC,eAAe;EACfC;AACkC,CAAC,KAAK;EACxC,MAAM,CAACC,YAAY,EAAEC,eAAe,CAAC,GAAGf,QAAQ,CAAsB,IAAI,CAAC;EAC3E,MAAMgB,gBAAgB,GAAGjB,MAAM,CAAuB,IAAI,CAAC;EAE3D,MAAMkB,kBAAkB,GAAGpB,WAAW,CAAEqB,OAA6B,IAAK;IACzE,IAAIF,gBAAgB,CAACG,OAAO,KAAKD,OAAO,EAAE;MACzC;IACD;IAEAF,gBAAgB,CAACG,OAAO,GAAGD,OAAO;IAClCH,eAAe,CAACG,OAAO,GAAG;MAAEA;IAAQ,CAAC,GAAG,IAAI,CAAC;EAC9C,CAAC,EAAE,EAAE,CAAC;EAENhB,mBAAmB,CAClB,MAAM;IACL,SAAS;;IACT,MAAMkB,mBAAmB,GAAGP,QAAQ,CAACQ,GAAG,CAAC,CAAC,CAACb,UAAU,CAAC,KAAKc,SAAS;IACpE,IAAI,CAACF,mBAAmB,EAAE;MACzB,OAAO,IAAI;IACZ;IAEA,OAAOjB,mBAAmB,CAACK,UAAU,EAAEC,gBAAgB,CAAC;EACzD,CAAC,EACD,CAACS,OAAO,EAAEK,eAAe,KAAK;IAC7B,SAAS;;IACT,IAAIL,OAAO,KAAKK,eAAe,EAAE;MAChC;IACD;IAEAtB,OAAO,CAACgB,kBAAkB,CAAC,CAACC,OAAO,CAAC;EACrC,CACD,CAAC;EAEDpB,eAAe,CAAC,MAAM;IACrB,IAAI,CAACgB,YAAY,IAAI,CAACJ,aAAa,EAAE;MACpCC,cAAc,CAACa,GAAG,CAAC,IAAI,CAAC;MACxBZ,eAAe,CAACY,GAAG,CAAC,KAAK,CAAC;MAC1B;IACD;IAEA,MAAMC,kBAAkB,GAAGrB,4BAA4B,CACtDM,aAAa,EACbF,UAAU,EACVM,YAAY,CAACI,OACd,CAAC;IAEDb,uBAAuB,CAAC;MACvBG,UAAU;MACVkB,OAAO,EAAEhB,aAAa;MACtBQ,OAAO,EAAEJ,YAAY,CAACI,OAAO;MAC7BP,cAAc,EAAEc,kBAAkB;MAClCb,eAAe;MACfe,SAAS,EAAElB,gBAAgB;MAC3BI;IACD,CAAC,CAAC;IACFF,cAAc,CAACa,GAAG,CAACC,kBAAkB,CAAC;IAEtC,OAAO,MAAM;MACZd,cAAc,CAACa,GAAG,CAAC,IAAI,CAAC;MACxBZ,eAAe,CAACY,GAAG,CAAC,KAAK,CAAC;MAC1BlB,+BAA+B,CAACmB,kBAAkB,CAAC;IACpD,CAAC;EACF,CAAC,EAAE,CACFX,YAAY,EACZN,UAAU,EACVC,gBAAgB,EAChBC,aAAa,EACbC,cAAc,EACdC,eAAe,EACfC,QAAQ,CACR,CAAC;AACH,CAAC","ignoreList":[]}
+{"version":3,"names":["useCallback","useLayoutEffect","useState","runOnJS","useAnimatedReaction","getPairKeyForSource","createBoundaryPortalHostName","mountPortalBoundaryHost","unmountPortalBoundaryHostByName","useActivePortalBoundaryHost","boundaryId","currentScreenKey","escapeHostKey","localMeasurement","portalHostName","portalHostReady","slotsMap","activePairKey","setActivePairKey","updateActivePairKey","pairKey","measurement","get","previousPairKey","set","nextPortalHostName","hostKey"],"sourceRoot":"../../../../../../../../../src","sources":["shared/components/boundary/portal/components/boundary-portal/hooks/use-active-portal-boundary-host.ts"],"mappings":";;AAAA,SAASA,WAAW,EAAEC,eAAe,EAAEC,QAAQ,QAAQ,OAAO;AAC9D,SACCC,OAAO,EAEPC,mBAAmB,QACb,yBAAyB;AAChC,SAASC,mBAAmB,QAAQ,iDAAiD;AAIrF,SAASC,4BAA4B,QAAQ,uBAAuB;AACpE,SACCC,uBAAuB,EACvBC,+BAA+B,QACzB,sCAAsC;AAY7C,OAAO,MAAMC,2BAA2B,GAAGA,CAAC;EAC3CC,UAAU;EACVC,gBAAgB;EAChBC,aAAa;EACbC,gBAAgB;EAChBC,cAAc;EACdC,eAAe;EACfC;AACkC,CAAC,KAAK;EACxC,MAAM,CAACC,aAAa,EAAEC,gBAAgB,CAAC,GAAGhB,QAAQ,CACjD,IACD,CAAC;EAED,MAAMiB,mBAAmB,GAAGnB,WAAW,CAAEoB,OAA6B,IAAK;IAC1EF,gBAAgB,CAACE,OAAO,CAAC;EAC1B,CAAC,EAAE,EAAE,CAAC;EAENhB,mBAAmB,CAClB,MAAM;IACL,SAAS;;IACT,MAAMgB,OAAO,GAAGf,mBAAmB,CAACK,UAAU,EAAEC,gBAAgB,CAAC;IACjE,MAAMU,WAAW,GAAGR,gBAAgB,CAACS,GAAG,CAAC,CAAC;IAC1C,IAAI,CAACF,OAAO,IAAIC,WAAW,EAAED,OAAO,KAAKA,OAAO,EAAE;MACjD,OAAO,IAAI;IACZ;IAEA,OAAOA,OAAO;EACf,CAAC,EACD,CAACA,OAAO,EAAEG,eAAe,KAAK;IAC7B,SAAS;;IACT,IAAIH,OAAO,KAAKG,eAAe,EAAE;MAChC;IACD;IAEApB,OAAO,CAACgB,mBAAmB,CAAC,CAACC,OAAO,CAAC;EACtC,CACD,CAAC;EAEDnB,eAAe,CAAC,MAAM;IACrB,IAAI,CAACgB,aAAa,IAAI,CAACL,aAAa,EAAE;MACrCE,cAAc,CAACU,GAAG,CAAC,IAAI,CAAC;MACxBT,eAAe,CAACS,GAAG,CAAC,KAAK,CAAC;MAC1B;IACD;IAEA,MAAMC,kBAAkB,GAAGnB,4BAA4B,CACtDM,aAAa,EACbF,UAAU,EACVO,aACD,CAAC;IAEDV,uBAAuB,CAAC;MACvBG,UAAU;MACVgB,OAAO,EAAEd,aAAa;MACtBC,gBAAgB;MAChBO,OAAO,EAAEH,aAAa;MACtBH,cAAc,EAAEW,kBAAkB;MAClCV,eAAe;MACfC;IACD,CAAC,CAAC;IACFF,cAAc,CAACU,GAAG,CAACC,kBAAkB,CAAC;IAEtC,OAAO,MAAM;MACZX,cAAc,CAACU,GAAG,CAAC,IAAI,CAAC;MACxBT,eAAe,CAACS,GAAG,CAAC,KAAK,CAAC;MAC1BhB,+BAA+B,CAACiB,kBAAkB,CAAC;IACpD,CAAC;EACF,CAAC,EAAE,CACFR,aAAa,EACbP,UAAU,EACVE,aAAa,EACbC,gBAAgB,EAChBC,cAAc,EACdC,eAAe,EACfC,QAAQ,CACR,CAAC;AACH,CAAC","ignoreList":[]}

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

@@ -3,6 +3,7 @@
 import { useAnimatedProps, useSharedValue } from "react-native-reanimated";
 import { useDescriptorsStore } from "../../../../../../providers/screen/descriptors";
 import { useScreenSlots } from "../../../../../../providers/screen/styles";
+import { useBoundaryRootStore } from "../../../../providers/boundary-root.provider";
 import { PORTAL_HOST_NAME_RESET_VALUE } from "../../../utils/naming";
 import { isTeleportEnabled } from "../../../utils/teleport-control";
 import { useActiveHostKey } from "../stores/host-registry.store";
@@ -10,6 +11,12 @@ import { useActivePortalBoundaryHost } from "./use-active-portal-boundary-host";
 export const useBoundaryPortalAttachment = ({
   boundaryId
 }) => {
+  const localMeasurement = useBoundaryRootStore(root => {
+    if (!root) {
+      throw new Error("Boundary portal attachment requires a boundary root.");
+    }
+    return root.localMeasurement;
+  });
   const currentScreenKey = useDescriptorsStore(s => s.derivations.currentScreenKey);
   const {
     slotsMap
@@ -21,6 +28,7 @@ export const useBoundaryPortalAttachment = ({
     boundaryId,
     currentScreenKey,
     escapeHostKey,
+    localMeasurement,
     portalHostName,
     portalHostReady,
     slotsMap

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

@@ -1 +1 @@
-{"version":3,"names":["useAnimatedProps","useSharedValue","useDescriptorsStore","useScreenSlots","PORTAL_HOST_NAME_RESET_VALUE","isTeleportEnabled","useActiveHostKey","useActivePortalBoundaryHost","useBoundaryPortalAttachment","boundaryId","currentScreenKey","s","derivations","slotsMap","portalHostName","portalHostReady","escapeHostKey","teleportProps","slot","get","pointerEvents","_pointerEvents","teleport","slotProps","props","shouldAttach","undefined","hostName"],"sourceRoot":"../../../../../../../../../src","sources":["shared/components/boundary/portal/components/boundary-portal/hooks/use-boundary-portal-attachment.ts"],"mappings":";;AAAA,SAASA,gBAAgB,EAAEC,cAAc,QAAQ,yBAAyB;AAC1E,SAASC,mBAAmB,QAAQ,gDAAgD;AACpF,SAASC,cAAc,QAAQ,2CAA2C;AAC1E,SAASC,4BAA4B,QAAQ,uBAAuB;AACpE,SAASC,iBAAiB,QAAQ,iCAAiC;AACnE,SAASC,gBAAgB,QAAQ,+BAA+B;AAChE,SAASC,2BAA2B,QAAQ,mCAAmC;AAM/E,OAAO,MAAMC,2BAA2B,GAAGA,CAAC;EAC3CC;AACkC,CAAC,KAAK;EACxC,MAAMC,gBAAgB,GAAGR,mBAAmB,CAC1CS,CAAC,IAAKA,CAAC,CAACC,WAAW,CAACF,gBACtB,CAAC;EACD,MAAM;IAAEG;EAAS,CAAC,GAAGV,cAAc,CAAC,CAAC;EACrC,MAAMW,cAAc,GAAGb,cAAc,CAAgB,IAAI,CAAC;EAC1D,MAAMc,eAAe,GAAGd,cAAc,CAAC,KAAK,CAAC;EAC7C,MAAMe,aAAa,GAAGV,gBAAgB,CAACI,gBAAgB,CAAC;EAExDH,2BAA2B,CAAC;IAC3BE,UAAU;IACVC,gBAAgB;IAChBM,aAAa;IACbF,cAAc;IACdC,eAAe;IACfF;EACD,CAAC,CAAC;EAEF,MAAMI,aAAa,GAAGjB,gBAAgB,CAAC,MAAM;IAC5C,SAAS;;IAET,MAAMkB,IAAI,GAAGL,QAAQ,CAACM,GAAG,CAAC,CAAC,CAACV,UAAU,CAAC;IACvC,MAAM;MACLW,aAAa,EAAEC,cAAc;MAC7BC,QAAQ;MACR,GAAGC;IACJ,CAAC,GAAGL,IAAI,EAAEM,KAAK,IAAI,CAAC,CAAC;IACrB,MAAMC,YAAY,GACjBP,IAAI,KAAKQ,SAAS,IAClBrB,iBAAiB,CAACiB,QAAQ,CAAC,IAC3BP,eAAe,CAACI,GAAG,CAAC,CAAC;IACtB,MAAMQ,QAAQ,GAAGF,YAAY,GAC1BX,cAAc,CAACK,GAAG,CAAC,CAAC,GACpBf,4BAA4B;IAE/B,OAAO;MACN,GAAGmB,SAAS;MACZI;IACD,CAAC;EACF,CAAC,CAAC;EAEF,OAAO;IAAEV;EAAc,CAAC;AACzB,CAAC","ignoreList":[]}
+{"version":3,"names":["useAnimatedProps","useSharedValue","useDescriptorsStore","useScreenSlots","useBoundaryRootStore","PORTAL_HOST_NAME_RESET_VALUE","isTeleportEnabled","useActiveHostKey","useActivePortalBoundaryHost","useBoundaryPortalAttachment","boundaryId","localMeasurement","root","Error","currentScreenKey","s","derivations","slotsMap","portalHostName","portalHostReady","escapeHostKey","teleportProps","slot","get","pointerEvents","_pointerEvents","teleport","slotProps","props","shouldAttach","undefined","hostName"],"sourceRoot":"../../../../../../../../../src","sources":["shared/components/boundary/portal/components/boundary-portal/hooks/use-boundary-portal-attachment.ts"],"mappings":";;AAAA,SAASA,gBAAgB,EAAEC,cAAc,QAAQ,yBAAyB;AAC1E,SAASC,mBAAmB,QAAQ,gDAAgD;AACpF,SAASC,cAAc,QAAQ,2CAA2C;AAC1E,SAASC,oBAAoB,QAAQ,8CAA8C;AACnF,SAASC,4BAA4B,QAAQ,uBAAuB;AACpE,SAASC,iBAAiB,QAAQ,iCAAiC;AACnE,SAASC,gBAAgB,QAAQ,+BAA+B;AAChE,SAASC,2BAA2B,QAAQ,mCAAmC;AAM/E,OAAO,MAAMC,2BAA2B,GAAGA,CAAC;EAC3CC;AACkC,CAAC,KAAK;EACxC,MAAMC,gBAAgB,GAAGP,oBAAoB,CAAEQ,IAAI,IAAK;IACvD,IAAI,CAACA,IAAI,EAAE;MACV,MAAM,IAAIC,KAAK,CAAC,sDAAsD,CAAC;IACxE;IAEA,OAAOD,IAAI,CAACD,gBAAgB;EAC7B,CAAC,CAAC;EACF,MAAMG,gBAAgB,GAAGZ,mBAAmB,CAC1Ca,CAAC,IAAKA,CAAC,CAACC,WAAW,CAACF,gBACtB,CAAC;EACD,MAAM;IAAEG;EAAS,CAAC,GAAGd,cAAc,CAAC,CAAC;EACrC,MAAMe,cAAc,GAAGjB,cAAc,CAAgB,IAAI,CAAC;EAC1D,MAAMkB,eAAe,GAAGlB,cAAc,CAAC,KAAK,CAAC;EAC7C,MAAMmB,aAAa,GAAGb,gBAAgB,CAACO,gBAAgB,CAAC;EAExDN,2BAA2B,CAAC;IAC3BE,UAAU;IACVI,gBAAgB;IAChBM,aAAa;IACbT,gBAAgB;IAChBO,cAAc;IACdC,eAAe;IACfF;EACD,CAAC,CAAC;EAEF,MAAMI,aAAa,GAAGrB,gBAAgB,CAAC,MAAM;IAC5C,SAAS;;IAET,MAAMsB,IAAI,GAAGL,QAAQ,CAACM,GAAG,CAAC,CAAC,CAACb,UAAU,CAAC;IACvC,MAAM;MACLc,aAAa,EAAEC,cAAc;MAC7BC,QAAQ;MACR,GAAGC;IACJ,CAAC,GAAGL,IAAI,EAAEM,KAAK,IAAI,CAAC,CAAC;IAErB,MAAMC,YAAY,GACjBP,IAAI,KAAKQ,SAAS,IAClBxB,iBAAiB,CAACoB,QAAQ,CAAC,IAC3BP,eAAe,CAACI,GAAG,CAAC,CAAC;IAEtB,MAAMQ,QAAQ,GAAGF,YAAY,GAC1BX,cAAc,CAACK,GAAG,CAAC,CAAC,GACpBlB,4BAA4B;IAE/B,OAAO;MACN,GAAGsB,SAAS;MACZI;IACD,CAAC;EACF,CAAC,CAAC;EAEF,OAAO;IAAEV;EAAc,CAAC;AACzB,CAAC","ignoreList":[]}

package/lib/module/shared/components/boundary/portal/components/boundary-portal/hooks/use-host-measurement.js

@@ -1,32 +1,21 @@
 "use strict";
 
-import { useLayoutEffect } from "react";
-import { cancelAnimation, measure, runOnUI, useAnimatedReaction, useAnimatedRef, useSharedValue, withDelay, withTiming } from "react-native-reanimated";
-import { ScrollStore } from "../../../../../../stores/scroll.store";
-import { getVisibilityBlockOffset } from "../../../../../../utils/visibility-block-offset";
-import { adjustedMeasuredBoundsForOverscrollDeltas, correctMeasuredBoundsForVisibilityGate } from "../../../../utils/measured-bounds";
-import { clearPortalHostBounds, setPortalHostBounds } from "../stores/host-bounds.store";
+import { cancelAnimation, measure, useAnimatedReaction, useAnimatedRef, useSharedValue, withDelay, withTiming } from "react-native-reanimated";
 const HOST_MEASUREMENT_RETRY_DELAY_MS = 16;
 export const useHostMeasurement = ({
-  capturesScroll,
-  enabled,
-  hostKey,
-  screenKey,
-  visibilityBlocked,
-  viewportHeight,
-  viewportWidth
+  measurementKey
 }) => {
   const hostRef = useAnimatedRef();
-  const scrollMetadata = ScrollStore.getValue(screenKey, "metadata");
-  const hasMeasuredHost = useSharedValue(false);
+  const hostBounds = useSharedValue(null);
+  const measuredKey = useSharedValue(null);
   const retryToken = useSharedValue(0);
   useAnimatedReaction(() => {
     "worklet";
 
-    if (!enabled) {
+    if (!measurementKey) {
       return null;
     }
-    return [hasMeasuredHost.get(), retryToken.get()];
+    return [measurementKey, measuredKey.get(), retryToken.get()];
   }, state => {
     "worklet";
 
@@ -34,8 +23,8 @@ export const useHostMeasurement = ({
       cancelAnimation(retryToken);
       return;
     }
-    const [hasAlreadyMeasured] = state;
-    if (!enabled || hasAlreadyMeasured) {
+    const [requestedKey, completedKey] = state;
+    if (requestedKey === completedKey) {
       return;
     }
     const measured = measure(hostRef);
@@ -47,44 +36,27 @@ export const useHostMeasurement = ({
       return;
     }
     cancelAnimation(retryToken);
-
-    // A measurement taken mid rubber-band would bake the transient
-    // overscroll displacement into the host frame. Store the at-rest
-    // position instead; clamped scroll deltas share that basis.
-    const currentScroll = scrollMetadata.get();
-    const overscrollNormalized = capturesScroll ? adjustedMeasuredBoundsForOverscrollDeltas(measured, currentScroll) : measured;
-    const correctedMeasured = correctMeasuredBoundsForVisibilityGate({
-      measured: overscrollNormalized,
-      visibilityBlocked: visibilityBlocked.get(),
-      visibilityBlockOffset: getVisibilityBlockOffset(viewportHeight),
-      viewportWidth,
-      viewportHeight
-    });
-    if (correctedMeasured.width <= 0 || correctedMeasured.height <= 0) {
+    if (measured.width <= 0 || measured.height <= 0) {
       cancelAnimation(retryToken);
       retryToken.set(withDelay(HOST_MEASUREMENT_RETRY_DELAY_MS, withTiming(retryToken.get() + 1, {
         duration: 0
       })));
       return;
     }
-    setPortalHostBounds(hostKey, {
-      x: correctedMeasured.x,
-      y: correctedMeasured.y,
-      width: correctedMeasured.width,
-      height: correctedMeasured.height,
-      pageX: correctedMeasured.pageX,
-      pageY: correctedMeasured.pageY,
-      scroll: capturesScroll ? currentScroll : null
+    hostBounds.set({
+      x: measured.x,
+      y: measured.y,
+      width: measured.width,
+      height: measured.height,
+      pageX: measured.pageX,
+      pageY: measured.pageY
     });
-    hasMeasuredHost.set(true);
+    measuredKey.set(requestedKey);
   });
-  useLayoutEffect(() => {
-    return () => {
-      runOnUI(clearPortalHostBounds)(hostKey);
-    };
-  }, [hostKey]);
   return {
-    hostRef
+    hostBounds,
+    hostRef,
+    measuredKey
   };
 };
 //# sourceMappingURL=use-host-measurement.js.map

package/lib/module/shared/components/boundary/portal/components/boundary-portal/hooks/use-host-measurement.js.map

@@ -1 +1 @@
-{"version":3,"names":["useLayoutEffect","cancelAnimation","measure","runOnUI","useAnimatedReaction","useAnimatedRef","useSharedValue","withDelay","withTiming","ScrollStore","getVisibilityBlockOffset","adjustedMeasuredBoundsForOverscrollDeltas","correctMeasuredBoundsForVisibilityGate","clearPortalHostBounds","setPortalHostBounds","HOST_MEASUREMENT_RETRY_DELAY_MS","useHostMeasurement","capturesScroll","enabled","hostKey","screenKey","visibilityBlocked","viewportHeight","viewportWidth","hostRef","scrollMetadata","getValue","hasMeasuredHost","retryToken","get","state","hasAlreadyMeasured","measured","set","duration","currentScroll","overscrollNormalized","correctedMeasured","visibilityBlockOffset","width","height","x","y","pageX","pageY","scroll"],"sourceRoot":"../../../../../../../../../src","sources":["shared/components/boundary/portal/components/boundary-portal/hooks/use-host-measurement.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["cancelAnimation","measure","useAnimatedReaction","useAnimatedRef","useSharedValue","withDelay","withTiming","HOST_MEASUREMENT_RETRY_DELAY_MS","useHostMeasurement","measurementKey","hostRef","hostBounds","measuredKey","retryToken","get","state","requestedKey","completedKey","measured","set","duration","width","height","x","y","pageX","pageY"],"sourceRoot":"../../../../../../../../../src","sources":["shared/components/boundary/portal/components/boundary-portal/hooks/use-host-measurement.ts"],"mappings":";;AACA,SACCA,eAAe,EAEfC,OAAO,EACPC,mBAAmB,EACnBC,cAAc,EACdC,cAAc,EACdC,SAAS,EACTC,UAAU,QACJ,yBAAyB;AAEhC,MAAMC,+BAA+B,GAAG,EAAE;AAM1C,OAAO,MAAMC,kBAAkB,GAAGA,CAAC;EAClCC;AACyB,CAAC,KAAK;EAC/B,MAAMC,OAAO,GAAGP,cAAc,CAAO,CAAC;EACtC,MAAMQ,UAAU,GAAGP,cAAc,CAA4B,IAAI,CAAC;EAClE,MAAMQ,WAAW,GAAGR,cAAc,CAAgB,IAAI,CAAC;EACvD,MAAMS,UAAU,GAAGT,cAAc,CAAC,CAAC,CAAC;EAEpCF,mBAAmB,CAClB,MAAM;IACL,SAAS;;IACT,IAAI,CAACO,cAAc,EAAE;MACpB,OAAO,IAAI;IACZ;IAEA,OAAO,CAACA,cAAc,EAAEG,WAAW,CAACE,GAAG,CAAC,CAAC,EAAED,UAAU,CAACC,GAAG,CAAC,CAAC,CAAC;EAC7D,CAAC,EACAC,KAAK,IAAK;IACV,SAAS;;IACT,IAAI,CAACA,KAAK,EAAE;MACXf,eAAe,CAACa,UAAU,CAAC;MAC3B;IACD;IAEA,MAAM,CAACG,YAAY,EAAEC,YAAY,CAAC,GAAGF,KAAK;IAC1C,IAAIC,YAAY,KAAKC,YAAY,EAAE;MAClC;IACD;IAEA,MAAMC,QAAQ,GAAGjB,OAAO,CAACS,OAAO,CAAC;IAEjC,IAAI,CAACQ,QAAQ,EAAE;MACdlB,eAAe,CAACa,UAAU,CAAC;MAC3BA,UAAU,CAACM,GAAG,CACbd,SAAS,CACRE,+BAA+B,EAC/BD,UAAU,CAACO,UAAU,CAACC,GAAG,CAAC,CAAC,GAAG,CAAC,EAAE;QAAEM,QAAQ,EAAE;MAAE,CAAC,CACjD,CACD,CAAC;MACD;IACD;IAEApB,eAAe,CAACa,UAAU,CAAC;IAE3B,IAAIK,QAAQ,CAACG,KAAK,IAAI,CAAC,IAAIH,QAAQ,CAACI,MAAM,IAAI,CAAC,EAAE;MAChDtB,eAAe,CAACa,UAAU,CAAC;MAC3BA,UAAU,CAACM,GAAG,CACbd,SAAS,CACRE,+BAA+B,EAC/BD,UAAU,CAACO,UAAU,CAACC,GAAG,CAAC,CAAC,GAAG,CAAC,EAAE;QAAEM,QAAQ,EAAE;MAAE,CAAC,CACjD,CACD,CAAC;MACD;IACD;IAEAT,UAAU,CAACQ,GAAG,CAAC;MACdI,CAAC,EAAEL,QAAQ,CAACK,CAAC;MACbC,CAAC,EAAEN,QAAQ,CAACM,CAAC;MACbH,KAAK,EAAEH,QAAQ,CAACG,KAAK;MACrBC,MAAM,EAAEJ,QAAQ,CAACI,MAAM;MACvBG,KAAK,EAAEP,QAAQ,CAACO,KAAK;MACrBC,KAAK,EAAER,QAAQ,CAACQ;IACjB,CAAC,CAAC;IACFd,WAAW,CAACO,GAAG,CAACH,YAAY,CAAC;EAC9B,CACD,CAAC;EAED,OAAO;IACNL,UAAU;IACVD,OAAO;IACPE;EACD,CAAC;AACF,CAAC","ignoreList":[]}

package/lib/module/shared/components/boundary/portal/components/boundary-portal/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["memo","Animated","runOnUI","logger","isTeleportAvailable","PORTAL_POINTER_EVENTS","NativePortal","TeleportPortal","useBoundaryPortalAttachment","usePlaceholderStyles","jsx","_jsx","AnimatedNativePortal","createAnimatedComponent","EnabledNativePortal","BoundaryPortal","boundaryId","children","enabled","placeholderRef","EnabledBoundaryPortal","__DEV__","warnOnce","teleportProps","handleOnLayout","placeholderStyle","View","ref","onLayout","nativeEvent","layout","style","pointerEvents","collapsable","animatedProps","name"],"sourceRoot":"../../../../../../../../src","sources":["shared/components/boundary/portal/components/boundary-portal/index.tsx"],"mappings":";;AAAA,SAGCA,IAAI,QAEE,OAAO;AAEd,OAAOC,QAAQ,IAAsBC,OAAO,QAAQ,yBAAyB;AAC7E,SAASC,MAAM,QAAQ,6BAA6B;AACpD,SACCC,mBAAmB,EACnBC,qBAAqB,EACrBC,YAAY,IAAIC,cAAc,QACxB,gBAAgB;AACvB,SAASC,2BAA2B,QAAQ,wCAAwC;AACpF,SAASC,oBAAoB,QAAQ,gCAAgC;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAStE,MAAMC,oBAAoB,GAAGL,cAAc,GACxCN,QAAQ,CAACY,uBAAuB,CAChCN,cACD,CAAC,GACA,IAAI;AACP,MAAMO,mBAAmB,GAAGF,oBAE3B;AASD,OAAO,MAAMG,cAAc,gBAAGf,IAAI,CAAC,SAASe,cAAcA,CAAC;EAC1DC,UAAU;EACVC,QAAQ;EACRC,OAAO;EACPC;AACoB,CAAC,EAAE;EACvB,IAAI,CAACD,OAAO,IAAI,CAACd,mBAAmB,IAAI,CAACQ,oBAAoB,EAAE;IAC9D,OAAOK,QAAQ;EAChB;EAEA,oBACCN,IAAA,CAACS,qBAAqB;IACrBJ,UAAU,EAAEA,UAAW;IACvBG,cAAc,EAAEA,cAAe;IAAAF,QAAA,EAE9BA;EAAQ,CACa,CAAC;AAE1B,CAAC,CAAC;AAEF,MAAMG,qBAAqB,gBAAGpB,IAAI,CAAC,SAASoB,qBAAqBA,CAAC;EACjEJ,UAAU;EACVC,QAAQ;EACRE;AACqC,CAAC,EAAE;EACxC,IAAIE,OAAO,IAAI,CAACL,UAAU,EAAE;IAC3Bb,MAAM,CAACmB,QAAQ,CACd,mBAAmB,EACnB,iEACD,CAAC;EACF;EAEA,MAAM;IAAEC;EAAc,CAAC,GAAGf,2BAA2B,CAAC;IAAEQ;EAAW,CAAC,CAAC;EACrE,MAAM;IAAEQ,cAAc;IAAEC;EAAiB,CAAC,GAAGhB,oBAAoB,CAAC,CAAC;EAEnE,oBACCE,IAAA,CAACV,QAAQ,CAACyB,IAAI;IACbC,GAAG,EAAER,cAAe;IACpBS,QAAQ,EAAEA,CAAC;MAAEC,WAAW,EAAE;QAAEC;MAAO;IAAE,CAAC,KACrC5B,OAAO,CAACsB,cAAc,CAAC,CAACM,MAAM,CAC9B;IACDC,KAAK,EAAEN,gBAAiB;IACxBO,aAAa,EAAE3B,qBAAsB;IACrC4B,WAAW,EAAE,KAAM;IAAAhB,QAAA,eAEnBN,IAAA,CAACG,mBAAmB;MACnBoB,aAAa,EAAEX,aAAc;MAC7BY,IAAI,EAAEnB,UAAW;MACjBgB,aAAa,EAAE3B,qBAAsB;MAAAY,QAAA,EAEpCA;IAAQ,CACW;EAAC,CACR,CAAC;AAElB,CAAC,CAAC","ignoreList":[]}
+{"version":3,"names":["memo","Animated","runOnUI","logger","isTeleportAvailable","PORTAL_POINTER_EVENTS","NativePortal","TeleportPortal","useBoundaryPortalAttachment","usePlaceholderStyles","jsx","_jsx","AnimatedNativePortal","createAnimatedComponent","EnabledNativePortal","BoundaryPortal","boundaryId","children","enabled","placeholderRef","EnabledBoundaryPortal","__DEV__","warnOnce","teleportProps","handleOnLayout","placeholderStyle","View","ref","onLayout","nativeEvent","layout","style","pointerEvents","collapsable","animatedProps","name"],"sourceRoot":"../../../../../../../../src","sources":["shared/components/boundary/portal/components/boundary-portal/index.tsx"],"mappings":";;AAAA,SAGCA,IAAI,QAEE,OAAO;AAEd,OAAOC,QAAQ,IAAsBC,OAAO,QAAQ,yBAAyB;AAC7E,SAASC,MAAM,QAAQ,6BAA6B;AACpD,SACCC,mBAAmB,EACnBC,qBAAqB,EACrBC,YAAY,IAAIC,cAAc,QACxB,gBAAgB;AACvB,SAASC,2BAA2B,QAAQ,wCAAwC;AACpF,SAASC,oBAAoB,QAAQ,gCAAgC;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAStE,MAAMC,oBAAoB,GAAGL,cAAc,GACxCN,QAAQ,CAACY,uBAAuB,CAChCN,cACD,CAAC,GACA,IAAI;AACP,MAAMO,mBAAmB,GAAGF,oBAE3B;AASD,OAAO,MAAMG,cAAc,gBAAGf,IAAI,CAAC,SAASe,cAAcA,CAAC;EAC1DC,UAAU;EACVC,QAAQ;EACRC,OAAO;EACPC;AACoB,CAAC,EAAE;EACvB,IAAI,CAACD,OAAO,IAAI,CAACd,mBAAmB,IAAI,CAACQ,oBAAoB,EAAE;IAC9D,OAAOK,QAAQ;EAChB;EAEA,oBACCN,IAAA,CAACS,qBAAqB;IACrBJ,UAAU,EAAEA,UAAW;IACvBG,cAAc,EAAEA,cAAe;IAAAF,QAAA,EAE9BA;EAAQ,CACa,CAAC;AAE1B,CAAC,CAAC;AAEF,MAAMG,qBAAqB,gBAAGpB,IAAI,CAAC,SAASoB,qBAAqBA,CAAC;EACjEJ,UAAU;EACVC,QAAQ;EACRE;AACqC,CAAC,EAAE;EACxC,IAAIE,OAAO,IAAI,CAACL,UAAU,EAAE;IAC3Bb,MAAM,CAACmB,QAAQ,CACd,mBAAmB,EACnB,iEACD,CAAC;EACF;EAEA,MAAM;IAAEC;EAAc,CAAC,GAAGf,2BAA2B,CAAC;IAAEQ;EAAW,CAAC,CAAC;EAErE,MAAM;IAAEQ,cAAc;IAAEC;EAAiB,CAAC,GAAGhB,oBAAoB,CAAC,CAAC;EAEnE,oBACCE,IAAA,CAACV,QAAQ,CAACyB,IAAI;IACbC,GAAG,EAAER,cAAe;IACpBS,QAAQ,EAAEA,CAAC;MAAEC,WAAW,EAAE;QAAEC;MAAO;IAAE,CAAC,KACrC5B,OAAO,CAACsB,cAAc,CAAC,CAACM,MAAM,CAC9B;IACDC,KAAK,EAAEN,gBAAiB;IACxBO,aAAa,EAAE3B,qBAAsB;IACrC4B,WAAW,EAAE,KAAM;IAAAhB,QAAA,eAEnBN,IAAA,CAACG,mBAAmB;MACnBoB,aAAa,EAAEX,aAAc;MAC7BY,IAAI,EAAEnB,UAAW;MACjBgB,aAAa,EAAE3B,qBAAsB;MAAAY,QAAA,EAEpCA;IAAQ,CACW;EAAC,CACR,CAAC;AAElB,CAAC,CAAC","ignoreList":[]}

package/lib/module/shared/components/boundary/portal/components/boundary-portal/stores/portal-boundary-host.store.js

@@ -25,7 +25,7 @@ const emit = () => {
   }
 };
 const isSameHost = (a, b) => {
-  return a.boundaryId === b.boundaryId && a.hostKey === b.hostKey && a.pairKey === b.pairKey && a.portalHostName === b.portalHostName && a.portalHostReady === b.portalHostReady && a.screenKey === b.screenKey && a.slotsMap === b.slotsMap;
+  return a.boundaryId === b.boundaryId && a.hostKey === b.hostKey && a.localMeasurement === b.localMeasurement && a.pairKey === b.pairKey && a.portalHostName === b.portalHostName && a.portalHostReady === b.portalHostReady && a.slotsMap === b.slotsMap;
 };
 export const mountPortalBoundaryHost = host => {
   const previous = activeBoundaryHosts.get(host.portalHostName);

package/lib/module/shared/components/boundary/portal/components/boundary-portal/stores/portal-boundary-host.store.js.map

@@ -1 +1 @@
-{"version":3,"names":["useSyncExternalStore","EMPTY_HOSTS","listeners","Set","activeBoundaryHosts","Map","snapshot","hostsByScope","buildSnapshot","host","values","hosts","hostKey","push","emit","listener","isSameHost","a","b","boundaryId","pairKey","portalHostName","portalHostReady","screenKey","slotsMap","mountPortalBoundaryHost","previous","get","set","unmountPortalBoundaryHostByName","delete","subscribe","add","useActivePortalBoundaryHosts"],"sourceRoot":"../../../../../../../../../src","sources":["shared/components/boundary/portal/components/boundary-portal/stores/portal-boundary-host.store.ts"],"mappings":";;AAAA,SAASA,oBAAoB,QAAQ,OAAO;AAkB5C,MAAMC,WAAuC,GAAG,EAAE;AAElD,MAAMC,SAAS,GAAG,IAAIC,GAAG,CAAa,CAAC;AACvC,MAAMC,mBAAmB,GAAG,IAAIC,GAAG,CAAmC,CAAC;AAEvE,IAAIC,QAAwB,GAAG;EAC9BC,YAAY,EAAE,CAAC;AAChB,CAAC;AAED,MAAMC,aAAa,GAAGA,CAAA,KAAsB;EAC3C,MAAMD,YAAwD,GAAG,CAAC,CAAC;EAEnE,KAAK,MAAME,IAAI,IAAIL,mBAAmB,CAACM,MAAM,CAAC,CAAC,EAAE;IAChD,MAAMC,KAAK,GAAGJ,YAAY,CAACE,IAAI,CAACG,OAAO,CAAC,IAAI,EAAE;IAC9CD,KAAK,CAACE,IAAI,CAACJ,IAAI,CAAC;IAChBF,YAAY,CAACE,IAAI,CAACG,OAAO,CAAC,GAAGD,KAAK;EACnC;EAEA,OAAO;IACNJ;EACD,CAAC;AACF,CAAC;AAED,MAAMO,IAAI,GAAGA,CAAA,KAAM;EAClBR,QAAQ,GAAGE,aAAa,CAAC,CAAC;EAE1B,KAAK,MAAMO,QAAQ,IAAIb,SAAS,EAAE;IACjCa,QAAQ,CAAC,CAAC;EACX;AACD,CAAC;AAED,MAAMC,UAAU,GAAGA,CAClBC,CAA2B,EAC3BC,CAA2B,KACvB;EACJ,OACCD,CAAC,CAACE,UAAU,KAAKD,CAAC,CAACC,UAAU,IAC7BF,CAAC,CAACL,OAAO,KAAKM,CAAC,CAACN,OAAO,IACvBK,CAAC,CAACG,OAAO,KAAKF,CAAC,CAACE,OAAO,IACvBH,CAAC,CAACI,cAAc,KAAKH,CAAC,CAACG,cAAc,IACrCJ,CAAC,CAACK,eAAe,KAAKJ,CAAC,CAACI,eAAe,IACvCL,CAAC,CAACM,SAAS,KAAKL,CAAC,CAACK,SAAS,IAC3BN,CAAC,CAACO,QAAQ,KAAKN,CAAC,CAACM,QAAQ;AAE3B,CAAC;AAED,OAAO,MAAMC,uBAAuB,GAAIhB,IAA8B,IAAK;EAC1E,MAAMiB,QAAQ,GAAGtB,mBAAmB,CAACuB,GAAG,CAAClB,IAAI,CAACY,cAAc,CAAC;EAC7D,IAAIK,QAAQ,IAAIV,UAAU,CAACU,QAAQ,EAAEjB,IAAI,CAAC,EAAE;IAC3C;EACD;EAEAL,mBAAmB,CAACwB,GAAG,CAACnB,IAAI,CAACY,cAAc,EAAEZ,IAAI,CAAC;EAClDK,IAAI,CAAC,CAAC;AACP,CAAC;AAED,OAAO,MAAMe,+BAA+B,GAC3CR,cAAyC,IACrC;EACJ,IAAI,CAACA,cAAc,IAAI,CAACjB,mBAAmB,CAAC0B,MAAM,CAACT,cAAc,CAAC,EAAE;IACnE;EACD;EAEAP,IAAI,CAAC,CAAC;AACP,CAAC;AAED,MAAMiB,SAAS,GAAIhB,QAAoB,IAAK;EAC3Cb,SAAS,CAAC8B,GAAG,CAACjB,QAAQ,CAAC;EAEvB,OAAO,MAAM;IACZb,SAAS,CAAC4B,MAAM,CAACf,QAAQ,CAAC;EAC3B,CAAC;AACF,CAAC;AAED,OAAO,MAAMkB,4BAA4B,GAAIrB,OAAe,IAAK;EAChE,OAAOZ,oBAAoB,CAC1B+B,SAAS,EACT,MAAMzB,QAAQ,CAACC,YAAY,CAACK,OAAO,CAAC,IAAIX,WAAW,EACnD,MAAMA,WACP,CAAC;AACF,CAAC","ignoreList":[]}
+{"version":3,"names":["useSyncExternalStore","EMPTY_HOSTS","listeners","Set","activeBoundaryHosts","Map","snapshot","hostsByScope","buildSnapshot","host","values","hosts","hostKey","push","emit","listener","isSameHost","a","b","boundaryId","localMeasurement","pairKey","portalHostName","portalHostReady","slotsMap","mountPortalBoundaryHost","previous","get","set","unmountPortalBoundaryHostByName","delete","subscribe","add","useActivePortalBoundaryHosts"],"sourceRoot":"../../../../../../../../../src","sources":["shared/components/boundary/portal/components/boundary-portal/stores/portal-boundary-host.store.ts"],"mappings":";;AAAA,SAASA,oBAAoB,QAAQ,OAAO;AAmB5C,MAAMC,WAAuC,GAAG,EAAE;AAElD,MAAMC,SAAS,GAAG,IAAIC,GAAG,CAAa,CAAC;AACvC,MAAMC,mBAAmB,GAAG,IAAIC,GAAG,CAAmC,CAAC;AAEvE,IAAIC,QAAwB,GAAG;EAC9BC,YAAY,EAAE,CAAC;AAChB,CAAC;AAED,MAAMC,aAAa,GAAGA,CAAA,KAAsB;EAC3C,MAAMD,YAAwD,GAAG,CAAC,CAAC;EAEnE,KAAK,MAAME,IAAI,IAAIL,mBAAmB,CAACM,MAAM,CAAC,CAAC,EAAE;IAChD,MAAMC,KAAK,GAAGJ,YAAY,CAACE,IAAI,CAACG,OAAO,CAAC,IAAI,EAAE;IAC9CD,KAAK,CAACE,IAAI,CAACJ,IAAI,CAAC;IAChBF,YAAY,CAACE,IAAI,CAACG,OAAO,CAAC,GAAGD,KAAK;EACnC;EAEA,OAAO;IACNJ;EACD,CAAC;AACF,CAAC;AAED,MAAMO,IAAI,GAAGA,CAAA,KAAM;EAClBR,QAAQ,GAAGE,aAAa,CAAC,CAAC;EAE1B,KAAK,MAAMO,QAAQ,IAAIb,SAAS,EAAE;IACjCa,QAAQ,CAAC,CAAC;EACX;AACD,CAAC;AAED,MAAMC,UAAU,GAAGA,CAClBC,CAA2B,EAC3BC,CAA2B,KACvB;EACJ,OACCD,CAAC,CAACE,UAAU,KAAKD,CAAC,CAACC,UAAU,IAC7BF,CAAC,CAACL,OAAO,KAAKM,CAAC,CAACN,OAAO,IACvBK,CAAC,CAACG,gBAAgB,KAAKF,CAAC,CAACE,gBAAgB,IACzCH,CAAC,CAACI,OAAO,KAAKH,CAAC,CAACG,OAAO,IACvBJ,CAAC,CAACK,cAAc,KAAKJ,CAAC,CAACI,cAAc,IACrCL,CAAC,CAACM,eAAe,KAAKL,CAAC,CAACK,eAAe,IACvCN,CAAC,CAACO,QAAQ,KAAKN,CAAC,CAACM,QAAQ;AAE3B,CAAC;AAED,OAAO,MAAMC,uBAAuB,GAAIhB,IAA8B,IAAK;EAC1E,MAAMiB,QAAQ,GAAGtB,mBAAmB,CAACuB,GAAG,CAAClB,IAAI,CAACa,cAAc,CAAC;EAC7D,IAAII,QAAQ,IAAIV,UAAU,CAACU,QAAQ,EAAEjB,IAAI,CAAC,EAAE;IAC3C;EACD;EAEAL,mBAAmB,CAACwB,GAAG,CAACnB,IAAI,CAACa,cAAc,EAAEb,IAAI,CAAC;EAClDK,IAAI,CAAC,CAAC;AACP,CAAC;AAED,OAAO,MAAMe,+BAA+B,GAC3CP,cAAyC,IACrC;EACJ,IAAI,CAACA,cAAc,IAAI,CAAClB,mBAAmB,CAAC0B,MAAM,CAACR,cAAc,CAAC,EAAE;IACnE;EACD;EAEAR,IAAI,CAAC,CAAC;AACP,CAAC;AAED,MAAMiB,SAAS,GAAIhB,QAAoB,IAAK;EAC3Cb,SAAS,CAAC8B,GAAG,CAACjB,QAAQ,CAAC;EAEvB,OAAO,MAAM;IACZb,SAAS,CAAC4B,MAAM,CAACf,QAAQ,CAAC;EAC3B,CAAC;AACF,CAAC;AAED,OAAO,MAAMkB,4BAA4B,GAAIrB,OAAe,IAAK;EAChE,OAAOZ,oBAAoB,CAC1B+B,SAAS,EACT,MAAMzB,QAAQ,CAACC,YAAY,CAACK,OAAO,CAAC,IAAIX,WAAW,EACnD,MAAMA,WACP,CAAC;AACF,CAAC","ignoreList":[]}

package/lib/module/shared/components/boundary/providers/boundary-root.provider.js

@@ -1,15 +1,16 @@
 "use strict";
 
 import { useImperativeHandle, useLayoutEffect, useMemo, useRef } from "react";
-import { useAnimatedRef } from "react-native-reanimated";
+import { useAnimatedRef, useSharedValue } from "react-native-reanimated";
 import { useDescriptorsStore } from "../../../providers/screen/descriptors";
 import { useComposedSlotStyles, useSlotStackingStyles } from "../../../providers/screen/styles";
 import { useBlankStackStore } from "../../../providers/stack/blank-stack.provider";
 import { createBoundTag } from "../../../stores/bounds/helpers/link-pairs.helpers";
 import createProvider from "../../../utils/create-provider";
 import { logger } from "../../../utils/logger";
-import { useBoundaryMeasurement } from "../hooks/use-boundary-measurement";
+import { BoundaryLifecycle } from "../components/boundary-lifecycle";
 import { resolveBoundaryPortal } from "../portal/utils/resolve-portal";
+import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 // logger.warn prepends the library prefix.
 const MULTIPLE_TARGETS_WARNING = "Multiple Boundary.Target elements were rendered under the same boundary root. The first target in render order will be measured.";
 export const TARGET_OUTSIDE_ROOT_WARNING = "Boundary.Target must be rendered inside Transition.Boundary or a component created by createBoundaryComponent.";
@@ -38,7 +39,7 @@ export const {
     escapeClipping
   });
   const currentScreenKey = useDescriptorsStore(s => s.derivations.currentScreenKey);
-  const isCurrentScreenClosing = useBlankStackStore(store => store?.scenesByKey[currentScreenKey]?.activity === "closing");
+  const isCurrentScreenClosing = useBlankStackStore(store => portalRuntime.handoff && store?.scenesByKey[currentScreenKey]?.activity === "closing");
   const retainedBoundTagRef = useRef(requestedBoundTag);
   const shouldRetainClosingBoundTag = portalRuntime.handoff && isCurrentScreenClosing;
 
@@ -49,8 +50,6 @@ export const {
     retainedBoundTagRef.current = requestedBoundTag;
   }
   const boundTag = retainedBoundTagRef.current;
-  const hasConfiguredInterpolator = useDescriptorsStore(s => s.derivations.hasConfiguredInterpolator);
-  const runtimeEnabled = enabled && hasConfiguredInterpolator;
   // Associated slot styles attach whenever the boundary is enabled,
   // independent of whether an interpolator is configured for this transition.
   const shouldAttachAssociatedStyles = enabled;
@@ -59,6 +58,7 @@ export const {
   const associatedStackingStyles = useSlotStackingStyles(boundTag.tag);
   const rootRef = useAnimatedRef();
   const measurementRef = useAnimatedRef();
+  const localMeasurement = useSharedValue(null);
   useLayoutEffect(() => {
     if (__DEV__ && targetCount > 1) {
       logger.warnOnce("boundary:multiple-targets", MULTIPLE_TARGETS_WARNING);
@@ -66,17 +66,6 @@ export const {
   }, [targetCount]);
   const measuredRef = hasTarget || shouldEscapeBoundaryRootToScreenHost ? measurementRef : rootRef;
   useImperativeHandle(forwardedRef, () => rootRef.current, [rootRef]);
-  useBoundaryMeasurement({
-    boundTag,
-    enabled,
-    runtimeEnabled,
-    currentScreenKey,
-    measuredRef,
-    style: hasTarget ? targetStyle : style,
-    handoff: portalRuntime.handoff,
-    escapeClipping: portalRuntime.escapeClipping,
-    config
-  });
   const shouldRenderBoundaryRootThroughPortal = shouldEscapeBoundaryRootToScreenHost && !hasTarget;
   const handoffEnabled = enabled && portalRuntime.handoff;
   // A nested active target takes the full associated style, so the root keeps
@@ -92,15 +81,28 @@ export const {
     boundTag,
     currentScreenKey,
     handoffEnabled,
+    localMeasurement,
     measurementRef,
     portalRuntime,
     ref: rootRef,
     shouldRenderBoundaryRootThroughPortal,
     shouldRenderHandoffHost: handoffEnabled && !hasTarget
-  }), [attachedStyle, boundTag, currentScreenKey, handoffEnabled, hasTarget, measurementRef, portalRuntime, rootRef, shouldRenderBoundaryRootThroughPortal]);
+  }), [attachedStyle, boundTag, currentScreenKey, handoffEnabled, hasTarget, localMeasurement, measurementRef, portalRuntime, rootRef, shouldRenderBoundaryRootThroughPortal]);
   return {
     value,
-    children: children(value)
+    children: /*#__PURE__*/_jsxs(_Fragment, {
+      children: [children(value), /*#__PURE__*/_jsx(BoundaryLifecycle, {
+        boundTag: boundTag,
+        config: config,
+        currentScreenKey: currentScreenKey,
+        enabled: enabled,
+        escapeClipping: portalRuntime.escapeClipping,
+        handoff: portalRuntime.handoff,
+        localMeasurement: localMeasurement,
+        measuredRef: measuredRef,
+        style: hasTarget ? targetStyle : style
+      })]
+    })
   };
 });
 //# sourceMappingURL=boundary-root.provider.js.map