react-native-screen-transitions 3.9.0 → 3.11.0

package/lib/commonjs/shared/components/boundary/utils/measured-bounds.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.normalizeMeasuredBoundsWithVisibilityGate = exports.normalizeMeasuredBoundsToOrigin = exports.measureWithOverscrollAwareness = exports.isMeasurementInViewport = exports.attachScrollSnapshotToMeasuredBounds = exports.adjustedMeasuredBoundsForOverscrollDeltas = void 0;
+exports.measureWithOverscrollAwareness = exports.isMeasurementInViewport = exports.correctMeasuredBoundsForVisibilityGate = exports.attachScrollSnapshotToMeasuredBounds = exports.adjustedMeasuredBoundsForOverscrollDeltas = void 0;
 var _reactNativeReanimated = require("react-native-reanimated");
 var _scroll = require("../../../stores/scroll.store");
 const SCROLL_MEASUREMENT_EPSILON = 1;
@@ -37,16 +37,6 @@ const adjustedMeasuredBoundsForOverscrollDeltas = (measured, scrollState) => {
   };
 };
 exports.adjustedMeasuredBoundsForOverscrollDeltas = adjustedMeasuredBoundsForOverscrollDeltas;
-const normalizeMeasuredBoundsToOrigin = (measured, origin) => {
-  "worklet";
-
-  return {
-    ...measured,
-    pageX: measured.pageX - origin.pageX,
-    pageY: measured.pageY - origin.pageY
-  };
-};
-exports.normalizeMeasuredBoundsToOrigin = normalizeMeasuredBoundsToOrigin;
 const isMeasurementInViewport = (measured, viewportWidth, viewportHeight) => {
   "worklet";
 
@@ -60,9 +50,8 @@ const isMeasurementInViewport = (measured, viewportWidth, viewportHeight) => {
   return centerX >= -toleranceX && centerX <= viewportWidth + toleranceX && centerY >= -toleranceY && centerY <= viewportHeight + toleranceY;
 };
 exports.isMeasurementInViewport = isMeasurementInViewport;
-const normalizeMeasuredBoundsWithVisibilityGate = ({
+const correctMeasuredBoundsForVisibilityGate = ({
   measured,
-  origin,
   visibilityBlocked,
   visibilityBlockOffset,
   viewportWidth,
@@ -70,31 +59,30 @@ const normalizeMeasuredBoundsWithVisibilityGate = ({
 }) => {
   "worklet";
 
-  const normalized = normalizeMeasuredBoundsToOrigin(measured, origin);
-  if (!visibilityBlocked || visibilityBlockOffset <= 0 || isMeasurementInViewport(normalized, viewportWidth, viewportHeight)) {
-    return normalized;
+  if (!visibilityBlocked || visibilityBlockOffset <= 0 || isMeasurementInViewport(measured, viewportWidth, viewportHeight)) {
+    return measured;
   }
 
-  // Fabric can expose the visibility transform to one native measurement one
-  // frame before the other. Prefer normal origin-relative coordinates, then
-  // test either side of that known frame skew while the gate is active.
-  const measuredAhead = {
-    ...normalized,
-    pageY: normalized.pageY - visibilityBlockOffset
+  // A destination can still carry the internal visibility transform for one
+  // native frame. Correct only that known offset and preserve all other
+  // presentation transforms in the measured coordinates.
+  const visibilityOffsetApplied = {
+    ...measured,
+    pageY: measured.pageY - visibilityBlockOffset
   };
-  if (isMeasurementInViewport(measuredAhead, viewportWidth, viewportHeight)) {
-    return measuredAhead;
+  if (isMeasurementInViewport(visibilityOffsetApplied, viewportWidth, viewportHeight)) {
+    return visibilityOffsetApplied;
   }
-  const originAhead = {
-    ...normalized,
-    pageY: normalized.pageY + visibilityBlockOffset
+  const inverseVisibilityOffsetApplied = {
+    ...measured,
+    pageY: measured.pageY + visibilityBlockOffset
   };
-  if (isMeasurementInViewport(originAhead, viewportWidth, viewportHeight)) {
-    return originAhead;
+  if (isMeasurementInViewport(inverseVisibilityOffsetApplied, viewportWidth, viewportHeight)) {
+    return inverseVisibilityOffsetApplied;
   }
-  return normalized;
+  return measured;
 };
-exports.normalizeMeasuredBoundsWithVisibilityGate = normalizeMeasuredBoundsWithVisibilityGate;
+exports.correctMeasuredBoundsForVisibilityGate = correctMeasuredBoundsForVisibilityGate;
 const measureWithOverscrollAwareness = (ref, scrollState) => {
   "worklet";
 

package/lib/commonjs/shared/components/boundary/utils/measured-bounds.js.map

@@ -1 +1 @@
-{"version":3,"names":["_reactNativeReanimated","require","_scroll","SCROLL_MEASUREMENT_EPSILON","getOverscrollDelta","axisState","clampedOffset","clampScrollAxisOffset","delta","offset","Math","abs","adjustedMeasuredBoundsForOverscrollDeltas","measured","scrollState","deltaX","horizontal","deltaY","vertical","x","y","pageX","pageY","exports","normalizeMeasuredBoundsToOrigin","origin","isMeasurementInViewport","viewportWidth","viewportHeight","width","height","toleranceX","toleranceY","centerX","centerY","normalizeMeasuredBoundsWithVisibilityGate","visibilityBlocked","visibilityBlockOffset","normalized","measuredAhead","originAhead","measureWithOverscrollAwareness","ref","measure","attachScrollSnapshotToMeasuredBounds","scroll","cloneScrollMetadataState"],"sourceRoot":"../../../../../../src","sources":["shared/components/boundary/utils/measured-bounds.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_reactNativeReanimated","require","_scroll","SCROLL_MEASUREMENT_EPSILON","getOverscrollDelta","axisState","clampedOffset","clampScrollAxisOffset","delta","offset","Math","abs","adjustedMeasuredBoundsForOverscrollDeltas","measured","scrollState","deltaX","horizontal","deltaY","vertical","x","y","pageX","pageY","exports","isMeasurementInViewport","viewportWidth","viewportHeight","width","height","toleranceX","toleranceY","centerX","centerY","correctMeasuredBoundsForVisibilityGate","visibilityBlocked","visibilityBlockOffset","visibilityOffsetApplied","inverseVisibilityOffsetApplied","measureWithOverscrollAwareness","ref","measure","attachScrollSnapshotToMeasuredBounds","scroll","cloneScrollMetadataState"],"sourceRoot":"../../../../../../src","sources":["shared/components/boundary/utils/measured-bounds.ts"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/shared/components/boundary/utils/refresh-signals.js

@@ -30,30 +30,31 @@ const getRefreshBoundarySignal = params => {
     group,
     shouldRefresh,
     closing,
-    entering,
-    animating,
-    progress,
     linkState
   } = params;
   if (!enabled) return null;
-  const canRefreshPreCloseDestination = shouldRefresh && closing && !entering && !animating && progress >= 1;
-  const canRefreshSettledDestination = shouldRefresh && !closing && !entering;
-
-  // Guards:
-  // 1) A user may dismiss via back button, in this case, we should remeasure.
-  // 2) If a user drags during entering/closing animations we should NOT remeasure.
-  if (!canRefreshPreCloseDestination && !canRefreshSettledDestination) {
+  if (!shouldRefresh) {
     return null;
   }
 
-  // Non group:
-  // Since in typical group flows we would need to know the src, we don't need to do that for
-  // single a->b flows. So we just trigger the destination refresh.
+  // A source may move while its destination is active, so refresh whichever
+  // side of the pair this boundary currently represents.
   if (!group) {
+    if (sourcePairKey) {
+      const sourcePair = linkState?.[sourcePairKey];
+      const participates = !!sourcePair?.links?.[linkId] || !!sourcePair?.sourceRequests?.[linkId];
+      if (!participates) {
+        return null;
+      }
+      return buildRefreshSignal("source", sourcePairKey, [currentScreenKey, closing ? "closing" : "settled"].join("|"));
+    }
     const refreshDestinationPairKey = destinationPairKey ?? (nextScreenKey ? undefined : ancestorDestinationPairKey);
     if (!refreshDestinationPairKey) {
       return null;
     }
+    if (!linkState?.[refreshDestinationPairKey]?.links?.[linkId]) {
+      return null;
+    }
     return buildRefreshSignal("destination", refreshDestinationPairKey, [currentScreenKey, closing ? "closing" : "settled"].join("|"));
   }
 

package/lib/commonjs/shared/components/boundary/utils/refresh-signals.js.map

@@ -1 +1 @@
-{"version":3,"names":["SOURCE_SIGNAL_PREFIX","DESTINATION_SIGNAL_PREFIX","buildRefreshSignal","type","pairKey","key","prefix","signal","getRefreshBoundarySignal","params","enabled","currentScreenKey","sourcePairKey","destinationPairKey","ancestorDestinationPairKey","nextScreenKey","linkId","group","shouldRefresh","closing","entering","animating","progress","linkState","canRefreshPreCloseDestination","canRefreshSettledDestination","refreshDestinationPairKey","undefined","join","activeId","groups","exports"],"sourceRoot":"../../../../../../src","sources":["shared/components/boundary/utils/refresh-signals.ts"],"mappings":";;;;;;AAMA,MAAMA,oBAAoB,GAAG,SAAS;AACtC,MAAMC,yBAAyB,GAAG,cAAc;AAMhD,MAAMC,kBAAkB,GAAGA,CAC1BC,IAA2B,EAC3BC,OAAsB,EACtBC,GAAW,KACgB;EAC3B,SAAS;;EACT,MAAMC,MAAM,GACXH,IAAI,KAAK,QAAQ,GAAGH,oBAAoB,GAAGC,yBAAyB;EACrE,OAAO;IACNE,IAAI;IACJC,OAAO;IACPG,MAAM,EAAE,GAAGD,MAAM,GAAGF,OAAO,IAAIC,GAAG;EACnC,CAAC;AACF,CAAC;AAEM,MAAMG,wBAAwB,GAAIC,MAexC,IAAmC;EACnC,SAAS;;EACT,MAAM;IACLC,OAAO;IACPC,gBAAgB;IAChBC,aAAa;IACbC,kBAAkB;IAClBC,0BAA0B;IAC1BC,aAAa;IACbC,MAAM;IACNC,KAAK;IACLC,aAAa;IACbC,OAAO;IACPC,QAAQ;IACRC,SAAS;IACTC,QAAQ;IACRC;EACD,CAAC,GAAGd,MAAM;EAEV,IAAI,CAACC,OAAO,EAAE,OAAO,IAAI;EAEzB,MAAMc,6BAA6B,GAClCN,aAAa,IAAIC,OAAO,IAAI,CAACC,QAAQ,IAAI,CAACC,SAAS,IAAIC,QAAQ,IAAI,CAAC;EAErE,MAAMG,4BAA4B,GAAGP,aAAa,IAAI,CAACC,OAAO,IAAI,CAACC,QAAQ;;EAE3E;EACA;EACA;EACA,IAAI,CAACI,6BAA6B,IAAI,CAACC,4BAA4B,EAAE;IACpE,OAAO,IAAI;EACZ;;EAEA;EACA;EACA;EACA,IAAI,CAACR,KAAK,EAAE;IACX,MAAMS,yBAAyB,GAC9Bb,kBAAkB,KACjBE,aAAa,GAAGY,SAAS,GAAGb,0BAA0B,CAAC;IAEzD,IAAI,CAACY,yBAAyB,EAAE;MAC/B,OAAO,IAAI;IACZ;IAEA,OAAOxB,kBAAkB,CACxB,aAAa,EACbwB,yBAAyB,EACzB,CAACf,gBAAgB,EAAEQ,OAAO,GAAG,SAAS,GAAG,SAAS,CAAC,CAACS,IAAI,CAAC,GAAG,CAC7D,CAAC;EACF;;EAEA;EACA;EACA,IAAIhB,aAAa,EAAE;IAClB,MAAMiB,QAAQ,GAAGN,SAAS,GAAGX,aAAa,CAAC,EAAEkB,MAAM,GAAGb,KAAK,CAAC,EAAEY,QAAQ;IAEtE,IAAIA,QAAQ,KAAKb,MAAM,EAAE;MACxB,OAAO,IAAI;IACZ;IAEA,OAAOd,kBAAkB,CACxB,QAAQ,EACRU,aAAa,EACb,CAACK,KAAK,EAAED,MAAM,EAAEG,OAAO,GAAG,SAAS,GAAG,SAAS,CAAC,CAACS,IAAI,CAAC,GAAG,CAC1D,CAAC;EACF;EAEA,MAAMF,yBAAyB,GAC9Bb,kBAAkB,KACjBE,aAAa,GAAGY,SAAS,GAAGb,0BAA0B,CAAC;EAEzD,IAAI,CAACY,yBAAyB,EAAE,OAAO,IAAI;;EAE3C;EACA;EACA,MAAMG,QAAQ,GACbN,SAAS,GAAGG,yBAAyB,CAAC,EAAEI,MAAM,GAAGb,KAAK,CAAC,EAAEY,QAAQ;;EAElE;EACA;EACA,IAAIA,QAAQ,KAAKb,MAAM,EAAE;IACxB,OAAO,IAAI;EACZ;EAEA,OAAOd,kBAAkB,CACxB,aAAa,EACbwB,yBAAyB,EACzB,CAACT,KAAK,EAAED,MAAM,EAAEG,OAAO,GAAG,SAAS,GAAG,SAAS,CAAC,CAACS,IAAI,CAAC,GAAG,CAC1D,CAAC;AACF,CAAC;AAACG,OAAA,CAAAvB,wBAAA,GAAAA,wBAAA","ignoreList":[]}
+{"version":3,"names":["SOURCE_SIGNAL_PREFIX","DESTINATION_SIGNAL_PREFIX","buildRefreshSignal","type","pairKey","key","prefix","signal","getRefreshBoundarySignal","params","enabled","currentScreenKey","sourcePairKey","destinationPairKey","ancestorDestinationPairKey","nextScreenKey","linkId","group","shouldRefresh","closing","linkState","sourcePair","participates","links","sourceRequests","join","refreshDestinationPairKey","undefined","activeId","groups","exports"],"sourceRoot":"../../../../../../src","sources":["shared/components/boundary/utils/refresh-signals.ts"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/shared/components/boundary/utils/resolve-boundary-target.js

@@ -0,0 +1,29 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.resolveBoundaryTarget = void 0;
+var _react = require("react");
+const resolveBoundaryTarget = (children, options) => {
+  let target = null;
+  let targetCount = 0;
+  const map = nodes => _react.Children.map(nodes, node => {
+    if (! /*#__PURE__*/(0, _react.isValidElement)(node)) return node;
+    if (node.type === _react.Fragment) {
+      return /*#__PURE__*/(0, _react.cloneElement)(node, undefined, map(node.props.children));
+    }
+    if (!options.isTarget(node)) return node;
+    target ??= node;
+    targetCount += 1;
+    return options.mapTarget?.(node, targetCount === 1) ?? node;
+  });
+  const mappedChildren = map(children);
+  return {
+    children: target ? mappedChildren : children,
+    target,
+    targetCount
+  };
+};
+exports.resolveBoundaryTarget = resolveBoundaryTarget;
+//# sourceMappingURL=resolve-boundary-target.js.map

package/lib/commonjs/shared/components/boundary/utils/resolve-boundary-target.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["_react","require","resolveBoundaryTarget","children","options","target","targetCount","map","nodes","Children","node","isValidElement","type","Fragment","cloneElement","undefined","props","isTarget","mapTarget","mappedChildren","exports"],"sourceRoot":"../../../../../../src","sources":["shared/components/boundary/utils/resolve-boundary-target.tsx"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,OAAA;AAcO,MAAMC,qBAAqB,GAAGA,CACpCC,QAAmB,EACnBC,OAAqC,KAKjC;EACJ,IAAIC,MAA2B,GAAG,IAAI;EACtC,IAAIC,WAAW,GAAG,CAAC;EACnB,MAAMC,GAAG,GAAIC,KAAgB,IAC5BC,eAAQ,CAACF,GAAG,CAACC,KAAK,EAAGE,IAAI,IAAK;IAC7B,IAAI,eAAC,IAAAC,qBAAc,EAA2BD,IAAI,CAAC,EAAE,OAAOA,IAAI;IAChE,IAAIA,IAAI,CAACE,IAAI,KAAKC,eAAQ,EAAE;MAC3B,oBAAO,IAAAC,mBAAY,EAACJ,IAAI,EAAEK,SAAS,EAAER,GAAG,CAACG,IAAI,CAACM,KAAK,CAACb,QAAQ,CAAC,CAAC;IAC/D;IACA,IAAI,CAACC,OAAO,CAACa,QAAQ,CAACP,IAAI,CAAC,EAAE,OAAOA,IAAI;IACxCL,MAAM,KAAKK,IAAI;IACfJ,WAAW,IAAI,CAAC;IAChB,OAAOF,OAAO,CAACc,SAAS,GAAGR,IAAI,EAAEJ,WAAW,KAAK,CAAC,CAAC,IAAII,IAAI;EAC5D,CAAC,CAAC;EAEH,MAAMS,cAAc,GAAGZ,GAAG,CAACJ,QAAQ,CAAC;EACpC,OAAO;IAAEA,QAAQ,EAAEE,MAAM,GAAGc,cAAc,GAAGhB,QAAQ;IAAEE,MAAM;IAAEC;EAAY,CAAC;AAC7E,CAAC;AAACc,OAAA,CAAAlB,qBAAA,GAAAA,qBAAA","ignoreList":[]}

package/lib/commonjs/shared/components/create-transition-aware-component.js

@@ -7,7 +7,6 @@ exports.createTransitionAwareComponent = createTransitionAwareComponent;
 var _react = require("react");
 var _reactNativeGestureHandler = require("react-native-gesture-handler");
 var _reactNativeReanimated = _interopRequireWildcard(require("react-native-reanimated"));
-var _registerBounds = require("../providers/register-bounds.provider");
 var _scrollCoordination = require("../providers/screen/gestures/scroll-coordination");
 var _styles = require("../providers/screen/styles");
 var _jsxRuntime = require("react/jsx-runtime");
@@ -22,7 +21,6 @@ function createTransitionAwareComponent(Wrapped, options = {}) {
   const AnimatedComponent = alreadyAnimated ? Wrapped : _reactNativeReanimated.default.createAnimatedComponent(Wrapped);
   const ScrollableInner = /*#__PURE__*/(0, _react.forwardRef)((props, ref) => {
     const {
-      remeasureOnFocus: _remeasureOnFocus,
       onScroll: userOnScroll,
       onMomentumScrollEnd: userOnMomentumScrollEnd,
       onScrollEndDrag: userOnScrollEndDrag,
@@ -75,40 +73,22 @@ function createTransitionAwareComponent(Wrapped, options = {}) {
       children: coordinatedScrollableComponent
     });
   });
-  const Inner = /*#__PURE__*/(0, _react.forwardRef)((props, _) => {
+  const Inner = /*#__PURE__*/(0, _react.forwardRef)((props, ref) => {
     const {
       children,
       style,
-      sharedBoundTag,
       styleId,
-      onPress,
-      remeasureOnFocus,
       animatedProps: userAnimatedProps,
       ...rest
     } = props;
-    const animatedRef = (0, _reactNativeReanimated.useAnimatedRef)();
-    const associatedId = sharedBoundTag || styleId;
-    const associatedStyles = (0, _styles.useSlotStyles)(associatedId);
-    const associatedProps = (0, _styles.useSlotProps)(associatedId);
-    return /*#__PURE__*/(0, _jsxRuntime.jsx)(_registerBounds.RegisterBoundsProvider, {
-      animatedRef: animatedRef,
-      style: style,
-      onPress: onPress,
-      sharedBoundTag: sharedBoundTag,
-      remeasureOnFocus: remeasureOnFocus,
-      children: ({
-        captureActiveOnPress,
-        handleInitialLayout
-      }) => /*#__PURE__*/(0, _jsxRuntime.jsx)(AnimatedComponent, {
-        ...rest,
-        ref: animatedRef,
-        style: [style, associatedStyles],
-        animatedProps: userAnimatedProps ?? associatedProps,
-        onPress: captureActiveOnPress,
-        onLayout: (0, _reactNativeReanimated.runOnUI)(handleInitialLayout),
-        collapsable: !sharedBoundTag,
-        children: children
-      })
+    const associatedStyles = (0, _styles.useSlotStyles)(styleId);
+    const associatedProps = (0, _styles.useSlotProps)(styleId);
+    return /*#__PURE__*/(0, _jsxRuntime.jsx)(AnimatedComponent, {
+      ...rest,
+      ref: ref,
+      style: [style, associatedStyles],
+      animatedProps: userAnimatedProps ?? associatedProps,
+      children: children
     });
   });
   if (isScrollable) {

package/lib/commonjs/shared/components/create-transition-aware-component.js.map

@@ -1 +1 @@
-{"version":3,"names":["_react","require","_reactNativeGestureHandler","_reactNativeReanimated","_interopRequireWildcard","_registerBounds","_scrollCoordination","_styles","_jsxRuntime","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","createTransitionAwareComponent","Wrapped","options","isScrollable","alreadyAnimated","AnimatedComponent","Animated","createAnimatedComponent","ScrollableInner","forwardRef","props","ref","remeasureOnFocus","_remeasureOnFocus","onScroll","userOnScroll","onMomentumScrollEnd","userOnMomentumScrollEnd","onScrollEndDrag","userOnScrollEndDrag","children","contentContainerStyle","scrollableProps","scrollDirection","horizontal","scrollHandler","scrollEventsEnabled","onContentSizeChange","onLayout","nativeGesture","metadataOwnerProviderValue","useScrollGestureCoordination","direction","composedScrollHandler","useComposedEventHandler","scrollableComponent","jsx","undefined","scrollEventThrottle","coordinatedScrollableComponent","GestureDetector","gesture","ScrollMetadataOwnerProvider","value","Inner","_","style","sharedBoundTag","styleId","onPress","animatedProps","userAnimatedProps","rest","animatedRef","useAnimatedRef","associatedId","associatedStyles","useSlotStyles","associatedProps","useSlotProps","RegisterBoundsProvider","captureActiveOnPress","handleInitialLayout","runOnUI","collapsable","memo"],"sourceRoot":"../../../../src","sources":["shared/components/create-transition-aware-component.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_react","require","_reactNativeGestureHandler","_reactNativeReanimated","_interopRequireWildcard","_scrollCoordination","_styles","_jsxRuntime","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","createTransitionAwareComponent","Wrapped","options","isScrollable","alreadyAnimated","AnimatedComponent","Animated","createAnimatedComponent","ScrollableInner","forwardRef","props","ref","onScroll","userOnScroll","onMomentumScrollEnd","userOnMomentumScrollEnd","onScrollEndDrag","userOnScrollEndDrag","children","contentContainerStyle","scrollableProps","scrollDirection","horizontal","scrollHandler","scrollEventsEnabled","onContentSizeChange","onLayout","nativeGesture","metadataOwnerProviderValue","useScrollGestureCoordination","direction","composedScrollHandler","useComposedEventHandler","scrollableComponent","jsx","undefined","scrollEventThrottle","coordinatedScrollableComponent","GestureDetector","gesture","ScrollMetadataOwnerProvider","value","Inner","style","styleId","animatedProps","userAnimatedProps","rest","associatedStyles","useSlotStyles","associatedProps","useSlotProps","memo"],"sourceRoot":"../../../../src","sources":["shared/components/create-transition-aware-component.tsx"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/shared/components/masked-view.js

@@ -46,7 +46,15 @@ const styles = _reactNative.StyleSheet.create({
   root: {
     flex: 1
   },
-  rootMask: {
+  // The mask rect's translate math assumes a physical top-left base. Under
+  // native RTL a fixed-width flex child anchors to the right edge, so pin it
+  // to the physical left (`end` = left edge in RTL).
+  rootMask: _reactNative.I18nManager.isRTL ? {
+    backgroundColor: "white",
+    end: 0,
+    position: "absolute",
+    top: 0
+  } : {
     backgroundColor: "white"
   },
   rootContainer: {

package/lib/commonjs/shared/components/masked-view.js.map

@@ -1 +1 @@
-{"version":3,"names":["_reactNative","require","_constants","_createTransitionAwareComponent","_jsxRuntime","TransitionView","createTransitionAwareComponent","View","LazyMaskedView","default","_","MaskedView","children","style","userStyles","jsx","styles","root","maskElement","styleId","MASK_STYLE_ID","rootMask","CONTAINER_STYLE_ID","rootContainer","StyleSheet","create","flex","backgroundColor"],"sourceRoot":"../../../../src","sources":["shared/components/masked-view.tsx"],"mappings":";;;;;;AAAA,IAAAA,YAAA,GAAAC,OAAA;AACA,IAAAC,UAAA,GAAAD,OAAA;AACA,IAAAE,+BAAA,GAAAF,OAAA;AAAqF,IAAAG,WAAA,GAAAH,OAAA;AAErF,MAAMI,cAAc,GAAG,IAAAC,8DAA8B,EAACC,iBAAI,CAAC;AAE3D,IAAIC,cAAc,GAAGD,iBAAI;AAEzB,IAAI;EACHC,cAAc,GAAGP,OAAO,CAAC,uCAAuC,CAAC,CAACQ,OAAO;AAC1E,CAAC,CAAC,OAAOC,CAAC,EAAE;EACX;AAAA;;AAGD;AACA;AACA;AACA;AACe,SAASC,UAAUA,CAAC;EAClCC,QAAQ;EACRC,KAAK,EAAEC,UAAU,GAAG,CAAC;AAItB,CAAC,EAAE;EACF,IAAIN,cAAc,KAAKD,iBAAI,EAAE;IAC5B,OAAOK,QAAQ;EAChB;EAEA,oBACC,IAAAR,WAAA,CAAAW,GAAA,EAACP,cAAc;IACdK,KAAK,EAAEG,MAAM,CAACC;IACd;IAAA;IACAC,WAAW,eACV,IAAAd,WAAA,CAAAW,GAAA,EAACV,cAAc;MAACc,OAAO,EAAEC,wBAAc;MAACP,KAAK,EAAEG,MAAM,CAACK;IAAS,CAAE,CACjE;IAAAT,QAAA,eAED,IAAAR,WAAA,CAAAW,GAAA,EAACV,cAAc;MACdc,OAAO,EAAEG,6BAAmB;MAC5BT,KAAK,EAAE,CAACG,MAAM,CAACO,aAAa,EAAET,UAAU,CAAE;MAAAF,QAAA,EAEzCA;IAAQ,CACM;EAAC,CACF,CAAC;AAEnB;AAEA,MAAMI,MAAM,GAAGQ,uBAAU,CAACC,MAAM,CAAC;EAChCR,IAAI,EAAE;IACLS,IAAI,EAAE;EACP,CAAC;EACDL,QAAQ,EAAE;IACTM,eAAe,EAAE;EAClB,CAAC;EACDJ,aAAa,EAAE;IACdG,IAAI,EAAE;EACP;AACD,CAAC,CAAC","ignoreList":[]}
+{"version":3,"names":["_reactNative","require","_constants","_createTransitionAwareComponent","_jsxRuntime","TransitionView","createTransitionAwareComponent","View","LazyMaskedView","default","_","MaskedView","children","style","userStyles","jsx","styles","root","maskElement","styleId","MASK_STYLE_ID","rootMask","CONTAINER_STYLE_ID","rootContainer","StyleSheet","create","flex","I18nManager","isRTL","backgroundColor","end","position","top"],"sourceRoot":"../../../../src","sources":["shared/components/masked-view.tsx"],"mappings":";;;;;;AAAA,IAAAA,YAAA,GAAAC,OAAA;AAOA,IAAAC,UAAA,GAAAD,OAAA;AACA,IAAAE,+BAAA,GAAAF,OAAA;AAAqF,IAAAG,WAAA,GAAAH,OAAA;AAErF,MAAMI,cAAc,GAAG,IAAAC,8DAA8B,EAACC,iBAAI,CAAC;AAE3D,IAAIC,cAAc,GAAGD,iBAAI;AAEzB,IAAI;EACHC,cAAc,GAAGP,OAAO,CAAC,uCAAuC,CAAC,CAACQ,OAAO;AAC1E,CAAC,CAAC,OAAOC,CAAC,EAAE;EACX;AAAA;;AAGD;AACA;AACA;AACA;AACe,SAASC,UAAUA,CAAC;EAClCC,QAAQ;EACRC,KAAK,EAAEC,UAAU,GAAG,CAAC;AAItB,CAAC,EAAE;EACF,IAAIN,cAAc,KAAKD,iBAAI,EAAE;IAC5B,OAAOK,QAAQ;EAChB;EAEA,oBACC,IAAAR,WAAA,CAAAW,GAAA,EAACP,cAAc;IACdK,KAAK,EAAEG,MAAM,CAACC;IACd;IAAA;IACAC,WAAW,eACV,IAAAd,WAAA,CAAAW,GAAA,EAACV,cAAc;MAACc,OAAO,EAAEC,wBAAc;MAACP,KAAK,EAAEG,MAAM,CAACK;IAAS,CAAE,CACjE;IAAAT,QAAA,eAED,IAAAR,WAAA,CAAAW,GAAA,EAACV,cAAc;MACdc,OAAO,EAAEG,6BAAmB;MAC5BT,KAAK,EAAE,CAACG,MAAM,CAACO,aAAa,EAAET,UAAU,CAAE;MAAAF,QAAA,EAEzCA;IAAQ,CACM;EAAC,CACF,CAAC;AAEnB;AAEA,MAAMI,MAAM,GAAGQ,uBAAU,CAACC,MAAM,CAAC;EAChCR,IAAI,EAAE;IACLS,IAAI,EAAE;EACP,CAAC;EACD;EACA;EACA;EACAL,QAAQ,EAAEM,wBAAW,CAACC,KAAK,GACxB;IACAC,eAAe,EAAE,OAAO;IACxBC,GAAG,EAAE,CAAC;IACNC,QAAQ,EAAE,UAAU;IACpBC,GAAG,EAAE;EACN,CAAC,GACA;IACAH,eAAe,EAAE;EAClB,CAAC;EACHN,aAAa,EAAE;IACdG,IAAI,EAAE;EACP;AACD,CAAC,CAAC","ignoreList":[]}

package/lib/commonjs/shared/components/screen-container/hooks/use-backdrop-pointer-events.js

@@ -19,13 +19,9 @@ var _stack = require("../../../types/stack.types");
  * - Other stacks default to 'block' (undefined = normal touch handling)
  */
 function useBackdropPointerEvents() {
-  const {
-    current
-  } = (0, _descriptors.useDescriptors)();
-  const screenOptions = (0, _options.useScreenOptionsContext)();
-  const {
-    flags
-  } = (0, _core.useStackCoreContext)();
+  const screenOptions = (0, _options.useScreenOptionsStore)();
+  const descriptorBackdropBehavior = (0, _descriptors.useDescriptorsStore)(store => store.options.backdropBehavior);
+  const stackType = (0, _core.useStackCoreStore)(store => store.flags.STACK_TYPE);
   const [runtimeBackdropBehavior, setRuntimeBackdropBehavior] = (0, _react.useState)(undefined);
   (0, _reactNativeReanimated.useAnimatedReaction)(() => screenOptions.get().backdropBehavior, (next, previous) => {
     "worklet";
@@ -34,8 +30,8 @@ function useBackdropPointerEvents() {
       (0, _reactNativeReanimated.runOnJS)(setRuntimeBackdropBehavior)(next);
     }
   }, [screenOptions]);
-  const isComponentStack = flags.STACK_TYPE === _stack.StackType.COMPONENT;
-  const backdropBehavior = runtimeBackdropBehavior ?? current.options.backdropBehavior ?? (isComponentStack ? "passthrough" : "block");
+  const isComponentStack = stackType === _stack.StackType.COMPONENT;
+  const backdropBehavior = runtimeBackdropBehavior ?? descriptorBackdropBehavior ?? (isComponentStack ? "passthrough" : "block");
   const pointerEvents = backdropBehavior === "passthrough" ? "box-none" : undefined;
   const isBackdropActive = backdropBehavior === "dismiss" || backdropBehavior === "collapse";
   return {

package/lib/commonjs/shared/components/screen-container/hooks/use-backdrop-pointer-events.js.map

@@ -1 +1 @@
-{"version":3,"names":["_react","require","_reactNativeReanimated","_descriptors","_options","_core","_stack","useBackdropPointerEvents","current","useDescriptors","screenOptions","useScreenOptionsContext","flags","useStackCoreContext","runtimeBackdropBehavior","setRuntimeBackdropBehavior","useState","undefined","useAnimatedReaction","get","backdropBehavior","next","previous","runOnJS","isComponentStack","STACK_TYPE","StackType","COMPONENT","options","pointerEvents","isBackdropActive"],"sourceRoot":"../../../../../../src","sources":["shared/components/screen-container/hooks/use-backdrop-pointer-events.ts"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,OAAA;AACA,IAAAC,sBAAA,GAAAD,OAAA;AACA,IAAAE,YAAA,GAAAF,OAAA;AACA,IAAAG,QAAA,GAAAH,OAAA;AACA,IAAAI,KAAA,GAAAJ,OAAA;AAEA,IAAAK,MAAA,GAAAL,OAAA;AAQA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACO,SAASM,wBAAwBA,CAAA,EAAgC;EACvE,MAAM;IAAEC;EAAQ,CAAC,GAAG,IAAAC,2BAAc,EAAC,CAAC;EACpC,MAAMC,aAAa,GAAG,IAAAC,gCAAuB,EAAC,CAAC;EAC/C,MAAM;IAAEC;EAAM,CAAC,GAAG,IAAAC,yBAAmB,EAAC,CAAC;EACvC,MAAM,CAACC,uBAAuB,EAAEC,0BAA0B,CAAC,GAAG,IAAAC,eAAQ,EAEpEC,SAAS,CAAC;EAEZ,IAAAC,0CAAmB,EAClB,MAAMR,aAAa,CAACS,GAAG,CAAC,CAAC,CAACC,gBAAgB,EAC1C,CAACC,IAAI,EAAEC,QAAQ,KAAK;IACnB,SAAS;;IACT,IAAID,IAAI,KAAKC,QAAQ,EAAE;MACtB,IAAAC,8BAAO,EAACR,0BAA0B,CAAC,CAACM,IAAI,CAAC;IAC1C;EACD,CAAC,EACD,CAACX,aAAa,CACf,CAAC;EAED,MAAMc,gBAAgB,GAAGZ,KAAK,CAACa,UAAU,KAAKC,gBAAS,CAACC,SAAS;EACjE,MAAMP,gBAAkC,GACvCN,uBAAuB,IACvBN,OAAO,CAACoB,OAAO,CAACR,gBAAgB,KAC/BI,gBAAgB,GAAG,aAAa,GAAG,OAAO,CAAC;EAE7C,MAAMK,aAAa,GAClBT,gBAAgB,KAAK,aAAa,GAAG,UAAU,GAAGH,SAAS;EAE5D,MAAMa,gBAAgB,GACrBV,gBAAgB,KAAK,SAAS,IAAIA,gBAAgB,KAAK,UAAU;EAElE,OAAO;IAAES,aAAa;IAAET,gBAAgB;IAAEU;EAAiB,CAAC;AAC7D","ignoreList":[]}
+{"version":3,"names":["_react","require","_reactNativeReanimated","_descriptors","_options","_core","_stack","useBackdropPointerEvents","screenOptions","useScreenOptionsStore","descriptorBackdropBehavior","useDescriptorsStore","store","options","backdropBehavior","stackType","useStackCoreStore","flags","STACK_TYPE","runtimeBackdropBehavior","setRuntimeBackdropBehavior","useState","undefined","useAnimatedReaction","get","next","previous","runOnJS","isComponentStack","StackType","COMPONENT","pointerEvents","isBackdropActive"],"sourceRoot":"../../../../../../src","sources":["shared/components/screen-container/hooks/use-backdrop-pointer-events.ts"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,OAAA;AACA,IAAAC,sBAAA,GAAAD,OAAA;AACA,IAAAE,YAAA,GAAAF,OAAA;AACA,IAAAG,QAAA,GAAAH,OAAA;AACA,IAAAI,KAAA,GAAAJ,OAAA;AAEA,IAAAK,MAAA,GAAAL,OAAA;AAQA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACO,SAASM,wBAAwBA,CAAA,EAAgC;EACvE,MAAMC,aAAa,GAAG,IAAAC,8BAAqB,EAAC,CAAC;EAC7C,MAAMC,0BAA0B,GAAG,IAAAC,gCAAmB,EACpDC,KAAK,IAAKA,KAAK,CAACC,OAAO,CAACC,gBAC1B,CAAC;EACD,MAAMC,SAAS,GAAG,IAAAC,uBAAiB,EAAEJ,KAAK,IAAKA,KAAK,CAACK,KAAK,CAACC,UAAU,CAAC;EACtE,MAAM,CAACC,uBAAuB,EAAEC,0BAA0B,CAAC,GAAG,IAAAC,eAAQ,EAEpEC,SAAS,CAAC;EAEZ,IAAAC,0CAAmB,EAClB,MAAMf,aAAa,CAACgB,GAAG,CAAC,CAAC,CAACV,gBAAgB,EAC1C,CAACW,IAAI,EAAEC,QAAQ,KAAK;IACnB,SAAS;;IACT,IAAID,IAAI,KAAKC,QAAQ,EAAE;MACtB,IAAAC,8BAAO,EAACP,0BAA0B,CAAC,CAACK,IAAI,CAAC;IAC1C;EACD,CAAC,EACD,CAACjB,aAAa,CACf,CAAC;EAED,MAAMoB,gBAAgB,GAAGb,SAAS,KAAKc,gBAAS,CAACC,SAAS;EAC1D,MAAMhB,gBAAkC,GACvCK,uBAAuB,IACvBT,0BAA0B,KACzBkB,gBAAgB,GAAG,aAAa,GAAG,OAAO,CAAC;EAE7C,MAAMG,aAAa,GAClBjB,gBAAgB,KAAK,aAAa,GAAG,UAAU,GAAGQ,SAAS;EAE5D,MAAMU,gBAAgB,GACrBlB,gBAAgB,KAAK,SAAS,IAAIA,gBAAgB,KAAK,UAAU;EAElE,OAAO;IAAEiB,aAAa;IAAEjB,gBAAgB;IAAEkB;EAAiB,CAAC;AAC7D","ignoreList":[]}

package/lib/commonjs/shared/components/screen-container/hooks/use-content-layout.js

@@ -11,16 +11,12 @@ var _descriptors = require("../../../providers/screen/descriptors");
 var _animation = require("../../../stores/animation.store");
 var _system = require("../../../stores/system.store");
 function useContentLayout() {
-  const {
-    current
-  } = (0, _descriptors.useDescriptors)();
-  const {
-    isFirstKey
-  } = (0, _descriptors.useDescriptorDerivations)();
+  const routeKey = (0, _descriptors.useDescriptorsStore)(store => store.derivations.currentScreenKey);
+  const isFirstKey = (0, _descriptors.useDescriptorsStore)(store => store.derivations.isFirstKey);
+  const experimental_animateOnInitialMount = (0, _descriptors.useDescriptorsStore)(store => store.options.experimental_animateOnInitialMount);
   const {
     height: screenHeight
   } = (0, _reactNative.useWindowDimensions)();
-  const routeKey = current.route.key;
   const animations = _animation.AnimationStore.getBag(routeKey);
   const system = _system.SystemStore.getBag(routeKey);
   const {
@@ -31,7 +27,6 @@ function useContentLayout() {
   const {
     requestLifecycleTransition
   } = system.actions;
-  const experimental_animateOnInitialMount = current.options.experimental_animateOnInitialMount;
   return (0, _react.useCallback)(event => {
     const {
       width,

package/lib/commonjs/shared/components/screen-container/hooks/use-content-layout.js.map

@@ -1 +1 @@
-{"version":3,"names":["_react","require","_reactNative","_reactNativeReanimated","_descriptors","_animation","_system","useContentLayout","current","useDescriptors","isFirstKey","useDescriptorDerivations","height","screenHeight","useWindowDimensions","routeKey","route","key","animations","AnimationStore","getBag","system","SystemStore","targetProgress","resolvedAutoSnapPoint","measuredContentLayout","requestLifecycleTransition","actions","experimental_animateOnInitialMount","options","useCallback","event","width","nativeEvent","layout","fraction","Math","min","runOnUI","nextWidth","nextHeight","nextFraction","set","isFirstMeasurement","get","transitionProgress","progressAnimating","LifecycleTransitionRequestKind","Open"],"sourceRoot":"../../../../../../src","sources":["shared/components/screen-container/hooks/use-content-layout.ts"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,OAAA;AACA,IAAAC,YAAA,GAAAD,OAAA;AACA,IAAAE,sBAAA,GAAAF,OAAA;AACA,IAAAG,YAAA,GAAAH,OAAA;AAIA,IAAAI,UAAA,GAAAJ,OAAA;AACA,IAAAK,OAAA,GAAAL,OAAA;AAKO,SAASM,gBAAgBA,CAAA,EAAG;EAClC,MAAM;IAAEC;EAAQ,CAAC,GAAG,IAAAC,2BAAc,EAAC,CAAC;EACpC,MAAM;IAAEC;EAAW,CAAC,GAAG,IAAAC,qCAAwB,EAAC,CAAC;EACjD,MAAM;IAAEC,MAAM,EAAEC;EAAa,CAAC,GAAG,IAAAC,gCAAmB,EAAC,CAAC;EACtD,MAAMC,QAAQ,GAAGP,OAAO,CAACQ,KAAK,CAACC,GAAG;EAClC,MAAMC,UAAU,GAAGC,yBAAc,CAACC,MAAM,CAACL,QAAQ,CAAC;EAClD,MAAMM,MAAM,GAAGC,mBAAW,CAACF,MAAM,CAACL,QAAQ,CAAC;EAE3C,MAAM;IAAEQ,cAAc;IAAEC,qBAAqB;IAAEC;EAAsB,CAAC,GACrEJ,MAAM;EACP,MAAM;IAAEK;EAA2B,CAAC,GAAGL,MAAM,CAACM,OAAO;EAErD,MAAMC,kCAAkC,GACvCpB,OAAO,CAACqB,OAAO,CAACD,kCAAkC;EAEnD,OAAO,IAAAE,kBAAW,EAChBC,KAAwB,IAAK;IAC7B,MAAM;MAAEC,KAAK;MAAEpB;IAAO,CAAC,GAAGmB,KAAK,CAACE,WAAW,CAACC,MAAM;IAClD,IAAIF,KAAK,IAAI,CAAC,IAAIpB,MAAM,IAAI,CAAC,EAAE;IAE/B,MAAMuB,QAAQ,GAAGC,IAAI,CAACC,GAAG,CAACzB,MAAM,GAAGC,YAAY,EAAE,CAAC,CAAC;IAEnD,IAAAyB,8BAAO,EAAC,CAACC,SAAiB,EAAEC,UAAkB,EAAEC,YAAoB,KAAK;MACxE,SAAS;;MACThB,qBAAqB,CAACiB,GAAG,CAAC;QACzBV,KAAK,EAAEO,SAAS;QAChB3B,MAAM,EAAE4B;MACT,CAAC,CAAC;MAEF,MAAMG,kBAAkB,GAAGnB,qBAAqB,CAACoB,GAAG,CAAC,CAAC,IAAI,CAAC;MAC3DpB,qBAAqB,CAACkB,GAAG,CAACD,YAAY,CAAC;MAEvC,IACC,CAACE,kBAAkB,IACnBzB,UAAU,CAAC2B,kBAAkB,CAACD,GAAG,CAAC,CAAC,KAAK,CAAC,IACzC1B,UAAU,CAAC4B,iBAAiB,CAACF,GAAG,CAAC,CAAC,KAAK,CAAC,EACvC;QACD;MACD;MAEA,IAAIlC,UAAU,IAAI,CAACkB,kCAAkC,EAAE;QACtDL,cAAc,CAACmB,GAAG,CAACD,YAAY,CAAC;QAChCvB,UAAU,CAAC2B,kBAAkB,CAACH,GAAG,CAACD,YAAY,CAAC;QAC/C;MACD;MAEAf,0BAA0B,CACzBqB,sCAA8B,CAACC,IAAI,EACnCP,YACD,CAAC;IACF,CAAC,CAAC,CAACT,KAAK,EAAEpB,MAAM,EAAEuB,QAAQ,CAAC;EAC5B,CAAC,EACD,CACCjB,UAAU,EACVK,cAAc,EACdC,qBAAqB,EACrBC,qBAAqB,EACrBf,UAAU,EACVG,YAAY,EACZe,kCAAkC,EAClCF,0BAA0B,CAE5B,CAAC;AACF","ignoreList":[]}
+{"version":3,"names":["_react","require","_reactNative","_reactNativeReanimated","_descriptors","_animation","_system","useContentLayout","routeKey","useDescriptorsStore","store","derivations","currentScreenKey","isFirstKey","experimental_animateOnInitialMount","options","height","screenHeight","useWindowDimensions","animations","AnimationStore","getBag","system","SystemStore","targetProgress","resolvedAutoSnapPoint","measuredContentLayout","requestLifecycleTransition","actions","useCallback","event","width","nativeEvent","layout","fraction","Math","min","runOnUI","nextWidth","nextHeight","nextFraction","set","isFirstMeasurement","get","transitionProgress","progressAnimating","LifecycleTransitionRequestKind","Open"],"sourceRoot":"../../../../../../src","sources":["shared/components/screen-container/hooks/use-content-layout.ts"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,OAAA;AACA,IAAAC,YAAA,GAAAD,OAAA;AACA,IAAAE,sBAAA,GAAAF,OAAA;AACA,IAAAG,YAAA,GAAAH,OAAA;AACA,IAAAI,UAAA,GAAAJ,OAAA;AACA,IAAAK,OAAA,GAAAL,OAAA;AAKO,SAASM,gBAAgBA,CAAA,EAAG;EAClC,MAAMC,QAAQ,GAAG,IAAAC,gCAAmB,EAClCC,KAAK,IAAKA,KAAK,CAACC,WAAW,CAACC,gBAC9B,CAAC;EACD,MAAMC,UAAU,GAAG,IAAAJ,gCAAmB,EACpCC,KAAK,IAAKA,KAAK,CAACC,WAAW,CAACE,UAC9B,CAAC;EACD,MAAMC,kCAAkC,GAAG,IAAAL,gCAAmB,EAC5DC,KAAK,IAAKA,KAAK,CAACK,OAAO,CAACD,kCAC1B,CAAC;EACD,MAAM;IAAEE,MAAM,EAAEC;EAAa,CAAC,GAAG,IAAAC,gCAAmB,EAAC,CAAC;EACtD,MAAMC,UAAU,GAAGC,yBAAc,CAACC,MAAM,CAACb,QAAQ,CAAC;EAClD,MAAMc,MAAM,GAAGC,mBAAW,CAACF,MAAM,CAACb,QAAQ,CAAC;EAE3C,MAAM;IAAEgB,cAAc;IAAEC,qBAAqB;IAAEC;EAAsB,CAAC,GACrEJ,MAAM;EACP,MAAM;IAAEK;EAA2B,CAAC,GAAGL,MAAM,CAACM,OAAO;EAErD,OAAO,IAAAC,kBAAW,EAChBC,KAAwB,IAAK;IAC7B,MAAM;MAAEC,KAAK;MAAEf;IAAO,CAAC,GAAGc,KAAK,CAACE,WAAW,CAACC,MAAM;IAClD,IAAIF,KAAK,IAAI,CAAC,IAAIf,MAAM,IAAI,CAAC,EAAE;IAE/B,MAAMkB,QAAQ,GAAGC,IAAI,CAACC,GAAG,CAACpB,MAAM,GAAGC,YAAY,EAAE,CAAC,CAAC;IAEnD,IAAAoB,8BAAO,EAAC,CAACC,SAAiB,EAAEC,UAAkB,EAAEC,YAAoB,KAAK;MACxE,SAAS;;MACTd,qBAAqB,CAACe,GAAG,CAAC;QACzBV,KAAK,EAAEO,SAAS;QAChBtB,MAAM,EAAEuB;MACT,CAAC,CAAC;MAEF,MAAMG,kBAAkB,GAAGjB,qBAAqB,CAACkB,GAAG,CAAC,CAAC,IAAI,CAAC;MAC3DlB,qBAAqB,CAACgB,GAAG,CAACD,YAAY,CAAC;MAEvC,IACC,CAACE,kBAAkB,IACnBvB,UAAU,CAACyB,kBAAkB,CAACD,GAAG,CAAC,CAAC,KAAK,CAAC,IACzCxB,UAAU,CAAC0B,iBAAiB,CAACF,GAAG,CAAC,CAAC,KAAK,CAAC,EACvC;QACD;MACD;MAEA,IAAI9B,UAAU,IAAI,CAACC,kCAAkC,EAAE;QACtDU,cAAc,CAACiB,GAAG,CAACD,YAAY,CAAC;QAChCrB,UAAU,CAACyB,kBAAkB,CAACH,GAAG,CAACD,YAAY,CAAC;QAC/C;MACD;MAEAb,0BAA0B,CACzBmB,sCAA8B,CAACC,IAAI,EACnCP,YACD,CAAC;IACF,CAAC,CAAC,CAACT,KAAK,EAAEf,MAAM,EAAEkB,QAAQ,CAAC;EAC5B,CAAC,EACD,CACCf,UAAU,EACVK,cAAc,EACdC,qBAAqB,EACrBC,qBAAqB,EACrBb,UAAU,EACVI,YAAY,EACZH,kCAAkC,EAClCa,0BAA0B,CAE5B,CAAC;AACF","ignoreList":[]}

package/lib/commonjs/shared/components/screen-container/layers/backdrop.js

@@ -23,17 +23,18 @@ const BackdropLayer = exports.BackdropLayer = /*#__PURE__*/(0, _react.memo)(func
   backdropBehavior,
   isBackdropActive
 }) {
-  const {
-    current
-  } = (0, _descriptors.useDescriptors)();
   const {
     dismissScreen
   } = (0, _useNavigationHelpers.useNavigationHelpers)();
-  const BackdropComponent = current.options.backdropComponent;
-  const routeKey = current.route.key;
+  const routeKey = (0, _descriptors.useDescriptorsStore)(store => store.derivations.currentScreenKey);
+  const BackdropComponent = (0, _descriptors.useDescriptorsStore)(store => store.options.backdropComponent);
+  const rawSnapPoints = (0, _descriptors.useDescriptorsStore)(store => store.options.snapPoints);
+  const canDismiss = (0, _descriptors.useDescriptorsStore)(store => store.options.gestureEnabled !== false);
+  const transitionSpec = (0, _descriptors.useDescriptorsStore)(store => store.options.transitionSpec);
   const animations = _animation.AnimationStore.getBag(routeKey);
   const {
     targetProgress,
+    animationProgress,
     resolvedAutoSnapPoint
   } = _system.SystemStore.getBag(routeKey);
   const AnimatedBackdropComponent = (0, _react.useMemo)(() => BackdropComponent && !(0, _renderComponent.usesLayerRenderProps)(BackdropComponent) ? _reactNativeReanimated.default.createAnimatedComponent(BackdropComponent) : null, [BackdropComponent]);
@@ -43,16 +44,12 @@ const BackdropLayer = exports.BackdropLayer = /*#__PURE__*/(0, _react.memo)(func
       return;
     }
     if (backdropBehavior === "collapse") {
-      const rawSnapPoints = current.options.snapPoints;
-      const canDismiss = current.options.gestureEnabled !== false;
-
       // No snap points → fallback to dismiss
       if (!rawSnapPoints || rawSnapPoints.length === 0) {
         dismissScreen();
         return;
       }
       const gestures = _gesture.GestureStore.getBag(routeKey);
-      const transitionSpec = current.options.transitionSpec;
       (0, _reactNativeReanimated.runOnUI)(() => {
         "worklet";
 
@@ -78,14 +75,16 @@ const BackdropLayer = exports.BackdropLayer = /*#__PURE__*/(0, _react.memo)(func
         };
         (0, _animateToProgress.animateToProgress)({
           target,
+          markEntering: false,
           spec,
           animations,
           targetProgress,
+          animationProgress,
           onAnimationFinish: shouldDismiss ? dismissScreen : undefined
         });
       })();
     }
-  }, [animations, targetProgress, resolvedAutoSnapPoint, backdropBehavior, current, dismissScreen, routeKey]);
+  }, [animations, targetProgress, animationProgress, resolvedAutoSnapPoint, backdropBehavior, rawSnapPoints, canDismiss, transitionSpec, dismissScreen, routeKey]);
   const animatedBackdropStyle = (0, _styles.useSlotStyles)("backdrop");
   const animatedBackdropProps = (0, _styles.useSlotProps)("backdrop");
   const backdropPointerEvents = isBackdropActive ? "auto" : "none";

package/lib/commonjs/shared/components/screen-container/layers/backdrop.js.map

@@ -1 +1 @@
-{"version":3,"names":["_react","require","_reactNative","_reactNativeReanimated","_interopRequireWildcard","_specs","_useNavigationHelpers","_descriptors","_styles","_animation","_gesture","_system","_animateToProgress","_findCollapseTarget","_renderComponent","_jsxRuntime","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","BackdropLayer","exports","memo","backdropBehavior","isBackdropActive","current","useDescriptors","dismissScreen","useNavigationHelpers","BackdropComponent","options","backdropComponent","routeKey","route","key","animations","AnimationStore","getBag","targetProgress","resolvedAutoSnapPoint","SystemStore","AnimatedBackdropComponent","useMemo","usesLayerRenderProps","Animated","createAnimatedComponent","handleBackdropPress","useCallback","rawSnapPoints","snapPoints","canDismiss","gestureEnabled","length","gestures","GestureStore","transitionSpec","runOnUI","resolvedSnaps","point","resolvedPoint","push","target","shouldDismiss","findCollapseTarget","transitionProgress","dismissing","spec","open","expand","DefaultSnapSpec","close","collapse","animateToProgress","onAnimationFinish","undefined","animatedBackdropStyle","useSlotStyles","animatedBackdropProps","useSlotProps","backdropPointerEvents","backdropStyles","StyleSheet","absoluteFill","backdropProps","jsx","Pressable","style","pointerEvents","onPress","children","animatedProps","styles","props","View"],"sourceRoot":"../../../../../../src","sources":["shared/components/screen-container/layers/backdrop.tsx"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,OAAA;AACA,IAAAC,YAAA,GAAAD,OAAA;AACA,IAAAE,sBAAA,GAAAC,uBAAA,CAAAH,OAAA;AACA,IAAAI,MAAA,GAAAJ,OAAA;AACA,IAAAK,qBAAA,GAAAL,OAAA;AACA,IAAAM,YAAA,GAAAN,OAAA;AACA,IAAAO,OAAA,GAAAP,OAAA;AACA,IAAAQ,UAAA,GAAAR,OAAA;AACA,IAAAS,QAAA,GAAAT,OAAA;AACA,IAAAU,OAAA,GAAAV,OAAA;AAKA,IAAAW,kBAAA,GAAAX,OAAA;AACA,IAAAY,mBAAA,GAAAZ,OAAA;AACA,IAAAa,gBAAA,GAAAb,OAAA;AAA0D,IAAAc,WAAA,GAAAd,OAAA;AAAA,SAAAG,wBAAAY,CAAA,EAAAC,CAAA,6BAAAC,OAAA,MAAAC,CAAA,OAAAD,OAAA,IAAAE,CAAA,OAAAF,OAAA,YAAAd,uBAAA,YAAAA,CAAAY,CAAA,EAAAC,CAAA,SAAAA,CAAA,IAAAD,CAAA,IAAAA,CAAA,CAAAK,UAAA,SAAAL,CAAA,MAAAM,CAAA,EAAAC,CAAA,EAAAC,CAAA,KAAAC,SAAA,QAAAC,OAAA,EAAAV,CAAA,iBAAAA,CAAA,uBAAAA,CAAA,yBAAAA,CAAA,SAAAQ,CAAA,MAAAF,CAAA,GAAAL,CAAA,GAAAG,CAAA,GAAAD,CAAA,QAAAG,CAAA,CAAAK,GAAA,CAAAX,CAAA,UAAAM,CAAA,CAAAM,GAAA,CAAAZ,CAAA,GAAAM,CAAA,CAAAO,GAAA,CAAAb,CAAA,EAAAQ,CAAA,gBAAAP,CAAA,IAAAD,CAAA,gBAAAC,CAAA,OAAAa,cAAA,CAAAC,IAAA,CAAAf,CAAA,EAAAC,CAAA,OAAAM,CAAA,IAAAD,CAAA,GAAAU,MAAA,CAAAC,cAAA,KAAAD,MAAA,CAAAE,wBAAA,CAAAlB,CAAA,EAAAC,CAAA,OAAAM,CAAA,CAAAK,GAAA,IAAAL,CAAA,CAAAM,GAAA,IAAAP,CAAA,CAAAE,CAAA,EAAAP,CAAA,EAAAM,CAAA,IAAAC,CAAA,CAAAP,CAAA,IAAAD,CAAA,CAAAC,CAAA,WAAAO,CAAA,KAAAR,CAAA,EAAAC,CAAA;AAEnD,MAAMkB,aAAa,GAAAC,OAAA,CAAAD,aAAA,gBAAG,IAAAE,WAAI,EAAC,SAASF,aAAaA,CAAC;EACxDG,gBAAgB;EAChBC;AAID,CAAC,EAAE;EACF,MAAM;IAAEC;EAAQ,CAAC,GAAG,IAAAC,2BAAc,EAAC,CAAC;EACpC,MAAM;IAAEC;EAAc,CAAC,GAAG,IAAAC,0CAAoB,EAAC,CAAC;EAEhD,MAAMC,iBAAiB,GAAGJ,OAAO,CAACK,OAAO,CAACC,iBAAiB;EAC3D,MAAMC,QAAQ,GAAGP,OAAO,CAACQ,KAAK,CAACC,GAAG;EAClC,MAAMC,UAAU,GAAGC,yBAAc,CAACC,MAAM,CAACL,QAAQ,CAAC;EAClD,MAAM;IAAEM,cAAc;IAAEC;EAAsB,CAAC,GAC9CC,mBAAW,CAACH,MAAM,CAACL,QAAQ,CAAC;EAE7B,MAAMS,yBAAyB,GAAG,IAAAC,cAAO,EACxC,MACCb,iBAAiB,IAAI,CAAC,IAAAc,qCAAoB,EAACd,iBAAiB,CAAC,GAC1De,8BAAQ,CAACC,uBAAuB,CAChChB,iBACD,CAAC,GACA,IAAI,EACR,CAACA,iBAAiB,CACnB,CAAC;EAED,MAAMiB,mBAAmB,GAAG,IAAAC,kBAAW,EAAC,MAAM;IAC7C,IAAIxB,gBAAgB,KAAK,SAAS,EAAE;MACnCI,aAAa,CAAC,CAAC;MACf;IACD;IAEA,IAAIJ,gBAAgB,KAAK,UAAU,EAAE;MACpC,MAAMyB,aAAa,GAAGvB,OAAO,CAACK,OAAO,CAACmB,UAAU;MAChD,MAAMC,UAAU,GAAGzB,OAAO,CAACK,OAAO,CAACqB,cAAc,KAAK,KAAK;;MAE3D;MACA,IAAI,CAACH,aAAa,IAAIA,aAAa,CAACI,MAAM,KAAK,CAAC,EAAE;QACjDzB,aAAa,CAAC,CAAC;QACf;MACD;MAEA,MAAM0B,QAAQ,GAAGC,qBAAY,CAACjB,MAAM,CAACL,QAAQ,CAAC;MAC9C,MAAMuB,cAAc,GAAG9B,OAAO,CAACK,OAAO,CAACyB,cAAc;MAErD,IAAAC,8BAAO,EAAC,MAAM;QACb,SAAS;;QACT,MAAMC,aAAuB,GAAG,EAAE;QAElC,KAAK,IAAIjD,CAAC,GAAG,CAAC,EAAEA,CAAC,GAAGwC,aAAa,CAACI,MAAM,EAAE5C,CAAC,EAAE,EAAE;UAC9C,MAAMkD,KAAK,GAAGV,aAAa,CAACxC,CAAC,CAAC;UAC9B,MAAMmD,aAAa,GAClBD,KAAK,KAAK,MAAM,GAAGnB,qBAAqB,CAAC1B,GAAG,CAAC,CAAC,GAAG6C,KAAK;UAEvD,IAAI,OAAOC,aAAa,KAAK,QAAQ,EAAE;YACtCF,aAAa,CAACG,IAAI,CAACD,aAAa,CAAC;UAClC;QACD;QAEA,MAAM;UAAEE,MAAM;UAAEC;QAAc,CAAC,GAAG,IAAAC,sCAAkB,EACnD5B,UAAU,CAAC6B,kBAAkB,CAACnD,GAAG,CAAC,CAAC,EACnC4C,aAAa,EACbP,UACD,CAAC;;QAED;QACA,IAAIG,QAAQ,CAACY,UAAU,CAACpD,GAAG,CAAC,CAAC,EAAE;QAE/BwC,QAAQ,CAACY,UAAU,CAACnD,GAAG,CAACgD,aAAa,GAAG,CAAC,GAAG,CAAC,CAAC;QAE9C,MAAMI,IAAI,GAAGJ,aAAa,GACvBP,cAAc,GACd;UACAY,IAAI,EAAEZ,cAAc,EAAEa,MAAM,IAAIC,sBAAe;UAC/CC,KAAK,EAAEf,cAAc,EAAEgB,QAAQ,IAAIF;QACpC,CAAC;QAEH,IAAAG,oCAAiB,EAAC;UACjBX,MAAM;UACNK,IAAI;UACJ/B,UAAU;UACVG,cAAc;UACdmC,iBAAiB,EAAEX,aAAa,GAAGnC,aAAa,GAAG+C;QACpD,CAAC,CAAC;MACH,CAAC,CAAC,CAAC,CAAC;IACL;EACD,CAAC,EAAE,CACFvC,UAAU,EACVG,cAAc,EACdC,qBAAqB,EACrBhB,gBAAgB,EAChBE,OAAO,EACPE,aAAa,EACbK,QAAQ,CACR,CAAC;EAEF,MAAM2C,qBAAqB,GAAG,IAAAC,qBAAa,EAAC,UAAU,CAAC;EACvD,MAAMC,qBAAqB,GAAG,IAAAC,oBAAY,EAAC,UAAU,CAAC;EACtD,MAAMC,qBAAqB,GAAGvD,gBAAgB,GAAG,MAAM,GAAG,MAAM;EAChE,MAAMwD,cAAc,GAAG,CACtBC,uBAAU,CAACC,YAAY,EACvBP,qBAAqB,CACqB;EAC3C,MAAMQ,aAAa,GAClBN,qBAA8D;EAE/D,oBACC,IAAA7E,WAAA,CAAAoF,GAAA,EAACjG,YAAA,CAAAkG,SAAS;IACTC,KAAK,EAAEL,uBAAU,CAACC,YAAa;IAC/BK,aAAa,EAAE/D,gBAAgB,GAAG,MAAM,GAAG,MAAO;IAClDgE,OAAO,EAAEhE,gBAAgB,GAAGsB,mBAAmB,GAAG4B,SAAU;IAAAe,QAAA,EAE3DhD,yBAAyB,gBACzB,IAAAzC,WAAA,CAAAoF,GAAA,EAAC3C,yBAAyB;MACzB6C,KAAK,EAAEN,cAAe;MACtBU,aAAa,EAAEb,qBAAsB;MACrCU,aAAa,EAAER;IAAsB,CACrC,CAAC,GACClD,iBAAiB,gBACpB,IAAA7B,WAAA,CAAAoF,GAAA,EAACvD,iBAAiB;MACjB8D,MAAM,EAAEX,cAAe;MACvBY,KAAK,EAAET,aAAc;MACrBI,aAAa,EAAER;IAAsB,CACrC,CAAC,gBAEF,IAAA/E,WAAA,CAAAoF,GAAA,EAAChG,sBAAA,CAAAuB,OAAQ,CAACkF,IAAI;MACbP,KAAK,EAAEN,cAAe;MACtBO,aAAa,EAAER;IAAsB,CACrC;EACD,CACS,CAAC;AAEd,CAAC,CAAC","ignoreList":[]}
+{"version":3,"names":["_react","require","_reactNative","_reactNativeReanimated","_interopRequireWildcard","_specs","_useNavigationHelpers","_descriptors","_styles","_animation","_gesture","_system","_animateToProgress","_findCollapseTarget","_renderComponent","_jsxRuntime","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","BackdropLayer","exports","memo","backdropBehavior","isBackdropActive","dismissScreen","useNavigationHelpers","routeKey","useDescriptorsStore","store","derivations","currentScreenKey","BackdropComponent","options","backdropComponent","rawSnapPoints","snapPoints","canDismiss","gestureEnabled","transitionSpec","animations","AnimationStore","getBag","targetProgress","animationProgress","resolvedAutoSnapPoint","SystemStore","AnimatedBackdropComponent","useMemo","usesLayerRenderProps","Animated","createAnimatedComponent","handleBackdropPress","useCallback","length","gestures","GestureStore","runOnUI","resolvedSnaps","point","resolvedPoint","push","target","shouldDismiss","findCollapseTarget","transitionProgress","dismissing","spec","open","expand","DefaultSnapSpec","close","collapse","animateToProgress","markEntering","onAnimationFinish","undefined","animatedBackdropStyle","useSlotStyles","animatedBackdropProps","useSlotProps","backdropPointerEvents","backdropStyles","StyleSheet","absoluteFill","backdropProps","jsx","Pressable","style","pointerEvents","onPress","children","animatedProps","styles","props","View"],"sourceRoot":"../../../../../../src","sources":["shared/components/screen-container/layers/backdrop.tsx"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/shared/components/screen-container/layers/content.js

@@ -10,7 +10,6 @@ var _reactNativeGestureHandler = require("react-native-gesture-handler");
 var _reactNativeReanimated = _interopRequireDefault(require("react-native-reanimated"));
 var _descriptors = require("../../../providers/screen/descriptors");
 var _gestures = require("../../../providers/screen/gestures");
-var _origin = require("../../../providers/screen/origin.provider");
 var _styles = require("../../../providers/screen/styles");
 var _host = require("../../boundary/portal/components/boundary-portal/components/host");
 var _useContentLayout = require("../hooks/use-content-layout");
@@ -26,17 +25,14 @@ const ContentLayer = exports.ContentLayer = /*#__PURE__*/(0, _react.memo)(({
   pointerEvents,
   isBackdropActive
 }) => {
-  const {
-    current
-  } = (0, _descriptors.useDescriptors)();
-  const gestureContext = (0, _gestures.useGestureContext)();
-  const ContentComponent = current.options.contentComponent;
-  const isNavigationMaskEnabled = !!current.options.navigationMaskEnabled;
+  const gestureContext = (0, _gestures.useGestureStore)();
+  const ContentComponent = (0, _descriptors.useDescriptorsStore)(store => store.options.contentComponent);
+  const isNavigationMaskEnabled = (0, _descriptors.useDescriptorsStore)(store => !!store.options.navigationMaskEnabled);
+  const hasAutoSnapPoint = (0, _descriptors.useDescriptorsStore)(store => store.options.snapPoints?.includes("auto") ?? false);
   const contentPointerEvents = isBackdropActive ? "box-none" : pointerEvents;
   const AnimatedContentComponent = (0, _react.useMemo)(() => {
     return ContentComponent && !(0, _renderComponent.usesLayerRenderProps)(ContentComponent) ? _reactNativeReanimated.default.createAnimatedComponent(ContentComponent) : null;
   }, [ContentComponent]);
-  const hasAutoSnapPoint = current.options.snapPoints?.includes("auto") ?? false;
   const handleContentLayout = (0, _useContentLayout.useContentLayout)();
   const animatedContentStyle = (0, _styles.useSlotStyles)("content");
   const animatedContentProps = (0, _styles.useSlotProps)("content");
@@ -45,15 +41,13 @@ const ContentLayer = exports.ContentLayer = /*#__PURE__*/(0, _react.memo)(({
   const contentChildren = /*#__PURE__*/(0, _jsxRuntime.jsx)(_maybeMaskedNavigationContainer.MaybeMaskedNavigationContainer, {
     pointerEvents: contentPointerEvents,
     enabled: isNavigationMaskEnabled,
-    children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_surfaceContainer.SurfaceContainer, {
+    children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_surfaceContainer.SurfaceContainer, {
       pointerEvents: contentPointerEvents,
-      children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_origin.OriginProvider, {
-        children: [hasAutoSnapPoint ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.View, {
-          collapsable: false,
-          onLayout: handleContentLayout,
-          children: children
-        }) : children, /*#__PURE__*/(0, _jsxRuntime.jsx)(_host.ScreenFallbackHost, {})]
-      })
+      children: [hasAutoSnapPoint ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.View, {
+        collapsable: false,
+        onLayout: handleContentLayout,
+        children: children
+      }) : children, /*#__PURE__*/(0, _jsxRuntime.jsx)(_host.ScreenFallbackHost, {})]
     })
   });
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNativeGestureHandler.GestureDetector, {