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

package/lib/module/shared/stores/bounds/helpers/link-pairs.helpers.js

@@ -0,0 +1,105 @@
+"use strict";
+
+const PAIR_SEPARATOR = "<>";
+export const createScreenPairKey = (sourceScreenKey, destinationScreenKey) => {
+  "worklet";
+
+  return `${sourceScreenKey}${PAIR_SEPARATOR}${destinationScreenKey}`;
+};
+export const createPendingPairKey = sourceScreenKey => {
+  "worklet";
+
+  return createScreenPairKey(sourceScreenKey, "");
+};
+export const getSourceScreenKeyFromPairKey = pairKey => {
+  "worklet";
+
+  const separatorIndex = pairKey.indexOf(PAIR_SEPARATOR);
+  if (separatorIndex === -1) return pairKey;
+  return pairKey.slice(0, separatorIndex);
+};
+export const getDestinationScreenKeyFromPairKey = pairKey => {
+  "worklet";
+
+  const separatorIndex = pairKey.indexOf(PAIR_SEPARATOR);
+  if (separatorIndex === -1) return "";
+  return pairKey.slice(separatorIndex + PAIR_SEPARATOR.length);
+};
+export const isScreenPairKeyForScreen = (pairKey, screenKey) => {
+  "worklet";
+
+  return pairKey === createPendingPairKey(screenKey) || pairKey.startsWith(`${screenKey}${PAIR_SEPARATOR}`) || pairKey.endsWith(`${PAIR_SEPARATOR}${screenKey}`);
+};
+export const getLinkKeyFromTag = tag => {
+  "worklet";
+
+  const separatorIndex = tag.indexOf(":");
+  if (separatorIndex === -1) return tag;
+  return tag.slice(separatorIndex + 1);
+};
+export const getGroupKeyFromTag = tag => {
+  "worklet";
+
+  const separatorIndex = tag.indexOf(":");
+  if (separatorIndex === -1) return null;
+  return tag.slice(0, separatorIndex);
+};
+export const createGroupTag = (group, linkKey) => {
+  "worklet";
+
+  return `${group}:${linkKey}`;
+};
+export const ensurePairState = (state, pairKey) => {
+  "worklet";
+
+  if (!state[pairKey]) {
+    state[pairKey] = {
+      links: {},
+      groups: {}
+    };
+  }
+  state[pairKey].groups ??= {};
+  return state[pairKey];
+};
+export const ensurePairLinks = (state, pairKey) => {
+  "worklet";
+
+  return ensurePairState(state, pairKey).links;
+};
+export const ensurePairGroups = (state, pairKey) => {
+  "worklet";
+
+  return ensurePairState(state, pairKey).groups;
+};
+export const removePairLink = (state, pairKey, linkKey) => {
+  "worklet";
+
+  const pair = state[pairKey];
+  if (!pair) return;
+  delete pair.links[linkKey];
+  for (const key in pair.links) {
+    if (pair.links[key]) return;
+  }
+  delete state[pairKey];
+};
+export const getLink = (state, pairKey, linkKey) => {
+  "worklet";
+
+  return state[pairKey]?.links[linkKey] ?? null;
+};
+export const getSource = (state, pairKey, linkKey) => {
+  "worklet";
+
+  return getLink(state, pairKey, linkKey)?.source ?? null;
+};
+export const getDestination = (state, pairKey, linkKey) => {
+  "worklet";
+
+  return getLink(state, pairKey, linkKey)?.destination ?? null;
+};
+export const getActiveGroupId = (state, pairKey, group) => {
+  "worklet";
+
+  return state[pairKey]?.groups?.[group]?.activeId ?? null;
+};
+//# sourceMappingURL=link-pairs.helpers.js.map

