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

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

@@ -1 +1 @@
-{"version":3,"names":["_animation","require","_useScreenAnimation"],"sourceRoot":"../../../../../../src","sources":["shared/providers/screen/animation/index.tsx"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;AAAA,IAAAA,UAAA,GAAAC,OAAA;AAIA,IAAAC,mBAAA,GAAAD,OAAA","ignoreList":[]}
+{"version":3,"names":["_animation","require","_useScreenAnimation"],"sourceRoot":"../../../../../../src","sources":["shared/providers/screen/animation/index.tsx"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,IAAAA,UAAA,GAAAC,OAAA;AAKA,IAAAC,mBAAA,GAAAD,OAAA","ignoreList":[]}

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

@@ -15,21 +15,22 @@ var _readScreenAnimationRevisions = require("./helpers/read-screen-animation-rev
 
 function useScreenAnimation(target) {
   const route = (0, _native.useRoute)();
-  const screenAnimationStore = (0, _animation.useScreenAnimationStore)(route.key);
+  const localAnimationStore = (0, _animation.useOptionalScreenAnimationStore)();
+  const keyedAnimationStore = (0, _animation.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 = (0, _useBuildTransitionAccessor.useBuildTransitionAccessor)(screenAnimationStore);
-  const transitionTarget = normalizeScreenAnimationTarget(target, ancestorScreenAnimationSources.length);
+  const transitionTarget = normalizeScreenAnimationTarget(target, transitionOriginIndex);
   const animation = (0, _reactNativeReanimated.useDerivedValue)(() => {
     "worklet";
 
-    (0, _readScreenAnimationRevisions.readScreenAnimationRevisions)(screenInterpolatorPropsRevision, ancestorScreenAnimationSources, descendantScreenAnimationSources);
+    (0, _readScreenAnimationRevisions.readScreenAnimationRevisions)(transitionSources);
     return transition(transitionTarget);
   });
   return animation;

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

@@ -1 +1 @@
-{"version":3,"names":["_native","require","_reactNativeReanimated","_animation","_useBuildTransitionAccessor","_readScreenAnimationRevisions","useScreenAnimation","target","route","useRoute","screenAnimationStore","useScreenAnimationStore","key","Error","screenInterpolatorPropsRevision","ancestorScreenAnimationSources","descendantScreenAnimationSources","transition","useBuildTransitionAccessor","transitionTarget","normalizeScreenAnimationTarget","length","animation","useDerivedValue","readScreenAnimationRevisions","isTransitionTarget","ancestorCount","undefined","depth","Number","isInteger","ancestor","NaN"],"sourceRoot":"../../../../../../src","sources":["shared/providers/screen/animation/use-screen-animation.tsx"],"mappings":";;;;;;AAAA,IAAAA,OAAA,GAAAC,OAAA;AACA,IAAAC,sBAAA,GAAAD,OAAA;AAKA,IAAAE,UAAA,GAAAF,OAAA;AACA,IAAAG,2BAAA,GAAAH,OAAA;AACA,IAAAI,6BAAA,GAAAJ,OAAA;AAYA;;AAOA;;AAIO,SAASK,kBAAkBA,CACjCC,MAA8B,EAGkB;EAChD,MAAMC,KAAK,GAAG,IAAAC,gBAAQ,EAAC,CAAC;EACxB,MAAMC,oBAAoB,GAAG,IAAAC,kCAAuB,EAACH,KAAK,CAACI,GAAG,CAAC;EAE/D,IAAI,CAACF,oBAAoB,EAAE;IAC1B,MAAM,IAAIG,KAAK,CACd,oCAAoCL,KAAK,CAACI,GAAG,iBAC9C,CAAC;EACF;EAEA,MAAM;IACLE,+BAA+B;IAC/BC,8BAA8B;IAC9BC;EACD,CAAC,GAAGN,oBAAoB;EACxB,MAAMO,UAAU,GAAG,IAAAC,sDAA0B,EAACR,oBAAoB,CAAC;EACnE,MAAMS,gBAAgB,GAAGC,8BAA8B,CACtDb,MAAM,EACNQ,8BAA8B,CAACM,MAChC,CAAC;EAED,MAAMC,SAAS,GAAG,IAAAC,sCAAe,EAAkC,MAAM;IACxE,SAAS;;IACT,IAAAC,0DAA4B,EAC3BV,+BAA+B,EAC/BC,8BAA8B,EAC9BC,gCACD,CAAC;IACD,OAAOC,UAAU,CAACE,gBAAgB,CAAC;EACpC,CAAC,CAAC;EAEF,OAAOG,SAAS;AACjB;AAEA,MAAMG,kBAAkB,GACvBlB,MAA6B,IACS;EACtC,OAAO,OAAOA,MAAM,KAAK,QAAQ,IAAIA,MAAM,KAAK,IAAI,IAAI,OAAO,IAAIA,MAAM;AAC1E,CAAC;AAED,MAAMa,8BAA8B,GAAGA,CACtCb,MAAyC,EACzCmB,aAAqB,KACmB;EACxC,IAAInB,MAAM,KAAKoB,SAAS,IAAIF,kBAAkB,CAAClB,MAAM,CAAC,EAAE;IACvD,OAAOA,MAAM;EACd;EAEA,IAAIA,MAAM,KAAK,MAAM,EAAE;IACtB,OAAO;MAAEqB,KAAK,EAAE;IAAE,CAAC;EACpB;EAEA,IAAIrB,MAAM,KAAK,QAAQ,EAAE;IACxB,OAAO;MAAEqB,KAAK,EAAE,CAAC;IAAE,CAAC;EACrB;EAEA,IAAIrB,MAAM,KAAK,MAAM,EAAE;IACtB,OAAO;MAAEqB,KAAK,EAAEF,aAAa,GAAG,CAAC,GAAG,CAACA,aAAa,GAAG,CAAC;IAAE,CAAC;EAC1D;EAEA,IAAI,CAACG,MAAM,CAACC,SAAS,CAACvB,MAAM,CAACwB,QAAQ,CAAC,IAAIxB,MAAM,CAACwB,QAAQ,GAAG,CAAC,EAAE;IAC9D,OAAO;MAAEH,KAAK,EAAEC,MAAM,CAACG;IAAI,CAAC;EAC7B;EAEA,OAAO;IAAEJ,KAAK,EAAE,CAACrB,MAAM,CAACwB;EAAS,CAAC;AACnC,CAAC","ignoreList":[]}
+{"version":3,"names":["_native","require","_reactNativeReanimated","_animation","_useBuildTransitionAccessor","_readScreenAnimationRevisions","useScreenAnimation","target","route","useRoute","localAnimationStore","useOptionalScreenAnimationStore","keyedAnimationStore","key","screenAnimationStore","Error","transitionSources","transitionOriginIndex","transition","useBuildTransitionAccessor","transitionTarget","normalizeScreenAnimationTarget","animation","useDerivedValue","readScreenAnimationRevisions","isTransitionTarget","ancestorCount","undefined","depth","Number","isInteger","ancestor","NaN"],"sourceRoot":"../../../../../../src","sources":["shared/providers/screen/animation/use-screen-animation.tsx"],"mappings":";;;;;;AAAA,IAAAA,OAAA,GAAAC,OAAA;AACA,IAAAC,sBAAA,GAAAD,OAAA;AAKA,IAAAE,UAAA,GAAAF,OAAA;AACA,IAAAG,2BAAA,GAAAH,OAAA;AACA,IAAAI,6BAAA,GAAAJ,OAAA;AAYA;;AAOA;;AAIO,SAASK,kBAAkBA,CACjCC,MAA8B,EAGkB;EAChD,MAAMC,KAAK,GAAG,IAAAC,gBAAQ,EAAC,CAAC;EACxB,MAAMC,mBAAmB,GAAG,IAAAC,0CAA+B,EAAC,CAAC;EAC7D,MAAMC,mBAAmB,GAAG,IAAAD,0CAA+B,EAC1DD,mBAAmB,GAAG,IAAI,GAAGF,KAAK,CAACK,GACpC,CAAC;EACD,MAAMC,oBAAoB,GAAGJ,mBAAmB,IAAIE,mBAAmB;EAEvE,IAAI,CAACE,oBAAoB,EAAE;IAC1B,MAAM,IAAIC,KAAK,CACd,kDAAkDP,KAAK,CAACK,GAAG,GAC5D,CAAC;EACF;EAEA,MAAM;IAAEG,iBAAiB;IAAEC;EAAsB,CAAC,GAAGH,oBAAoB;EACzE,MAAMI,UAAU,GAAG,IAAAC,sDAA0B,EAACL,oBAAoB,CAAC;EACnE,MAAMM,gBAAgB,GAAGC,8BAA8B,CACtDd,MAAM,EACNU,qBACD,CAAC;EAED,MAAMK,SAAS,GAAG,IAAAC,sCAAe,EAAkC,MAAM;IACxE,SAAS;;IACT,IAAAC,0DAA4B,EAACR,iBAAiB,CAAC;IAC/C,OAAOE,UAAU,CAACE,gBAAgB,CAAC;EACpC,CAAC,CAAC;EAEF,OAAOE,SAAS;AACjB;AAEA,MAAMG,kBAAkB,GACvBlB,MAA6B,IACS;EACtC,OAAO,OAAOA,MAAM,KAAK,QAAQ,IAAIA,MAAM,KAAK,IAAI,IAAI,OAAO,IAAIA,MAAM;AAC1E,CAAC;AAED,MAAMc,8BAA8B,GAAGA,CACtCd,MAAyC,EACzCmB,aAAqB,KACmB;EACxC,IAAInB,MAAM,KAAKoB,SAAS,IAAIF,kBAAkB,CAAClB,MAAM,CAAC,EAAE;IACvD,OAAOA,MAAM;EACd;EAEA,IAAIA,MAAM,KAAK,MAAM,EAAE;IACtB,OAAO;MAAEqB,KAAK,EAAE;IAAE,CAAC;EACpB;EAEA,IAAIrB,MAAM,KAAK,QAAQ,EAAE;IACxB,OAAO;MAAEqB,KAAK,EAAE,CAAC;IAAE,CAAC;EACrB;EAEA,IAAIrB,MAAM,KAAK,MAAM,EAAE;IACtB,OAAO;MAAEqB,KAAK,EAAEF,aAAa,GAAG,CAAC,GAAG,CAACA,aAAa,GAAG,CAAC;IAAE,CAAC;EAC1D;EAEA,IAAI,CAACG,MAAM,CAACC,SAAS,CAACvB,MAAM,CAACwB,QAAQ,CAAC,IAAIxB,MAAM,CAACwB,QAAQ,GAAG,CAAC,EAAE;IAC9D,OAAO;MAAEH,KAAK,EAAEC,MAAM,CAACG;IAAI,CAAC;EAC7B;EAEA,OAAO;IAAEJ,KAAK,EAAE,CAACrB,MAAM,CAACwB;EAAS,CAAC;AACnC,CAAC","ignoreList":[]}

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

@@ -7,12 +7,13 @@ exports.useDescriptorsStore = exports.DescriptorsProvider = void 0;
 var _react = require("react");
 var _reactNativeReanimated = require("react-native-reanimated");
 var _context = require("../../../adapters/with-screen-transitions/context");
+var _screenTopology = require("../../../factories/screen-topology");
+var _useStack = require("../../../hooks/navigation/use-stack");
 var _blankStack = require("../../../providers/stack/blank-stack.provider");
 var _coordinator = require("../../../stores/bounds/internals/coordinator");
 var _system = require("../../../stores/system.store");
 var _createProvider = _interopRequireDefault(require("../../../utils/create-provider"));
 var _deriveDescriptorDerivations = require("./helpers/derive-descriptor-derivations");
-var _deriveStructuralAncestorKeys = require("./helpers/derive-structural-ancestor-keys");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 /**
  * Base descriptor interface - minimal contract for all stack types.
@@ -20,32 +21,36 @@ function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e
  * tight coupling to React Navigation.
  */
 
+const createDescriptorsProvider = (0, _createProvider.default)("Descriptors", {
+  global: true
+});
 const {
   DescriptorsProvider,
-  useDescriptorsStore
-} = (0, _createProvider.default)("Descriptors", {
-  guarded: true
-})(({
+  useDescriptorsStore,
+  useOptionalDescriptorsStore
+} = createDescriptorsProvider(({
   previous,
   current,
   next,
   routeKey,
   children
-}, {
-  useParentStore
 }) => {
-  const parentScreenKey = useParentStore(store => store?.derivations.currentScreenKey);
-  const parentAncestorKeys = useParentStore(store => store?.derivations.ancestorKeys);
-  const parentTransitionSourcePairKey = useParentStore(store => store?.derivations.transitionSourcePairKey);
-  const parentTransitionDestinationScreenKey = useParentStore(store => store?.derivations.transitionDestinationScreenKey);
-  const blankStackCurrent = (0, _blankStack.useBlankStackStore)(store => routeKey ? store?.scenesByKey[routeKey]?.descriptor : undefined);
-  const blankStackPrevious = (0, _blankStack.useBlankStackStore)(store => routeKey ? store?.scenesByKey[routeKey]?.previousDescriptor : undefined);
-  const blankStackNext = (0, _blankStack.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 = (0, _blankStack.useOptionalBlankStackStore)(store => routeKey ? store?.scenesByKey[routeKey]?.descriptor : undefined);
+  const blankStackPrevious = (0, _blankStack.useOptionalBlankStackStore)(store => routeKey ? store?.scenesByKey[routeKey]?.previousDescriptor : undefined);
+  const blankStackNext = (0, _blankStack.useOptionalBlankStackStore)(store => routeKey ? store?.scenesByKey[routeKey]?.nextDescriptor : undefined);
   const adapterContext = (0, _context.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 = (0, _useStack.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.`);
   }
@@ -54,37 +59,47 @@ const {
     current: resolvedCurrent,
     next: resolvedNext
   }), [resolvedPrevious, resolvedCurrent, resolvedNext]);
-  const ancestorKeys = (0, _react.useMemo)(() => (0, _deriveStructuralAncestorKeys.deriveStructuralAncestorKeys)(parentScreenKey ? {
-    currentScreenKey: parentScreenKey,
-    ancestorKeys: parentAncestorKeys ?? []
-  } : null), [parentAncestorKeys, parentScreenKey]);
   const derivations = (0, _react.useMemo)(() => {
     const localDerivations = (0, _deriveDescriptorDerivations.deriveDescriptorDerivations)({
       previous: resolvedPrevious,
       current: resolvedCurrent,
-      next: resolvedNext,
-      ancestorKeys
+      next: resolvedNext
     });
     return {
       ...localDerivations,
-      transitionSourcePairKey: localDerivations.sourcePairKey ?? parentTransitionSourcePairKey,
-      transitionDestinationScreenKey: localDerivations.nextScreenKey ?? parentTransitionDestinationScreenKey
+      transitionSourcePairKey: localDerivations.sourcePairKey ?? parentTransitionSourcePairKey ?? undefined,
+      transitionDestinationScreenKey: localDerivations.nextScreenKey ?? parentTransitionDestinationScreenKey ?? undefined
     };
-  }, [resolvedPrevious, resolvedCurrent, resolvedNext, ancestorKeys, parentTransitionSourcePairKey, parentTransitionDestinationScreenKey]);
+  }, [resolvedPrevious, resolvedCurrent, resolvedNext, parentTransitionSourcePairKey, parentTransitionDestinationScreenKey]);
   const animationProgress = _system.SystemStore.getValue(derivations.currentScreenKey, "animationProgress");
   const pendingLifecycleStartBlockCount = _system.SystemStore.getValue(derivations.currentScreenKey, "pendingLifecycleStartBlockCount");
   (0, _react.useLayoutEffect)(() => {
+    _screenTopology.screenTopology.register({
+      screenKey: derivations.currentScreenKey,
+      parentScreenKey
+    });
     (0, _reactNativeReanimated.runOnUI)(_coordinator.registerScreen)({
       screenKey: derivations.currentScreenKey,
-      parentScreenKey: derivations.parentScreenKey,
+      parentScreenKey,
       animationProgress,
       pendingLifecycleStartBlockCount
     });
     return () => {
+      _screenTopology.screenTopology.unregister(derivations.currentScreenKey);
       (0, _reactNativeReanimated.runOnUI)(_coordinator.unregisterScreen)(derivations.currentScreenKey);
     };
-  }, [animationProgress, derivations.currentScreenKey, derivations.parentScreenKey, pendingLifecycleStartBlockCount]);
+  }, [animationProgress, derivations.currentScreenKey, parentScreenKey, pendingLifecycleStartBlockCount]);
+  (0, _react.useLayoutEffect)(() => {
+    if (!isActiveScreen || !parentScreenKey) {
+      return;
+    }
+    return _screenTopology.screenTopology.activate({
+      screenKey: derivations.currentScreenKey,
+      parentScreenKey
+    });
+  }, [isActiveScreen, derivations.currentScreenKey, parentScreenKey]);
   return {
+    key: derivations.currentScreenKey,
     value: {
       previous: resolvedPrevious,
       current: resolvedCurrent,

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

@@ -1 +1 @@
-{"version":3,"names":["_react","require","_reactNativeReanimated","_context","_blankStack","_coordinator","_system","_createProvider","_interopRequireDefault","_deriveDescriptorDerivations","_deriveStructuralAncestorKeys","e","__esModule","default","DescriptorsProvider","useDescriptorsStore","createProvider","guarded","previous","current","next","routeKey","children","useParentStore","parentScreenKey","store","derivations","currentScreenKey","parentAncestorKeys","ancestorKeys","parentTransitionSourcePairKey","transitionSourcePairKey","parentTransitionDestinationScreenKey","transitionDestinationScreenKey","blankStackCurrent","useBlankStackStore","scenesByKey","descriptor","undefined","blankStackPrevious","previousDescriptor","blankStackNext","nextDescriptor","adapterContext","useScreenTransitionsAdapterOptionalContext","adapterScene","scenes","routeIndexByKey","get","resolvedCurrent","resolvedPrevious","resolvedNext","Error","descriptors","useMemo","deriveStructuralAncestorKeys","localDerivations","deriveDescriptorDerivations","sourcePairKey","nextScreenKey","animationProgress","SystemStore","getValue","pendingLifecycleStartBlockCount","useLayoutEffect","runOnUI","registerScreen","screenKey","unregisterScreen","value","options","exports"],"sourceRoot":"../../../../../../src","sources":["shared/providers/screen/descriptors/descriptors.provider.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_react","require","_reactNativeReanimated","_context","_screenTopology","_useStack","_blankStack","_coordinator","_system","_createProvider","_interopRequireDefault","_deriveDescriptorDerivations","e","__esModule","default","createDescriptorsProvider","createProvider","global","DescriptorsProvider","useDescriptorsStore","useOptionalDescriptorsStore","previous","current","next","routeKey","children","parentScreenKey","store","derivations","currentScreenKey","parentTransitionSourcePairKey","transitionSourcePairKey","parentTransitionDestinationScreenKey","transitionDestinationScreenKey","blankStackCurrent","useOptionalBlankStackStore","scenesByKey","descriptor","undefined","blankStackPrevious","previousDescriptor","blankStackNext","nextDescriptor","adapterContext","useScreenTransitionsAdapterOptionalContext","adapterScene","scenes","routeIndexByKey","get","resolvedCurrent","resolvedPrevious","resolvedNext","route","key","isActiveScreen","useStack","focusedScene","focusedIndex","activity","Error","descriptors","useMemo","localDerivations","deriveDescriptorDerivations","sourcePairKey","nextScreenKey","animationProgress","SystemStore","getValue","pendingLifecycleStartBlockCount","useLayoutEffect","screenTopology","register","screenKey","runOnUI","registerScreen","unregister","unregisterScreen","activate","value","options","exports"],"sourceRoot":"../../../../../../src","sources":["shared/providers/screen/descriptors/descriptors.provider.tsx"],"mappings":"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","ignoreList":[]}

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

@@ -8,8 +8,7 @@ var _linkPairs = require("../../../../stores/bounds/helpers/link-pairs.helpers")
 function deriveDescriptorDerivations({
   previous,
   current,
-  next,
-  ancestorKeys
+  next
 }) {
   const previousScreenKey = previous?.route.key;
   const currentScreenKey = current.route.key;
@@ -29,10 +28,8 @@ function deriveDescriptorDerivations({
     transitionSourcePairKey: sourcePairKey,
     transitionDestinationScreenKey: nextScreenKey,
     destinationPairKey,
-    parentScreenKey: ancestorKeys[0],
     isFirstKey,
     isTopMostScreen,
-    ancestorKeys,
     hasConfiguredInterpolator
   };
 }

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

@@ -1 +1 @@
-{"version":3,"names":["_linkPairs","require","deriveDescriptorDerivations","previous","current","next","ancestorKeys","previousScreenKey","route","key","currentScreenKey","nextScreenKey","sourcePairKey","createScreenPairKey","undefined","destinationPairKey","navigationState","navigation","getState","routes","isFirstKey","findIndex","isTopMostScreen","hasConfiguredInterpolator","options","screenStyleInterpolator","transitionSourcePairKey","transitionDestinationScreenKey","parentScreenKey"],"sourceRoot":"../../../../../../../src","sources":["shared/providers/screen/descriptors/helpers/derive-descriptor-derivations.ts"],"mappings":";;;;;;AAAA,IAAAA,UAAA,GAAAC,OAAA;AA4BO,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,GAChC,IAAAE,8BAAmB,EAACH,gBAAgB,EAAEC,aAAa,CAAC,GACpDG,SAAS;EACZ,MAAMC,kBAAkB,GAAGR,iBAAiB,GACzC,IAAAM,8BAAmB,EAACN,iBAAiB,EAAEG,gBAAgB,CAAC,GACxDI,SAAS;EAEZ,MAAME,eAAe,GAAGZ,OAAO,CAACa,UAAU,CAACC,QAAQ,CAAC,CAAC;EACrD,MAAMC,MAAM,GAAGH,eAAe,EAAEG,MAAM,IAAI,EAAE;EAC5C,MAAMC,UAAU,GACfD,MAAM,CAACE,SAAS,CAAEb,KAAK,IAAKA,KAAK,CAACC,GAAG,KAAKL,OAAO,CAACI,KAAK,CAACC,GAAG,CAAC,KAAK,CAAC;EACnE,MAAMa,eAAe,GAAG,CAACjB,IAAI;EAC7B,MAAMkB,yBAAyB,GAC9B,CAAC,CAACnB,OAAO,CAACoB,OAAO,CAACC,uBAAuB,IACzC,CAAC,CAACpB,IAAI,EAAEmB,OAAO,EAAEC,uBAAuB;EAEzC,OAAO;IACNlB,iBAAiB;IACjBG,gBAAgB;IAChBC,aAAa;IACbC,aAAa;IACbc,uBAAuB,EAAEd,aAAa;IACtCe,8BAA8B,EAAEhB,aAAa;IAC7CI,kBAAkB;IAClBa,eAAe,EAAEtB,YAAY,CAAC,CAAC,CAAC;IAChCc,UAAU;IACVE,eAAe;IACfhB,YAAY;IACZiB;EACD,CAAC;AACF","ignoreList":[]}
+{"version":3,"names":["_linkPairs","require","deriveDescriptorDerivations","previous","current","next","previousScreenKey","route","key","currentScreenKey","nextScreenKey","sourcePairKey","createScreenPairKey","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,IAAAA,UAAA,GAAAC,OAAA;AAyBO,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,GAChC,IAAAE,8BAAmB,EAACH,gBAAgB,EAAEC,aAAa,CAAC,GACpDG,SAAS;EACZ,MAAMC,kBAAkB,GAAGR,iBAAiB,GACzC,IAAAM,8BAAmB,EAACN,iBAAiB,EAAEG,gBAAgB,CAAC,GACxDI,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,CAAEb,KAAK,IAAKA,KAAK,CAACC,GAAG,KAAKJ,OAAO,CAACG,KAAK,CAACC,GAAG,CAAC,KAAK,CAAC;EACnE,MAAMa,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;IACNlB,iBAAiB;IACjBG,gBAAgB;IAChBC,aAAa;IACbC,aAAa;IACbc,uBAAuB,EAAEd,aAAa;IACtCe,8BAA8B,EAAEhB,aAAa;IAC7CI,kBAAkB;IAClBK,UAAU;IACVE,eAAe;IACfC;EACD,CAAC;AACF","ignoreList":[]}

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

@@ -3,13 +3,14 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.useGestureStore = exports.ScreenGestureProvider = void 0;
+exports.useScreenGestureStore = exports.useOptionalScreenGestureStore = exports.ScreenGestureProvider = void 0;
 var _react = require("react");
 var _reactNativeGestureHandler = require("react-native-gesture-handler");
 var _reactNativeReanimated = require("react-native-reanimated");
 var _scroll = require("../../../stores/scroll.store");
 var _createProvider = _interopRequireDefault(require("../../../utils/create-provider"));
 var _descriptors = require("../descriptors");
+var _useCurrentScreenRelationships = require("../use-current-screen-relationships");
 var _useScreenGestureConfig = require("./hooks/use-screen-gesture-config");
 var _gestureOwnershipBridge = require("./ownership/gesture-ownership-bridge");
 var _useBuildPanGesture = require("./pan/use-build-pan-gesture");
@@ -17,28 +18,25 @@ var _useBuildPinchGesture = require("./pinch/use-build-pinch-gesture");
 var _types = require("./types");
 var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+const EMPTY_GESTURE_SOURCES = [];
+const createScreenGestureProvider = (0, _createProvider.default)("ScreenGesture", {
+  global: true
+});
 const {
   ScreenGestureProvider,
-  useScreenGestureStore: useGestureStore
-} = (0, _createProvider.default)("ScreenGesture", {
-  guarded: false
-})(({
+  useOptionalScreenGestureStore,
+  useScreenGestureStore
+} = createScreenGestureProvider(({
   children
-}, {
-  useParentStore
 }) => {
   const currentScreenKey = (0, _descriptors.useDescriptorsStore)(store => store.derivations.currentScreenKey);
   const isTopMostScreen = (0, _descriptors.useDescriptorsStore)(store => store.derivations.isTopMostScreen);
-  const gestureContext = useParentStore(parentContext => isTopMostScreen ? parentContext : null);
-  const gestureConfig = (0, _useScreenGestureConfig.useScreenGestureConfig)(gestureContext);
+  const relationships = (0, _useCurrentScreenRelationships.useCurrentScreenRelationships)();
+  const relationshipAncestorGestures = useOptionalScreenGestureStore(relationships.parentScreenKey, store => store.relationshipGestureSources) ?? EMPTY_GESTURE_SOURCES;
+  const ancestorGestures = isTopMostScreen ? relationshipAncestorGestures : EMPTY_GESTURE_SOURCES;
+  const gestureConfig = (0, _useScreenGestureConfig.useScreenGestureConfig)(ancestorGestures);
   const scrollState = _scroll.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 = (0, _reactNativeReanimated.useSharedValue)(_types.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 = (0, _reactNativeReanimated.useSharedValue)(null);
   const panGesture = (0, _useBuildPanGesture.useBuildPanGesture)({
     scrollState,
@@ -51,24 +49,31 @@ const {
     gestureCompositionOwner
   });
   const detectorGesture = (0, _react.useMemo)(() => _reactNativeGestureHandler.Gesture.Simultaneous(panGesture, pinchGesture), [panGesture, pinchGesture]);
-  const value = (0, _react.useMemo)(() => ({
+  const source = (0, _react.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 = (0, _react.useMemo)(() => [source, ...ancestorGestures], [source, ancestorGestures]);
+  const value = (0, _react.useMemo)(() => ({
+    ...source,
+    ancestorGestures,
+    relationshipGestureSources
+  }), [source, ancestorGestures, relationshipGestureSources]);
   const content = (0, _react.useMemo)(() => /*#__PURE__*/(0, _jsxRuntime.jsxs)(_react.Fragment, {
     children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_gestureOwnershipBridge.GestureOwnershipBridge, {}), children]
   }), [children]);
   return {
+    key: currentScreenKey,
     value,
     children: content
   };
 });
-exports.useGestureStore = useGestureStore;
+exports.useScreenGestureStore = useScreenGestureStore;
+exports.useOptionalScreenGestureStore = useOptionalScreenGestureStore;
 exports.ScreenGestureProvider = ScreenGestureProvider;
 //# sourceMappingURL=gestures.provider.js.map

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

@@ -1 +1 @@
-{"version":3,"names":["_react","require","_reactNativeGestureHandler","_reactNativeReanimated","_scroll","_createProvider","_interopRequireDefault","_descriptors","_useScreenGestureConfig","_gestureOwnershipBridge","_useBuildPanGesture","_useBuildPinchGesture","_types","_jsxRuntime","e","__esModule","default","ScreenGestureProvider","useScreenGestureStore","useGestureStore","createProvider","guarded","children","useParentStore","currentScreenKey","useDescriptorsStore","store","derivations","isTopMostScreen","gestureContext","parentContext","gestureConfig","useScreenGestureConfig","scrollState","ScrollStore","getValue","childDirectionClaims","useSharedValue","NO_DIRECTION_CLAIMS","gestureCompositionOwner","panGesture","useBuildPanGesture","pinchGesture","useBuildPinchGesture","detectorGesture","useMemo","Gesture","Simultaneous","value","routeKey","claimedDirections","participation","content","jsxs","Fragment","jsx","GestureOwnershipBridge","exports"],"sourceRoot":"../../../../../../src","sources":["shared/providers/screen/gestures/gestures.provider.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_react","require","_reactNativeGestureHandler","_reactNativeReanimated","_scroll","_createProvider","_interopRequireDefault","_descriptors","_useCurrentScreenRelationships","_useScreenGestureConfig","_gestureOwnershipBridge","_useBuildPanGesture","_useBuildPinchGesture","_types","_jsxRuntime","e","__esModule","default","EMPTY_GESTURE_SOURCES","createScreenGestureProvider","createProvider","global","ScreenGestureProvider","useOptionalScreenGestureStore","useScreenGestureStore","children","currentScreenKey","useDescriptorsStore","store","derivations","isTopMostScreen","relationships","useCurrentScreenRelationships","relationshipAncestorGestures","parentScreenKey","relationshipGestureSources","ancestorGestures","gestureConfig","useScreenGestureConfig","scrollState","ScrollStore","getValue","childDirectionClaims","useSharedValue","NO_DIRECTION_CLAIMS","gestureCompositionOwner","panGesture","useBuildPanGesture","pinchGesture","useBuildPinchGesture","detectorGesture","useMemo","Gesture","Simultaneous","source","routeKey","claimedDirections","participation","value","content","jsxs","Fragment","jsx","GestureOwnershipBridge","key","exports"],"sourceRoot":"../../../../../../src","sources":["shared/providers/screen/gestures/gestures.provider.tsx"],"mappings":"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","ignoreList":[]}

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

@@ -8,7 +8,7 @@ var _native = require("@react-navigation/native");
 var _react = require("react");
 var _descriptors = require("../../descriptors");
 var _policy = require("../shared/policy");
-function useScreenGestureConfig(gestureContext) {
+function useScreenGestureConfig(ancestorGestures) {
   const options = (0, _descriptors.useDescriptorsStore)(store => store.options);
   const isFirstKey = (0, _descriptors.useDescriptorsStore)(store => store.derivations.isFirstKey);
   const currentScreenKey = (0, _descriptors.useDescriptorsStore)(store => store.derivations.currentScreenKey);
@@ -19,8 +19,8 @@ function useScreenGestureConfig(gestureContext) {
   return (0, _react.useMemo)(() => (0, _policy.resolveScreenGestureConfig)({
     options,
     isFirstKey,
-    gestureContext,
+    ancestorGestures,
     isRemovePrevented
-  }), [isFirstKey, options, gestureContext, isRemovePrevented]);
+  }), [isFirstKey, options, ancestorGestures, isRemovePrevented]);
 }
 //# sourceMappingURL=use-screen-gesture-config.js.map

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

@@ -1 +1 @@
-{"version":3,"names":["_native","require","_react","_descriptors","_policy","useScreenGestureConfig","gestureContext","options","useDescriptorsStore","store","isFirstKey","derivations","currentScreenKey","preventedRoutes","usePreventRemoveContext","isRemovePrevented","preventRemove","useMemo","resolveScreenGestureConfig"],"sourceRoot":"../../../../../../../src","sources":["shared/providers/screen/gestures/hooks/use-screen-gesture-config.ts"],"mappings":";;;;;;AAAA,IAAAA,OAAA,GAAAC,OAAA;AACA,IAAAC,MAAA,GAAAD,OAAA;AACA,IAAAE,YAAA,GAAAF,OAAA;AACA,IAAAG,OAAA,GAAAH,OAAA;AAGO,SAASI,sBAAsBA,CACrCC,cAAyC,EACnB;EACtB,MAAMC,OAAO,GAAG,IAAAC,gCAAmB,EAAEC,KAAK,IAAKA,KAAK,CAACF,OAAO,CAAC;EAC7D,MAAMG,UAAU,GAAG,IAAAF,gCAAmB,EACpCC,KAAK,IAAKA,KAAK,CAACE,WAAW,CAACD,UAC9B,CAAC;EACD,MAAME,gBAAgB,GAAG,IAAAJ,gCAAmB,EAC1CC,KAAK,IAAKA,KAAK,CAACE,WAAW,CAACC,gBAC9B,CAAC;EACD,MAAM;IAAEC;EAAgB,CAAC,GAAG,IAAAC,+BAAuB,EAAC,CAAC;EACrD,MAAMC,iBAAiB,GACtBF,eAAe,CAACD,gBAAgB,CAAC,EAAEI,aAAa,KAAK,IAAI;EAE1D,OAAO,IAAAC,cAAO,EACb,MACC,IAAAC,kCAA0B,EAAC;IAC1BX,OAAO;IACPG,UAAU;IACVJ,cAAc;IACdS;EACD,CAAC,CAAC,EACH,CAACL,UAAU,EAAEH,OAAO,EAAED,cAAc,EAAES,iBAAiB,CACxD,CAAC;AACF","ignoreList":[]}
+{"version":3,"names":["_native","require","_react","_descriptors","_policy","useScreenGestureConfig","ancestorGestures","options","useDescriptorsStore","store","isFirstKey","derivations","currentScreenKey","preventedRoutes","usePreventRemoveContext","isRemovePrevented","preventRemove","useMemo","resolveScreenGestureConfig"],"sourceRoot":"../../../../../../../src","sources":["shared/providers/screen/gestures/hooks/use-screen-gesture-config.ts"],"mappings":";;;;;;AAAA,IAAAA,OAAA,GAAAC,OAAA;AACA,IAAAC,MAAA,GAAAD,OAAA;AACA,IAAAE,YAAA,GAAAF,OAAA;AACA,IAAAG,OAAA,GAAAH,OAAA;AAGO,SAASI,sBAAsBA,CACrCC,gBAAgD,EAC1B;EACtB,MAAMC,OAAO,GAAG,IAAAC,gCAAmB,EAAEC,KAAK,IAAKA,KAAK,CAACF,OAAO,CAAC;EAC7D,MAAMG,UAAU,GAAG,IAAAF,gCAAmB,EACpCC,KAAK,IAAKA,KAAK,CAACE,WAAW,CAACD,UAC9B,CAAC;EACD,MAAME,gBAAgB,GAAG,IAAAJ,gCAAmB,EAC1CC,KAAK,IAAKA,KAAK,CAACE,WAAW,CAACC,gBAC9B,CAAC;EACD,MAAM;IAAEC;EAAgB,CAAC,GAAG,IAAAC,+BAAuB,EAAC,CAAC;EACrD,MAAMC,iBAAiB,GACtBF,eAAe,CAACD,gBAAgB,CAAC,EAAEI,aAAa,KAAK,IAAI;EAE1D,OAAO,IAAAC,cAAO,EACb,MACC,IAAAC,kCAA0B,EAAC;IAC1BX,OAAO;IACPG,UAAU;IACVJ,gBAAgB;IAChBS;EACD,CAAC,CAAC,EACH,CAACL,UAAU,EAAEH,OAAO,EAAED,gBAAgB,EAAES,iBAAiB,CAC1D,CAAC;AACF","ignoreList":[]}

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

@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", {
 exports.useScreenGesture = void 0;
 var _resolveChainTarget = require("../../../../utils/resolve-chain-target");
 var _gestures = require("../gestures.provider");
-var _ancestors = require("../shared/ancestors");
 /**
  * Returns a screen navigation pan gesture.
  * Use this to coordinate child gestures with the navigation gesture.
@@ -21,11 +20,11 @@ var _ancestors = require("../shared/ancestors");
  * ```
  */
 const useScreenGesture = target => {
-  const ctx = (0, _gestures.useGestureStore)();
+  const ctx = (0, _gestures.useOptionalScreenGestureStore)();
   return (0, _resolveChainTarget.resolveChainTarget)({
     target,
     self: ctx,
-    ancestors: (0, _ancestors.walkGestureAncestors)(ctx?.gestureContext)
+    ancestors: ctx?.ancestorGestures ?? []
   })?.panGesture ?? null;
 };
 exports.useScreenGesture = useScreenGesture;

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

@@ -1 +1 @@
-{"version":3,"names":["_resolveChainTarget","require","_gestures","_ancestors","useScreenGesture","target","ctx","useGestureStore","resolveChainTarget","self","ancestors","walkGestureAncestors","gestureContext","panGesture","exports"],"sourceRoot":"../../../../../../../src","sources":["shared/providers/screen/gestures/hooks/use-screen-gesture.ts"],"mappings":";;;;;;AAAA,IAAAA,mBAAA,GAAAC,OAAA;AAIA,IAAAC,SAAA,GAAAD,OAAA;AACA,IAAAE,UAAA,GAAAF,OAAA;AAIA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACO,MAAMG,gBAAgB,GAAIC,MAA4B,IAAK;EACjE,MAAMC,GAAG,GAAG,IAAAC,yBAAe,EAAC,CAAC;EAE7B,OACC,IAAAC,sCAAkB,EAAC;IAClBH,MAAM;IACNI,IAAI,EAAEH,GAAG;IACTI,SAAS,EAAE,IAAAC,+BAAoB,EAACL,GAAG,EAAEM,cAAc;EACpD,CAAC,CAAC,EAAEC,UAAU,IAAI,IAAI;AAExB,CAAC;AAACC,OAAA,CAAAV,gBAAA,GAAAA,gBAAA","ignoreList":[]}
+{"version":3,"names":["_resolveChainTarget","require","_gestures","useScreenGesture","target","ctx","useOptionalScreenGestureStore","resolveChainTarget","self","ancestors","ancestorGestures","panGesture","exports"],"sourceRoot":"../../../../../../../src","sources":["shared/providers/screen/gestures/hooks/use-screen-gesture.ts"],"mappings":";;;;;;AAAA,IAAAA,mBAAA,GAAAC,OAAA;AAIA,IAAAC,SAAA,GAAAD,OAAA;AAIA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACO,MAAME,gBAAgB,GAAIC,MAA4B,IAAK;EACjE,MAAMC,GAAG,GAAG,IAAAC,uCAA6B,EAAC,CAAC;EAE3C,OACC,IAAAC,sCAAkB,EAAC;IAClBH,MAAM;IACNI,IAAI,EAAEH,GAAG;IACTI,SAAS,EAAEJ,GAAG,EAAEK,gBAAgB,IAAI;EACrC,CAAC,CAAC,EAAEC,UAAU,IAAI,IAAI;AAExB,CAAC;AAACC,OAAA,CAAAT,gBAAA,GAAAA,gBAAA","ignoreList":[]}

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

@@ -9,10 +9,16 @@ Object.defineProperty(exports, "ScreenGestureProvider", {
     return _gestures.ScreenGestureProvider;
   }
 });
-Object.defineProperty(exports, "useGestureStore", {
+Object.defineProperty(exports, "useOptionalScreenGestureStore", {
   enumerable: true,
   get: function () {
-    return _gestures.useGestureStore;
+    return _gestures.useOptionalScreenGestureStore;
+  }
+});
+Object.defineProperty(exports, "useScreenGestureStore", {
+  enumerable: true,
+  get: function () {
+    return _gestures.useScreenGestureStore;
   }
 });
 var _gestures = require("./gestures.provider");

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

@@ -1 +1 @@
-{"version":3,"names":["_gestures","require"],"sourceRoot":"../../../../../../src","sources":["shared/providers/screen/gestures/index.tsx"],"mappings":";;;;;;;;;;;;;;;;;AAAA,IAAAA,SAAA,GAAAC,OAAA","ignoreList":[]}
+{"version":3,"names":["_gestures","require"],"sourceRoot":"../../../../../../src","sources":["shared/providers/screen/gestures/index.tsx"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;AAAA,IAAAA,SAAA,GAAAC,OAAA","ignoreList":[]}

package/lib/commonjs/shared/providers/screen/gestures/ownership/gesture-ownership-bridge.js

@@ -10,7 +10,6 @@ var _ownership = require("../../../../types/ownership.types");
 var _descriptors = require("../../../screen/descriptors");
 var _blankStack = require("../../../stack/blank-stack.provider");
 var _gestures = require("../gestures.provider");
-var _ancestors = require("../shared/ancestors");
 var _policy = require("../shared/policy");
 var _shadowingClaims = require("./shadowing-claims");
 var _jsxRuntime = require("react/jsx-runtime");
@@ -24,12 +23,12 @@ const findShadowedDirections = (claimedDirections, ancestorDirections) => {
   }
   return shadowedDirections;
 };
-const findShadowedAncestors = (parentContext, claimedDirections) => {
-  if (!parentContext) {
+const findShadowedAncestors = (ancestorGestures, claimedDirections) => {
+  if (ancestorGestures.length === 0) {
     return NO_SHADOWED_ANCESTORS;
   }
   const ancestors = [];
-  for (const ancestor of (0, _ancestors.walkGestureAncestors)(parentContext)) {
+  for (const ancestor of ancestorGestures) {
     const directions = findShadowedDirections(claimedDirections, ancestor.claimedDirections);
     if (directions.length > 0) {
       ancestors.push({
@@ -84,29 +83,23 @@ const getDescriptorIsFirstKey = descriptor => {
   const routes = navigationState?.routes ?? [];
   return routes.findIndex(route => route.key === descriptor.route.key) === 0;
 };
-const getDescriptorClaimedDirections = (descriptor, gestureContext) => {
+const getDescriptorClaimedDirections = (descriptor, ancestorGestures) => {
   if (!descriptor) {
     return _ownership.NO_CLAIMS;
   }
   return (0, _policy.resolveScreenGestureConfig)({
     options: descriptor.options,
     isFirstKey: getDescriptorIsFirstKey(descriptor),
-    gestureContext
+    ancestorGestures
   }).participation.claimedDirections;
 };
-const requireGestureContext = gestureContext => {
-  if (!gestureContext) {
-    throw new Error("GestureOwnershipBridge must be rendered within a ScreenGestureProvider");
-  }
-  return gestureContext;
-};
 function ActiveGestureOwnershipBridge() {
-  const gestureContext = requireGestureContext((0, _gestures.useGestureStore)());
+  const gestureContext = (0, _gestures.useScreenGestureStore)();
   const previous = (0, _descriptors.useDescriptorsStore)(store => store.previous);
-  const isCurrentScreenClosing = (0, _blankStack.useBlankStackStore)(store => store?.scenesByKey[gestureContext.routeKey]?.activity === "closing");
+  const isCurrentScreenClosing = (0, _blankStack.useOptionalBlankStackStore)(store => store?.scenesByKey[gestureContext.routeKey]?.activity === "closing");
   const {
     claimedDirections,
-    gestureContext: parentContext,
+    ancestorGestures,
     routeKey: currentScreenKey
   } = gestureContext;
   // A retained closing screen cannot receive touches, so its ownership must
@@ -114,9 +107,9 @@ function ActiveGestureOwnershipBridge() {
   const effectiveClaimedDirections = (0, _react.useMemo)(() => (0, _shadowingClaims.resolveShadowingClaimDirections)({
     isCurrentScreenClosing,
     currentClaimedDirections: claimedDirections,
-    previousClaimedDirections: getDescriptorClaimedDirections(previous, parentContext)
-  }), [isCurrentScreenClosing, claimedDirections, previous, parentContext]);
-  const shadowedAncestors = (0, _react.useMemo)(() => findShadowedAncestors(parentContext, effectiveClaimedDirections), [parentContext, effectiveClaimedDirections]);
+    previousClaimedDirections: getDescriptorClaimedDirections(previous, ancestorGestures)
+  }), [isCurrentScreenClosing, claimedDirections, previous, ancestorGestures]);
+  const shadowedAncestors = (0, _react.useMemo)(() => findShadowedAncestors(ancestorGestures, effectiveClaimedDirections), [ancestorGestures, effectiveClaimedDirections]);
   (0, _react.useLayoutEffect)(() => {
     if (!shadowedAncestors.length) {
       return;

package/lib/commonjs/shared/providers/screen/gestures/ownership/gesture-ownership-bridge.js.map

@@ -1 +1 @@
-{"version":3,"names":["_react","require","_gesture","_ownership","_descriptors","_blankStack","_gestures","_ancestors","_policy","_shadowingClaims","_jsxRuntime","NO_SHADOWED_ANCESTORS","findShadowedDirections","claimedDirections","ancestorDirections","shadowedDirections","direction","DIRECTIONS","push","findShadowedAncestors","parentContext","ancestors","ancestor","walkGestureAncestors","directions","length","registerShadowingClaims","shadowedAncestors","currentScreenKey","isDismissing","GestureStore","getValue","newClaims","childDirectionClaims","get","routeKey","set","clearShadowingClaims","currentClaims","needsUpdate","getDescriptorIsFirstKey","descriptor","navigationState","navigation","getState","routes","findIndex","route","key","getDescriptorClaimedDirections","gestureContext","NO_CLAIMS","resolveScreenGestureConfig","options","isFirstKey","participation","requireGestureContext","Error","ActiveGestureOwnershipBridge","useGestureStore","previous","useDescriptorsStore","store","isCurrentScreenClosing","useBlankStackStore","scenesByKey","activity","effectiveClaimedDirections","useMemo","resolveShadowingClaimDirections","currentClaimedDirections","previousClaimedDirections","useLayoutEffect","GestureOwnershipBridge","isTopMostScreen","derivations","jsx"],"sourceRoot":"../../../../../../../src","sources":["shared/providers/screen/gestures/ownership/gesture-ownership-bridge.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_react","require","_gesture","_ownership","_descriptors","_blankStack","_gestures","_policy","_shadowingClaims","_jsxRuntime","NO_SHADOWED_ANCESTORS","findShadowedDirections","claimedDirections","ancestorDirections","shadowedDirections","direction","DIRECTIONS","push","findShadowedAncestors","ancestorGestures","length","ancestors","ancestor","directions","registerShadowingClaims","shadowedAncestors","currentScreenKey","isDismissing","GestureStore","getValue","newClaims","childDirectionClaims","get","routeKey","set","clearShadowingClaims","currentClaims","needsUpdate","getDescriptorIsFirstKey","descriptor","navigationState","navigation","getState","routes","findIndex","route","key","getDescriptorClaimedDirections","NO_CLAIMS","resolveScreenGestureConfig","options","isFirstKey","participation","ActiveGestureOwnershipBridge","gestureContext","useScreenGestureStore","previous","useDescriptorsStore","store","isCurrentScreenClosing","useOptionalBlankStackStore","scenesByKey","activity","effectiveClaimedDirections","useMemo","resolveShadowingClaimDirections","currentClaimedDirections","previousClaimedDirections","useLayoutEffect","GestureOwnershipBridge","isTopMostScreen","derivations","jsx"],"sourceRoot":"../../../../../../../src","sources":["shared/providers/screen/gestures/ownership/gesture-ownership-bridge.tsx"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/shared/providers/screen/gestures/ownership/resolve-ownership.js

@@ -23,15 +23,15 @@ var _ownership = require("../../../../types/ownership.types");
  * used in worklets since it's a plain object.
  *
  * @param selfClaims - The directions claimed by the current screen
- * @param gestureContext - The gesture context chain (can be null if no ancestors)
+ * @param ancestors - Nearest-first ancestor gesture values from screen topology.
  * @returns Ownership status for all four directions
  */
-function resolveOwnership(selfClaims, gestureContext) {
+function resolveOwnership(selfClaims, ancestors) {
   const result = {
     ..._ownership.NO_OWNERSHIP
   };
   for (const direction of _ownership.DIRECTIONS) {
-    result[direction] = resolveDirectionOwnership(direction, selfClaims, gestureContext);
+    result[direction] = resolveDirectionOwnership(direction, selfClaims, ancestors);
   }
   return result;
 }
@@ -39,19 +39,17 @@ function resolveOwnership(selfClaims, gestureContext) {
 /**
  * Resolves ownership for a single direction.
  */
-function resolveDirectionOwnership(direction, selfClaims, gestureContext) {
+function resolveDirectionOwnership(direction, selfClaims, ancestors) {
   // Check self first
   if (selfClaims[direction]) {
     return "self";
   }
 
   // Walk ancestors looking for a claim
-  let ancestor = gestureContext;
-  while (ancestor) {
+  for (const ancestor of ancestors) {
     if (ancestor.claimedDirections?.[direction]) {
       return "ancestor";
     }
-    ancestor = ancestor.gestureContext;
   }
 
   // No one claims this direction