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

package/lib/commonjs/shared/utils/navigation/resolve-scene-neighbors.js

@@ -4,13 +4,29 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.resolveSceneNeighbors = resolveSceneNeighbors;
+const findPreviousDescriptor = (scenes, sceneIndex, isRouteClosing) => {
+  let firstClosingBelow;
+  for (let i = sceneIndex - 1; i >= 0; i--) {
+    const candidate = scenes[i];
+    if (!candidate) continue;
+    if (!isRouteClosing(candidate.route.key)) {
+      return candidate.descriptor;
+    }
+    if (firstClosingBelow === undefined) {
+      firstClosingBelow = candidate.descriptor;
+    }
+  }
+  return firstClosingBelow;
+};
+
 /**
  * Resolves previous/next descriptors while accounting for routes that are
  * visually closing.
  *
  * Rules:
- * - Closing scenes are isolated (no previous/next) so their transition does not
- *   mix with newly pushed screens.
+ * - Closing scenes keep their previous descriptor so their original pair can
+ *   keep resolving while they remain mounted, but they never receive a next
+ *   descriptor.
  * - Non-closing scenes skip over closing neighbors to find the actual active
  *   neighbor.
  * - If there is no non-closing neighbor above/below, we fall back to the first
@@ -26,7 +42,7 @@ function resolveSceneNeighbors(scenes, sceneIndex, isRouteClosing) {
   }
   if (isRouteClosing(current.route.key)) {
     return {
-      previousDescriptor: undefined,
+      previousDescriptor: findPreviousDescriptor(scenes, sceneIndex, isRouteClosing),
       nextDescriptor: undefined
     };
   }
@@ -46,22 +62,7 @@ function resolveSceneNeighbors(scenes, sceneIndex, isRouteClosing) {
   if (nextDescriptor === undefined) {
     nextDescriptor = firstClosingAbove;
   }
-  let previousDescriptor;
-  let firstClosingBelow;
-  for (let i = sceneIndex - 1; i >= 0; i--) {
-    const candidate = scenes[i];
-    if (!candidate) continue;
-    if (!isRouteClosing(candidate.route.key)) {
-      previousDescriptor = candidate.descriptor;
-      break;
-    }
-    if (firstClosingBelow === undefined) {
-      firstClosingBelow = candidate.descriptor;
-    }
-  }
-  if (previousDescriptor === undefined) {
-    previousDescriptor = firstClosingBelow;
-  }
+  const previousDescriptor = findPreviousDescriptor(scenes, sceneIndex, isRouteClosing);
   return {
     previousDescriptor,
     nextDescriptor

package/lib/commonjs/shared/utils/navigation/resolve-scene-neighbors.js.map

@@ -1 +1 @@
-{"version":3,"names":["resolveSceneNeighbors","scenes","sceneIndex","isRouteClosing","current","previousDescriptor","undefined","nextDescriptor","route","key","firstClosingAbove","i","length","candidate","descriptor","firstClosingBelow"],"sourceRoot":"../../../../../src","sources":["shared/utils/navigation/resolve-scene-neighbors.ts"],"mappings":";;;;;;AAOA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACO,SAASA,qBAAqBA,CACpCC,MAAW,EACXC,UAAkB,EAClBC,cAA8B,EAI7B;EACD,MAAMC,OAAO,GAAGH,MAAM,CAACC,UAAU,CAAC;EAClC,IAAI,CAACE,OAAO,EAAE;IACb,OAAO;MACNC,kBAAkB,EAAEC,SAAS;MAC7BC,cAAc,EAAED;IACjB,CAAC;EACF;EAEA,IAAIH,cAAc,CAACC,OAAO,CAACI,KAAK,CAACC,GAAG,CAAC,EAAE;IACtC,OAAO;MACNJ,kBAAkB,EAAEC,SAAS;MAC7BC,cAAc,EAAED;IACjB,CAAC;EACF;EAEA,IAAIC,cAA2C;EAC/C,IAAIG,iBAA8C;EAElD,KAAK,IAAIC,CAAC,GAAGT,UAAU,GAAG,CAAC,EAAES,CAAC,GAAGV,MAAM,CAACW,MAAM,EAAED,CAAC,EAAE,EAAE;IACpD,MAAME,SAAS,GAAGZ,MAAM,CAACU,CAAC,CAAC;IAC3B,IAAI,CAACE,SAAS,EAAE;IAEhB,IAAI,CAACV,cAAc,CAACU,SAAS,CAACL,KAAK,CAACC,GAAG,CAAC,EAAE;MACzCF,cAAc,GAAGM,SAAS,CAACC,UAAU;MACrC;IACD;IAEA,IAAIJ,iBAAiB,KAAKJ,SAAS,EAAE;MACpCI,iBAAiB,GAAGG,SAAS,CAACC,UAAU;IACzC;EACD;EAEA,IAAIP,cAAc,KAAKD,SAAS,EAAE;IACjCC,cAAc,GAAGG,iBAAiB;EACnC;EAEA,IAAIL,kBAA+C;EACnD,IAAIU,iBAA8C;EAElD,KAAK,IAAIJ,CAAC,GAAGT,UAAU,GAAG,CAAC,EAAES,CAAC,IAAI,CAAC,EAAEA,CAAC,EAAE,EAAE;IACzC,MAAME,SAAS,GAAGZ,MAAM,CAACU,CAAC,CAAC;IAC3B,IAAI,CAACE,SAAS,EAAE;IAEhB,IAAI,CAACV,cAAc,CAACU,SAAS,CAACL,KAAK,CAACC,GAAG,CAAC,EAAE;MACzCJ,kBAAkB,GAAGQ,SAAS,CAACC,UAAU;MACzC;IACD;IAEA,IAAIC,iBAAiB,KAAKT,SAAS,EAAE;MACpCS,iBAAiB,GAAGF,SAAS,CAACC,UAAU;IACzC;EACD;EAEA,IAAIT,kBAAkB,KAAKC,SAAS,EAAE;IACrCD,kBAAkB,GAAGU,iBAAiB;EACvC;EAEA,OAAO;IACNV,kBAAkB;IAClBE;EACD,CAAC;AACF","ignoreList":[]}
+{"version":3,"names":["findPreviousDescriptor","scenes","sceneIndex","isRouteClosing","firstClosingBelow","i","candidate","route","key","descriptor","undefined","resolveSceneNeighbors","current","previousDescriptor","nextDescriptor","firstClosingAbove","length"],"sourceRoot":"../../../../../src","sources":["shared/utils/navigation/resolve-scene-neighbors.ts"],"mappings":";;;;;;AAOA,MAAMA,sBAAsB,GAAGA,CAC9BC,MAAW,EACXC,UAAkB,EAClBC,cAA8B,KACG;EACjC,IAAIC,iBAA8C;EAElD,KAAK,IAAIC,CAAC,GAAGH,UAAU,GAAG,CAAC,EAAEG,CAAC,IAAI,CAAC,EAAEA,CAAC,EAAE,EAAE;IACzC,MAAMC,SAAS,GAAGL,MAAM,CAACI,CAAC,CAAC;IAC3B,IAAI,CAACC,SAAS,EAAE;IAEhB,IAAI,CAACH,cAAc,CAACG,SAAS,CAACC,KAAK,CAACC,GAAG,CAAC,EAAE;MACzC,OAAOF,SAAS,CAACG,UAAU;IAC5B;IAEA,IAAIL,iBAAiB,KAAKM,SAAS,EAAE;MACpCN,iBAAiB,GAAGE,SAAS,CAACG,UAAU;IACzC;EACD;EAEA,OAAOL,iBAAiB;AACzB,CAAC;;AAED;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACO,SAASO,qBAAqBA,CACpCV,MAAW,EACXC,UAAkB,EAClBC,cAA8B,EAI7B;EACD,MAAMS,OAAO,GAAGX,MAAM,CAACC,UAAU,CAAC;EAClC,IAAI,CAACU,OAAO,EAAE;IACb,OAAO;MACNC,kBAAkB,EAAEH,SAAS;MAC7BI,cAAc,EAAEJ;IACjB,CAAC;EACF;EAEA,IAAIP,cAAc,CAACS,OAAO,CAACL,KAAK,CAACC,GAAG,CAAC,EAAE;IACtC,OAAO;MACNK,kBAAkB,EAAEb,sBAAsB,CACzCC,MAAM,EACNC,UAAU,EACVC,cACD,CAAC;MACDW,cAAc,EAAEJ;IACjB,CAAC;EACF;EAEA,IAAII,cAA2C;EAC/C,IAAIC,iBAA8C;EAElD,KAAK,IAAIV,CAAC,GAAGH,UAAU,GAAG,CAAC,EAAEG,CAAC,GAAGJ,MAAM,CAACe,MAAM,EAAEX,CAAC,EAAE,EAAE;IACpD,MAAMC,SAAS,GAAGL,MAAM,CAACI,CAAC,CAAC;IAC3B,IAAI,CAACC,SAAS,EAAE;IAEhB,IAAI,CAACH,cAAc,CAACG,SAAS,CAACC,KAAK,CAACC,GAAG,CAAC,EAAE;MACzCM,cAAc,GAAGR,SAAS,CAACG,UAAU;MACrC;IACD;IAEA,IAAIM,iBAAiB,KAAKL,SAAS,EAAE;MACpCK,iBAAiB,GAAGT,SAAS,CAACG,UAAU;IACzC;EACD;EAEA,IAAIK,cAAc,KAAKJ,SAAS,EAAE;IACjCI,cAAc,GAAGC,iBAAiB;EACnC;EAEA,MAAMF,kBAAkB,GAAGb,sBAAsB,CAChDC,MAAM,EACNC,UAAU,EACVC,cACD,CAAC;EAED,OAAO;IACNU,kBAAkB;IAClBC;EACD,CAAC;AACF","ignoreList":[]}

package/lib/commonjs/shared/utils/resolve-chain-target.js

@@ -4,33 +4,26 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.resolveChainTarget = resolveChainTarget;
-const isAncestorTarget = target => {
-  return typeof target === "object" && target !== null && "ancestor" in target;
-};
 function resolveChainTarget({
   target,
   self,
   ancestors
 }) {
+  "worklet";
+
   if (!self) {
     return null;
   }
-  if (!target || target === "self") {
-    return self;
-  }
-  if (target === "parent") {
-    return ancestors[0] ?? null;
-  }
-  if (target === "root") {
-    return ancestors[ancestors.length - 1] ?? null;
-  }
-  if (!isAncestorTarget(target)) {
+  const depth = target?.depth ?? 0;
+  if (!Number.isInteger(depth)) {
     return null;
   }
-  const depth = target.ancestor;
-  if (!Number.isInteger(depth) || depth < 1) {
+  if (depth === 0) {
+    return self;
+  }
+  if (depth > 0) {
     return null;
   }
-  return ancestors[depth - 1] ?? null;
+  return ancestors[Math.abs(depth) - 1] ?? null;
 }
 //# sourceMappingURL=resolve-chain-target.js.map

package/lib/commonjs/shared/utils/resolve-chain-target.js.map

@@ -1 +1 @@
-{"version":3,"names":["isAncestorTarget","target","resolveChainTarget","self","ancestors","length","depth","ancestor","Number","isInteger"],"sourceRoot":"../../../../src","sources":["shared/utils/resolve-chain-target.ts"],"mappings":";;;;;;AAQA,MAAMA,gBAAgB,GACrBC,MAAmB,IACiB;EACpC,OAAO,OAAOA,MAAM,KAAK,QAAQ,IAAIA,MAAM,KAAK,IAAI,IAAI,UAAU,IAAIA,MAAM;AAC7E,CAAC;AAEM,SAASC,kBAAkBA,CAAI;EACrCD,MAAM;EACNE,IAAI;EACJC;AAC4B,CAAC,EAAY;EACzC,IAAI,CAACD,IAAI,EAAE;IACV,OAAO,IAAI;EACZ;EAEA,IAAI,CAACF,MAAM,IAAIA,MAAM,KAAK,MAAM,EAAE;IACjC,OAAOE,IAAI;EACZ;EAEA,IAAIF,MAAM,KAAK,QAAQ,EAAE;IACxB,OAAOG,SAAS,CAAC,CAAC,CAAC,IAAI,IAAI;EAC5B;EAEA,IAAIH,MAAM,KAAK,MAAM,EAAE;IACtB,OAAOG,SAAS,CAACA,SAAS,CAACC,MAAM,GAAG,CAAC,CAAC,IAAI,IAAI;EAC/C;EAEA,IAAI,CAACL,gBAAgB,CAACC,MAAM,CAAC,EAAE;IAC9B,OAAO,IAAI;EACZ;EAEA,MAAMK,KAAK,GAAGL,MAAM,CAACM,QAAQ;EAC7B,IAAI,CAACC,MAAM,CAACC,SAAS,CAACH,KAAK,CAAC,IAAIA,KAAK,GAAG,CAAC,EAAE;IAC1C,OAAO,IAAI;EACZ;EAEA,OAAOF,SAAS,CAACE,KAAK,GAAG,CAAC,CAAC,IAAI,IAAI;AACpC","ignoreList":[]}
+{"version":3,"names":["resolveChainTarget","target","self","ancestors","depth","Number","isInteger","Math","abs"],"sourceRoot":"../../../../src","sources":["shared/utils/resolve-chain-target.ts"],"mappings":";;;;;;AAQO,SAASA,kBAAkBA,CAAI;EACrCC,MAAM;EACNC,IAAI;EACJC;AAC4B,CAAC,EAAY;EACzC,SAAS;;EACT,IAAI,CAACD,IAAI,EAAE;IACV,OAAO,IAAI;EACZ;EAEA,MAAME,KAAK,GAAGH,MAAM,EAAEG,KAAK,IAAI,CAAC;EAChC,IAAI,CAACC,MAAM,CAACC,SAAS,CAACF,KAAK,CAAC,EAAE;IAC7B,OAAO,IAAI;EACZ;EAEA,IAAIA,KAAK,KAAK,CAAC,EAAE;IAChB,OAAOF,IAAI;EACZ;EAEA,IAAIE,KAAK,GAAG,CAAC,EAAE;IACd,OAAO,IAAI;EACZ;EAEA,OAAOD,SAAS,CAACI,IAAI,CAACC,GAAG,CAACJ,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,IAAI;AAC9C","ignoreList":[]}

package/lib/commonjs/shared/utils/resolve-screen-transition-options.js

@@ -3,8 +3,8 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.resolveSheetScrollGestureBehavior = exports.DEFAULT_SHEET_SCROLL_GESTURE_BEHAVIOR = void 0;
-const DEFAULT_SHEET_SCROLL_GESTURE_BEHAVIOR = exports.DEFAULT_SHEET_SCROLL_GESTURE_BEHAVIOR = "expand-and-collapse";
+exports.resolveSheetScrollGestureBehavior = void 0;
+var _constants = require("../constants");
 const resolveSheetScrollGestureBehavior = options => {
   const explicitBehavior = options.sheetScrollGestureBehavior;
   if (explicitBehavior) return explicitBehavior;
@@ -12,7 +12,7 @@ const resolveSheetScrollGestureBehavior = options => {
   if (legacyBehavior !== undefined) {
     return legacyBehavior ? "expand-and-collapse" : "collapse-only";
   }
-  return DEFAULT_SHEET_SCROLL_GESTURE_BEHAVIOR;
+  return _constants.DEFAULT_SHEET_SCROLL_GESTURE_BEHAVIOR;
 };
 exports.resolveSheetScrollGestureBehavior = resolveSheetScrollGestureBehavior;
 //# sourceMappingURL=resolve-screen-transition-options.js.map

package/lib/commonjs/shared/utils/resolve-screen-transition-options.js.map

@@ -1 +1 @@
-{"version":3,"names":["DEFAULT_SHEET_SCROLL_GESTURE_BEHAVIOR","exports","resolveSheetScrollGestureBehavior","options","explicitBehavior","sheetScrollGestureBehavior","legacyBehavior","expandViaScrollView","undefined"],"sourceRoot":"../../../../src","sources":["shared/utils/resolve-screen-transition-options.ts"],"mappings":";;;;;;AAKO,MAAMA,qCAAiE,GAAAC,OAAA,CAAAD,qCAAA,GAC7E,qBAAqB;AAEf,MAAME,iCAAiC,GAC7CC,OAGC,IAC+B;EAChC,MAAMC,gBAAgB,GAAGD,OAAO,CAACE,0BAA0B;EAC3D,IAAID,gBAAgB,EAAE,OAAOA,gBAAgB;EAE7C,MAAME,cAAc,GAAGH,OAAO,CAACI,mBAAmB;EAClD,IAAID,cAAc,KAAKE,SAAS,EAAE;IACjC,OAAOF,cAAc,GAAG,qBAAqB,GAAG,eAAe;EAChE;EAEA,OAAON,qCAAqC;AAC7C,CAAC;AAACC,OAAA,CAAAC,iCAAA,GAAAA,iCAAA","ignoreList":[]}
+{"version":3,"names":["_constants","require","resolveSheetScrollGestureBehavior","options","explicitBehavior","sheetScrollGestureBehavior","legacyBehavior","expandViaScrollView","undefined","DEFAULT_SHEET_SCROLL_GESTURE_BEHAVIOR","exports"],"sourceRoot":"../../../../src","sources":["shared/utils/resolve-screen-transition-options.ts"],"mappings":";;;;;;AAAA,IAAAA,UAAA,GAAAC,OAAA;AAMO,MAAMC,iCAAiC,GAC7CC,OAGC,IAC+B;EAChC,MAAMC,gBAAgB,GAAGD,OAAO,CAACE,0BAA0B;EAC3D,IAAID,gBAAgB,EAAE,OAAOA,gBAAgB;EAE7C,MAAME,cAAc,GAAGH,OAAO,CAACI,mBAAmB;EAClD,IAAID,cAAc,KAAKE,SAAS,EAAE;IACjC,OAAOF,cAAc,GAAG,qBAAqB,GAAG,eAAe;EAChE;EAEA,OAAOG,gDAAqC;AAC7C,CAAC;AAACC,OAAA,CAAAR,iCAAA,GAAAA,iCAAA","ignoreList":[]}

package/lib/module/component-stack/components/component-screen.js

@@ -1,8 +1,7 @@
 "use strict";
 
 import { StyleSheet } from "react-native";
-import Animated, { useAnimatedProps, useAnimatedRef } from "react-native-reanimated";
-import { LayoutAnchorProvider } from "../../shared/providers/layout-anchor.provider";
+import Animated, { useAnimatedProps } from "react-native-reanimated";
 import { AnimationStore } from "../../shared/stores/animation.store";
 import { jsx as _jsx } from "react/jsx-runtime";
 const POINT_NONE = "none";
@@ -12,7 +11,6 @@ export const ComponentScreen = ({
   children
 }) => {
   const sceneClosing = AnimationStore.getValue(routeKey, "closing");
-  const screenRef = useAnimatedRef();
   const animatedProps = useAnimatedProps(() => {
     return {
       pointerEvents: sceneClosing.get() ? POINT_NONE : POINT_BOX_NONE
@@ -20,13 +18,9 @@ export const ComponentScreen = ({
   });
   const ComponentScreenComponent = Animated.View;
   return /*#__PURE__*/_jsx(ComponentScreenComponent, {
-    ref: screenRef,
     style: StyleSheet.absoluteFill,
     animatedProps: animatedProps,
-    children: /*#__PURE__*/_jsx(LayoutAnchorProvider, {
-      anchorRef: screenRef,
-      children: children
-    })
+    children: children
   });
 };
 //# sourceMappingURL=component-screen.js.map

