react-native-screen-transitions 3.9.0 → 3.10.0

package/lib/commonjs/shared/providers/screen/styles/hooks/use-interpolated-style-maps.js

@@ -19,8 +19,8 @@ var _descriptors = require("../../descriptors");
 var _options = require("../../options");
 var _collectInterpolatorSharedValues = require("../helpers/collect-interpolator-shared-values");
 var _normalizeSlots = require("../helpers/normalize-slots");
-var _openingPhase = require("../helpers/opening-phase");
 var _stripInterpolatorOptions = require("../helpers/strip-interpolator-options");
+var _transitionVisualState = require("../helpers/transition-visual-state");
 const NO_STYLE_LAYERS = [];
 const normalizeRawStyleMap = rawStyleMap => {
   "worklet";
@@ -114,11 +114,13 @@ const useInterpolatedStylesMap = () => {
   const interpolatorSharedValues = (0, _react.useMemo)(() => (0, _collectInterpolatorSharedValues.collectInterpolatorSharedValues)([currentInterpolator, nextInterpolator]), [currentInterpolator, nextInterpolator]);
   const activeScreenKey = nextScreenKey ?? currentScreenKey;
   const {
-    entering: activeEntering,
-    transitionProgress: activeTransitionProgress
+    closing: activeClosing,
+    entering: activeEntering
   } = _animation.AnimationStore.getBag(activeScreenKey);
   const {
-    pendingLifecycleRequestKind: activePendingLifecycleRequestKind
+    animationProgress: activeAnimationProgress,
+    pendingLifecycleRequestKind: activePendingLifecycleRequestKind,
+    pendingLifecycleStartBlockCount: activePendingLifecycleStartBlockCount
   } = _system.SystemStore.getBag(activeScreenKey);
   const isGesturingDuringCloseAnimation = (0, _reactNativeReanimated.useSharedValue)(false);
   const localStylesMaps = (0, _reactNativeReanimated.useDerivedValue)(() => {
@@ -145,14 +147,25 @@ const useInterpolatedStylesMap = () => {
     }
     const isInGestureMode = !!isDragging || isGesturingDuringCloseAnimation.get();
 
-    // The current screen keeps interpolator ownership until the next screen is
-    // genuinely live: never during a gesture-driven close, never before a next
-    // interpolator exists, and never in the next screen's pre-start window
-    // (entering, but no transformed frame yet). Only then does "next" take over.
+    // Interpolator ownership changes only at visual boundaries on the UI thread:
+    // the next screen attaches after its blockers clear and progress starts, then
+    // detaches once its closing progress has committed at zero. The downstream
+    // resolver sees the owner disappear in this same graph and resets its styles
+    // without waiting for React to remove the screen.
     const isPendingOpen = activePendingLifecycleRequestKind.get() === _system.LifecycleTransitionRequestKind.Open;
     const activeOpening = isPendingOpen || !!activeEntering.get();
-    const currentOwnsInterpolator = isInGestureMode || !nextInterpolator || (0, _openingPhase.isOpeningBeforeStart)(activeOpening ? 1 : 0, activeTransitionProgress.get());
-    nextInterpolatorReady.set(currentOwnsInterpolator ? 0 : 1);
+    const isOpeningBlocked = (0, _transitionVisualState.isOpenTransitionBlocked)({
+      opening: activeOpening,
+      pendingLifecycleStartBlockCount: activePendingLifecycleStartBlockCount.get(),
+      animationProgress: activeAnimationProgress.get()
+    });
+    const hasCloseFinished = (0, _transitionVisualState.hasCloseTransitionFinished)({
+      closing: activeClosing.get(),
+      animationProgress: activeAnimationProgress.get()
+    });
+    const currentOwnsInterpolator = isInGestureMode || !nextInterpolator || isOpeningBlocked || hasCloseFinished;
+    const nextReady = currentOwnsInterpolator ? 0 : 1;
+    nextInterpolatorReady.set(nextReady);
     const interpolatorOptionsOwner = currentOwnsInterpolator ? "current" : "next";
     let selectedProgress = progress;
     let selectedNext = next;

package/lib/commonjs/shared/providers/screen/styles/hooks/use-interpolated-style-maps.js.map

@@ -1 +1 @@
-{"version":3,"names":["_react","require","_reactNativeReanimated","_constants","_animation","_system","_logger","_animation2","_useBuildBoundsAccessor","_useBuildTransitionAccessor","_readScreenAnimationRevisions","_selectedInterpolatorOptions","_descriptors","_options","_collectInterpolatorSharedValues","_normalizeSlots","_openingPhase","_stripInterpolatorOptions","NO_STYLE_LAYERS","normalizeRawStyleMap","rawStyleMap","NO_STYLES","stylesMap","normalizeSlots","stripInterpolatorOptions","runInterpolator","interpolator","props","progress","next","bounds","transition","undefined","raw","_","__DEV__","logger","warn","appendLayer","layers","result","push","useInterpolatedStylesMap","currentScreenKey","useDescriptorsStore","s","derivations","nextScreenKey","screenOptions","useScreenOptionsContext","screenInterpolatorProps","screenInterpolatorPropsRevision","selectedInterpolatorOptions","nextInterpolator","currentInterpolator","ancestorScreenAnimationSources","descendantScreenAnimationSources","useScreenAnimationContext","boundsAccessor","useBuildBoundsAccessor","useBuildTransitionAccessor","nextInterpolatorReady","useSharedValue","interpolatorSharedValues","useMemo","collectInterpolatorSharedValues","activeScreenKey","entering","activeEntering","transitionProgress","activeTransitionProgress","AnimationStore","getBag","pendingLifecycleRequestKind","activePendingLifecycleRequestKind","SystemStore","isGesturingDuringCloseAnimation","localStylesMaps","useDerivedValue","readScreenAnimationRevisions","get","current","isDragging","gesture","dragging","isNextClosing","closing","set","isInGestureMode","isPendingOpen","LifecycleTransitionRequestKind","Open","activeOpening","currentOwnsInterpolator","isOpeningBeforeStart","interpolatorOptionsOwner","selectedProgress","selectedNext","currentResult","syncSelectedInterpolatorOptions","options","syncScreenOptionsOverrides","nextResult","length","exports"],"sourceRoot":"../../../../../../../src","sources":["shared/providers/screen/styles/hooks/use-interpolated-style-maps.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_react","require","_reactNativeReanimated","_constants","_animation","_system","_logger","_animation2","_useBuildBoundsAccessor","_useBuildTransitionAccessor","_readScreenAnimationRevisions","_selectedInterpolatorOptions","_descriptors","_options","_collectInterpolatorSharedValues","_normalizeSlots","_stripInterpolatorOptions","_transitionVisualState","NO_STYLE_LAYERS","normalizeRawStyleMap","rawStyleMap","NO_STYLES","stylesMap","normalizeSlots","stripInterpolatorOptions","runInterpolator","interpolator","props","progress","next","bounds","transition","undefined","raw","_","__DEV__","logger","warn","appendLayer","layers","result","push","useInterpolatedStylesMap","currentScreenKey","useDescriptorsStore","s","derivations","nextScreenKey","screenOptions","useScreenOptionsContext","screenInterpolatorProps","screenInterpolatorPropsRevision","selectedInterpolatorOptions","nextInterpolator","currentInterpolator","ancestorScreenAnimationSources","descendantScreenAnimationSources","useScreenAnimationContext","boundsAccessor","useBuildBoundsAccessor","useBuildTransitionAccessor","nextInterpolatorReady","useSharedValue","interpolatorSharedValues","useMemo","collectInterpolatorSharedValues","activeScreenKey","closing","activeClosing","entering","activeEntering","AnimationStore","getBag","animationProgress","activeAnimationProgress","pendingLifecycleRequestKind","activePendingLifecycleRequestKind","pendingLifecycleStartBlockCount","activePendingLifecycleStartBlockCount","SystemStore","isGesturingDuringCloseAnimation","localStylesMaps","useDerivedValue","readScreenAnimationRevisions","get","current","isDragging","gesture","dragging","isNextClosing","set","isInGestureMode","isPendingOpen","LifecycleTransitionRequestKind","Open","activeOpening","isOpeningBlocked","isOpenTransitionBlocked","opening","hasCloseFinished","hasCloseTransitionFinished","currentOwnsInterpolator","nextReady","interpolatorOptionsOwner","selectedProgress","selectedNext","currentResult","syncSelectedInterpolatorOptions","options","syncScreenOptionsOverrides","nextResult","length","exports"],"sourceRoot":"../../../../../../../src","sources":["shared/providers/screen/styles/hooks/use-interpolated-style-maps.tsx"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/shared/providers/screen/styles/hooks/use-maybe-block-visibility.js

@@ -10,6 +10,7 @@ var _animation = require("../../../../stores/animation.store");
 var _system = require("../../../../stores/system.store");
 var _visibilityBlockOffset = require("../../../../utils/visibility-block-offset");
 var _descriptors = require("../../descriptors");
+var _transitionVisualState = require("../helpers/transition-visual-state");
 var _visibilityGate = require("../helpers/visibility-gate");
 const useMaybeBlockVisibility = isFloatingOverlay => {
   const {
@@ -20,11 +21,10 @@ const useMaybeBlockVisibility = isFloatingOverlay => {
   } = (0, _descriptors.useDescriptorDerivations)();
   const {
     closing,
-    entering,
-    progressAnimating,
-    transitionProgress
+    entering
   } = _animation.AnimationStore.getBag(currentScreenKey);
   const {
+    animationProgress,
     pendingLifecycleStartBlockCount,
     pendingLifecycleRequestKind
   } = _system.SystemStore.getBag(currentScreenKey);
@@ -38,7 +38,7 @@ const useMaybeBlockVisibility = isFloatingOverlay => {
       hasVisibilityGateOpened: hasVisibilityGateOpened.get(),
       pendingLifecycleStartBlockCount: pendingLifecycleStartBlockCount.get(),
       pendingLifecycleRequestKind: pendingLifecycleRequestKind.get(),
-      progress: transitionProgress.get(),
+      animationProgress: animationProgress.get(),
       entering: entering.get()
     });
   }, gate => {
@@ -53,10 +53,12 @@ const useMaybeBlockVisibility = isFloatingOverlay => {
     "worklet";
 
     const offset = (0, _visibilityBlockOffset.getVisibilityBlockOffset)(height);
-    // Keep opacity out of normal rendering so effects such as Liquid Glass
-    // retain native compositing. Once closing has fully finished, hiding the
-    // outgoing screen lets the handoff settle before React removes its host.
-    const shouldHideClosedScreen = closing.get() === 1 && transitionProgress.get() <= 0 && progressAnimating.get() === 0;
+    // Hide the outgoing screen after its visual close while React removes its
+    // host asynchronously.
+    const shouldHideClosedScreen = (0, _transitionVisualState.hasCloseTransitionFinished)({
+      closing: closing.get(),
+      animationProgress: animationProgress.get()
+    });
     if (shouldHideClosedScreen) {
       return {
         opacity: 0

package/lib/commonjs/shared/providers/screen/styles/hooks/use-maybe-block-visibility.js.map

@@ -1 +1 @@
-{"version":3,"names":["_reactNative","require","_reactNativeReanimated","_animation","_system","_visibilityBlockOffset","_descriptors","_visibilityGate","useMaybeBlockVisibility","isFloatingOverlay","height","useWindowDimensions","currentScreenKey","useDescriptorDerivations","closing","entering","progressAnimating","transitionProgress","AnimationStore","getBag","pendingLifecycleStartBlockCount","pendingLifecycleRequestKind","SystemStore","hasVisibilityGateOpened","useSharedValue","shouldBlockVisibility","useAnimatedReaction","resolveScreenVisibilityGate","get","progress","gate","shouldOpenGate","set","shouldBlock","animatedStyle","useAnimatedStyle","offset","getVisibilityBlockOffset","shouldHideClosedScreen","opacity","transform","translateY","animatedProps","useAnimatedProps","pointerEvents","exports"],"sourceRoot":"../../../../../../../src","sources":["shared/providers/screen/styles/hooks/use-maybe-block-visibility.tsx"],"mappings":";;;;;;AAAA,IAAAA,YAAA,GAAAC,OAAA;AACA,IAAAC,sBAAA,GAAAD,OAAA;AAMA,IAAAE,UAAA,GAAAF,OAAA;AACA,IAAAG,OAAA,GAAAH,OAAA;AACA,IAAAI,sBAAA,GAAAJ,OAAA;AACA,IAAAK,YAAA,GAAAL,OAAA;AACA,IAAAM,eAAA,GAAAN,OAAA;AAEO,MAAMO,uBAAuB,GAAIC,iBAA2B,IAAK;EACvE,MAAM;IAAEC;EAAO,CAAC,GAAG,IAAAC,gCAAmB,EAAC,CAAC;EACxC,MAAM;IAAEC;EAAiB,CAAC,GAAG,IAAAC,qCAAwB,EAAC,CAAC;EACvD,MAAM;IAAEC,OAAO;IAAEC,QAAQ;IAAEC,iBAAiB;IAAEC;EAAmB,CAAC,GACjEC,yBAAc,CAACC,MAAM,CAACP,gBAAgB,CAAC;EACxC,MAAM;IAAEQ,+BAA+B;IAAEC;EAA4B,CAAC,GACrEC,mBAAW,CAACH,MAAM,CAACP,gBAAgB,CAAC;EAErC,MAAMW,uBAAuB,GAAG,IAAAC,qCAAc,EAAC,KAAK,CAAC;EACrD,MAAMC,qBAAqB,GAAG,IAAAD,qCAAc,EAAC,CAACf,iBAAiB,CAAC;EAEhE,IAAAiB,0CAAmB,EAClB,MAAM;IACL,SAAS;;IAET,OAAO,IAAAC,2CAA2B,EAAC;MAClClB,iBAAiB;MACjBc,uBAAuB,EAAEA,uBAAuB,CAACK,GAAG,CAAC,CAAC;MACtDR,+BAA+B,EAAEA,+BAA+B,CAACQ,GAAG,CAAC,CAAC;MACtEP,2BAA2B,EAAEA,2BAA2B,CAACO,GAAG,CAAC,CAAC;MAC9DC,QAAQ,EAAEZ,kBAAkB,CAACW,GAAG,CAAC,CAAC;MAClCb,QAAQ,EAAEA,QAAQ,CAACa,GAAG,CAAC;IACxB,CAAC,CAAC;EACH,CAAC,EACAE,IAAI,IAAK;IACT,SAAS;;IAET,IAAIA,IAAI,CAACC,cAAc,EAAE;MACxBR,uBAAuB,CAACS,GAAG,CAAC,IAAI,CAAC;IAClC;IAEAP,qBAAqB,CAACO,GAAG,CAACF,IAAI,CAACG,WAAW,CAAC;EAC5C,CACD,CAAC;EAED,MAAMC,aAAa,GAAG,IAAAC,uCAAgB,EAAC,MAAM;IAC5C,SAAS;;IACT,MAAMC,MAAM,GAAG,IAAAC,+CAAwB,EAAC3B,MAAM,CAAC;IAC/C;IACA;IACA;IACA,MAAM4B,sBAAsB,GAC3BxB,OAAO,CAACc,GAAG,CAAC,CAAC,KAAK,CAAC,IACnBX,kBAAkB,CAACW,GAAG,CAAC,CAAC,IAAI,CAAC,IAC7BZ,iBAAiB,CAACY,GAAG,CAAC,CAAC,KAAK,CAAC;IAE9B,IAAIU,sBAAsB,EAAE;MAC3B,OAAO;QACNC,OAAO,EAAE;MACV,CAAC;IACF;IAEA,OAAO;MACNC,SAAS,EAAE,CACV;QACCC,UAAU,EAAEhB,qBAAqB,CAACG,GAAG,CAAC,CAAC,GAAGQ,MAAM,GAAG;MACpD,CAAC;IAEH,CAAC;EACF,CAAC,CAAC;EAEF,MAAMM,aAAa,GAAG,IAAAC,uCAAgB,EAAC,MAAM;IAC5C,SAAS;;IACT,OAAO;MACNC,aAAa,EAAEnB,qBAAqB,CAACG,GAAG,CAAC,CAAC,GACtC,MAAM,GACN;IACL,CAAC;EACF,CAAC,CAAC;EAEF,OAAO;IACNM,aAAa;IACbQ,aAAa;IACbjB;EACD,CAAC;AACF,CAAC;AAACoB,OAAA,CAAArC,uBAAA,GAAAA,uBAAA","ignoreList":[]}
+{"version":3,"names":["_reactNative","require","_reactNativeReanimated","_animation","_system","_visibilityBlockOffset","_descriptors","_transitionVisualState","_visibilityGate","useMaybeBlockVisibility","isFloatingOverlay","height","useWindowDimensions","currentScreenKey","useDescriptorDerivations","closing","entering","AnimationStore","getBag","animationProgress","pendingLifecycleStartBlockCount","pendingLifecycleRequestKind","SystemStore","hasVisibilityGateOpened","useSharedValue","shouldBlockVisibility","useAnimatedReaction","resolveScreenVisibilityGate","get","gate","shouldOpenGate","set","shouldBlock","animatedStyle","useAnimatedStyle","offset","getVisibilityBlockOffset","shouldHideClosedScreen","hasCloseTransitionFinished","opacity","transform","translateY","animatedProps","useAnimatedProps","pointerEvents","exports"],"sourceRoot":"../../../../../../../src","sources":["shared/providers/screen/styles/hooks/use-maybe-block-visibility.tsx"],"mappings":";;;;;;AAAA,IAAAA,YAAA,GAAAC,OAAA;AACA,IAAAC,sBAAA,GAAAD,OAAA;AAMA,IAAAE,UAAA,GAAAF,OAAA;AACA,IAAAG,OAAA,GAAAH,OAAA;AACA,IAAAI,sBAAA,GAAAJ,OAAA;AACA,IAAAK,YAAA,GAAAL,OAAA;AACA,IAAAM,sBAAA,GAAAN,OAAA;AACA,IAAAO,eAAA,GAAAP,OAAA;AAEO,MAAMQ,uBAAuB,GAAIC,iBAA2B,IAAK;EACvE,MAAM;IAAEC;EAAO,CAAC,GAAG,IAAAC,gCAAmB,EAAC,CAAC;EACxC,MAAM;IAAEC;EAAiB,CAAC,GAAG,IAAAC,qCAAwB,EAAC,CAAC;EACvD,MAAM;IAAEC,OAAO;IAAEC;EAAS,CAAC,GAAGC,yBAAc,CAACC,MAAM,CAACL,gBAAgB,CAAC;EACrE,MAAM;IACLM,iBAAiB;IACjBC,+BAA+B;IAC/BC;EACD,CAAC,GAAGC,mBAAW,CAACJ,MAAM,CAACL,gBAAgB,CAAC;EAExC,MAAMU,uBAAuB,GAAG,IAAAC,qCAAc,EAAC,KAAK,CAAC;EACrD,MAAMC,qBAAqB,GAAG,IAAAD,qCAAc,EAAC,CAACd,iBAAiB,CAAC;EAEhE,IAAAgB,0CAAmB,EAClB,MAAM;IACL,SAAS;;IAET,OAAO,IAAAC,2CAA2B,EAAC;MAClCjB,iBAAiB;MACjBa,uBAAuB,EAAEA,uBAAuB,CAACK,GAAG,CAAC,CAAC;MACtDR,+BAA+B,EAAEA,+BAA+B,CAACQ,GAAG,CAAC,CAAC;MACtEP,2BAA2B,EAAEA,2BAA2B,CAACO,GAAG,CAAC,CAAC;MAC9DT,iBAAiB,EAAEA,iBAAiB,CAACS,GAAG,CAAC,CAAC;MAC1CZ,QAAQ,EAAEA,QAAQ,CAACY,GAAG,CAAC;IACxB,CAAC,CAAC;EACH,CAAC,EACAC,IAAI,IAAK;IACT,SAAS;;IAET,IAAIA,IAAI,CAACC,cAAc,EAAE;MACxBP,uBAAuB,CAACQ,GAAG,CAAC,IAAI,CAAC;IAClC;IAEAN,qBAAqB,CAACM,GAAG,CAACF,IAAI,CAACG,WAAW,CAAC;EAC5C,CACD,CAAC;EAED,MAAMC,aAAa,GAAG,IAAAC,uCAAgB,EAAC,MAAM;IAC5C,SAAS;;IACT,MAAMC,MAAM,GAAG,IAAAC,+CAAwB,EAACzB,MAAM,CAAC;IAC/C;IACA;IACA,MAAM0B,sBAAsB,GAAG,IAAAC,iDAA0B,EAAC;MACzDvB,OAAO,EAAEA,OAAO,CAACa,GAAG,CAAC,CAAC;MACtBT,iBAAiB,EAAEA,iBAAiB,CAACS,GAAG,CAAC;IAC1C,CAAC,CAAC;IACF,IAAIS,sBAAsB,EAAE;MAC3B,OAAO;QACNE,OAAO,EAAE;MACV,CAAC;IACF;IAEA,OAAO;MACNC,SAAS,EAAE,CACV;QACCC,UAAU,EAAEhB,qBAAqB,CAACG,GAAG,CAAC,CAAC,GAAGO,MAAM,GAAG;MACpD,CAAC;IAEH,CAAC;EACF,CAAC,CAAC;EAEF,MAAMO,aAAa,GAAG,IAAAC,uCAAgB,EAAC,MAAM;IAC5C,SAAS;;IACT,OAAO;MACNC,aAAa,EAAEnB,qBAAqB,CAACG,GAAG,CAAC,CAAC,GACtC,MAAM,GACN;IACL,CAAC;EACF,CAAC,CAAC;EAEF,OAAO;IACNK,aAAa;IACbS,aAAa;IACbjB;EACD,CAAC;AACF,CAAC;AAACoB,OAAA,CAAApC,uBAAA,GAAAA,uBAAA","ignoreList":[]}

package/lib/commonjs/shared/stores/bounds/internals/links.js

@@ -147,11 +147,11 @@ const writeGroup = (state, pairKey, group, activeId, initialId) => {
     initialId: previousInitialId ?? initialId ?? activeId
   };
 };
-const writeDestination = (state, pairKey, linkKey, screenKey, bounds, styles, group) => {
+const writeDestination = (state, pairKey, linkKey, screenKey, bounds, styles, group, runtimeFlags = {}) => {
   "worklet";
 
   const existingLink = (0, _linkPairs.getLink)(state, pairKey, linkKey);
-  const destination = createLinkSide(screenKey, bounds, styles);
+  const destination = createLinkSide(screenKey, bounds, styles, runtimeFlags);
   const link = existingLink ?? {
     group,
     status: "source-incomplete",
@@ -200,14 +200,14 @@ function setSource(pairKey, tag, screenKey, bounds, styles = {}, group, runtimeF
     return state;
   });
 }
-function setDestination(pairKey, tag, screenKey, bounds, styles = {}, group) {
+function setDestination(pairKey, tag, screenKey, bounds, styles = {}, group, runtimeFlags = {}) {
   "worklet";
 
   _state.pairs.modify(state => {
     "worklet";
 
     const linkKey = (0, _linkPairs.getLinkKeyFromTag)(tag);
-    writeDestination(state, pairKey, linkKey, screenKey, bounds, styles, group);
+    writeDestination(state, pairKey, linkKey, screenKey, bounds, styles, group, runtimeFlags);
     return state;
   });
 }

package/lib/commonjs/shared/stores/bounds/internals/links.js.map

@@ -1 +1 @@
-{"version":3,"names":["_linkPairs","require","_state","syncLinkStatus","link","status","source","destination","isSharedValueLike","value","_isReanimatedSharedValue","snapshotSharedValue","snapshotTransformArrayValue","snapshot","index","length","snapshotValue","snapshotTransformEntryValue","undefined","push","Array","isArray","snapshotTransformItem","hasValue","key","snapshotTransform","snapshotStyles","styles","transform","createLinkSide","screenKey","bounds","runtimeFlags","handoff","escapeClipping","writePairLink","state","pairKey","linkKey","ensurePairLinks","writeGroup","group","activeId","initialId","previousInitialId","groups","ensurePairGroups","writeDestination","existingLink","getPairLink","initialDestination","setSource","tag","pairs","modify","getLinkKeyFromTag","pairLinks","initialSource","sourceRequests","setDestination","setActiveGroupId","requestSourceMeasure","ensurePairSourceRequests","getActiveGroupId","getPairActiveGroupId","get","getLink","hasSourceLink","getResolvedLink","getGroupKeyFromTag","initialLink","createGroupTag","getSource","getPairSource","getDestination","getPairDestination"],"sourceRoot":"../../../../../../src","sources":["shared/stores/bounds/internals/links.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_linkPairs","require","_state","syncLinkStatus","link","status","source","destination","isSharedValueLike","value","_isReanimatedSharedValue","snapshotSharedValue","snapshotTransformArrayValue","snapshot","index","length","snapshotValue","snapshotTransformEntryValue","undefined","push","Array","isArray","snapshotTransformItem","hasValue","key","snapshotTransform","snapshotStyles","styles","transform","createLinkSide","screenKey","bounds","runtimeFlags","handoff","escapeClipping","writePairLink","state","pairKey","linkKey","ensurePairLinks","writeGroup","group","activeId","initialId","previousInitialId","groups","ensurePairGroups","writeDestination","existingLink","getPairLink","initialDestination","setSource","tag","pairs","modify","getLinkKeyFromTag","pairLinks","initialSource","sourceRequests","setDestination","setActiveGroupId","requestSourceMeasure","ensurePairSourceRequests","getActiveGroupId","getPairActiveGroupId","get","getLink","hasSourceLink","getResolvedLink","getGroupKeyFromTag","initialLink","createGroupTag","getSource","getPairSource","getDestination","getPairDestination"],"sourceRoot":"../../../../../../src","sources":["shared/stores/bounds/internals/links.ts"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/shared/stores/scroll.store.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getClampedScrollAxisDelta = exports.cloneScrollMetadataState = exports.clampScrollAxisOffset = exports.ScrollStore = void 0;
+exports.getVisualScrollAxisDelta = exports.getClampedScrollAxisDelta = exports.cloneScrollMetadataState = exports.clampScrollAxisOffset = exports.ScrollStore = void 0;
 var _reactNativeReanimated = require("react-native-reanimated");
 var _createStore = require("../utils/create-store");
 const metadataWriters = {};
@@ -89,12 +89,30 @@ const getClampedScrollAxisDelta = (current, captured, axis) => {
   return currentOffset - capturedOffset;
 };
 
+/**
+ * Visual scroll travel from a bounds snapshot normalized to its at-rest
+ * position. The captured side is clamped because measurement removes transient
+ * rubber-band displacement; the current side stays raw so consumers can follow
+ * the position that is actually visible on iOS.
+ */
+exports.getClampedScrollAxisDelta = getClampedScrollAxisDelta;
+const getVisualScrollAxisDelta = (current, captured, axis) => {
+  "worklet";
+
+  const currentAxisState = current?.[axis];
+  const capturedOffset = clampScrollAxisOffset(captured?.[axis]);
+  if (!currentAxisState || capturedOffset === null) {
+    return 0;
+  }
+  return currentAxisState.offset - capturedOffset;
+};
+
 /**
  * Route-keyed scroll geometry used by gesture activation and bounds measurement.
  * Coordination tracks gesture-owner scoped ScrollView offsets and dimensions;
  * metadata tracks screen-scoped scroll values exposed to animation consumers.
  */
-exports.getClampedScrollAxisDelta = getClampedScrollAxisDelta;
+exports.getVisualScrollAxisDelta = getVisualScrollAxisDelta;
 const scrollStore = (0, _createStore.createStore)({
   createBag: () => ({
     coordination: (0, _reactNativeReanimated.makeMutable)(null),

package/lib/commonjs/shared/stores/scroll.store.js.map

@@ -1 +1 @@
-{"version":3,"names":["_reactNativeReanimated","require","_createStore","metadataWriters","nextMetadataWriterId","createMetadataWriterId","claimMetadataWriter","routeKey","axis","writerId","writers","releaseMetadataWriter","vertical","horizontal","hasMetadataWriters","Boolean","clearMetadataWriters","cloneScrollMetadataState","scroll","offset","contentSize","layoutSize","isTouched","exports","clampScrollAxisOffset","axisState","maxOffset","Math","max","min","getClampedScrollAxisDelta","current","captured","currentOffset","capturedOffset","scrollStore","createStore","createBag","coordination","makeMutable","metadata","disposeBag","bag","cancelAnimation","ScrollStore","clearBag"],"sourceRoot":"../../../../src","sources":["shared/stores/scroll.store.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_reactNativeReanimated","require","_createStore","metadataWriters","nextMetadataWriterId","createMetadataWriterId","claimMetadataWriter","routeKey","axis","writerId","writers","releaseMetadataWriter","vertical","horizontal","hasMetadataWriters","Boolean","clearMetadataWriters","cloneScrollMetadataState","scroll","offset","contentSize","layoutSize","isTouched","exports","clampScrollAxisOffset","axisState","maxOffset","Math","max","min","getClampedScrollAxisDelta","current","captured","currentOffset","capturedOffset","getVisualScrollAxisDelta","currentAxisState","scrollStore","createStore","createBag","coordination","makeMutable","metadata","disposeBag","bag","cancelAnimation","ScrollStore","clearBag"],"sourceRoot":"../../../../src","sources":["shared/stores/scroll.store.ts"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/shared/stores/system.store.js

@@ -22,6 +22,7 @@ let LifecycleTransitionRequestKind = exports.LifecycleTransitionRequestKind = /*
 const SystemStore = exports.SystemStore = (0, _createStore.createStore)({
   createBag: () => ({
     targetProgress: (0, _reactNativeReanimated.makeMutable)(1),
+    animationProgress: (0, _reactNativeReanimated.makeMutable)(0),
     resolvedAutoSnapPoint: (0, _reactNativeReanimated.makeMutable)(-1),
     measuredContentLayout: (0, _reactNativeReanimated.makeMutable)(null),
     pendingLifecycleRequestKind: (0, _reactNativeReanimated.makeMutable)(LifecycleTransitionRequestKind.None),
@@ -30,6 +31,7 @@ const SystemStore = exports.SystemStore = (0, _createStore.createStore)({
   }),
   disposeBag: bag => {
     (0, _reactNativeReanimated.cancelAnimation)(bag.targetProgress);
+    (0, _reactNativeReanimated.cancelAnimation)(bag.animationProgress);
     (0, _reactNativeReanimated.cancelAnimation)(bag.resolvedAutoSnapPoint);
     (0, _reactNativeReanimated.cancelAnimation)(bag.measuredContentLayout);
     (0, _reactNativeReanimated.cancelAnimation)(bag.pendingLifecycleRequestKind);

package/lib/commonjs/shared/stores/system.store.js.map

@@ -1 +1 @@
-{"version":3,"names":["_reactNativeReanimated","require","_createStore","LifecycleTransitionRequestKind","exports","SystemStore","createStore","createBag","targetProgress","makeMutable","resolvedAutoSnapPoint","measuredContentLayout","pendingLifecycleRequestKind","None","pendingLifecycleRequestTarget","pendingLifecycleStartBlockCount","disposeBag","bag","cancelAnimation","actions","requestLifecycleTransition","kind","target","set","clearLifecycleTransitionRequest","blockLifecycleStart","modify","count","unblockLifecycleStart","Math","max","drainLifecycleStartBlocks"],"sourceRoot":"../../../../src","sources":["shared/stores/system.store.ts"],"mappings":";;;;;;AAAA,IAAAA,sBAAA,GAAAC,OAAA;AAMA,IAAAC,YAAA,GAAAD,OAAA;AAAoD,IAExCE,8BAA8B,GAAAC,OAAA,CAAAD,8BAAA,0BAA9BA,8BAA8B;EAA9BA,8BAA8B,CAA9BA,8BAA8B;EAA9BA,8BAA8B,CAA9BA,8BAA8B;EAA9BA,8BAA8B,CAA9BA,8BAA8B;EAA9BA,8BAA8B,CAA9BA,8BAA8B;EAAA,OAA9BA,8BAA8B;AAAA;AAoD1C;AACA;AACA;AACA;AACA;AACA;AACO,MAAME,WAAW,GAAAD,OAAA,CAAAC,WAAA,GAAG,IAAAC,wBAAW,EAAuC;EAC5EC,SAAS,EAAEA,CAAA,MAAO;IACjBC,cAAc,EAAE,IAAAC,kCAAW,EAAC,CAAC,CAAC;IAC9BC,qBAAqB,EAAE,IAAAD,kCAAW,EAAC,CAAC,CAAC,CAAC;IACtCE,qBAAqB,EAAE,IAAAF,kCAAW,EAAgB,IAAI,CAAC;IACvDG,2BAA2B,EAAE,IAAAH,kCAAW,EACvCN,8BAA8B,CAACU,IAChC,CAAC;IACDC,6BAA6B,EAAE,IAAAL,kCAAW,EAAS,CAAC,CAAC;IACrDM,+BAA+B,EAAE,IAAAN,kCAAW,EAAS,CAAC;EACvD,CAAC,CAAC;EACFO,UAAU,EAAGC,GAAG,IAAK;IACpB,IAAAC,sCAAe,EAACD,GAAG,CAACT,cAAc,CAAC;IACnC,IAAAU,sCAAe,EAACD,GAAG,CAACP,qBAAqB,CAAC;IAC1C,IAAAQ,sCAAe,EAACD,GAAG,CAACN,qBAAqB,CAAC;IAC1C,IAAAO,sCAAe,EAACD,GAAG,CAACL,2BAA2B,CAAC;IAChD,IAAAM,sCAAe,EAACD,GAAG,CAACH,6BAA6B,CAAC;IAClD,IAAAI,sCAAe,EAACD,GAAG,CAACF,+BAA+B,CAAC;EACrD,CAAC;EACDI,OAAO,EAAGF,GAAG,KAAM;IAClBG,0BAA0BA,CAACC,IAAI,EAAEC,MAAM,EAAE;MACxC,SAAS;;MACTL,GAAG,CAACH,6BAA6B,CAACS,GAAG,CAACD,MAAM,CAAC;MAC7CL,GAAG,CAACL,2BAA2B,CAACW,GAAG,CAACF,IAAI,CAAC;IAC1C,CAAC;IAEDG,+BAA+BA,CAAA,EAAG;MACjC,SAAS;;MACTP,GAAG,CAACL,2BAA2B,CAACW,GAAG,CAACpB,8BAA8B,CAACU,IAAI,CAAC;MACxEI,GAAG,CAACH,6BAA6B,CAACS,GAAG,CAAC,CAAC,CAAC;IACzC,CAAC;IAEDE,mBAAmBA,CAAA,EAAG;MACrB,SAAS;;MACTR,GAAG,CAACF,+BAA+B,CAACW,MAAM,CACtBC,KAAQ,IAAQ;QAClC,SAAS;;QACT,OAAQA,KAAK,GAAG,CAAC;MAClB,CACD,CAAC;IACF,CAAC;IAEDC,qBAAqBA,CAAA,EAAG;MACvB,SAAS;;MACTX,GAAG,CAACF,+BAA+B,CAACW,MAAM,CACtBC,KAAQ,IAAQ;QAClC,SAAS;;QACT,OAAOE,IAAI,CAACC,GAAG,CAAC,CAAC,EAAEH,KAAK,GAAG,CAAC,CAAC;MAC9B,CACD,CAAC;IACF,CAAC;IAEDI,yBAAyBA,CAAA,EAAG;MAC3B,SAAS;;MACTd,GAAG,CAACF,+BAA+B,CAACQ,GAAG,CAAC,CAAC,CAAC;IAC3C;EACD,CAAC;AACF,CAAC,CAAC","ignoreList":[]}
+{"version":3,"names":["_reactNativeReanimated","require","_createStore","LifecycleTransitionRequestKind","exports","SystemStore","createStore","createBag","targetProgress","makeMutable","animationProgress","resolvedAutoSnapPoint","measuredContentLayout","pendingLifecycleRequestKind","None","pendingLifecycleRequestTarget","pendingLifecycleStartBlockCount","disposeBag","bag","cancelAnimation","actions","requestLifecycleTransition","kind","target","set","clearLifecycleTransitionRequest","blockLifecycleStart","modify","count","unblockLifecycleStart","Math","max","drainLifecycleStartBlocks"],"sourceRoot":"../../../../src","sources":["shared/stores/system.store.ts"],"mappings":";;;;;;AAAA,IAAAA,sBAAA,GAAAC,OAAA;AAMA,IAAAC,YAAA,GAAAD,OAAA;AAAoD,IAExCE,8BAA8B,GAAAC,OAAA,CAAAD,8BAAA,0BAA9BA,8BAA8B;EAA9BA,8BAA8B,CAA9BA,8BAA8B;EAA9BA,8BAA8B,CAA9BA,8BAA8B;EAA9BA,8BAA8B,CAA9BA,8BAA8B;EAA9BA,8BAA8B,CAA9BA,8BAA8B;EAAA,OAA9BA,8BAA8B;AAAA;AA0D1C;AACA;AACA;AACA;AACA;AACA;AACO,MAAME,WAAW,GAAAD,OAAA,CAAAC,WAAA,GAAG,IAAAC,wBAAW,EAAuC;EAC5EC,SAAS,EAAEA,CAAA,MAAO;IACjBC,cAAc,EAAE,IAAAC,kCAAW,EAAC,CAAC,CAAC;IAC9BC,iBAAiB,EAAE,IAAAD,kCAAW,EAAC,CAAC,CAAC;IACjCE,qBAAqB,EAAE,IAAAF,kCAAW,EAAC,CAAC,CAAC,CAAC;IACtCG,qBAAqB,EAAE,IAAAH,kCAAW,EAAgB,IAAI,CAAC;IACvDI,2BAA2B,EAAE,IAAAJ,kCAAW,EACvCN,8BAA8B,CAACW,IAChC,CAAC;IACDC,6BAA6B,EAAE,IAAAN,kCAAW,EAAS,CAAC,CAAC;IACrDO,+BAA+B,EAAE,IAAAP,kCAAW,EAAS,CAAC;EACvD,CAAC,CAAC;EACFQ,UAAU,EAAGC,GAAG,IAAK;IACpB,IAAAC,sCAAe,EAACD,GAAG,CAACV,cAAc,CAAC;IACnC,IAAAW,sCAAe,EAACD,GAAG,CAACR,iBAAiB,CAAC;IACtC,IAAAS,sCAAe,EAACD,GAAG,CAACP,qBAAqB,CAAC;IAC1C,IAAAQ,sCAAe,EAACD,GAAG,CAACN,qBAAqB,CAAC;IAC1C,IAAAO,sCAAe,EAACD,GAAG,CAACL,2BAA2B,CAAC;IAChD,IAAAM,sCAAe,EAACD,GAAG,CAACH,6BAA6B,CAAC;IAClD,IAAAI,sCAAe,EAACD,GAAG,CAACF,+BAA+B,CAAC;EACrD,CAAC;EACDI,OAAO,EAAGF,GAAG,KAAM;IAClBG,0BAA0BA,CAACC,IAAI,EAAEC,MAAM,EAAE;MACxC,SAAS;;MACTL,GAAG,CAACH,6BAA6B,CAACS,GAAG,CAACD,MAAM,CAAC;MAC7CL,GAAG,CAACL,2BAA2B,CAACW,GAAG,CAACF,IAAI,CAAC;IAC1C,CAAC;IAEDG,+BAA+BA,CAAA,EAAG;MACjC,SAAS;;MACTP,GAAG,CAACL,2BAA2B,CAACW,GAAG,CAACrB,8BAA8B,CAACW,IAAI,CAAC;MACxEI,GAAG,CAACH,6BAA6B,CAACS,GAAG,CAAC,CAAC,CAAC;IACzC,CAAC;IAEDE,mBAAmBA,CAAA,EAAG;MACrB,SAAS;;MACTR,GAAG,CAACF,+BAA+B,CAACW,MAAM,CACtBC,KAAQ,IAAQ;QAClC,SAAS;;QACT,OAAQA,KAAK,GAAG,CAAC;MAClB,CACD,CAAC;IACF,CAAC;IAEDC,qBAAqBA,CAAA,EAAG;MACvB,SAAS;;MACTX,GAAG,CAACF,+BAA+B,CAACW,MAAM,CACtBC,KAAQ,IAAQ;QAClC,SAAS;;QACT,OAAOE,IAAI,CAACC,GAAG,CAAC,CAAC,EAAEH,KAAK,GAAG,CAAC,CAAC;MAC9B,CACD,CAAC;IACF,CAAC;IAEDI,yBAAyBA,CAAA,EAAG;MAC3B,SAAS;;MACTd,GAAG,CAACF,+BAA+B,CAACQ,GAAG,CAAC,CAAC,CAAC;IAC3C;EACD,CAAC;AACF,CAAC,CAAC","ignoreList":[]}

package/lib/commonjs/shared/utils/animation/animate-to-progress.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.animateToProgress = void 0;
+exports.resolveAnimationProgressRange = exports.animateToProgress = void 0;
 var _reactNativeReanimated = require("react-native-reanimated");
 var _constants = require("../../constants");
 var _animate = require("./animate");
@@ -15,16 +15,27 @@ const setTransitionLifecycleFlags = (animations, isClosing, markEntering) => {
     animations.entering.set(_constants.FALSE);
     return;
   }
+  animations.closing.set(_constants.FALSE);
   if (markEntering) {
     animations.entering.set(_constants.TRUE);
   }
 };
+const resolveAnimationProgressRange = (currentProgress, targetProgress) => {
+  "worklet";
+
+  return {
+    from: Math.min(1, Math.max(0, currentProgress)),
+    to: targetProgress
+  };
+};
+exports.resolveAnimationProgressRange = resolveAnimationProgressRange;
 const animateToProgress = ({
   target,
   spec,
   onAnimationFinish,
   animations,
   targetProgress,
+  animationProgress,
   emitWillAnimate = true,
   markEntering = true,
   initialVelocity
@@ -52,13 +63,19 @@ const animateToProgress = ({
   const startAnimation = () => {
     "worklet";
 
+    const {
+      from: animationProgressFrom,
+      to: animationProgressTo
+    } = resolveAnimationProgressRange(transitionProgress.get(), value);
     targetProgress.set(value);
+    animationProgress.set(animationProgressFrom);
     const shouldClearEnteringOnFinish = !isClosing && (markEntering || entering.get());
     setTransitionLifecycleFlags(animations, isClosing, markEntering);
     if (!config) {
       progressAnimating.set(_constants.FALSE);
       progressSettled.set(_constants.TRUE);
       transitionProgress.set(value);
+      animationProgress.set(animationProgressTo);
       if (shouldClearEnteringOnFinish) {
         entering.set(_constants.FALSE);
       }
@@ -76,6 +93,7 @@ const animateToProgress = ({
         progressSettled.set(_constants.TRUE);
       }
       if (!state.finished) return;
+      animationProgress.set(animationProgressTo);
       if (shouldClearEnteringOnFinish) {
         entering.set(_constants.FALSE);
       }
@@ -104,6 +122,10 @@ const animateToProgress = ({
           progressAnimating.set(_constants.FALSE);
         });
       }
+    }, {
+      value: animationProgress,
+      from: animationProgressFrom,
+      to: animationProgressTo
     }));
   };
   if (emitWillAnimate) {

package/lib/commonjs/shared/utils/animation/animate-to-progress.js.map

@@ -1 +1 @@
-{"version":3,"names":["_reactNativeReanimated","require","_constants","_animate","setTransitionLifecycleFlags","animations","isClosing","markEntering","closing","set","TRUE","entering","FALSE","animateToProgress","target","spec","onAnimationFinish","targetProgress","emitWillAnimate","initialVelocity","value","config","close","open","isSpringConfig","isSpringAnimationConfig","effectiveConfig","velocity","transitionProgress","willAnimate","progressAnimating","progressSettled","startAnimation","shouldClearEnteringOnFinish","get","runOnJS","animate","state","settled","finished","requestAnimationFrame","exports"],"sourceRoot":"../../../../../src","sources":["shared/utils/animation/animate-to-progress.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_reactNativeReanimated","require","_constants","_animate","setTransitionLifecycleFlags","animations","isClosing","markEntering","closing","set","TRUE","entering","FALSE","resolveAnimationProgressRange","currentProgress","targetProgress","from","Math","min","max","to","exports","animateToProgress","target","spec","onAnimationFinish","animationProgress","emitWillAnimate","initialVelocity","value","config","close","open","isSpringConfig","isSpringAnimationConfig","effectiveConfig","velocity","transitionProgress","willAnimate","progressAnimating","progressSettled","startAnimation","animationProgressFrom","animationProgressTo","get","shouldClearEnteringOnFinish","runOnJS","animate","state","settled","finished","requestAnimationFrame"],"sourceRoot":"../../../../../src","sources":["shared/utils/animation/animate-to-progress.ts"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/shared/utils/animation/animate.js

@@ -6,6 +6,11 @@ Object.defineProperty(exports, "__esModule", {
 exports.isSpringAnimationConfig = exports.animate = void 0;
 var _reactNativeReanimated = require("react-native-reanimated");
 var _spring = require("./spring");
+const linearEasing = progress => {
+  "worklet";
+
+  return progress;
+};
 const isSpringAnimationConfig = config => {
   "worklet";
 
@@ -15,10 +20,17 @@ const isSpringAnimationConfig = config => {
   return "stiffness" in config || "damping" in config || "mass" in config || "velocity" in config || "overshootClamping" in config || "energyThreshold" in config || "dampingRatio" in config || "clamp" in config;
 };
 exports.isSpringAnimationConfig = isSpringAnimationConfig;
-const animate = (toValue, config, callback) => {
+const animate = (toValue, config, callback, animationProgress) => {
   "worklet";
 
   if (!isSpringAnimationConfig(config)) {
+    if (animationProgress) {
+      animationProgress.value.set(animationProgress.from);
+      animationProgress.value.set((0, _reactNativeReanimated.withTiming)(animationProgress.to, {
+        ...config,
+        easing: linearEasing
+      }));
+    }
     return (0, _reactNativeReanimated.withTiming)(toValue, config, finished => {
       "worklet";
 
@@ -29,7 +41,7 @@ const animate = (toValue, config, callback) => {
       });
     });
   }
-  return (0, _spring.withInternalSpring)(toValue, config, callback);
+  return (0, _spring.withInternalSpring)(toValue, config, callback, animationProgress);
 };
 exports.animate = animate;
 //# sourceMappingURL=animate.js.map

package/lib/commonjs/shared/utils/animation/animate.js.map

@@ -1 +1 @@
-{"version":3,"names":["_reactNativeReanimated","require","_spring","isSpringAnimationConfig","config","exports","animate","toValue","callback","withTiming","finished","didFinish","settled","withInternalSpring"],"sourceRoot":"../../../../../src","sources":["shared/utils/animation/animate.ts"],"mappings":";;;;;;AACA,IAAAA,sBAAA,GAAAC,OAAA;AACA,IAAAC,OAAA,GAAAD,OAAA;AASO,MAAME,uBAAuB,GACnCC,MAAyC,IACJ;EACrC,SAAS;;EACT,IAAI,OAAOA,MAAM,KAAK,QAAQ,IAAIA,MAAM,KAAK,IAAI,EAAE;IAClD,OAAO,KAAK;EACb;EAEA,OACC,WAAW,IAAIA,MAAM,IACrB,SAAS,IAAIA,MAAM,IACnB,MAAM,IAAIA,MAAM,IAChB,UAAU,IAAIA,MAAM,IACpB,mBAAmB,IAAIA,MAAM,IAC7B,iBAAiB,IAAIA,MAAM,IAC3B,cAAc,IAAIA,MAAM,IACxB,OAAO,IAAIA,MAAM;AAEnB,CAAC;AAACC,OAAA,CAAAF,uBAAA,GAAAA,uBAAA;AAEK,MAAMG,OAAO,GAAGA,CACtBC,OAAe,EACfH,MAA8B,EAC9BI,QAAiC,KAC7B;EACJ,SAAS;;EAET,IAAI,CAACL,uBAAuB,CAACC,MAAM,CAAC,EAAE;IACrC,OAAO,IAAAK,iCAAU,EAACF,OAAO,EAAEH,MAAM,EAAGM,QAAQ,IAAK;MAChD,SAAS;;MACT,MAAMC,SAAS,GAAGD,QAAQ,KAAK,IAAI;MACnCF,QAAQ,GAAG;QACVE,QAAQ,EAAEC,SAAS;QACnBC,OAAO,EAAED;MACV,CAAC,CAAC;IACH,CAAC,CAAC;EACH;EAEA,OAAO,IAAAE,0BAAkB,EAACN,OAAO,EAAEH,MAAM,EAAEI,QAAQ,CAAC;AACrD,CAAC;AAACH,OAAA,CAAAC,OAAA,GAAAA,OAAA","ignoreList":[]}
+{"version":3,"names":["_reactNativeReanimated","require","_spring","linearEasing","progress","isSpringAnimationConfig","config","exports","animate","toValue","callback","animationProgress","value","set","from","withTiming","to","easing","finished","didFinish","settled","withInternalSpring"],"sourceRoot":"../../../../../src","sources":["shared/utils/animation/animate.ts"],"mappings":";;;;;;AACA,IAAAA,sBAAA,GAAAC,OAAA;AACA,IAAAC,OAAA,GAAAD,OAAA;AASA,MAAME,YAAY,GAAIC,QAAgB,IAAK;EAC1C,SAAS;;EACT,OAAOA,QAAQ;AAChB,CAAC;AAEM,MAAMC,uBAAuB,GACnCC,MAAyC,IACJ;EACrC,SAAS;;EACT,IAAI,OAAOA,MAAM,KAAK,QAAQ,IAAIA,MAAM,KAAK,IAAI,EAAE;IAClD,OAAO,KAAK;EACb;EAEA,OACC,WAAW,IAAIA,MAAM,IACrB,SAAS,IAAIA,MAAM,IACnB,MAAM,IAAIA,MAAM,IAChB,UAAU,IAAIA,MAAM,IACpB,mBAAmB,IAAIA,MAAM,IAC7B,iBAAiB,IAAIA,MAAM,IAC3B,cAAc,IAAIA,MAAM,IACxB,OAAO,IAAIA,MAAM;AAEnB,CAAC;AAACC,OAAA,CAAAF,uBAAA,GAAAA,uBAAA;AAEK,MAAMG,OAAO,GAAGA,CACtBC,OAAe,EACfH,MAA8B,EAC9BI,QAAiC,EACjCC,iBAA2C,KACvC;EACJ,SAAS;;EAET,IAAI,CAACN,uBAAuB,CAACC,MAAM,CAAC,EAAE;IACrC,IAAIK,iBAAiB,EAAE;MACtBA,iBAAiB,CAACC,KAAK,CAACC,GAAG,CAACF,iBAAiB,CAACG,IAAI,CAAC;MACnDH,iBAAiB,CAACC,KAAK,CAACC,GAAG,CAC1B,IAAAE,iCAAU,EAACJ,iBAAiB,CAACK,EAAE,EAAE;QAChC,GAAGV,MAAM;QACTW,MAAM,EAAEd;MACT,CAAC,CACF,CAAC;IACF;IAEA,OAAO,IAAAY,iCAAU,EAACN,OAAO,EAAEH,MAAM,EAAGY,QAAQ,IAAK;MAChD,SAAS;;MACT,MAAMC,SAAS,GAAGD,QAAQ,KAAK,IAAI;MACnCR,QAAQ,GAAG;QACVQ,QAAQ,EAAEC,SAAS;QACnBC,OAAO,EAAED;MACV,CAAC,CAAC;IACH,CAAC,CAAC;EACH;EAEA,OAAO,IAAAE,0BAAkB,EAACZ,OAAO,EAAEH,MAAM,EAAEI,QAAQ,EAAEC,iBAAiB,CAAC;AACxE,CAAC;AAACJ,OAAA,CAAAC,OAAA,GAAAA,OAAA","ignoreList":[]}

package/lib/commonjs/shared/utils/animation/spring/spring.js

@@ -9,6 +9,7 @@ const REACT_NATIVE_RUNTIME_KIND = 1;
 const REDUCE_MOTION_SYSTEM = "system";
 const REDUCE_MOTION_ALWAYS = "always";
 const DEFAULT_SPRING_SETTLE_DISTANCE = 0.001;
+const MAX_UNFINISHED_ANIMATION_PROGRESS = 1 - 1e-6;
 const DEFAULT_SPRING_CONFIG = {
   damping: 120,
   mass: 4,
@@ -34,7 +35,7 @@ const getReduceMotionForAnimation = config => {
   }
   return config === REDUCE_MOTION_ALWAYS;
 };
-const defineSpringAnimation = (_starting, factory) => {
+const defineSpringAnimation = (_starting, factory, onReducedMotion) => {
   "worklet";
 
   const create = () => {
@@ -46,6 +47,7 @@ const defineSpringAnimation = (_starting, factory) => {
       "worklet";
 
       if (animation.reduceMotion) {
+        onReducedMotion?.();
         animation.current = animation.toValue;
         animation.onFrame = () => true;
         return;
@@ -78,9 +80,10 @@ const defineSpringAnimation = (_starting, factory) => {
  * to the native spring handoff behavior while keeping our own surface small and
  * easy to extend with callbacks tailored to the transition lifecycle.
  */
-const withInternalSpring = (toValue, userConfig, callback) => {
+const withInternalSpring = (toValue, userConfig, callback, animationProgress) => {
   "worklet";
 
+  // biome-ignore format: Keep this Reanimated fork aligned with its upstream layout.
   return defineSpringAnimation(toValue, () => {
     "worklet";
 
@@ -119,6 +122,7 @@ const withInternalSpring = (toValue, userConfig, callback) => {
       } = animation;
       if (config.skipAnimation) {
         animation.current = toValue;
+        animationProgress?.value.set(animationProgress.to);
         animation.lastTimestamp = 0;
         return true;
       }
@@ -128,6 +132,7 @@ const withInternalSpring = (toValue, userConfig, callback) => {
       } = animation;
       const deltaTime = Math.min(Math.max(now - lastTimestamp, 0), 64);
       animation.lastTimestamp = now;
+      animation.animationProgressElapsed += deltaTime;
       const t = deltaTime / 1000;
       const v0 = velocity;
       const x0 = current - toValue;
@@ -157,6 +162,7 @@ const withInternalSpring = (toValue, userConfig, callback) => {
       if ((0, _springUtils.isAnimationTerminatingCalculation)(animation, config)) {
         animation.velocity = 0;
         animation.current = toValue;
+        animationProgress?.value.set(animationProgress.to);
         settled = true;
         animation.settled = true;
         // clear lastTimestamp to avoid using stale value by the next spring animation that starts after this one
@@ -164,6 +170,11 @@ const withInternalSpring = (toValue, userConfig, callback) => {
         return true;
       }
       notifySettled(animation);
+      if (animationProgress) {
+        const elapsedFraction = animation.animationProgressDuration <= 0 ? MAX_UNFINISHED_ANIMATION_PROGRESS : Math.min(animation.animationProgressElapsed / animation.animationProgressDuration, MAX_UNFINISHED_ANIMATION_PROGRESS);
+        const nextAnimationProgress = animationProgress.from + (animationProgress.to - animationProgress.from) * elapsedFraction;
+        animationProgress.value.set(nextAnimationProgress);
+      }
       return false;
     }
     function isTriggeredTwice(previousAnimation, animation) {
@@ -212,6 +223,9 @@ const withInternalSpring = (toValue, userConfig, callback) => {
       }
       const initialEnergy = (0, _springUtils.getEnergy)(x0, config.velocity, config.stiffness, config.mass);
       animation.initialEnergy = initialEnergy;
+      animation.animationProgressElapsed = 0;
+      animation.animationProgressDuration = config.skipAnimation ? 0 : (0, _springUtils.calculateSpringAnimationDuration)(animation, config);
+      animationProgress?.value.set(animationProgress.from);
       animation.lastTimestamp = previousAnimation?.lastTimestamp || now;
       animation.startTimestamp = triggeredTwice ? previousAnimation?.startTimestamp || now : now;
       notifySettled(animation);
@@ -239,9 +253,15 @@ const withInternalSpring = (toValue, userConfig, callback) => {
       omega0: 0,
       omega1: 0,
       initialEnergy: 0,
+      animationProgressElapsed: 0,
+      animationProgressDuration: 0,
       reduceMotion: getReduceMotionForAnimation(config.reduceMotion)
     };
     return animation;
+  }, () => {
+    "worklet";
+
+    animationProgress?.value.set(animationProgress.to);
   });
 };
 exports.withInternalSpring = withInternalSpring;