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

package/lib/module/shared/stores/bounds/internals/links.js

@@ -1,112 +1,171 @@
 "use strict";
 
-import { findLatestPendingSourceLinkIndex, findLinkIndexForDestinationWrite, hasLinkSide, isCompletedLinkForScreenKey, isSameScreenFamily, selectSourceUpdateTargetIndex } from "../helpers/link.helpers";
-import { ensureTagState } from "../helpers/tag-state.helpers";
-import { registry } from "./state";
-function setSource(mode, tag, screenKey, bounds, styles = {}) {
+import { createGroupTag, createPendingPairKey, ensurePairGroups, ensurePairLinks, getGroupKeyFromTag, getLinkKeyFromTag, getActiveGroupId as getPairActiveGroupId, getDestination as getPairDestination, getLink as getPairLink, getSource as getPairSource, getSourceScreenKeyFromPairKey, removePairLink } from "../helpers/link-pairs.helpers";
+import { pairs } from "./state";
+const toLinkKey = tag => {
   "worklet";
 
-  registry.modify(state => {
+  return getLinkKeyFromTag(tag);
+};
+const createLinkSide = (screenKey, bounds, styles) => {
+  "worklet";
+
+  return {
+    screenKey,
+    bounds,
+    styles
+  };
+};
+const writePairLink = (state, pairKey, linkKey, link) => {
+  "worklet";
+
+  ensurePairLinks(state, pairKey)[linkKey] = link;
+};
+const writeGroup = (state, pairKey, group, activeId, initialId) => {
+  "worklet";
+
+  const previousInitialId = state[pairKey]?.groups?.[group]?.initialId;
+  ensurePairGroups(state, pairKey)[group] = {
+    activeId,
+    initialId: previousInitialId ?? initialId ?? activeId
+  };
+};
+const writeDestination = (state, pairKey, linkKey, screenKey, bounds, styles, group) => {
+  "worklet";
+
+  const link = getPairLink(state, pairKey, linkKey);
+  if (!link) return;
+  const destination = createLinkSide(screenKey, bounds, styles);
+  link.group = group ?? link.group;
+  link.destination = destination;
+  link.initialDestination ??= destination;
+  writePairLink(state, pairKey, linkKey, link);
+  if (link.group) {
+    writeGroup(state, pairKey, link.group, linkKey);
+  }
+};
+const promotePendingSource = (state, pairKey, linkKey) => {
+  "worklet";
+
+  if (getPairLink(state, pairKey, linkKey)) return;
+  const sourceScreenKey = getSourceScreenKeyFromPairKey(pairKey);
+  const pendingPairKey = createPendingPairKey(sourceScreenKey);
+  if (pendingPairKey === pairKey) return;
+  const pendingLink = getPairLink(state, pendingPairKey, linkKey);
+  if (!pendingLink) return;
+  writePairLink(state, pairKey, linkKey, pendingLink);
+  if (pendingLink.group) {
+    const pendingGroupState = state[pendingPairKey]?.groups?.[pendingLink.group];
+    if (pendingGroupState) {
+      writeGroup(state, pairKey, pendingLink.group, pendingGroupState.activeId, pendingGroupState.initialId);
+    }
+  }
+  removePairLink(state, pendingPairKey, linkKey);
+};
+function setSource(pairKey, tag, screenKey, bounds, styles = {}, group) {
+  "worklet";
+
+  pairs.modify(state => {
     "worklet";
 
-    const source = {
-      screenKey,
-      bounds,
-      styles
+    const linkKey = toLinkKey(tag);
+    const source = createLinkSide(screenKey, bounds, styles);
+    const pairLinks = ensurePairLinks(state, pairKey);
+    const existingLink = pairLinks[linkKey];
+    const link = existingLink ?? {
+      group,
+      source,
+      destination: null,
+      initialSource: source
     };
-    if (mode === "capture") {
-      const tagState = ensureTagState(state, tag);
-      const stack = tagState.linkStack;
-      const topIndex = stack.length - 1;
-      const topLink = topIndex >= 0 ? stack[topIndex] : null;
-      if (topLink && topLink.destination === null && isSameScreenFamily(topLink.source, source)) {
-        topLink.source = source;
-        if (!topLink.initialSource) {
-          topLink.initialSource = source;
-        }
-        return state;
-      }
-      stack.push({
-        source,
-        destination: null,
-        initialSource: source
-      });
-      return state;
-    }
-    const stack = state[tag]?.linkStack;
-    if (!stack || stack.length === 0) return state;
-    const targetIndex = selectSourceUpdateTargetIndex(stack, screenKey);
-    if (targetIndex === -1) return state;
-    const link = stack[targetIndex];
+    link.group = group ?? link.group;
     link.source = source;
-    if (!link.initialSource) {
-      link.initialSource = source;
+    link.initialSource ??= source;
+    pairLinks[linkKey] = link;
+    const pendingPairKey = createPendingPairKey(screenKey);
+    if (pendingPairKey !== pairKey) {
+      removePairLink(state, pendingPairKey, linkKey);
     }
     return state;
   });
 }
-function setDestination(mode, tag, screenKey, bounds, styles = {}, expectedSourceScreenKey) {
+function setDestination(pairKey, tag, screenKey, bounds, styles = {}, group) {
   "worklet";
 
-  registry.modify(state => {
+  pairs.modify(state => {
     "worklet";
 
-    const stack = state[tag]?.linkStack;
-    if (!stack || stack.length === 0) return state;
-    const targetIndex = findLinkIndexForDestinationWrite(stack, mode === "refresh" ? screenKey : undefined, expectedSourceScreenKey);
-    if (targetIndex === -1) return state;
-    const link = stack[targetIndex];
-    const destination = {
-      screenKey,
-      bounds,
-      styles
-    };
-    link.destination = destination;
-    if (!link.initialDestination) {
-      link.initialDestination = destination;
-    }
+    const linkKey = toLinkKey(tag);
+    promotePendingSource(state, pairKey, linkKey);
+    writeDestination(state, pairKey, linkKey, screenKey, bounds, styles, group);
     return state;
   });
 }
-function getMatchedLink(tag, screenKey) {
+function setActiveGroupId(pairKey, group, tag) {
   "worklet";
 
-  const tagState = registry.get()[tag];
-  const stack = tagState?.linkStack;
-  if (!stack || stack.length === 0) {
-    return null;
-  }
-  if (!screenKey) {
-    const lastLink = stack[stack.length - 1];
-    return lastLink ?? null;
-  }
-  for (let i = stack.length - 1; i >= 0; i--) {
-    const link = stack[i];
-    if (isCompletedLinkForScreenKey(link, screenKey)) {
-      return link;
-    }
-  }
-  return null;
+  pairs.modify(state => {
+    "worklet";
+
+    writeGroup(state, pairKey, group, toLinkKey(tag));
+    return state;
+  });
 }
-function getPendingLink(tag, sourceScreenKey) {
+function getActiveGroupId(pairKey, group) {
   "worklet";
 
-  const tagState = registry.get()[tag];
-  const stack = tagState?.linkStack;
-  if (!stack || stack.length === 0) return null;
-  const pendingSourceLinkIndex = findLatestPendingSourceLinkIndex(stack, sourceScreenKey);
-  if (pendingSourceLinkIndex === -1) return null;
-  return stack[pendingSourceLinkIndex] ?? null;
+  return getPairActiveGroupId(pairs.get(), pairKey, group);
+}
+function getLink(pairKey, tag) {
+  "worklet";
+
+  return getPairLink(pairs.get(), pairKey, toLinkKey(tag));
+}
+const isCompletedLink = link => {
+  "worklet";
+
+  return !!link?.destination;
+};
+function getResolvedLink(pairKey, tag) {
+  "worklet";
+
+  const state = pairs.get();
+  const linkKey = toLinkKey(tag);
+  const group = getGroupKeyFromTag(tag);
+  const requestedLink = getPairLink(state, pairKey, linkKey);
+
+  // Group active ids can update before the new member has a full source/destination
+  // link, so unresolved grouped links fall back to the initial id's measurements.
+  if (!group || isCompletedLink(requestedLink)) {
+    return {
+      tag,
+      link: requestedLink
+    };
+  }
+  const initialId = state[pairKey]?.groups?.[group]?.initialId;
+  if (initialId) {
+    const initialLink = getPairLink(state, pairKey, initialId);
+    if (isCompletedLink(initialLink)) {
+      return {
+        tag: createGroupTag(group, initialId),
+        link: initialLink
+      };
+    }
+  }
+  return {
+    tag,
+    link: requestedLink
+  };
 }
-function hasSourceLink(tag, screenKey) {
+function getSource(pairKey, tag) {
   "worklet";
 
-  return hasLinkSide(registry.get()[tag]?.linkStack, screenKey, "source");
+  return getPairSource(pairs.get(), pairKey, toLinkKey(tag));
 }
-function hasDestinationLink(tag, screenKey) {
+function getDestination(pairKey, tag) {
   "worklet";
 
-  return hasLinkSide(registry.get()[tag]?.linkStack, screenKey, "destination");
+  return getPairDestination(pairs.get(), pairKey, toLinkKey(tag));
 }
-export { getMatchedLink, getPendingLink, hasDestinationLink, hasSourceLink, setDestination, setSource };
+export { getActiveGroupId, getDestination, getLink, getResolvedLink, getSource, setActiveGroupId, setDestination, setSource };
 //# sourceMappingURL=links.js.map

package/lib/module/shared/stores/bounds/internals/links.js.map

@@ -1 +1 @@
-{"version":3,"names":["findLatestPendingSourceLinkIndex","findLinkIndexForDestinationWrite","hasLinkSide","isCompletedLinkForScreenKey","isSameScreenFamily","selectSourceUpdateTargetIndex","ensureTagState","registry","setSource","mode","tag","screenKey","bounds","styles","modify","state","source","tagState","stack","linkStack","topIndex","length","topLink","destination","initialSource","push","targetIndex","link","setDestination","expectedSourceScreenKey","undefined","initialDestination","getMatchedLink","get","lastLink","i","getPendingLink","sourceScreenKey","pendingSourceLinkIndex","hasSourceLink","hasDestinationLink"],"sourceRoot":"../../../../../../src","sources":["shared/stores/bounds/internals/links.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["createGroupTag","createPendingPairKey","ensurePairGroups","ensurePairLinks","getGroupKeyFromTag","getLinkKeyFromTag","getActiveGroupId","getPairActiveGroupId","getDestination","getPairDestination","getLink","getPairLink","getSource","getPairSource","getSourceScreenKeyFromPairKey","removePairLink","pairs","toLinkKey","tag","createLinkSide","screenKey","bounds","styles","writePairLink","state","pairKey","linkKey","link","writeGroup","group","activeId","initialId","previousInitialId","groups","writeDestination","destination","initialDestination","promotePendingSource","sourceScreenKey","pendingPairKey","pendingLink","pendingGroupState","setSource","modify","source","pairLinks","existingLink","initialSource","setDestination","setActiveGroupId","get","isCompletedLink","getResolvedLink","requestedLink","initialLink"],"sourceRoot":"../../../../../../src","sources":["shared/stores/bounds/internals/links.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/shared/stores/bounds/internals/resolver.js

@@ -1,55 +1,29 @@
 "use strict";
 
-import { findLatest } from "../helpers/find-latest";
-import { matchesScreenKey } from "../helpers/matching";
-import { registry } from "./state";
-function findCompletedLinkByDestination(stack, screenKey) {
+import { createScreenPairKey } from "../helpers/link-pairs.helpers";
+import { getResolvedLink } from "./links";
+function resolvePairKey(context) {
   "worklet";
 
-  if (!screenKey) return null;
-  return findLatest(stack, link => !!link.destination && matchesScreenKey(link.destination, screenKey));
-}
-function findCompletedLinkBySource(stack, screenKey) {
-  "worklet";
-
-  if (!screenKey) return null;
-  return findLatest(stack, link => !!link.destination && matchesScreenKey(link.source, screenKey));
-}
-function findPendingLinkBySource(stack, screenKey) {
-  "worklet";
-
-  if (!screenKey) return null;
-  return findLatest(stack, link => link.destination === null && matchesScreenKey(link.source, screenKey));
-}
-function findEnteringTransitionLink(stack, context) {
-  "worklet";
-
-  return findCompletedLinkByDestination(stack, context.currentScreenKey) ?? findPendingLinkBySource(stack, context.previousScreenKey) ?? findCompletedLinkBySource(stack, context.previousScreenKey);
-}
-function findExitingTransitionLink(stack, context) {
-  "worklet";
-
-  return findCompletedLinkBySource(stack, context.currentScreenKey) ?? findCompletedLinkByDestination(stack, context.nextScreenKey) ?? findPendingLinkBySource(stack, context.currentScreenKey);
+  if (context.entering) {
+    if (!context.previousScreenKey || !context.currentScreenKey) return null;
+    return createScreenPairKey(context.previousScreenKey, context.currentScreenKey);
+  }
+  if (!context.currentScreenKey || !context.nextScreenKey) return null;
+  return createScreenPairKey(context.currentScreenKey, context.nextScreenKey);
 }
 function resolveTransitionPair(tag, context) {
   "worklet";
 
-  const tagState = registry.get()[tag];
-  const stack = tagState?.linkStack;
-  const matchedLink = stack && stack.length > 0 ? context.entering ? findEnteringTransitionLink(stack, context) : findExitingTransitionLink(stack, context) : null;
-  const sourceBounds = matchedLink?.source?.bounds ?? null;
-  const destinationBounds = matchedLink?.destination?.bounds ?? null;
-  const sourceStyles = matchedLink?.source?.styles ?? null;
-  const destinationStyles = matchedLink?.destination?.styles ?? null;
-  const sourceScreenKey = matchedLink?.source?.screenKey ?? null;
-  const destinationScreenKey = matchedLink?.destination?.screenKey ?? null;
+  const pairKey = resolvePairKey(context);
+  const matchedLink = pairKey ? getResolvedLink(pairKey, tag).link : null;
   return {
-    sourceBounds,
-    destinationBounds,
-    sourceStyles,
-    destinationStyles,
-    sourceScreenKey,
-    destinationScreenKey
+    sourceBounds: matchedLink?.source.bounds ?? null,
+    destinationBounds: matchedLink?.destination?.bounds ?? null,
+    sourceStyles: matchedLink?.source.styles ?? null,
+    destinationStyles: matchedLink?.destination?.styles ?? null,
+    sourceScreenKey: matchedLink?.source.screenKey ?? null,
+    destinationScreenKey: matchedLink?.destination?.screenKey ?? null
   };
 }
 export { resolveTransitionPair };

package/lib/module/shared/stores/bounds/internals/resolver.js.map

@@ -1 +1 @@
-{"version":3,"names":["findLatest","matchesScreenKey","registry","findCompletedLinkByDestination","stack","screenKey","link","destination","findCompletedLinkBySource","source","findPendingLinkBySource","findEnteringTransitionLink","context","currentScreenKey","previousScreenKey","findExitingTransitionLink","nextScreenKey","resolveTransitionPair","tag","tagState","get","linkStack","matchedLink","length","entering","sourceBounds","bounds","destinationBounds","sourceStyles","styles","destinationStyles","sourceScreenKey","destinationScreenKey"],"sourceRoot":"../../../../../../src","sources":["shared/stores/bounds/internals/resolver.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["createScreenPairKey","getResolvedLink","resolvePairKey","context","entering","previousScreenKey","currentScreenKey","nextScreenKey","resolveTransitionPair","tag","pairKey","matchedLink","link","sourceBounds","source","bounds","destinationBounds","destination","sourceStyles","styles","destinationStyles","sourceScreenKey","screenKey","destinationScreenKey"],"sourceRoot":"../../../../../../src","sources":["shared/stores/bounds/internals/resolver.ts"],"mappings":";;AAAA,SAASA,mBAAmB,QAAQ,+BAA+B;AAOnE,SAASC,eAAe,QAAQ,SAAS;AAEzC,SAASC,cAAcA,CACtBC,OAAiC,EACV;EACvB,SAAS;;EAET,IAAIA,OAAO,CAACC,QAAQ,EAAE;IACrB,IAAI,CAACD,OAAO,CAACE,iBAAiB,IAAI,CAACF,OAAO,CAACG,gBAAgB,EAAE,OAAO,IAAI;IACxE,OAAON,mBAAmB,CACzBG,OAAO,CAACE,iBAAiB,EACzBF,OAAO,CAACG,gBACT,CAAC;EACF;EAEA,IAAI,CAACH,OAAO,CAACG,gBAAgB,IAAI,CAACH,OAAO,CAACI,aAAa,EAAE,OAAO,IAAI;EACpE,OAAOP,mBAAmB,CAACG,OAAO,CAACG,gBAAgB,EAAEH,OAAO,CAACI,aAAa,CAAC;AAC5E;AAEA,SAASC,qBAAqBA,CAC7BC,GAAU,EACVN,OAAiC,EACR;EACzB,SAAS;;EACT,MAAMO,OAAO,GAAGR,cAAc,CAACC,OAAO,CAAC;EACvC,MAAMQ,WAAW,GAAGD,OAAO,GAAGT,eAAe,CAACS,OAAO,EAAED,GAAG,CAAC,CAACG,IAAI,GAAG,IAAI;EAEvE,OAAO;IACNC,YAAY,EAAEF,WAAW,EAAEG,MAAM,CAACC,MAAM,IAAI,IAAI;IAChDC,iBAAiB,EAAEL,WAAW,EAAEM,WAAW,EAAEF,MAAM,IAAI,IAAI;IAC3DG,YAAY,EAAEP,WAAW,EAAEG,MAAM,CAACK,MAAM,IAAI,IAAI;IAChDC,iBAAiB,EAAET,WAAW,EAAEM,WAAW,EAAEE,MAAM,IAAI,IAAI;IAC3DE,eAAe,EAAEV,WAAW,EAAEG,MAAM,CAACQ,SAAS,IAAI,IAAI;IACtDC,oBAAoB,EAAEZ,WAAW,EAAEM,WAAW,EAAEK,SAAS,IAAI;EAC9D,CAAC;AACF;AAEA,SAASd,qBAAqB","ignoreList":[]}

package/lib/module/shared/stores/bounds/internals/state.js

@@ -1,6 +1,29 @@
 "use strict";
 
 import { makeMutable } from "react-native-reanimated";
-export const registry = makeMutable({});
-export const groups = makeMutable({});
+export const boundaryRegistry = makeMutable({});
+
+/**
+ * Transition links scoped per screen pair.
+ *
+ * Links used to live in a flat array that acted like a global history. To find
+ * the right link, we had to scan for the latest pending or completed entry that
+ * matched a screen, which made refreshes and rapid triggers tricky to handle.
+ *
+ * Keying by screen pair fixes that: each transition lives under its pair, and
+ * every shared boundary id maps to a single link in that pair. Refreshing the
+ * source or destination just overwrites the same slot instead of pushing a new
+ * history entry.
+ *
+ * Example:
+ *
+ * {
+ *   "a<>b": {
+ *     links: {
+ *       "unique-tag-1": { source: ..., destination: ... },
+ *     },
+ *   },
+ * }
+ */
+export const pairs = makeMutable({});
 //# sourceMappingURL=state.js.map

package/lib/module/shared/stores/bounds/internals/state.js.map

@@ -1 +1 @@
-{"version":3,"names":["makeMutable","registry","groups"],"sourceRoot":"../../../../../../src","sources":["shared/stores/bounds/internals/state.ts"],"mappings":";;AAAA,SAASA,WAAW,QAAQ,yBAAyB;AAMrD,OAAO,MAAMC,QAAQ,GAAGD,WAAW,CAAgB,CAAC,CAAC,CAAC;AACtD,OAAO,MAAME,MAAM,GAAGF,WAAW,CAAc,CAAC,CAAC,CAAC","ignoreList":[]}
+{"version":3,"names":["makeMutable","boundaryRegistry","pairs"],"sourceRoot":"../../../../../../src","sources":["shared/stores/bounds/internals/state.ts"],"mappings":";;AAAA,SAASA,WAAW,QAAQ,yBAAyB;AAKrD,OAAO,MAAMC,gBAAgB,GAAGD,WAAW,CAAuB,CAAC,CAAC,CAAC;;AAErE;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,MAAME,KAAK,GAAGF,WAAW,CAAiB,CAAC,CAAC,CAAC","ignoreList":[]}

package/lib/module/shared/stores/gesture.store.js

@@ -16,6 +16,7 @@ function createGestureBag() {
     y: makeMutable(0),
     normX,
     normY,
+    velocity: makeMutable(0),
     scale,
     normScale,
     focalX: makeMutable(0),
@@ -55,6 +56,7 @@ export const GestureStore = createStore({
     cancelAnimation(bag.y);
     cancelAnimation(bag.normX);
     cancelAnimation(bag.normY);
+    cancelAnimation(bag.velocity);
     cancelAnimation(bag.scale);
     cancelAnimation(bag.normScale);
     cancelAnimation(bag.focalX);

package/lib/module/shared/stores/gesture.store.js.map

@@ -1 +1 @@
-{"version":3,"names":["cancelAnimation","makeMutable","createStore","createGestureBag","normX","normY","scale","normScale","dismissing","dragging","settling","active","x","y","focalX","focalY","raw","direction","normalizedX","normalizedY","isDismissing","isDragging","GestureStore","createBag","disposeBag","bag"],"sourceRoot":"../../../../src","sources":["shared/stores/gesture.store.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["cancelAnimation","makeMutable","createStore","createGestureBag","normX","normY","scale","normScale","dismissing","dragging","settling","active","x","y","velocity","focalX","focalY","raw","direction","normalizedX","normalizedY","isDismissing","isDragging","GestureStore","createBag","disposeBag","bag"],"sourceRoot":"../../../../src","sources":["shared/stores/gesture.store.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/shared/types/animation.types.js

@@ -41,10 +41,6 @@ import { NAVIGATION_MASK_CONTAINER_STYLE_ID, NAVIGATION_MASK_ELEMENT_STYLE_ID }
  * itself.
  */
 
-/**
- * @deprecated Use `TransitionInterpolatorOptions`.
- */
-
 /**
  * Internal normalized slot format.
  * Always uses the explicit `{ style, props }` shape (with Reanimated's full StyleProps).

package/lib/module/shared/types/animation.types.js.map

@@ -1 +1 @@
-{"version":3,"names":["NAVIGATION_MASK_CONTAINER_STYLE_ID","NAVIGATION_MASK_ELEMENT_STYLE_ID"],"sourceRoot":"../../../../src","sources":["shared/types/animation.types.ts"],"mappings":";;AAOA,SACCA,kCAAkC,EAClCC,gCAAgC,QAC1B,cAAc;;AAMrB;AACA;AACA;AACA;AACA;AACA;AACA;;AAqPA;AACA;AACA;AACA;;AAKA;AACA;AACA;AACA;AACA;AACA;;AAUA;AACA;AACA;AACA;AACA;AACA;AACA;;AAGA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAGA;AACA;AACA;;AAGA;AACA;AACA;AACA;;AAMA;AACA;AACA;AACA;;AAgBA;AACA;AACA;;AAsBA;AACA;AACA;;AAGA;AACA;AACA","ignoreList":[]}
+{"version":3,"names":["NAVIGATION_MASK_CONTAINER_STYLE_ID","NAVIGATION_MASK_ELEMENT_STYLE_ID"],"sourceRoot":"../../../../src","sources":["shared/types/animation.types.ts"],"mappings":";;AAOA,SACCA,kCAAkC,EAClCC,gCAAgC,QAC1B,cAAc;;AAMrB;AACA;AACA;AACA;AACA;AACA;AACA;;AAmOA;AACA;AACA;AACA;;AAKA;AACA;AACA;AACA;AACA;AACA;;AAUA;AACA;AACA;AACA;AACA;AACA;AACA;;AAGA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAGA;AACA;AACA;AACA;;AAMA;AACA;AACA;AACA;;AAgBA;AACA;AACA;;AAsBA;AACA;AACA;;AAGA;AACA;AACA","ignoreList":[]}

package/lib/module/shared/types/gesture.types.js

@@ -6,7 +6,6 @@ export let GestureActivationState = /*#__PURE__*/function (GestureActivationStat
   GestureActivationState[GestureActivationState["FAILED"] = 2] = "FAILED";
   return GestureActivationState;
 }({});
-export { GestureActivationState as GestureOffsetState };
 
 /**
  * Resolved boolean flags for which directions a gesture is active in.

package/lib/module/shared/types/gesture.types.js.map

@@ -1 +1 @@
-{"version":3,"names":["GestureActivationState","GestureOffsetState"],"sourceRoot":"../../../../src","sources":["shared/types/gesture.types.ts"],"mappings":";;AA8DA,WAAYA,sBAAsB,0BAAtBA,sBAAsB;EAAtBA,sBAAsB,CAAtBA,sBAAsB;EAAtBA,sBAAsB,CAAtBA,sBAAsB;EAAtBA,sBAAsB,CAAtBA,sBAAsB;EAAA,OAAtBA,sBAAsB;AAAA;AAMlC,SAASA,sBAAsB,IAAIC,kBAAkB;;AAIrD;AACA;AACA;AACA","ignoreList":[]}
+{"version":3,"names":["GestureActivationState"],"sourceRoot":"../../../../src","sources":["shared/types/gesture.types.ts"],"mappings":";;AA8DA,WAAYA,sBAAsB,0BAAtBA,sBAAsB;EAAtBA,sBAAsB,CAAtBA,sBAAsB;EAAtBA,sBAAsB,CAAtBA,sBAAsB;EAAtBA,sBAAsB,CAAtBA,sBAAsB;EAAA,OAAtBA,sBAAsB;AAAA;;AAQlC;AACA;AACA;AACA","ignoreList":[]}

package/lib/module/shared/utils/bounds/helpers/create-bounds-accessor-core.js

@@ -35,7 +35,8 @@ const createBoundsAccessorParts = ({
     });
     const computed = prepareBoundStyles({
       props,
-      options
+      options,
+      syncGroupActiveId: true
     });
     const scopedTag = tag ?? "";
     const target = Object.isExtensible(computed) ? computed : {

package/lib/module/shared/utils/bounds/helpers/create-bounds-accessor-core.js.map

@@ -1 +1 @@
-{"version":3,"names":["createBoundTag","createInterpolators","createLinkAccessor","prepareBoundStyles","createBoundsAccessorParts","getProps","extendResult","getMeasured","getSnapshot","getLink","interpolateStyle","interpolateBounds","computeBounds","params","props","options","id","tag","group","computed","scopedTag","target","Object","isExtensible","defineProperties","value","key","enumerable","configurable","property","fallback","fallbackOrTargetKey","createBoundsAccessorCore","assign"],"sourceRoot":"../../../../../../src","sources":["shared/utils/bounds/helpers/create-bounds-accessor-core.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["createBoundTag","createInterpolators","createLinkAccessor","prepareBoundStyles","createBoundsAccessorParts","getProps","extendResult","getMeasured","getSnapshot","getLink","interpolateStyle","interpolateBounds","computeBounds","params","props","options","id","tag","group","computed","syncGroupActiveId","scopedTag","target","Object","isExtensible","defineProperties","value","key","enumerable","configurable","property","fallback","fallbackOrTargetKey","createBoundsAccessorCore","assign"],"sourceRoot":"../../../../../../src","sources":["shared/utils/bounds/helpers/create-bounds-accessor-core.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/shared/utils/bounds/helpers/create-link-accessor.js

@@ -1,8 +1,9 @@
 "use strict";
 
 import { getEntry } from "../../../stores/bounds/internals/entries";
-import { resolveGroupLink } from "../../../stores/bounds/internals/groups";
+import { getResolvedLink } from "../../../stores/bounds/internals/links";
 import { prepareBoundStyles } from "./prepare-bound-styles";
+import { resolveBoundsPairKey } from "./resolve-bounds-pair-key";
 const toResolvedPair = link => {
   "worklet";
 
@@ -35,11 +36,11 @@ export const createLinkAccessor = getProps => {
 
     const props = getProps();
     const stringTag = String(tag);
-    const screenKey = props.current?.route.key;
-    const resolved = resolveGroupLink({
+    const pairKey = resolveBoundsPairKey(props);
+    const resolved = pairKey ? getResolvedLink(pairKey, stringTag) : {
       tag: stringTag,
-      screenKey
-    });
+      link: null
+    };
     const selectedTag = resolved.tag;
     const link = resolved.link;
     if (!link) return null;

package/lib/module/shared/utils/bounds/helpers/create-link-accessor.js.map

@@ -1 +1 @@
-{"version":3,"names":["getEntry","resolveGroupLink","prepareBoundStyles","toResolvedPair","link","sourceBounds","source","bounds","destinationBounds","destination","sourceStyles","styles","destinationStyles","sourceScreenKey","screenKey","destinationScreenKey","createLinkAccessor","getProps","getMeasured","tag","key","entry","String","getSnapshot","getLink","props","stringTag","current","route","resolved","selectedTag","resolvedPair","id","initialSource","initialDestination","compute","computeOptions","options"],"sourceRoot":"../../../../../../src","sources":["shared/utils/bounds/helpers/create-link-accessor.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["getEntry","getResolvedLink","prepareBoundStyles","resolveBoundsPairKey","toResolvedPair","link","sourceBounds","source","bounds","destinationBounds","destination","sourceStyles","styles","destinationStyles","sourceScreenKey","screenKey","destinationScreenKey","createLinkAccessor","getProps","getMeasured","tag","key","entry","String","getSnapshot","getLink","props","stringTag","pairKey","resolved","selectedTag","resolvedPair","id","initialSource","initialDestination","compute","computeOptions","options"],"sourceRoot":"../../../../../../src","sources":["shared/utils/bounds/helpers/create-link-accessor.ts"],"mappings":";;AAAA,SAASA,QAAQ,QAAQ,0CAA0C;AACnE,SAASC,eAAe,QAAQ,wCAAwC;AAYxE,SAASC,kBAAkB,QAAQ,wBAAwB;AAC3D,SAASC,oBAAoB,QAAQ,2BAA2B;AAUhE,MAAMC,cAAc,GAAIC,IAAa,IAA6B;EACjE,SAAS;;EACT,OAAO;IACNC,YAAY,EAAED,IAAI,CAACE,MAAM,CAACC,MAAM;IAChCC,iBAAiB,EAAEJ,IAAI,CAACK,WAAW,EAAEF,MAAM,IAAI,IAAI;IACnDG,YAAY,EAAEN,IAAI,CAACE,MAAM,CAACK,MAAM;IAChCC,iBAAiB,EAAER,IAAI,CAACK,WAAW,EAAEE,MAAM,IAAI,IAAI;IACnDE,eAAe,EAAET,IAAI,CAACE,MAAM,CAACQ,SAAS;IACtCC,oBAAoB,EAAEX,IAAI,CAACK,WAAW,EAAEK,SAAS,IAAI;EACtD,CAAC;AACF,CAAC;AAED,OAAO,MAAME,kBAAkB,GAAIC,QAAkB,IAAmB;EACvE,SAAS;;EAET,MAAMC,WAAW,GAAGA,CAACC,GAAY,EAAEC,GAAY,KAA2B;IACzE,SAAS;;IACT,IAAI,CAACA,GAAG,EAAE,OAAO,IAAI;IACrB,MAAMC,KAAK,GAAGtB,QAAQ,CAACuB,MAAM,CAACH,GAAG,CAAC,EAAEC,GAAG,CAAC;IACxC,OAAOC,KAAK,EAAEd,MAAM,GAAIc,KAAK,GAAqB,IAAI;EACvD,CAAC;EAED,MAAME,WAAW,GAAGA,CAACJ,GAAY,EAAEC,GAAY,KAA2B;IACzE,SAAS;;IACT,OAAOF,WAAW,CAACC,GAAG,EAAEC,GAAG,CAAC;EAC7B,CAAC;EAED,MAAMI,OAAO,GAAIL,GAAY,IAAwB;IACpD,SAAS;;IACT,MAAMM,KAAK,GAAGR,QAAQ,CAAC,CAAC;IACxB,MAAMS,SAAS,GAAGJ,MAAM,CAACH,GAAG,CAAC;IAC7B,MAAMQ,OAAO,GAAGzB,oBAAoB,CAACuB,KAAK,CAAC;IAC3C,MAAMG,QAAQ,GAAGD,OAAO,GACrB3B,eAAe,CAAC2B,OAAO,EAAED,SAAS,CAAC,GACnC;MAAEP,GAAG,EAAEO,SAAS;MAAEtB,IAAI,EAAE;IAAK,CAAC;IACjC,MAAMyB,WAAW,GAAGD,QAAQ,CAACT,GAAG;IAChC,MAAMf,IAAI,GAAGwB,QAAQ,CAACxB,IAAI;IAE1B,IAAI,CAACA,IAAI,EAAE,OAAO,IAAI;IACtB,MAAM0B,YAAY,GAAG3B,cAAc,CAACC,IAAI,CAAC;IAEzC,OAAO;MACN2B,EAAE,EAAEF,WAAW;MACfvB,MAAM,EAAEF,IAAI,CAACE,MAAM,GAChB;QAAEC,MAAM,EAAEH,IAAI,CAACE,MAAM,CAACC,MAAM;QAAEI,MAAM,EAAEP,IAAI,CAACE,MAAM,CAACK;MAAO,CAAC,GAC1D,IAAI;MACPF,WAAW,EAAEL,IAAI,CAACK,WAAW,GAC1B;QAAEF,MAAM,EAAEH,IAAI,CAACK,WAAW,CAACF,MAAM;QAAEI,MAAM,EAAEP,IAAI,CAACK,WAAW,CAACE;MAAO,CAAC,GACpE,IAAI;MACPqB,aAAa,EAAE5B,IAAI,CAAC4B,aAAa,GAC9B;QACAzB,MAAM,EAAEH,IAAI,CAAC4B,aAAa,CAACzB,MAAM;QACjCI,MAAM,EAAEP,IAAI,CAAC4B,aAAa,CAACrB;MAC5B,CAAC,GACA,IAAI;MACPsB,kBAAkB,EAAE7B,IAAI,CAAC6B,kBAAkB,GACxC;QACA1B,MAAM,EAAEH,IAAI,CAAC6B,kBAAkB,CAAC1B,MAAM;QACtCI,MAAM,EAAEP,IAAI,CAAC6B,kBAAkB,CAACtB;MACjC,CAAC,GACA,IAAI;MACPuB,OAAO,EACNC,cAAiB,IAC4B;QAC7C,SAAS;;QACT,OAAOlC,kBAAkB,CAAC;UACzBwB,KAAK;UACLW,OAAO,EAAE;YACR,GAAGD,cAAc;YACjBJ,EAAE,EAAEF;UACL,CAAuB;UACvBC;QACD,CAAC,CAAC;MACH;IACD,CAAC;EACF,CAAC;EAED,OAAO;IACNZ,WAAW;IACXK,WAAW;IACXC;EACD,CAAC;AACF,CAAC","ignoreList":[]}

package/lib/module/shared/utils/bounds/helpers/prepare-bound-styles.js

@@ -1,9 +1,10 @@
 "use strict";
 
 import { getEntry } from "../../../stores/bounds/internals/entries";
-import { getGroupActiveId, setGroupActiveId } from "../../../stores/bounds/internals/groups";
+import { setActiveGroupId } from "../../../stores/bounds/internals/links";
 import { DEFAULT_BOUNDS_OPTIONS } from "../constants";
 import { createBoundTag } from "./create-bound-tag";
+import { resolveBoundsPairKey } from "./resolve-bounds-pair-key";
 import { computeBoundStyles } from "./styles/compute";
 const buildBoundsOptions = ({
   props,
@@ -28,22 +29,34 @@ const buildBoundsOptions = ({
   };
   return resolved;
 };
-const syncGroupActiveMember = (group, id) => {
+const syncActiveGroupId = params => {
   "worklet";
 
-  if (!group || id == null || id === "") return;
-  const normalizedId = String(id);
-  if (getGroupActiveId(group) === normalizedId) return;
-  setGroupActiveId(group, normalizedId);
+  const {
+    props,
+    id,
+    group
+  } = params;
+  if (id == null || id === "" || !group) return;
+  const pairKey = resolveBoundsPairKey(props);
+  if (!pairKey) return;
+  setActiveGroupId(pairKey, group, String(id));
 };
 export const prepareBoundStyles = ({
   props,
   options,
-  resolvedPair
+  resolvedPair,
+  syncGroupActiveId = false
 }) => {
   "worklet";
 
-  syncGroupActiveMember(options.group, options.id);
+  if (syncGroupActiveId) {
+    syncActiveGroupId({
+      props,
+      id: options.id,
+      group: options.group
+    });
+  }
   const resolved = buildBoundsOptions({
     props,
     id: options.id,