react-native-screen-transitions 3.4.0-alpha.0 → 3.4.0-alpha.2

package/lib/module/shared/components/create-boundary-component/hooks/use-pending-destination-measurement.js

@@ -3,6 +3,7 @@
 import { useAnimatedReaction } from "react-native-reanimated";
 import { BoundStore } from "../../../stores/bounds";
 import { resolvePendingSourceKey } from "../helpers/resolve-pending-source-key";
+import { resolvePendingDestinationCaptureSignal } from "./helpers/measurement-rules";
 export const usePendingDestinationMeasurement = params => {
   const {
     sharedBoundTag,
@@ -13,10 +14,12 @@ export const usePendingDestinationMeasurement = params => {
   useAnimatedReaction(() => {
     "worklet";
 
-    if (!enabled) return 0;
     const resolvedSourceKey = resolvePendingSourceKey(sharedBoundTag, expectedSourceScreenKey);
-    if (!resolvedSourceKey) return 0;
-    return BoundStore.hasPendingLinkFromSource(sharedBoundTag, resolvedSourceKey) ? resolvedSourceKey : 0;
+    return resolvePendingDestinationCaptureSignal({
+      enabled,
+      resolvedSourceKey,
+      hasPendingLinkFromSource: resolvedSourceKey ? BoundStore.hasPendingLinkFromSource(sharedBoundTag, resolvedSourceKey) : false
+    });
   }, (captureSignal, previousCaptureSignal) => {
     "worklet";
 
@@ -25,7 +28,7 @@ export const usePendingDestinationMeasurement = params => {
       return;
     }
     maybeMeasureAndStore({
-      shouldSetDestination: true
+      intent: "complete-destination"
     });
   }, [enabled, sharedBoundTag, expectedSourceScreenKey, maybeMeasureAndStore]);
 };

package/lib/module/shared/components/create-boundary-component/hooks/use-pending-destination-measurement.js.map

@@ -1 +1 @@
-{"version":3,"names":["useAnimatedReaction","BoundStore","resolvePendingSourceKey","usePendingDestinationMeasurement","params","sharedBoundTag","enabled","expectedSourceScreenKey","maybeMeasureAndStore","resolvedSourceKey","hasPendingLinkFromSource","captureSignal","previousCaptureSignal","shouldSetDestination"],"sourceRoot":"../../../../../../src","sources":["shared/components/create-boundary-component/hooks/use-pending-destination-measurement.ts"],"mappings":";;AAAA,SAASA,mBAAmB,QAAQ,yBAAyB;AAC7D,SAASC,UAAU,QAAQ,wBAAwB;AACnD,SAASC,uBAAuB,QAAQ,uCAAuC;AAG/E,OAAO,MAAMC,gCAAgC,GAAIC,MAKhD,IAAK;EACL,MAAM;IACLC,cAAc;IACdC,OAAO;IACPC,uBAAuB;IACvBC;EACD,CAAC,GAAGJ,MAAM;EAEVJ,mBAAmB,CAClB,MAAM;IACL,SAAS;;IACT,IAAI,CAACM,OAAO,EAAE,OAAO,CAAC;IACtB,MAAMG,iBAAiB,GAAGP,uBAAuB,CAChDG,cAAc,EACdE,uBACD,CAAC;IACD,IAAI,CAACE,iBAAiB,EAAE,OAAO,CAAC;IAEhC,OAAOR,UAAU,CAACS,wBAAwB,CACzCL,cAAc,EACdI,iBACD,CAAC,GACEA,iBAAiB,GACjB,CAAC;EACL,CAAC,EACD,CAACE,aAAa,EAAEC,qBAAqB,KAAK;IACzC,SAAS;;IACT,IAAI,CAACN,OAAO,EAAE;IACd,IAAI,CAACK,aAAa,IAAIA,aAAa,KAAKC,qBAAqB,EAAE;MAC9D;IACD;IAEAJ,oBAAoB,CAAC;MAAEK,oBAAoB,EAAE;IAAK,CAAC,CAAC;EACrD,CAAC,EACD,CAACP,OAAO,EAAED,cAAc,EAAEE,uBAAuB,EAAEC,oBAAoB,CACxE,CAAC;AACF,CAAC","ignoreList":[]}
+{"version":3,"names":["useAnimatedReaction","BoundStore","resolvePendingSourceKey","resolvePendingDestinationCaptureSignal","usePendingDestinationMeasurement","params","sharedBoundTag","enabled","expectedSourceScreenKey","maybeMeasureAndStore","resolvedSourceKey","hasPendingLinkFromSource","captureSignal","previousCaptureSignal","intent"],"sourceRoot":"../../../../../../src","sources":["shared/components/create-boundary-component/hooks/use-pending-destination-measurement.ts"],"mappings":";;AAAA,SAASA,mBAAmB,QAAQ,yBAAyB;AAC7D,SAASC,UAAU,QAAQ,wBAAwB;AACnD,SAASC,uBAAuB,QAAQ,uCAAuC;AAE/E,SAASC,sCAAsC,QAAQ,6BAA6B;AAEpF,OAAO,MAAMC,gCAAgC,GAAIC,MAKhD,IAAK;EACL,MAAM;IACLC,cAAc;IACdC,OAAO;IACPC,uBAAuB;IACvBC;EACD,CAAC,GAAGJ,MAAM;EAEVL,mBAAmB,CAClB,MAAM;IACL,SAAS;;IACT,MAAMU,iBAAiB,GAAGR,uBAAuB,CAChDI,cAAc,EACdE,uBACD,CAAC;IACD,OAAOL,sCAAsC,CAAC;MAC7CI,OAAO;MACPG,iBAAiB;MACjBC,wBAAwB,EAAED,iBAAiB,GACxCT,UAAU,CAACU,wBAAwB,CACnCL,cAAc,EACdI,iBACD,CAAC,GACA;IACJ,CAAC,CAAC;EACH,CAAC,EACD,CAACE,aAAa,EAAEC,qBAAqB,KAAK;IACzC,SAAS;;IACT,IAAI,CAACN,OAAO,EAAE;IACd,IAAI,CAACK,aAAa,IAAIA,aAAa,KAAKC,qBAAqB,EAAE;MAC9D;IACD;IAEAJ,oBAAoB,CAAC;MAAEK,MAAM,EAAE;IAAuB,CAAC,CAAC;EACzD,CAAC,EACD,CAACP,OAAO,EAAED,cAAc,EAAEE,uBAAuB,EAAEC,oBAAoB,CACxE,CAAC;AACF,CAAC","ignoreList":[]}

package/lib/module/shared/components/create-boundary-component/hooks/use-pending-destination-retry-measurement.js

@@ -3,6 +3,7 @@
 import { useAnimatedReaction, useSharedValue } from "react-native-reanimated";
 import { BoundStore } from "../../../stores/bounds";
 import { resolvePendingSourceKey } from "../helpers/resolve-pending-source-key";
+import { resolvePendingDestinationRetrySignal } from "./helpers/measurement-rules";
 export const usePendingDestinationRetryMeasurement = params => {
   const {
     sharedBoundTag,
@@ -20,21 +21,19 @@ export const usePendingDestinationRetryMeasurement = params => {
   useAnimatedReaction(() => {
     "worklet";
 
-    if (!enabled) return 0;
-    if (retryCount.get() >= MAX_RETRIES) return 0;
-    if (!animating.get()) return 0;
-    if (BoundStore.hasDestinationLink(sharedBoundTag, currentScreenKey)) return 0;
-    const currentProgress = progress.get();
-    if (currentProgress <= 0 || currentProgress >= RETRY_PROGRESS_MAX) {
-      return 0;
-    }
     const resolvedSourceKey = resolvePendingSourceKey(sharedBoundTag, expectedSourceScreenKey);
-    if (!resolvedSourceKey) return 0;
-    if (!BoundStore.hasPendingLinkFromSource(sharedBoundTag, resolvedSourceKey)) {
-      return 0;
-    }
-    const bucket = Math.floor(currentProgress * RETRY_PROGRESS_BUCKETS) + 1;
-    return bucket;
+    return resolvePendingDestinationRetrySignal({
+      enabled,
+      retryCount: retryCount.get(),
+      maxRetries: MAX_RETRIES,
+      isAnimating: !!animating.get(),
+      hasDestinationLink: BoundStore.hasDestinationLink(sharedBoundTag, currentScreenKey),
+      progress: progress.get(),
+      retryProgressMax: RETRY_PROGRESS_MAX,
+      retryProgressBuckets: RETRY_PROGRESS_BUCKETS,
+      resolvedSourceKey,
+      hasPendingLinkFromSource: resolvedSourceKey ? BoundStore.hasPendingLinkFromSource(sharedBoundTag, resolvedSourceKey) : false
+    });
   }, captureSignal => {
     "worklet";
 
@@ -46,7 +45,7 @@ export const usePendingDestinationRetryMeasurement = params => {
     if (retryCount.get() >= MAX_RETRIES) return;
     retryCount.set(retryCount.get() + 1);
     maybeMeasureAndStore({
-      shouldSetDestination: true
+      intent: "complete-destination"
     });
   }, [enabled, sharedBoundTag, currentScreenKey, expectedSourceScreenKey, progress, animating, maybeMeasureAndStore, retryCount]);
 };

package/lib/module/shared/components/create-boundary-component/hooks/use-pending-destination-retry-measurement.js.map

@@ -1 +1 @@
-{"version":3,"names":["useAnimatedReaction","useSharedValue","BoundStore","resolvePendingSourceKey","usePendingDestinationRetryMeasurement","params","sharedBoundTag","enabled","currentScreenKey","expectedSourceScreenKey","progress","animating","maybeMeasureAndStore","retryCount","MAX_RETRIES","RETRY_PROGRESS_BUCKETS","RETRY_PROGRESS_MAX","get","hasDestinationLink","currentProgress","resolvedSourceKey","hasPendingLinkFromSource","bucket","Math","floor","captureSignal","set","shouldSetDestination"],"sourceRoot":"../../../../../../src","sources":["shared/components/create-boundary-component/hooks/use-pending-destination-retry-measurement.ts"],"mappings":";;AAAA,SAASA,mBAAmB,EAAEC,cAAc,QAAQ,yBAAyB;AAE7E,SAASC,UAAU,QAAQ,wBAAwB;AACnD,SAASC,uBAAuB,QAAQ,uCAAuC;AAG/E,OAAO,MAAMC,qCAAqC,GAAIC,MAQrD,IAAK;EACL,MAAM;IACLC,cAAc;IACdC,OAAO;IACPC,gBAAgB;IAChBC,uBAAuB;IACvBC,QAAQ;IACRC,SAAS;IACTC;EACD,CAAC,GAAGP,MAAM;EAEV,MAAMQ,UAAU,GAAGZ,cAAc,CAAC,CAAC,CAAC;EACpC,MAAMa,WAAW,GAAG,CAAC;EACrB,MAAMC,sBAAsB,GAAG,CAAC;EAChC,MAAMC,kBAAkB,GAAG,IAAI;EAE/BhB,mBAAmB,CAClB,MAAM;IACL,SAAS;;IACT,IAAI,CAACO,OAAO,EAAE,OAAO,CAAC;IACtB,IAAIM,UAAU,CAACI,GAAG,CAAC,CAAC,IAAIH,WAAW,EAAE,OAAO,CAAC;IAC7C,IAAI,CAACH,SAAS,CAACM,GAAG,CAAC,CAAC,EAAE,OAAO,CAAC;IAC9B,IAAIf,UAAU,CAACgB,kBAAkB,CAACZ,cAAc,EAAEE,gBAAgB,CAAC,EAClE,OAAO,CAAC;IAET,MAAMW,eAAe,GAAGT,QAAQ,CAACO,GAAG,CAAC,CAAC;IACtC,IAAIE,eAAe,IAAI,CAAC,IAAIA,eAAe,IAAIH,kBAAkB,EAAE;MAClE,OAAO,CAAC;IACT;IAEA,MAAMI,iBAAiB,GAAGjB,uBAAuB,CAChDG,cAAc,EACdG,uBACD,CAAC;IAED,IAAI,CAACW,iBAAiB,EAAE,OAAO,CAAC;IAChC,IACC,CAAClB,UAAU,CAACmB,wBAAwB,CAACf,cAAc,EAAEc,iBAAiB,CAAC,EACtE;MACD,OAAO,CAAC;IACT;IAEA,MAAME,MAAM,GAAGC,IAAI,CAACC,KAAK,CAACL,eAAe,GAAGJ,sBAAsB,CAAC,GAAG,CAAC;IACvE,OAAOO,MAAM;EACd,CAAC,EACAG,aAAa,IAAK;IAClB,SAAS;;IACT,IAAI,CAAClB,OAAO,EAAE;IACd,IAAI,CAACkB,aAAa,EAAE;MACnBZ,UAAU,CAACa,GAAG,CAAC,CAAC,CAAC;MACjB;IACD;IAEA,IAAIb,UAAU,CAACI,GAAG,CAAC,CAAC,IAAIH,WAAW,EAAE;IACrCD,UAAU,CAACa,GAAG,CAACb,UAAU,CAACI,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC;IACpCL,oBAAoB,CAAC;MAAEe,oBAAoB,EAAE;IAAK,CAAC,CAAC;EACrD,CAAC,EACD,CACCpB,OAAO,EACPD,cAAc,EACdE,gBAAgB,EAChBC,uBAAuB,EACvBC,QAAQ,EACRC,SAAS,EACTC,oBAAoB,EACpBC,UAAU,CAEZ,CAAC;AACF,CAAC","ignoreList":[]}
+{"version":3,"names":["useAnimatedReaction","useSharedValue","BoundStore","resolvePendingSourceKey","resolvePendingDestinationRetrySignal","usePendingDestinationRetryMeasurement","params","sharedBoundTag","enabled","currentScreenKey","expectedSourceScreenKey","progress","animating","maybeMeasureAndStore","retryCount","MAX_RETRIES","RETRY_PROGRESS_BUCKETS","RETRY_PROGRESS_MAX","resolvedSourceKey","get","maxRetries","isAnimating","hasDestinationLink","retryProgressMax","retryProgressBuckets","hasPendingLinkFromSource","captureSignal","set","intent"],"sourceRoot":"../../../../../../src","sources":["shared/components/create-boundary-component/hooks/use-pending-destination-retry-measurement.ts"],"mappings":";;AAAA,SAECA,mBAAmB,EACnBC,cAAc,QACR,yBAAyB;AAChC,SAASC,UAAU,QAAQ,wBAAwB;AACnD,SAASC,uBAAuB,QAAQ,uCAAuC;AAE/E,SAASC,oCAAoC,QAAQ,6BAA6B;AAElF,OAAO,MAAMC,qCAAqC,GAAIC,MAQrD,IAAK;EACL,MAAM;IACLC,cAAc;IACdC,OAAO;IACPC,gBAAgB;IAChBC,uBAAuB;IACvBC,QAAQ;IACRC,SAAS;IACTC;EACD,CAAC,GAAGP,MAAM;EAEV,MAAMQ,UAAU,GAAGb,cAAc,CAAC,CAAC,CAAC;EACpC,MAAMc,WAAW,GAAG,CAAC;EACrB,MAAMC,sBAAsB,GAAG,CAAC;EAChC,MAAMC,kBAAkB,GAAG,IAAI;EAE/BjB,mBAAmB,CAClB,MAAM;IACL,SAAS;;IACT,MAAMkB,iBAAiB,GAAGf,uBAAuB,CAChDI,cAAc,EACdG,uBACD,CAAC;IACD,OAAON,oCAAoC,CAAC;MAC3CI,OAAO;MACPM,UAAU,EAAEA,UAAU,CAACK,GAAG,CAAC,CAAC;MAC5BC,UAAU,EAAEL,WAAW;MACvBM,WAAW,EAAE,CAAC,CAACT,SAAS,CAACO,GAAG,CAAC,CAAC;MAC9BG,kBAAkB,EAAEpB,UAAU,CAACoB,kBAAkB,CAChDf,cAAc,EACdE,gBACD,CAAC;MACDE,QAAQ,EAAEA,QAAQ,CAACQ,GAAG,CAAC,CAAC;MACxBI,gBAAgB,EAAEN,kBAAkB;MACpCO,oBAAoB,EAAER,sBAAsB;MAC5CE,iBAAiB;MACjBO,wBAAwB,EAAEP,iBAAiB,GACxChB,UAAU,CAACuB,wBAAwB,CACnClB,cAAc,EACdW,iBACD,CAAC,GACA;IACJ,CAAC,CAAC;EACH,CAAC,EACAQ,aAAa,IAAK;IAClB,SAAS;;IACT,IAAI,CAAClB,OAAO,EAAE;IACd,IAAI,CAACkB,aAAa,EAAE;MACnBZ,UAAU,CAACa,GAAG,CAAC,CAAC,CAAC;MACjB;IACD;IAEA,IAAIb,UAAU,CAACK,GAAG,CAAC,CAAC,IAAIJ,WAAW,EAAE;IACrCD,UAAU,CAACa,GAAG,CAACb,UAAU,CAACK,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC;IACpCN,oBAAoB,CAAC;MAAEe,MAAM,EAAE;IAAuB,CAAC,CAAC;EACzD,CAAC,EACD,CACCpB,OAAO,EACPD,cAAc,EACdE,gBAAgB,EAChBC,uBAAuB,EACvBC,QAAQ,EACRC,SAAS,EACTC,oBAAoB,EACpBC,UAAU,CAEZ,CAAC;AACF,CAAC","ignoreList":[]}

package/lib/module/shared/components/create-boundary-component/hooks/use-scroll-settled-measurement.js

@@ -2,6 +2,8 @@
 
 import { useAnimatedReaction } from "react-native-reanimated";
 import { useScrollSettleContext } from "../../../providers/scroll-settle.provider";
+import { shouldTriggerScrollSettledRefresh } from "./helpers/measurement-rules";
+import { useDeferredMeasurementTrigger } from "./use-deferred-measurement-trigger";
 export const useScrollSettledMeasurement = params => {
   const {
     enabled,
@@ -12,19 +14,35 @@ export const useScrollSettledMeasurement = params => {
   } = params;
   const scrollSettle = useScrollSettleContext();
   const settledSignal = scrollSettle?.settledSignal;
+  const {
+    queueOrFlushMeasurement
+  } = useDeferredMeasurementTrigger({
+    enabled,
+    isAnimating,
+    onFlush: () => {
+      "worklet";
+
+      maybeMeasureAndStore({
+        intent: "refresh-source"
+      });
+    }
+  });
   useAnimatedReaction(() => settledSignal?.value ?? 0, (signal, previousSignal) => {
     "worklet";
 
-    if (!enabled) return;
-    if (!group || !hasNextScreen || !settledSignal) return;
-    if (signal === 0 || signal === previousSignal) return;
-    if (isAnimating.value) return;
-
+    if (!shouldTriggerScrollSettledRefresh({
+      enabled,
+      group,
+      hasNextScreen,
+      hasSettledSignal: !!settledSignal,
+      signal,
+      previousSignal
+    })) {
+      return;
+    }
     // Re-measure source bounds after scroll settles while idle.
     // This captures post-scroll positions before close transition starts.
-    maybeMeasureAndStore({
-      shouldUpdateSource: true
-    });
-  }, [enabled, group, hasNextScreen, settledSignal, isAnimating, maybeMeasureAndStore]);
+    queueOrFlushMeasurement();
+  }, [enabled, group, hasNextScreen, settledSignal, queueOrFlushMeasurement]);
 };
 //# sourceMappingURL=use-scroll-settled-measurement.js.map

package/lib/module/shared/components/create-boundary-component/hooks/use-scroll-settled-measurement.js.map

@@ -1 +1 @@
-{"version":3,"names":["useAnimatedReaction","useScrollSettleContext","useScrollSettledMeasurement","params","enabled","group","hasNextScreen","isAnimating","maybeMeasureAndStore","scrollSettle","settledSignal","value","signal","previousSignal","shouldUpdateSource"],"sourceRoot":"../../../../../../src","sources":["shared/components/create-boundary-component/hooks/use-scroll-settled-measurement.ts"],"mappings":";;AAAA,SAASA,mBAAmB,QAAQ,yBAAyB;AAC7D,SAASC,sBAAsB,QAAQ,2CAA2C;AAIlF,OAAO,MAAMC,2BAA2B,GAAIC,MAM3C,IAAK;EACL,MAAM;IAAEC,OAAO;IAAEC,KAAK;IAAEC,aAAa;IAAEC,WAAW;IAAEC;EAAqB,CAAC,GACzEL,MAAM;EACP,MAAMM,YAAY,GAAGR,sBAAsB,CAAC,CAAC;EAC7C,MAAMS,aAAa,GAAGD,YAAY,EAAEC,aAAa;EAEjDV,mBAAmB,CAClB,MAAMU,aAAa,EAAEC,KAAK,IAAI,CAAC,EAC/B,CAACC,MAAM,EAAEC,cAAc,KAAK;IAC3B,SAAS;;IACT,IAAI,CAACT,OAAO,EAAE;IACd,IAAI,CAACC,KAAK,IAAI,CAACC,aAAa,IAAI,CAACI,aAAa,EAAE;IAChD,IAAIE,MAAM,KAAK,CAAC,IAAIA,MAAM,KAAKC,cAAc,EAAE;IAC/C,IAAIN,WAAW,CAACI,KAAK,EAAE;;IAEvB;IACA;IACAH,oBAAoB,CAAC;MAAEM,kBAAkB,EAAE;IAAK,CAAC,CAAC;EACnD,CAAC,EACD,CACCV,OAAO,EACPC,KAAK,EACLC,aAAa,EACbI,aAAa,EACbH,WAAW,EACXC,oBAAoB,CAEtB,CAAC;AACF,CAAC","ignoreList":[]}
+{"version":3,"names":["useAnimatedReaction","useScrollSettleContext","shouldTriggerScrollSettledRefresh","useDeferredMeasurementTrigger","useScrollSettledMeasurement","params","enabled","group","hasNextScreen","isAnimating","maybeMeasureAndStore","scrollSettle","settledSignal","queueOrFlushMeasurement","onFlush","intent","value","signal","previousSignal","hasSettledSignal"],"sourceRoot":"../../../../../../src","sources":["shared/components/create-boundary-component/hooks/use-scroll-settled-measurement.ts"],"mappings":";;AAAA,SAA2BA,mBAAmB,QAAQ,yBAAyB;AAC/E,SAASC,sBAAsB,QAAQ,2CAA2C;AAElF,SAASC,iCAAiC,QAAQ,6BAA6B;AAC/E,SAASC,6BAA6B,QAAQ,oCAAoC;AAElF,OAAO,MAAMC,2BAA2B,GAAIC,MAM3C,IAAK;EACL,MAAM;IAAEC,OAAO;IAAEC,KAAK;IAAEC,aAAa;IAAEC,WAAW;IAAEC;EAAqB,CAAC,GACzEL,MAAM;EACP,MAAMM,YAAY,GAAGV,sBAAsB,CAAC,CAAC;EAC7C,MAAMW,aAAa,GAAGD,YAAY,EAAEC,aAAa;EACjD,MAAM;IAAEC;EAAwB,CAAC,GAAGV,6BAA6B,CAAC;IACjEG,OAAO;IACPG,WAAW;IACXK,OAAO,EAAEA,CAAA,KAAM;MACd,SAAS;;MACTJ,oBAAoB,CAAC;QAAEK,MAAM,EAAE;MAAiB,CAAC,CAAC;IACnD;EACD,CAAC,CAAC;EAEFf,mBAAmB,CAClB,MAAMY,aAAa,EAAEI,KAAK,IAAI,CAAC,EAC/B,CAACC,MAAM,EAAEC,cAAc,KAAK;IAC3B,SAAS;;IACT,IACC,CAAChB,iCAAiC,CAAC;MAClCI,OAAO;MACPC,KAAK;MACLC,aAAa;MACbW,gBAAgB,EAAE,CAAC,CAACP,aAAa;MACjCK,MAAM;MACNC;IACD,CAAC,CAAC,EACD;MACD;IACD;IACA;IACA;IACAL,uBAAuB,CAAC,CAAC;EAC1B,CAAC,EACD,CAACP,OAAO,EAAEC,KAAK,EAAEC,aAAa,EAAEI,aAAa,EAAEC,uBAAuB,CACvE,CAAC;AACF,CAAC","ignoreList":[]}

package/lib/module/shared/components/create-boundary-component/index.js

@@ -13,19 +13,23 @@ import { useAutoSourceMeasurement } from "./hooks/use-auto-source-measurement";
 import { useBoundaryMeasureAndStore } from "./hooks/use-boundary-measure-and-store";
 import { useBoundaryPresence } from "./hooks/use-boundary-presence";
 import { useGroupActiveMeasurement } from "./hooks/use-group-active-measurement";
+import { useGroupActiveSourceMeasurement } from "./hooks/use-group-active-source-measurement";
 import { useInitialLayoutHandler } from "./hooks/use-initial-layout-handler";
 import { usePendingDestinationMeasurement } from "./hooks/use-pending-destination-measurement";
 import { usePendingDestinationRetryMeasurement } from "./hooks/use-pending-destination-retry-measurement";
 import { useScrollSettledMeasurement } from "./hooks/use-scroll-settled-measurement";
 import { buildBoundaryMatchKey } from "./utils/build-boundary-match-key";
 import { jsx as _jsx } from "react/jsx-runtime";
-const setGroupActiveIdOnUI = (group, id) => {
+const setGroupSelectionOnUI = (group, id) => {
   "worklet";
 
   BoundStore.setGroupActiveId(group, id);
 };
-export function createBoundaryComponent(Wrapped) {
-  const AnimatedComponent = Animated.createAnimatedComponent(Wrapped);
+export function createBoundaryComponent(Wrapped, options = {}) {
+  const {
+    alreadyAnimated = false
+  } = options;
+  const AnimatedComponent = alreadyAnimated ? Wrapped : Animated.createAnimatedComponent(Wrapped);
   const Inner = /*#__PURE__*/forwardRef((props, _ref) => {
     const {
       enabled = true,
@@ -146,6 +150,18 @@ export function createBoundaryComponent(Wrapped) {
       maybeMeasureAndStore
     });
 
+    // Source-side analog for grouped retargeting: when an unfocused/source
+    // boundary becomes the active member, refresh its snapshot (and source
+    // link when one exists) so close transitions don't use stale geometry.
+    useGroupActiveSourceMeasurement({
+      enabled: runtimeEnabled,
+      group,
+      id,
+      hasNextScreen,
+      isAnimating,
+      maybeMeasureAndStore
+    });
+
     // While idle on source screens, re-measure after scroll settles so a later
     // close transition starts from up-to-date source geometry.
     useScrollSettledMeasurement({
@@ -169,10 +185,10 @@ export function createBoundaryComponent(Wrapped) {
     const handlePress = useCallback((...args) => {
       // Press path has priority: capture source before user onPress/navigation.
       if (group) {
-        runOnUI(setGroupActiveIdOnUI)(group, String(id));
+        runOnUI(setGroupSelectionOnUI)(group, String(id));
       }
       runOnUI(maybeMeasureAndStore)({
-        shouldSetSource: true
+        intent: "capture-source"
       });
       if (typeof onPress === "function") {
         onPress(...args);
@@ -217,8 +233,6 @@ export const Boundary = {
   /** Passive boundary wrapper (no built-in press semantics). */
   View: BoundaryView,
   /** Pressable boundary wrapper with press-priority source capture. */
-  Pressable: BoundaryPressable,
-  /** Factory for custom boundary wrappers. */
-  createBoundaryComponent
+  Pressable: BoundaryPressable
 };
 //# sourceMappingURL=index.js.map

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

@@ -1 +1 @@
-{"version":3,"names":["forwardRef","memo","useCallback","useMemo","Pressable","View","RNView","Animated","runOnUI","useAnimatedRef","useAssociatedStyles","useLayoutAnchorContext","useDescriptorDerivations","AnimationStore","BoundStore","prepareStyleForBounds","useAutoSourceMeasurement","useBoundaryMeasureAndStore","useBoundaryPresence","useGroupActiveMeasurement","useInitialLayoutHandler","usePendingDestinationMeasurement","usePendingDestinationRetryMeasurement","useScrollSettledMeasurement","buildBoundaryMatchKey","jsx","_jsx","setGroupActiveIdOnUI","group","id","setGroupActiveId","createBoundaryComponent","Wrapped","AnimatedComponent","createAnimatedComponent","Inner","props","_ref","enabled","anchor","scaleMode","target","method","style","onPress","rest","sharedBoundTag","animatedRef","previousScreenKey","preferredSourceScreenKey","currentScreenKey","nextScreenKey","ancestorKeys","navigatorKey","ancestorNavigatorKeys","hasConfiguredInterpolator","runtimeEnabled","hasNextScreen","shouldUpdateDestination","layoutAnchor","boundaryConfig","undefined","isAnimating","getRouteAnimation","progress","preparedStyles","associatedStyles","resetTransformOnUnset","waitForFirstResolvedStyle","maybeMeasureAndStore","shouldRunDestinationEffects","expectedSourceScreenKey","animating","handlePress","args","String","shouldSetSource","resolvedOnPress","ref","collapsable","BoundaryView","displayName","BoundaryPressable","Boundary"],"sourceRoot":"../../../../../src","sources":["shared/components/create-boundary-component/index.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["forwardRef","memo","useCallback","useMemo","Pressable","View","RNView","Animated","runOnUI","useAnimatedRef","useAssociatedStyles","useLayoutAnchorContext","useDescriptorDerivations","AnimationStore","BoundStore","prepareStyleForBounds","useAutoSourceMeasurement","useBoundaryMeasureAndStore","useBoundaryPresence","useGroupActiveMeasurement","useGroupActiveSourceMeasurement","useInitialLayoutHandler","usePendingDestinationMeasurement","usePendingDestinationRetryMeasurement","useScrollSettledMeasurement","buildBoundaryMatchKey","jsx","_jsx","setGroupSelectionOnUI","group","id","setGroupActiveId","createBoundaryComponent","Wrapped","options","alreadyAnimated","AnimatedComponent","createAnimatedComponent","Inner","props","_ref","enabled","anchor","scaleMode","target","method","style","onPress","rest","sharedBoundTag","animatedRef","previousScreenKey","preferredSourceScreenKey","currentScreenKey","nextScreenKey","ancestorKeys","navigatorKey","ancestorNavigatorKeys","hasConfiguredInterpolator","runtimeEnabled","hasNextScreen","shouldUpdateDestination","layoutAnchor","boundaryConfig","undefined","isAnimating","getRouteAnimation","progress","preparedStyles","associatedStyles","resetTransformOnUnset","waitForFirstResolvedStyle","maybeMeasureAndStore","shouldRunDestinationEffects","expectedSourceScreenKey","animating","handlePress","args","String","intent","resolvedOnPress","ref","collapsable","BoundaryView","displayName","BoundaryPressable","Boundary"],"sourceRoot":"../../../../../src","sources":["shared/components/create-boundary-component/index.tsx"],"mappings":"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","ignoreList":[]}

package/lib/module/shared/components/create-boundary-component/utils/build-boundary-match-key.js

@@ -1,17 +1,12 @@
 "use strict";
 
-export function buildBoundaryMatchKey(paramsOrGroup, legacyId) {
+export function buildBoundaryMatchKey(params) {
   "worklet";
 
-  if (typeof paramsOrGroup === "object" && paramsOrGroup !== null) {
-    const {
-      group,
-      id
-    } = paramsOrGroup;
-    return group ? `${group}:${id}` : String(id);
-  }
-  const group = paramsOrGroup;
-  const id = legacyId;
+  const {
+    group,
+    id
+  } = params;
   return group ? `${group}:${id}` : String(id);
 }
 //# sourceMappingURL=build-boundary-match-key.js.map

package/lib/module/shared/components/create-boundary-component/utils/build-boundary-match-key.js.map

@@ -1 +1 @@
-{"version":3,"names":["buildBoundaryMatchKey","paramsOrGroup","legacyId","group","id","String"],"sourceRoot":"../../../../../../src","sources":["shared/components/create-boundary-component/utils/build-boundary-match-key.ts"],"mappings":";;AAcA,OAAO,SAASA,qBAAqBA,CACpCC,aAA+D,EAC/DC,QAAqB,EACZ;EACT,SAAS;;EAET,IAAI,OAAOD,aAAa,KAAK,QAAQ,IAAIA,aAAa,KAAK,IAAI,EAAE;IAChE,MAAM;MAAEE,KAAK;MAAEC;IAAG,CAAC,GAAGH,aAAa;IACnC,OAAOE,KAAK,GAAG,GAAGA,KAAK,IAAIC,EAAE,EAAE,GAAGC,MAAM,CAACD,EAAE,CAAC;EAC7C;EAEA,MAAMD,KAAK,GAAGF,aAAa;EAC3B,MAAMG,EAAE,GAAGF,QAAQ;EACnB,OAAOC,KAAK,GAAG,GAAGA,KAAK,IAAIC,EAAE,EAAE,GAAGC,MAAM,CAACD,EAAE,CAAC;AAC7C","ignoreList":[]}
+{"version":3,"names":["buildBoundaryMatchKey","params","group","id","String"],"sourceRoot":"../../../../../../src","sources":["shared/components/create-boundary-component/utils/build-boundary-match-key.ts"],"mappings":";;AAUA,OAAO,SAASA,qBAAqBA,CACpCC,MAAmC,EAC1B;EACT,SAAS;;EACT,MAAM;IAAEC,KAAK;IAAEC;EAAG,CAAC,GAAGF,MAAM;EAC5B,OAAOC,KAAK,GAAG,GAAGA,KAAK,IAAIC,EAAE,EAAE,GAAGC,MAAM,CAACD,EAAE,CAAC;AAC7C","ignoreList":[]}

package/lib/module/shared/components/create-transition-aware-component.js

@@ -12,9 +12,10 @@ import { ScrollSettleProvider } from "../providers/scroll-settle.provider";
 import { jsx as _jsx } from "react/jsx-runtime";
 export function createTransitionAwareComponent(Wrapped, options = {}) {
   const {
-    isScrollable = false
+    isScrollable = false,
+    alreadyAnimated = false
   } = options;
-  const AnimatedComponent = Animated.createAnimatedComponent(Wrapped);
+  const AnimatedComponent = alreadyAnimated ? Wrapped : Animated.createAnimatedComponent(Wrapped);
   const ScrollableInner = /*#__PURE__*/forwardRef((props, ref) => {
     const {
       remeasureOnFocus: _remeasureOnFocus,

package/lib/module/shared/components/create-transition-aware-component.js.map

@@ -1 +1 @@
-{"version":3,"names":["forwardRef","memo","useCallback","GestureDetector","Animated","runOnUI","useAnimatedRef","useComposedEventHandler","useSharedValue","useAssociatedStyles","useScrollRegistry","RegisterBoundsProvider","ScrollSettleProvider","jsx","_jsx","createTransitionAwareComponent","Wrapped","options","isScrollable","AnimatedComponent","createAnimatedComponent","ScrollableInner","props","ref","remeasureOnFocus","_remeasureOnFocus","onScroll","userOnScroll","onMomentumScrollEnd","userOnMomentumScrollEnd","onScrollEndDrag","userOnScrollEndDrag","scrollableProps","settledSignal","emitScrollSettled","value","scrollDirection","horizontal","scrollHandler","onContentSizeChange","onLayout","nativeGesture","direction","composedScrollHandler","handleMomentumScrollEnd","event","handleScrollEndDrag","velocityX","Math","abs","nativeEvent","velocity","x","velocityY","y","scrollableComponent","scrollEventThrottle","children","gesture","Inner","_","style","sharedBoundTag","styleId","onPress","rest","animatedRef","associatedStyles","associatedProps","id","resetTransformOnUnset","waitForFirstResolvedStyle","captureActiveOnPress","handleInitialLayout","animatedProps","collapsable"],"sourceRoot":"../../../../src","sources":["shared/components/create-transition-aware-component.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["forwardRef","memo","useCallback","GestureDetector","Animated","runOnUI","useAnimatedRef","useComposedEventHandler","useSharedValue","useAssociatedStyles","useScrollRegistry","RegisterBoundsProvider","ScrollSettleProvider","jsx","_jsx","createTransitionAwareComponent","Wrapped","options","isScrollable","alreadyAnimated","AnimatedComponent","createAnimatedComponent","ScrollableInner","props","ref","remeasureOnFocus","_remeasureOnFocus","onScroll","userOnScroll","onMomentumScrollEnd","userOnMomentumScrollEnd","onScrollEndDrag","userOnScrollEndDrag","scrollableProps","settledSignal","emitScrollSettled","value","scrollDirection","horizontal","scrollHandler","onContentSizeChange","onLayout","nativeGesture","direction","composedScrollHandler","handleMomentumScrollEnd","event","handleScrollEndDrag","velocityX","Math","abs","nativeEvent","velocity","x","velocityY","y","scrollableComponent","scrollEventThrottle","children","gesture","Inner","_","style","sharedBoundTag","styleId","onPress","rest","animatedRef","associatedStyles","associatedProps","id","resetTransformOnUnset","waitForFirstResolvedStyle","captureActiveOnPress","handleInitialLayout","animatedProps","collapsable"],"sourceRoot":"../../../../src","sources":["shared/components/create-transition-aware-component.tsx"],"mappings":"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","ignoreList":[]}

package/lib/module/shared/components/native-screen-container.js

@@ -9,19 +9,25 @@ export const NativeScreenContainer = ({
 }) => {
   const {
     flags: {
-      DISABLE_NATIVE_SCREENS = false
+      DISABLE_NATIVE_SCREENS = false,
+      DISABLE_NATIVE_SCREEN_CONTAINER = false
     }
   } = useStack();
-  if (!DISABLE_NATIVE_SCREENS) {
+  if (!DISABLE_NATIVE_SCREENS && !DISABLE_NATIVE_SCREEN_CONTAINER) {
     return /*#__PURE__*/_jsx(ScreenContainer, {
       style: styles.container,
       children: children
     });
   }
-  return /*#__PURE__*/_jsx(View, {
-    style: styles.container,
-    children: children
-  });
+  return (
+    /*#__PURE__*/
+    // Mirror ScreenContainer's native boundary when screens are disabled.
+    _jsx(View, {
+      collapsable: false,
+      style: styles.container,
+      children: children
+    })
+  );
 };
 const styles = StyleSheet.create({
   container: {

package/lib/module/shared/components/native-screen-container.js.map

@@ -1 +1 @@
-{"version":3,"names":["StyleSheet","View","ScreenContainer","useStack","jsx","_jsx","NativeScreenContainer","children","flags","DISABLE_NATIVE_SCREENS","style","styles","container","create","flex"],"sourceRoot":"../../../../src","sources":["shared/components/native-screen-container.tsx"],"mappings":";;AAAA,SAASA,UAAU,EAAEC,IAAI,QAAQ,cAAc;AAC/C,SAASC,eAAe,QAAQ,sBAAsB;AACtD,SAASC,QAAQ,QAAQ,+BAA+B;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAMzD,OAAO,MAAMC,qBAAqB,GAAGA,CAAC;EAAEC;AAAgB,CAAC,KAAK;EAC7D,MAAM;IACLC,KAAK,EAAE;MAAEC,sBAAsB,GAAG;IAAM;EACzC,CAAC,GAAGN,QAAQ,CAAC,CAAC;EACd,IAAI,CAACM,sBAAsB,EAAE;IAC5B,oBACCJ,IAAA,CAACH,eAAe;MAACQ,KAAK,EAAEC,MAAM,CAACC,SAAU;MAAAL,QAAA,EAAEA;IAAQ,CAAkB,CAAC;EAExE;EACA,oBAAOF,IAAA,CAACJ,IAAI;IAACS,KAAK,EAAEC,MAAM,CAACC,SAAU;IAAAL,QAAA,EAAEA;EAAQ,CAAO,CAAC;AACxD,CAAC;AAED,MAAMI,MAAM,GAAGX,UAAU,CAACa,MAAM,CAAC;EAChCD,SAAS,EAAE;IACVE,IAAI,EAAE;EACP;AACD,CAAC,CAAC","ignoreList":[]}
+{"version":3,"names":["StyleSheet","View","ScreenContainer","useStack","jsx","_jsx","NativeScreenContainer","children","flags","DISABLE_NATIVE_SCREENS","DISABLE_NATIVE_SCREEN_CONTAINER","style","styles","container","collapsable","create","flex"],"sourceRoot":"../../../../src","sources":["shared/components/native-screen-container.tsx"],"mappings":";;AAAA,SAASA,UAAU,EAAEC,IAAI,QAAQ,cAAc;AAC/C,SAASC,eAAe,QAAQ,sBAAsB;AACtD,SAASC,QAAQ,QAAQ,+BAA+B;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAMzD,OAAO,MAAMC,qBAAqB,GAAGA,CAAC;EAAEC;AAAgB,CAAC,KAAK;EAC7D,MAAM;IACLC,KAAK,EAAE;MACNC,sBAAsB,GAAG,KAAK;MAC9BC,+BAA+B,GAAG;IACnC;EACD,CAAC,GAAGP,QAAQ,CAAC,CAAC;EACd,IAAI,CAACM,sBAAsB,IAAI,CAACC,+BAA+B,EAAE;IAChE,oBACCL,IAAA,CAACH,eAAe;MAACS,KAAK,EAAEC,MAAM,CAACC,SAAU;MAAAN,QAAA,EAAEA;IAAQ,CAAkB,CAAC;EAExE;EACA;IAAA;IACC;IACAF,IAAA,CAACJ,IAAI;MAACa,WAAW,EAAE,KAAM;MAACH,KAAK,EAAEC,MAAM,CAACC,SAAU;MAAAN,QAAA,EAChDA;IAAQ,CACJ;EAAC;AAET,CAAC;AAED,MAAMK,MAAM,GAAGZ,UAAU,CAACe,MAAM,CAAC;EAChCF,SAAS,EAAE;IACVG,IAAI,EAAE;EACP;AACD,CAAC,CAAC","ignoreList":[]}

package/lib/module/shared/components/native-screen.js

@@ -39,24 +39,37 @@ export const NativeScreen = ({
     backdropBehaviors
   } = useManagedStackContext();
   const routesLength = routes.length;
+  const topIndex = routesLength - 1;
+  const topRouteKey = routes[topIndex]?.key ?? routeKey;
   const screenRef = useAnimatedRef();
-  const sceneProgress = AnimationStore.getRouteAnimation(routeKey, "progress");
   const sceneClosing = AnimationStore.getRouteAnimation(routeKey, "closing");
+  const topSceneProgress = AnimationStore.getRouteAnimation(topRouteKey, "progress");
+  const topSceneClosing = AnimationStore.getRouteAnimation(topRouteKey, "closing");
   const screenActivity = useSharedValue(ScreenActivity.TRANSITIONING_OR_BELOW_TOP);
   useDerivedValue(() => {
-    if (!sceneProgress) {
+    if (!topSceneProgress) {
       screenActivity.set(ScreenActivity.TRANSITIONING_OR_BELOW_TOP);
       return;
     }
     if (index < routesLength - activeScreensLimit - 1 || isPreloaded) {
       screenActivity.set(ScreenActivity.INACTIVE);
-    } else {
-      const outputValue = index === routesLength - 1 ? ScreenActivity.ON_TOP : index >= routesLength - activeScreensLimit ? ScreenActivity.TRANSITIONING_OR_BELOW_TOP : ScreenActivity.INACTIVE;
-      const v = interpolate(sceneProgress.get(), [0, 1 - EPSILON, 1], [1, 1, outputValue], Extrapolation.CLAMP);
-      const next = Math.trunc(v) ?? ScreenActivity.TRANSITIONING_OR_BELOW_TOP;
+      return;
+    }
+    const focusedIndex = optimisticFocusedIndex.value;
+    const topIsClosing = topSceneClosing.get() > 0 && focusedIndex >= 0 && focusedIndex < topIndex;
+    if (topIsClosing) {
+      const postCloseActiveStart = Math.max(0, focusedIndex - activeScreensLimit + 1);
+      const next = index === topIndex ? ScreenActivity.ON_TOP : index > focusedIndex || index >= postCloseActiveStart ? ScreenActivity.TRANSITIONING_OR_BELOW_TOP : ScreenActivity.INACTIVE;
       if (next !== screenActivity.get()) {
         screenActivity.set(next);
       }
+      return;
+    }
+    const outputValue = index === topIndex ? ScreenActivity.ON_TOP : index >= routesLength - activeScreensLimit ? ScreenActivity.TRANSITIONING_OR_BELOW_TOP : ScreenActivity.INACTIVE;
+    const v = interpolate(topSceneProgress.get(), [0, 1 - EPSILON, 1], [1, 1, outputValue], Extrapolation.CLAMP);
+    const next = Math.trunc(v) ?? ScreenActivity.TRANSITIONING_OR_BELOW_TOP;
+    if (next !== screenActivity.get()) {
+      screenActivity.set(next);
     }
   });
   const animatedProps = useAnimatedProps(() => {
@@ -87,8 +100,22 @@ export const NativeScreen = ({
       pointerEvents
     };
   });
-  const NativeScreenComponent = !DISABLE_NATIVE_SCREENS ? AnimatedNativeScreen : Animated.View;
-  return /*#__PURE__*/_jsx(NativeScreenComponent, {
+  if (DISABLE_NATIVE_SCREENS) {
+    return /*#__PURE__*/_jsx(Animated.View, {
+      ref: screenRef
+      // Keep a native boundary per screen when falling back to plain views.
+      // Android release builds can otherwise flatten sibling screens together.
+      ,
+      collapsable: false,
+      style: StyleSheet.absoluteFill,
+      animatedProps: animatedProps,
+      children: /*#__PURE__*/_jsx(LayoutAnchorProvider, {
+        anchorRef: screenRef,
+        children: children
+      })
+    });
+  }
+  return /*#__PURE__*/_jsx(AnimatedNativeScreen, {
     enabled: true,
     ref: screenRef,
     style: StyleSheet.absoluteFill,

package/lib/module/shared/components/native-screen.js.map

@@ -1 +1 @@
-{"version":3,"names":["StyleSheet","Animated","Extrapolation","interpolate","useAnimatedProps","useAnimatedRef","useDerivedValue","useSharedValue","Screen","RNSScreen","EPSILON","useStack","LayoutAnchorProvider","useManagedStackContext","AnimationStore","jsx","_jsx","PASSTHROUGH","ScreenActivity","POINT_NONE","POINT_BOX_NONE","AnimatedNativeScreen","createAnimatedComponent","NativeScreen","routeKey","index","isPreloaded","children","freezeOnBlur","shouldFreeze","flags","DISABLE_NATIVE_SCREENS","routes","optimisticFocusedIndex","activeScreensLimit","backdropBehaviors","routesLength","length","screenRef","sceneProgress","getRouteAnimation","sceneClosing","screenActivity","TRANSITIONING_OR_BELOW_TOP","set","INACTIVE","outputValue","ON_TOP","v","get","CLAMP","next","Math","trunc","animatedProps","activity","isClosing","activeIndex","value","isActive","activeBackdrop","activeAllowsPassthrough","isAllowedPassthroughBelow","pointerEvents","activityState","NativeScreenComponent","View","enabled","ref","style","absoluteFill","anchorRef"],"sourceRoot":"../../../../src","sources":["shared/components/native-screen.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["StyleSheet","Animated","Extrapolation","interpolate","useAnimatedProps","useAnimatedRef","useDerivedValue","useSharedValue","Screen","RNSScreen","EPSILON","useStack","LayoutAnchorProvider","useManagedStackContext","AnimationStore","jsx","_jsx","PASSTHROUGH","ScreenActivity","POINT_NONE","POINT_BOX_NONE","AnimatedNativeScreen","createAnimatedComponent","NativeScreen","routeKey","index","isPreloaded","children","freezeOnBlur","shouldFreeze","flags","DISABLE_NATIVE_SCREENS","routes","optimisticFocusedIndex","activeScreensLimit","backdropBehaviors","routesLength","length","topIndex","topRouteKey","key","screenRef","sceneClosing","getRouteAnimation","topSceneProgress","topSceneClosing","screenActivity","TRANSITIONING_OR_BELOW_TOP","set","INACTIVE","focusedIndex","value","topIsClosing","get","postCloseActiveStart","Math","max","next","ON_TOP","outputValue","v","CLAMP","trunc","animatedProps","activity","isClosing","activeIndex","isActive","activeBackdrop","activeAllowsPassthrough","isAllowedPassthroughBelow","pointerEvents","activityState","View","ref","collapsable","style","absoluteFill","anchorRef","enabled"],"sourceRoot":"../../../../src","sources":["shared/components/native-screen.tsx"],"mappings":"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","ignoreList":[]}

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

@@ -1,11 +1,11 @@
 "use strict";
 
-import { isFloatOverlayVisible } from "../../../utils/overlay/visibility";
+import { isOverlayVisible } from "../../../utils/overlay/visibility";
 
 /**
  * Find the active float overlay from scenes.
  * Scans from the top of the stack downward to find the first screen
- * with a visible overlay that isn't explicitly set to legacy screen mode.
+ * with a visible overlay.
  */
 export function getActiveFloatOverlay(scenes, index, transitionsAlwaysOn) {
   if (scenes.length === 0) {
@@ -25,7 +25,7 @@ export function getActiveFloatOverlay(scenes, index, transitionsAlwaysOn) {
     if (!transitionsAlwaysOn && !options?.enableTransitions) {
       continue;
     }
-    if (isFloatOverlayVisible(options)) {
+    if (isOverlayVisible(options)) {
       return {
         scene,
         overlayIndex: i

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

@@ -1 +1 @@
-{"version":3,"names":["isFloatOverlayVisible","getActiveFloatOverlay","scenes","index","transitionsAlwaysOn","length","startIndex","Math","max","i","scene","options","descriptor","enableTransitions","overlayIndex"],"sourceRoot":"../../../../../../src","sources":["shared/components/overlay/helpers/get-active-overlay.ts"],"mappings":";;AACA,SAASA,qBAAqB,QAAQ,mCAAmC;;AAEzE;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,qBAAqB,CAACW,OAAO,CAAC,EAAE;MACnC,OAAO;QAAED,KAAK;QAAEI,YAAY,EAAEL;MAAE,CAAC;IAClC;EACD;EAEA,OAAO,IAAI;AACZ","ignoreList":[]}
+{"version":3,"names":["isOverlayVisible","getActiveFloatOverlay","scenes","index","transitionsAlwaysOn","length","startIndex","Math","max","i","scene","options","descriptor","enableTransitions","overlayIndex"],"sourceRoot":"../../../../../../src","sources":["shared/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":[]}

package/lib/module/shared/components/overlay/index.js

@@ -1,9 +1,7 @@
 "use strict";
 
 import { FloatOverlay } from "./variations/float-overlay";
-import { ScreenOverlay } from "./variations/screen-overlay";
 export const Overlay = {
-  Float: FloatOverlay,
-  Screen: ScreenOverlay
+  Float: FloatOverlay
 };
 //# sourceMappingURL=index.js.map

package/lib/module/shared/components/overlay/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["FloatOverlay","ScreenOverlay","Overlay","Float","Screen"],"sourceRoot":"../../../../../src","sources":["shared/components/overlay/index.ts"],"mappings":";;AAAA,SAASA,YAAY,QAAQ,4BAA4B;AACzD,SAASC,aAAa,QAAQ,6BAA6B;AAE3D,OAAO,MAAMC,OAAO,GAAG;EACtBC,KAAK,EAAEH,YAAY;EACnBI,MAAM,EAAEH;AACT,CAAC","ignoreList":[]}
+{"version":3,"names":["FloatOverlay","Overlay","Float"],"sourceRoot":"../../../../../src","sources":["shared/components/overlay/index.ts"],"mappings":";;AAAA,SAASA,YAAY,QAAQ,4BAA4B;AAEzD,OAAO,MAAMC,OAAO,GAAG;EACtBC,KAAK,EAAEF;AACR,CAAC","ignoreList":[]}

package/lib/module/shared/components/overlay/variations/overlay-host.js

@@ -2,9 +2,8 @@
 
 import { NavigationContext, NavigationRouteContext } from "@react-navigation/native";
 import { memo, useMemo } from "react";
-import { Animated, StyleSheet, useWindowDimensions, View } from "react-native";
+import { Animated, StyleSheet, View } from "react-native";
 import { useDerivedValue } from "react-native-reanimated";
-import { useSafeAreaInsets } from "react-native-safe-area-context";
 import { useScreenAnimation } from "../../../providers/screen/animation";
 import { jsx as _jsx } from "react/jsx-runtime";
 export const OverlayHost = /*#__PURE__*/memo(function OverlayHost({
@@ -12,29 +11,16 @@ export const OverlayHost = /*#__PURE__*/memo(function OverlayHost({
   overlayScreenState
 }) {
   const OverlayComponent = scene.descriptor.options.overlay;
-  const screen = useWindowDimensions();
-  const insets = useSafeAreaInsets();
   const screenAnimation = useScreenAnimation();
   const relativeProgress = useDerivedValue(() => {
     "worklet";
 
     return screenAnimation.value.stackProgress;
   });
-  const overlayAnimation = useDerivedValue(() => ({
-    progress: relativeProgress.value,
-    layouts: {
-      screen
-    },
-    insets
-  }));
   const overlayProps = useMemo(() => ({
     ...overlayScreenState,
-    progress: relativeProgress,
-    /**@deprecated */
-    overlayAnimation,
-    /**@deprecated */
-    screenAnimation
-  }), [relativeProgress, overlayAnimation, screenAnimation, overlayScreenState]);
+    progress: relativeProgress
+  }), [relativeProgress, overlayScreenState]);
   if (!OverlayComponent) {
     return null;
   }

package/lib/module/shared/components/overlay/variations/overlay-host.js.map

@@ -1 +1 @@
-{"version":3,"names":["NavigationContext","NavigationRouteContext","memo","useMemo","Animated","StyleSheet","useWindowDimensions","View","useDerivedValue","useSafeAreaInsets","useScreenAnimation","jsx","_jsx","OverlayHost","scene","overlayScreenState","OverlayComponent","descriptor","options","overlay","screen","insets","screenAnimation","relativeProgress","value","stackProgress","overlayAnimation","progress","layouts","overlayProps","pointerEvents","style","styles","container","floating","absolute","children","Provider","navigation","route","create","absoluteFillObject","zIndex","flex"],"sourceRoot":"../../../../../../src","sources":["shared/components/overlay/variations/overlay-host.tsx"],"mappings":";;AAAA,SACCA,iBAAiB,EACjBC,sBAAsB,QAChB,0BAA0B;AACjC,SAASC,IAAI,EAAEC,OAAO,QAAQ,OAAO;AACrC,SAASC,QAAQ,EAAEC,UAAU,EAAEC,mBAAmB,EAAEC,IAAI,QAAQ,cAAc;AAC9E,SAASC,eAAe,QAAQ,yBAAyB;AACzD,SAASC,iBAAiB,QAAQ,gCAAgC;AAElE,SAASC,kBAAkB,QAAQ,qCAAqC;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAazE,OAAO,MAAMC,WAAW,gBAAGX,IAAI,CAAC,SAASW,WAAWA,CAAC;EACpDC,KAAK;EACLC;AACiB,CAAC,EAAE;EACpB,MAAMC,gBAAgB,GAAGF,KAAK,CAACG,UAAU,CAACC,OAAO,CAACC,OAAO;EACzD,MAAMC,MAAM,GAAGd,mBAAmB,CAAC,CAAC;EACpC,MAAMe,MAAM,GAAGZ,iBAAiB,CAAC,CAAC;EAElC,MAAMa,eAAe,GAAGZ,kBAAkB,CAAC,CAAC;EAC5C,MAAMa,gBAAgB,GAAGf,eAAe,CAAC,MAAM;IAC9C,SAAS;;IACT,OAAOc,eAAe,CAACE,KAAK,CAACC,aAAa;EAC3C,CAAC,CAAC;EAEF,MAAMC,gBAAgB,GAAGlB,eAAe,CAA4B,OAAO;IAC1EmB,QAAQ,EAAEJ,gBAAgB,CAACC,KAAK;IAChCI,OAAO,EAAE;MAAER;IAAO,CAAC;IACnBC;EACD,CAAC,CAAC,CAAC;EAEH,MAAMQ,YAAwD,GAAG1B,OAAO,CACvE,OAAO;IACN,GAAGY,kBAAkB;IACrBY,QAAQ,EAAEJ,gBAAgB;IAC1B;IACAG,gBAAgB;IAChB;IACAJ;EACD,CAAC,CAAC,EACF,CAACC,gBAAgB,EAAEG,gBAAgB,EAAEJ,eAAe,EAAEP,kBAAkB,CACzE,CAAC;EAED,IAAI,CAACC,gBAAgB,EAAE;IACtB,OAAO,IAAI;EACZ;EAEA,oBACCJ,IAAA,CAACR,QAAQ,CAACG,IAAI;IACbuB,aAAa,EAAC,UAAU;IACxBC,KAAK,EAAE,CAACC,MAAM,CAACC,SAAS,EAAED,MAAM,CAACE,QAAQ,EAAEF,MAAM,CAACG,QAAQ,CAAE;IAAAC,QAAA,eAE5DxB,IAAA,CAACZ,iBAAiB,CAACqC,QAAQ;MAACb,KAAK,EAAEV,KAAK,CAACG,UAAU,CAACqB,UAAkB;MAAAF,QAAA,eACrExB,IAAA,CAACX,sBAAsB,CAACoC,QAAQ;QAACb,KAAK,EAAEV,KAAK,CAACyB,KAAM;QAAAH,QAAA,eACnDxB,IAAA,CAACL,IAAI;UAACuB,aAAa,EAAC,UAAU;UAACC,KAAK,EAAEC,MAAM,CAACb,OAAQ;UAAAiB,QAAA,eACpDxB,IAAA,CAACI,gBAAgB;YAAA,GAAKa;UAAY,CAAG;QAAC,CACjC;MAAC,CACyB;IAAC,CACP;EAAC,CACf,CAAC;AAElB,CAAC,CAAC;AAEF,MAAMG,MAAM,GAAG3B,UAAU,CAACmC,MAAM,CAAC;EAChCrB,OAAO,EAAE;IACR,GAAGd,UAAU,CAACoC,kBAAkB;IAChCC,MAAM,EAAE;EACT,CAAC;EACDT,SAAS,EAAE;IACVU,IAAI,EAAE;EACP,CAAC;EACDR,QAAQ,EAAE9B,UAAU,CAACoC,kBAAkB;EACvCP,QAAQ,EAAE;IACTQ,MAAM,EAAE;EACT;AACD,CAAC,CAAC","ignoreList":[]}
+{"version":3,"names":["NavigationContext","NavigationRouteContext","memo","useMemo","Animated","StyleSheet","View","useDerivedValue","useScreenAnimation","jsx","_jsx","OverlayHost","scene","overlayScreenState","OverlayComponent","descriptor","options","overlay","screenAnimation","relativeProgress","value","stackProgress","overlayProps","progress","pointerEvents","style","styles","container","floating","absolute","children","Provider","navigation","route","create","absoluteFillObject","zIndex","flex"],"sourceRoot":"../../../../../../src","sources":["shared/components/overlay/variations/overlay-host.tsx"],"mappings":";;AAAA,SACCA,iBAAiB,EACjBC,sBAAsB,QAChB,0BAA0B;AACjC,SAASC,IAAI,EAAEC,OAAO,QAAQ,OAAO;AACrC,SAASC,QAAQ,EAAEC,UAAU,EAAEC,IAAI,QAAQ,cAAc;AACzD,SAASC,eAAe,QAAQ,yBAAyB;AAEzD,SAASC,kBAAkB,QAAQ,qCAAqC;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAYzE,OAAO,MAAMC,WAAW,gBAAGT,IAAI,CAAC,SAASS,WAAWA,CAAC;EACpDC,KAAK;EACLC;AACiB,CAAC,EAAE;EACpB,MAAMC,gBAAgB,GAAGF,KAAK,CAACG,UAAU,CAACC,OAAO,CAACC,OAAO;EAEzD,MAAMC,eAAe,GAAGV,kBAAkB,CAAC,CAAC;EAC5C,MAAMW,gBAAgB,GAAGZ,eAAe,CAAC,MAAM;IAC9C,SAAS;;IACT,OAAOW,eAAe,CAACE,KAAK,CAACC,aAAa;EAC3C,CAAC,CAAC;EAEF,MAAMC,YAAwD,GAAGnB,OAAO,CACvE,OAAO;IACN,GAAGU,kBAAkB;IACrBU,QAAQ,EAAEJ;EACX,CAAC,CAAC,EACF,CAACA,gBAAgB,EAAEN,kBAAkB,CACtC,CAAC;EAED,IAAI,CAACC,gBAAgB,EAAE;IACtB,OAAO,IAAI;EACZ;EAEA,oBACCJ,IAAA,CAACN,QAAQ,CAACE,IAAI;IACbkB,aAAa,EAAC,UAAU;IACxBC,KAAK,EAAE,CAACC,MAAM,CAACC,SAAS,EAAED,MAAM,CAACE,QAAQ,EAAEF,MAAM,CAACG,QAAQ,CAAE;IAAAC,QAAA,eAE5DpB,IAAA,CAACV,iBAAiB,CAAC+B,QAAQ;MAACX,KAAK,EAAER,KAAK,CAACG,UAAU,CAACiB,UAAkB;MAAAF,QAAA,eACrEpB,IAAA,CAACT,sBAAsB,CAAC8B,QAAQ;QAACX,KAAK,EAAER,KAAK,CAACqB,KAAM;QAAAH,QAAA,eACnDpB,IAAA,CAACJ,IAAI;UAACkB,aAAa,EAAC,UAAU;UAACC,KAAK,EAAEC,MAAM,CAACT,OAAQ;UAAAa,QAAA,eACpDpB,IAAA,CAACI,gBAAgB;YAAA,GAAKQ;UAAY,CAAG;QAAC,CACjC;MAAC,CACyB;IAAC,CACP;EAAC,CACf,CAAC;AAElB,CAAC,CAAC;AAEF,MAAMI,MAAM,GAAGrB,UAAU,CAAC6B,MAAM,CAAC;EAChCjB,OAAO,EAAE;IACR,GAAGZ,UAAU,CAAC8B,kBAAkB;IAChCC,MAAM,EAAE;EACT,CAAC;EACDT,SAAS,EAAE;IACVU,IAAI,EAAE;EACP,CAAC;EACDR,QAAQ,EAAExB,UAAU,CAAC8B,kBAAkB;EACvCP,QAAQ,EAAE;IACTQ,MAAM,EAAE;EACT;AACD,CAAC,CAAC","ignoreList":[]}