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

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

@@ -2,7 +2,8 @@
 
 import { useAnimatedProps, useSharedValue } from "react-native-reanimated";
 import { useDescriptorsStore } from "../../../../../../providers/screen/descriptors";
-import { useScreenSlots } from "../../../../../../providers/screen/styles";
+import { useScreenSlotStore } 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,10 +11,14 @@ 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
-  } = useScreenSlots();
+  const slotsMap = useScreenSlotStore(store => store.slotsMap);
   const portalHostName = useSharedValue(null);
   const portalHostReady = useSharedValue(false);
   const escapeHostKey = useActiveHostKey(currentScreenKey);
@@ -21,6 +26,7 @@ export const useBoundaryPortalAttachment = ({
     boundaryId,
     currentScreenKey,
     escapeHostKey,
+    localMeasurement,
     portalHostName,
     portalHostReady,
     slotsMap

package/lib/module/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":["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","useScreenSlotStore","useBoundaryRootStore","PORTAL_HOST_NAME_RESET_VALUE","isTeleportEnabled","useActiveHostKey","useActivePortalBoundaryHost","useBoundaryPortalAttachment","boundaryId","localMeasurement","root","Error","currentScreenKey","s","derivations","slotsMap","store","portalHostName","portalHostReady","escapeHostKey","teleportProps","slot","get","pointerEvents","_pointerEvents","teleport","slotProps","props","shouldAttach","undefined","hostName"],"sourceRoot":"../../../../../../../../src","sources":["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,kBAAkB,QAAQ,2CAA2C;AAC9E,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,MAAMG,QAAQ,GAAGd,kBAAkB,CAAEe,KAAK,IAAKA,KAAK,CAACD,QAAQ,CAAC;EAC9D,MAAME,cAAc,GAAGlB,cAAc,CAAgB,IAAI,CAAC;EAC1D,MAAMmB,eAAe,GAAGnB,cAAc,CAAC,KAAK,CAAC;EAC7C,MAAMoB,aAAa,GAAGd,gBAAgB,CAACO,gBAAgB,CAAC;EAExDN,2BAA2B,CAAC;IAC3BE,UAAU;IACVI,gBAAgB;IAChBO,aAAa;IACbV,gBAAgB;IAChBQ,cAAc;IACdC,eAAe;IACfH;EACD,CAAC,CAAC;EAEF,MAAMK,aAAa,GAAGtB,gBAAgB,CAAC,MAAM;IAC5C,SAAS;;IAET,MAAMuB,IAAI,GAAGN,QAAQ,CAACO,GAAG,CAAC,CAAC,CAACd,UAAU,CAAC;IACvC,MAAM;MACLe,aAAa,EAAEC,cAAc;MAC7BC,QAAQ;MACR,GAAGC;IACJ,CAAC,GAAGL,IAAI,EAAEM,KAAK,IAAI,CAAC,CAAC;IAErB,MAAMC,YAAY,GACjBP,IAAI,KAAKQ,SAAS,IAClBzB,iBAAiB,CAACqB,QAAQ,CAAC,IAC3BP,eAAe,CAACI,GAAG,CAAC,CAAC;IAEtB,MAAMQ,QAAQ,GAAGF,YAAY,GAC1BX,cAAc,CAACK,GAAG,CAAC,CAAC,GACpBnB,4BAA4B;IAE/B,OAAO;MACN,GAAGuB,SAAS;MACZI;IACD,CAAC;EACF,CAAC,CAAC;EAEF,OAAO;IAAEV;EAAc,CAAC;AACzB,CAAC","ignoreList":[]}

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

@@ -1,33 +1,21 @@
 "use strict";
 
-import { useLayoutEffect } from "react";
 import { cancelAnimation, measure, useAnimatedReaction, useAnimatedRef, useSharedValue, withDelay, withTiming } from "react-native-reanimated";
-import { scheduleOnUI } from "react-native-worklets";
-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";
 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";
 
@@ -35,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);
@@ -48,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 () => {
-      scheduleOnUI(clearPortalHostBounds, hostKey);
-    };
-  }, [hostKey]);
   return {
-    hostRef
+    hostBounds,
+    hostRef,
+    measuredKey
   };
 };
 //# sourceMappingURL=use-host-measurement.js.map

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

