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

package/lib/commonjs/shared/stores/bounds/internals/clear.js

@@ -5,40 +5,32 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.clear = clear;
 var _keys = require("../helpers/keys");
-var _matching = require("../helpers/matching");
+var _linkPairs = require("../helpers/link-pairs.helpers");
 var _state = require("./state");
-const clearRegistry = (shouldClearScreen, shouldClearLink) => {
+function clear(screenKey) {
   "worklet";
 
-  _state.registry.modify(state => {
+  _state.boundaryRegistry.modify(state => {
     "worklet";
 
     for (const tag in state) {
       const tagState = state[tag];
-      for (const entryScreenKey in tagState.screens) {
-        const screenEntry = tagState.screens[entryScreenKey];
-        if (shouldClearScreen(entryScreenKey, screenEntry)) {
-          delete tagState.screens[entryScreenKey];
-        }
-      }
-      for (let i = tagState.linkStack.length - 1; i >= 0; i--) {
-        const link = tagState.linkStack[i];
-        if (shouldClearLink(link)) {
-          tagState.linkStack.splice(i, 1);
-        }
-      }
-      if (!(0, _keys.hasAnyKeys)(tagState.screens) && tagState.linkStack.length === 0) {
+      delete tagState.screens[screenKey];
+      if (!(0, _keys.hasAnyKeys)(tagState.screens)) {
         delete state[tag];
       }
     }
     return state;
   });
-};
-function clear(screenKey) {
-  "worklet";
+  _state.pairs.modify(state => {
+    "worklet";
 
-  clearRegistry(entryScreenKey => entryScreenKey === screenKey, link => {
-    return (0, _matching.matchesScreenKey)(link.source, screenKey) || (0, _matching.matchesScreenKey)(link.destination, screenKey);
+    for (const pairKey in state) {
+      if ((0, _linkPairs.isScreenPairKeyForScreen)(pairKey, screenKey)) {
+        delete state[pairKey];
+      }
+    }
+    return state;
   });
 }
 //# sourceMappingURL=clear.js.map

package/lib/commonjs/shared/stores/bounds/internals/clear.js.map

@@ -1 +1 @@
-{"version":3,"names":["_keys","require","_matching","_state","clearRegistry","shouldClearScreen","shouldClearLink","registry","modify","state","tag","tagState","entryScreenKey","screens","screenEntry","i","linkStack","length","link","splice","hasAnyKeys","clear","screenKey","matchesScreenKey","source","destination"],"sourceRoot":"../../../../../../src","sources":["shared/stores/bounds/internals/clear.ts"],"mappings":";;;;;;AAAA,IAAAA,KAAA,GAAAC,OAAA;AACA,IAAAC,SAAA,GAAAD,OAAA;AAEA,IAAAE,MAAA,GAAAF,OAAA;AASA,MAAMG,aAAa,GAAGA,CACrBC,iBAAkC,EAClCC,eAA8B,KAC1B;EACJ,SAAS;;EACTC,eAAQ,CAACC,MAAM,CAA2BC,KAAQ,IAAQ;IACzD,SAAS;;IACT,KAAK,MAAMC,GAAG,IAAID,KAAK,EAAE;MACxB,MAAME,QAAQ,GAAGF,KAAK,CAACC,GAAG,CAAC;MAE3B,KAAK,MAAME,cAAc,IAAID,QAAQ,CAACE,OAAO,EAAE;QAC9C,MAAMC,WAAW,GAAGH,QAAQ,CAACE,OAAO,CAACD,cAAc,CAAC;QACpD,IAAIP,iBAAiB,CAACO,cAAc,EAAEE,WAAW,CAAC,EAAE;UACnD,OAAOH,QAAQ,CAACE,OAAO,CAACD,cAAc,CAAC;QACxC;MACD;MAEA,KAAK,IAAIG,CAAC,GAAGJ,QAAQ,CAACK,SAAS,CAACC,MAAM,GAAG,CAAC,EAAEF,CAAC,IAAI,CAAC,EAAEA,CAAC,EAAE,EAAE;QACxD,MAAMG,IAAI,GAAGP,QAAQ,CAACK,SAAS,CAACD,CAAC,CAAC;QAClC,IAAIT,eAAe,CAACY,IAAI,CAAC,EAAE;UAC1BP,QAAQ,CAACK,SAAS,CAACG,MAAM,CAACJ,CAAC,EAAE,CAAC,CAAC;QAChC;MACD;MAEA,IAAI,CAAC,IAAAK,gBAAU,EAACT,QAAQ,CAACE,OAAO,CAAC,IAAIF,QAAQ,CAACK,SAAS,CAACC,MAAM,KAAK,CAAC,EAAE;QACrE,OAAOR,KAAK,CAACC,GAAG,CAAC;MAClB;IACD;IAEA,OAAOD,KAAK;EACb,CAAC,CAAC;AACH,CAAC;AAED,SAASY,KAAKA,CAACC,SAAoB,EAAE;EACpC,SAAS;;EACTlB,aAAa,CACXQ,cAAc,IAAKA,cAAc,KAAKU,SAAS,EAC/CJ,IAAI,IAAK;IACT,OACC,IAAAK,0BAAgB,EAACL,IAAI,CAACM,MAAM,EAAEF,SAAS,CAAC,IACxC,IAAAC,0BAAgB,EAACL,IAAI,CAACO,WAAW,EAAEH,SAAS,CAAC;EAE/C,CACD,CAAC;AACF","ignoreList":[]}
+{"version":3,"names":["_keys","require","_linkPairs","_state","clear","screenKey","boundaryRegistry","modify","state","tag","tagState","screens","hasAnyKeys","pairs","pairKey","isScreenPairKeyForScreen"],"sourceRoot":"../../../../../../src","sources":["shared/stores/bounds/internals/clear.ts"],"mappings":";;;;;;AAAA,IAAAA,KAAA,GAAAC,OAAA;AACA,IAAAC,UAAA,GAAAD,OAAA;AAEA,IAAAE,MAAA,GAAAF,OAAA;AAEA,SAASG,KAAKA,CAACC,SAAoB,EAAE;EACpC,SAAS;;EAETC,uBAAgB,CAACC,MAAM,CAAkCC,KAAQ,IAAQ;IACxE,SAAS;;IACT,KAAK,MAAMC,GAAG,IAAID,KAAK,EAAE;MACxB,MAAME,QAAQ,GAAGF,KAAK,CAACC,GAAG,CAAC;MAC3B,OAAOC,QAAQ,CAACC,OAAO,CAACN,SAAS,CAAC;MAElC,IAAI,CAAC,IAAAO,gBAAU,EAACF,QAAQ,CAACC,OAAO,CAAC,EAAE;QAClC,OAAOH,KAAK,CAACC,GAAG,CAAC;MAClB;IACD;IAEA,OAAOD,KAAK;EACb,CAAC,CAAC;EAEFK,YAAK,CAACN,MAAM,CAA4BC,KAAQ,IAAQ;IACvD,SAAS;;IACT,KAAK,MAAMM,OAAO,IAAIN,KAAK,EAAE;MAC5B,IAAI,IAAAO,mCAAwB,EAACD,OAAO,EAAET,SAAS,CAAC,EAAE;QACjD,OAAOG,KAAK,CAACM,OAAO,CAAC;MACtB;IACD;IAEA,OAAON,KAAK;EACb,CAAC,CAAC;AACH","ignoreList":[]}

package/lib/commonjs/shared/stores/bounds/internals/entries.js

@@ -6,30 +6,68 @@ Object.defineProperty(exports, "__esModule", {
 exports.getEntry = getEntry;
 exports.removeEntry = removeEntry;
 exports.setEntry = setEntry;
-var _entries = require("../helpers/entries.helpers");
-var _tagState = require("../helpers/tag-state.helpers");
+var _keys = require("../helpers/keys");
 var _state = require("./state");
+const ensureBoundaryState = (state, tag) => {
+  "worklet";
+
+  if (!state[tag]) {
+    state[tag] = {
+      screens: {}
+    };
+  }
+  return state[tag];
+};
+const ensureScreenEntry = (state, tag, screenKey) => {
+  "worklet";
+
+  const tagState = ensureBoundaryState(state, tag);
+  if (!tagState.screens[screenKey]) {
+    tagState.screens[screenKey] = {
+      bounds: null,
+      styles: {}
+    };
+  }
+  return tagState.screens[screenKey];
+};
+const applyEntryPatch = (entry, patch) => {
+  "worklet";
+
+  if (patch.bounds !== undefined) {
+    entry.bounds = patch.bounds;
+  }
+  if (patch.styles !== undefined) {
+    entry.styles = patch.styles ?? {};
+  }
+  if (patch.boundaryConfig === undefined) {
+    return;
+  }
+  if (patch.boundaryConfig === null) {
+    delete entry.boundaryConfig;
+  } else {
+    entry.boundaryConfig = patch.boundaryConfig;
+  }
+};
 function getEntry(tag, key) {
   "worklet";
 
-  return (0, _entries.findMatchingScreenEntry)(_state.registry.get()[tag], key);
+  return _state.boundaryRegistry.get()[tag]?.screens[key] ?? null;
 }
 function setEntry(tag, screenKey, patch) {
   "worklet";
 
-  _state.registry.modify(state => {
+  _state.boundaryRegistry.modify(state => {
     "worklet";
 
-    const tagState = (0, _tagState.ensureTagState)(state, tag);
-    const entry = (0, _entries.ensureScreenEntry)(tagState, screenKey);
-    (0, _entries.applyEntryPatch)(entry, patch);
+    const entry = ensureScreenEntry(state, tag, screenKey);
+    applyEntryPatch(entry, patch);
     return state;
   });
 }
 function removeEntry(tag, screenKey) {
   "worklet";
 
-  _state.registry.modify(state => {
+  _state.boundaryRegistry.modify(state => {
     "worklet";
 
     const tagState = state[tag];
@@ -37,7 +75,9 @@ function removeEntry(tag, screenKey) {
       return state;
     }
     delete tagState.screens[screenKey];
-    (0, _tagState.pruneTagState)(state, tag);
+    if (!(0, _keys.hasAnyKeys)(tagState.screens)) {
+      delete state[tag];
+    }
     return state;
   });
 }

package/lib/commonjs/shared/stores/bounds/internals/entries.js.map

@@ -1 +1 @@
-{"version":3,"names":["_entries","require","_tagState","_state","getEntry","tag","key","findMatchingScreenEntry","registry","get","setEntry","screenKey","patch","modify","state","tagState","ensureTagState","entry","ensureScreenEntry","applyEntryPatch","removeEntry","screens","pruneTagState"],"sourceRoot":"../../../../../../src","sources":["shared/stores/bounds/internals/entries.ts"],"mappings":";;;;;;;;AAAA,IAAAA,QAAA,GAAAC,OAAA;AAKA,IAAAC,SAAA,GAAAD,OAAA;AAEA,IAAAE,MAAA,GAAAF,OAAA;AAEA,SAASG,QAAQA,CAACC,GAAU,EAAEC,GAAc,EAAsB;EACjE,SAAS;;EACT,OAAO,IAAAC,gCAAuB,EAACC,eAAQ,CAACC,GAAG,CAAC,CAAC,CAACJ,GAAG,CAAC,EAAEC,GAAG,CAAC;AACzD;AAEA,SAASI,QAAQA,CAACL,GAAU,EAAEM,SAAoB,EAAEC,KAAiB,EAAE;EACtE,SAAS;;EACTJ,eAAQ,CAACK,MAAM,CAA2BC,KAAQ,IAAQ;IACzD,SAAS;;IACT,MAAMC,QAAQ,GAAG,IAAAC,wBAAc,EAACF,KAAK,EAAET,GAAG,CAAC;IAC3C,MAAMY,KAAK,GAAG,IAAAC,0BAAiB,EAACH,QAAQ,EAAEJ,SAAS,CAAC;IACpD,IAAAQ,wBAAe,EAACF,KAAK,EAAEL,KAAK,CAAC;IAC7B,OAAOE,KAAK;EACb,CAAC,CAAC;AACH;AAEA,SAASM,WAAWA,CAACf,GAAU,EAAEM,SAAoB,EAAE;EACtD,SAAS;;EACTH,eAAQ,CAACK,MAAM,CAA2BC,KAAQ,IAAQ;IACzD,SAAS;;IACT,MAAMC,QAAQ,GAAGD,KAAK,CAACT,GAAG,CAAC;IAC3B,IAAI,CAACU,QAAQ,EAAEM,OAAO,CAACV,SAAS,CAAC,EAAE;MAClC,OAAOG,KAAK;IACb;IAEA,OAAOC,QAAQ,CAACM,OAAO,CAACV,SAAS,CAAC;IAClC,IAAAW,uBAAa,EAACR,KAAK,EAAET,GAAG,CAAC;IAEzB,OAAOS,KAAK;EACb,CAAC,CAAC;AACH","ignoreList":[]}
+{"version":3,"names":["_keys","require","_state","ensureBoundaryState","state","tag","screens","ensureScreenEntry","screenKey","tagState","bounds","styles","applyEntryPatch","entry","patch","undefined","boundaryConfig","getEntry","key","boundaryRegistry","get","setEntry","modify","removeEntry","hasAnyKeys"],"sourceRoot":"../../../../../../src","sources":["shared/stores/bounds/internals/entries.ts"],"mappings":";;;;;;;;AAAA,IAAAA,KAAA,GAAAC,OAAA;AAEA,IAAAC,MAAA,GAAAD,OAAA;AAEA,MAAME,mBAAmB,GAAGA,CAACC,KAA2B,EAAEC,GAAU,KAAK;EACxE,SAAS;;EACT,IAAI,CAACD,KAAK,CAACC,GAAG,CAAC,EAAE;IAChBD,KAAK,CAACC,GAAG,CAAC,GAAG;MACZC,OAAO,EAAE,CAAC;IACX,CAAC;EACF;EACA,OAAOF,KAAK,CAACC,GAAG,CAAC;AAClB,CAAC;AAED,MAAME,iBAAiB,GAAGA,CACzBH,KAA2B,EAC3BC,GAAU,EACVG,SAAoB,KACH;EACjB,SAAS;;EACT,MAAMC,QAAQ,GAAGN,mBAAmB,CAACC,KAAK,EAAEC,GAAG,CAAC;EAChD,IAAI,CAACI,QAAQ,CAACH,OAAO,CAACE,SAAS,CAAC,EAAE;IACjCC,QAAQ,CAACH,OAAO,CAACE,SAAS,CAAC,GAAG;MAC7BE,MAAM,EAAE,IAAI;MACZC,MAAM,EAAE,CAAC;IACV,CAAC;EACF;EACA,OAAOF,QAAQ,CAACH,OAAO,CAACE,SAAS,CAAC;AACnC,CAAC;AAED,MAAMI,eAAe,GAAGA,CAACC,KAAkB,EAAEC,KAAiB,KAAK;EAClE,SAAS;;EACT,IAAIA,KAAK,CAACJ,MAAM,KAAKK,SAAS,EAAE;IAC/BF,KAAK,CAACH,MAAM,GAAGI,KAAK,CAACJ,MAAM;EAC5B;EAEA,IAAII,KAAK,CAACH,MAAM,KAAKI,SAAS,EAAE;IAC/BF,KAAK,CAACF,MAAM,GAAGG,KAAK,CAACH,MAAM,IAAI,CAAC,CAAC;EAClC;EAEA,IAAIG,KAAK,CAACE,cAAc,KAAKD,SAAS,EAAE;IACvC;EACD;EAEA,IAAID,KAAK,CAACE,cAAc,KAAK,IAAI,EAAE;IAClC,OAAOH,KAAK,CAACG,cAAc;EAC5B,CAAC,MAAM;IACNH,KAAK,CAACG,cAAc,GAAGF,KAAK,CAACE,cAAc;EAC5C;AACD,CAAC;AAED,SAASC,QAAQA,CAACZ,GAAU,EAAEa,GAAc,EAAsB;EACjE,SAAS;;EACT,OAAOC,uBAAgB,CAACC,GAAG,CAAC,CAAC,CAACf,GAAG,CAAC,EAAEC,OAAO,CAACY,GAAG,CAAC,IAAI,IAAI;AACzD;AAEA,SAASG,QAAQA,CAAChB,GAAU,EAAEG,SAAoB,EAAEM,KAAiB,EAAE;EACtE,SAAS;;EACTK,uBAAgB,CAACG,MAAM,CAAkClB,KAAQ,IAAQ;IACxE,SAAS;;IACT,MAAMS,KAAK,GAAGN,iBAAiB,CAACH,KAAK,EAAEC,GAAG,EAAEG,SAAS,CAAC;IACtDI,eAAe,CAACC,KAAK,EAAEC,KAAK,CAAC;IAC7B,OAAOV,KAAK;EACb,CAAC,CAAC;AACH;AAEA,SAASmB,WAAWA,CAAClB,GAAU,EAAEG,SAAoB,EAAE;EACtD,SAAS;;EACTW,uBAAgB,CAACG,MAAM,CAAkClB,KAAQ,IAAQ;IACxE,SAAS;;IACT,MAAMK,QAAQ,GAAGL,KAAK,CAACC,GAAG,CAAC;IAC3B,IAAI,CAACI,QAAQ,EAAEH,OAAO,CAACE,SAAS,CAAC,EAAE;MAClC,OAAOJ,KAAK;IACb;IAEA,OAAOK,QAAQ,CAACH,OAAO,CAACE,SAAS,CAAC;IAClC,IAAI,CAAC,IAAAgB,gBAAU,EAACf,QAAQ,CAACH,OAAO,CAAC,EAAE;MAClC,OAAOF,KAAK,CAACC,GAAG,CAAC;IAClB;IAEA,OAAOD,KAAK;EACb,CAAC,CAAC;AACH","ignoreList":[]}

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

@@ -3,118 +3,179 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getMatchedLink = getMatchedLink;
-exports.getPendingLink = getPendingLink;
-exports.hasDestinationLink = hasDestinationLink;
-exports.hasSourceLink = hasSourceLink;
+exports.getActiveGroupId = getActiveGroupId;
+exports.getDestination = getDestination;
+exports.getLink = getLink;
+exports.getResolvedLink = getResolvedLink;
+exports.getSource = getSource;
+exports.setActiveGroupId = setActiveGroupId;
 exports.setDestination = setDestination;
 exports.setSource = setSource;
-var _link = require("../helpers/link.helpers");
-var _tagState = require("../helpers/tag-state.helpers");
+var _linkPairs = require("../helpers/link-pairs.helpers");
 var _state = require("./state");
-function setSource(mode, tag, screenKey, bounds, styles = {}) {
+const toLinkKey = tag => {
   "worklet";
 
-  _state.registry.modify(state => {
+  return (0, _linkPairs.getLinkKeyFromTag)(tag);
+};
+const createLinkSide = (screenKey, bounds, styles) => {
+  "worklet";
+
+  return {
+    screenKey,
+    bounds,
+    styles
+  };
+};
+const writePairLink = (state, pairKey, linkKey, link) => {
+  "worklet";
+
+  (0, _linkPairs.ensurePairLinks)(state, pairKey)[linkKey] = link;
+};
+const writeGroup = (state, pairKey, group, activeId, initialId) => {
+  "worklet";
+
+  const previousInitialId = state[pairKey]?.groups?.[group]?.initialId;
+  (0, _linkPairs.ensurePairGroups)(state, pairKey)[group] = {
+    activeId,
+    initialId: previousInitialId ?? initialId ?? activeId
+  };
+};
+const writeDestination = (state, pairKey, linkKey, screenKey, bounds, styles, group) => {
+  "worklet";
+
+  const link = (0, _linkPairs.getLink)(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 ((0, _linkPairs.getLink)(state, pairKey, linkKey)) return;
+  const sourceScreenKey = (0, _linkPairs.getSourceScreenKeyFromPairKey)(pairKey);
+  const pendingPairKey = (0, _linkPairs.createPendingPairKey)(sourceScreenKey);
+  if (pendingPairKey === pairKey) return;
+  const pendingLink = (0, _linkPairs.getLink)(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);
+    }
+  }
+  (0, _linkPairs.removePairLink)(state, pendingPairKey, linkKey);
+};
+function setSource(pairKey, tag, screenKey, bounds, styles = {}, group) {
+  "worklet";
+
+  _state.pairs.modify(state => {
     "worklet";
 
-    const source = {
-      screenKey,
-      bounds,
-      styles
+    const linkKey = toLinkKey(tag);
+    const source = createLinkSide(screenKey, bounds, styles);
+    const pairLinks = (0, _linkPairs.ensurePairLinks)(state, pairKey);
+    const existingLink = pairLinks[linkKey];
+    const link = existingLink ?? {
+      group,
+      source,
+      destination: null,
+      initialSource: source
     };
-    if (mode === "capture") {
-      const tagState = (0, _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 && (0, _link.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 = (0, _link.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 = (0, _linkPairs.createPendingPairKey)(screenKey);
+    if (pendingPairKey !== pairKey) {
+      (0, _linkPairs.removePairLink)(state, pendingPairKey, linkKey);
     }
     return state;
   });
 }
-function setDestination(mode, tag, screenKey, bounds, styles = {}, expectedSourceScreenKey) {
+function setDestination(pairKey, tag, screenKey, bounds, styles = {}, group) {
   "worklet";
 
-  _state.registry.modify(state => {
+  _state.pairs.modify(state => {
     "worklet";
 
-    const stack = state[tag]?.linkStack;
-    if (!stack || stack.length === 0) return state;
-    const targetIndex = (0, _link.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 = _state.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 ((0, _link.isCompletedLinkForScreenKey)(link, screenKey)) {
-      return link;
-    }
-  }
-  return null;
+  _state.pairs.modify(state => {
+    "worklet";
+
+    writeGroup(state, pairKey, group, toLinkKey(tag));
+    return state;
+  });
 }
-function getPendingLink(tag, sourceScreenKey) {
+function getActiveGroupId(pairKey, group) {
   "worklet";
 
-  const tagState = _state.registry.get()[tag];
-  const stack = tagState?.linkStack;
-  if (!stack || stack.length === 0) return null;
-  const pendingSourceLinkIndex = (0, _link.findLatestPendingSourceLinkIndex)(stack, sourceScreenKey);
-  if (pendingSourceLinkIndex === -1) return null;
-  return stack[pendingSourceLinkIndex] ?? null;
+  return (0, _linkPairs.getActiveGroupId)(_state.pairs.get(), pairKey, group);
+}
+function getLink(pairKey, tag) {
+  "worklet";
+
+  return (0, _linkPairs.getLink)(_state.pairs.get(), pairKey, toLinkKey(tag));
+}
+const isCompletedLink = link => {
+  "worklet";
+
+  return !!link?.destination;
+};
+function getResolvedLink(pairKey, tag) {
+  "worklet";
+
+  const state = _state.pairs.get();
+  const linkKey = toLinkKey(tag);
+  const group = (0, _linkPairs.getGroupKeyFromTag)(tag);
+  const requestedLink = (0, _linkPairs.getLink)(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 = (0, _linkPairs.getLink)(state, pairKey, initialId);
+    if (isCompletedLink(initialLink)) {
+      return {
+        tag: (0, _linkPairs.createGroupTag)(group, initialId),
+        link: initialLink
+      };
+    }
+  }
+  return {
+    tag,
+    link: requestedLink
+  };
 }
-function hasSourceLink(tag, screenKey) {
+function getSource(pairKey, tag) {
   "worklet";
 
-  return (0, _link.hasLinkSide)(_state.registry.get()[tag]?.linkStack, screenKey, "source");
+  return (0, _linkPairs.getSource)(_state.pairs.get(), pairKey, toLinkKey(tag));
 }
-function hasDestinationLink(tag, screenKey) {
+function getDestination(pairKey, tag) {
   "worklet";
 
-  return (0, _link.hasLinkSide)(_state.registry.get()[tag]?.linkStack, screenKey, "destination");
+  return (0, _linkPairs.getDestination)(_state.pairs.get(), pairKey, toLinkKey(tag));
 }
 //# sourceMappingURL=links.js.map

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

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

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

@@ -4,56 +4,30 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.resolveTransitionPair = resolveTransitionPair;
-var _findLatest = require("../helpers/find-latest");
-var _matching = require("../helpers/matching");
-var _state = require("./state");
-function findCompletedLinkByDestination(stack, screenKey) {
+var _linkPairs = require("../helpers/link-pairs.helpers");
+var _links = require("./links");
+function resolvePairKey(context) {
   "worklet";
 
-  if (!screenKey) return null;
-  return (0, _findLatest.findLatest)(stack, link => !!link.destination && (0, _matching.matchesScreenKey)(link.destination, screenKey));
-}
-function findCompletedLinkBySource(stack, screenKey) {
-  "worklet";
-
-  if (!screenKey) return null;
-  return (0, _findLatest.findLatest)(stack, link => !!link.destination && (0, _matching.matchesScreenKey)(link.source, screenKey));
-}
-function findPendingLinkBySource(stack, screenKey) {
-  "worklet";
-
-  if (!screenKey) return null;
-  return (0, _findLatest.findLatest)(stack, link => link.destination === null && (0, _matching.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 (0, _linkPairs.createScreenPairKey)(context.previousScreenKey, context.currentScreenKey);
+  }
+  if (!context.currentScreenKey || !context.nextScreenKey) return null;
+  return (0, _linkPairs.createScreenPairKey)(context.currentScreenKey, context.nextScreenKey);
 }
 function resolveTransitionPair(tag, context) {
   "worklet";
 
-  const tagState = _state.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 ? (0, _links.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
   };
 }
 //# sourceMappingURL=resolver.js.map

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

@@ -1 +1 @@
-{"version":3,"names":["_findLatest","require","_matching","_state","findCompletedLinkByDestination","stack","screenKey","findLatest","link","destination","matchesScreenKey","findCompletedLinkBySource","source","findPendingLinkBySource","findEnteringTransitionLink","context","currentScreenKey","previousScreenKey","findExitingTransitionLink","nextScreenKey","resolveTransitionPair","tag","tagState","registry","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":["_linkPairs","require","_links","resolvePairKey","context","entering","previousScreenKey","currentScreenKey","createScreenPairKey","nextScreenKey","resolveTransitionPair","tag","pairKey","matchedLink","getResolvedLink","link","sourceBounds","source","bounds","destinationBounds","destination","sourceStyles","styles","destinationStyles","sourceScreenKey","screenKey","destinationScreenKey"],"sourceRoot":"../../../../../../src","sources":["shared/stores/bounds/internals/resolver.ts"],"mappings":";;;;;;AAAA,IAAAA,UAAA,GAAAC,OAAA;AAOA,IAAAC,MAAA,GAAAD,OAAA;AAEA,SAASE,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,OAAO,IAAAC,8BAAmB,EACzBJ,OAAO,CAACE,iBAAiB,EACzBF,OAAO,CAACG,gBACT,CAAC;EACF;EAEA,IAAI,CAACH,OAAO,CAACG,gBAAgB,IAAI,CAACH,OAAO,CAACK,aAAa,EAAE,OAAO,IAAI;EACpE,OAAO,IAAAD,8BAAmB,EAACJ,OAAO,CAACG,gBAAgB,EAAEH,OAAO,CAACK,aAAa,CAAC;AAC5E;AAEA,SAASC,qBAAqBA,CAC7BC,GAAU,EACVP,OAAiC,EACR;EACzB,SAAS;;EACT,MAAMQ,OAAO,GAAGT,cAAc,CAACC,OAAO,CAAC;EACvC,MAAMS,WAAW,GAAGD,OAAO,GAAG,IAAAE,sBAAe,EAACF,OAAO,EAAED,GAAG,CAAC,CAACI,IAAI,GAAG,IAAI;EAEvE,OAAO;IACNC,YAAY,EAAEH,WAAW,EAAEI,MAAM,CAACC,MAAM,IAAI,IAAI;IAChDC,iBAAiB,EAAEN,WAAW,EAAEO,WAAW,EAAEF,MAAM,IAAI,IAAI;IAC3DG,YAAY,EAAER,WAAW,EAAEI,MAAM,CAACK,MAAM,IAAI,IAAI;IAChDC,iBAAiB,EAAEV,WAAW,EAAEO,WAAW,EAAEE,MAAM,IAAI,IAAI;IAC3DE,eAAe,EAAEX,WAAW,EAAEI,MAAM,CAACQ,SAAS,IAAI,IAAI;IACtDC,oBAAoB,EAAEb,WAAW,EAAEO,WAAW,EAAEK,SAAS,IAAI;EAC9D,CAAC;AACF","ignoreList":[]}

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

@@ -3,8 +3,31 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.registry = exports.groups = void 0;
+exports.pairs = exports.boundaryRegistry = void 0;
 var _reactNativeReanimated = require("react-native-reanimated");
-const registry = exports.registry = (0, _reactNativeReanimated.makeMutable)({});
-const groups = exports.groups = (0, _reactNativeReanimated.makeMutable)({});
+const boundaryRegistry = exports.boundaryRegistry = (0, _reactNativeReanimated.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: ... },
+ *     },
+ *   },
+ * }
+ */
+const pairs = exports.pairs = (0, _reactNativeReanimated.makeMutable)({});
 //# sourceMappingURL=state.js.map

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

@@ -1 +1 @@
-{"version":3,"names":["_reactNativeReanimated","require","registry","exports","makeMutable","groups"],"sourceRoot":"../../../../../../src","sources":["shared/stores/bounds/internals/state.ts"],"mappings":";;;;;;AAAA,IAAAA,sBAAA,GAAAC,OAAA;AAMO,MAAMC,QAAQ,GAAAC,OAAA,CAAAD,QAAA,GAAG,IAAAE,kCAAW,EAAgB,CAAC,CAAC,CAAC;AAC/C,MAAMC,MAAM,GAAAF,OAAA,CAAAE,MAAA,GAAG,IAAAD,kCAAW,EAAc,CAAC,CAAC,CAAC","ignoreList":[]}
+{"version":3,"names":["_reactNativeReanimated","require","boundaryRegistry","exports","makeMutable","pairs"],"sourceRoot":"../../../../../../src","sources":["shared/stores/bounds/internals/state.ts"],"mappings":";;;;;;AAAA,IAAAA,sBAAA,GAAAC,OAAA;AAKO,MAAMC,gBAAgB,GAAAC,OAAA,CAAAD,gBAAA,GAAG,IAAAE,kCAAW,EAAuB,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;AACO,MAAMC,KAAK,GAAAF,OAAA,CAAAE,KAAA,GAAG,IAAAD,kCAAW,EAAiB,CAAC,CAAC,CAAC","ignoreList":[]}

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

@@ -20,6 +20,7 @@ function createGestureBag() {
     y: (0, _reactNativeReanimated.makeMutable)(0),
     normX,
     normY,
+    velocity: (0, _reactNativeReanimated.makeMutable)(0),
     scale,
     normScale,
     focalX: (0, _reactNativeReanimated.makeMutable)(0),
@@ -59,6 +60,7 @@ const GestureStore = exports.GestureStore = (0, _createStore.createStore)({
     (0, _reactNativeReanimated.cancelAnimation)(bag.y);
     (0, _reactNativeReanimated.cancelAnimation)(bag.normX);
     (0, _reactNativeReanimated.cancelAnimation)(bag.normY);
+    (0, _reactNativeReanimated.cancelAnimation)(bag.velocity);
     (0, _reactNativeReanimated.cancelAnimation)(bag.scale);
     (0, _reactNativeReanimated.cancelAnimation)(bag.normScale);
     (0, _reactNativeReanimated.cancelAnimation)(bag.focalX);