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

package/lib/commonjs/shared/providers/screen/animation/helpers/hydrate-transition-state.js

@@ -5,46 +5,97 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.hydrateTransitionState = exports.computeLogicallySettled = void 0;
 var _constants = require("../../../../constants");
-const computeSettled = params => {
+const computeSettled = (animating, dismissing, closing) => {
   "worklet";
 
-  const {
-    animating,
-    dismissing,
-    closing
-  } = params;
   return animating || dismissing || closing ? _constants.FALSE : _constants.TRUE;
 };
-const computeSnapIndex = (progress, snapPoints) => {
+const getResolvedSnapPointCount = (snapPoints, resolvedAutoSnap) => {
   "worklet";
 
-  if (snapPoints.length === 0) return -1;
-  if (progress <= snapPoints[0]) return 0;
-  if (progress >= snapPoints[snapPoints.length - 1]) return snapPoints.length - 1;
-  for (let i = 0; i < snapPoints.length - 1; i++) {
-    if (progress <= snapPoints[i + 1]) {
-      const t = (progress - snapPoints[i]) / (snapPoints[i + 1] - snapPoints[i]);
+  return snapPoints.length + (resolvedAutoSnap !== null ? 1 : 0);
+};
+const getAutoSnapPointIndex = (snapPoints, resolvedAutoSnap) => {
+  "worklet";
+
+  let index = 0;
+  while (index < snapPoints.length && snapPoints[index] <= resolvedAutoSnap) {
+    index++;
+  }
+  return index;
+};
+const getResolvedSnapPointAt = (snapPoints, resolvedAutoSnap, autoSnapPointIndex, index) => {
+  "worklet";
+
+  if (resolvedAutoSnap === null) {
+    return snapPoints[index];
+  }
+  if (index < autoSnapPointIndex) {
+    return snapPoints[index];
+  }
+  if (index === autoSnapPointIndex) {
+    return resolvedAutoSnap;
+  }
+  return snapPoints[index - 1];
+};
+const computeAnimatedSnapIndex = (progress, snapPoints, resolvedAutoSnap) => {
+  "worklet";
+
+  const snapPointCount = getResolvedSnapPointCount(snapPoints, resolvedAutoSnap);
+  if (snapPointCount === 0) return -1;
+  const autoSnapPointIndex = resolvedAutoSnap === null ? -1 : getAutoSnapPointIndex(snapPoints, resolvedAutoSnap);
+  const firstSnapPoint = getResolvedSnapPointAt(snapPoints, resolvedAutoSnap, autoSnapPointIndex, 0);
+  const lastSnapPoint = getResolvedSnapPointAt(snapPoints, resolvedAutoSnap, autoSnapPointIndex, snapPointCount - 1);
+  if (progress <= firstSnapPoint) return 0;
+  if (progress >= lastSnapPoint) return snapPointCount - 1;
+  for (let i = 0; i < snapPointCount - 1; i++) {
+    const currentSnapPoint = getResolvedSnapPointAt(snapPoints, resolvedAutoSnap, autoSnapPointIndex, i);
+    const nextSnapPoint = getResolvedSnapPointAt(snapPoints, resolvedAutoSnap, autoSnapPointIndex, i + 1);
+    if (progress <= nextSnapPoint) {
+      const t = (progress - currentSnapPoint) / (nextSnapPoint - currentSnapPoint);
       return i + t;
     }
   }
-  return snapPoints.length - 1;
+  return snapPointCount - 1;
 };
-const computeLogicallySettled = ({
-  progress,
-  targetProgress,
-  settled,
-  dragging
-}) => {
+const computeTargetSnapIndex = (targetProgress, snapPoints, resolvedAutoSnap) => {
+  "worklet";
+
+  const snapPointCount = getResolvedSnapPointCount(snapPoints, resolvedAutoSnap);
+  if (snapPointCount === 0) return -1;
+  const autoSnapPointIndex = resolvedAutoSnap === null ? -1 : getAutoSnapPointIndex(snapPoints, resolvedAutoSnap);
+  const firstSnapPoint = getResolvedSnapPointAt(snapPoints, resolvedAutoSnap, autoSnapPointIndex, 0);
+  if (targetProgress <= 0 && Math.abs(firstSnapPoint) > _constants.EPSILON) {
+    return -1;
+  }
+  let nearestIndex = 0;
+  let smallestDistance = Math.abs(targetProgress - firstSnapPoint);
+  for (let i = 1; i < snapPointCount; i++) {
+    const snapPoint = getResolvedSnapPointAt(snapPoints, resolvedAutoSnap, autoSnapPointIndex, i);
+    const distance = Math.abs(targetProgress - snapPoint);
+    if (distance < smallestDistance) {
+      smallestDistance = distance;
+      nearestIndex = i;
+    }
+  }
+  return nearestIndex;
+};
+const computeLogicallySettledValue = (progress, targetProgress, settled, gestureActive) => {
   "worklet";
 
   if (settled) {
     return _constants.TRUE;
   }
-  if (dragging) {
+  if (gestureActive) {
     return _constants.FALSE;
   }
   return Math.abs(progress - targetProgress) <= _constants.ANIMATION_SNAP_THRESHOLD ? _constants.TRUE : _constants.FALSE;
 };
+const computeLogicallySettled = params => {
+  "worklet";
+
+  return computeLogicallySettledValue(params.progress, params.targetProgress, params.settled, params.gestureActive);
+};
 exports.computeLogicallySettled = computeLogicallySettled;
 const hydrateTransitionState = (s, dimensions) => {
   "worklet";
@@ -58,26 +109,31 @@ const hydrateTransitionState = (s, dimensions) => {
   out.gesture.y = s.gesture.y.get();
   out.gesture.normX = s.gesture.normX.get();
   out.gesture.normY = s.gesture.normY.get();
+  out.gesture.scale = s.gesture.scale.get();
+  out.gesture.normScale = s.gesture.normScale.get();
+  out.gesture.focalX = s.gesture.focalX.get();
+  out.gesture.focalY = s.gesture.focalY.get();
+  out.gesture.raw.x = s.gesture.raw.x.get();
+  out.gesture.raw.y = s.gesture.raw.y.get();
+  out.gesture.raw.normX = s.gesture.raw.normX.get();
+  out.gesture.raw.normY = s.gesture.raw.normY.get();
+  out.gesture.raw.scale = s.gesture.raw.scale.get();
+  out.gesture.raw.normScale = s.gesture.raw.normScale.get();
   out.gesture.dismissing = s.gesture.dismissing.get();
   out.gesture.dragging = s.gesture.dragging.get();
+  out.gesture.settling = s.gesture.settling.get();
+  out.gesture.active = s.gesture.active.get();
   out.gesture.direction = s.gesture.direction.get();
-  const isGestureSettling = Math.abs(out.gesture.normX) > _constants.EPSILON || Math.abs(out.gesture.normY) > _constants.EPSILON;
-  out.animating = s.animating.get() || out.gesture.dragging || isGestureSettling ? 1 : 0;
+  const isGestureSettling = Math.abs(out.gesture.normX) > _constants.EPSILON || Math.abs(out.gesture.normY) > _constants.EPSILON || Math.abs(out.gesture.normScale) > _constants.EPSILON;
+  const isGestureActive = out.gesture.dragging || out.gesture.settling || isGestureSettling ? _constants.TRUE : _constants.FALSE;
+  out.animating = s.animating.get() || isGestureActive ? 1 : 0;
   out.gesture.normalizedX = out.gesture.normX;
   out.gesture.normalizedY = out.gesture.normY;
   out.gesture.isDismissing = out.gesture.dismissing;
   out.gesture.isDragging = out.gesture.dragging;
-  out.settled = computeSettled({
-    animating: out.animating,
-    dismissing: out.gesture.dismissing,
-    closing: out.closing
-  });
-  out.logicallySettled = computeLogicallySettled({
-    progress: out.progress,
-    targetProgress: s.targetProgress.get(),
-    settled: out.settled,
-    dragging: out.gesture.dragging
-  });
+  out.settled = computeSettled(out.animating, out.gesture.dismissing, out.closing);
+  const targetProgress = s.targetProgress.get();
+  out.logicallySettled = computeLogicallySettledValue(out.progress, targetProgress, out.settled, isGestureActive);
   if (s.settled.get() !== out.settled) {
     s.settled.set(out.settled);
   }
@@ -85,25 +141,23 @@ const hydrateTransitionState = (s, dimensions) => {
     s.logicallySettled.set(out.logicallySettled);
   }
   out.meta = s.meta;
+  out.options = s.options;
+  out.route = s.route;
   out.layouts.screen.width = dimensions.width;
   out.layouts.screen.height = dimensions.height;
+  out.layouts.navigationMaskEnabled = s.navigationMaskEnabled;
   const content = s.measuredContentLayout.get();
   if (content) {
-    if (!out.layouts.content) {
-      out.layouts.content = {
-        width: content.width,
-        height: content.height
-      };
-    } else {
-      out.layouts.content.width = content.width;
-      out.layouts.content.height = content.height;
-    }
+    s.contentLayoutSlot.width = content.width;
+    s.contentLayoutSlot.height = content.height;
+    out.layouts.content = s.contentLayoutSlot;
   } else {
     out.layouts.content = undefined;
   }
-  const resolvedAutoSnap = s.hasAutoSnapPoint && s.resolvedAutoSnapPoint.get() > 0 ? s.resolvedAutoSnapPoint.get() : null;
-  const resolvedSnapPoints = resolvedAutoSnap !== null ? [...s.sortedNumericSnapPoints, resolvedAutoSnap].sort((a, b) => a - b) : s.sortedNumericSnapPoints;
-  out.snapIndex = computeSnapIndex(out.progress, resolvedSnapPoints);
+  const autoSnapPoint = s.resolvedAutoSnapPoint.get();
+  const resolvedAutoSnap = s.hasAutoSnapPoint && autoSnapPoint > 0 ? autoSnapPoint : null;
+  out.animatedSnapIndex = computeAnimatedSnapIndex(out.progress, s.sortedNumericSnapPoints, resolvedAutoSnap);
+  out.snapIndex = computeTargetSnapIndex(targetProgress, s.sortedNumericSnapPoints, resolvedAutoSnap);
   return out;
 };
 exports.hydrateTransitionState = hydrateTransitionState;

package/lib/commonjs/shared/providers/screen/animation/helpers/hydrate-transition-state.js.map

@@ -1 +1 @@
-{"version":3,"names":["_constants","require","computeSettled","params","animating","dismissing","closing","FALSE","TRUE","computeSnapIndex","progress","snapPoints","length","i","t","computeLogicallySettled","targetProgress","settled","dragging","Math","abs","ANIMATION_SNAP_THRESHOLD","exports","hydrateTransitionState","s","dimensions","out","unwrapped","get","willAnimate","entering","gesture","x","y","normX","normY","direction","isGestureSettling","EPSILON","normalizedX","normalizedY","isDismissing","isDragging","logicallySettled","set","meta","layouts","screen","width","height","content","measuredContentLayout","undefined","resolvedAutoSnap","hasAutoSnapPoint","resolvedAutoSnapPoint","resolvedSnapPoints","sortedNumericSnapPoints","sort","a","b","snapIndex"],"sourceRoot":"../../../../../../../src","sources":["shared/providers/screen/animation/helpers/hydrate-transition-state.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_constants","require","computeSettled","animating","dismissing","closing","FALSE","TRUE","getResolvedSnapPointCount","snapPoints","resolvedAutoSnap","length","getAutoSnapPointIndex","index","getResolvedSnapPointAt","autoSnapPointIndex","computeAnimatedSnapIndex","progress","snapPointCount","firstSnapPoint","lastSnapPoint","i","currentSnapPoint","nextSnapPoint","t","computeTargetSnapIndex","targetProgress","Math","abs","EPSILON","nearestIndex","smallestDistance","snapPoint","distance","computeLogicallySettledValue","settled","gestureActive","ANIMATION_SNAP_THRESHOLD","computeLogicallySettled","params","exports","hydrateTransitionState","s","dimensions","out","unwrapped","get","willAnimate","entering","gesture","x","y","normX","normY","scale","normScale","focalX","focalY","raw","dragging","settling","active","direction","isGestureSettling","isGestureActive","normalizedX","normalizedY","isDismissing","isDragging","logicallySettled","set","meta","options","route","layouts","screen","width","height","navigationMaskEnabled","content","measuredContentLayout","contentLayoutSlot","undefined","autoSnapPoint","resolvedAutoSnapPoint","hasAutoSnapPoint","animatedSnapIndex","sortedNumericSnapPoints","snapIndex"],"sourceRoot":"../../../../../../../src","sources":["shared/providers/screen/animation/helpers/hydrate-transition-state.ts"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/shared/providers/screen/animation/helpers/pipeline.js

@@ -16,23 +16,28 @@ var _derivations = require("./derivations");
 var _hasTransitionsEnabled = require("./has-transitions-enabled");
 var _hydrateTransitionState = require("./hydrate-transition-state");
 var _useBuildTransitionState = require("./use-build-transition-state");
-const createInitialBaseInterpolatorProps = (dimensions, insets) => ({
-  layouts: {
-    screen: dimensions,
-    navigationMaskEnabled: false
-  },
-  insets,
-  previous: undefined,
-  current: _constants.DEFAULT_SCREEN_TRANSITION_STATE,
-  next: undefined,
-  progress: 0,
-  stackProgress: 0,
-  snapIndex: -1,
-  logicallySettled: 1,
-  focused: true,
-  active: _constants.DEFAULT_SCREEN_TRANSITION_STATE,
-  inactive: undefined
-});
+const createInitialBaseInterpolatorProps = (dimensions, insets) => {
+  const current = {
+    ..._constants.DEFAULT_SCREEN_TRANSITION_STATE,
+    layouts: {
+      screen: dimensions,
+      navigationMaskEnabled: false
+    }
+  };
+  return {
+    layouts: current.layouts,
+    insets,
+    previous: undefined,
+    current,
+    next: undefined,
+    progress: 0,
+    stackProgress: 0,
+    logicallySettled: 1,
+    focused: true,
+    active: current,
+    inactive: undefined
+  };
+};
 function useScreenAnimationPipeline() {
   const {
     flags,
@@ -47,89 +52,59 @@ function useScreenAnimationPipeline() {
     next: nextDescriptor,
     previous: prevDescriptor
   } = (0, _descriptors.useDescriptors)();
-  const currentAnimation = (0, _useBuildTransitionState.useBuildTransitionState)(currDescriptor, "current");
-  const nextAnimation = (0, _useBuildTransitionState.useBuildTransitionState)(nextDescriptor, "next");
-  const prevAnimation = (0, _useBuildTransitionState.useBuildTransitionState)(prevDescriptor, "previous");
+  const currentAnimation = (0, _useBuildTransitionState.useBuildTransitionState)(currDescriptor);
+  const nextAnimation = (0, _useBuildTransitionState.useBuildTransitionState)(nextDescriptor);
+  const prevAnimation = (0, _useBuildTransitionState.useBuildTransitionState)(prevDescriptor);
   const currentRouteKey = currDescriptor?.route?.key;
   const currentIndex = routeKeys.indexOf(currentRouteKey);
   const nextRouteKey = nextDescriptor?.route?.key;
   const nextHasTransitions = !!nextRouteKey && (0, _hasTransitionsEnabled.hasTransitionsEnabled)(nextDescriptor?.options, transitionsAlwaysOn);
   const screenInterpolatorProps = (0, _reactNativeReanimated.useSharedValue)(createInitialBaseInterpolatorProps(dimensions, insets));
-  const boundsAccessor = (0, _react.useMemo)(() => {
-    return (0, _bounds.createBoundsAccessor)(() => {
-      "worklet";
-
-      return screenInterpolatorProps.get();
-    });
-  }, [screenInterpolatorProps]);
-  (0, _reactNativeReanimated.useAnimatedReaction)(() => {
-    "worklet";
-
-    const previous = prevAnimation ? (0, _hydrateTransitionState.hydrateTransitionState)(prevAnimation, dimensions) : undefined;
-    const next = nextAnimation && nextHasTransitions ? (0, _hydrateTransitionState.hydrateTransitionState)(nextAnimation, dimensions) : undefined;
-    const current = currentAnimation ? (0, _hydrateTransitionState.hydrateTransitionState)(currentAnimation, dimensions) : _constants.DEFAULT_SCREEN_TRANSITION_STATE;
-    const {
-      progress,
-      ...helpers
-    } = (0, _derivations.derivations)({
-      previous,
-      current,
-      next
-    });
-    const stackProgress = currentIndex >= 0 ? rootStackProgress.get() - currentIndex : progress;
-    const focused = helpers.focused;
-    const active = helpers.active;
-    const inactive = helpers.inactive;
-    const snapIndex = current.snapIndex;
-    const logicallySettled = active.logicallySettled;
-    return {
-      previous,
-      current,
-      next,
-      progress,
-      stackProgress,
-      snapIndex,
-      logicallySettled,
-      focused,
-      active,
-      inactive
-    };
-  }, ({
-    previous,
-    current,
-    next,
-    progress,
-    stackProgress,
-    snapIndex,
-    logicallySettled,
-    focused,
-    active,
-    inactive
-  }) => {
+  const screenInterpolatorFrameRevisionState = (0, _reactNativeReanimated.useSharedValue)({
+    value: 0
+  });
+  const screenInterpolatorFrameUpdater = (0, _reactNativeReanimated.useDerivedValue)(() => {
     "worklet";
 
     screenInterpolatorProps.modify(frame => {
       "worklet";
 
-      frame.layouts = current.layouts;
+      frame.previous = prevAnimation ? (0, _hydrateTransitionState.hydrateTransitionState)(prevAnimation, dimensions) : undefined;
+      frame.current = currentAnimation ? (0, _hydrateTransitionState.hydrateTransitionState)(currentAnimation, dimensions) : _constants.DEFAULT_SCREEN_TRANSITION_STATE;
+      frame.next = nextAnimation && nextHasTransitions ? (0, _hydrateTransitionState.hydrateTransitionState)(nextAnimation, dimensions) : undefined;
+      frame.layouts = frame.current.layouts;
       frame.insets = insets;
-      frame.previous = previous;
-      frame.current = current;
-      frame.next = next;
-      frame.progress = progress;
-      frame.stackProgress = stackProgress;
-      frame.snapIndex = snapIndex;
-      frame.logicallySettled = logicallySettled;
-      frame.focused = focused;
-      frame.active = active;
-      frame.inactive = inactive;
+      (0, _derivations.updateDerivations)(frame);
+      frame.stackProgress = currentIndex >= 0 ? rootStackProgress.get() - currentIndex : frame.progress;
+      frame.logicallySettled = frame.active.logicallySettled;
       return frame;
-    });
+    }, false);
+
+    // MAINTAINER NOTE: We increment a revision counter instead of returning a
+    // new frame object so consumers can subscribe to in-place frame updates.
+    //
+    // Since we mutate the frame in place for performance reasons, readers must
+    // call `screenInterpolatorFrameUpdater.get()` before reading the frame.
+    screenInterpolatorFrameRevisionState.modify(revision => {
+      "worklet";
+
+      revision.value += 1;
+      return revision;
+    }, false);
+    return screenInterpolatorFrameRevisionState.get().value;
   });
+  const boundsAccessor = (0, _react.useMemo)(() => {
+    return (0, _bounds.createBoundsAccessor)(() => {
+      "worklet";
+
+      return screenInterpolatorProps.get();
+    });
+  }, [screenInterpolatorProps]);
   const nextInterpolator = nextDescriptor?.options.screenStyleInterpolator;
   const currentInterpolator = currDescriptor?.options.screenStyleInterpolator;
   return {
     screenInterpolatorProps,
+    screenInterpolatorFrameUpdater,
     nextInterpolator,
     currentInterpolator,
     boundsAccessor

package/lib/commonjs/shared/providers/screen/animation/helpers/pipeline.js.map

@@ -1 +1 @@
-{"version":3,"names":["_react","require","_reactNative","_reactNativeReanimated","_reactNativeSafeAreaContext","_constants","_useStack","_bounds","_descriptors","_derivations","_hasTransitionsEnabled","_hydrateTransitionState","_useBuildTransitionState","createInitialBaseInterpolatorProps","dimensions","insets","layouts","screen","navigationMaskEnabled","previous","undefined","current","DEFAULT_SCREEN_TRANSITION_STATE","next","progress","stackProgress","snapIndex","logicallySettled","focused","active","inactive","useScreenAnimationPipeline","flags","rootStackProgress","routeKeys","useStack","useWindowDimensions","useSafeAreaInsets","transitionsAlwaysOn","TRANSITIONS_ALWAYS_ON","currDescriptor","nextDescriptor","prevDescriptor","useDescriptors","currentAnimation","useBuildTransitionState","nextAnimation","prevAnimation","currentRouteKey","route","key","currentIndex","indexOf","nextRouteKey","nextHasTransitions","hasTransitionsEnabled","options","screenInterpolatorProps","useSharedValue","boundsAccessor","useMemo","createBoundsAccessor","get","useAnimatedReaction","hydrateTransitionState","helpers","derivations","modify","frame","nextInterpolator","screenStyleInterpolator","currentInterpolator"],"sourceRoot":"../../../../../../../src","sources":["shared/providers/screen/animation/helpers/pipeline.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_react","require","_reactNative","_reactNativeReanimated","_reactNativeSafeAreaContext","_constants","_useStack","_bounds","_descriptors","_derivations","_hasTransitionsEnabled","_hydrateTransitionState","_useBuildTransitionState","createInitialBaseInterpolatorProps","dimensions","insets","current","DEFAULT_SCREEN_TRANSITION_STATE","layouts","screen","navigationMaskEnabled","previous","undefined","next","progress","stackProgress","logicallySettled","focused","active","inactive","useScreenAnimationPipeline","flags","rootStackProgress","routeKeys","useStack","useWindowDimensions","useSafeAreaInsets","transitionsAlwaysOn","TRANSITIONS_ALWAYS_ON","currDescriptor","nextDescriptor","prevDescriptor","useDescriptors","currentAnimation","useBuildTransitionState","nextAnimation","prevAnimation","currentRouteKey","route","key","currentIndex","indexOf","nextRouteKey","nextHasTransitions","hasTransitionsEnabled","options","screenInterpolatorProps","useSharedValue","screenInterpolatorFrameRevisionState","value","screenInterpolatorFrameUpdater","useDerivedValue","modify","frame","hydrateTransitionState","updateDerivations","get","revision","boundsAccessor","useMemo","createBoundsAccessor","nextInterpolator","screenStyleInterpolator","currentInterpolator"],"sourceRoot":"../../../../../../../src","sources":["shared/providers/screen/animation/helpers/pipeline.ts"],"mappings":"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","ignoreList":[]}

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

@@ -9,20 +9,20 @@ var _constants = require("../../../../constants");
 var _animation = require("../../../../stores/animation.store");
 var _gesture = require("../../../../stores/gesture.store");
 var _system = require("../../../../stores/system.store");
+var _buildScreenTransitionOptions = require("./build-screen-transition-options");
 var _worklet = require("./worklet");
-const useBuildTransitionState = (descriptor, slot) => {
+const useBuildTransitionState = descriptor => {
   const key = descriptor?.route?.key;
   const meta = descriptor?.options?.meta;
   const route = descriptor?.route;
-  const gestureEnabled = descriptor?.options?.gestureEnabled;
   const navigationMaskEnabled = !!descriptor?.options?.navigationMaskEnabled;
   const snapPoints = descriptor?.options?.snapPoints;
-  const shouldUseNeutralNextGestures = slot === "next" && gestureEnabled === false && (!snapPoints || snapPoints.length === 0);
   return (0, _react.useMemo)(() => {
     if (!key || !route) return undefined;
     const plainRoute = (0, _worklet.toPlainRoute)(route);
     const plainMeta = meta ? (0, _worklet.toPlainValue)(meta) : undefined;
     const sortedNumericSnapPoints = (snapPoints ?? []).filter(p => typeof p === "number").sort((a, b) => a - b);
+    const transitionOptions = (0, _buildScreenTransitionOptions.buildScreenTransitionOptions)(descriptor.options);
     return {
       progress: _animation.AnimationStore.getValue(key, "progress"),
       willAnimate: _animation.AnimationStore.getValue(key, "willAnimate"),
@@ -34,14 +34,20 @@ const useBuildTransitionState = (descriptor, slot) => {
       targetProgress: _system.SystemStore.getValue(key, "targetProgress"),
       resolvedAutoSnapPoint: _system.SystemStore.getValue(key, "resolvedAutoSnapPoint"),
       measuredContentLayout: _system.SystemStore.getValue(key, "measuredContentLayout"),
+      contentLayoutSlot: {
+        width: 0,
+        height: 0
+      },
       hasAutoSnapPoint: snapPoints?.includes("auto") ?? false,
       sortedNumericSnapPoints,
-      gesture: shouldUseNeutralNextGestures ? _gesture.GestureStore.peekBag(key) ?? _gesture.GestureStore.getCachedBag() : _gesture.GestureStore.getBag(key),
+      gesture: _gesture.GestureStore.getBag(key),
       route: plainRoute,
       meta: plainMeta,
-      unwrapped: (0, _constants.createScreenTransitionState)(plainRoute, plainMeta, navigationMaskEnabled)
+      options: transitionOptions,
+      navigationMaskEnabled,
+      unwrapped: (0, _constants.createScreenTransitionState)(plainRoute, plainMeta, navigationMaskEnabled, transitionOptions)
     };
-  }, [key, meta, route, shouldUseNeutralNextGestures, snapPoints, navigationMaskEnabled]);
+  }, [key, meta, route, snapPoints, navigationMaskEnabled, descriptor?.options]);
 };
 exports.useBuildTransitionState = useBuildTransitionState;
 //# sourceMappingURL=use-build-transition-state.js.map

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

@@ -1 +1 @@
-{"version":3,"names":["_react","require","_constants","_animation","_gesture","_system","_worklet","useBuildTransitionState","descriptor","slot","key","route","meta","options","gestureEnabled","navigationMaskEnabled","snapPoints","shouldUseNeutralNextGestures","length","useMemo","undefined","plainRoute","toPlainRoute","plainMeta","toPlainValue","sortedNumericSnapPoints","filter","p","sort","a","b","progress","AnimationStore","getValue","willAnimate","closing","entering","animating","settled","logicallySettled","targetProgress","SystemStore","resolvedAutoSnapPoint","measuredContentLayout","hasAutoSnapPoint","includes","gesture","GestureStore","peekBag","getCachedBag","getBag","unwrapped","createScreenTransitionState","exports"],"sourceRoot":"../../../../../../../src","sources":["shared/providers/screen/animation/helpers/use-build-transition-state.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_react","require","_constants","_animation","_gesture","_system","_buildScreenTransitionOptions","_worklet","useBuildTransitionState","descriptor","key","route","meta","options","navigationMaskEnabled","snapPoints","useMemo","undefined","plainRoute","toPlainRoute","plainMeta","toPlainValue","sortedNumericSnapPoints","filter","p","sort","a","b","transitionOptions","buildScreenTransitionOptions","progress","AnimationStore","getValue","willAnimate","closing","entering","animating","settled","logicallySettled","targetProgress","SystemStore","resolvedAutoSnapPoint","measuredContentLayout","contentLayoutSlot","width","height","hasAutoSnapPoint","includes","gesture","GestureStore","getBag","unwrapped","createScreenTransitionState","exports"],"sourceRoot":"../../../../../../../src","sources":["shared/providers/screen/animation/helpers/use-build-transition-state.ts"],"mappings":"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","ignoreList":[]}

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

@@ -5,30 +5,39 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.useScreenAnimation = useScreenAnimation;
 var _reactNativeReanimated = require("react-native-reanimated");
+var _resolveChainTarget = require("../../../utils/resolve-chain-target");
 var _animation = require("./animation.provider");
-var _resolveScreenAnimationTarget = require("./helpers/resolve-screen-animation-target");
 function useScreenAnimation(target) {
   const {
     screenInterpolatorProps,
+    screenInterpolatorFrameUpdater,
     boundsAccessor,
     ancestorScreenAnimationSources
   } = (0, _animation.useScreenAnimationContext)();
-  const source = (0, _resolveScreenAnimationTarget.resolveScreenAnimationTarget)({
+  const selfSource = {
+    screenInterpolatorProps,
+    screenInterpolatorFrameUpdater,
+    boundsAccessor
+  };
+  const source = (0, _resolveChainTarget.resolveChainTarget)({
     target,
-    self: {
-      screenInterpolatorProps,
-      boundsAccessor
-    },
+    self: selfSource,
     ancestors: ancestorScreenAnimationSources
   });
-  return (0, _reactNativeReanimated.useDerivedValue)(() => {
+  const resolvedSource = source ?? selfSource;
+  const animation = (0, _reactNativeReanimated.useDerivedValue)(() => {
     "worklet";
 
-    const props = source.screenInterpolatorProps.get();
+    resolvedSource.screenInterpolatorFrameUpdater.get();
+    const props = resolvedSource.screenInterpolatorProps.get();
     return {
       ...props,
-      bounds: source.boundsAccessor
+      bounds: resolvedSource.boundsAccessor
     };
   });
+  if (target && target !== "self" && !source) {
+    return null;
+  }
+  return animation;
 }
 //# sourceMappingURL=use-screen-animation.js.map

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

@@ -1 +1 @@
-{"version":3,"names":["_reactNativeReanimated","require","_animation","_resolveScreenAnimationTarget","useScreenAnimation","target","screenInterpolatorProps","boundsAccessor","ancestorScreenAnimationSources","useScreenAnimationContext","source","resolveScreenAnimationTarget","self","ancestors","useDerivedValue","props","get","bounds"],"sourceRoot":"../../../../../../src","sources":["shared/providers/screen/animation/use-screen-animation.tsx"],"mappings":";;;;;;AAAA,IAAAA,sBAAA,GAAAC,OAAA;AAEA,IAAAC,UAAA,GAAAD,OAAA;AACA,IAAAE,6BAAA,GAAAF,OAAA;AAKO,SAASG,kBAAkBA,CACjCC,MAA8B,EACW;EACzC,MAAM;IACLC,uBAAuB;IACvBC,cAAc;IACdC;EACD,CAAC,GAAG,IAAAC,oCAAyB,EAAC,CAAC;EAE/B,MAAMC,MAAM,GAAG,IAAAC,0DAA4B,EAAwB;IAClEN,MAAM;IACNO,IAAI,EAAE;MACLN,uBAAuB;MACvBC;IACD,CAAC;IACDM,SAAS,EAAEL;EACZ,CAAC,CAAC;EAEF,OAAO,IAAAM,sCAAe,EAA2B,MAAM;IACtD,SAAS;;IAET,MAAMC,KAAK,GAAGL,MAAM,CAACJ,uBAAuB,CAACU,GAAG,CAAC,CAAC;IAElD,OAAO;MACN,GAAGD,KAAK;MACRE,MAAM,EAAEP,MAAM,CAACH;IAChB,CAAC;EACF,CAAC,CAAC;AACH","ignoreList":[]}
+{"version":3,"names":["_reactNativeReanimated","require","_resolveChainTarget","_animation","useScreenAnimation","target","screenInterpolatorProps","screenInterpolatorFrameUpdater","boundsAccessor","ancestorScreenAnimationSources","useScreenAnimationContext","selfSource","source","resolveChainTarget","self","ancestors","resolvedSource","animation","useDerivedValue","get","props","bounds"],"sourceRoot":"../../../../../../src","sources":["shared/providers/screen/animation/use-screen-animation.tsx"],"mappings":";;;;;;AAAA,IAAAA,sBAAA,GAAAC,OAAA;AAEA,IAAAC,mBAAA,GAAAD,OAAA;AACA,IAAAE,UAAA,GAAAF,OAAA;AAYO,SAASG,kBAAkBA,CACjCC,MAA8B,EACkB;EAChD,MAAM;IACLC,uBAAuB;IACvBC,8BAA8B;IAC9BC,cAAc;IACdC;EACD,CAAC,GAAG,IAAAC,oCAAyB,EAAC,CAAC;EAE/B,MAAMC,UAAiC,GAAG;IACzCL,uBAAuB;IACvBC,8BAA8B;IAC9BC;EACD,CAAC;EAED,MAAMI,MAAM,GAAG,IAAAC,sCAAkB,EAAwB;IACxDR,MAAM;IACNS,IAAI,EAAEH,UAAU;IAChBI,SAAS,EAAEN;EACZ,CAAC,CAAC;EACF,MAAMO,cAAc,GAAGJ,MAAM,IAAID,UAAU;EAE3C,MAAMM,SAAS,GAAG,IAAAC,sCAAe,EAA2B,MAAM;IACjE,SAAS;;IAETF,cAAc,CAACT,8BAA8B,CAACY,GAAG,CAAC,CAAC;IACnD,MAAMC,KAAK,GAAGJ,cAAc,CAACV,uBAAuB,CAACa,GAAG,CAAC,CAAC;IAE1D,OAAO;MACN,GAAGC,KAAK;MACRC,MAAM,EAAEL,cAAc,CAACR;IACxB,CAAC;EACF,CAAC,CAAC;EAEF,IAAIH,MAAM,IAAIA,MAAM,KAAK,MAAM,IAAI,CAACO,MAAM,EAAE;IAC3C,OAAO,IAAI;EACZ;EAEA,OAAOK,SAAS;AACjB","ignoreList":[]}