react-native-screen-transitions 3.10.0 → 3.11.1

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

@@ -3,15 +3,13 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.DescriptorsProvider = DescriptorsProvider;
-exports.useDescriptorDerivations = useDescriptorDerivations;
-exports.useDescriptors = useDescriptors;
-exports.useDescriptorsStore = void 0;
+exports.useDescriptorsStore = exports.DescriptorsProvider = void 0;
 var _react = require("react");
+var _context = require("../../../adapters/with-screen-transitions/context");
+var _blankStack = require("../../../providers/stack/blank-stack.provider");
 var _createProvider = _interopRequireDefault(require("../../../utils/create-provider"));
 var _deriveDescriptorDerivations = require("./helpers/derive-descriptor-derivations");
 var _getAncestorKeys = require("./helpers/get-ancestor-keys");
-var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 /**
  * Base descriptor interface - minimal contract for all stack types.
@@ -20,7 +18,7 @@ function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e
  */
 
 const {
-  DescriptorsProvider: InternalDescriptorsProvider,
+  DescriptorsProvider,
   useDescriptorsStore
 } = (0, _createProvider.default)("Descriptors", {
   guarded: true
@@ -28,54 +26,44 @@ const {
   previous,
   current,
   next,
+  routeKey,
   children
 }) => {
+  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 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;
+  if (!resolvedCurrent) {
+    throw new Error(`Descriptors scene "${routeKey ?? "unknown"}" was not found.`);
+  }
   const descriptors = (0, _react.useMemo)(() => ({
-    previous,
-    current,
-    next
-  }), [previous, current, next]);
-  const {
-    ancestorKeys,
-    ancestorDestinationPairKey
-  } = (0, _react.useMemo)(() => (0, _getAncestorKeys.getAncestorKeyState)(current), [current]);
+    previous: resolvedPrevious,
+    current: resolvedCurrent,
+    next: resolvedNext
+  }), [resolvedPrevious, resolvedCurrent, resolvedNext]);
+  const ancestorKeys = (0, _react.useMemo)(() => (0, _getAncestorKeys.getAncestorKeys)(resolvedCurrent), [resolvedCurrent]);
   const derivations = (0, _react.useMemo)(() => (0, _deriveDescriptorDerivations.deriveDescriptorDerivations)({
-    previous,
-    current,
-    next,
-    ancestorKeys,
-    ancestorDestinationPairKey
-  }), [previous, current, next, ancestorKeys, ancestorDestinationPairKey]);
-  const value = (0, _react.useMemo)(() => ({
-    descriptors,
-    derivations
-  }), [descriptors, derivations]);
+    previous: resolvedPrevious,
+    current: resolvedCurrent,
+    next: resolvedNext,
+    ancestorKeys
+  }), [resolvedPrevious, resolvedCurrent, resolvedNext, ancestorKeys]);
   return {
-    value,
+    value: {
+      previous: resolvedPrevious,
+      current: resolvedCurrent,
+      next: resolvedNext,
+      descriptors,
+      derivations,
+      options: resolvedCurrent.options
+    },
     children
   };
 });
 exports.useDescriptorsStore = useDescriptorsStore;
-function DescriptorsProvider({
-  children,
-  previous,
-  current,
-  next
-}) {
-  const providerProps = {
-    previous,
-    current,
-    next,
-    children
-  };
-  return /*#__PURE__*/(0, _jsxRuntime.jsx)(InternalDescriptorsProvider, {
-    ...providerProps
-  });
-}
-function useDescriptors() {
-  return useDescriptorsStore(store => store.descriptors);
-}
-function useDescriptorDerivations() {
-  return useDescriptorsStore(store => store.derivations);
-}
+exports.DescriptorsProvider = DescriptorsProvider;
 //# sourceMappingURL=descriptors.provider.js.map

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