@@ -1 +1 @@
-{"version":3,"names":["useLayoutEffect","cancelAnimation","measure","useAnimatedReaction","useAnimatedRef","useSharedValue","withDelay","withTiming","scheduleOnUI","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":["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":["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;EACD,OAAO;IACNL,UAAU;IACVD,OAAO;IACPE;EACD,CAAC;AACF,CAAC","ignoreList":[]}

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

@@ -1,7 +1,8 @@
 "use strict";
 
 import { memo } from "react";
-import Animated, { runOnUI } from "react-native-reanimated";
+import Animated from "react-native-reanimated";
+import { scheduleOnUI } from "react-native-worklets";
 import { logger } from "../../../../../utils/logger";
 import { isTeleportAvailable, PORTAL_POINTER_EVENTS, NativePortal as TeleportPortal } from "../../teleport";
 import { useBoundaryPortalAttachment } from "./hooks/use-boundary-portal-attachment";
@@ -47,7 +48,7 @@ const EnabledBoundaryPortal = /*#__PURE__*/memo(function EnabledBoundaryPortal({
       nativeEvent: {
         layout
       }
-    }) => runOnUI(handleOnLayout)(layout),
+    }) => scheduleOnUI(handleOnLayout, layout),
     style: placeholderStyle,
     pointerEvents: PORTAL_POINTER_EVENTS,
     collapsable: false,

package/lib/module/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":["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","scheduleOnUI","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":["components/boundary/portal/components/boundary-portal/index.tsx"],"mappings":";;AAAA,SAGCA,IAAI,QAEE,OAAO;AAEd,OAAOC,QAAQ,MAA4B,yBAAyB;AACpE,SAASC,YAAY,QAAQ,uBAAuB;AACpD,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,YAAY,CAACsB,cAAc,EAAEM,MAAM,CACnC;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/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/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":["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":["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/components/boundary/providers/boundary-root.provider.js

@@ -1,24 +1,24 @@
 "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.";
 export const {
   BoundaryRootProvider,
-  useBoundaryRootStore
-} = createProvider("BoundaryRoot", {
-  guarded: false
-})(({
+  useBoundaryRootStore,
+  useOptionalBoundaryRootStore
+} = createProvider("BoundaryRoot")(({
   children,
   config,
   enabled = true,
@@ -38,7 +38,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 +49,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 +57,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 +65,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 +80,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

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

@@ -1 +1 @@
-{"version":3,"names":["useImperativeHandle","useLayoutEffect","useMemo","useRef","useAnimatedRef","useDescriptorsStore","useComposedSlotStyles","useSlotStackingStyles","useBlankStackStore","createBoundTag","createProvider","logger","useBoundaryMeasurement","resolveBoundaryPortal","MULTIPLE_TARGETS_WARNING","TARGET_OUTSIDE_ROOT_WARNING","BoundaryRootProvider","useBoundaryRootStore","guarded","children","config","enabled","escapeClipping","forwardedRef","group","handoff","hasTarget","id","style","targetCount","targetStyle","requestedBoundTag","String","portalRuntime","currentScreenKey","s","derivations","isCurrentScreenClosing","store","scenesByKey","activity","retainedBoundTagRef","shouldRetainClosingBoundTag","current","boundTag","hasConfiguredInterpolator","runtimeEnabled","shouldAttachAssociatedStyles","shouldEscapeBoundaryRootToScreenHost","associatedStyles","tag","associatedStackingStyles","rootRef","measurementRef","__DEV__","warnOnce","measuredRef","shouldRenderBoundaryRootThroughPortal","handoffEnabled","attachedStyle","undefined","value","ref","shouldRenderHandoffHost"],"sourceRoot":"../../../../../src","sources":["components/boundary/providers/boundary-root.provider.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["useImperativeHandle","useLayoutEffect","useMemo","useRef","useAnimatedRef","useSharedValue","useDescriptorsStore","useComposedSlotStyles","useSlotStackingStyles","useBlankStackStore","createBoundTag","createProvider","logger","BoundaryLifecycle","resolveBoundaryPortal","jsx","_jsx","Fragment","_Fragment","jsxs","_jsxs","MULTIPLE_TARGETS_WARNING","TARGET_OUTSIDE_ROOT_WARNING","BoundaryRootProvider","useBoundaryRootStore","useOptionalBoundaryRootStore","children","config","enabled","escapeClipping","forwardedRef","group","handoff","hasTarget","id","style","targetCount","targetStyle","requestedBoundTag","String","portalRuntime","currentScreenKey","s","derivations","isCurrentScreenClosing","store","scenesByKey","activity","retainedBoundTagRef","shouldRetainClosingBoundTag","current","boundTag","shouldAttachAssociatedStyles","shouldEscapeBoundaryRootToScreenHost","associatedStyles","tag","associatedStackingStyles","rootRef","measurementRef","localMeasurement","__DEV__","warnOnce","measuredRef","shouldRenderBoundaryRootThroughPortal","handoffEnabled","attachedStyle","undefined","value","ref","shouldRenderHandoffHost"],"sourceRoot":"../../../../../src","sources":["components/boundary/providers/boundary-root.provider.tsx"],"mappings":"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","ignoreList":[]}

package/lib/module/components/boundary/utils/refresh-signals.js

@@ -23,11 +23,12 @@ export const getRefreshBoundarySignal = params => {
     linkId,
     group,
     shouldRefresh,
+    settled = false,
     closing,
     linkState
   } = params;
   if (!enabled) return null;
-  if (!shouldRefresh) {
+  if (!shouldRefresh && (!group || !settled)) {
     return null;
   }
 
@@ -55,24 +56,37 @@ export const getRefreshBoundarySignal = params => {
   // Source side:
   // When the activeId changes, trigger a refresh to ensure the source bounds are captured.
   if (sourcePairKey) {
-    const activeId = linkState?.[sourcePairKey]?.groups?.[group]?.activeId;
+    const pair = linkState?.[sourcePairKey];
+    const groupState = pair?.groups?.[group];
+    const activeId = groupState?.activeId;
     if (activeId !== linkId) {
       return null;
     }
-    return buildRefreshSignal("source", sourcePairKey, [group, linkId, closing ? "closing" : "settled"].join("|"));
+
+    // The opening member is captured by the initial handshake. A settled
+    // refresh is only needed after selection moves to another member.
+    if (!shouldRefresh && (groupState?.initialId === undefined || activeId === groupState.initialId || !!pair?.links?.[linkId]?.source)) {
+      return null;
+    }
+    return buildRefreshSignal("source", sourcePairKey, [group, linkId, shouldRefresh ? closing ? "closing" : "settled" : "retarget"].join("|"));
   }
   const refreshDestinationPairKey = destinationPairKey;
   if (!refreshDestinationPairKey) return null;
 
   // Destination side:
   // When the activeId changes, trigger a refresh to ensure the destination bounds are captured.
-  const activeId = linkState?.[refreshDestinationPairKey]?.groups?.[group]?.activeId;
+  const pair = linkState?.[refreshDestinationPairKey];
+  const groupState = pair?.groups?.[group];
+  const activeId = groupState?.activeId;
 
   // Destination retargeting should only measure a concrete member that already
   // participates in the pair. Missing members fall back to initialId at resolve.
   if (activeId !== linkId) {
     return null;
   }
-  return buildRefreshSignal("destination", refreshDestinationPairKey, [group, linkId, closing ? "closing" : "settled"].join("|"));
+  if (!shouldRefresh && (groupState?.initialId === undefined || activeId === groupState.initialId || !!pair?.links?.[linkId]?.destination)) {
+    return null;
+  }
+  return buildRefreshSignal("destination", refreshDestinationPairKey, [group, linkId, shouldRefresh ? closing ? "closing" : "settled" : "retarget"].join("|"));
 };
 //# sourceMappingURL=refresh-signals.js.map

package/lib/module/components/boundary/utils/refresh-signals.js.map

@@ -1 +1 @@
-{"version":3,"names":["SOURCE_SIGNAL_PREFIX","DESTINATION_SIGNAL_PREFIX","buildRefreshSignal","type","pairKey","key","prefix","signal","getRefreshBoundarySignal","params","enabled","currentScreenKey","sourcePairKey","destinationPairKey","linkId","group","shouldRefresh","closing","linkState","sourcePair","participates","links","sourceRequests","join","refreshDestinationPairKey","activeId","groups"],"sourceRoot":"../../../../../src","sources":["components/boundary/utils/refresh-signals.ts"],"mappings":";;AAMA,MAAMA,oBAAoB,GAAG,SAAS;AACtC,MAAMC,yBAAyB,GAAG,cAAc;AAMhD,MAAMC,kBAAkB,GAAGA,CAC1BC,IAA2B,EAC3BC,OAAsB,EACtBC,GAAW,KACgB;EAC3B,SAAS;;EACT,MAAMC,MAAM,GACXH,IAAI,KAAK,QAAQ,GAAGH,oBAAoB,GAAGC,yBAAyB;EACrE,OAAO;IACNE,IAAI;IACJC,OAAO;IACPG,MAAM,EAAE,GAAGD,MAAM,GAAGF,OAAO,IAAIC,GAAG;EACnC,CAAC;AACF,CAAC;AAED,OAAO,MAAMG,wBAAwB,GAAIC,MAUxC,IAAmC;EACnC,SAAS;;EACT,MAAM;IACLC,OAAO;IACPC,gBAAgB;IAChBC,aAAa;IACbC,kBAAkB;IAClBC,MAAM;IACNC,KAAK;IACLC,aAAa;IACbC,OAAO;IACPC;EACD,CAAC,GAAGT,MAAM;EAEV,IAAI,CAACC,OAAO,EAAE,OAAO,IAAI;EAEzB,IAAI,CAACM,aAAa,EAAE;IACnB,OAAO,IAAI;EACZ;;EAEA;EACA;EACA,IAAI,CAACD,KAAK,EAAE;IACX,IAAIH,aAAa,EAAE;MAClB,MAAMO,UAAU,GAAGD,SAAS,GAAGN,aAAa,CAAC;MAC7C,MAAMQ,YAAY,GACjB,CAAC,CAACD,UAAU,EAAEE,KAAK,GAAGP,MAAM,CAAC,IAAI,CAAC,CAACK,UAAU,EAAEG,cAAc,GAAGR,MAAM,CAAC;MAExE,IAAI,CAACM,YAAY,EAAE;QAClB,OAAO,IAAI;MACZ;MAEA,OAAOlB,kBAAkB,CACxB,QAAQ,EACRU,aAAa,EACb,CAACD,gBAAgB,EAAEM,OAAO,GAAG,SAAS,GAAG,SAAS,CAAC,CAACM,IAAI,CAAC,GAAG,CAC7D,CAAC;IACF;IAEA,MAAMC,yBAAyB,GAAGX,kBAAkB;IAEpD,IAAI,CAACW,yBAAyB,EAAE;MAC/B,OAAO,IAAI;IACZ;IAEA,IAAI,CAACN,SAAS,GAAGM,yBAAyB,CAAC,EAAEH,KAAK,GAAGP,MAAM,CAAC,EAAE;MAC7D,OAAO,IAAI;IACZ;IAEA,OAAOZ,kBAAkB,CACxB,aAAa,EACbsB,yBAAyB,EACzB,CAACb,gBAAgB,EAAEM,OAAO,GAAG,SAAS,GAAG,SAAS,CAAC,CAACM,IAAI,CAAC,GAAG,CAC7D,CAAC;EACF;;EAEA;EACA;EACA,IAAIX,aAAa,EAAE;IAClB,MAAMa,QAAQ,GAAGP,SAAS,GAAGN,aAAa,CAAC,EAAEc,MAAM,GAAGX,KAAK,CAAC,EAAEU,QAAQ;IAEtE,IAAIA,QAAQ,KAAKX,MAAM,EAAE;MACxB,OAAO,IAAI;IACZ;IAEA,OAAOZ,kBAAkB,CACxB,QAAQ,EACRU,aAAa,EACb,CAACG,KAAK,EAAED,MAAM,EAAEG,OAAO,GAAG,SAAS,GAAG,SAAS,CAAC,CAACM,IAAI,CAAC,GAAG,CAC1D,CAAC;EACF;EAEA,MAAMC,yBAAyB,GAAGX,kBAAkB;EAEpD,IAAI,CAACW,yBAAyB,EAAE,OAAO,IAAI;;EAE3C;EACA;EACA,MAAMC,QAAQ,GACbP,SAAS,GAAGM,yBAAyB,CAAC,EAAEE,MAAM,GAAGX,KAAK,CAAC,EAAEU,QAAQ;;EAElE;EACA;EACA,IAAIA,QAAQ,KAAKX,MAAM,EAAE;IACxB,OAAO,IAAI;EACZ;EAEA,OAAOZ,kBAAkB,CACxB,aAAa,EACbsB,yBAAyB,EACzB,CAACT,KAAK,EAAED,MAAM,EAAEG,OAAO,GAAG,SAAS,GAAG,SAAS,CAAC,CAACM,IAAI,CAAC,GAAG,CAC1D,CAAC;AACF,CAAC","ignoreList":[]}
+{"version":3,"names":["SOURCE_SIGNAL_PREFIX","DESTINATION_SIGNAL_PREFIX","buildRefreshSignal","type","pairKey","key","prefix","signal","getRefreshBoundarySignal","params","enabled","currentScreenKey","sourcePairKey","destinationPairKey","linkId","group","shouldRefresh","settled","closing","linkState","sourcePair","participates","links","sourceRequests","join","refreshDestinationPairKey","pair","groupState","groups","activeId","initialId","undefined","source","destination"],"sourceRoot":"../../../../../src","sources":["components/boundary/utils/refresh-signals.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/components/overlay/helpers/create-overlay-interpolator-frame.js

@@ -0,0 +1,30 @@
+"use strict";
+
+import { updateDerivations } from "../../../providers/screen/animation/helpers/derivations";
+export const shouldUseOverlayGestureDriver = (overlayFrame, driverFrame) => {
+  "worklet";
+
+  const gesture = overlayFrame.current.gesture;
+  return driverFrame.current.route.key !== overlayFrame.current.route.key && !!(gesture.dragging || gesture.dismissing || gesture.settling);
+};
+export const createOverlayInterpolatorFrame = ({
+  overlayFrame,
+  driverFrame,
+  previousOverlayFrame
+}) => {
+  "worklet";
+
+  const current = overlayFrame.current;
+  const driverIsCurrent = driverFrame.current.route.key === current.route.key;
+  const frame = {
+    ...overlayFrame,
+    previous: previousOverlayFrame?.current,
+    current,
+    next: driverIsCurrent ? undefined : driverFrame.current,
+    layouts: current.layouts
+  };
+  updateDerivations(frame);
+  frame.stackProgress = overlayFrame.stackProgress;
+  return frame;
+};
+//# sourceMappingURL=create-overlay-interpolator-frame.js.map

package/lib/module/components/overlay/helpers/create-overlay-interpolator-frame.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["updateDerivations","shouldUseOverlayGestureDriver","overlayFrame","driverFrame","gesture","current","route","key","dragging","dismissing","settling","createOverlayInterpolatorFrame","previousOverlayFrame","driverIsCurrent","frame","previous","next","undefined","layouts","stackProgress"],"sourceRoot":"../../../../../src","sources":["components/overlay/helpers/create-overlay-interpolator-frame.ts"],"mappings":";;AAAA,SAASA,iBAAiB,QAAQ,yDAAyD;AAG3F,OAAO,MAAMC,6BAA6B,GAAGA,CAC5CC,YAAqC,EACrCC,WAAoC,KACvB;EACb,SAAS;;EACT,MAAMC,OAAO,GAAGF,YAAY,CAACG,OAAO,CAACD,OAAO;EAE5C,OACCD,WAAW,CAACE,OAAO,CAACC,KAAK,CAACC,GAAG,KAAKL,YAAY,CAACG,OAAO,CAACC,KAAK,CAACC,GAAG,IAChE,CAAC,EAAEH,OAAO,CAACI,QAAQ,IAAIJ,OAAO,CAACK,UAAU,IAAIL,OAAO,CAACM,QAAQ,CAAC;AAEhE,CAAC;AAED,OAAO,MAAMC,8BAA8B,GAAGA,CAAC;EAC9CT,YAAY;EACZC,WAAW;EACXS;AAKD,CAAC,KAA8B;EAC9B,SAAS;;EACT,MAAMP,OAAO,GAAGH,YAAY,CAACG,OAAO;EACpC,MAAMQ,eAAe,GAAGV,WAAW,CAACE,OAAO,CAACC,KAAK,CAACC,GAAG,KAAKF,OAAO,CAACC,KAAK,CAACC,GAAG;EAC3E,MAAMO,KAA8B,GAAG;IACtC,GAAGZ,YAAY;IACfa,QAAQ,EAAEH,oBAAoB,EAAEP,OAAO;IACvCA,OAAO;IACPW,IAAI,EAAEH,eAAe,GAAGI,SAAS,GAAGd,WAAW,CAACE,OAAO;IACvDa,OAAO,EAAEb,OAAO,CAACa;EAClB,CAAC;EAEDlB,iBAAiB,CAACc,KAAK,CAAC;EACxBA,KAAK,CAACK,aAAa,GAAGjB,YAAY,CAACiB,aAAa;EAEhD,OAAOL,KAAK;AACb,CAAC","ignoreList":[]}

package/lib/module/components/overlay/helpers/get-active-overlay.js

@@ -1,37 +1,65 @@
 "use strict";
 
 import { isOverlayVisible } from "../../../utils/overlay/visibility";
+const resolveOverlayActivity = (scene, distanceFromTop) => {
+  if (distanceFromTop === 0 && scene.activity === "closing") {
+    return "closing";
+  }
+  if (distanceFromTop === 0) {
+    return "active";
+  }
+  if (distanceFromTop === 1) {
+    return "inert";
+  }
+  return "inactive";
+};
 
 /**
- * Find the active float overlay from scenes.
- * Scans from the top of the stack downward to find the first screen
- * with a visible overlay.
+ * Finds every visible floating-overlay checkpoint in stack order.
+ *
+ * The newest checkpoint owns the active overlay. Its immediate predecessor
+ * remains visible and inert; all older checkpoints are retained but inactive.
+ * This mirrors the screen activity window without making plain screens create
+ * a new overlay checkpoint.
  */
-export function getActiveFloatOverlay(scenes, index, transitionsAlwaysOn) {
-  if (scenes.length === 0) {
-    return null;
-  }
-
-  // When navigating back, closing scenes are kept at the top of the local stack
-  // while the focused index already points to the destination screen. We need to
-  // start scanning from the actual top of the stack so the overlay can animate
-  // out together with its closing screen instead of disappearing immediately.
-  const startIndex = Math.max(index, scenes.length - 1);
-  for (let i = startIndex; i >= 0; i--) {
-    const scene = scenes[i];
+export function getFloatOverlayStack(scenes, transitionsAlwaysOn) {
+  const candidates = [];
+  for (let index = 0; index < scenes.length; index += 1) {
+    const scene = scenes[index];
     const options = scene?.descriptor?.options;
-
-    // Skip screens without enableTransitions (native-stack only)
     if (!transitionsAlwaysOn && !options?.enableTransitions) {
       continue;
     }
     if (isOverlayVisible(options)) {
-      return {
+      candidates.push({
         scene,
-        overlayIndex: i
-      };
+        overlayIndex: index
+      });
     }
   }
-  return null;
+  const topIndex = candidates.length - 1;
+  return candidates.map((candidate, index) => ({
+    ...candidate,
+    activity: resolveOverlayActivity(candidate.scene, topIndex - index)
+  }));
+}
+export function getFloatOverlayTransitions(overlayStack, scenes) {
+  const topScene = scenes[scenes.length - 1];
+  return overlayStack.map((entry, index) => {
+    const nextEntry = overlayStack[index + 1];
+    let nextPresentedEntry;
+    for (let nextIndex = index + 1; nextIndex < overlayStack.length; nextIndex++) {
+      const candidate = overlayStack[nextIndex];
+      if (candidate?.scene.activity !== "closing") {
+        nextPresentedEntry = candidate;
+        break;
+      }
+    }
+    const driverScene = entry.scene.activity === "closing" && nextEntry ? entry.scene : nextPresentedEntry?.scene ?? nextEntry?.scene ?? topScene ?? entry.scene;
+    return {
+      ...entry,
+      driverScene
+    };
+  });
 }
 //# sourceMappingURL=get-active-overlay.js.map

package/lib/module/components/overlay/helpers/get-active-overlay.js.map

@@ -1 +1 @@
-{"version":3,"names":["isOverlayVisible","getActiveFloatOverlay","scenes","index","transitionsAlwaysOn","length","startIndex","Math","max","i","scene","options","descriptor","enableTransitions","overlayIndex"],"sourceRoot":"../../../../../src","sources":["components/overlay/helpers/get-active-overlay.ts"],"mappings":";;AACA,SAASA,gBAAgB,QAAQ,mCAAmC;;AAEpE;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,qBAAqBA,CACpCC,MAAoB,EACpBC,KAAa,EACbC,mBAA4B,EACyB;EACrD,IAAIF,MAAM,CAACG,MAAM,KAAK,CAAC,EAAE;IACxB,OAAO,IAAI;EACZ;;EAEA;EACA;EACA;EACA;EACA,MAAMC,UAAU,GAAGC,IAAI,CAACC,GAAG,CAACL,KAAK,EAAED,MAAM,CAACG,MAAM,GAAG,CAAC,CAAC;EAErD,KAAK,IAAII,CAAC,GAAGH,UAAU,EAAEG,CAAC,IAAI,CAAC,EAAEA,CAAC,EAAE,EAAE;IACrC,MAAMC,KAAK,GAAGR,MAAM,CAACO,CAAC,CAAC;IACvB,MAAME,OAAO,GAAGD,KAAK,EAAEE,UAAU,EAAED,OAAO;;IAE1C;IACA,IAAI,CAACP,mBAAmB,IAAI,CAACO,OAAO,EAAEE,iBAAiB,EAAE;MACxD;IACD;IAEA,IAAIb,gBAAgB,CAACW,OAAO,CAAC,EAAE;MAC9B,OAAO;QAAED,KAAK;QAAEI,YAAY,EAAEL;MAAE,CAAC;IAClC;EACD;EAEA,OAAO,IAAI;AACZ","ignoreList":[]}
+{"version":3,"names":["isOverlayVisible","resolveOverlayActivity","scene","distanceFromTop","activity","getFloatOverlayStack","scenes","transitionsAlwaysOn","candidates","index","length","options","descriptor","enableTransitions","push","overlayIndex","topIndex","map","candidate","getFloatOverlayTransitions","overlayStack","topScene","entry","nextEntry","nextPresentedEntry","nextIndex","driverScene"],"sourceRoot":"../../../../../src","sources":["components/overlay/helpers/get-active-overlay.ts"],"mappings":";;AAIA,SAASA,gBAAgB,QAAQ,mCAAmC;AAgBpE,MAAMC,sBAAsB,GAAGA,CAC9BC,KAAiB,EACjBC,eAAuB,KACG;EAC1B,IAAIA,eAAe,KAAK,CAAC,IAAID,KAAK,CAACE,QAAQ,KAAK,SAAS,EAAE;IAC1D,OAAO,SAAS;EACjB;EAEA,IAAID,eAAe,KAAK,CAAC,EAAE;IAC1B,OAAO,QAAQ;EAChB;EAEA,IAAIA,eAAe,KAAK,CAAC,EAAE;IAC1B,OAAO,OAAO;EACf;EAEA,OAAO,UAAU;AAClB,CAAC;;AAED;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASE,oBAAoBA,CACnCC,MAAoB,EACpBC,mBAA4B,EACN;EACtB,MAAMC,UAA8B,GAAG,EAAE;EAEzC,KAAK,IAAIC,KAAK,GAAG,CAAC,EAAEA,KAAK,GAAGH,MAAM,CAACI,MAAM,EAAED,KAAK,IAAI,CAAC,EAAE;IACtD,MAAMP,KAAK,GAAGI,MAAM,CAACG,KAAK,CAAC;IAC3B,MAAME,OAAO,GAAGT,KAAK,EAAEU,UAAU,EAAED,OAAO;IAE1C,IAAI,CAACJ,mBAAmB,IAAI,CAACI,OAAO,EAAEE,iBAAiB,EAAE;MACxD;IACD;IAEA,IAAIb,gBAAgB,CAACW,OAAO,CAAC,EAAE;MAC9BH,UAAU,CAACM,IAAI,CAAC;QAAEZ,KAAK;QAAEa,YAAY,EAAEN;MAAM,CAAC,CAAC;IAChD;EACD;EAEA,MAAMO,QAAQ,GAAGR,UAAU,CAACE,MAAM,GAAG,CAAC;EACtC,OAAOF,UAAU,CAACS,GAAG,CAAC,CAACC,SAAS,EAAET,KAAK,MAAM;IAC5C,GAAGS,SAAS;IACZd,QAAQ,EAAEH,sBAAsB,CAACiB,SAAS,CAAChB,KAAK,EAAEc,QAAQ,GAAGP,KAAK;EACnE,CAAC,CAAC,CAAC;AACJ;AAEA,OAAO,SAASU,0BAA0BA,CACzCC,YAAiC,EACjCd,MAAoB,EACY;EAChC,MAAMe,QAAQ,GAAGf,MAAM,CAACA,MAAM,CAACI,MAAM,GAAG,CAAC,CAAC;EAE1C,OAAOU,YAAY,CAACH,GAAG,CAAC,CAACK,KAAK,EAAEb,KAAK,KAAK;IACzC,MAAMc,SAAS,GAAGH,YAAY,CAACX,KAAK,GAAG,CAAC,CAAC;IACzC,IAAIe,kBAAiD;IAErD,KACC,IAAIC,SAAS,GAAGhB,KAAK,GAAG,CAAC,EACzBgB,SAAS,GAAGL,YAAY,CAACV,MAAM,EAC/Be,SAAS,EAAE,EACV;MACD,MAAMP,SAAS,GAAGE,YAAY,CAACK,SAAS,CAAC;MACzC,IAAIP,SAAS,EAAEhB,KAAK,CAACE,QAAQ,KAAK,SAAS,EAAE;QAC5CoB,kBAAkB,GAAGN,SAAS;QAC9B;MACD;IACD;IAEA,MAAMQ,WAAW,GAChBJ,KAAK,CAACpB,KAAK,CAACE,QAAQ,KAAK,SAAS,IAAImB,SAAS,GAC5CD,KAAK,CAACpB,KAAK,GACVsB,kBAAkB,EAAEtB,KAAK,IAC3BqB,SAAS,EAAErB,KAAK,IAChBmB,QAAQ,IACRC,KAAK,CAACpB,KAAM;IAEf,OAAO;MACN,GAAGoB,KAAK;MACRI;IACD,CAAC;EACF,CAAC,CAAC;AACH","ignoreList":[]}

package/lib/module/components/overlay/helpers/retain-ready-overlay-resources.js

@@ -0,0 +1,17 @@
+"use strict";
+
+export function retainReadyOverlayResources(previous, overlayAnimationStore, driverScene, driverAnimationStore, driverSlots) {
+  if (!overlayAnimationStore || !driverAnimationStore || !driverSlots) {
+    return previous;
+  }
+  if (previous?.overlayAnimationStore === overlayAnimationStore && previous.driverScene === driverScene && previous.driverAnimationStore === driverAnimationStore && previous.driverSlots === driverSlots) {
+    return previous;
+  }
+  return {
+    overlayAnimationStore,
+    driverScene,
+    driverAnimationStore,
+    driverSlots
+  };
+}
+//# sourceMappingURL=retain-ready-overlay-resources.js.map

package/lib/module/components/overlay/helpers/retain-ready-overlay-resources.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["retainReadyOverlayResources","previous","overlayAnimationStore","driverScene","driverAnimationStore","driverSlots"],"sourceRoot":"../../../../../src","sources":["components/overlay/helpers/retain-ready-overlay-resources.ts"],"mappings":";;AAWA,OAAO,SAASA,2BAA2BA,CAC1CC,QAAsC,EACtCC,qBAAyD,EACzDC,WAAuC,EACvCC,oBAAwD,EACxDC,WAA0C,EACX;EAC/B,IAAI,CAACH,qBAAqB,IAAI,CAACE,oBAAoB,IAAI,CAACC,WAAW,EAAE;IACpE,OAAOJ,QAAQ;EAChB;EAEA,IACCA,QAAQ,EAAEC,qBAAqB,KAAKA,qBAAqB,IACzDD,QAAQ,CAACE,WAAW,KAAKA,WAAW,IACpCF,QAAQ,CAACG,oBAAoB,KAAKA,oBAAoB,IACtDH,QAAQ,CAACI,WAAW,KAAKA,WAAW,EACnC;IACD,OAAOJ,QAAQ;EAChB;EAEA,OAAO;IACNC,qBAAqB;IACrBC,WAAW;IACXC,oBAAoB;IACpBC;EACD,CAAC;AACF","ignoreList":[]}