react-native-screen-transitions 4.0.0-alpha.6 → 4.0.0-alpha.8

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","_links","_system","_teleport","_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","hasSource","source","hasHostBounds","getPortalHostBounds","hostKey","hasSlot","slotsMap","undefined","hasGeometry","useFrameCallback","hostStyle","useAnimatedStyle","NO_STYLES","sourceBounds","bounds","isCrossScreenPortal","resolvePortalOffsetStyle","placement","contentFrameStyle","height","width","slotStyle","slot","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":"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","ignoreList":[]}
+{"version":3,"names":["_react","require","_reactNative","_reactNativeReanimated","_interopRequireWildcard","_constants","_composeSlotStyle","_teleport","_localMeasurement","_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","getCurrentBoundaryBounds","host","resolveBoundaryLocalMeasurement","localMeasurement","pairKey","PortalBoundaryHost","exports","memo","hostBounds","hostMeasurementKey","measuredHostKey","style","useAnimatedReaction","ready","portalHostReady","hostStyle","useAnimatedStyle","boundaryBounds","NO_STYLES","resolvePortalOffsetStyle","bounds","contentFrameStyle","height","width","slotStyle","slot","slotsMap","boundaryId","composeSlotStyleWithLocalTransform","undefined","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":"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","ignoreList":[]}

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

@@ -0,0 +1,13 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.resolveBoundaryLocalMeasurement = void 0;
+const resolveBoundaryLocalMeasurement = (measurement, pairKey) => {
+  "worklet";
+
+  return measurement?.pairKey === pairKey ? measurement.bounds : null;
+};
+exports.resolveBoundaryLocalMeasurement = resolveBoundaryLocalMeasurement;
+//# sourceMappingURL=local-measurement.js.map

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

@@ -0,0 +1 @@
+{"version":3,"names":["resolveBoundaryLocalMeasurement","measurement","pairKey","bounds","exports"],"sourceRoot":"../../../../../../../../src","sources":["components/boundary/portal/components/boundary-portal/helpers/local-measurement.ts"],"mappings":";;;;;;AAGO,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;AAACC,OAAA,CAAAJ,+BAAA,GAAAA,+BAAA","ignoreList":[]}

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

@@ -4,45 +4,22 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.resolvePortalOffsetStyle = void 0;
-var _scroll = require("../../../../../../stores/scroll.store");
-var _hostBounds = require("../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.
- */
-
 const resolvePortalOffsetStyle = ({
   bounds,
-  hostKey,
-  placement
+  hostBounds
 }) => {
   "worklet";
 
-  const hostBounds = (0, _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 ? (0, _scroll.getClampedScrollAxisDelta)(boundsScrollSnapshot, hostBoundsScrollSnapshot, "horizontal") : 0;
-  const hostSnapshotDeltaY = alignHostToBoundsScroll ? (0, _scroll.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/commonjs/components/boundary/portal/components/boundary-portal/helpers/offset-style.js.map

@@ -1 +1 @@
-{"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":[]}
+{"version":3,"names":["resolvePortalOffsetStyle","bounds","hostBounds","hostPageX","pageX","hostPageY","pageY","transform","translateY","translateX","exports"],"sourceRoot":"../../../../../../../../src","sources":["components/boundary/portal/components/boundary-portal/helpers/offset-style.ts"],"mappings":";;;;;;AAOO,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;AAACO,OAAA,CAAAV,wBAAA,GAAAA,wBAAA","ignoreList":[]}

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

@@ -3,62 +3,71 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.useActivePortalBoundaryHost = void 0;
+exports.useActivePortalBoundaryHost = exports.resolveActivePortalPairKey = void 0;
 var _react = require("react");
 var _reactNativeReanimated = require("react-native-reanimated");
 var _reactNativeWorklets = require("react-native-worklets");
 var _links = require("../../../../../../stores/bounds/internals/links");
 var _naming = require("../../../utils/naming");
 var _portalBoundaryHost = require("../stores/portal-boundary-host.store");
+const resolveActivePortalPairKey = ({
+  pairKey,
+  measurementPairKey,
+  hasAnimatedSlot
+}) => {
+  "worklet";
+
+  if (!pairKey || measurementPairKey !== pairKey || !hasAnimatedSlot) {
+    return null;
+  }
+  return pairKey;
+};
+exports.resolveActivePortalPairKey = resolveActivePortalPairKey;
 const useActivePortalBoundaryHost = ({
   boundaryId,
   currentScreenKey,
   escapeHostKey,
+  localMeasurement,
   portalHostName,
   portalHostReady,
   slotsMap
 }) => {
-  const [activePortal, setActivePortal] = (0, _react.useState)(null);
-  const activePairKeyRef = (0, _react.useRef)(null);
-  const updateActivePortal = (0, _react.useCallback)(pairKey => {
-    if (activePairKeyRef.current === pairKey) {
-      return;
-    }
-    activePairKeyRef.current = pairKey;
-    setActivePortal(pairKey ? {
-      pairKey
-    } : null);
+  const [activePairKey, setActivePairKey] = (0, _react.useState)(null);
+  const updateActivePairKey = (0, _react.useCallback)(pairKey => {
+    setActivePairKey(pairKey);
   }, []);
   (0, _reactNativeReanimated.useAnimatedReaction)(() => {
     "worklet";
 
-    const isBoundaryAnimating = slotsMap.get()[boundaryId] !== undefined;
-    if (!isBoundaryAnimating) {
-      return null;
-    }
-    return (0, _links.getPairKeyForSource)(boundaryId, currentScreenKey);
+    const pairKey = (0, _links.getPairKeyForSource)(boundaryId, currentScreenKey);
+    const measurement = localMeasurement.get();
+    return resolveActivePortalPairKey({
+      pairKey,
+      measurementPairKey: measurement?.pairKey,
+      hasAnimatedSlot: slotsMap.get()[boundaryId] !== undefined
+    });
   }, (pairKey, previousPairKey) => {
     "worklet";
 
     if (pairKey === previousPairKey) {
       return;
     }
-    (0, _reactNativeWorklets.scheduleOnRN)(updateActivePortal, pairKey);
+    (0, _reactNativeWorklets.scheduleOnRN)(updateActivePairKey, pairKey);
   });
   (0, _react.useLayoutEffect)(() => {
-    if (!activePortal || !escapeHostKey) {
+    if (!activePairKey || !escapeHostKey) {
       portalHostName.set(null);
       portalHostReady.set(false);
       return;
     }
-    const nextPortalHostName = (0, _naming.createBoundaryPortalHostName)(escapeHostKey, boundaryId, activePortal.pairKey);
+    const nextPortalHostName = (0, _naming.createBoundaryPortalHostName)(escapeHostKey, boundaryId, activePairKey);
     (0, _portalBoundaryHost.mountPortalBoundaryHost)({
       boundaryId,
       hostKey: escapeHostKey,
-      pairKey: activePortal.pairKey,
+      localMeasurement,
+      pairKey: activePairKey,
       portalHostName: nextPortalHostName,
       portalHostReady,
-      screenKey: currentScreenKey,
       slotsMap
     });
     portalHostName.set(nextPortalHostName);
@@ -67,7 +76,7 @@ const useActivePortalBoundaryHost = ({
       portalHostReady.set(false);
       (0, _portalBoundaryHost.unmountPortalBoundaryHostByName)(nextPortalHostName);
     };
-  }, [activePortal, boundaryId, currentScreenKey, escapeHostKey, portalHostName, portalHostReady, slotsMap]);
+  }, [activePairKey, boundaryId, escapeHostKey, localMeasurement, portalHostName, portalHostReady, slotsMap]);
 };
 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

@@ -1 +1 @@
-{"version":3,"names":["_react","require","_reactNativeReanimated","_reactNativeWorklets","_links","_naming","_portalBoundaryHost","useActivePortalBoundaryHost","boundaryId","currentScreenKey","escapeHostKey","portalHostName","portalHostReady","slotsMap","activePortal","setActivePortal","useState","activePairKeyRef","useRef","updateActivePortal","useCallback","pairKey","current","useAnimatedReaction","isBoundaryAnimating","get","undefined","getPairKeyForSource","previousPairKey","scheduleOnRN","useLayoutEffect","set","nextPortalHostName","createBoundaryPortalHostName","mountPortalBoundaryHost","hostKey","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;AACA,IAAAG,MAAA,GAAAH,OAAA;AAGA,IAAAI,OAAA,GAAAJ,OAAA;AACA,IAAAK,mBAAA,GAAAL,OAAA;AAkBO,MAAMM,2BAA2B,GAAGA,CAAC;EAC3CC,UAAU;EACVC,gBAAgB;EAChBC,aAAa;EACbC,cAAc;EACdC,eAAe;EACfC;AACkC,CAAC,KAAK;EACxC,MAAM,CAACC,YAAY,EAAEC,eAAe,CAAC,GAAG,IAAAC,eAAQ,EAAsB,IAAI,CAAC;EAC3E,MAAMC,gBAAgB,GAAG,IAAAC,aAAM,EAAuB,IAAI,CAAC;EAE3D,MAAMC,kBAAkB,GAAG,IAAAC,kBAAW,EAAEC,OAA6B,IAAK;IACzE,IAAIJ,gBAAgB,CAACK,OAAO,KAAKD,OAAO,EAAE;MACzC;IACD;IAEAJ,gBAAgB,CAACK,OAAO,GAAGD,OAAO;IAClCN,eAAe,CAACM,OAAO,GAAG;MAAEA;IAAQ,CAAC,GAAG,IAAI,CAAC;EAC9C,CAAC,EAAE,EAAE,CAAC;EAEN,IAAAE,0CAAmB,EAClB,MAAM;IACL,SAAS;;IACT,MAAMC,mBAAmB,GAAGX,QAAQ,CAACY,GAAG,CAAC,CAAC,CAACjB,UAAU,CAAC,KAAKkB,SAAS;IACpE,IAAI,CAACF,mBAAmB,EAAE;MACzB,OAAO,IAAI;IACZ;IAEA,OAAO,IAAAG,0BAAmB,EAACnB,UAAU,EAAEC,gBAAgB,CAAC;EACzD,CAAC,EACD,CAACY,OAAO,EAAEO,eAAe,KAAK;IAC7B,SAAS;;IACT,IAAIP,OAAO,KAAKO,eAAe,EAAE;MAChC;IACD;IAEA,IAAAC,iCAAY,EAACV,kBAAkB,EAAEE,OAAO,CAAC;EAC1C,CACD,CAAC;EAED,IAAAS,sBAAe,EAAC,MAAM;IACrB,IAAI,CAAChB,YAAY,IAAI,CAACJ,aAAa,EAAE;MACpCC,cAAc,CAACoB,GAAG,CAAC,IAAI,CAAC;MACxBnB,eAAe,CAACmB,GAAG,CAAC,KAAK,CAAC;MAC1B;IACD;IAEA,MAAMC,kBAAkB,GAAG,IAAAC,oCAA4B,EACtDvB,aAAa,EACbF,UAAU,EACVM,YAAY,CAACO,OACd,CAAC;IAED,IAAAa,2CAAuB,EAAC;MACvB1B,UAAU;MACV2B,OAAO,EAAEzB,aAAa;MACtBW,OAAO,EAAEP,YAAY,CAACO,OAAO;MAC7BV,cAAc,EAAEqB,kBAAkB;MAClCpB,eAAe;MACfwB,SAAS,EAAE3B,gBAAgB;MAC3BI;IACD,CAAC,CAAC;IACFF,cAAc,CAACoB,GAAG,CAACC,kBAAkB,CAAC;IAEtC,OAAO,MAAM;MACZrB,cAAc,CAACoB,GAAG,CAAC,IAAI,CAAC;MACxBnB,eAAe,CAACmB,GAAG,CAAC,KAAK,CAAC;MAC1B,IAAAM,mDAA+B,EAACL,kBAAkB,CAAC;IACpD,CAAC;EACF,CAAC,EAAE,CACFlB,YAAY,EACZN,UAAU,EACVC,gBAAgB,EAChBC,aAAa,EACbC,cAAc,EACdC,eAAe,EACfC,QAAQ,CACR,CAAC;AACH,CAAC;AAACyB,OAAA,CAAA/B,2BAAA,GAAAA,2BAAA","ignoreList":[]}
+{"version":3,"names":["_react","require","_reactNativeReanimated","_reactNativeWorklets","_links","_naming","_portalBoundaryHost","resolveActivePortalPairKey","pairKey","measurementPairKey","hasAnimatedSlot","exports","useActivePortalBoundaryHost","boundaryId","currentScreenKey","escapeHostKey","localMeasurement","portalHostName","portalHostReady","slotsMap","activePairKey","setActivePairKey","useState","updateActivePairKey","useCallback","useAnimatedReaction","getPairKeyForSource","measurement","get","undefined","previousPairKey","scheduleOnRN","useLayoutEffect","set","nextPortalHostName","createBoundaryPortalHostName","mountPortalBoundaryHost","hostKey","unmountPortalBoundaryHostByName"],"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;AACA,IAAAG,MAAA,GAAAH,OAAA;AAIA,IAAAI,OAAA,GAAAJ,OAAA;AACA,IAAAK,mBAAA,GAAAL,OAAA;AAeO,MAAMM,0BAA0B,GAAGA,CAAC;EAC1CC,OAAO;EACPC,kBAAkB;EAClBC;AAKD,CAAC,KAA2B;EAC3B,SAAS;;EACT,IAAI,CAACF,OAAO,IAAIC,kBAAkB,KAAKD,OAAO,IAAI,CAACE,eAAe,EAAE;IACnE,OAAO,IAAI;EACZ;EAEA,OAAOF,OAAO;AACf,CAAC;AAACG,OAAA,CAAAJ,0BAAA,GAAAA,0BAAA;AAEK,MAAMK,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,GAAG,IAAAC,eAAQ,EACjD,IACD,CAAC;EAED,MAAMC,mBAAmB,GAAG,IAAAC,kBAAW,EAAEhB,OAA6B,IAAK;IAC1Ea,gBAAgB,CAACb,OAAO,CAAC;EAC1B,CAAC,EAAE,EAAE,CAAC;EAEN,IAAAiB,0CAAmB,EAClB,MAAM;IACL,SAAS;;IACT,MAAMjB,OAAO,GAAG,IAAAkB,0BAAmB,EAACb,UAAU,EAAEC,gBAAgB,CAAC;IACjE,MAAMa,WAAW,GAAGX,gBAAgB,CAACY,GAAG,CAAC,CAAC;IAE1C,OAAOrB,0BAA0B,CAAC;MACjCC,OAAO;MACPC,kBAAkB,EAAEkB,WAAW,EAAEnB,OAAO;MACxCE,eAAe,EAAES,QAAQ,CAACS,GAAG,CAAC,CAAC,CAACf,UAAU,CAAC,KAAKgB;IACjD,CAAC,CAAC;EACH,CAAC,EACD,CAACrB,OAAO,EAAEsB,eAAe,KAAK;IAC7B,SAAS;;IACT,IAAItB,OAAO,KAAKsB,eAAe,EAAE;MAChC;IACD;IAEA,IAAAC,iCAAY,EAACR,mBAAmB,EAAEf,OAAO,CAAC;EAC3C,CACD,CAAC;EAED,IAAAwB,sBAAe,EAAC,MAAM;IACrB,IAAI,CAACZ,aAAa,IAAI,CAACL,aAAa,EAAE;MACrCE,cAAc,CAACgB,GAAG,CAAC,IAAI,CAAC;MACxBf,eAAe,CAACe,GAAG,CAAC,KAAK,CAAC;MAC1B;IACD;IAEA,MAAMC,kBAAkB,GAAG,IAAAC,oCAA4B,EACtDpB,aAAa,EACbF,UAAU,EACVO,aACD,CAAC;IAED,IAAAgB,2CAAuB,EAAC;MACvBvB,UAAU;MACVwB,OAAO,EAAEtB,aAAa;MACtBC,gBAAgB;MAChBR,OAAO,EAAEY,aAAa;MACtBH,cAAc,EAAEiB,kBAAkB;MAClChB,eAAe;MACfC;IACD,CAAC,CAAC;IACFF,cAAc,CAACgB,GAAG,CAACC,kBAAkB,CAAC;IAEtC,OAAO,MAAM;MACZjB,cAAc,CAACgB,GAAG,CAAC,IAAI,CAAC;MACxBf,eAAe,CAACe,GAAG,CAAC,KAAK,CAAC;MAC1B,IAAAK,mDAA+B,EAACJ,kBAAkB,CAAC;IACpD,CAAC;EACF,CAAC,EAAE,CACFd,aAAa,EACbP,UAAU,EACVE,aAAa,EACbC,gBAAgB,EAChBC,cAAc,EACdC,eAAe,EACfC,QAAQ,CACR,CAAC;AACH,CAAC;AAACR,OAAA,CAAAC,2BAAA,GAAAA,2BAAA","ignoreList":[]}

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

@@ -7,6 +7,7 @@ exports.useBoundaryPortalAttachment = void 0;
 var _reactNativeReanimated = require("react-native-reanimated");
 var _descriptors = require("../../../../../../providers/screen/descriptors");
 var _styles = require("../../../../../../providers/screen/styles");
+var _boundaryRoot = require("../../../../providers/boundary-root.provider");
 var _naming = require("../../../utils/naming");
 var _teleportControl = require("../../../utils/teleport-control");
 var _hostRegistry = require("../stores/host-registry.store");
@@ -14,10 +15,14 @@ var _useActivePortalBoundaryHost = require("./use-active-portal-boundary-host");
 const useBoundaryPortalAttachment = ({
   boundaryId
 }) => {
+  const localMeasurement = (0, _boundaryRoot.useBoundaryRootStore)(root => {
+    if (!root) {
+      throw new Error("Boundary portal attachment requires a boundary root.");
+    }
+    return root.localMeasurement;
+  });
   const currentScreenKey = (0, _descriptors.useDescriptorsStore)(s => s.derivations.currentScreenKey);
-  const {
-    slotsMap
-  } = (0, _styles.useScreenSlots)();
+  const slotsMap = (0, _styles.useScreenSlotStore)(store => store.slotsMap);
   const portalHostName = (0, _reactNativeReanimated.useSharedValue)(null);
   const portalHostReady = (0, _reactNativeReanimated.useSharedValue)(false);
   const escapeHostKey = (0, _hostRegistry.useActiveHostKey)(currentScreenKey);
@@ -25,6 +30,7 @@ const useBoundaryPortalAttachment = ({
     boundaryId,
     currentScreenKey,
     escapeHostKey,
+    localMeasurement,
     portalHostName,
     portalHostReady,
     slotsMap

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

@@ -1 +1 @@
-{"version":3,"names":["_reactNativeReanimated","require","_descriptors","_styles","_naming","_teleportControl","_hostRegistry","_useActivePortalBoundaryHost","useBoundaryPortalAttachment","boundaryId","currentScreenKey","useDescriptorsStore","s","derivations","slotsMap","useScreenSlots","portalHostName","useSharedValue","portalHostReady","escapeHostKey","useActiveHostKey","useActivePortalBoundaryHost","teleportProps","useAnimatedProps","slot","get","pointerEvents","_pointerEvents","teleport","slotProps","props","shouldAttach","undefined","isTeleportEnabled","hostName","PORTAL_HOST_NAME_RESET_VALUE","exports"],"sourceRoot":"../../../../../../../../src","sources":["components/boundary/portal/components/boundary-portal/hooks/use-boundary-portal-attachment.ts"],"mappings":";;;;;;AAAA,IAAAA,sBAAA,GAAAC,OAAA;AACA,IAAAC,YAAA,GAAAD,OAAA;AACA,IAAAE,OAAA,GAAAF,OAAA;AACA,IAAAG,OAAA,GAAAH,OAAA;AACA,IAAAI,gBAAA,GAAAJ,OAAA;AACA,IAAAK,aAAA,GAAAL,OAAA;AACA,IAAAM,4BAAA,GAAAN,OAAA;AAMO,MAAMO,2BAA2B,GAAGA,CAAC;EAC3CC;AACkC,CAAC,KAAK;EACxC,MAAMC,gBAAgB,GAAG,IAAAC,gCAAmB,EAC1CC,CAAC,IAAKA,CAAC,CAACC,WAAW,CAACH,gBACtB,CAAC;EACD,MAAM;IAAEI;EAAS,CAAC,GAAG,IAAAC,sBAAc,EAAC,CAAC;EACrC,MAAMC,cAAc,GAAG,IAAAC,qCAAc,EAAgB,IAAI,CAAC;EAC1D,MAAMC,eAAe,GAAG,IAAAD,qCAAc,EAAC,KAAK,CAAC;EAC7C,MAAME,aAAa,GAAG,IAAAC,8BAAgB,EAACV,gBAAgB,CAAC;EAExD,IAAAW,wDAA2B,EAAC;IAC3BZ,UAAU;IACVC,gBAAgB;IAChBS,aAAa;IACbH,cAAc;IACdE,eAAe;IACfJ;EACD,CAAC,CAAC;EAEF,MAAMQ,aAAa,GAAG,IAAAC,uCAAgB,EAAC,MAAM;IAC5C,SAAS;;IAET,MAAMC,IAAI,GAAGV,QAAQ,CAACW,GAAG,CAAC,CAAC,CAAChB,UAAU,CAAC;IACvC,MAAM;MACLiB,aAAa,EAAEC,cAAc;MAC7BC,QAAQ;MACR,GAAGC;IACJ,CAAC,GAAGL,IAAI,EAAEM,KAAK,IAAI,CAAC,CAAC;IACrB,MAAMC,YAAY,GACjBP,IAAI,KAAKQ,SAAS,IAClB,IAAAC,kCAAiB,EAACL,QAAQ,CAAC,IAC3BV,eAAe,CAACO,GAAG,CAAC,CAAC;IACtB,MAAMS,QAAQ,GAAGH,YAAY,GAC1Bf,cAAc,CAACS,GAAG,CAAC,CAAC,GACpBU,oCAA4B;IAE/B,OAAO;MACN,GAAGN,SAAS;MACZK;IACD,CAAC;EACF,CAAC,CAAC;EAEF,OAAO;IAAEZ;EAAc,CAAC;AACzB,CAAC;AAACc,OAAA,CAAA5B,2BAAA,GAAAA,2BAAA","ignoreList":[]}
+{"version":3,"names":["_reactNativeReanimated","require","_descriptors","_styles","_boundaryRoot","_naming","_teleportControl","_hostRegistry","_useActivePortalBoundaryHost","useBoundaryPortalAttachment","boundaryId","localMeasurement","useBoundaryRootStore","root","Error","currentScreenKey","useDescriptorsStore","s","derivations","slotsMap","useScreenSlotStore","store","portalHostName","useSharedValue","portalHostReady","escapeHostKey","useActiveHostKey","useActivePortalBoundaryHost","teleportProps","useAnimatedProps","slot","get","pointerEvents","_pointerEvents","teleport","slotProps","props","shouldAttach","undefined","isTeleportEnabled","hostName","PORTAL_HOST_NAME_RESET_VALUE","exports"],"sourceRoot":"../../../../../../../../src","sources":["components/boundary/portal/components/boundary-portal/hooks/use-boundary-portal-attachment.ts"],"mappings":";;;;;;AAAA,IAAAA,sBAAA,GAAAC,OAAA;AACA,IAAAC,YAAA,GAAAD,OAAA;AACA,IAAAE,OAAA,GAAAF,OAAA;AACA,IAAAG,aAAA,GAAAH,OAAA;AACA,IAAAI,OAAA,GAAAJ,OAAA;AACA,IAAAK,gBAAA,GAAAL,OAAA;AACA,IAAAM,aAAA,GAAAN,OAAA;AACA,IAAAO,4BAAA,GAAAP,OAAA;AAMO,MAAMQ,2BAA2B,GAAGA,CAAC;EAC3CC;AACkC,CAAC,KAAK;EACxC,MAAMC,gBAAgB,GAAG,IAAAC,kCAAoB,EAAEC,IAAI,IAAK;IACvD,IAAI,CAACA,IAAI,EAAE;MACV,MAAM,IAAIC,KAAK,CAAC,sDAAsD,CAAC;IACxE;IAEA,OAAOD,IAAI,CAACF,gBAAgB;EAC7B,CAAC,CAAC;EACF,MAAMI,gBAAgB,GAAG,IAAAC,gCAAmB,EAC1CC,CAAC,IAAKA,CAAC,CAACC,WAAW,CAACH,gBACtB,CAAC;EACD,MAAMI,QAAQ,GAAG,IAAAC,0BAAkB,EAAEC,KAAK,IAAKA,KAAK,CAACF,QAAQ,CAAC;EAC9D,MAAMG,cAAc,GAAG,IAAAC,qCAAc,EAAgB,IAAI,CAAC;EAC1D,MAAMC,eAAe,GAAG,IAAAD,qCAAc,EAAC,KAAK,CAAC;EAC7C,MAAME,aAAa,GAAG,IAAAC,8BAAgB,EAACX,gBAAgB,CAAC;EAExD,IAAAY,wDAA2B,EAAC;IAC3BjB,UAAU;IACVK,gBAAgB;IAChBU,aAAa;IACbd,gBAAgB;IAChBW,cAAc;IACdE,eAAe;IACfL;EACD,CAAC,CAAC;EAEF,MAAMS,aAAa,GAAG,IAAAC,uCAAgB,EAAC,MAAM;IAC5C,SAAS;;IAET,MAAMC,IAAI,GAAGX,QAAQ,CAACY,GAAG,CAAC,CAAC,CAACrB,UAAU,CAAC;IACvC,MAAM;MACLsB,aAAa,EAAEC,cAAc;MAC7BC,QAAQ;MACR,GAAGC;IACJ,CAAC,GAAGL,IAAI,EAAEM,KAAK,IAAI,CAAC,CAAC;IAErB,MAAMC,YAAY,GACjBP,IAAI,KAAKQ,SAAS,IAClB,IAAAC,kCAAiB,EAACL,QAAQ,CAAC,IAC3BV,eAAe,CAACO,GAAG,CAAC,CAAC;IAEtB,MAAMS,QAAQ,GAAGH,YAAY,GAC1Bf,cAAc,CAACS,GAAG,CAAC,CAAC,GACpBU,oCAA4B;IAE/B,OAAO;MACN,GAAGN,SAAS;MACZK;IACD,CAAC;EACF,CAAC,CAAC;EAEF,OAAO;IAAEZ;EAAc,CAAC;AACzB,CAAC;AAACc,OAAA,CAAAjC,2BAAA,GAAAA,2BAAA","ignoreList":[]}

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

@@ -4,34 +4,22 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.useHostMeasurement = void 0;
-var _react = require("react");
 var _reactNativeReanimated = require("react-native-reanimated");
-var _reactNativeWorklets = require("react-native-worklets");
-var _scroll = require("../../../../../../stores/scroll.store");
-var _visibilityBlockOffset = require("../../../../../../utils/visibility-block-offset");
-var _measuredBounds = require("../../../../utils/measured-bounds");
-var _hostBounds = require("../stores/host-bounds.store");
 const HOST_MEASUREMENT_RETRY_DELAY_MS = 16;
 const useHostMeasurement = ({
-  capturesScroll,
-  enabled,
-  hostKey,
-  screenKey,
-  visibilityBlocked,
-  viewportHeight,
-  viewportWidth
+  measurementKey
 }) => {
   const hostRef = (0, _reactNativeReanimated.useAnimatedRef)();
-  const scrollMetadata = _scroll.ScrollStore.getValue(screenKey, "metadata");
-  const hasMeasuredHost = (0, _reactNativeReanimated.useSharedValue)(false);
+  const hostBounds = (0, _reactNativeReanimated.useSharedValue)(null);
+  const measuredKey = (0, _reactNativeReanimated.useSharedValue)(null);
   const retryToken = (0, _reactNativeReanimated.useSharedValue)(0);
   (0, _reactNativeReanimated.useAnimatedReaction)(() => {
     "worklet";
 
-    if (!enabled) {
+    if (!measurementKey) {
       return null;
     }
-    return [hasMeasuredHost.get(), retryToken.get()];
+    return [measurementKey, measuredKey.get(), retryToken.get()];
   }, state => {
     "worklet";
 
@@ -39,8 +27,8 @@ const useHostMeasurement = ({
       (0, _reactNativeReanimated.cancelAnimation)(retryToken);
       return;
     }
-    const [hasAlreadyMeasured] = state;
-    if (!enabled || hasAlreadyMeasured) {
+    const [requestedKey, completedKey] = state;
+    if (requestedKey === completedKey) {
       return;
     }
     const measured = (0, _reactNativeReanimated.measure)(hostRef);
@@ -52,44 +40,27 @@ const useHostMeasurement = ({
       return;
     }
     (0, _reactNativeReanimated.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 ? (0, _measuredBounds.adjustedMeasuredBoundsForOverscrollDeltas)(measured, currentScroll) : measured;
-    const correctedMeasured = (0, _measuredBounds.correctMeasuredBoundsForVisibilityGate)({
-      measured: overscrollNormalized,
-      visibilityBlocked: visibilityBlocked.get(),
-      visibilityBlockOffset: (0, _visibilityBlockOffset.getVisibilityBlockOffset)(viewportHeight),
-      viewportWidth,
-      viewportHeight
-    });
-    if (correctedMeasured.width <= 0 || correctedMeasured.height <= 0) {
+    if (measured.width <= 0 || measured.height <= 0) {
       (0, _reactNativeReanimated.cancelAnimation)(retryToken);
       retryToken.set((0, _reactNativeReanimated.withDelay)(HOST_MEASUREMENT_RETRY_DELAY_MS, (0, _reactNativeReanimated.withTiming)(retryToken.get() + 1, {
         duration: 0
       })));
       return;
     }
-    (0, _hostBounds.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);
   });
-  (0, _react.useLayoutEffect)(() => {
-    return () => {
-      (0, _reactNativeWorklets.scheduleOnUI)(_hostBounds.clearPortalHostBounds, hostKey);
-    };
-  }, [hostKey]);
   return {
-    hostRef
+    hostBounds,
+    hostRef,
+    measuredKey
   };
 };
 exports.useHostMeasurement = useHostMeasurement;

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

@@ -1 +1 @@
-{"version":3,"names":["_react","require","_reactNativeReanimated","_reactNativeWorklets","_scroll","_visibilityBlockOffset","_measuredBounds","_hostBounds","HOST_MEASUREMENT_RETRY_DELAY_MS","useHostMeasurement","capturesScroll","enabled","hostKey","screenKey","visibilityBlocked","viewportHeight","viewportWidth","hostRef","useAnimatedRef","scrollMetadata","ScrollStore","getValue","hasMeasuredHost","useSharedValue","retryToken","useAnimatedReaction","get","state","cancelAnimation","hasAlreadyMeasured","measured","measure","set","withDelay","withTiming","duration","currentScroll","overscrollNormalized","adjustedMeasuredBoundsForOverscrollDeltas","correctedMeasured","correctMeasuredBoundsForVisibilityGate","visibilityBlockOffset","getVisibilityBlockOffset","width","height","setPortalHostBounds","x","y","pageX","pageY","scroll","useLayoutEffect","scheduleOnUI","clearPortalHostBounds","exports"],"sourceRoot":"../../../../../../../../src","sources":["components/boundary/portal/components/boundary-portal/hooks/use-host-measurement.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_reactNativeReanimated","require","HOST_MEASUREMENT_RETRY_DELAY_MS","useHostMeasurement","measurementKey","hostRef","useAnimatedRef","hostBounds","useSharedValue","measuredKey","retryToken","useAnimatedReaction","get","state","cancelAnimation","requestedKey","completedKey","measured","measure","set","withDelay","withTiming","duration","width","height","x","y","pageX","pageY","exports"],"sourceRoot":"../../../../../../../../src","sources":["components/boundary/portal/components/boundary-portal/hooks/use-host-measurement.ts"],"mappings":";;;;;;AACA,IAAAA,sBAAA,GAAAC,OAAA;AAWA,MAAMC,+BAA+B,GAAG,EAAE;AAMnC,MAAMC,kBAAkB,GAAGA,CAAC;EAClCC;AACyB,CAAC,KAAK;EAC/B,MAAMC,OAAO,GAAG,IAAAC,qCAAc,EAAO,CAAC;EACtC,MAAMC,UAAU,GAAG,IAAAC,qCAAc,EAA4B,IAAI,CAAC;EAClE,MAAMC,WAAW,GAAG,IAAAD,qCAAc,EAAgB,IAAI,CAAC;EACvD,MAAME,UAAU,GAAG,IAAAF,qCAAc,EAAC,CAAC,CAAC;EAEpC,IAAAG,0CAAmB,EAClB,MAAM;IACL,SAAS;;IACT,IAAI,CAACP,cAAc,EAAE;MACpB,OAAO,IAAI;IACZ;IAEA,OAAO,CAACA,cAAc,EAAEK,WAAW,CAACG,GAAG,CAAC,CAAC,EAAEF,UAAU,CAACE,GAAG,CAAC,CAAC,CAAC;EAC7D,CAAC,EACAC,KAAK,IAAK;IACV,SAAS;;IACT,IAAI,CAACA,KAAK,EAAE;MACX,IAAAC,sCAAe,EAACJ,UAAU,CAAC;MAC3B;IACD;IAEA,MAAM,CAACK,YAAY,EAAEC,YAAY,CAAC,GAAGH,KAAK;IAC1C,IAAIE,YAAY,KAAKC,YAAY,EAAE;MAClC;IACD;IAEA,MAAMC,QAAQ,GAAG,IAAAC,8BAAO,EAACb,OAAO,CAAC;IAEjC,IAAI,CAACY,QAAQ,EAAE;MACd,IAAAH,sCAAe,EAACJ,UAAU,CAAC;MAC3BA,UAAU,CAACS,GAAG,CACb,IAAAC,gCAAS,EACRlB,+BAA+B,EAC/B,IAAAmB,iCAAU,EAACX,UAAU,CAACE,GAAG,CAAC,CAAC,GAAG,CAAC,EAAE;QAAEU,QAAQ,EAAE;MAAE,CAAC,CACjD,CACD,CAAC;MACD;IACD;IAEA,IAAAR,sCAAe,EAACJ,UAAU,CAAC;IAE3B,IAAIO,QAAQ,CAACM,KAAK,IAAI,CAAC,IAAIN,QAAQ,CAACO,MAAM,IAAI,CAAC,EAAE;MAChD,IAAAV,sCAAe,EAACJ,UAAU,CAAC;MAC3BA,UAAU,CAACS,GAAG,CACb,IAAAC,gCAAS,EACRlB,+BAA+B,EAC/B,IAAAmB,iCAAU,EAACX,UAAU,CAACE,GAAG,CAAC,CAAC,GAAG,CAAC,EAAE;QAAEU,QAAQ,EAAE;MAAE,CAAC,CACjD,CACD,CAAC;MACD;IACD;IAEAf,UAAU,CAACY,GAAG,CAAC;MACdM,CAAC,EAAER,QAAQ,CAACQ,CAAC;MACbC,CAAC,EAAET,QAAQ,CAACS,CAAC;MACbH,KAAK,EAAEN,QAAQ,CAACM,KAAK;MACrBC,MAAM,EAAEP,QAAQ,CAACO,MAAM;MACvBG,KAAK,EAAEV,QAAQ,CAACU,KAAK;MACrBC,KAAK,EAAEX,QAAQ,CAACW;IACjB,CAAC,CAAC;IACFnB,WAAW,CAACU,GAAG,CAACJ,YAAY,CAAC;EAC9B,CACD,CAAC;EACD,OAAO;IACNR,UAAU;IACVF,OAAO;IACPI;EACD,CAAC;AACF,CAAC;AAACoB,OAAA,CAAA1B,kBAAA,GAAAA,kBAAA","ignoreList":[]}

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

@@ -5,13 +5,14 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.BoundaryPortal = void 0;
 var _react = require("react");
-var _reactNativeReanimated = _interopRequireWildcard(require("react-native-reanimated"));
+var _reactNativeReanimated = _interopRequireDefault(require("react-native-reanimated"));
+var _reactNativeWorklets = require("react-native-worklets");
 var _logger = require("../../../../../utils/logger");
 var _teleport = require("../../teleport");
 var _useBoundaryPortalAttachment = require("./hooks/use-boundary-portal-attachment");
 var _usePlaceholderStyles = require("./hooks/use-placeholder-styles");
 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); }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const AnimatedNativePortal = _teleport.NativePortal ? _reactNativeReanimated.default.createAnimatedComponent(_teleport.NativePortal) : null;
 const EnabledNativePortal = AnimatedNativePortal;
 const BoundaryPortal = exports.BoundaryPortal = /*#__PURE__*/(0, _react.memo)(function BoundaryPortal({
@@ -52,7 +53,7 @@ const EnabledBoundaryPortal = /*#__PURE__*/(0, _react.memo)(function EnabledBoun
       nativeEvent: {
         layout
       }
-    }) => (0, _reactNativeReanimated.runOnUI)(handleOnLayout)(layout),
+    }) => (0, _reactNativeWorklets.scheduleOnUI)(handleOnLayout, layout),
     style: placeholderStyle,
     pointerEvents: _teleport.PORTAL_POINTER_EVENTS,
     collapsable: false,

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

@@ -1 +1 @@
-{"version":3,"names":["_react","require","_reactNativeReanimated","_interopRequireWildcard","_logger","_teleport","_useBoundaryPortalAttachment","_usePlaceholderStyles","_jsxRuntime","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","AnimatedNativePortal","TeleportPortal","Animated","createAnimatedComponent","EnabledNativePortal","BoundaryPortal","exports","memo","boundaryId","children","enabled","placeholderRef","isTeleportAvailable","jsx","EnabledBoundaryPortal","__DEV__","logger","warnOnce","teleportProps","useBoundaryPortalAttachment","handleOnLayout","placeholderStyle","usePlaceholderStyles","View","ref","onLayout","nativeEvent","layout","runOnUI","style","pointerEvents","PORTAL_POINTER_EVENTS","collapsable","animatedProps","name"],"sourceRoot":"../../../../../../../src","sources":["components/boundary/portal/components/boundary-portal/index.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_react","require","_reactNativeReanimated","_interopRequireDefault","_reactNativeWorklets","_logger","_teleport","_useBoundaryPortalAttachment","_usePlaceholderStyles","_jsxRuntime","e","__esModule","default","AnimatedNativePortal","TeleportPortal","Animated","createAnimatedComponent","EnabledNativePortal","BoundaryPortal","exports","memo","boundaryId","children","enabled","placeholderRef","isTeleportAvailable","jsx","EnabledBoundaryPortal","__DEV__","logger","warnOnce","teleportProps","useBoundaryPortalAttachment","handleOnLayout","placeholderStyle","usePlaceholderStyles","View","ref","onLayout","nativeEvent","layout","scheduleOnUI","style","pointerEvents","PORTAL_POINTER_EVENTS","collapsable","animatedProps","name"],"sourceRoot":"../../../../../../../src","sources":["components/boundary/portal/components/boundary-portal/index.tsx"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,OAAA;AAOA,IAAAC,sBAAA,GAAAC,sBAAA,CAAAF,OAAA;AACA,IAAAG,oBAAA,GAAAH,OAAA;AACA,IAAAI,OAAA,GAAAJ,OAAA;AACA,IAAAK,SAAA,GAAAL,OAAA;AAKA,IAAAM,4BAAA,GAAAN,OAAA;AACA,IAAAO,qBAAA,GAAAP,OAAA;AAAsE,IAAAQ,WAAA,GAAAR,OAAA;AAAA,SAAAE,uBAAAO,CAAA,WAAAA,CAAA,IAAAA,CAAA,CAAAC,UAAA,GAAAD,CAAA,KAAAE,OAAA,EAAAF,CAAA;AAStE,MAAMG,oBAAoB,GAAGC,sBAAc,GACxCC,8BAAQ,CAACC,uBAAuB,CAChCF,sBACD,CAAC,GACA,IAAI;AACP,MAAMG,mBAAmB,GAAGJ,oBAE3B;AASM,MAAMK,cAAc,GAAAC,OAAA,CAAAD,cAAA,gBAAG,IAAAE,WAAI,EAAC,SAASF,cAAcA,CAAC;EAC1DG,UAAU;EACVC,QAAQ;EACRC,OAAO;EACPC;AACoB,CAAC,EAAE;EACvB,IAAI,CAACD,OAAO,IAAI,CAACE,6BAAmB,IAAI,CAACZ,oBAAoB,EAAE;IAC9D,OAAOS,QAAQ;EAChB;EAEA,oBACC,IAAAb,WAAA,CAAAiB,GAAA,EAACC,qBAAqB;IACrBN,UAAU,EAAEA,UAAW;IACvBG,cAAc,EAAEA,cAAe;IAAAF,QAAA,EAE9BA;EAAQ,CACa,CAAC;AAE1B,CAAC,CAAC;AAEF,MAAMK,qBAAqB,gBAAG,IAAAP,WAAI,EAAC,SAASO,qBAAqBA,CAAC;EACjEN,UAAU;EACVC,QAAQ;EACRE;AACqC,CAAC,EAAE;EACxC,IAAII,OAAO,IAAI,CAACP,UAAU,EAAE;IAC3BQ,cAAM,CAACC,QAAQ,CACd,mBAAmB,EACnB,iEACD,CAAC;EACF;EAEA,MAAM;IAAEC;EAAc,CAAC,GAAG,IAAAC,wDAA2B,EAAC;IAAEX;EAAW,CAAC,CAAC;EAErE,MAAM;IAAEY,cAAc;IAAEC;EAAiB,CAAC,GAAG,IAAAC,0CAAoB,EAAC,CAAC;EAEnE,oBACC,IAAA1B,WAAA,CAAAiB,GAAA,EAACxB,sBAAA,CAAAU,OAAQ,CAACwB,IAAI;IACbC,GAAG,EAAEb,cAAe;IACpBc,QAAQ,EAAEA,CAAC;MAAEC,WAAW,EAAE;QAAEC;MAAO;IAAE,CAAC,KACrC,IAAAC,iCAAY,EAACR,cAAc,EAAEO,MAAM,CACnC;IACDE,KAAK,EAAER,gBAAiB;IACxBS,aAAa,EAAEC,+BAAsB;IACrCC,WAAW,EAAE,KAAM;IAAAvB,QAAA,eAEnB,IAAAb,WAAA,CAAAiB,GAAA,EAACT,mBAAmB;MACnB6B,aAAa,EAAEf,aAAc;MAC7BgB,IAAI,EAAE1B,UAAW;MACjBsB,aAAa,EAAEC,+BAAsB;MAAAtB,QAAA,EAEpCA;IAAQ,CACW;EAAC,CACR,CAAC;AAElB,CAAC,CAAC","ignoreList":[]}

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

@@ -29,7 +29,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;
 };
 const mountPortalBoundaryHost = host => {
   const previous = activeBoundaryHosts.get(host.portalHostName);

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

@@ -1 +1 @@
-{"version":3,"names":["_react","require","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","exports","unmountPortalBoundaryHostByName","delete","subscribe","add","useActivePortalBoundaryHosts","useSyncExternalStore"],"sourceRoot":"../../../../../../../../src","sources":["components/boundary/portal/components/boundary-portal/stores/portal-boundary-host.store.ts"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,OAAA;AAkBA,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;AAEM,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;AAACe,OAAA,CAAAJ,uBAAA,GAAAA,uBAAA;AAEK,MAAMK,+BAA+B,GAC3CT,cAAyC,IACrC;EACJ,IAAI,CAACA,cAAc,IAAI,CAACjB,mBAAmB,CAAC2B,MAAM,CAACV,cAAc,CAAC,EAAE;IACnE;EACD;EAEAP,IAAI,CAAC,CAAC;AACP,CAAC;AAACe,OAAA,CAAAC,+BAAA,GAAAA,+BAAA;AAEF,MAAME,SAAS,GAAIjB,QAAoB,IAAK;EAC3Cb,SAAS,CAAC+B,GAAG,CAAClB,QAAQ,CAAC;EAEvB,OAAO,MAAM;IACZb,SAAS,CAAC6B,MAAM,CAAChB,QAAQ,CAAC;EAC3B,CAAC;AACF,CAAC;AAEM,MAAMmB,4BAA4B,GAAItB,OAAe,IAAK;EAChE,OAAO,IAAAuB,2BAAoB,EAC1BH,SAAS,EACT,MAAM1B,QAAQ,CAACC,YAAY,CAACK,OAAO,CAAC,IAAIX,WAAW,EACnD,MAAMA,WACP,CAAC;AACF,CAAC;AAAC4B,OAAA,CAAAK,4BAAA,GAAAA,4BAAA","ignoreList":[]}
+{"version":3,"names":["_react","require","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","exports","unmountPortalBoundaryHostByName","delete","subscribe","add","useActivePortalBoundaryHosts","useSyncExternalStore"],"sourceRoot":"../../../../../../../../src","sources":["components/boundary/portal/components/boundary-portal/stores/portal-boundary-host.store.ts"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,OAAA;AAmBA,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;AAEM,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;AAACe,OAAA,CAAAJ,uBAAA,GAAAA,uBAAA;AAEK,MAAMK,+BAA+B,GAC3CR,cAAyC,IACrC;EACJ,IAAI,CAACA,cAAc,IAAI,CAAClB,mBAAmB,CAAC2B,MAAM,CAACT,cAAc,CAAC,EAAE;IACnE;EACD;EAEAR,IAAI,CAAC,CAAC;AACP,CAAC;AAACe,OAAA,CAAAC,+BAAA,GAAAA,+BAAA;AAEF,MAAME,SAAS,GAAIjB,QAAoB,IAAK;EAC3Cb,SAAS,CAAC+B,GAAG,CAAClB,QAAQ,CAAC;EAEvB,OAAO,MAAM;IACZb,SAAS,CAAC6B,MAAM,CAAChB,QAAQ,CAAC;EAC3B,CAAC;AACF,CAAC;AAEM,MAAMmB,4BAA4B,GAAItB,OAAe,IAAK;EAChE,OAAO,IAAAuB,2BAAoB,EAC1BH,SAAS,EACT,MAAM1B,QAAQ,CAACC,YAAY,CAACK,OAAO,CAAC,IAAIX,WAAW,EACnD,MAAMA,WACP,CAAC;AACF,CAAC;AAAC4B,OAAA,CAAAK,4BAAA,GAAAA,4BAAA","ignoreList":[]}

package/lib/commonjs/components/boundary/providers/boundary-root.provider.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.useBoundaryRootStore = exports.TARGET_OUTSIDE_ROOT_WARNING = exports.BoundaryRootProvider = void 0;
+exports.useOptionalBoundaryRootStore = exports.useBoundaryRootStore = exports.TARGET_OUTSIDE_ROOT_WARNING = exports.BoundaryRootProvider = void 0;
 var _react = require("react");
 var _reactNativeReanimated = require("react-native-reanimated");
 var _descriptors = require("../../../providers/screen/descriptors");
@@ -12,18 +12,18 @@ var _blankStack = require("../../../providers/stack/blank-stack.provider");
 var _linkPairs = require("../../../stores/bounds/helpers/link-pairs.helpers");
 var _createProvider = _interopRequireDefault(require("../../../utils/create-provider"));
 var _logger = require("../../../utils/logger");
-var _useBoundaryMeasurement = require("../hooks/use-boundary-measurement");
+var _boundaryLifecycle = require("../components/boundary-lifecycle");
 var _resolvePortal = require("../portal/utils/resolve-portal");
+var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 // 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.";
 const TARGET_OUTSIDE_ROOT_WARNING = exports.TARGET_OUTSIDE_ROOT_WARNING = "Boundary.Target must be rendered inside Transition.Boundary or a component created by createBoundaryComponent.";
 const {
   BoundaryRootProvider,
-  useBoundaryRootStore
-} = (0, _createProvider.default)("BoundaryRoot", {
-  guarded: false
-})(({
+  useBoundaryRootStore,
+  useOptionalBoundaryRootStore
+} = (0, _createProvider.default)("BoundaryRoot")(({
   children,
   config,
   enabled = true,
@@ -43,7 +43,7 @@ const {
     escapeClipping
   });
   const currentScreenKey = (0, _descriptors.useDescriptorsStore)(s => s.derivations.currentScreenKey);
-  const isCurrentScreenClosing = (0, _blankStack.useBlankStackStore)(store => store?.scenesByKey[currentScreenKey]?.activity === "closing");
+  const isCurrentScreenClosing = (0, _blankStack.useBlankStackStore)(store => portalRuntime.handoff && store.scenesByKey[currentScreenKey]?.activity === "closing");
   const retainedBoundTagRef = (0, _react.useRef)(requestedBoundTag);
   const shouldRetainClosingBoundTag = portalRuntime.handoff && isCurrentScreenClosing;
 
@@ -54,8 +54,6 @@ const {
     retainedBoundTagRef.current = requestedBoundTag;
   }
   const boundTag = retainedBoundTagRef.current;
-  const hasConfiguredInterpolator = (0, _descriptors.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;
@@ -64,6 +62,7 @@ const {
   const associatedStackingStyles = (0, _styles.useSlotStackingStyles)(boundTag.tag);
   const rootRef = (0, _reactNativeReanimated.useAnimatedRef)();
   const measurementRef = (0, _reactNativeReanimated.useAnimatedRef)();
+  const localMeasurement = (0, _reactNativeReanimated.useSharedValue)(null);
   (0, _react.useLayoutEffect)(() => {
     if (__DEV__ && targetCount > 1) {
       _logger.logger.warnOnce("boundary:multiple-targets", MULTIPLE_TARGETS_WARNING);
@@ -71,17 +70,6 @@ const {
   }, [targetCount]);
   const measuredRef = hasTarget || shouldEscapeBoundaryRootToScreenHost ? measurementRef : rootRef;
   (0, _react.useImperativeHandle)(forwardedRef, () => rootRef.current, [rootRef]);
-  (0, _useBoundaryMeasurement.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
@@ -97,17 +85,31 @@ 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__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
+      children: [children(value), /*#__PURE__*/(0, _jsxRuntime.jsx)(_boundaryLifecycle.BoundaryLifecycle, {
+        boundTag: boundTag,
+        config: config,
+        currentScreenKey: currentScreenKey,
+        enabled: enabled,
+        escapeClipping: portalRuntime.escapeClipping,
+        handoff: portalRuntime.handoff,
+        localMeasurement: localMeasurement,
+        measuredRef: measuredRef,
+        style: hasTarget ? targetStyle : style
+      })]
+    })
   };
 });
+exports.useOptionalBoundaryRootStore = useOptionalBoundaryRootStore;
 exports.useBoundaryRootStore = useBoundaryRootStore;
 exports.BoundaryRootProvider = BoundaryRootProvider;
 //# sourceMappingURL=boundary-root.provider.js.map