package/lib/module/component-stack/components/component-screen.js.map

@@ -1 +1 @@
-{"version":3,"names":["StyleSheet","Animated","useAnimatedProps","useAnimatedRef","LayoutAnchorProvider","AnimationStore","jsx","_jsx","POINT_NONE","POINT_BOX_NONE","ComponentScreen","routeKey","children","sceneClosing","getValue","screenRef","animatedProps","pointerEvents","get","ComponentScreenComponent","View","ref","style","absoluteFill","anchorRef"],"sourceRoot":"../../../../src","sources":["component-stack/components/component-screen.tsx"],"mappings":";;AACA,SAASA,UAAU,QAAmB,cAAc;AACpD,OAAOC,QAAQ,IACdC,gBAAgB,EAChBC,cAAc,QACR,yBAAyB;AAChC,SAASC,oBAAoB,QAAQ,+CAA+C;AACpF,SAASC,cAAc,QAAQ,qCAAqC;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAMrE,MAAMC,UAAU,GAAG,MAAe;AAClC,MAAMC,cAAc,GAAG,UAAmB;AAE1C,OAAO,MAAMC,eAAe,GAAGA,CAAC;EAAEC,QAAQ;EAAEC;AAAsB,CAAC,KAAK;EACvE,MAAMC,YAAY,GAAGR,cAAc,CAACS,QAAQ,CAACH,QAAQ,EAAE,SAAS,CAAC;EACjE,MAAMI,SAAS,GAAGZ,cAAc,CAAO,CAAC;EAExC,MAAMa,aAAa,GAAGd,gBAAgB,CAAC,MAAM;IAC5C,OAAO;MACNe,aAAa,EAAEJ,YAAY,CAACK,GAAG,CAAC,CAAC,GAAGV,UAAU,GAAGC;IAClD,CAAC;EACF,CAAC,CAAC;EAEF,MAAMU,wBAAwB,GAAGlB,QAAQ,CAACmB,IAAI;EAE9C,oBACCb,IAAA,CAACY,wBAAwB;IACxBE,GAAG,EAAEN,SAAU;IACfO,KAAK,EAAEtB,UAAU,CAACuB,YAAa;IAC/BP,aAAa,EAAEA,aAAc;IAAAJ,QAAA,eAE7BL,IAAA,CAACH,oBAAoB;MAACoB,SAAS,EAAET,SAAU;MAAAH,QAAA,EACzCA;IAAQ,CACY;EAAC,CACE,CAAC;AAE7B,CAAC","ignoreList":[]}
+{"version":3,"names":["StyleSheet","Animated","useAnimatedProps","AnimationStore","jsx","_jsx","POINT_NONE","POINT_BOX_NONE","ComponentScreen","routeKey","children","sceneClosing","getValue","animatedProps","pointerEvents","get","ComponentScreenComponent","View","style","absoluteFill"],"sourceRoot":"../../../../src","sources":["component-stack/components/component-screen.tsx"],"mappings":";;AACA,SAASA,UAAU,QAAQ,cAAc;AACzC,OAAOC,QAAQ,IAAIC,gBAAgB,QAAQ,yBAAyB;AACpE,SAASC,cAAc,QAAQ,qCAAqC;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAMrE,MAAMC,UAAU,GAAG,MAAe;AAClC,MAAMC,cAAc,GAAG,UAAmB;AAE1C,OAAO,MAAMC,eAAe,GAAGA,CAAC;EAAEC,QAAQ;EAAEC;AAAsB,CAAC,KAAK;EACvE,MAAMC,YAAY,GAAGR,cAAc,CAACS,QAAQ,CAACH,QAAQ,EAAE,SAAS,CAAC;EAEjE,MAAMI,aAAa,GAAGX,gBAAgB,CAAC,MAAM;IAC5C,OAAO;MACNY,aAAa,EAAEH,YAAY,CAACI,GAAG,CAAC,CAAC,GAAGT,UAAU,GAAGC;IAClD,CAAC;EACF,CAAC,CAAC;EAEF,MAAMS,wBAAwB,GAAGf,QAAQ,CAACgB,IAAI;EAE9C,oBACCZ,IAAA,CAACW,wBAAwB;IACxBE,KAAK,EAAElB,UAAU,CAACmB,YAAa;IAC/BN,aAAa,EAAEA,aAAc;IAAAH,QAAA,EAE5BA;EAAQ,CACgB,CAAC;AAE7B,CAAC","ignoreList":[]}

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