package/lib/module/shared/stores/bounds/helpers/link-pairs.helpers.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["PAIR_SEPARATOR","createScreenPairKey","sourceScreenKey","destinationScreenKey","createPendingPairKey","getSourceScreenKeyFromPairKey","pairKey","separatorIndex","indexOf","slice","getDestinationScreenKeyFromPairKey","length","isScreenPairKeyForScreen","screenKey","startsWith","endsWith","getLinkKeyFromTag","tag","getGroupKeyFromTag","createGroupTag","group","linkKey","ensurePairState","state","links","groups","ensurePairLinks","ensurePairGroups","removePairLink","pair","key","getLink","getSource","source","getDestination","destination","getActiveGroupId","activeId"],"sourceRoot":"../../../../../../src","sources":["shared/stores/bounds/helpers/link-pairs.helpers.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/shared/stores/bounds/index.js

@@ -1,9 +1,8 @@
 "use strict";
 
-import { clear, clearByAncestor, clearByBranch } from "./internals/clear";
+import { clear } from "./internals/clear";
 import { getEntry, removeEntry, setEntry } from "./internals/entries";
-import { getGroupActiveId, getGroupInitialId, setGroupActiveId, setGroupInitialId } from "./internals/groups";
-import { getMatchedLink, getPendingLink, hasDestinationLink, hasSourceLink, setDestination, setSource } from "./internals/links";
+import { getActiveGroupId, getDestination, getLink, getSource, setActiveGroupId, setDestination, setSource } from "./internals/links";
 import { resolveTransitionPair } from "./internals/resolver";
 export const BoundStore = {
   entry: {
@@ -14,22 +13,15 @@ export const BoundStore = {
   link: {
     setSource,
     setDestination,
-    getMatched: getMatchedLink,
-    getPair: resolveTransitionPair,
-    getPending: getPendingLink,
-    hasSource: hasSourceLink,
-    hasDestination: hasDestinationLink
-  },
-  group: {
-    setActiveId: setGroupActiveId,
-    setInitialId: setGroupInitialId,
-    getActiveId: getGroupActiveId,
-    getInitialId: getGroupInitialId
+    setActiveGroupId,
+    getLink,
+    getSource,
+    getDestination,
+    getActiveGroupId,
+    getPair: resolveTransitionPair
   },
   cleanup: {
-    byScreen: clear,
-    byAncestor: clearByAncestor,
-    byBranch: clearByBranch
+    byScreen: clear
   }
 };
 //# sourceMappingURL=index.js.map

package/lib/module/shared/stores/bounds/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["clear","clearByAncestor","clearByBranch","getEntry","removeEntry","setEntry","getGroupActiveId","getGroupInitialId","setGroupActiveId","setGroupInitialId","getMatchedLink","getPendingLink","hasDestinationLink","hasSourceLink","setDestination","setSource","resolveTransitionPair","BoundStore","entry","set","get","remove","link","getMatched","getPair","getPending","hasSource","hasDestination","group","setActiveId","setInitialId","getActiveId","getInitialId","cleanup","byScreen","byAncestor","byBranch"],"sourceRoot":"../../../../../src","sources":["shared/stores/bounds/index.ts"],"mappings":";;AAAA,SAASA,KAAK,EAAEC,eAAe,EAAEC,aAAa,QAAQ,mBAAmB;AACzE,SAASC,QAAQ,EAAEC,WAAW,EAAEC,QAAQ,QAAQ,qBAAqB;AACrE,SACCC,gBAAgB,EAChBC,iBAAiB,EACjBC,gBAAgB,EAChBC,iBAAiB,QACX,oBAAoB;AAC3B,SACCC,cAAc,EACdC,cAAc,EACdC,kBAAkB,EAClBC,aAAa,EACbC,cAAc,EACdC,SAAS,QACH,mBAAmB;AAC1B,SAASC,qBAAqB,QAAQ,sBAAsB;AAc5D,OAAO,MAAMC,UAAU,GAAG;EACzBC,KAAK,EAAE;IACNC,GAAG,EAAEd,QAAQ;IACbe,GAAG,EAAEjB,QAAQ;IACbkB,MAAM,EAAEjB;EACT,CAAC;EACDkB,IAAI,EAAE;IACLP,SAAS;IACTD,cAAc;IACdS,UAAU,EAAEb,cAAc;IAC1Bc,OAAO,EAAER,qBAAqB;IAC9BS,UAAU,EAAEd,cAAc;IAC1Be,SAAS,EAAEb,aAAa;IACxBc,cAAc,EAAEf;EACjB,CAAC;EACDgB,KAAK,EAAE;IACNC,WAAW,EAAErB,gBAAgB;IAC7BsB,YAAY,EAAErB,iBAAiB;IAC/BsB,WAAW,EAAEzB,gBAAgB;IAC7B0B,YAAY,EAAEzB;EACf,CAAC;EACD0B,OAAO,EAAE;IACRC,QAAQ,EAAElC,KAAK;IACfmC,UAAU,EAAElC,eAAe;IAC3BmC,QAAQ,EAAElC;EACX;AACD,CAAC","ignoreList":[]}
+{"version":3,"names":["clear","getEntry","removeEntry","setEntry","getActiveGroupId","getDestination","getLink","getSource","setActiveGroupId","setDestination","setSource","resolveTransitionPair","BoundStore","entry","set","get","remove","link","getPair","cleanup","byScreen"],"sourceRoot":"../../../../../src","sources":["shared/stores/bounds/index.ts"],"mappings":";;AAAA,SAASA,KAAK,QAAQ,mBAAmB;AACzC,SAASC,QAAQ,EAAEC,WAAW,EAAEC,QAAQ,QAAQ,qBAAqB;AACrE,SACCC,gBAAgB,EAChBC,cAAc,EACdC,OAAO,EACPC,SAAS,EACTC,gBAAgB,EAChBC,cAAc,EACdC,SAAS,QACH,mBAAmB;AAC1B,SAASC,qBAAqB,QAAQ,sBAAsB;AAc5D,OAAO,MAAMC,UAAU,GAAG;EACzBC,KAAK,EAAE;IACNC,GAAG,EAAEX,QAAQ;IACbY,GAAG,EAAEd,QAAQ;IACbe,MAAM,EAAEd;EACT,CAAC;EACDe,IAAI,EAAE;IACLP,SAAS;IACTD,cAAc;IACdD,gBAAgB;IAChBF,OAAO;IACPC,SAAS;IACTF,cAAc;IACdD,gBAAgB;IAChBc,OAAO,EAAEP;EACV,CAAC;EACDQ,OAAO,EAAE;IACRC,QAAQ,EAAEpB;EACX;AACD,CAAC","ignoreList":[]}

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

@@ -1,60 +1,33 @@
 "use strict";
 
 import { hasAnyKeys } from "../helpers/keys";
-import { matchesNavigatorKey, matchesScreenKey } from "../helpers/matching";
-import { registry } from "./state";
-const clearRegistry = (shouldClearScreen, shouldClearLink) => {
+import { isScreenPairKeyForScreen } from "../helpers/link-pairs.helpers";
+import { boundaryRegistry, pairs } from "./state";
+function clear(screenKey) {
   "worklet";
 
-  registry.modify(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 (!hasAnyKeys(tagState.screens) && tagState.linkStack.length === 0) {
+      delete tagState.screens[screenKey];
+      if (!hasAnyKeys(tagState.screens)) {
         delete state[tag];
       }
     }
     return state;
   });
-};
-function clear(screenKey) {
-  "worklet";
-
-  clearRegistry(entryScreenKey => entryScreenKey === screenKey, link => {
-    return matchesScreenKey(link.source, screenKey) || matchesScreenKey(link.destination, screenKey);
-  });
-}
-function clearByAncestor(ancestorKey) {
-  "worklet";
-
-  clearRegistry((entryScreenKey, screenEntry) => {
-    return entryScreenKey === ancestorKey || (screenEntry.ancestorKeys?.includes(ancestorKey) ?? false);
-  }, link => {
-    return matchesScreenKey(link.source, ancestorKey) || matchesScreenKey(link.destination, ancestorKey);
-  });
-}
-function clearByBranch(branchNavigatorKey) {
-  "worklet";
+  pairs.modify(state => {
+    "worklet";
 
-  if (!branchNavigatorKey) return;
-  clearRegistry((_entryScreenKey, screenEntry) => {
-    return screenEntry.navigatorKey === branchNavigatorKey || (screenEntry.ancestorNavigatorKeys?.includes(branchNavigatorKey) ?? false);
-  }, link => {
-    return matchesNavigatorKey(link.source, branchNavigatorKey) || matchesNavigatorKey(link.destination, branchNavigatorKey);
+    for (const pairKey in state) {
+      if (isScreenPairKeyForScreen(pairKey, screenKey)) {
+        delete state[pairKey];
+      }
+    }
+    return state;
   });
 }
-export { clear, clearByAncestor, clearByBranch };
+export { clear };
 //# sourceMappingURL=clear.js.map

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

@@ -1 +1 @@
-{"version":3,"names":["hasAnyKeys","matchesNavigatorKey","matchesScreenKey","registry","clearRegistry","shouldClearScreen","shouldClearLink","modify","state","tag","tagState","entryScreenKey","screens","screenEntry","i","linkStack","length","link","splice","clear","screenKey","source","destination","clearByAncestor","ancestorKey","ancestorKeys","includes","clearByBranch","branchNavigatorKey","_entryScreenKey","navigatorKey","ancestorNavigatorKeys"],"sourceRoot":"../../../../../../src","sources":["shared/stores/bounds/internals/clear.ts"],"mappings":";;AAAA,SAASA,UAAU,QAAQ,iBAAiB;AAC5C,SAASC,mBAAmB,EAAEC,gBAAgB,QAAQ,qBAAqB;AAE3E,SAA6BC,QAAQ,QAAQ,SAAS;AAStD,MAAMC,aAAa,GAAGA,CACrBC,iBAAkC,EAClCC,eAA8B,KAC1B;EACJ,SAAS;;EACTH,QAAQ,CAACI,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,IAAIN,iBAAiB,CAACM,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,IAAIR,eAAe,CAACW,IAAI,CAAC,EAAE;UAC1BP,QAAQ,CAACK,SAAS,CAACG,MAAM,CAACJ,CAAC,EAAE,CAAC,CAAC;QAChC;MACD;MAEA,IAAI,CAACd,UAAU,CAACU,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,SAASW,KAAKA,CAACC,SAAoB,EAAE;EACpC,SAAS;;EACThB,aAAa,CACXO,cAAc,IAAKA,cAAc,KAAKS,SAAS,EAC/CH,IAAI,IAAK;IACT,OACCf,gBAAgB,CAACe,IAAI,CAACI,MAAM,EAAED,SAAS,CAAC,IACxClB,gBAAgB,CAACe,IAAI,CAACK,WAAW,EAAEF,SAAS,CAAC;EAE/C,CACD,CAAC;AACF;AAEA,SAASG,eAAeA,CAACC,WAAsB,EAAE;EAChD,SAAS;;EACTpB,aAAa,CACZ,CAACO,cAAc,EAAEE,WAAW,KAAK;IAChC,OACCF,cAAc,KAAKa,WAAW,KAC7BX,WAAW,CAACY,YAAY,EAAEC,QAAQ,CAACF,WAAW,CAAC,IAAI,KAAK,CAAC;EAE5D,CAAC,EACAP,IAAI,IAAK;IACT,OACCf,gBAAgB,CAACe,IAAI,CAACI,MAAM,EAAEG,WAAW,CAAC,IAC1CtB,gBAAgB,CAACe,IAAI,CAACK,WAAW,EAAEE,WAAW,CAAC;EAEjD,CACD,CAAC;AACF;AAEA,SAASG,aAAaA,CAACC,kBAAgC,EAAE;EACxD,SAAS;;EACT,IAAI,CAACA,kBAAkB,EAAE;EAEzBxB,aAAa,CACZ,CAACyB,eAAe,EAAEhB,WAAW,KAAK;IACjC,OACCA,WAAW,CAACiB,YAAY,KAAKF,kBAAkB,KAC9Cf,WAAW,CAACkB,qBAAqB,EAAEL,QAAQ,CAACE,kBAAkB,CAAC,IAC/D,KAAK,CAAC;EAET,CAAC,EACAX,IAAI,IAAK;IACT,OACChB,mBAAmB,CAACgB,IAAI,CAACI,MAAM,EAAEO,kBAAkB,CAAC,IACpD3B,mBAAmB,CAACgB,IAAI,CAACK,WAAW,EAAEM,kBAAkB,CAAC;EAE3D,CACD,CAAC;AACF;AAEA,SAAST,KAAK,EAAEI,eAAe,EAAEI,aAAa","ignoreList":[]}
+{"version":3,"names":["hasAnyKeys","isScreenPairKeyForScreen","boundaryRegistry","pairs","clear","screenKey","modify","state","tag","tagState","screens","pairKey"],"sourceRoot":"../../../../../../src","sources":["shared/stores/bounds/internals/clear.ts"],"mappings":";;AAAA,SAASA,UAAU,QAAQ,iBAAiB;AAC5C,SAASC,wBAAwB,QAAQ,+BAA+B;AAExE,SAAoCC,gBAAgB,EAAEC,KAAK,QAAQ,SAAS;AAE5E,SAASC,KAAKA,CAACC,SAAoB,EAAE;EACpC,SAAS;;EAETH,gBAAgB,CAACI,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,CAACL,SAAS,CAAC;MAElC,IAAI,CAACL,UAAU,CAACS,QAAQ,CAACC,OAAO,CAAC,EAAE;QAClC,OAAOH,KAAK,CAACC,GAAG,CAAC;MAClB;IACD;IAEA,OAAOD,KAAK;EACb,CAAC,CAAC;EAEFJ,KAAK,CAACG,MAAM,CAA4BC,KAAQ,IAAQ;IACvD,SAAS;;IACT,KAAK,MAAMI,OAAO,IAAIJ,KAAK,EAAE;MAC5B,IAAIN,wBAAwB,CAACU,OAAO,EAAEN,SAAS,CAAC,EAAE;QACjD,OAAOE,KAAK,CAACI,OAAO,CAAC;MACtB;IACD;IAEA,OAAOJ,KAAK;EACb,CAAC,CAAC;AACH;AAEA,SAASH,KAAK","ignoreList":[]}

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

@@ -1,21 +1,59 @@
 "use strict";
 
-import { applyEntryPatch, ensureScreenEntry, findMatchingScreenEntry } from "../helpers/entries.helpers";
-import { ensureTagState, pruneTagState } from "../helpers/tag-state.helpers";
-import { registry } from "./state";
+import { hasAnyKeys } from "../helpers/keys";
+import { boundaryRegistry } from "./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 findMatchingScreenEntry(registry.get()[tag], key);
+  return boundaryRegistry.get()[tag]?.screens[key] ?? null;
 }
 function setEntry(tag, screenKey, patch) {
   "worklet";
 
-  registry.modify(state => {
+  boundaryRegistry.modify(state => {
     "worklet";
 
-    const tagState = ensureTagState(state, tag);
-    const entry = ensureScreenEntry(tagState, screenKey);
+    const entry = ensureScreenEntry(state, tag, screenKey);
     applyEntryPatch(entry, patch);
     return state;
   });
@@ -23,7 +61,7 @@ function setEntry(tag, screenKey, patch) {
 function removeEntry(tag, screenKey) {
   "worklet";
 
-  registry.modify(state => {
+  boundaryRegistry.modify(state => {
     "worklet";
 
     const tagState = state[tag];
@@ -31,7 +69,9 @@ function removeEntry(tag, screenKey) {
       return state;
     }
     delete tagState.screens[screenKey];
-    pruneTagState(state, tag);
+    if (!hasAnyKeys(tagState.screens)) {
+      delete state[tag];
+    }
     return state;
   });
 }

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

@@ -1 +1 @@
-{"version":3,"names":["applyEntryPatch","ensureScreenEntry","findMatchingScreenEntry","ensureTagState","pruneTagState","registry","getEntry","tag","key","get","setEntry","screenKey","patch","modify","state","tagState","entry","removeEntry","screens"],"sourceRoot":"../../../../../../src","sources":["shared/stores/bounds/internals/entries.ts"],"mappings":";;AAAA,SACCA,eAAe,EACfC,iBAAiB,EACjBC,uBAAuB,QACjB,4BAA4B;AACnC,SAASC,cAAc,EAAEC,aAAa,QAAQ,8BAA8B;AAE5E,SAA6BC,QAAQ,QAAQ,SAAS;AAEtD,SAASC,QAAQA,CAACC,GAAU,EAAEC,GAAc,EAAsB;EACjE,SAAS;;EACT,OAAON,uBAAuB,CAACG,QAAQ,CAACI,GAAG,CAAC,CAAC,CAACF,GAAG,CAAC,EAAEC,GAAG,CAAC;AACzD;AAEA,SAASE,QAAQA,CAACH,GAAU,EAAEI,SAAoB,EAAEC,KAAiB,EAAE;EACtE,SAAS;;EACTP,QAAQ,CAACQ,MAAM,CAA2BC,KAAQ,IAAQ;IACzD,SAAS;;IACT,MAAMC,QAAQ,GAAGZ,cAAc,CAACW,KAAK,EAAEP,GAAG,CAAC;IAC3C,MAAMS,KAAK,GAAGf,iBAAiB,CAACc,QAAQ,EAAEJ,SAAS,CAAC;IACpDX,eAAe,CAACgB,KAAK,EAAEJ,KAAK,CAAC;IAC7B,OAAOE,KAAK;EACb,CAAC,CAAC;AACH;AAEA,SAASG,WAAWA,CAACV,GAAU,EAAEI,SAAoB,EAAE;EACtD,SAAS;;EACTN,QAAQ,CAACQ,MAAM,CAA2BC,KAAQ,IAAQ;IACzD,SAAS;;IACT,MAAMC,QAAQ,GAAGD,KAAK,CAACP,GAAG,CAAC;IAC3B,IAAI,CAACQ,QAAQ,EAAEG,OAAO,CAACP,SAAS,CAAC,EAAE;MAClC,OAAOG,KAAK;IACb;IAEA,OAAOC,QAAQ,CAACG,OAAO,CAACP,SAAS,CAAC;IAClCP,aAAa,CAACU,KAAK,EAAEP,GAAG,CAAC;IAEzB,OAAOO,KAAK;EACb,CAAC,CAAC;AACH;AAEA,SAASR,QAAQ,EAAEW,WAAW,EAAEP,QAAQ","ignoreList":[]}
+{"version":3,"names":["hasAnyKeys","boundaryRegistry","ensureBoundaryState","state","tag","screens","ensureScreenEntry","screenKey","tagState","bounds","styles","applyEntryPatch","entry","patch","undefined","boundaryConfig","getEntry","key","get","setEntry","modify","removeEntry"],"sourceRoot":"../../../../../../src","sources":["shared/stores/bounds/internals/entries.ts"],"mappings":";;AAAA,SAASA,UAAU,QAAQ,iBAAiB;AAE5C,SAAoCC,gBAAgB,QAAQ,SAAS;AAErE,MAAMC,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,OAAOhB,gBAAgB,CAACiB,GAAG,CAAC,CAAC,CAACd,GAAG,CAAC,EAAEC,OAAO,CAACY,GAAG,CAAC,IAAI,IAAI;AACzD;AAEA,SAASE,QAAQA,CAACf,GAAU,EAAEG,SAAoB,EAAEM,KAAiB,EAAE;EACtE,SAAS;;EACTZ,gBAAgB,CAACmB,MAAM,CAAkCjB,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,SAASkB,WAAWA,CAACjB,GAAU,EAAEG,SAAoB,EAAE;EACtD,SAAS;;EACTN,gBAAgB,CAACmB,MAAM,CAAkCjB,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,CAACP,UAAU,CAACQ,QAAQ,CAACH,OAAO,CAAC,EAAE;MAClC,OAAOF,KAAK,CAACC,GAAG,CAAC;IAClB;IAEA,OAAOD,KAAK;EACb,CAAC,CAAC;AACH;AAEA,SAASa,QAAQ,EAAEK,WAAW,EAAEF,QAAQ","ignoreList":[]}

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

@@ -1,118 +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 = {}, ancestorKeys, navigatorKey, ancestorNavigatorKeys) {
+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,
-      ancestorKeys,
-      navigatorKey,
-      ancestorNavigatorKeys,
-      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 = {}, ancestorKeys, expectedSourceScreenKey, navigatorKey, ancestorNavigatorKeys) {
+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,
-      ancestorKeys,
-      navigatorKey,
-      ancestorNavigatorKeys,
-      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