react-native-screen-transitions 3.12.0 → 3.13.0-beta.1

package/lib/module/shared/providers/screen/animation/helpers/read-screen-animation-revisions.js

@@ -1,20 +1,11 @@
 "use strict";
 
-export const readScreenAnimationRevisions = (screenInterpolatorPropsRevision, ancestorScreenAnimationSources, descendantScreenAnimationSources, screenInterpolatorExternalDeps) => {
+export const readScreenAnimationRevisions = (sources, externalRevisions = []) => {
   "worklet";
 
-  screenInterpolatorPropsRevision.get();
-  for (let index = 0; index < ancestorScreenAnimationSources.length; index++) {
-    ancestorScreenAnimationSources[index]?.screenInterpolatorPropsRevision.get();
-  }
-  const descendantSources = descendantScreenAnimationSources.get();
-  for (let index = 0; index < descendantSources.length; index++) {
-    descendantSources[index]?.source.screenInterpolatorPropsRevision.get();
-  }
-  if (screenInterpolatorExternalDeps) {
-    for (let index = 0; index < screenInterpolatorExternalDeps.length; index++) {
-      screenInterpolatorExternalDeps[index]?.get();
-    }
+  for (const source of sources) {
+    source.screenInterpolatorPropsRevision.get();
   }
+  for (const revision of externalRevisions) revision.get();
 };
 //# sourceMappingURL=read-screen-animation-revisions.js.map

package/lib/module/shared/providers/screen/animation/helpers/read-screen-animation-revisions.js.map

@@ -1 +1 @@
-{"version":3,"names":["readScreenAnimationRevisions","screenInterpolatorPropsRevision","ancestorScreenAnimationSources","descendantScreenAnimationSources","screenInterpolatorExternalDeps","get","index","length","descendantSources","source"],"sourceRoot":"../../../../../../../src","sources":["shared/providers/screen/animation/helpers/read-screen-animation-revisions.ts"],"mappings":";;AASA,OAAO,MAAMA,4BAA4B,GAAGA,CAC3CC,+BAAgE,EAChEC,8BAAuD,EACvDC,gCAAkE,EAClEC,8BAA+D,KAC3D;EACJ,SAAS;;EACTH,+BAA+B,CAACI,GAAG,CAAC,CAAC;EAErC,KAAK,IAAIC,KAAK,GAAG,CAAC,EAAEA,KAAK,GAAGJ,8BAA8B,CAACK,MAAM,EAAED,KAAK,EAAE,EAAE;IAC3EJ,8BAA8B,CAC7BI,KAAK,CACL,EAAEL,+BAA+B,CAACI,GAAG,CAAC,CAAC;EACzC;EAEA,MAAMG,iBAAiB,GAAGL,gCAAgC,CAACE,GAAG,CAAC,CAAC;EAChE,KAAK,IAAIC,KAAK,GAAG,CAAC,EAAEA,KAAK,GAAGE,iBAAiB,CAACD,MAAM,EAAED,KAAK,EAAE,EAAE;IAC9DE,iBAAiB,CAACF,KAAK,CAAC,EAAEG,MAAM,CAACR,+BAA+B,CAACI,GAAG,CAAC,CAAC;EACvE;EAEA,IAAID,8BAA8B,EAAE;IACnC,KACC,IAAIE,KAAK,GAAG,CAAC,EACbA,KAAK,GAAGF,8BAA8B,CAACG,MAAM,EAC7CD,KAAK,EAAE,EACN;MACDF,8BAA8B,CAACE,KAAK,CAAC,EAAED,GAAG,CAAC,CAAC;IAC7C;EACD;AACD,CAAC","ignoreList":[]}
+{"version":3,"names":["readScreenAnimationRevisions","sources","externalRevisions","source","screenInterpolatorPropsRevision","get","revision"],"sourceRoot":"../../../../../../../src","sources":["shared/providers/screen/animation/helpers/read-screen-animation-revisions.ts"],"mappings":";;AAKA,OAAO,MAAMA,4BAA4B,GAAGA,CAC3CC,OAAmD,EACnDC,iBAAiD,GAAG,EAAE,KAClD;EACJ,SAAS;;EACT,KAAK,MAAMC,MAAM,IAAIF,OAAO,EAAE;IAC7BE,MAAM,CAACC,+BAA+B,CAACC,GAAG,CAAC,CAAC;EAC7C;EACA,KAAK,MAAMC,QAAQ,IAAIJ,iBAAiB,EAAEI,QAAQ,CAACD,GAAG,CAAC,CAAC;AACzD,CAAC","ignoreList":[]}

package/lib/module/shared/providers/screen/animation/helpers/stack-progress.js

@@ -1,30 +1,15 @@
 "use strict";
 
-export const syncStackProgressValues = (visualProgressValues, stackProgressValues) => {
+export const readStackProgress = (entries, routeKey, fallbackProgress) => {
   "worklet";
 
-  let total = 0;
-  for (let i = visualProgressValues.length - 1; i >= 0; i--) {
-    total += visualProgressValues[i]?.get() ?? 0;
-    const stackProgress = stackProgressValues[i];
-    if (stackProgress && stackProgress.get() !== total) {
-      stackProgress.set(total);
-    }
-  }
-};
-export const resolveStackProgress = (stackProgress, fallbackProgress, currentProgress, previousCurrentProgress, nextProgress, previousNextProgress) => {
-  "worklet";
-
-  if (!stackProgress) {
-    return fallbackProgress;
-  }
-  let total = stackProgress.get();
-  if (previousCurrentProgress !== undefined) {
-    total += currentProgress - previousCurrentProgress;
-  }
-  if (nextProgress !== undefined && previousNextProgress !== undefined) {
-    total += nextProgress - previousNextProgress;
-  }
-  return total;
+  let progress = 0;
+  for (let index = entries.length - 1; index >= 0; index--) {
+    const entry = entries[index];
+    if (!entry) continue;
+    progress += entry.visualProgress.get();
+    if (entry.routeKey === routeKey) return progress;
+  }
+  return fallbackProgress;
 };
 //# sourceMappingURL=stack-progress.js.map

package/lib/module/shared/providers/screen/animation/helpers/stack-progress.js.map

@@ -1 +1 @@
-{"version":3,"names":["syncStackProgressValues","visualProgressValues","stackProgressValues","total","i","length","get","stackProgress","set","resolveStackProgress","fallbackProgress","currentProgress","previousCurrentProgress","nextProgress","previousNextProgress","undefined"],"sourceRoot":"../../../../../../../src","sources":["shared/providers/screen/animation/helpers/stack-progress.ts"],"mappings":";;AAEA,OAAO,MAAMA,uBAAuB,GAAGA,CACtCC,oBAA2C,EAC3CC,mBAA0C,KACtC;EACJ,SAAS;;EACT,IAAIC,KAAK,GAAG,CAAC;EAEb,KAAK,IAAIC,CAAC,GAAGH,oBAAoB,CAACI,MAAM,GAAG,CAAC,EAAED,CAAC,IAAI,CAAC,EAAEA,CAAC,EAAE,EAAE;IAC1DD,KAAK,IAAIF,oBAAoB,CAACG,CAAC,CAAC,EAAEE,GAAG,CAAC,CAAC,IAAI,CAAC;IAC5C,MAAMC,aAAa,GAAGL,mBAAmB,CAACE,CAAC,CAAC;IAE5C,IAAIG,aAAa,IAAIA,aAAa,CAACD,GAAG,CAAC,CAAC,KAAKH,KAAK,EAAE;MACnDI,aAAa,CAACC,GAAG,CAACL,KAAK,CAAC;IACzB;EACD;AACD,CAAC;AAED,OAAO,MAAMM,oBAAoB,GAAGA,CACnCF,aAA8C,EAC9CG,gBAAwB,EACxBC,eAAuB,EACvBC,uBAA2C,EAC3CC,YAAgC,EAChCC,oBAAwC,KACpC;EACJ,SAAS;;EACT,IAAI,CAACP,aAAa,EAAE;IACnB,OAAOG,gBAAgB;EACxB;EAEA,IAAIP,KAAK,GAAGI,aAAa,CAACD,GAAG,CAAC,CAAC;EAE/B,IAAIM,uBAAuB,KAAKG,SAAS,EAAE;IAC1CZ,KAAK,IAAIQ,eAAe,GAAGC,uBAAuB;EACnD;EAEA,IAAIC,YAAY,KAAKE,SAAS,IAAID,oBAAoB,KAAKC,SAAS,EAAE;IACrEZ,KAAK,IAAIU,YAAY,GAAGC,oBAAoB;EAC7C;EAEA,OAAOX,KAAK;AACb,CAAC","ignoreList":[]}
+{"version":3,"names":["readStackProgress","entries","routeKey","fallbackProgress","progress","index","length","entry","visualProgress","get"],"sourceRoot":"../../../../../../../src","sources":["shared/providers/screen/animation/helpers/stack-progress.ts"],"mappings":";;AAOA,OAAO,MAAMA,iBAAiB,GAAGA,CAChCC,OAAsC,EACtCC,QAAgB,EAChBC,gBAAwB,KACpB;EACJ,SAAS;;EACT,IAAIC,QAAQ,GAAG,CAAC;EAEhB,KAAK,IAAIC,KAAK,GAAGJ,OAAO,CAACK,MAAM,GAAG,CAAC,EAAED,KAAK,IAAI,CAAC,EAAEA,KAAK,EAAE,EAAE;IACzD,MAAME,KAAK,GAAGN,OAAO,CAACI,KAAK,CAAC;IAC5B,IAAI,CAACE,KAAK,EAAE;IAEZH,QAAQ,IAAIG,KAAK,CAACC,cAAc,CAACC,GAAG,CAAC,CAAC;IACtC,IAAIF,KAAK,CAACL,QAAQ,KAAKA,QAAQ,EAAE,OAAOE,QAAQ;EACjD;EAEA,OAAOD,gBAAgB;AACxB,CAAC","ignoreList":[]}

package/lib/module/shared/providers/screen/animation/helpers/use-build-transition-state.js

@@ -22,7 +22,6 @@ export const useBuildTransitionState = descriptor => {
     return {
       transitionProgress: AnimationStore.getValue(key, "transitionProgress"),
       visualProgress: AnimationStore.getValue(key, "visualProgress"),
-      stackProgress: AnimationStore.getValue(key, "stackProgress"),
       willAnimate: AnimationStore.getValue(key, "willAnimate"),
       closing: AnimationStore.getValue(key, "closing"),
       entering: AnimationStore.getValue(key, "entering"),

package/lib/module/shared/providers/screen/animation/helpers/use-build-transition-state.js.map

@@ -1 +1 @@
-{"version":3,"names":["useMemo","createScreenTransitionState","AnimationStore","GestureStore","ScrollStore","SystemStore","buildScreenTransitionOptions","toPlainRoute","toPlainValue","useBuildTransitionState","descriptor","key","route","meta","options","snapPoints","undefined","plainRoute","plainMeta","sortedNumericSnapPoints","filter","p","sort","a","b","transitionOptions","transitionProgress","getValue","visualProgress","stackProgress","willAnimate","closing","entering","progressAnimating","progressSettled","targetProgress","resolvedAutoSnapPoint","measuredContentLayout","scrollMetadata","contentLayoutSlot","width","height","hasAutoSnapPoint","includes","gesture","getBag","optionsSlot","unwrapped"],"sourceRoot":"../../../../../../../src","sources":["shared/providers/screen/animation/helpers/use-build-transition-state.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["useMemo","createScreenTransitionState","AnimationStore","GestureStore","ScrollStore","SystemStore","buildScreenTransitionOptions","toPlainRoute","toPlainValue","useBuildTransitionState","descriptor","key","route","meta","options","snapPoints","undefined","plainRoute","plainMeta","sortedNumericSnapPoints","filter","p","sort","a","b","transitionOptions","transitionProgress","getValue","visualProgress","willAnimate","closing","entering","progressAnimating","progressSettled","targetProgress","resolvedAutoSnapPoint","measuredContentLayout","scrollMetadata","contentLayoutSlot","width","height","hasAutoSnapPoint","includes","gesture","getBag","optionsSlot","unwrapped"],"sourceRoot":"../../../../../../../src","sources":["shared/providers/screen/animation/helpers/use-build-transition-state.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/shared/providers/screen/animation/index.js

@@ -1,5 +1,5 @@
 "use strict";
 
-export { ScreenAnimationProvider, useScreenAnimationStore } from "./animation.provider";
+export { ScreenAnimationProvider, useOptionalScreenAnimationStore, useScreenAnimationStore } from "./animation.provider";
 export { useScreenAnimation } from "./use-screen-animation";
 //# sourceMappingURL=index.js.map

package/lib/module/shared/providers/screen/animation/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["ScreenAnimationProvider","useScreenAnimationStore","useScreenAnimation"],"sourceRoot":"../../../../../../src","sources":["shared/providers/screen/animation/index.tsx"],"mappings":";;AAAA,SACCA,uBAAuB,EACvBC,uBAAuB,QACjB,sBAAsB;AAC7B,SAECC,kBAAkB,QACZ,wBAAwB","ignoreList":[]}
+{"version":3,"names":["ScreenAnimationProvider","useOptionalScreenAnimationStore","useScreenAnimationStore","useScreenAnimation"],"sourceRoot":"../../../../../../src","sources":["shared/providers/screen/animation/index.tsx"],"mappings":";;AAAA,SACCA,uBAAuB,EACvBC,+BAA+B,EAC/BC,uBAAuB,QACjB,sBAAsB;AAC7B,SAECC,kBAAkB,QACZ,wBAAwB","ignoreList":[]}

package/lib/module/shared/providers/screen/animation/use-screen-animation.js

@@ -2,7 +2,7 @@
 
 import { useRoute } from "@react-navigation/native";
 import { useDerivedValue } from "react-native-reanimated";
-import { useScreenAnimationStore } from "./animation.provider";
+import { useOptionalScreenAnimationStore } from "./animation.provider";
 import { useBuildTransitionAccessor } from "./helpers/accessors/use-build-transition-accessor";
 import { readScreenAnimationRevisions } from "./helpers/read-screen-animation-revisions";
 
@@ -12,21 +12,22 @@ import { readScreenAnimationRevisions } from "./helpers/read-screen-animation-re
 
 export function useScreenAnimation(target) {
   const route = useRoute();
-  const screenAnimationStore = useScreenAnimationStore(route.key);
+  const localAnimationStore = useOptionalScreenAnimationStore();
+  const keyedAnimationStore = useOptionalScreenAnimationStore(localAnimationStore ? null : route.key);
+  const screenAnimationStore = localAnimationStore ?? keyedAnimationStore;
   if (!screenAnimationStore) {
-    throw new Error(`ScreenAnimation store for route "${route.key}" was not found`);
+    throw new Error(`ScreenAnimationStore is unavailable for route "${route.key}"`);
   }
   const {
-    screenInterpolatorPropsRevision,
-    ancestorScreenAnimationSources,
-    descendantScreenAnimationSources
+    transitionSources,
+    transitionOriginIndex
   } = screenAnimationStore;
   const transition = useBuildTransitionAccessor(screenAnimationStore);
-  const transitionTarget = normalizeScreenAnimationTarget(target, ancestorScreenAnimationSources.length);
+  const transitionTarget = normalizeScreenAnimationTarget(target, transitionOriginIndex);
   const animation = useDerivedValue(() => {
     "worklet";
 
-    readScreenAnimationRevisions(screenInterpolatorPropsRevision, ancestorScreenAnimationSources, descendantScreenAnimationSources);
+    readScreenAnimationRevisions(transitionSources);
     return transition(transitionTarget);
   });
   return animation;

package/lib/module/shared/providers/screen/animation/use-screen-animation.js.map

@@ -1 +1 @@
-{"version":3,"names":["useRoute","useDerivedValue","useScreenAnimationStore","useBuildTransitionAccessor","readScreenAnimationRevisions","useScreenAnimation","target","route","screenAnimationStore","key","Error","screenInterpolatorPropsRevision","ancestorScreenAnimationSources","descendantScreenAnimationSources","transition","transitionTarget","normalizeScreenAnimationTarget","length","animation","isTransitionTarget","ancestorCount","undefined","depth","Number","isInteger","ancestor","NaN"],"sourceRoot":"../../../../../../src","sources":["shared/providers/screen/animation/use-screen-animation.tsx"],"mappings":";;AAAA,SAASA,QAAQ,QAAQ,0BAA0B;AACnD,SAA4BC,eAAe,QAAQ,yBAAyB;AAK5E,SAASC,uBAAuB,QAAQ,sBAAsB;AAC9D,SAASC,0BAA0B,QAAQ,mDAAmD;AAC9F,SAASC,4BAA4B,QAAQ,2CAA2C;;AAYxF;;AAOA;;AAIA,OAAO,SAASC,kBAAkBA,CACjCC,MAA8B,EAGkB;EAChD,MAAMC,KAAK,GAAGP,QAAQ,CAAC,CAAC;EACxB,MAAMQ,oBAAoB,GAAGN,uBAAuB,CAACK,KAAK,CAACE,GAAG,CAAC;EAE/D,IAAI,CAACD,oBAAoB,EAAE;IAC1B,MAAM,IAAIE,KAAK,CACd,oCAAoCH,KAAK,CAACE,GAAG,iBAC9C,CAAC;EACF;EAEA,MAAM;IACLE,+BAA+B;IAC/BC,8BAA8B;IAC9BC;EACD,CAAC,GAAGL,oBAAoB;EACxB,MAAMM,UAAU,GAAGX,0BAA0B,CAACK,oBAAoB,CAAC;EACnE,MAAMO,gBAAgB,GAAGC,8BAA8B,CACtDV,MAAM,EACNM,8BAA8B,CAACK,MAChC,CAAC;EAED,MAAMC,SAAS,GAAGjB,eAAe,CAAkC,MAAM;IACxE,SAAS;;IACTG,4BAA4B,CAC3BO,+BAA+B,EAC/BC,8BAA8B,EAC9BC,gCACD,CAAC;IACD,OAAOC,UAAU,CAACC,gBAAgB,CAAC;EACpC,CAAC,CAAC;EAEF,OAAOG,SAAS;AACjB;AAEA,MAAMC,kBAAkB,GACvBb,MAA6B,IACS;EACtC,OAAO,OAAOA,MAAM,KAAK,QAAQ,IAAIA,MAAM,KAAK,IAAI,IAAI,OAAO,IAAIA,MAAM;AAC1E,CAAC;AAED,MAAMU,8BAA8B,GAAGA,CACtCV,MAAyC,EACzCc,aAAqB,KACmB;EACxC,IAAId,MAAM,KAAKe,SAAS,IAAIF,kBAAkB,CAACb,MAAM,CAAC,EAAE;IACvD,OAAOA,MAAM;EACd;EAEA,IAAIA,MAAM,KAAK,MAAM,EAAE;IACtB,OAAO;MAAEgB,KAAK,EAAE;IAAE,CAAC;EACpB;EAEA,IAAIhB,MAAM,KAAK,QAAQ,EAAE;IACxB,OAAO;MAAEgB,KAAK,EAAE,CAAC;IAAE,CAAC;EACrB;EAEA,IAAIhB,MAAM,KAAK,MAAM,EAAE;IACtB,OAAO;MAAEgB,KAAK,EAAEF,aAAa,GAAG,CAAC,GAAG,CAACA,aAAa,GAAG,CAAC;IAAE,CAAC;EAC1D;EAEA,IAAI,CAACG,MAAM,CAACC,SAAS,CAAClB,MAAM,CAACmB,QAAQ,CAAC,IAAInB,MAAM,CAACmB,QAAQ,GAAG,CAAC,EAAE;IAC9D,OAAO;MAAEH,KAAK,EAAEC,MAAM,CAACG;IAAI,CAAC;EAC7B;EAEA,OAAO;IAAEJ,KAAK,EAAE,CAAChB,MAAM,CAACmB;EAAS,CAAC;AACnC,CAAC","ignoreList":[]}
+{"version":3,"names":["useRoute","useDerivedValue","useOptionalScreenAnimationStore","useBuildTransitionAccessor","readScreenAnimationRevisions","useScreenAnimation","target","route","localAnimationStore","keyedAnimationStore","key","screenAnimationStore","Error","transitionSources","transitionOriginIndex","transition","transitionTarget","normalizeScreenAnimationTarget","animation","isTransitionTarget","ancestorCount","undefined","depth","Number","isInteger","ancestor","NaN"],"sourceRoot":"../../../../../../src","sources":["shared/providers/screen/animation/use-screen-animation.tsx"],"mappings":";;AAAA,SAASA,QAAQ,QAAQ,0BAA0B;AACnD,SAA4BC,eAAe,QAAQ,yBAAyB;AAK5E,SAASC,+BAA+B,QAAQ,sBAAsB;AACtE,SAASC,0BAA0B,QAAQ,mDAAmD;AAC9F,SAASC,4BAA4B,QAAQ,2CAA2C;;AAYxF;;AAOA;;AAIA,OAAO,SAASC,kBAAkBA,CACjCC,MAA8B,EAGkB;EAChD,MAAMC,KAAK,GAAGP,QAAQ,CAAC,CAAC;EACxB,MAAMQ,mBAAmB,GAAGN,+BAA+B,CAAC,CAAC;EAC7D,MAAMO,mBAAmB,GAAGP,+BAA+B,CAC1DM,mBAAmB,GAAG,IAAI,GAAGD,KAAK,CAACG,GACpC,CAAC;EACD,MAAMC,oBAAoB,GAAGH,mBAAmB,IAAIC,mBAAmB;EAEvE,IAAI,CAACE,oBAAoB,EAAE;IAC1B,MAAM,IAAIC,KAAK,CACd,kDAAkDL,KAAK,CAACG,GAAG,GAC5D,CAAC;EACF;EAEA,MAAM;IAAEG,iBAAiB;IAAEC;EAAsB,CAAC,GAAGH,oBAAoB;EACzE,MAAMI,UAAU,GAAGZ,0BAA0B,CAACQ,oBAAoB,CAAC;EACnE,MAAMK,gBAAgB,GAAGC,8BAA8B,CACtDX,MAAM,EACNQ,qBACD,CAAC;EAED,MAAMI,SAAS,GAAGjB,eAAe,CAAkC,MAAM;IACxE,SAAS;;IACTG,4BAA4B,CAACS,iBAAiB,CAAC;IAC/C,OAAOE,UAAU,CAACC,gBAAgB,CAAC;EACpC,CAAC,CAAC;EAEF,OAAOE,SAAS;AACjB;AAEA,MAAMC,kBAAkB,GACvBb,MAA6B,IACS;EACtC,OAAO,OAAOA,MAAM,KAAK,QAAQ,IAAIA,MAAM,KAAK,IAAI,IAAI,OAAO,IAAIA,MAAM;AAC1E,CAAC;AAED,MAAMW,8BAA8B,GAAGA,CACtCX,MAAyC,EACzCc,aAAqB,KACmB;EACxC,IAAId,MAAM,KAAKe,SAAS,IAAIF,kBAAkB,CAACb,MAAM,CAAC,EAAE;IACvD,OAAOA,MAAM;EACd;EAEA,IAAIA,MAAM,KAAK,MAAM,EAAE;IACtB,OAAO;MAAEgB,KAAK,EAAE;IAAE,CAAC;EACpB;EAEA,IAAIhB,MAAM,KAAK,QAAQ,EAAE;IACxB,OAAO;MAAEgB,KAAK,EAAE,CAAC;IAAE,CAAC;EACrB;EAEA,IAAIhB,MAAM,KAAK,MAAM,EAAE;IACtB,OAAO;MAAEgB,KAAK,EAAEF,aAAa,GAAG,CAAC,GAAG,CAACA,aAAa,GAAG,CAAC;IAAE,CAAC;EAC1D;EAEA,IAAI,CAACG,MAAM,CAACC,SAAS,CAAClB,MAAM,CAACmB,QAAQ,CAAC,IAAInB,MAAM,CAACmB,QAAQ,GAAG,CAAC,EAAE;IAC9D,OAAO;MAAEH,KAAK,EAAEC,MAAM,CAACG;IAAI,CAAC;EAC7B;EAEA,OAAO;IAAEJ,KAAK,EAAE,CAAChB,MAAM,CAACmB;EAAS,CAAC;AACnC,CAAC","ignoreList":[]}

package/lib/module/shared/providers/screen/descriptors/descriptors.provider.js

@@ -1,11 +1,15 @@
 "use strict";
 
-import { useMemo } from "react";
+import { useLayoutEffect, useMemo } from "react";
+import { runOnUI } from "react-native-reanimated";
 import { useScreenTransitionsAdapterOptionalContext } from "../../../adapters/with-screen-transitions/context";
-import { useBlankStackStore } from "../../../providers/stack/blank-stack.provider";
+import { screenTopology } from "../../../factories/screen-topology";
+import { useStack } from "../../../hooks/navigation/use-stack";
+import { useOptionalBlankStackStore } from "../../../providers/stack/blank-stack.provider";
+import { registerScreen, unregisterScreen } from "../../../stores/bounds/internals/coordinator";
+import { SystemStore } from "../../../stores/system.store";
 import createProvider from "../../../utils/create-provider";
 import { deriveDescriptorDerivations } from "./helpers/derive-descriptor-derivations";
-import { getAncestorKeys } from "./helpers/get-ancestor-keys";
 
 /**
  * Base descriptor interface - minimal contract for all stack types.
@@ -13,26 +17,36 @@ import { getAncestorKeys } from "./helpers/get-ancestor-keys";
  * tight coupling to React Navigation.
  */
 
-export const {
+const createDescriptorsProvider = createProvider("Descriptors", {
+  global: true
+});
+const {
   DescriptorsProvider,
-  useDescriptorsStore
-} = createProvider("Descriptors", {
-  guarded: true
-})(({
+  useDescriptorsStore,
+  useOptionalDescriptorsStore
+} = createDescriptorsProvider(({
   previous,
   current,
   next,
   routeKey,
   children
 }) => {
-  const blankStackCurrent = useBlankStackStore(store => routeKey ? store?.scenesByKey[routeKey]?.descriptor : undefined);
-  const blankStackPrevious = useBlankStackStore(store => routeKey ? store?.scenesByKey[routeKey]?.previousDescriptor : undefined);
-  const blankStackNext = useBlankStackStore(store => routeKey ? store?.scenesByKey[routeKey]?.nextDescriptor : undefined);
+  const parentScreenKey = useOptionalDescriptorsStore(store => store?.derivations.currentScreenKey);
+  const parentTransitionSourcePairKey = useOptionalDescriptorsStore(store => store?.derivations.transitionSourcePairKey);
+  const parentTransitionDestinationScreenKey = useOptionalDescriptorsStore(store => store?.derivations.transitionDestinationScreenKey);
+  const blankStackCurrent = useOptionalBlankStackStore(store => routeKey ? store?.scenesByKey[routeKey]?.descriptor : undefined);
+  const blankStackPrevious = useOptionalBlankStackStore(store => routeKey ? store?.scenesByKey[routeKey]?.previousDescriptor : undefined);
+  const blankStackNext = useOptionalBlankStackStore(store => routeKey ? store?.scenesByKey[routeKey]?.nextDescriptor : undefined);
   const adapterContext = useScreenTransitionsAdapterOptionalContext();
   const adapterScene = routeKey ? adapterContext?.scenesByKey?.[routeKey] ?? adapterContext?.scenes[adapterContext.routeIndexByKey.get(routeKey) ?? -1] : undefined;
   const resolvedCurrent = current ?? blankStackCurrent ?? adapterScene?.descriptor;
   const resolvedPrevious = previous ?? blankStackPrevious ?? adapterScene?.previousDescriptor;
   const resolvedNext = next ?? blankStackNext ?? adapterScene?.nextDescriptor;
+  const currentScreenKey = current?.route.key ?? routeKey;
+  const isActiveScreen = useStack(store => {
+    const focusedScene = store.scenes[store.focusedIndex];
+    return focusedScene.route.key === currentScreenKey && focusedScene.activity === "active";
+  });
   if (!resolvedCurrent) {
     throw new Error(`Descriptors scene "${routeKey ?? "unknown"}" was not found.`);
   }
@@ -41,14 +55,47 @@ export const {
     current: resolvedCurrent,
     next: resolvedNext
   }), [resolvedPrevious, resolvedCurrent, resolvedNext]);
-  const ancestorKeys = useMemo(() => getAncestorKeys(resolvedCurrent), [resolvedCurrent]);
-  const derivations = useMemo(() => deriveDescriptorDerivations({
-    previous: resolvedPrevious,
-    current: resolvedCurrent,
-    next: resolvedNext,
-    ancestorKeys
-  }), [resolvedPrevious, resolvedCurrent, resolvedNext, ancestorKeys]);
+  const derivations = useMemo(() => {
+    const localDerivations = deriveDescriptorDerivations({
+      previous: resolvedPrevious,
+      current: resolvedCurrent,
+      next: resolvedNext
+    });
+    return {
+      ...localDerivations,
+      transitionSourcePairKey: localDerivations.sourcePairKey ?? parentTransitionSourcePairKey ?? undefined,
+      transitionDestinationScreenKey: localDerivations.nextScreenKey ?? parentTransitionDestinationScreenKey ?? undefined
+    };
+  }, [resolvedPrevious, resolvedCurrent, resolvedNext, parentTransitionSourcePairKey, parentTransitionDestinationScreenKey]);
+  const animationProgress = SystemStore.getValue(derivations.currentScreenKey, "animationProgress");
+  const pendingLifecycleStartBlockCount = SystemStore.getValue(derivations.currentScreenKey, "pendingLifecycleStartBlockCount");
+  useLayoutEffect(() => {
+    screenTopology.register({
+      screenKey: derivations.currentScreenKey,
+      parentScreenKey
+    });
+    runOnUI(registerScreen)({
+      screenKey: derivations.currentScreenKey,
+      parentScreenKey,
+      animationProgress,
+      pendingLifecycleStartBlockCount
+    });
+    return () => {
+      screenTopology.unregister(derivations.currentScreenKey);
+      runOnUI(unregisterScreen)(derivations.currentScreenKey);
+    };
+  }, [animationProgress, derivations.currentScreenKey, parentScreenKey, pendingLifecycleStartBlockCount]);
+  useLayoutEffect(() => {
+    if (!isActiveScreen || !parentScreenKey) {
+      return;
+    }
+    return screenTopology.activate({
+      screenKey: derivations.currentScreenKey,
+      parentScreenKey
+    });
+  }, [isActiveScreen, derivations.currentScreenKey, parentScreenKey]);
   return {
+    key: derivations.currentScreenKey,
     value: {
       previous: resolvedPrevious,
       current: resolvedCurrent,
@@ -60,4 +107,5 @@ export const {
     children
   };
 });
+export { DescriptorsProvider, useDescriptorsStore };
 //# sourceMappingURL=descriptors.provider.js.map

package/lib/module/shared/providers/screen/descriptors/descriptors.provider.js.map

@@ -1 +1 @@
-{"version":3,"names":["useMemo","useScreenTransitionsAdapterOptionalContext","useBlankStackStore","createProvider","deriveDescriptorDerivations","getAncestorKeys","DescriptorsProvider","useDescriptorsStore","guarded","previous","current","next","routeKey","children","blankStackCurrent","store","scenesByKey","descriptor","undefined","blankStackPrevious","previousDescriptor","blankStackNext","nextDescriptor","adapterContext","adapterScene","scenes","routeIndexByKey","get","resolvedCurrent","resolvedPrevious","resolvedNext","Error","descriptors","ancestorKeys","derivations","value","options"],"sourceRoot":"../../../../../../src","sources":["shared/providers/screen/descriptors/descriptors.provider.tsx"],"mappings":";;AACA,SAASA,OAAO,QAAQ,OAAO;AAC/B,SAASC,0CAA0C,QAAQ,mDAAmD;AAC9G,SAASC,kBAAkB,QAAQ,+CAA+C;AAElF,OAAOC,cAAc,MAAM,gCAAgC;AAE3D,SAASC,2BAA2B,QAAQ,yCAAyC;AACrF,SAASC,eAAe,QAAQ,6BAA6B;;AAE7D;AACA;AACA;AACA;AACA;;AA6BA,OAAO,MAAM;EAAEC,mBAAmB;EAAEC;AAAoB,CAAC,GAAGJ,cAAc,CACzE,aAAa,EACb;EAAEK,OAAO,EAAE;AAAK,CACjB,CAAC,CACA,CAAC;EAAEC,QAAQ;EAAEC,OAAO;EAAEC,IAAI;EAAEC,QAAQ;EAAEC;AAAS,CAAC,KAAK;EACpD,MAAMC,iBAAiB,GAAGZ,kBAAkB,CAAEa,KAAK,IAClDH,QAAQ,GAAGG,KAAK,EAAEC,WAAW,CAACJ,QAAQ,CAAC,EAAEK,UAAU,GAAGC,SACvD,CAAC;EACD,MAAMC,kBAAkB,GAAGjB,kBAAkB,CAAEa,KAAK,IACnDH,QAAQ,GAAGG,KAAK,EAAEC,WAAW,CAACJ,QAAQ,CAAC,EAAEQ,kBAAkB,GAAGF,SAC/D,CAAC;EACD,MAAMG,cAAc,GAAGnB,kBAAkB,CAAEa,KAAK,IAC/CH,QAAQ,GAAGG,KAAK,EAAEC,WAAW,CAACJ,QAAQ,CAAC,EAAEU,cAAc,GAAGJ,SAC3D,CAAC;EACD,MAAMK,cAAc,GAAGtB,0CAA0C,CAAC,CAAC;EACnE,MAAMuB,YAAY,GAAGZ,QAAQ,GACzBW,cAAc,EAAEP,WAAW,GAAGJ,QAAQ,CAAC,IACzCW,cAAc,EAAEE,MAAM,CACrBF,cAAc,CAACG,eAAe,CAACC,GAAG,CAACf,QAAQ,CAAC,IAAI,CAAC,CAAC,CAClD,GACAM,SAAS;EAEZ,MAAMU,eAAe,GACpBlB,OAAO,IAAII,iBAAiB,IAAIU,YAAY,EAAEP,UAAU;EACzD,MAAMY,gBAAgB,GACrBpB,QAAQ,IAAIU,kBAAkB,IAAIK,YAAY,EAAEJ,kBAAkB;EACnE,MAAMU,YAAY,GAAGnB,IAAI,IAAIU,cAAc,IAAIG,YAAY,EAAEF,cAAc;EAE3E,IAAI,CAACM,eAAe,EAAE;IACrB,MAAM,IAAIG,KAAK,CACd,sBAAsBnB,QAAQ,IAAI,SAAS,kBAC5C,CAAC;EACF;EAEA,MAAMoB,WAAW,GAAGhC,OAAO,CAC1B,OAAO;IACNS,QAAQ,EAAEoB,gBAAgB;IAC1BnB,OAAO,EAAEkB,eAAe;IACxBjB,IAAI,EAAEmB;EACP,CAAC,CAAC,EACF,CAACD,gBAAgB,EAAED,eAAe,EAAEE,YAAY,CACjD,CAAC;EAED,MAAMG,YAAY,GAAGjC,OAAO,CAC3B,MAAMK,eAAe,CAACuB,eAAe,CAAC,EACtC,CAACA,eAAe,CACjB,CAAC;EAED,MAAMM,WAAW,GAAGlC,OAAO,CAC1B,MACCI,2BAA2B,CAAC;IAC3BK,QAAQ,EAAEoB,gBAAgB;IAC1BnB,OAAO,EAAEkB,eAAe;IACxBjB,IAAI,EAAEmB,YAAY;IAClBG;EACD,CAAC,CAAC,EACH,CAACJ,gBAAgB,EAAED,eAAe,EAAEE,YAAY,EAAEG,YAAY,CAC/D,CAAC;EAED,OAAO;IACNE,KAAK,EAAE;MACN1B,QAAQ,EAAEoB,gBAAgB;MAC1BnB,OAAO,EAAEkB,eAAe;MACxBjB,IAAI,EAAEmB,YAAY;MAClBE,WAAW;MACXE,WAAW;MACXE,OAAO,EAAER,eAAe,CAACQ;IAC1B,CAAC;IACDvB;EACD,CAAC;AACF,CACD,CAAC","ignoreList":[]}
+{"version":3,"names":["useLayoutEffect","useMemo","runOnUI","useScreenTransitionsAdapterOptionalContext","screenTopology","useStack","useOptionalBlankStackStore","registerScreen","unregisterScreen","SystemStore","createProvider","deriveDescriptorDerivations","createDescriptorsProvider","global","DescriptorsProvider","useDescriptorsStore","useOptionalDescriptorsStore","previous","current","next","routeKey","children","parentScreenKey","store","derivations","currentScreenKey","parentTransitionSourcePairKey","transitionSourcePairKey","parentTransitionDestinationScreenKey","transitionDestinationScreenKey","blankStackCurrent","scenesByKey","descriptor","undefined","blankStackPrevious","previousDescriptor","blankStackNext","nextDescriptor","adapterContext","adapterScene","scenes","routeIndexByKey","get","resolvedCurrent","resolvedPrevious","resolvedNext","route","key","isActiveScreen","focusedScene","focusedIndex","activity","Error","descriptors","localDerivations","sourcePairKey","nextScreenKey","animationProgress","getValue","pendingLifecycleStartBlockCount","register","screenKey","unregister","activate","value","options"],"sourceRoot":"../../../../../../src","sources":["shared/providers/screen/descriptors/descriptors.provider.tsx"],"mappings":"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","ignoreList":[]}

package/lib/module/shared/providers/screen/descriptors/helpers/derive-descriptor-derivations.js

@@ -4,8 +4,7 @@ import { createScreenPairKey } from "../../../../stores/bounds/helpers/link-pair
 export function deriveDescriptorDerivations({
   previous,
   current,
-  next,
-  ancestorKeys
+  next
 }) {
   const previousScreenKey = previous?.route.key;
   const currentScreenKey = current.route.key;
@@ -22,11 +21,11 @@ export function deriveDescriptorDerivations({
     currentScreenKey,
     nextScreenKey,
     sourcePairKey,
+    transitionSourcePairKey: sourcePairKey,
+    transitionDestinationScreenKey: nextScreenKey,
     destinationPairKey,
-    parentScreenKey: ancestorKeys[0],
     isFirstKey,
     isTopMostScreen,
-    ancestorKeys,
     hasConfiguredInterpolator
   };
 }

package/lib/module/shared/providers/screen/descriptors/helpers/derive-descriptor-derivations.js.map

@@ -1 +1 @@
-{"version":3,"names":["createScreenPairKey","deriveDescriptorDerivations","previous","current","next","ancestorKeys","previousScreenKey","route","key","currentScreenKey","nextScreenKey","sourcePairKey","undefined","destinationPairKey","navigationState","navigation","getState","routes","isFirstKey","findIndex","isTopMostScreen","hasConfiguredInterpolator","options","screenStyleInterpolator","parentScreenKey"],"sourceRoot":"../../../../../../../src","sources":["shared/providers/screen/descriptors/helpers/derive-descriptor-derivations.ts"],"mappings":";;AAAA,SAASA,mBAAmB,QAAQ,sDAAsD;AAwB1F,OAAO,SAASC,2BAA2BA,CAAC;EAC3CC,QAAQ;EACRC,OAAO;EACPC,IAAI;EACJC;AACO,CAAC,EAAyB;EACjC,MAAMC,iBAAiB,GAAGJ,QAAQ,EAAEK,KAAK,CAACC,GAAG;EAC7C,MAAMC,gBAAgB,GAAGN,OAAO,CAACI,KAAK,CAACC,GAAG;EAC1C,MAAME,aAAa,GAAGN,IAAI,EAAEG,KAAK,CAACC,GAAG;EACrC,MAAMG,aAAa,GAAGD,aAAa,GAChCV,mBAAmB,CAACS,gBAAgB,EAAEC,aAAa,CAAC,GACpDE,SAAS;EACZ,MAAMC,kBAAkB,GAAGP,iBAAiB,GACzCN,mBAAmB,CAACM,iBAAiB,EAAEG,gBAAgB,CAAC,GACxDG,SAAS;EAEZ,MAAME,eAAe,GAAGX,OAAO,CAACY,UAAU,CAACC,QAAQ,CAAC,CAAC;EACrD,MAAMC,MAAM,GAAGH,eAAe,EAAEG,MAAM,IAAI,EAAE;EAC5C,MAAMC,UAAU,GACfD,MAAM,CAACE,SAAS,CAAEZ,KAAK,IAAKA,KAAK,CAACC,GAAG,KAAKL,OAAO,CAACI,KAAK,CAACC,GAAG,CAAC,KAAK,CAAC;EACnE,MAAMY,eAAe,GAAG,CAAChB,IAAI;EAC7B,MAAMiB,yBAAyB,GAC9B,CAAC,CAAClB,OAAO,CAACmB,OAAO,CAACC,uBAAuB,IACzC,CAAC,CAACnB,IAAI,EAAEkB,OAAO,EAAEC,uBAAuB;EAEzC,OAAO;IACNjB,iBAAiB;IACjBG,gBAAgB;IAChBC,aAAa;IACbC,aAAa;IACbE,kBAAkB;IAClBW,eAAe,EAAEnB,YAAY,CAAC,CAAC,CAAC;IAChCa,UAAU;IACVE,eAAe;IACff,YAAY;IACZgB;EACD,CAAC;AACF","ignoreList":[]}
+{"version":3,"names":["createScreenPairKey","deriveDescriptorDerivations","previous","current","next","previousScreenKey","route","key","currentScreenKey","nextScreenKey","sourcePairKey","undefined","destinationPairKey","navigationState","navigation","getState","routes","isFirstKey","findIndex","isTopMostScreen","hasConfiguredInterpolator","options","screenStyleInterpolator","transitionSourcePairKey","transitionDestinationScreenKey"],"sourceRoot":"../../../../../../../src","sources":["shared/providers/screen/descriptors/helpers/derive-descriptor-derivations.ts"],"mappings":";;AAAA,SAASA,mBAAmB,QAAQ,sDAAsD;AAyB1F,OAAO,SAASC,2BAA2BA,CAAC;EAC3CC,QAAQ;EACRC,OAAO;EACPC;AACO,CAAC,EAAyB;EACjC,MAAMC,iBAAiB,GAAGH,QAAQ,EAAEI,KAAK,CAACC,GAAG;EAC7C,MAAMC,gBAAgB,GAAGL,OAAO,CAACG,KAAK,CAACC,GAAG;EAC1C,MAAME,aAAa,GAAGL,IAAI,EAAEE,KAAK,CAACC,GAAG;EACrC,MAAMG,aAAa,GAAGD,aAAa,GAChCT,mBAAmB,CAACQ,gBAAgB,EAAEC,aAAa,CAAC,GACpDE,SAAS;EACZ,MAAMC,kBAAkB,GAAGP,iBAAiB,GACzCL,mBAAmB,CAACK,iBAAiB,EAAEG,gBAAgB,CAAC,GACxDG,SAAS;EAEZ,MAAME,eAAe,GAAGV,OAAO,CAACW,UAAU,CAACC,QAAQ,CAAC,CAAC;EACrD,MAAMC,MAAM,GAAGH,eAAe,EAAEG,MAAM,IAAI,EAAE;EAC5C,MAAMC,UAAU,GACfD,MAAM,CAACE,SAAS,CAAEZ,KAAK,IAAKA,KAAK,CAACC,GAAG,KAAKJ,OAAO,CAACG,KAAK,CAACC,GAAG,CAAC,KAAK,CAAC;EACnE,MAAMY,eAAe,GAAG,CAACf,IAAI;EAC7B,MAAMgB,yBAAyB,GAC9B,CAAC,CAACjB,OAAO,CAACkB,OAAO,CAACC,uBAAuB,IACzC,CAAC,CAAClB,IAAI,EAAEiB,OAAO,EAAEC,uBAAuB;EAEzC,OAAO;IACNjB,iBAAiB;IACjBG,gBAAgB;IAChBC,aAAa;IACbC,aAAa;IACba,uBAAuB,EAAEb,aAAa;IACtCc,8BAA8B,EAAEf,aAAa;IAC7CG,kBAAkB;IAClBK,UAAU;IACVE,eAAe;IACfC;EACD,CAAC;AACF","ignoreList":[]}

package/lib/module/shared/providers/screen/gestures/gestures.provider.js

@@ -6,34 +6,32 @@ import { useSharedValue } from "react-native-reanimated";
 import { ScrollStore } from "../../../stores/scroll.store";
 import createProvider from "../../../utils/create-provider";
 import { useDescriptorsStore } from "../descriptors";
+import { useCurrentScreenRelationships } from "../use-current-screen-relationships";
 import { useScreenGestureConfig } from "./hooks/use-screen-gesture-config";
 import { GestureOwnershipBridge } from "./ownership/gesture-ownership-bridge";
 import { useBuildPanGesture } from "./pan/use-build-pan-gesture";
 import { useBuildPinchGesture } from "./pinch/use-build-pinch-gesture";
 import { NO_DIRECTION_CLAIMS } from "./types";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+const EMPTY_GESTURE_SOURCES = [];
+const createScreenGestureProvider = createProvider("ScreenGesture", {
+  global: true
+});
 export const {
   ScreenGestureProvider,
-  useScreenGestureStore: useGestureStore
-} = createProvider("ScreenGesture", {
-  guarded: false
-})(({
+  useOptionalScreenGestureStore,
+  useScreenGestureStore
+} = createScreenGestureProvider(({
   children
-}, {
-  useParentStore
 }) => {
   const currentScreenKey = useDescriptorsStore(store => store.derivations.currentScreenKey);
   const isTopMostScreen = useDescriptorsStore(store => store.derivations.isTopMostScreen);
-  const gestureContext = useParentStore(parentContext => isTopMostScreen ? parentContext : null);
-  const gestureConfig = useScreenGestureConfig(gestureContext);
+  const relationships = useCurrentScreenRelationships();
+  const relationshipAncestorGestures = useOptionalScreenGestureStore(relationships.parentScreenKey, store => store.relationshipGestureSources) ?? EMPTY_GESTURE_SOURCES;
+  const ancestorGestures = isTopMostScreen ? relationshipAncestorGestures : EMPTY_GESTURE_SOURCES;
+  const gestureConfig = useScreenGestureConfig(ancestorGestures);
   const scrollState = ScrollStore.getValue(currentScreenKey, "coordination");
-
-  // Ancestors read this before activating. If a nested screen claims the same
-  // direction, it writes here so the ancestor can fail and let it take priority.
   const childDirectionClaims = useSharedValue(NO_DIRECTION_CLAIMS);
-
-  // The first gesture to activate owns navigation release. Other gestures may
-  // still join as companion trackers during the same simultaneous composition.
   const gestureCompositionOwner = useSharedValue(null);
   const panGesture = useBuildPanGesture({
     scrollState,
@@ -46,20 +44,26 @@ export const {
     gestureCompositionOwner
   });
   const detectorGesture = useMemo(() => Gesture.Simultaneous(panGesture, pinchGesture), [panGesture, pinchGesture]);
-  const value = useMemo(() => ({
+  const source = useMemo(() => ({
     routeKey: currentScreenKey,
     detectorGesture,
     panGesture,
     pinchGesture,
     scrollState,
-    gestureContext,
     claimedDirections: gestureConfig.participation.claimedDirections,
     childDirectionClaims
-  }), [currentScreenKey, detectorGesture, panGesture, pinchGesture, scrollState, gestureContext, gestureConfig.participation.claimedDirections, childDirectionClaims]);
+  }), [currentScreenKey, detectorGesture, panGesture, pinchGesture, scrollState, gestureConfig.participation.claimedDirections, childDirectionClaims]);
+  const relationshipGestureSources = useMemo(() => [source, ...ancestorGestures], [source, ancestorGestures]);
+  const value = useMemo(() => ({
+    ...source,
+    ancestorGestures,
+    relationshipGestureSources
+  }), [source, ancestorGestures, relationshipGestureSources]);
   const content = useMemo(() => /*#__PURE__*/_jsxs(Fragment, {
     children: [/*#__PURE__*/_jsx(GestureOwnershipBridge, {}), children]
   }), [children]);
   return {
+    key: currentScreenKey,
     value,
     children: content
   };

package/lib/module/shared/providers/screen/gestures/gestures.provider.js.map

@@ -1 +1 @@
-{"version":3,"names":["Fragment","useMemo","Gesture","useSharedValue","ScrollStore","createProvider","useDescriptorsStore","useScreenGestureConfig","GestureOwnershipBridge","useBuildPanGesture","useBuildPinchGesture","NO_DIRECTION_CLAIMS","jsx","_jsx","jsxs","_jsxs","ScreenGestureProvider","useScreenGestureStore","useGestureStore","guarded","children","useParentStore","currentScreenKey","store","derivations","isTopMostScreen","gestureContext","parentContext","gestureConfig","scrollState","getValue","childDirectionClaims","gestureCompositionOwner","panGesture","pinchGesture","detectorGesture","Simultaneous","value","routeKey","claimedDirections","participation","content"],"sourceRoot":"../../../../../../src","sources":["shared/providers/screen/gestures/gestures.provider.tsx"],"mappings":";;AAAA,SAASA,QAAQ,EAAEC,OAAO,QAAQ,OAAO;AACzC,SAASC,OAAO,QAAQ,8BAA8B;AACtD,SAASC,cAAc,QAAQ,yBAAyB;AACxD,SAASC,WAAW,QAAQ,8BAA8B;AAC1D,OAAOC,cAAc,MAAM,gCAAgC;AAC3D,SAASC,mBAAmB,QAAQ,gBAAgB;AACpD,SAASC,sBAAsB,QAAQ,mCAAmC;AAC1E,SAASC,sBAAsB,QAAQ,sCAAsC;AAC7E,SAASC,kBAAkB,QAAQ,6BAA6B;AAChE,SAASC,oBAAoB,QAAQ,iCAAiC;AACtE,SAICC,mBAAmB,QACb,SAAS;AAAC,SAAAC,GAAA,IAAAC,IAAA,EAAAC,IAAA,IAAAC,KAAA;AAMjB,OAAO,MAAM;EAAEC,qBAAqB;EAAEC,qBAAqB,EAAEC;AAAgB,CAAC,GAC7Eb,cAAc,CAAC,eAAe,EAAE;EAAEc,OAAO,EAAE;AAAM,CAAC,CAAC,CAIlD,CACC;EAAEC;AAAS,CAAC,EACZ;EAAEC;AAAe,CAAC,KAC4C;EAC9D,MAAMC,gBAAgB,GAAGhB,mBAAmB,CAC1CiB,KAAK,IAAKA,KAAK,CAACC,WAAW,CAACF,gBAC9B,CAAC;EACD,MAAMG,eAAe,GAAGnB,mBAAmB,CACzCiB,KAAK,IAAKA,KAAK,CAACC,WAAW,CAACC,eAC9B,CAAC;EACD,MAAMC,cAAc,GAAGL,cAAc,CAAEM,aAAa,IACnDF,eAAe,GAAGE,aAAa,GAAG,IACnC,CAAC;EACD,MAAMC,aAAa,GAAGrB,sBAAsB,CAACmB,cAAc,CAAC;EAE5D,MAAMG,WAAW,GAAGzB,WAAW,CAAC0B,QAAQ,CACvCR,gBAAgB,EAChB,cACD,CAAC;;EAED;EACA;EACA,MAAMS,oBAAoB,GACzB5B,cAAc,CAAoBQ,mBAAmB,CAAC;;EAEvD;EACA;EACA,MAAMqB,uBAAuB,GAC5B7B,cAAc,CAA0B,IAAI,CAAC;EAE9C,MAAM8B,UAAU,GAAGxB,kBAAkB,CAAC;IACrCoB,WAAW;IACXD,aAAa;IACbG,oBAAoB;IACpBC;EACD,CAAC,CAAC;EAEF,MAAME,YAAY,GAAGxB,oBAAoB,CAAC;IACzCkB,aAAa;IACbI;EACD,CAAC,CAAC;EAEF,MAAMG,eAAe,GAAGlC,OAAO,CAC9B,MAAMC,OAAO,CAACkC,YAAY,CAACH,UAAU,EAAEC,YAAY,CAAC,EACpD,CAACD,UAAU,EAAEC,YAAY,CAC1B,CAAC;EAED,MAAMG,KAAK,GAAGpC,OAAO,CACpB,OAAO;IACNqC,QAAQ,EAAEhB,gBAAgB;IAC1Ba,eAAe;IACfF,UAAU;IACVC,YAAY;IACZL,WAAW;IACXH,cAAc;IACda,iBAAiB,EAAEX,aAAa,CAACY,aAAa,CAACD,iBAAiB;IAChER;EACD,CAAC,CAAC,EACF,CACCT,gBAAgB,EAChBa,eAAe,EACfF,UAAU,EACVC,YAAY,EACZL,WAAW,EACXH,cAAc,EACdE,aAAa,CAACY,aAAa,CAACD,iBAAiB,EAC7CR,oBAAoB,CAEtB,CAAC;EAED,MAAMU,OAAO,GAAGxC,OAAO,CACtB,mBACCc,KAAA,CAACf,QAAQ;IAAAoB,QAAA,gBACRP,IAAA,CAACL,sBAAsB,IAAE,CAAC,EACzBY,QAAQ;EAAA,CACA,CACV,EACD,CAACA,QAAQ,CACV,CAAC;EAED,OAAO;IACNiB,KAAK;IACLjB,QAAQ,EAAEqB;EACX,CAAC;AACF,CACD,CAAC","ignoreList":[]}
+{"version":3,"names":["Fragment","useMemo","Gesture","useSharedValue","ScrollStore","createProvider","useDescriptorsStore","useCurrentScreenRelationships","useScreenGestureConfig","GestureOwnershipBridge","useBuildPanGesture","useBuildPinchGesture","NO_DIRECTION_CLAIMS","jsx","_jsx","jsxs","_jsxs","EMPTY_GESTURE_SOURCES","createScreenGestureProvider","global","ScreenGestureProvider","useOptionalScreenGestureStore","useScreenGestureStore","children","currentScreenKey","store","derivations","isTopMostScreen","relationships","relationshipAncestorGestures","parentScreenKey","relationshipGestureSources","ancestorGestures","gestureConfig","scrollState","getValue","childDirectionClaims","gestureCompositionOwner","panGesture","pinchGesture","detectorGesture","Simultaneous","source","routeKey","claimedDirections","participation","value","content","key"],"sourceRoot":"../../../../../../src","sources":["shared/providers/screen/gestures/gestures.provider.tsx"],"mappings":"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","ignoreList":[]}

package/lib/module/shared/providers/screen/gestures/hooks/use-screen-gesture-config.js

@@ -4,7 +4,7 @@ import { usePreventRemoveContext } from "@react-navigation/native";
 import { useMemo } from "react";
 import { useDescriptorsStore } from "../../descriptors";
 import { resolveScreenGestureConfig } from "../shared/policy";
-export function useScreenGestureConfig(gestureContext) {
+export function useScreenGestureConfig(ancestorGestures) {
   const options = useDescriptorsStore(store => store.options);
   const isFirstKey = useDescriptorsStore(store => store.derivations.isFirstKey);
   const currentScreenKey = useDescriptorsStore(store => store.derivations.currentScreenKey);
@@ -15,8 +15,8 @@ export function useScreenGestureConfig(gestureContext) {
   return useMemo(() => resolveScreenGestureConfig({
     options,
     isFirstKey,
-    gestureContext,
+    ancestorGestures,
     isRemovePrevented
-  }), [isFirstKey, options, gestureContext, isRemovePrevented]);
+  }), [isFirstKey, options, ancestorGestures, isRemovePrevented]);
 }
 //# sourceMappingURL=use-screen-gesture-config.js.map

package/lib/module/shared/providers/screen/gestures/hooks/use-screen-gesture-config.js.map

@@ -1 +1 @@
-{"version":3,"names":["usePreventRemoveContext","useMemo","useDescriptorsStore","resolveScreenGestureConfig","useScreenGestureConfig","gestureContext","options","store","isFirstKey","derivations","currentScreenKey","preventedRoutes","isRemovePrevented","preventRemove"],"sourceRoot":"../../../../../../../src","sources":["shared/providers/screen/gestures/hooks/use-screen-gesture-config.ts"],"mappings":";;AAAA,SAASA,uBAAuB,QAAQ,0BAA0B;AAClE,SAASC,OAAO,QAAQ,OAAO;AAC/B,SAASC,mBAAmB,QAAQ,mBAAmB;AACvD,SAASC,0BAA0B,QAAQ,kBAAkB;AAG7D,OAAO,SAASC,sBAAsBA,CACrCC,cAAyC,EACnB;EACtB,MAAMC,OAAO,GAAGJ,mBAAmB,CAAEK,KAAK,IAAKA,KAAK,CAACD,OAAO,CAAC;EAC7D,MAAME,UAAU,GAAGN,mBAAmB,CACpCK,KAAK,IAAKA,KAAK,CAACE,WAAW,CAACD,UAC9B,CAAC;EACD,MAAME,gBAAgB,GAAGR,mBAAmB,CAC1CK,KAAK,IAAKA,KAAK,CAACE,WAAW,CAACC,gBAC9B,CAAC;EACD,MAAM;IAAEC;EAAgB,CAAC,GAAGX,uBAAuB,CAAC,CAAC;EACrD,MAAMY,iBAAiB,GACtBD,eAAe,CAACD,gBAAgB,CAAC,EAAEG,aAAa,KAAK,IAAI;EAE1D,OAAOZ,OAAO,CACb,MACCE,0BAA0B,CAAC;IAC1BG,OAAO;IACPE,UAAU;IACVH,cAAc;IACdO;EACD,CAAC,CAAC,EACH,CAACJ,UAAU,EAAEF,OAAO,EAAED,cAAc,EAAEO,iBAAiB,CACxD,CAAC;AACF","ignoreList":[]}
+{"version":3,"names":["usePreventRemoveContext","useMemo","useDescriptorsStore","resolveScreenGestureConfig","useScreenGestureConfig","ancestorGestures","options","store","isFirstKey","derivations","currentScreenKey","preventedRoutes","isRemovePrevented","preventRemove"],"sourceRoot":"../../../../../../../src","sources":["shared/providers/screen/gestures/hooks/use-screen-gesture-config.ts"],"mappings":";;AAAA,SAASA,uBAAuB,QAAQ,0BAA0B;AAClE,SAASC,OAAO,QAAQ,OAAO;AAC/B,SAASC,mBAAmB,QAAQ,mBAAmB;AACvD,SAASC,0BAA0B,QAAQ,kBAAkB;AAG7D,OAAO,SAASC,sBAAsBA,CACrCC,gBAAgD,EAC1B;EACtB,MAAMC,OAAO,GAAGJ,mBAAmB,CAAEK,KAAK,IAAKA,KAAK,CAACD,OAAO,CAAC;EAC7D,MAAME,UAAU,GAAGN,mBAAmB,CACpCK,KAAK,IAAKA,KAAK,CAACE,WAAW,CAACD,UAC9B,CAAC;EACD,MAAME,gBAAgB,GAAGR,mBAAmB,CAC1CK,KAAK,IAAKA,KAAK,CAACE,WAAW,CAACC,gBAC9B,CAAC;EACD,MAAM;IAAEC;EAAgB,CAAC,GAAGX,uBAAuB,CAAC,CAAC;EACrD,MAAMY,iBAAiB,GACtBD,eAAe,CAACD,gBAAgB,CAAC,EAAEG,aAAa,KAAK,IAAI;EAE1D,OAAOZ,OAAO,CACb,MACCE,0BAA0B,CAAC;IAC1BG,OAAO;IACPE,UAAU;IACVH,gBAAgB;IAChBO;EACD,CAAC,CAAC,EACH,CAACJ,UAAU,EAAEF,OAAO,EAAED,gBAAgB,EAAEO,iBAAiB,CAC1D,CAAC;AACF","ignoreList":[]}

package/lib/module/shared/providers/screen/gestures/hooks/use-screen-gesture.js

@@ -1,8 +1,7 @@
 "use strict";
 
 import { resolveChainTarget } from "../../../../utils/resolve-chain-target";
-import { useGestureStore } from "../gestures.provider";
-import { walkGestureAncestors } from "../shared/ancestors";
+import { useOptionalScreenGestureStore } from "../gestures.provider";
 /**
  * Returns a screen navigation pan gesture.
  * Use this to coordinate child gestures with the navigation gesture.
@@ -17,11 +16,11 @@ import { walkGestureAncestors } from "../shared/ancestors";
  * ```
  */
 export const useScreenGesture = target => {
-  const ctx = useGestureStore();
+  const ctx = useOptionalScreenGestureStore();
   return resolveChainTarget({
     target,
     self: ctx,
-    ancestors: walkGestureAncestors(ctx?.gestureContext)
+    ancestors: ctx?.ancestorGestures ?? []
   })?.panGesture ?? null;
 };
 //# sourceMappingURL=use-screen-gesture.js.map

package/lib/module/shared/providers/screen/gestures/hooks/use-screen-gesture.js.map

@@ -1 +1 @@
-{"version":3,"names":["resolveChainTarget","useGestureStore","walkGestureAncestors","useScreenGesture","target","ctx","self","ancestors","gestureContext","panGesture"],"sourceRoot":"../../../../../../../src","sources":["shared/providers/screen/gestures/hooks/use-screen-gesture.ts"],"mappings":";;AAAA,SAECA,kBAAkB,QACZ,wCAAwC;AAC/C,SAASC,eAAe,QAAQ,sBAAsB;AACtD,SAASC,oBAAoB,QAAQ,qBAAqB;AAI1D;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMC,gBAAgB,GAAIC,MAA4B,IAAK;EACjE,MAAMC,GAAG,GAAGJ,eAAe,CAAC,CAAC;EAE7B,OACCD,kBAAkB,CAAC;IAClBI,MAAM;IACNE,IAAI,EAAED,GAAG;IACTE,SAAS,EAAEL,oBAAoB,CAACG,GAAG,EAAEG,cAAc;EACpD,CAAC,CAAC,EAAEC,UAAU,IAAI,IAAI;AAExB,CAAC","ignoreList":[]}
+{"version":3,"names":["resolveChainTarget","useOptionalScreenGestureStore","useScreenGesture","target","ctx","self","ancestors","ancestorGestures","panGesture"],"sourceRoot":"../../../../../../../src","sources":["shared/providers/screen/gestures/hooks/use-screen-gesture.ts"],"mappings":";;AAAA,SAECA,kBAAkB,QACZ,wCAAwC;AAC/C,SAASC,6BAA6B,QAAQ,sBAAsB;AAIpE;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMC,gBAAgB,GAAIC,MAA4B,IAAK;EACjE,MAAMC,GAAG,GAAGH,6BAA6B,CAAC,CAAC;EAE3C,OACCD,kBAAkB,CAAC;IAClBG,MAAM;IACNE,IAAI,EAAED,GAAG;IACTE,SAAS,EAAEF,GAAG,EAAEG,gBAAgB,IAAI;EACrC,CAAC,CAAC,EAAEC,UAAU,IAAI,IAAI;AAExB,CAAC","ignoreList":[]}

package/lib/module/shared/providers/screen/gestures/index.js

@@ -1,4 +1,4 @@
 "use strict";
 
-export { ScreenGestureProvider, useGestureStore } from "./gestures.provider";
+export { ScreenGestureProvider, useOptionalScreenGestureStore, useScreenGestureStore } from "./gestures.provider";
 //# sourceMappingURL=index.js.map

package/lib/module/shared/providers/screen/gestures/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["ScreenGestureProvider","useGestureStore"],"sourceRoot":"../../../../../../src","sources":["shared/providers/screen/gestures/index.tsx"],"mappings":";;AAAA,SACCA,qBAAqB,EACrBC,eAAe,QACT,qBAAqB","ignoreList":[]}
+{"version":3,"names":["ScreenGestureProvider","useOptionalScreenGestureStore","useScreenGestureStore"],"sourceRoot":"../../../../../../src","sources":["shared/providers/screen/gestures/index.tsx"],"mappings":";;AAAA,SACCA,qBAAqB,EACrBC,6BAA6B,EAC7BC,qBAAqB,QACf,qBAAqB","ignoreList":[]}