@@ -1 +1 @@
-{"version":3,"names":["_react","require","_createProvider","_interopRequireDefault","_deriveDescriptorDerivations","_getAncestorKeys","_jsxRuntime","e","__esModule","default","DescriptorsProvider","InternalDescriptorsProvider","useDescriptorsStore","createProvider","guarded","previous","current","next","children","descriptors","useMemo","ancestorKeys","ancestorDestinationPairKey","getAncestorKeyState","derivations","deriveDescriptorDerivations","value","exports","providerProps","jsx","useDescriptors","store","useDescriptorDerivations"],"sourceRoot":"../../../../../../src","sources":["shared/providers/screen/descriptors/descriptors.provider.tsx"],"mappings":";;;;;;;;;AACA,IAAAA,MAAA,GAAAC,OAAA;AAEA,IAAAC,eAAA,GAAAC,sBAAA,CAAAF,OAAA;AAEA,IAAAG,4BAAA,GAAAH,OAAA;AACA,IAAAI,gBAAA,GAAAJ,OAAA;AAAkE,IAAAK,WAAA,GAAAL,OAAA;AAAA,SAAAE,uBAAAI,CAAA,WAAAA,CAAA,IAAAA,CAAA,CAAAC,UAAA,GAAAD,CAAA,KAAAE,OAAA,EAAAF,CAAA;AAElE;AACA;AACA;AACA;AACA;;AA2BA,MAAM;EACLG,mBAAmB,EAAEC,2BAA2B;EAChDC;AACD,CAAC,GAAG,IAAAC,uBAAc,EAAC,aAAa,EAAE;EAAEC,OAAO,EAAE;AAAK,CAAC,CAAC,CAGlD,CAAC;EAAEC,QAAQ;EAAEC,OAAO;EAAEC,IAAI;EAAEC;AAAS,CAAC,KAAK;EAC5C,MAAMC,WAAW,GAAG,IAAAC,cAAO,EAC1B,OAAO;IAAEL,QAAQ;IAAEC,OAAO;IAAEC;EAAK,CAAC,CAAC,EACnC,CAACF,QAAQ,EAAEC,OAAO,EAAEC,IAAI,CACzB,CAAC;EAED,MAAM;IAAEI,YAAY;IAAEC;EAA2B,CAAC,GAAG,IAAAF,cAAO,EAC3D,MAAM,IAAAG,oCAAmB,EAACP,OAAO,CAAC,EAClC,CAACA,OAAO,CACT,CAAC;EAED,MAAMQ,WAAW,GAAG,IAAAJ,cAAO,EAC1B,MACC,IAAAK,wDAA2B,EAAC;IAC3BV,QAAQ;IACRC,OAAO;IACPC,IAAI;IACJI,YAAY;IACZC;EACD,CAAC,CAAC,EACH,CAACP,QAAQ,EAAEC,OAAO,EAAEC,IAAI,EAAEI,YAAY,EAAEC,0BAA0B,CACnE,CAAC;EAED,MAAMI,KAAK,GAAG,IAAAN,cAAO,EACpB,OAAO;IACND,WAAW;IACXK;EACD,CAAC,CAAC,EACF,CAACL,WAAW,EAAEK,WAAW,CAC1B,CAAC;EAED,OAAO;IACNE,KAAK;IACLR;EACD,CAAC;AACF,CAAC,CAAC;AAACS,OAAA,CAAAf,mBAAA,GAAAA,mBAAA;AAEI,SAASF,mBAAmBA,CAAqC;EACvEQ,QAAQ;EACRH,QAAQ;EACRC,OAAO;EACPC;AACsC,CAAC,EAAE;EACzC,MAAMW,aAAa,GAAG;IACrBb,QAAQ;IACRC,OAAO;IACPC,IAAI;IACJC;EACD,CAAC;EAED,oBAAO,IAAAZ,WAAA,CAAAuB,GAAA,EAAClB,2BAA2B;IAAA,GAAKiB;EAAa,CAAG,CAAC;AAC1D;AAEO,SAASE,cAAcA,CAAA,EAE1B;EACH,OAAOlB,mBAAmB,CACxBmB,KAAK,IAAKA,KAAK,CAACZ,WAClB,CAAC;AACF;AAEO,SAASa,wBAAwBA,CAAA,EAAsC;EAC7E,OAAOpB,mBAAmB,CAAEmB,KAAK,IAAKA,KAAK,CAACP,WAAW,CAAC;AACzD","ignoreList":[]}
+{"version":3,"names":["_react","require","_context","_blankStack","_createProvider","_interopRequireDefault","_deriveDescriptorDerivations","_getAncestorKeys","e","__esModule","default","DescriptorsProvider","useDescriptorsStore","createProvider","guarded","previous","current","next","routeKey","children","blankStackCurrent","useBlankStackStore","store","scenesByKey","descriptor","undefined","blankStackPrevious","previousDescriptor","blankStackNext","nextDescriptor","adapterContext","useScreenTransitionsAdapterOptionalContext","adapterScene","scenes","routeIndexByKey","get","resolvedCurrent","resolvedPrevious","resolvedNext","Error","descriptors","useMemo","ancestorKeys","getAncestorKeys","derivations","deriveDescriptorDerivations","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

@@ -9,8 +9,7 @@ function deriveDescriptorDerivations({
   previous,
   current,
   next,
-  ancestorKeys,
-  ancestorDestinationPairKey
+  ancestorKeys
 }) {
   const previousScreenKey = previous?.route.key;
   const currentScreenKey = current.route.key;
@@ -28,7 +27,6 @@ function deriveDescriptorDerivations({
     nextScreenKey,
     sourcePairKey,
     destinationPairKey,
-    ancestorDestinationPairKey,
     parentScreenKey: ancestorKeys[0],
     isFirstKey,
     isTopMostScreen,

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","ancestorDestinationPairKey","previousScreenKey","route","key","currentScreenKey","nextScreenKey","sourcePairKey","createScreenPairKey","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,IAAAA,UAAA,GAAAC,OAAA;AA0BO,SAASC,2BAA2BA,CAAC;EAC3CC,QAAQ;EACRC,OAAO;EACPC,IAAI;EACJC,YAAY;EACZC;AACO,CAAC,EAAyB;EACjC,MAAMC,iBAAiB,GAAGL,QAAQ,EAAEM,KAAK,CAACC,GAAG;EAC7C,MAAMC,gBAAgB,GAAGP,OAAO,CAACK,KAAK,CAACC,GAAG;EAC1C,MAAME,aAAa,GAAGP,IAAI,EAAEI,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,GAAGb,OAAO,CAACc,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,KAAKN,OAAO,CAACK,KAAK,CAACC,GAAG,CAAC,KAAK,CAAC;EACnE,MAAMa,eAAe,GAAG,CAAClB,IAAI;EAC7B,MAAMmB,yBAAyB,GAC9B,CAAC,CAACpB,OAAO,CAACqB,OAAO,CAACC,uBAAuB,IACzC,CAAC,CAACrB,IAAI,EAAEoB,OAAO,EAAEC,uBAAuB;EAEzC,OAAO;IACNlB,iBAAiB;IACjBG,gBAAgB;IAChBC,aAAa;IACbC,aAAa;IACbG,kBAAkB;IAClBT,0BAA0B;IAC1BoB,eAAe,EAAErB,YAAY,CAAC,CAAC,CAAC;IAChCe,UAAU;IACVE,eAAe;IACfjB,YAAY;IACZkB;EACD,CAAC;AACF","ignoreList":[]}
+{"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","parentScreenKey"],"sourceRoot":"../../../../../../../src","sources":["shared/providers/screen/descriptors/helpers/derive-descriptor-derivations.ts"],"mappings":";;;;;;AAAA,IAAAA,UAAA,GAAAC,OAAA;AAwBO,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;IACbG,kBAAkB;IAClBW,eAAe,EAAEpB,YAAY,CAAC,CAAC,CAAC;IAChCc,UAAU;IACVE,eAAe;IACfhB,YAAY;IACZiB;EACD,CAAC;AACF","ignoreList":[]}

package/lib/commonjs/shared/providers/screen/descriptors/helpers/get-ancestor-keys.js

@@ -3,22 +3,15 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getAncestorKeyState = getAncestorKeyState;
 exports.getAncestorKeys = getAncestorKeys;
-var _linkPairs = require("../../../../stores/bounds/helpers/link-pairs.helpers");
 /**
  * Builds nested navigator ancestor keys from immediate parent to root.
- * The nearest ancestor destination pair lets child routes attach measurements
- * to the transition owned by the parent stack.
  */
-function getAncestorKeyState(current) {
+function getAncestorKeys(current) {
   const ancestors = [];
-  let ancestorDestinationPairKey;
   const nav = current.navigation;
   if (typeof nav?.getParent !== "function") {
-    return {
-      ancestorKeys: ancestors
-    };
+    return ancestors;
   }
   let parent = nav.getParent();
   while (parent) {
@@ -27,20 +20,10 @@ function getAncestorKeyState(current) {
       const focusedRoute = state.routes[state.index];
       if (focusedRoute?.key) {
         ancestors.push(focusedRoute.key);
-        const previousRoute = state.routes[state.index - 1];
-        if (!ancestorDestinationPairKey && previousRoute?.key) {
-          ancestorDestinationPairKey = (0, _linkPairs.createScreenPairKey)(previousRoute.key, focusedRoute.key);
-        }
       }
     }
     parent = parent.getParent();
   }
-  return {
-    ancestorKeys: ancestors,
-    ancestorDestinationPairKey
-  };
-}
-function getAncestorKeys(current) {
-  return getAncestorKeyState(current).ancestorKeys;
+  return ancestors;
 }
 //# sourceMappingURL=get-ancestor-keys.js.map

package/lib/commonjs/shared/providers/screen/descriptors/helpers/get-ancestor-keys.js.map

@@ -1 +1 @@
-{"version":3,"names":["_linkPairs","require","getAncestorKeyState","current","ancestors","ancestorDestinationPairKey","nav","navigation","getParent","ancestorKeys","parent","state","getState","routes","index","undefined","focusedRoute","key","push","previousRoute","createScreenPairKey","getAncestorKeys"],"sourceRoot":"../../../../../../../src","sources":["shared/providers/screen/descriptors/helpers/get-ancestor-keys.ts"],"mappings":";;;;;;;AAAA,IAAAA,UAAA,GAAAC,OAAA;AASA;AACA;AACA;AACA;AACA;AACO,SAASC,mBAAmBA,CAClCC,OAA4B,EACT;EACnB,MAAMC,SAAmB,GAAG,EAAE;EAC9B,IAAIC,0BAAqD;EACzD,MAAMC,GAAG,GAAGH,OAAO,CAACI,UAAiB;EAErC,IAAI,OAAOD,GAAG,EAAEE,SAAS,KAAK,UAAU,EAAE;IACzC,OAAO;MAAEC,YAAY,EAAEL;IAAU,CAAC;EACnC;EAEA,IAAIM,MAAM,GAAGJ,GAAG,CAACE,SAAS,CAAC,CAAC;EAE5B,OAAOE,MAAM,EAAE;IACd,MAAMC,KAAK,GAAGD,MAAM,CAACE,QAAQ,CAAC,CAAC;IAC/B,IAAID,KAAK,EAAEE,MAAM,IAAIF,KAAK,CAACG,KAAK,KAAKC,SAAS,EAAE;MAC/C,MAAMC,YAAY,GAAGL,KAAK,CAACE,MAAM,CAACF,KAAK,CAACG,KAAK,CAAC;MAC9C,IAAIE,YAAY,EAAEC,GAAG,EAAE;QACtBb,SAAS,CAACc,IAAI,CAACF,YAAY,CAACC,GAAG,CAAC;QAEhC,MAAME,aAAa,GAAGR,KAAK,CAACE,MAAM,CAACF,KAAK,CAACG,KAAK,GAAG,CAAC,CAAC;QACnD,IAAI,CAACT,0BAA0B,IAAIc,aAAa,EAAEF,GAAG,EAAE;UACtDZ,0BAA0B,GAAG,IAAAe,8BAAmB,EAC/CD,aAAa,CAACF,GAAG,EACjBD,YAAY,CAACC,GACd,CAAC;QACF;MACD;IACD;IACAP,MAAM,GAAGA,MAAM,CAACF,SAAS,CAAC,CAAC;EAC5B;EAEA,OAAO;IACNC,YAAY,EAAEL,SAAS;IACvBC;EACD,CAAC;AACF;AAEO,SAASgB,eAAeA,CAAClB,OAA4B,EAAY;EACvE,OAAOD,mBAAmB,CAACC,OAAO,CAAC,CAACM,YAAY;AACjD","ignoreList":[]}
+{"version":3,"names":["getAncestorKeys","current","ancestors","nav","navigation","getParent","parent","state","getState","routes","index","undefined","focusedRoute","key","push"],"sourceRoot":"../../../../../../../src","sources":["shared/providers/screen/descriptors/helpers/get-ancestor-keys.ts"],"mappings":";;;;;;AAEA;AACA;AACA;AACO,SAASA,eAAeA,CAACC,OAA4B,EAAY;EACvE,MAAMC,SAAmB,GAAG,EAAE;EAC9B,MAAMC,GAAG,GAAGF,OAAO,CAACG,UAAiB;EAErC,IAAI,OAAOD,GAAG,EAAEE,SAAS,KAAK,UAAU,EAAE;IACzC,OAAOH,SAAS;EACjB;EAEA,IAAII,MAAM,GAAGH,GAAG,CAACE,SAAS,CAAC,CAAC;EAE5B,OAAOC,MAAM,EAAE;IACd,MAAMC,KAAK,GAAGD,MAAM,CAACE,QAAQ,CAAC,CAAC;IAC/B,IAAID,KAAK,EAAEE,MAAM,IAAIF,KAAK,CAACG,KAAK,KAAKC,SAAS,EAAE;MAC/C,MAAMC,YAAY,GAAGL,KAAK,CAACE,MAAM,CAACF,KAAK,CAACG,KAAK,CAAC;MAC9C,IAAIE,YAAY,EAAEC,GAAG,EAAE;QACtBX,SAAS,CAACY,IAAI,CAACF,YAAY,CAACC,GAAG,CAAC;MACjC;IACD;IACAP,MAAM,GAAGA,MAAM,CAACD,SAAS,CAAC,CAAC;EAC5B;EAEA,OAAOH,SAAS;AACjB","ignoreList":[]}

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

@@ -9,18 +9,6 @@ Object.defineProperty(exports, "DescriptorsProvider", {
     return _descriptors.DescriptorsProvider;
   }
 });
-Object.defineProperty(exports, "useDescriptorDerivations", {
-  enumerable: true,
-  get: function () {
-    return _descriptors.useDescriptorDerivations;
-  }
-});
-Object.defineProperty(exports, "useDescriptors", {
-  enumerable: true,
-  get: function () {
-    return _descriptors.useDescriptors;
-  }
-});
 Object.defineProperty(exports, "useDescriptorsStore", {
   enumerable: true,
   get: function () {

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

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

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.useGestureContext = exports.ScreenGestureProvider = void 0;
+exports.useGestureStore = exports.ScreenGestureProvider = void 0;
 var _react = require("react");
 var _reactNativeGestureHandler = require("react-native-gesture-handler");
 var _reactNativeReanimated = require("react-native-reanimated");
@@ -18,17 +18,17 @@ var _types = require("./types");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const {
   ScreenGestureProvider,
-  useScreenGestureContext: useGestureContext
+  useScreenGestureStore: useGestureStore
 } = (0, _createProvider.default)("ScreenGesture", {
   guarded: false
 })(({
   children
+}, {
+  useParentStore
 }) => {
-  const gestureContext = useGestureContext();
+  const gestureContext = useParentStore();
   const gestureConfig = (0, _useScreenGestureConfig.useScreenGestureConfig)();
-  const {
-    currentScreenKey
-  } = (0, _descriptors.useDescriptorDerivations)();
+  const currentScreenKey = (0, _descriptors.useDescriptorsStore)(store => store.derivations.currentScreenKey);
   const scrollState = _scroll.ScrollStore.getValue(currentScreenKey, "coordination");
 
   // Ancestors read this before activating. If a nested screen claims the same
@@ -65,6 +65,6 @@ const {
     children
   };
 });
-exports.useGestureContext = useGestureContext;
+exports.useGestureStore = useGestureStore;
 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","_useWalkUpAndRegisterShadowingClaims","_useBuildPanGesture","_useBuildPinchGesture","_types","e","__esModule","default","ScreenGestureProvider","useScreenGestureContext","useGestureContext","createProvider","guarded","children","gestureContext","gestureConfig","useScreenGestureConfig","currentScreenKey","useDescriptorDerivations","scrollState","ScrollStore","getValue","childDirectionClaims","useSharedValue","NO_DIRECTION_CLAIMS","gestureCompositionOwner","panGesture","useBuildPanGesture","pinchGesture","useBuildPinchGesture","detectorGesture","useMemo","Gesture","Simultaneous","value","routeKey","claimedDirections","participation","useWalkUpAndRegisterShadowingClaims","exports"],"sourceRoot":"../../../../../../src","sources":["shared/providers/screen/gestures/gestures.provider.tsx"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,OAAA;AACA,IAAAC,0BAAA,GAAAD,OAAA;AACA,IAAAE,sBAAA,GAAAF,OAAA;AACA,IAAAG,OAAA,GAAAH,OAAA;AACA,IAAAI,eAAA,GAAAC,sBAAA,CAAAL,OAAA;AACA,IAAAM,YAAA,GAAAN,OAAA;AACA,IAAAO,uBAAA,GAAAP,OAAA;AACA,IAAAQ,oCAAA,GAAAR,OAAA;AACA,IAAAS,mBAAA,GAAAT,OAAA;AACA,IAAAU,qBAAA,GAAAV,OAAA;AACA,IAAAW,MAAA,GAAAX,OAAA;AAKiB,SAAAK,uBAAAO,CAAA,WAAAA,CAAA,IAAAA,CAAA,CAAAC,UAAA,GAAAD,CAAA,KAAAE,OAAA,EAAAF,CAAA;AAMV,MAAM;EACZG,qBAAqB;EACrBC,uBAAuB,EAAEC;AAC1B,CAAC,GAAG,IAAAC,uBAAc,EAAC,eAAe,EAAE;EAAEC,OAAO,EAAE;AAAM,CAAC,CAAC,CAGrD,CAAC;EAAEC;AAAS,CAAC,KAA+D;EAC7E,MAAMC,cAAc,GAAGJ,iBAAiB,CAAC,CAAC;EAC1C,MAAMK,aAAa,GAAG,IAAAC,8CAAsB,EAAC,CAAC;EAC9C,MAAM;IAAEC;EAAiB,CAAC,GAAG,IAAAC,qCAAwB,EAAC,CAAC;EAEvD,MAAMC,WAAW,GAAGC,mBAAW,CAACC,QAAQ,CAACJ,gBAAgB,EAAE,cAAc,CAAC;;EAE1E;EACA;EACA,MAAMK,oBAAoB,GACzB,IAAAC,qCAAc,EAAoBC,0BAAmB,CAAC;;EAEvD;EACA;EACA,MAAMC,uBAAuB,GAAG,IAAAF,qCAAc,EAA0B,IAAI,CAAC;EAE7E,MAAMG,UAAU,GAAG,IAAAC,sCAAkB,EAAC;IACrCR,WAAW;IACXJ,aAAa;IACbO,oBAAoB;IACpBG;EACD,CAAC,CAAC;EAEF,MAAMG,YAAY,GAAG,IAAAC,0CAAoB,EAAC;IACzCd,aAAa;IACbU;EACD,CAAC,CAAC;EAEF,MAAMK,eAAe,GAAG,IAAAC,cAAO,EAC9B,MAAMC,kCAAO,CAACC,YAAY,CAACP,UAAU,EAAEE,YAAY,CAAC,EACpD,CAACF,UAAU,EAAEE,YAAY,CAC1B,CAAC;EAED,MAAMM,KAAK,GAAG,IAAAH,cAAO,EACpB,OAAO;IACNI,QAAQ,EAAElB,gBAAgB;IAC1Ba,eAAe;IACfJ,UAAU;IACVE,YAAY;IACZT,WAAW;IACXL,cAAc;IACdsB,iBAAiB,EAAErB,aAAa,CAACsB,aAAa,CAACD,iBAAiB;IAChEd;EACD,CAAC,CAAC,EACF,CACCL,gBAAgB,EAChBa,eAAe,EACfJ,UAAU,EACVE,YAAY,EACZT,WAAW,EACXL,cAAc,EACdC,aAAa,CAACsB,aAAa,CAACD,iBAAiB,EAC7Cd,oBAAoB,CAEtB,CAAC;EAED,IAAAgB,wEAAmC,EAClCvB,aAAa,CAACsB,aAAa,CAACD,iBAC7B,CAAC;EAED,OAAO;IACNF,KAAK;IACLrB;EACD,CAAC;AACF,CAAC,CAAC;AAAC0B,OAAA,CAAA7B,iBAAA,GAAAA,iBAAA;AAAA6B,OAAA,CAAA/B,qBAAA,GAAAA,qBAAA","ignoreList":[]}
+{"version":3,"names":["_react","require","_reactNativeGestureHandler","_reactNativeReanimated","_scroll","_createProvider","_interopRequireDefault","_descriptors","_useScreenGestureConfig","_useWalkUpAndRegisterShadowingClaims","_useBuildPanGesture","_useBuildPinchGesture","_types","e","__esModule","default","ScreenGestureProvider","useScreenGestureStore","useGestureStore","createProvider","guarded","children","useParentStore","gestureContext","gestureConfig","useScreenGestureConfig","currentScreenKey","useDescriptorsStore","store","derivations","scrollState","ScrollStore","getValue","childDirectionClaims","useSharedValue","NO_DIRECTION_CLAIMS","gestureCompositionOwner","panGesture","useBuildPanGesture","pinchGesture","useBuildPinchGesture","detectorGesture","useMemo","Gesture","Simultaneous","value","routeKey","claimedDirections","participation","useWalkUpAndRegisterShadowingClaims","exports"],"sourceRoot":"../../../../../../src","sources":["shared/providers/screen/gestures/gestures.provider.tsx"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,OAAA;AACA,IAAAC,0BAAA,GAAAD,OAAA;AACA,IAAAE,sBAAA,GAAAF,OAAA;AACA,IAAAG,OAAA,GAAAH,OAAA;AACA,IAAAI,eAAA,GAAAC,sBAAA,CAAAL,OAAA;AACA,IAAAM,YAAA,GAAAN,OAAA;AACA,IAAAO,uBAAA,GAAAP,OAAA;AACA,IAAAQ,oCAAA,GAAAR,OAAA;AACA,IAAAS,mBAAA,GAAAT,OAAA;AACA,IAAAU,qBAAA,GAAAV,OAAA;AACA,IAAAW,MAAA,GAAAX,OAAA;AAKiB,SAAAK,uBAAAO,CAAA,WAAAA,CAAA,IAAAA,CAAA,CAAAC,UAAA,GAAAD,CAAA,KAAAE,OAAA,EAAAF,CAAA;AAMV,MAAM;EAAEG,qBAAqB;EAAEC,qBAAqB,EAAEC;AAAgB,CAAC,GAC7E,IAAAC,uBAAc,EAAC,eAAe,EAAE;EAAEC,OAAO,EAAE;AAAM,CAAC,CAAC,CAIlD,CACC;EAAEC;AAAS,CAAC,EACZ;EAAEC;AAAe,CAAC,KAC4C;EAC9D,MAAMC,cAAc,GAAGD,cAAc,CAAC,CAAC;EACvC,MAAME,aAAa,GAAG,IAAAC,8CAAsB,EAAC,CAAC;EAC9C,MAAMC,gBAAgB,GAAG,IAAAC,gCAAmB,EAC1CC,KAAK,IAAKA,KAAK,CAACC,WAAW,CAACH,gBAC9B,CAAC;EAED,MAAMI,WAAW,GAAGC,mBAAW,CAACC,QAAQ,CACvCN,gBAAgB,EAChB,cACD,CAAC;;EAED;EACA;EACA,MAAMO,oBAAoB,GACzB,IAAAC,qCAAc,EAAoBC,0BAAmB,CAAC;;EAEvD;EACA;EACA,MAAMC,uBAAuB,GAC5B,IAAAF,qCAAc,EAA0B,IAAI,CAAC;EAE9C,MAAMG,UAAU,GAAG,IAAAC,sCAAkB,EAAC;IACrCR,WAAW;IACXN,aAAa;IACbS,oBAAoB;IACpBG;EACD,CAAC,CAAC;EAEF,MAAMG,YAAY,GAAG,IAAAC,0CAAoB,EAAC;IACzChB,aAAa;IACbY;EACD,CAAC,CAAC;EAEF,MAAMK,eAAe,GAAG,IAAAC,cAAO,EAC9B,MAAMC,kCAAO,CAACC,YAAY,CAACP,UAAU,EAAEE,YAAY,CAAC,EACpD,CAACF,UAAU,EAAEE,YAAY,CAC1B,CAAC;EAED,MAAMM,KAAK,GAAG,IAAAH,cAAO,EACpB,OAAO;IACNI,QAAQ,EAAEpB,gBAAgB;IAC1Be,eAAe;IACfJ,UAAU;IACVE,YAAY;IACZT,WAAW;IACXP,cAAc;IACdwB,iBAAiB,EAAEvB,aAAa,CAACwB,aAAa,CAACD,iBAAiB;IAChEd;EACD,CAAC,CAAC,EACF,CACCP,gBAAgB,EAChBe,eAAe,EACfJ,UAAU,EACVE,YAAY,EACZT,WAAW,EACXP,cAAc,EACdC,aAAa,CAACwB,aAAa,CAACD,iBAAiB,EAC7Cd,oBAAoB,CAEtB,CAAC;EAED,IAAAgB,wEAAmC,EAClCzB,aAAa,CAACwB,aAAa,CAACD,iBAC7B,CAAC;EAED,OAAO;IACNF,KAAK;IACLxB;EACD,CAAC;AACF,CACD,CAAC;AAAC6B,OAAA,CAAAhC,eAAA,GAAAA,eAAA;AAAAgC,OAAA,CAAAlC,qBAAA,GAAAA,qBAAA","ignoreList":[]}

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

@@ -9,15 +9,9 @@ var _descriptors = require("../../descriptors");
 var _gestures = require("../gestures.provider");
 var _policy = require("../shared/policy");
 function useScreenGestureConfig() {
-  const gestureContext = (0, _gestures.useGestureContext)();
-  const {
-    current: {
-      options
-    }
-  } = (0, _descriptors.useDescriptors)();
-  const {
-    isFirstKey
-  } = (0, _descriptors.useDescriptorDerivations)();
+  const gestureContext = (0, _gestures.useGestureStore)();
+  const options = (0, _descriptors.useDescriptorsStore)(store => store.options);
+  const isFirstKey = (0, _descriptors.useDescriptorsStore)(store => store.derivations.isFirstKey);
   return (0, _react.useMemo)(() => (0, _policy.resolveScreenGestureConfig)({
     options,
     isFirstKey,

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

@@ -1 +1 @@
-{"version":3,"names":["_react","require","_descriptors","_gestures","_policy","useScreenGestureConfig","gestureContext","useGestureContext","current","options","useDescriptors","isFirstKey","useDescriptorDerivations","useMemo","resolveScreenGestureConfig"],"sourceRoot":"../../../../../../../src","sources":["shared/providers/screen/gestures/hooks/use-screen-gesture-config.ts"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,OAAA;AACA,IAAAC,YAAA,GAAAD,OAAA;AACA,IAAAE,SAAA,GAAAF,OAAA;AACA,IAAAG,OAAA,GAAAH,OAAA;AAGO,SAASI,sBAAsBA,CAAA,EAAwB;EAC7D,MAAMC,cAAc,GAAG,IAAAC,2BAAiB,EAAC,CAAC;EAC1C,MAAM;IACLC,OAAO,EAAE;MAAEC;IAAQ;EACpB,CAAC,GAAG,IAAAC,2BAAc,EAAC,CAAC;EAEpB,MAAM;IAAEC;EAAW,CAAC,GAAG,IAAAC,qCAAwB,EAAC,CAAC;EAEjD,OAAO,IAAAC,cAAO,EACb,MACC,IAAAC,kCAA0B,EAAC;IAC1BL,OAAO;IACPE,UAAU;IACVL;EACD,CAAC,CAAC,EACH,CAACK,UAAU,EAAEF,OAAO,EAAEH,cAAc,CACrC,CAAC;AACF","ignoreList":[]}
+{"version":3,"names":["_react","require","_descriptors","_gestures","_policy","useScreenGestureConfig","gestureContext","useGestureStore","options","useDescriptorsStore","store","isFirstKey","derivations","useMemo","resolveScreenGestureConfig"],"sourceRoot":"../../../../../../../src","sources":["shared/providers/screen/gestures/hooks/use-screen-gesture-config.ts"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,OAAA;AACA,IAAAC,YAAA,GAAAD,OAAA;AACA,IAAAE,SAAA,GAAAF,OAAA;AACA,IAAAG,OAAA,GAAAH,OAAA;AAGO,SAASI,sBAAsBA,CAAA,EAAwB;EAC7D,MAAMC,cAAc,GAAG,IAAAC,yBAAe,EAAC,CAAC;EACxC,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;EAED,OAAO,IAAAE,cAAO,EACb,MACC,IAAAC,kCAA0B,EAAC;IAC1BN,OAAO;IACPG,UAAU;IACVL;EACD,CAAC,CAAC,EACH,CAACK,UAAU,EAAEH,OAAO,EAAEF,cAAc,CACrC,CAAC;AACF","ignoreList":[]}

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

@@ -21,7 +21,7 @@ var _ancestors = require("../shared/ancestors");
  * ```
  */
 const useScreenGesture = target => {
-  const ctx = (0, _gestures.useGestureContext)();
+  const ctx = (0, _gestures.useGestureStore)();
   return (0, _resolveChainTarget.resolveChainTarget)({
     target,
     self: ctx,

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","useGestureContext","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,2BAAiB,EAAC,CAAC;EAE/B,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","_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":[]}

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

@@ -11,9 +11,7 @@ var _gesture = require("../../../../stores/gesture.store");
 var _system = require("../../../../stores/system.store");
 var _descriptors = require("../../descriptors");
 function useStableRuntimeConfig(runtimeConfigInput) {
-  const {
-    currentScreenKey
-  } = (0, _descriptors.useDescriptorDerivations)();
+  const currentScreenKey = (0, _descriptors.useDescriptorsStore)(store => store.derivations.currentScreenKey);
   const {
     participation,
     policy

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

@@ -1 +1 @@
-{"version":3,"names":["_react","require","_reactNativeReanimated","_animation","_gesture","_system","_descriptors","useStableRuntimeConfig","runtimeConfigInput","currentScreenKey","useDescriptorDerivations","participation","policy","stores","useMemo","gestures","GestureStore","getBag","animations","AnimationStore","system","SystemStore","runtimeConfig","stableRuntimeConfig","useSharedValue","useLayoutEffect","set"],"sourceRoot":"../../../../../../../src","sources":["shared/providers/screen/gestures/hooks/use-stable-runtime-config.ts"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,OAAA;AACA,IAAAC,sBAAA,GAAAD,OAAA;AACA,IAAAE,UAAA,GAAAF,OAAA;AACA,IAAAG,QAAA,GAAAH,OAAA;AACA,IAAAI,OAAA,GAAAJ,OAAA;AACA,IAAAK,YAAA,GAAAL,OAAA;AAQO,SAASM,sBAAsBA,CACrCC,kBAA+C,EACR;EACvC,MAAM;IAAEC;EAAiB,CAAC,GAAG,IAAAC,qCAAwB,EAAC,CAAC;EACvD,MAAM;IAAEC,aAAa;IAAEC;EAAO,CAAC,GAAGJ,kBAAkB;EAEpD,MAAMK,MAAM,GAAG,IAAAC,cAAO,EAAC,MAAM;IAC5B,OAAO;MACNC,QAAQ,EAAEC,qBAAY,CAACC,MAAM,CAACR,gBAAgB,CAAC;MAC/CS,UAAU,EAAEC,yBAAc,CAACF,MAAM,CAACR,gBAAgB,CAAC;MACnDW,MAAM,EAAEC,mBAAW,CAACJ,MAAM,CAACR,gBAAgB;IAC5C,CAAC;EACF,CAAC,EAAE,CAACA,gBAAgB,CAAC,CAAC;EAEtB,MAAMa,aAAa,GAAG,IAAAR,cAAO,EAA0B,MAAM;IAC5D,OAAO;MACNH,aAAa;MACbC,MAAM;MACNC;IACD,CAAC;EACF,CAAC,EAAE,CAACF,aAAa,EAAEC,MAAM,EAAEC,MAAM,CAAC,CAAC;EACnC,MAAMU,mBAAmB,GAAG,IAAAC,qCAAc,EAACF,aAAa,CAAC;EAEzD,IAAAG,sBAAe,EAAC,MAAM;IACrBF,mBAAmB,CAACG,GAAG,CAACJ,aAAa,CAAC;EACvC,CAAC,EAAE,CAACC,mBAAmB,EAAED,aAAa,CAAC,CAAC;EAExC,OAAOC,mBAAmB;AAC3B","ignoreList":[]}
+{"version":3,"names":["_react","require","_reactNativeReanimated","_animation","_gesture","_system","_descriptors","useStableRuntimeConfig","runtimeConfigInput","currentScreenKey","useDescriptorsStore","store","derivations","participation","policy","stores","useMemo","gestures","GestureStore","getBag","animations","AnimationStore","system","SystemStore","runtimeConfig","stableRuntimeConfig","useSharedValue","useLayoutEffect","set"],"sourceRoot":"../../../../../../../src","sources":["shared/providers/screen/gestures/hooks/use-stable-runtime-config.ts"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,OAAA;AACA,IAAAC,sBAAA,GAAAD,OAAA;AACA,IAAAE,UAAA,GAAAF,OAAA;AACA,IAAAG,QAAA,GAAAH,OAAA;AACA,IAAAI,OAAA,GAAAJ,OAAA;AACA,IAAAK,YAAA,GAAAL,OAAA;AAQO,SAASM,sBAAsBA,CACrCC,kBAA+C,EACR;EACvC,MAAMC,gBAAgB,GAAG,IAAAC,gCAAmB,EAC1CC,KAAK,IAAKA,KAAK,CAACC,WAAW,CAACH,gBAC9B,CAAC;EACD,MAAM;IAAEI,aAAa;IAAEC;EAAO,CAAC,GAAGN,kBAAkB;EAEpD,MAAMO,MAAM,GAAG,IAAAC,cAAO,EAAC,MAAM;IAC5B,OAAO;MACNC,QAAQ,EAAEC,qBAAY,CAACC,MAAM,CAACV,gBAAgB,CAAC;MAC/CW,UAAU,EAAEC,yBAAc,CAACF,MAAM,CAACV,gBAAgB,CAAC;MACnDa,MAAM,EAAEC,mBAAW,CAACJ,MAAM,CAACV,gBAAgB;IAC5C,CAAC;EACF,CAAC,EAAE,CAACA,gBAAgB,CAAC,CAAC;EAEtB,MAAMe,aAAa,GAAG,IAAAR,cAAO,EAA0B,MAAM;IAC5D,OAAO;MACNH,aAAa;MACbC,MAAM;MACNC;IACD,CAAC;EACF,CAAC,EAAE,CAACF,aAAa,EAAEC,MAAM,EAAEC,MAAM,CAAC,CAAC;EACnC,MAAMU,mBAAmB,GAAG,IAAAC,qCAAc,EAACF,aAAa,CAAC;EAEzD,IAAAG,sBAAe,EAAC,MAAM;IACrBF,mBAAmB,CAACG,GAAG,CAACJ,aAAa,CAAC;EACvC,CAAC,EAAE,CAACC,mBAAmB,EAAED,aAAa,CAAC,CAAC;EAExC,OAAOC,mBAAmB;AAC3B","ignoreList":[]}

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

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

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

@@ -5,11 +5,11 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.resolveShadowingClaimDirections = void 0;
 const resolveShadowingClaimDirections = ({
-  currentActivity,
+  isCurrentScreenClosing,
   currentClaimedDirections,
   previousClaimedDirections
 }) => {
-  if (currentActivity === "closing") {
+  if (isCurrentScreenClosing) {
     return previousClaimedDirections;
   }
   return currentClaimedDirections;

package/lib/commonjs/shared/providers/screen/gestures/ownership/shadowing-claims.js.map

@@ -1 +1 @@
-{"version":3,"names":["resolveShadowingClaimDirections","currentActivity","currentClaimedDirections","previousClaimedDirections","exports"],"sourceRoot":"../../../../../../../src","sources":["shared/providers/screen/gestures/ownership/shadowing-claims.ts"],"mappings":";;;;;;AAGO,MAAMA,+BAA+B,GAAGA,CAAC;EAC/CC,eAAe;EACfC,wBAAwB;EACxBC;AAKD,CAAC,KAAwB;EACxB,IAAIF,eAAe,KAAK,SAAS,EAAE;IAClC,OAAOE,yBAAyB;EACjC;EAEA,OAAOD,wBAAwB;AAChC,CAAC;AAACE,OAAA,CAAAJ,+BAAA,GAAAA,+BAAA","ignoreList":[]}
+{"version":3,"names":["resolveShadowingClaimDirections","isCurrentScreenClosing","currentClaimedDirections","previousClaimedDirections","exports"],"sourceRoot":"../../../../../../../src","sources":["shared/providers/screen/gestures/ownership/shadowing-claims.ts"],"mappings":";;;;;;AAEO,MAAMA,+BAA+B,GAAGA,CAAC;EAC/CC,sBAAsB;EACtBC,wBAAwB;EACxBC;AAKD,CAAC,KAAwB;EACxB,IAAIF,sBAAsB,EAAE;IAC3B,OAAOE,yBAAyB;EACjC;EAEA,OAAOD,wBAAwB;AAChC,CAAC;AAACE,OAAA,CAAAJ,+BAAA,GAAAA,+BAAA","ignoreList":[]}

package/lib/commonjs/shared/providers/screen/gestures/ownership/use-walk-up-and-register-shadowing-claims.js

@@ -8,6 +8,7 @@ var _react = require("react");
 var _gesture = require("../../../../stores/gesture.store");
 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");
@@ -106,15 +107,11 @@ const getDescriptorClaimedDirections = (descriptor, gestureContext) => {
  * B is skipped because it does not claim vertical.
  */
 function useWalkUpAndRegisterShadowingClaims(claimedDirections) {
-  const parentContext = (0, _gestures.useGestureContext)();
-  const {
-    current,
-    previous
-  } = (0, _descriptors.useDescriptors)();
-  const {
-    isTopMostScreen,
-    currentScreenKey
-  } = (0, _descriptors.useDescriptorDerivations)();
+  const parentContext = (0, _gestures.useGestureStore)();
+  const previous = (0, _descriptors.useDescriptorsStore)(store => store.previous);
+  const isTopMostScreen = (0, _descriptors.useDescriptorsStore)(store => store.derivations.isTopMostScreen);
+  const currentScreenKey = (0, _descriptors.useDescriptorsStore)(store => store.derivations.currentScreenKey);
+  const isCurrentScreenClosing = (0, _blankStack.useBlankStackStore)(store => store?.scenesByKey[currentScreenKey]?.activity === "closing");
 
   /*
    * We want to calculate effective claimed directions as claimedDirections is not enough for us.
@@ -136,10 +133,10 @@ function useWalkUpAndRegisterShadowingClaims(claimedDirections) {
    * - if the screen underneath does not claim it, let the parent handle it
    */
   const effectiveClaimedDirections = (0, _react.useMemo)(() => (0, _shadowingClaims.resolveShadowingClaimDirections)({
-    currentActivity: current.activity,
+    isCurrentScreenClosing,
     currentClaimedDirections: claimedDirections,
     previousClaimedDirections: getDescriptorClaimedDirections(previous, parentContext)
-  }), [current.activity, claimedDirections, previous, parentContext]);
+  }), [isCurrentScreenClosing, claimedDirections, previous, parentContext]);
   const shadowedAncestors = (0, _react.useMemo)(() => findShadowedAncestors(parentContext, effectiveClaimedDirections), [parentContext, effectiveClaimedDirections]);
   (0, _react.useLayoutEffect)(() => {
     if (!isTopMostScreen || !shadowedAncestors.length) {

package/lib/commonjs/shared/providers/screen/gestures/ownership/use-walk-up-and-register-shadowing-claims.js.map

@@ -1 +1 @@
-{"version":3,"names":["_react","require","_gesture","_ownership","_descriptors","_gestures","_ancestors","_policy","_shadowingClaims","NO_SHADOWED_ANCESTORS","findShadowedDirections","claimedDirections","ancestorDirections","shadowedDirections","dir","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","useWalkUpAndRegisterShadowingClaims","useGestureContext","current","previous","useDescriptors","isTopMostScreen","useDescriptorDerivations","effectiveClaimedDirections","useMemo","resolveShadowingClaimDirections","currentActivity","activity","currentClaimedDirections","previousClaimedDirections","useLayoutEffect"],"sourceRoot":"../../../../../../../src","sources":["shared/providers/screen/gestures/ownership/use-walk-up-and-register-shadowing-claims.ts"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,OAAA;AACA,IAAAC,QAAA,GAAAD,OAAA;AACA,IAAAE,UAAA,GAAAF,OAAA;AAMA,IAAAG,YAAA,GAAAH,OAAA;AAKA,IAAAI,SAAA,GAAAJ,OAAA;AACA,IAAAK,UAAA,GAAAL,OAAA;AACA,IAAAM,OAAA,GAAAN,OAAA;AAEA,IAAAO,gBAAA,GAAAP,OAAA;AAOA,MAAMQ,qBAAyC,GAAG,EAAE;AAEpD,MAAMC,sBAAsB,GAAGA,CAC9BC,iBAAoC,EACpCC,kBAAqC,KACjC;EACJ,MAAMC,kBAA+B,GAAG,EAAE;EAE1C,KAAK,MAAMC,GAAG,IAAIC,qBAAU,EAAE;IAC7B,IAAIJ,iBAAiB,CAACG,GAAG,CAAC,IAAIF,kBAAkB,CAACE,GAAG,CAAC,EAAE;MACtDD,kBAAkB,CAACG,IAAI,CAACF,GAAG,CAAC;IAC7B;EACD;EAEA,OAAOD,kBAAkB;AAC1B,CAAC;AAED,MAAMI,qBAAqB,GAAGA,CAC7BC,aAAwC,EACxCP,iBAAoC,KAChC;EACJ,IAAI,CAACO,aAAa,EAAE;IACnB,OAAOT,qBAAqB;EAC7B;EAEA,MAAMU,SAA6B,GAAG,EAAE;EACxC,KAAK,MAAMC,QAAQ,IAAI,IAAAC,+BAAoB,EAACH,aAAa,CAAC,EAAE;IAC3D,MAAMI,UAAU,GAAGZ,sBAAsB,CACxCC,iBAAiB,EACjBS,QAAQ,CAACT,iBACV,CAAC;IAED,IAAIW,UAAU,CAACC,MAAM,GAAG,CAAC,EAAE;MAC1BJ,SAAS,CAACH,IAAI,CAAC;QAAEI,QAAQ;QAAEE;MAAW,CAAC,CAAC;IACzC;EACD;EAEA,OAAOH,SAAS,CAACI,MAAM,GAAGJ,SAAS,GAAGV,qBAAqB;AAC5D,CAAC;AAED,MAAMe,uBAAuB,GAAGA,CAC/BC,iBAAqC,EACrCC,gBAAwB,KACpB;EACJ,MAAMC,YAAY,GAAGC,qBAAY,CAACC,QAAQ,CAACH,gBAAgB,EAAE,YAAY,CAAC;EAE1E,KAAK,MAAM;IAAEN,QAAQ;IAAEE;EAAW,CAAC,IAAIG,iBAAiB,EAAE;IACzD,MAAMK,SAAS,GAAG;MAAE,GAAGV,QAAQ,CAACW,oBAAoB,CAACC,GAAG,CAAC;IAAE,CAAC;IAC5D,KAAK,MAAMlB,GAAG,IAAIQ,UAAU,EAAE;MAC7BQ,SAAS,CAAChB,GAAG,CAAC,GAAG;QAAEmB,QAAQ,EAAEP,gBAAgB;QAAEC;MAAa,CAAC;IAC9D;IACAP,QAAQ,CAACW,oBAAoB,CAACG,GAAG,CAACJ,SAAS,CAAC;EAC7C;AACD,CAAC;AAED,MAAMK,oBAAoB,GAAGA,CAC5BV,iBAAqC,EACrCC,gBAAwB,KACpB;EACJ,KAAK,MAAM;IAAEN,QAAQ;IAAEE;EAAW,CAAC,IAAIG,iBAAiB,EAAE;IACzD,MAAMW,aAAa,GAAGhB,QAAQ,CAACW,oBAAoB,CAACC,GAAG,CAAC,CAAC;IACzD,MAAMF,SAAS,GAAG;MAAE,GAAGM;IAAc,CAAC;IACtC,IAAIC,WAAW,GAAG,KAAK;IAEvB,KAAK,MAAMvB,GAAG,IAAIQ,UAAU,EAAE;MAC7B;MACA,IAAIc,aAAa,CAACtB,GAAG,CAAC,EAAEmB,QAAQ,KAAKP,gBAAgB,EAAE;QACtDI,SAAS,CAAChB,GAAG,CAAC,GAAG,IAAI;QACrBuB,WAAW,GAAG,IAAI;MACnB;IACD;IAEA,IAAIA,WAAW,EAAE;MAChBjB,QAAQ,CAACW,oBAAoB,CAACG,GAAG,CAACJ,SAAS,CAAC;IAC7C;EACD;AACD,CAAC;AAED,MAAMQ,uBAAuB,GAAIC,UAA0B,IAAc;EACxE,MAAMC,eAAe,GAAGD,UAAU,CAACE,UAAU,CAACC,QAAQ,CAAC,CAAC;EACxD,MAAMC,MAAM,GAAGH,eAAe,EAAEG,MAAM,IAAI,EAAE;EAC5C,OAAOA,MAAM,CAACC,SAAS,CAAEC,KAAK,IAAKA,KAAK,CAACC,GAAG,KAAKP,UAAU,CAACM,KAAK,CAACC,GAAG,CAAC,KAAK,CAAC;AAC7E,CAAC;AAED,MAAMC,8BAA8B,GAAGA,CACtCR,UAAsC,EACtCS,cAAyC,KAClB;EACvB,IAAI,CAACT,UAAU,EAAE;IAChB,OAAOU,oBAAS;EACjB;EAEA,OAAO,IAAAC,kCAA0B,EAAC;IACjCC,OAAO,EAAEZ,UAAU,CAACY,OAAO;IAC3BC,UAAU,EAAEd,uBAAuB,CAACC,UAAU,CAAC;IAC/CS;EACD,CAAC,CAAC,CAACK,aAAa,CAAC1C,iBAAiB;AACnC,CAAC;;AAED;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACO,SAAS2C,mCAAmCA,CAClD3C,iBAAoC,EAC7B;EACP,MAAMO,aAAa,GAAG,IAAAqC,2BAAiB,EAAC,CAAC;EACzC,MAAM;IAAEC,OAAO;IAAEC;EAAS,CAAC,GAAG,IAAAC,2BAAc,EAAC,CAAC;EAC9C,MAAM;IAAEC,eAAe;IAAEjC;EAAiB,CAAC,GAAG,IAAAkC,qCAAwB,EAAC,CAAC;;EAExE;AACD;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;EACC,MAAMC,0BAA0B,GAAG,IAAAC,cAAO,EACzC,MACC,IAAAC,gDAA+B,EAAC;IAC/BC,eAAe,EAAER,OAAO,CAACS,QAAQ;IACjCC,wBAAwB,EAAEvD,iBAAiB;IAC3CwD,yBAAyB,EAAEpB,8BAA8B,CACxDU,QAAQ,EACRvC,aACD;EACD,CAAC,CAAC,EACH,CAACsC,OAAO,CAACS,QAAQ,EAAEtD,iBAAiB,EAAE8C,QAAQ,EAAEvC,aAAa,CAC9D,CAAC;EAED,MAAMO,iBAAiB,GAAG,IAAAqC,cAAO,EAChC,MAAM7C,qBAAqB,CAACC,aAAa,EAAE2C,0BAA0B,CAAC,EACtE,CAAC3C,aAAa,EAAE2C,0BAA0B,CAC3C,CAAC;EAED,IAAAO,sBAAe,EAAC,MAAM;IACrB,IAAI,CAACT,eAAe,IAAI,CAAClC,iBAAiB,CAACF,MAAM,EAAE;MAClD;IACD;IAEAC,uBAAuB,CAACC,iBAAiB,EAAEC,gBAAgB,CAAC;IAE5D,OAAO,MAAM;MACZS,oBAAoB,CAACV,iBAAiB,EAAEC,gBAAgB,CAAC;IAC1D,CAAC;EACF,CAAC,EAAE,CAACD,iBAAiB,EAAEC,gBAAgB,EAAEiC,eAAe,CAAC,CAAC;AAC3D","ignoreList":[]}
+{"version":3,"names":["_react","require","_gesture","_ownership","_descriptors","_blankStack","_gestures","_ancestors","_policy","_shadowingClaims","NO_SHADOWED_ANCESTORS","findShadowedDirections","claimedDirections","ancestorDirections","shadowedDirections","dir","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","useWalkUpAndRegisterShadowingClaims","useGestureStore","previous","useDescriptorsStore","store","isTopMostScreen","derivations","isCurrentScreenClosing","useBlankStackStore","scenesByKey","activity","effectiveClaimedDirections","useMemo","resolveShadowingClaimDirections","currentClaimedDirections","previousClaimedDirections","useLayoutEffect"],"sourceRoot":"../../../../../../../src","sources":["shared/providers/screen/gestures/ownership/use-walk-up-and-register-shadowing-claims.ts"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/shared/providers/screen/gestures/pan/activation/use-pan-activation.js

@@ -19,10 +19,8 @@ const usePanActivation = ({
   dimensions,
   gestureCompositionOwner
 }) => {
-  const {
-    currentScreenKey,
-    parentScreenKey
-  } = (0, _descriptors.useDescriptorDerivations)();
+  const currentScreenKey = (0, _descriptors.useDescriptorsStore)(store => store.derivations.currentScreenKey);
+  const parentScreenKey = (0, _descriptors.useDescriptorsStore)(store => store.derivations.parentScreenKey);
   const ancestorDismissing = (0, _react.useMemo)(() => {
     if (!parentScreenKey) return null;
     return _gesture.GestureStore.peekBag(parentScreenKey)?.dismissing ?? null;

package/lib/commonjs/shared/providers/screen/gestures/pan/activation/use-pan-activation.js.map

@@ -1 +1 @@
-{"version":3,"names":["_react","require","_reactNativeReanimated","_gesture","_gesture2","_descriptors","_runtime","_panActivationDecision","usePanActivation","scrollState","childDirectionClaims","runtime","screenOptions","dimensions","gestureCompositionOwner","currentScreenKey","parentScreenKey","useDescriptorDerivations","ancestorDismissing","useMemo","GestureStore","peekBag","dismissing","initialTouch","useSharedValue","x","y","gestureActivationState","GestureActivationState","PENDING","pendingDirection","onTouchesDown","useCallback","event","stateManager","participation","resolvePanRuntime","get","canTrackGesture","set","FAILED","fail","firstTouch","changedTouches","onTouchesMove","currentActivationState","resolvedRuntime","policy","enabled","activate","decision","resolvePanActivationMoveDecision","activationState","Boolean","nextActivationState","action","direction","exports"],"sourceRoot":"../../../../../../../../src","sources":["shared/providers/screen/gestures/pan/activation/use-pan-activation.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_react","require","_reactNativeReanimated","_gesture","_gesture2","_descriptors","_runtime","_panActivationDecision","usePanActivation","scrollState","childDirectionClaims","runtime","screenOptions","dimensions","gestureCompositionOwner","currentScreenKey","useDescriptorsStore","store","derivations","parentScreenKey","ancestorDismissing","useMemo","GestureStore","peekBag","dismissing","initialTouch","useSharedValue","x","y","gestureActivationState","GestureActivationState","PENDING","pendingDirection","onTouchesDown","useCallback","event","stateManager","participation","resolvePanRuntime","get","canTrackGesture","set","FAILED","fail","firstTouch","changedTouches","onTouchesMove","currentActivationState","resolvedRuntime","policy","enabled","activate","decision","resolvePanActivationMoveDecision","activationState","Boolean","nextActivationState","action","direction","exports"],"sourceRoot":"../../../../../../../../src","sources":["shared/providers/screen/gestures/pan/activation/use-pan-activation.ts"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/shared/providers/screen/gestures/pan/behavior/pan-lifecycle.js

@@ -6,8 +6,8 @@ Object.defineProperty(exports, "__esModule", {
 exports.trackPanGesture = exports.startPanBase = exports.finalizePanRelease = void 0;
 var _reactNativeReanimated = require("react-native-reanimated");
 var _constants = require("../../../../../constants");
+var _animation = require("../../../../../stores/animation.store");
 var _animateToProgress = require("../../../../../utils/animation/animate-to-progress");
-var _emit = require("../../../../../utils/animation/emit");
 var _physics = require("../../shared/physics");
 var _snapshot = require("../../shared/snapshot");
 var _values = require("../../shared/values");
@@ -22,11 +22,7 @@ const startPanBase = runtime => {
       animations
     }
   } = runtime;
-  const wasSettling = gestures.settling.get();
-  const hasResidualGesture = Math.abs(gestures.normX.get()) > _constants.EPSILON || Math.abs(gestures.normY.get()) > _constants.EPSILON || Math.abs(gestures.normScale.get()) > _constants.EPSILON || Math.abs(gestures.rotation.get()) > _constants.EPSILON;
-  if (!wasSettling || !hasResidualGesture) {
-    (0, _emit.emit)(animations.willAnimate, _constants.TRUE, _constants.FALSE);
-  }
+  (0, _animation.emitMotionStart)(animations);
   gestures.dragging.set(_constants.TRUE);
   gestures.dismissing.set(0);
   gestures.settling.set(0);
@@ -101,6 +97,7 @@ const finalizePanRelease = (release, runtime, dismissScreen, dimensions, rawEven
     animations.transitionProgress.set(plan.commitProgress);
     system.targetProgress.set(plan.commitProgress);
   }
+  const progressAlreadyAtTarget = Math.abs(animations.transitionProgress.get() - plan.target) <= _constants.EPSILON;
   if (canDriveRelease && plan.shouldDismiss) {
     (0, _snapshot.snapshotGestureHandoff)(gestures, {
       velocity: plan.handoffVelocity
@@ -109,15 +106,15 @@ const finalizePanRelease = (release, runtime, dismissScreen, dimensions, rawEven
   (0, _panReset.resetPanGestureValues)({
     plan,
     gestures,
+    animations,
+    completeMotion: !plan.shouldDismiss && progressAlreadyAtTarget,
     updateLifecycle: canDriveRelease
   });
   if (!canDriveRelease) {
     return;
   }
-  const progressAlreadyAtTarget = Math.abs(animations.transitionProgress.get() - plan.target) <= _constants.EPSILON;
   if (!plan.shouldDismiss && progressAlreadyAtTarget) {
     system.targetProgress.set(plan.target);
-    animations.progressAnimating.set(_constants.FALSE);
     return;
   }
   if (plan.shouldDismiss && requestDismiss) {