@@ -5,7 +5,7 @@ import Animated, { runOnUI, useAnimatedRef, useAnimatedStyle } from "react-nativ
 import { NO_STYLES } from "../../constants";
 import { useDescriptorDerivations } from "../../providers/screen/descriptors";
 import { useScreenStyles } from "../../providers/screen/styles";
-import { setGroupInitialId } from "../../stores/bounds/internals/groups";
+import { createPendingPairKey } from "../../stores/bounds/helpers/link-pairs.helpers";
 import { prepareStyleForBounds } from "../../utils/bounds/helpers/styles/styles";
 import { useBoundaryPresence } from "./hooks/use-boundary-presence";
 import { useInitialDestinationMeasurement } from "./hooks/use-initial-destination-measurement";
@@ -13,11 +13,11 @@ import { useInitialSourceMeasurement } from "./hooks/use-initial-source-measurem
 import { useMeasurer } from "./hooks/use-measurer";
 import { useRefreshBoundary } from "./hooks/use-refresh-boundary";
 import { BoundaryOwnerProvider, useBoundaryOwner } from "./providers/boundary-owner.provider";
-import { buildBoundaryMatchKey } from "./utils/build-boundary-match-key";
 import { jsx as _jsx } from "react/jsx-runtime";
 export function createBoundaryComponent(Wrapped, options = {}) {
   const {
-    alreadyAnimated = false
+    alreadyAnimated = false,
+    shouldAutoMeasure = false
   } = options;
   const AnimatedComponent = alreadyAnimated ? Wrapped : Animated.createAnimatedComponent(Wrapped);
   const Inner = /*#__PURE__*/forwardRef((props, forwardedRef) => {
@@ -34,17 +34,13 @@ export function createBoundaryComponent(Wrapped, options = {}) {
       onPress,
       ...rest
     } = props;
-    const sharedBoundTag = buildBoundaryMatchKey({
-      group,
-      id
-    });
+    const linkId = String(id);
+    const entryTag = group ? `${group}:${linkId}` : linkId;
     const {
       previousScreenKey: preferredSourceScreenKey,
       currentScreenKey,
       nextScreenKey,
       ancestorKeys,
-      navigatorKey,
-      ancestorNavigatorKeys,
       hasConfiguredInterpolator
     } = useDescriptorDerivations();
     const runtimeEnabled = enabled && hasConfiguredInterpolator;
@@ -67,15 +63,20 @@ export function createBoundaryComponent(Wrapped, options = {}) {
     const associatedStyles = useAnimatedStyle(() => {
       "worklet";
 
-      return stylesMap.get()[sharedBoundTag]?.style ?? NO_STYLES;
+      return stylesMap.get()[entryTag]?.style ?? NO_STYLES;
     });
     const associatedStackingStyles = useAnimatedStyle(() => {
       "worklet";
 
-      const baseStyle = stylesMap.get()[sharedBoundTag]?.style;
+      const baseStyle = stylesMap.get()[entryTag]?.style;
+      const zIndex = baseStyle?.zIndex ?? 0;
+      const elevation = baseStyle?.elevation ?? 0;
+      if (zIndex === 0 && elevation === 0) {
+        return NO_STYLES;
+      }
       return {
-        zIndex: baseStyle?.zIndex ?? 0,
-        elevation: baseStyle?.elevation ?? 0
+        zIndex,
+        elevation
       };
     });
     const {
@@ -90,72 +91,61 @@ export function createBoundaryComponent(Wrapped, options = {}) {
     const preparedStyles = targetPreparedStyles ?? ownerPreparedStyles;
     const measureBoundary = useMeasurer({
       enabled,
-      sharedBoundTag,
-      preferredSourceScreenKey,
+      entryTag,
+      linkId,
+      group,
       currentScreenKey,
-      ancestorKeys,
-      navigatorKey,
-      ancestorNavigatorKeys,
       preparedStyles,
       measuredAnimatedRef: measuredRef
     });
     const shouldRunDestinationEffects = runtimeEnabled && !hasNextScreen;
 
     // Register/unregister this boundary in the presence map so source/destination
-    // matching can resolve across screens (including ancestor relationships).
+    // matching can resolve across concrete screen keys.
     useBoundaryPresence({
       enabled: runtimeEnabled,
-      sharedBoundTag,
+      entryTag,
       currentScreenKey,
-      ancestorKeys,
-      navigatorKey,
-      ancestorNavigatorKeys,
       boundaryConfig
     });
-
-    // Initial source measurement: capture source bounds when a matching
-    // destination appears on the next screen.
+    const shouldPassivelyMeasureSource = shouldAutoMeasure && typeof onPress !== "function";
     useInitialSourceMeasurement({
       enabled: runtimeEnabled,
       nextScreenKey,
-      measureBoundary
+      measureBoundary,
+      currentScreenKey,
+      linkId,
+      group,
+      shouldAutoMeasure: shouldPassivelyMeasureSource
     });
-
-    // Initial destination measurement: hold lifecycle start until the first
-    // valid destination measurement attaches, then release the pending transition.
     useInitialDestinationMeasurement({
-      sharedBoundTag,
+      linkId,
       enabled: shouldRunDestinationEffects,
       currentScreenKey,
+      preferredSourceScreenKey,
+      ancestorScreenKeys: ancestorKeys,
       measureBoundary
     });
-
-    // Pre-transition measurement path: when this route or its next sibling is
-    // about to animate, capture or refresh the measurements needed before
-    // progress or transform state mutates. Grouped sources refresh existing
-    // links; plain sources only backfill when missing.
     useRefreshBoundary({
       enabled: runtimeEnabled,
-      sharedBoundTag,
-      id,
-      group,
       currentScreenKey,
+      preferredSourceScreenKey,
       nextScreenKey,
-      hasNextScreen,
+      linkId,
+      group,
+      ancestorScreenKeys: ancestorKeys,
       measureBoundary
     });
     const handlePress = useCallback((...args) => {
       // Press path has priority: capture source before user onPress/navigation.
-      if (group) {
-        runOnUI(setGroupInitialId)(group, String(id));
-      }
       runOnUI(measureBoundary)({
-        intent: "capture-source"
+        type: "source",
+        pairKey: createPendingPairKey(currentScreenKey)
       });
       if (typeof onPress === "function") {
         onPress(...args);
       }
-    }, [group, id, measureBoundary, onPress]);
+    }, [measureBoundary, onPress, currentScreenKey]);
     const resolvedOnPress = typeof onPress === "function" ? handlePress : undefined;
     useImperativeHandle(forwardedRef, () => ownerRef.current, [ownerRef]);
     return /*#__PURE__*/_jsx(BoundaryOwnerProvider, {

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

@@ -1 +1 @@
-{"version":3,"names":["forwardRef","memo","useCallback","useImperativeHandle","useMemo","Animated","runOnUI","useAnimatedRef","useAnimatedStyle","NO_STYLES","useDescriptorDerivations","useScreenStyles","setGroupInitialId","prepareStyleForBounds","useBoundaryPresence","useInitialDestinationMeasurement","useInitialSourceMeasurement","useMeasurer","useRefreshBoundary","BoundaryOwnerProvider","useBoundaryOwner","buildBoundaryMatchKey","jsx","_jsx","createBoundaryComponent","Wrapped","options","alreadyAnimated","AnimatedComponent","createAnimatedComponent","Inner","props","forwardedRef","ownerRef","enabled","group","id","anchor","scaleMode","target","method","style","onPress","rest","sharedBoundTag","previousScreenKey","preferredSourceScreenKey","currentScreenKey","nextScreenKey","ancestorKeys","navigatorKey","ancestorNavigatorKeys","hasConfiguredInterpolator","runtimeEnabled","hasNextScreen","boundaryConfig","undefined","ownerPreparedStyles","stylesMap","associatedStyles","get","associatedStackingStyles","baseStyle","zIndex","elevation","contextValue","measuredRef","hasActiveTarget","targetPreparedStyles","associatedTargetStyles","preparedStyles","measureBoundary","measuredAnimatedRef","shouldRunDestinationEffects","handlePress","args","String","intent","resolvedOnPress","current","value","children","ref","collapsable"],"sourceRoot":"../../../../../src","sources":["shared/components/create-boundary-component/create-boundary-component.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["forwardRef","memo","useCallback","useImperativeHandle","useMemo","Animated","runOnUI","useAnimatedRef","useAnimatedStyle","NO_STYLES","useDescriptorDerivations","useScreenStyles","createPendingPairKey","prepareStyleForBounds","useBoundaryPresence","useInitialDestinationMeasurement","useInitialSourceMeasurement","useMeasurer","useRefreshBoundary","BoundaryOwnerProvider","useBoundaryOwner","jsx","_jsx","createBoundaryComponent","Wrapped","options","alreadyAnimated","shouldAutoMeasure","AnimatedComponent","createAnimatedComponent","Inner","props","forwardedRef","ownerRef","enabled","group","id","anchor","scaleMode","target","method","style","onPress","rest","linkId","String","entryTag","previousScreenKey","preferredSourceScreenKey","currentScreenKey","nextScreenKey","ancestorKeys","hasConfiguredInterpolator","runtimeEnabled","hasNextScreen","boundaryConfig","undefined","ownerPreparedStyles","stylesMap","associatedStyles","get","associatedStackingStyles","baseStyle","zIndex","elevation","contextValue","measuredRef","hasActiveTarget","targetPreparedStyles","associatedTargetStyles","preparedStyles","measureBoundary","measuredAnimatedRef","shouldRunDestinationEffects","shouldPassivelyMeasureSource","ancestorScreenKeys","handlePress","args","type","pairKey","resolvedOnPress","current","value","children","ref","collapsable"],"sourceRoot":"../../../../../src","sources":["shared/components/create-boundary-component/create-boundary-component.tsx"],"mappings":";;AAAA,SAECA,UAAU,EACVC,IAAI,EACJC,WAAW,EACXC,mBAAmB,EACnBC,OAAO,QACD,OAAO;AAEd,OAAOC,QAAQ,IACdC,OAAO,EACPC,cAAc,EACdC,gBAAgB,QACV,yBAAyB;AAChC,SAASC,SAAS,QAAQ,iBAAiB;AAC3C,SAASC,wBAAwB,QAAQ,oCAAoC;AAC7E,SAASC,eAAe,QAAQ,+BAA+B;AAC/D,SAASC,oBAAoB,QAAQ,gDAAgD;AACrF,SAASC,qBAAqB,QAAQ,0CAA0C;AAChF,SAASC,mBAAmB,QAAQ,+BAA+B;AACnE,SAASC,gCAAgC,QAAQ,6CAA6C;AAC9F,SAASC,2BAA2B,QAAQ,wCAAwC;AACpF,SAASC,WAAW,QAAQ,sBAAsB;AAClD,SAASC,kBAAkB,QAAQ,8BAA8B;AACjE,SACCC,qBAAqB,EACrBC,gBAAgB,QACV,qCAAqC;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAQ7C,OAAO,SAASC,uBAAuBA,CACtCC,OAAyB,EACzBC,OAAuC,GAAG,CAAC,CAAC,EAC3C;EACD,MAAM;IAAEC,eAAe,GAAG,KAAK;IAAEC,iBAAiB,GAAG;EAAM,CAAC,GAAGF,OAAO;EACtE,MAAMG,iBAAiB,GAAGF,eAAe,GACtCF,OAAO,GACPnB,QAAQ,CAACwB,uBAAuB,CAACL,OAAO,CAAC;EAE5C,MAAMM,KAAK,gBAAG9B,UAAU,CAGtB,CAAC+B,KAAK,EAAEC,YAAY,KAAK;IAC1B,MAAMC,QAAQ,GAAG1B,cAAc,CAAO,CAAC;IACvC,MAAM;MACL2B,OAAO,GAAG,IAAI;MACdC,KAAK;MACLC,EAAE;MACFC,MAAM;MACNC,SAAS;MACTC,MAAM;MACNC,MAAM;MACNC,KAAK;MACLC,OAAO;MACP,GAAGC;IACJ,CAAC,GAAGZ,KAAY;IAEhB,MAAMa,MAAM,GAAGC,MAAM,CAACT,EAAE,CAAC;IACzB,MAAMU,QAAQ,GAAGX,KAAK,GAAG,GAAGA,KAAK,IAAIS,MAAM,EAAE,GAAGA,MAAM;IAEtD,MAAM;MACLG,iBAAiB,EAAEC,wBAAwB;MAC3CC,gBAAgB;MAChBC,aAAa;MACbC,YAAY;MACZC;IACD,CAAC,GAAG1C,wBAAwB,CAAC,CAAC;IAE9B,MAAM2C,cAAc,GAAGnB,OAAO,IAAIkB,yBAAyB;IAC3D,MAAME,aAAa,GAAG,CAAC,CAACJ,aAAa;IACrC,MAAMK,cAAc,GAAGnD,OAAO,CAAkC,MAAM;MACrE,IACCiC,MAAM,KAAKmB,SAAS,IACpBlB,SAAS,KAAKkB,SAAS,IACvBjB,MAAM,KAAKiB,SAAS,IACpBhB,MAAM,KAAKgB,SAAS,EACnB;QACD,OAAOA,SAAS;MACjB;MAEA,OAAO;QACNnB,MAAM;QACNC,SAAS;QACTC,MAAM;QACNC;MACD,CAAC;IACF,CAAC,EAAE,CAACH,MAAM,EAAEC,SAAS,EAAEC,MAAM,EAAEC,MAAM,CAAC,CAAC;IAEvC,MAAMiB,mBAAmB,GAAGrD,OAAO,CAClC,MAAMS,qBAAqB,CAAC4B,KAAK,CAAC,EAClC,CAACA,KAAK,CACP,CAAC;IACD,MAAM;MAAEiB;IAAU,CAAC,GAAG/C,eAAe,CAAC,CAAC;IAEvC,MAAMgD,gBAAgB,GAAGnD,gBAAgB,CAAC,MAAM;MAC/C,SAAS;;MACT,OAAOkD,SAAS,CAACE,GAAG,CAAC,CAAC,CAACd,QAAQ,CAAC,EAAEL,KAAK,IAAIhC,SAAS;IACrD,CAAC,CAAC;IAEF,MAAMoD,wBAAwB,GAAGrD,gBAAgB,CAAC,MAAM;MACvD,SAAS;;MACT,MAAMsD,SAAS,GAAGJ,SAAS,CAACE,GAAG,CAAC,CAAC,CAACd,QAAQ,CAAC,EAAEL,KAAK;MAClD,MAAMsB,MAAM,GAAGD,SAAS,EAAEC,MAAM,IAAI,CAAC;MACrC,MAAMC,SAAS,GAAGF,SAAS,EAAEE,SAAS,IAAI,CAAC;MAE3C,IAAID,MAAM,KAAK,CAAC,IAAIC,SAAS,KAAK,CAAC,EAAE;QACpC,OAAOvD,SAAS;MACjB;MAEA,OAAO;QAAEsD,MAAM;QAAEC;MAAU,CAAC;IAC7B,CAAC,CAAC;IAEF,MAAM;MAAEC,YAAY;MAAEC,WAAW;MAAEC,eAAe;MAAEC;IAAqB,CAAC,GACzEhD,gBAAgB,CAAC;MAChBa,QAAQ;MACRoC,sBAAsB,EAAEhB,cAAc,GAAGM,gBAAgB,GAAGH;IAC7D,CAAC,CAAC;IAEH,MAAMc,cAAc,GAAGF,oBAAoB,IAAIX,mBAAmB;IAElE,MAAMc,eAAe,GAAGtD,WAAW,CAAC;MACnCiB,OAAO;MACPY,QAAQ;MACRF,MAAM;MACNT,KAAK;MACLc,gBAAgB;MAChBqB,cAAc;MACdE,mBAAmB,EAAEN;IACtB,CAAC,CAAC;IAEF,MAAMO,2BAA2B,GAAGpB,cAAc,IAAI,CAACC,aAAa;;IAEpE;IACA;IACAxC,mBAAmB,CAAC;MACnBoB,OAAO,EAAEmB,cAAc;MACvBP,QAAQ;MACRG,gBAAgB;MAChBM;IACD,CAAC,CAAC;IAEF,MAAMmB,4BAA4B,GACjC/C,iBAAiB,IAAI,OAAOe,OAAO,KAAK,UAAU;IAEnD1B,2BAA2B,CAAC;MAC3BkB,OAAO,EAAEmB,cAAc;MACvBH,aAAa;MACbqB,eAAe;MACftB,gBAAgB;MAChBL,MAAM;MACNT,KAAK;MACLR,iBAAiB,EAAE+C;IACpB,CAAC,CAAC;IAEF3D,gCAAgC,CAAC;MAChC6B,MAAM;MACNV,OAAO,EAAEuC,2BAA2B;MACpCxB,gBAAgB;MAChBD,wBAAwB;MACxB2B,kBAAkB,EAAExB,YAAY;MAChCoB;IACD,CAAC,CAAC;IAEFrD,kBAAkB,CAAC;MAClBgB,OAAO,EAAEmB,cAAc;MACvBJ,gBAAgB;MAChBD,wBAAwB;MACxBE,aAAa;MACbN,MAAM;MACNT,KAAK;MACLwC,kBAAkB,EAAExB,YAAY;MAChCoB;IACD,CAAC,CAAC;IAEF,MAAMK,WAAW,GAAG1E,WAAW,CAC9B,CAAC,GAAG2E,IAAe,KAAK;MACvB;MACAvE,OAAO,CAACiE,eAAe,CAAC,CAAC;QACxBO,IAAI,EAAE,QAAQ;QACdC,OAAO,EAAEnE,oBAAoB,CAACqC,gBAAgB;MAC/C,CAAC,CAAC;MAEF,IAAI,OAAOP,OAAO,KAAK,UAAU,EAAE;QAClCA,OAAO,CAAC,GAAGmC,IAAI,CAAC;MACjB;IACD,CAAC,EACD,CAACN,eAAe,EAAE7B,OAAO,EAAEO,gBAAgB,CAC5C,CAAC;IAED,MAAM+B,eAAe,GACpB,OAAOtC,OAAO,KAAK,UAAU,GAAGkC,WAAW,GAAGpB,SAAS;IAExDrD,mBAAmB,CAAC6B,YAAY,EAAE,MAAMC,QAAQ,CAACgD,OAAc,EAAE,CAChEhD,QAAQ,CACR,CAAC;IAEF,oBACCX,IAAA,CAACH,qBAAqB;MAAC+D,KAAK,EAAEjB,YAAa;MAAAkB,QAAA,eAC1C7D,IAAA,CAACM,iBAAiB;QAAA,GACbe,IAAI;QACRyC,GAAG,EAAEnD,QAAS;QACdQ,KAAK,EAAE,CACNA,KAAK,EACLY,cAAc,GACXc,eAAe,GACdN,wBAAwB,GACxBF,gBAAgB,GACjBH,SAAS,CACX;QACFd,OAAO,EAAEsC,eAAgB;QACzBK,WAAW,EAAE;MAAM,CACnB;IAAC,CACoB,CAAC;EAE1B,CAAC,CAAC;EAEF,oBAAOpF,IAAI,CACVI,QAAQ,CAACwB,uBAAuB,CAACC,KAAK,CACvC,CAAC;AAMF","ignoreList":[]}

package/lib/module/shared/components/create-boundary-component/hooks/use-boundary-presence.js

@@ -6,28 +6,18 @@ import { removeEntry, setEntry } from "../../../stores/bounds/internals/entries"
 export const useBoundaryPresence = params => {
   const {
     enabled,
-    sharedBoundTag,
+    entryTag,
     currentScreenKey,
-    ancestorKeys,
-    navigatorKey,
-    ancestorNavigatorKeys,
     boundaryConfig
   } = params;
-  const ancestorKeysSignature = ancestorKeys.join("|");
-  const ancestorNavigatorKeysSignature = ancestorNavigatorKeys?.join("|");
-
-  // biome-ignore lint/correctness/useExhaustiveDependencies: <Depend on the ancestory keys signature>
   useLayoutEffect(() => {
     if (!enabled) return;
-    runOnUI(setEntry)(sharedBoundTag, currentScreenKey, {
-      ancestorKeys,
-      boundaryConfig,
-      navigatorKey,
-      ancestorNavigatorKeys
+    runOnUI(setEntry)(entryTag, currentScreenKey, {
+      boundaryConfig
     });
     return () => {
-      runOnUI(removeEntry)(sharedBoundTag, currentScreenKey);
+      runOnUI(removeEntry)(entryTag, currentScreenKey);
     };
-  }, [enabled, sharedBoundTag, currentScreenKey, ancestorKeysSignature, navigatorKey, ancestorNavigatorKeysSignature, boundaryConfig]);
+  }, [enabled, entryTag, currentScreenKey, boundaryConfig]);
 };
 //# sourceMappingURL=use-boundary-presence.js.map

package/lib/module/shared/components/create-boundary-component/hooks/use-boundary-presence.js.map

@@ -1 +1 @@
-{"version":3,"names":["useLayoutEffect","runOnUI","removeEntry","setEntry","useBoundaryPresence","params","enabled","sharedBoundTag","currentScreenKey","ancestorKeys","navigatorKey","ancestorNavigatorKeys","boundaryConfig","ancestorKeysSignature","join","ancestorNavigatorKeysSignature"],"sourceRoot":"../../../../../../src","sources":["shared/components/create-boundary-component/hooks/use-boundary-presence.ts"],"mappings":";;AAAA,SAASA,eAAe,QAAQ,OAAO;AACvC,SAASC,OAAO,QAAQ,yBAAyB;AACjD,SACCC,WAAW,EACXC,QAAQ,QACF,0CAA0C;AAGjD,OAAO,MAAMC,mBAAmB,GAAIC,MAQnC,IAAK;EACL,MAAM;IACLC,OAAO;IACPC,cAAc;IACdC,gBAAgB;IAChBC,YAAY;IACZC,YAAY;IACZC,qBAAqB;IACrBC;EACD,CAAC,GAAGP,MAAM;EACV,MAAMQ,qBAAqB,GAAGJ,YAAY,CAACK,IAAI,CAAC,GAAG,CAAC;EACpD,MAAMC,8BAA8B,GAAGJ,qBAAqB,EAAEG,IAAI,CAAC,GAAG,CAAC;;EAEvE;EACAd,eAAe,CAAC,MAAM;IACrB,IAAI,CAACM,OAAO,EAAE;IAEdL,OAAO,CAACE,QAAQ,CAAC,CAACI,cAAc,EAAEC,gBAAgB,EAAE;MACnDC,YAAY;MACZG,cAAc;MACdF,YAAY;MACZC;IACD,CAAC,CAAC;IAEF,OAAO,MAAM;MACZV,OAAO,CAACC,WAAW,CAAC,CAACK,cAAc,EAAEC,gBAAgB,CAAC;IACvD,CAAC;EACF,CAAC,EAAE,CACFF,OAAO,EACPC,cAAc,EACdC,gBAAgB,EAChBK,qBAAqB,EACrBH,YAAY,EACZK,8BAA8B,EAC9BH,cAAc,CACd,CAAC;AACH,CAAC","ignoreList":[]}
+{"version":3,"names":["useLayoutEffect","runOnUI","removeEntry","setEntry","useBoundaryPresence","params","enabled","entryTag","currentScreenKey","boundaryConfig"],"sourceRoot":"../../../../../../src","sources":["shared/components/create-boundary-component/hooks/use-boundary-presence.ts"],"mappings":";;AAAA,SAASA,eAAe,QAAQ,OAAO;AACvC,SAASC,OAAO,QAAQ,yBAAyB;AACjD,SACCC,WAAW,EACXC,QAAQ,QACF,0CAA0C;AAGjD,OAAO,MAAMC,mBAAmB,GAAIC,MAKnC,IAAK;EACL,MAAM;IAAEC,OAAO;IAAEC,QAAQ;IAAEC,gBAAgB;IAAEC;EAAe,CAAC,GAAGJ,MAAM;EAEtEL,eAAe,CAAC,MAAM;IACrB,IAAI,CAACM,OAAO,EAAE;IAEdL,OAAO,CAACE,QAAQ,CAAC,CAACI,QAAQ,EAAEC,gBAAgB,EAAE;MAC7CC;IACD,CAAC,CAAC;IAEF,OAAO,MAAM;MACZR,OAAO,CAACC,WAAW,CAAC,CAACK,QAAQ,EAAEC,gBAAgB,CAAC;IACjD,CAAC;EACF,CAAC,EAAE,CAACF,OAAO,EAAEC,QAAQ,EAAEC,gBAAgB,EAAEC,cAAc,CAAC,CAAC;AAC1D,CAAC","ignoreList":[]}

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

@@ -2,13 +2,17 @@
 
 import { cancelAnimation, useAnimatedReaction, useSharedValue, withDelay, withTiming } from "react-native-reanimated";
 import { AnimationStore } from "../../../stores/animation.store";
-import { hasDestinationLink } from "../../../stores/bounds/internals/links";
+import { getDestination } from "../../../stores/bounds/internals/links";
+import { pairs } from "../../../stores/bounds/internals/state";
 import { LifecycleTransitionRequestKind, SystemStore } from "../../../stores/system.store";
+import { getInitialDestinationMeasurePairKey } from "../utils/destination-signals";
 const VIEWPORT_RETRY_DELAY_MS = 16;
 export const useInitialDestinationMeasurement = ({
-  sharedBoundTag,
+  linkId,
   enabled,
   currentScreenKey,
+  preferredSourceScreenKey,
+  ancestorScreenKeys,
   measureBoundary
 }) => {
   const progress = AnimationStore.getValue(currentScreenKey, "progress");
@@ -58,24 +62,29 @@ export const useInitialDestinationMeasurement = ({
     if (!hasPendingOpenRequest || !isWaitingForOpenToStart) {
       return [0, retryTick];
     }
-    const hasDestination = hasDestinationLink(sharedBoundTag, currentScreenKey);
-    const shouldBlock = enabled && !hasDestination;
-    if (!shouldBlock) {
-      return [0, retryTick];
-    }
-    return [1, retryTick];
-  }, ([shouldBlock]) => {
+    const destinationPairKey = getInitialDestinationMeasurePairKey({
+      enabled,
+      currentScreenKey,
+      preferredSourceScreenKey,
+      ancestorScreenKeys,
+      linkId,
+      linkState: ancestorScreenKeys.length ? pairs.get() : undefined
+    });
+    return [destinationPairKey, retryTick];
+  }, ([destinationPairKey]) => {
     "worklet";
 
-    if (!shouldBlock) {
+    if (!destinationPairKey) {
       releaseLifecycleStartBlock();
       return;
     }
     ensureLifecycleStartBlocked();
     measureBoundary({
-      intent: "complete-destination"
+      type: "destination",
+      pairKey: destinationPairKey
     });
-    if (hasDestinationLink(sharedBoundTag, currentScreenKey)) {
+    const destinationAttached = getDestination(destinationPairKey, linkId) !== null;
+    if (destinationAttached) {
       releaseLifecycleStartBlock();
       return;
     }

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

@@ -1 +1 @@
-{"version":3,"names":["cancelAnimation","useAnimatedReaction","useSharedValue","withDelay","withTiming","AnimationStore","hasDestinationLink","LifecycleTransitionRequestKind","SystemStore","VIEWPORT_RETRY_DELAY_MS","useInitialDestinationMeasurement","sharedBoundTag","enabled","currentScreenKey","measureBoundary","progress","getValue","system","getBag","pendingLifecycleRequestKind","blockLifecycleStart","unblockLifecycleStart","actions","isBlockingLifecycleStart","retryToken","ensureLifecycleStartBlocked","get","set","releaseLifecycleStartBlock","scheduleViewportRetry","duration","retryTick","hasPendingOpenRequest","Open","isWaitingForOpenToStart","hasDestination","shouldBlock","intent"],"sourceRoot":"../../../../../../src","sources":["shared/components/create-boundary-component/hooks/use-initial-destination-measurement.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["cancelAnimation","useAnimatedReaction","useSharedValue","withDelay","withTiming","AnimationStore","getDestination","pairs","LifecycleTransitionRequestKind","SystemStore","getInitialDestinationMeasurePairKey","VIEWPORT_RETRY_DELAY_MS","useInitialDestinationMeasurement","linkId","enabled","currentScreenKey","preferredSourceScreenKey","ancestorScreenKeys","measureBoundary","progress","getValue","system","getBag","pendingLifecycleRequestKind","blockLifecycleStart","unblockLifecycleStart","actions","isBlockingLifecycleStart","retryToken","ensureLifecycleStartBlocked","get","set","releaseLifecycleStartBlock","scheduleViewportRetry","duration","retryTick","hasPendingOpenRequest","Open","isWaitingForOpenToStart","destinationPairKey","linkState","length","undefined","type","pairKey","destinationAttached"],"sourceRoot":"../../../../../../src","sources":["shared/components/create-boundary-component/hooks/use-initial-destination-measurement.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/shared/components/create-boundary-component/hooks/use-initial-source-measurement.js

@@ -1,25 +1,45 @@
 "use strict";
 
-import { useAnimatedReaction } from "react-native-reanimated";
+import { useAnimatedReaction, useSharedValue } from "react-native-reanimated";
+import { pairs } from "../../../stores/bounds/internals/state";
+import { getInitialSourceCaptureSignal } from "../utils/source-signals";
 export const useInitialSourceMeasurement = params => {
   const {
     enabled,
     nextScreenKey,
-    measureBoundary
+    measureBoundary,
+    linkId,
+    currentScreenKey,
+    group,
+    shouldAutoMeasure
   } = params;
+  const lastSourceCaptureSignal = useSharedValue(null);
   useAnimatedReaction(() => {
     "worklet";
 
-    if (!enabled || !nextScreenKey) {
-      return 0;
-    }
-    return nextScreenKey;
+    return getInitialSourceCaptureSignal({
+      enabled,
+      nextScreenKey,
+      currentScreenKey,
+      linkId,
+      group,
+      shouldAutoMeasure,
+      linkState: group ? pairs.get() : undefined
+    });
   }, captureSignal => {
     "worklet";
 
-    if (!enabled || !captureSignal) return;
+    if (!enabled || !captureSignal) {
+      lastSourceCaptureSignal.set(null);
+      return;
+    }
+    if (lastSourceCaptureSignal.get() === captureSignal.signal) {
+      return;
+    }
+    lastSourceCaptureSignal.set(captureSignal.signal);
     measureBoundary({
-      intent: "capture-source"
+      type: "source",
+      pairKey: captureSignal.pairKey
     });
   });
 };

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

@@ -1 +1 @@
-{"version":3,"names":["useAnimatedReaction","useInitialSourceMeasurement","params","enabled","nextScreenKey","measureBoundary","captureSignal","intent"],"sourceRoot":"../../../../../../src","sources":["shared/components/create-boundary-component/hooks/use-initial-source-measurement.ts"],"mappings":";;AAAA,SAASA,mBAAmB,QAAQ,yBAAyB;AAG7D,OAAO,MAAMC,2BAA2B,GAAIC,MAI3C,IAAK;EACL,MAAM;IAAEC,OAAO;IAAEC,aAAa;IAAEC;EAAgB,CAAC,GAAGH,MAAM;EAE1DF,mBAAmB,CAClB,MAAM;IACL,SAAS;;IACT,IAAI,CAACG,OAAO,IAAI,CAACC,aAAa,EAAE;MAC/B,OAAO,CAAC;IACT;IAEA,OAAOA,aAAa;EACrB,CAAC,EACAE,aAAa,IAAK;IAClB,SAAS;;IACT,IAAI,CAACH,OAAO,IAAI,CAACG,aAAa,EAAE;IAEhCD,eAAe,CAAC;MAAEE,MAAM,EAAE;IAAiB,CAAC,CAAC;EAC9C,CACD,CAAC;AACF,CAAC","ignoreList":[]}
+{"version":3,"names":["useAnimatedReaction","useSharedValue","pairs","getInitialSourceCaptureSignal","useInitialSourceMeasurement","params","enabled","nextScreenKey","measureBoundary","linkId","currentScreenKey","group","shouldAutoMeasure","lastSourceCaptureSignal","linkState","get","undefined","captureSignal","set","signal","type","pairKey"],"sourceRoot":"../../../../../../src","sources":["shared/components/create-boundary-component/hooks/use-initial-source-measurement.ts"],"mappings":";;AAAA,SAASA,mBAAmB,EAAEC,cAAc,QAAQ,yBAAyB;AAC7E,SAASC,KAAK,QAAQ,wCAAwC;AAE9D,SAASC,6BAA6B,QAAQ,yBAAyB;AAEvE,OAAO,MAAMC,2BAA2B,GAAIC,MAQ3C,IAAK;EACL,MAAM;IACLC,OAAO;IACPC,aAAa;IACbC,eAAe;IACfC,MAAM;IACNC,gBAAgB;IAChBC,KAAK;IACLC;EACD,CAAC,GAAGP,MAAM;EACV,MAAMQ,uBAAuB,GAAGZ,cAAc,CAAgB,IAAI,CAAC;EAEnED,mBAAmB,CAClB,MAAM;IACL,SAAS;;IACT,OAAOG,6BAA6B,CAAC;MACpCG,OAAO;MACPC,aAAa;MACbG,gBAAgB;MAChBD,MAAM;MACNE,KAAK;MACLC,iBAAiB;MACjBE,SAAS,EAAEH,KAAK,GAAGT,KAAK,CAACa,GAAG,CAAC,CAAC,GAAGC;IAClC,CAAC,CAAC;EACH,CAAC,EACAC,aAAa,IAAK;IAClB,SAAS;;IACT,IAAI,CAACX,OAAO,IAAI,CAACW,aAAa,EAAE;MAC/BJ,uBAAuB,CAACK,GAAG,CAAC,IAAI,CAAC;MACjC;IACD;IAEA,IAAIL,uBAAuB,CAACE,GAAG,CAAC,CAAC,KAAKE,aAAa,CAACE,MAAM,EAAE;MAC3D;IACD;IAEAN,uBAAuB,CAACK,GAAG,CAACD,aAAa,CAACE,MAAM,CAAC;IACjDX,eAAe,CAAC;MACfY,IAAI,EAAE,QAAQ;MACdC,OAAO,EAAEJ,aAAa,CAACI;IACxB,CAAC,CAAC;EACH,CACD,CAAC;AACF,CAAC","ignoreList":[]}