react-native-screen-transitions 4.0.0-alpha.0 → 4.0.0-alpha.10

package/lib/module/utils/animation/animate-to-progress.js

@@ -1,7 +1,7 @@
 "use strict";
 
-import { scheduleOnRN } from "react-native-worklets";
 import { FALSE, TRUE } from "../../constants";
+import { emitMotionStart } from "../../stores/animation.store";
 import { animate, isSpringAnimationConfig } from "./animate";
 const setTransitionLifecycleFlags = (animations, isClosing, markEntering) => {
   "worklet";
@@ -11,19 +11,29 @@ const setTransitionLifecycleFlags = (animations, isClosing, markEntering) => {
     animations.entering.set(FALSE);
     return;
   }
+  animations.closing.set(FALSE);
   if (markEntering) {
     animations.entering.set(TRUE);
   }
 };
+export const resolveAnimationProgressRange = (currentProgress, targetProgress) => {
+  "worklet";
+
+  return {
+    from: Math.min(1, Math.max(0, currentProgress)),
+    to: targetProgress
+  };
+};
 export const animateToProgress = ({
   target,
   spec,
-  onAnimationFinish,
   animations,
   targetProgress,
+  animationProgress,
   emitWillAnimate = true,
   markEntering = true,
-  initialVelocity
+  initialVelocity,
+  isDragging
 }) => {
   "worklet";
 
@@ -40,79 +50,69 @@ export const animateToProgress = ({
   } : config;
   const {
     transitionProgress,
-    willAnimate,
     progressAnimating,
     progressSettled,
     entering
   } = animations;
-  const startAnimation = () => {
+  const startAnimation = activateMotion => {
     "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(FALSE);
       progressSettled.set(TRUE);
       transitionProgress.set(value);
+      animationProgress.set(animationProgressTo);
       if (shouldClearEnteringOnFinish) {
         entering.set(FALSE);
       }
-      if (onAnimationFinish) {
-        scheduleOnRN(onAnimationFinish, true);
-      }
       return;
     }
-    progressAnimating.set(TRUE); //<-- Do not move this into the callback
+    if (activateMotion) {
+      progressAnimating.set(TRUE);
+    }
     progressSettled.set(FALSE);
     transitionProgress.set(animate(value, effectiveConfig, state => {
       "worklet";
 
-      if (state.settled) {
-        progressSettled.set(TRUE);
-      }
       if (!state.finished) return;
+      if (isDragging?.get()) return;
+      progressSettled.set(TRUE);
+      animationProgress.set(animationProgressTo);
       if (shouldClearEnteringOnFinish) {
         entering.set(FALSE);
       }
       if (isClosing) {
         progressAnimating.set(FALSE);
-        if (onAnimationFinish) {
-          // Paint the terminal UI-thread host/style state before React
-          // removes the closing route and its native portal host.
-          requestAnimationFrame(() => {
-            "worklet";
-
-            requestAnimationFrame(() => {
-              "worklet";
-
-              scheduleOnRN(onAnimationFinish, state.finished);
-            });
-          });
-        }
       } else {
-        if (onAnimationFinish) {
-          scheduleOnRN(onAnimationFinish, state.finished);
-        }
-
         // Delay clearing progress animation by one frame to ensure final frame is painted
         requestAnimationFrame(() => {
           progressAnimating.set(FALSE);
         });
       }
+    }, {
+      value: animationProgress,
+      from: animationProgressFrom,
+      to: animationProgressTo
     }));
   };
   if (emitWillAnimate) {
     setTransitionLifecycleFlags(animations, isClosing, markEntering);
-    willAnimate.set(TRUE);
+    emitMotionStart(animations);
     requestAnimationFrame(() => {
       "worklet";
 
-      willAnimate.set(FALSE);
-      startAnimation();
+      startAnimation(false);
     });
     return;
   }
-  startAnimation();
+  startAnimation(true);
 };
 //# sourceMappingURL=animate-to-progress.js.map

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

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

package/lib/module/utils/animation/animate.js

@@ -2,6 +2,11 @@
 
 import { withTiming } from "react-native-reanimated";
 import { withInternalSpring } from "./spring";
+const linearEasing = progress => {
+  "worklet";
+
+  return progress;
+};
 export const isSpringAnimationConfig = config => {
   "worklet";
 
@@ -10,10 +15,17 @@ export 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;
 };
-export const animate = (toValue, config, callback) => {
+export const animate = (toValue, config, callback, animationProgress) => {
   "worklet";
 
   if (!isSpringAnimationConfig(config)) {
+    if (animationProgress) {
+      animationProgress.value.set(animationProgress.from);
+      animationProgress.value.set(withTiming(animationProgress.to, {
+        ...config,
+        easing: linearEasing
+      }));
+    }
     return withTiming(toValue, config, finished => {
       "worklet";
 
@@ -24,6 +36,6 @@ export const animate = (toValue, config, callback) => {
       });
     });
   }
-  return withInternalSpring(toValue, config, callback);
+  return withInternalSpring(toValue, config, callback, animationProgress);
 };
 //# sourceMappingURL=animate.js.map

package/lib/module/utils/animation/animate.js.map

@@ -1 +1 @@
-{"version":3,"names":["withTiming","withInternalSpring","isSpringAnimationConfig","config","animate","toValue","callback","finished","didFinish","settled"],"sourceRoot":"../../../../src","sources":["utils/animation/animate.ts"],"mappings":";;AACA,SAASA,UAAU,QAAQ,yBAAyB;AACpD,SAA4BC,kBAAkB,QAAQ,UAAU;AAShE,OAAO,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;AAED,OAAO,MAAMC,OAAO,GAAGA,CACtBC,OAAe,EACfF,MAA8B,EAC9BG,QAAiC,KAC7B;EACJ,SAAS;;EAET,IAAI,CAACJ,uBAAuB,CAACC,MAAM,CAAC,EAAE;IACrC,OAAOH,UAAU,CAACK,OAAO,EAAEF,MAAM,EAAGI,QAAQ,IAAK;MAChD,SAAS;;MACT,MAAMC,SAAS,GAAGD,QAAQ,KAAK,IAAI;MACnCD,QAAQ,GAAG;QACVC,QAAQ,EAAEC,SAAS;QACnBC,OAAO,EAAED;MACV,CAAC,CAAC;IACH,CAAC,CAAC;EACH;EAEA,OAAOP,kBAAkB,CAACI,OAAO,EAAEF,MAAM,EAAEG,QAAQ,CAAC;AACrD,CAAC","ignoreList":[]}
+{"version":3,"names":["withTiming","withInternalSpring","linearEasing","progress","isSpringAnimationConfig","config","animate","toValue","callback","animationProgress","value","set","from","to","easing","finished","didFinish","settled"],"sourceRoot":"../../../../src","sources":["utils/animation/animate.ts"],"mappings":";;AACA,SAASA,UAAU,QAAQ,yBAAyB;AACpD,SAA4BC,kBAAkB,QAAQ,UAAU;AAShE,MAAMC,YAAY,GAAIC,QAAgB,IAAK;EAC1C,SAAS;;EACT,OAAOA,QAAQ;AAChB,CAAC;AAED,OAAO,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;AAED,OAAO,MAAMC,OAAO,GAAGA,CACtBC,OAAe,EACfF,MAA8B,EAC9BG,QAAiC,EACjCC,iBAA2C,KACvC;EACJ,SAAS;;EAET,IAAI,CAACL,uBAAuB,CAACC,MAAM,CAAC,EAAE;IACrC,IAAII,iBAAiB,EAAE;MACtBA,iBAAiB,CAACC,KAAK,CAACC,GAAG,CAACF,iBAAiB,CAACG,IAAI,CAAC;MACnDH,iBAAiB,CAACC,KAAK,CAACC,GAAG,CAC1BX,UAAU,CAACS,iBAAiB,CAACI,EAAE,EAAE;QAChC,GAAGR,MAAM;QACTS,MAAM,EAAEZ;MACT,CAAC,CACF,CAAC;IACF;IAEA,OAAOF,UAAU,CAACO,OAAO,EAAEF,MAAM,EAAGU,QAAQ,IAAK;MAChD,SAAS;;MACT,MAAMC,SAAS,GAAGD,QAAQ,KAAK,IAAI;MACnCP,QAAQ,GAAG;QACVO,QAAQ,EAAEC,SAAS;QACnBC,OAAO,EAAED;MACV,CAAC,CAAC;IACH,CAAC,CAAC;EACH;EAEA,OAAOf,kBAAkB,CAACM,OAAO,EAAEF,MAAM,EAAEG,QAAQ,EAAEC,iBAAiB,CAAC;AACxE,CAAC","ignoreList":[]}

package/lib/module/utils/animation/spring/spring.js

@@ -1,10 +1,11 @@
 "use strict";
 
-import { calculateNewStiffnessToMatchDuration, checkIfConfigIsValid, criticallyDampedSpringCalculations, getEnergy, initialCalculations, isAnimationSettledCalculation, isAnimationTerminatingCalculation, safeMergeConfigs, scaleZetaToMatchClamps, underDampedSpringCalculations } from "./springUtils";
+import { calculateNewStiffnessToMatchDuration, calculateSpringAnimationDuration, checkIfConfigIsValid, criticallyDampedSpringCalculations, getEnergy, initialCalculations, isAnimationSettledCalculation, isAnimationTerminatingCalculation, safeMergeConfigs, scaleZetaToMatchClamps, underDampedSpringCalculations } from "./springUtils";
 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,
@@ -30,7 +31,7 @@ const getReduceMotionForAnimation = config => {
   }
   return config === REDUCE_MOTION_ALWAYS;
 };
-const defineSpringAnimation = (_starting, factory) => {
+const defineSpringAnimation = (_starting, factory, onReducedMotion) => {
   "worklet";
 
   const create = () => {
@@ -42,6 +43,7 @@ const defineSpringAnimation = (_starting, factory) => {
       "worklet";
 
       if (animation.reduceMotion) {
+        onReducedMotion?.();
         animation.current = animation.toValue;
         animation.onFrame = () => true;
         return;
@@ -74,9 +76,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.
  */
-export const withInternalSpring = (toValue, userConfig, callback) => {
+export const withInternalSpring = (toValue, userConfig, callback, animationProgress) => {
   "worklet";
 
+  // biome-ignore format: Keep this Reanimated fork aligned with its upstream layout.
   return defineSpringAnimation(toValue, () => {
     "worklet";
 
@@ -115,6 +118,7 @@ export const withInternalSpring = (toValue, userConfig, callback) => {
       } = animation;
       if (config.skipAnimation) {
         animation.current = toValue;
+        animationProgress?.value.set(animationProgress.to);
         animation.lastTimestamp = 0;
         return true;
       }
@@ -124,6 +128,7 @@ export 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;
@@ -153,6 +158,7 @@ export const withInternalSpring = (toValue, userConfig, callback) => {
       if (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
@@ -160,6 +166,11 @@ export 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) {
@@ -208,6 +219,9 @@ export const withInternalSpring = (toValue, userConfig, callback) => {
       }
       const initialEnergy = getEnergy(x0, config.velocity, config.stiffness, config.mass);
       animation.initialEnergy = initialEnergy;
+      animation.animationProgressElapsed = 0;
+      animation.animationProgressDuration = config.skipAnimation ? 0 : calculateSpringAnimationDuration(animation, config);
+      animationProgress?.value.set(animationProgress.from);
       animation.lastTimestamp = previousAnimation?.lastTimestamp || now;
       animation.startTimestamp = triggeredTwice ? previousAnimation?.startTimestamp || now : now;
       notifySettled(animation);
@@ -235,9 +249,15 @@ export 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);
   });
 };
 //# sourceMappingURL=spring.js.map

package/lib/module/utils/animation/spring/spring.js.map

@@ -1 +1 @@
-{"version":3,"names":["calculateNewStiffnessToMatchDuration","checkIfConfigIsValid","criticallyDampedSpringCalculations","getEnergy","initialCalculations","isAnimationSettledCalculation","isAnimationTerminatingCalculation","safeMergeConfigs","scaleZetaToMatchClamps","underDampedSpringCalculations","REACT_NATIVE_RUNTIME_KIND","REDUCE_MOTION_SYSTEM","REDUCE_MOTION_ALWAYS","DEFAULT_SPRING_SETTLE_DISTANCE","DEFAULT_SPRING_CONFIG","damping","mass","stiffness","duration","dampingRatio","overshootClamping","energyThreshold","velocity","reduceMotion","undefined","clamp","getRuntimeKind","globalThis","__RUNTIME_KIND","getReduceMotionForAnimation","config","defineSpringAnimation","_starting","factory","create","animation","baseOnStart","onStart","value","timestamp","previousAnimation","current","toValue","onFrame","__isAnimationDefinition","withInternalSpring","userConfig","callback","useDuration","skipAnimation","settleDistance","settled","notifySettled","finished","springOnFrame","now","lastTimestamp","deltaTime","Math","min","max","t","v0","x0","zeta","omega0","omega1","position","newPosition","newVelocity","isTriggeredTwice","startTimestamp","triggeredTwice","startValue","actualDuration","initialEnergy","didFinish"],"sourceRoot":"../../../../../src","sources":["utils/animation/spring/spring.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["calculateNewStiffnessToMatchDuration","calculateSpringAnimationDuration","checkIfConfigIsValid","criticallyDampedSpringCalculations","getEnergy","initialCalculations","isAnimationSettledCalculation","isAnimationTerminatingCalculation","safeMergeConfigs","scaleZetaToMatchClamps","underDampedSpringCalculations","REACT_NATIVE_RUNTIME_KIND","REDUCE_MOTION_SYSTEM","REDUCE_MOTION_ALWAYS","DEFAULT_SPRING_SETTLE_DISTANCE","MAX_UNFINISHED_ANIMATION_PROGRESS","DEFAULT_SPRING_CONFIG","damping","mass","stiffness","duration","dampingRatio","overshootClamping","energyThreshold","velocity","reduceMotion","undefined","clamp","getRuntimeKind","globalThis","__RUNTIME_KIND","getReduceMotionForAnimation","config","defineSpringAnimation","_starting","factory","onReducedMotion","create","animation","baseOnStart","onStart","value","timestamp","previousAnimation","current","toValue","onFrame","__isAnimationDefinition","withInternalSpring","userConfig","callback","animationProgress","useDuration","skipAnimation","settleDistance","settled","notifySettled","finished","springOnFrame","now","set","to","lastTimestamp","deltaTime","Math","min","max","animationProgressElapsed","t","v0","x0","zeta","omega0","omega1","position","newPosition","newVelocity","elapsedFraction","animationProgressDuration","nextAnimationProgress","from","isTriggeredTwice","startTimestamp","triggeredTwice","startValue","actualDuration","initialEnergy","didFinish"],"sourceRoot":"../../../../../src","sources":["utils/animation/spring/spring.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/utils/animation/spring/springUtils.js

@@ -261,6 +261,101 @@ export function underDampedSpringCalculations(animation, precalculatedValues) {
     velocity: underDampedVelocity
   };
 }
+const MAX_SPRING_DURATION_SECONDS = 60;
+const SPRING_DURATION_PRECISION_SECONDS = 0.0001;
+const MAX_OVERSHOOT_DURATION_SAMPLES = 4096;
+export function calculateSpringAnimationDuration(animation, config) {
+  "worklet";
+
+  const startPosition = animation.current;
+  const startVelocity = animation.velocity;
+  const x0 = startPosition - animation.toValue;
+  const stateAt = time => {
+    "worklet";
+
+    return animation.zeta < 1 ? underDampedSpringCalculations(animation, {
+      zeta: animation.zeta,
+      v0: startVelocity,
+      x0,
+      omega0: animation.omega0,
+      omega1: animation.omega1,
+      t: time
+    }) : criticallyDampedSpringCalculations(animation, {
+      v0: startVelocity,
+      x0,
+      omega0: animation.omega0,
+      t: time
+    });
+  };
+  const terminatesByEnergyAt = time => {
+    "worklet";
+
+    if (animation.initialEnergy === 0) {
+      return true;
+    }
+    const state = stateAt(time);
+    const energy = getEnergy(animation.toValue - state.position, state.velocity, config.stiffness, config.mass);
+    return energy / animation.initialEnergy <= config.energyThreshold;
+  };
+  if (terminatesByEnergyAt(0)) {
+    return 0;
+  }
+  let lowerBound = 0;
+  let upperBound = 1 / 60;
+  while (upperBound < MAX_SPRING_DURATION_SECONDS && !terminatesByEnergyAt(upperBound)) {
+    lowerBound = upperBound;
+    upperBound *= 2;
+  }
+  upperBound = Math.min(upperBound, MAX_SPRING_DURATION_SECONDS);
+  if (terminatesByEnergyAt(upperBound)) {
+    while (upperBound - lowerBound > SPRING_DURATION_PRECISION_SECONDS) {
+      const midpoint = (lowerBound + upperBound) / 2;
+      if (terminatesByEnergyAt(midpoint)) {
+        upperBound = midpoint;
+      } else {
+        lowerBound = midpoint;
+      }
+    }
+  }
+  const energyDuration = upperBound;
+  if (!config.overshootClamping || energyDuration === 0) {
+    return energyDuration * 1000;
+  }
+  const leftBound = animation.startValue >= 0 ? animation.toValue : animation.toValue + animation.startValue;
+  const rightBound = leftBound + Math.abs(animation.startValue);
+  const isOutsideBoundsAt = time => {
+    "worklet";
+
+    const {
+      position
+    } = stateAt(time);
+    return position < leftBound || position > rightBound;
+  };
+  const frequency = animation.zeta < 1 ? animation.omega1 : animation.omega0;
+  const sampleStep = frequency > 0 ? Math.min(1 / 240, Math.PI / (frequency * 8)) : 1 / 240;
+  const sampleCount = Math.min(MAX_OVERSHOOT_DURATION_SAMPLES, Math.max(1, Math.ceil(energyDuration / sampleStep)));
+  const effectiveStep = energyDuration / sampleCount;
+  let previousTime = 0;
+  for (let index = 1; index <= sampleCount; index += 1) {
+    const time = effectiveStep * index;
+    if (!isOutsideBoundsAt(time)) {
+      previousTime = time;
+      continue;
+    }
+    let crossingLowerBound = previousTime;
+    let crossingUpperBound = time;
+    while (crossingUpperBound - crossingLowerBound > SPRING_DURATION_PRECISION_SECONDS) {
+      const midpoint = (crossingLowerBound + crossingUpperBound) / 2;
+      if (isOutsideBoundsAt(midpoint)) {
+        crossingUpperBound = midpoint;
+      } else {
+        crossingLowerBound = midpoint;
+      }
+    }
+    return crossingUpperBound * 1000;
+  }
+  return energyDuration * 1000;
+}
 export function isAnimationTerminatingCalculation(animation, config) {
   "worklet";
 

package/lib/module/utils/animation/spring/springUtils.js.map

@@ -1 +1 @@
-{"version":3,"names":["checkIfConfigIsValid","config","errorMessage","forEach","prop","value","duration","clamp","min","max","console","warn","safeMergeConfigs","defaults","userConfig","filtered","Object","fromEntries","entries","filter","v","undefined","bisectRoot","func","precision","maxIterations","direction","idx","current","Math","abs","initialCalculations","stiffness","skipAnimation","zeta","omega0","omega1","useDuration","mass","m","dampingRatio","sqrt","damping","c","k","scaleZetaToMatchClamps","animation","toValue","startValue","toValueNum","Number","firstBound","secondBound","relativeExtremum1","relativeExtremum2","newZeta1","log","PI","newZeta2","zetaSatisfyingClamp","x","getEnergy","displacement","velocity","potentialEnergy","kineticEnergy","calculateNewStiffnessToMatchDuration","x0","v0","energyThreshold","threshold","targetDuration","energyDiffForStiffness","perceptualCoefficient","MILLISECONDS_IN_SECOND","settlingDuration","xtk","exp","vtk","e0","etk","energyFraction","EPSILON","criticallyDampedSpringCalculations","precalculatedValues","t","criticallyDampedEnvelope","criticallyDampedPosition","criticallyDampedVelocity","position","underDampedSpringCalculations","sin1","sin","cos1","cos","underDampedEnvelope","underDampedFrag1","underDampedPosition","underDampedVelocity","isAnimationTerminatingCalculation","initialEnergy","overshootClamping","leftBound","rightBound","currentEnergy","isAnimationSettledCalculation","distance","settleDistance","maxSettledEnergy"],"sourceRoot":"../../../../../src","sources":["utils/animation/spring/springUtils.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["checkIfConfigIsValid","config","errorMessage","forEach","prop","value","duration","clamp","min","max","console","warn","safeMergeConfigs","defaults","userConfig","filtered","Object","fromEntries","entries","filter","v","undefined","bisectRoot","func","precision","maxIterations","direction","idx","current","Math","abs","initialCalculations","stiffness","skipAnimation","zeta","omega0","omega1","useDuration","mass","m","dampingRatio","sqrt","damping","c","k","scaleZetaToMatchClamps","animation","toValue","startValue","toValueNum","Number","firstBound","secondBound","relativeExtremum1","relativeExtremum2","newZeta1","log","PI","newZeta2","zetaSatisfyingClamp","x","getEnergy","displacement","velocity","potentialEnergy","kineticEnergy","calculateNewStiffnessToMatchDuration","x0","v0","energyThreshold","threshold","targetDuration","energyDiffForStiffness","perceptualCoefficient","MILLISECONDS_IN_SECOND","settlingDuration","xtk","exp","vtk","e0","etk","energyFraction","EPSILON","criticallyDampedSpringCalculations","precalculatedValues","t","criticallyDampedEnvelope","criticallyDampedPosition","criticallyDampedVelocity","position","underDampedSpringCalculations","sin1","sin","cos1","cos","underDampedEnvelope","underDampedFrag1","underDampedPosition","underDampedVelocity","MAX_SPRING_DURATION_SECONDS","SPRING_DURATION_PRECISION_SECONDS","MAX_OVERSHOOT_DURATION_SAMPLES","calculateSpringAnimationDuration","startPosition","startVelocity","stateAt","time","terminatesByEnergyAt","initialEnergy","state","energy","lowerBound","upperBound","midpoint","energyDuration","overshootClamping","leftBound","rightBound","isOutsideBoundsAt","frequency","sampleStep","sampleCount","ceil","effectiveStep","previousTime","index","crossingLowerBound","crossingUpperBound","isAnimationTerminatingCalculation","currentEnergy","isAnimationSettledCalculation","distance","settleDistance","maxSettledEnergy"],"sourceRoot":"../../../../../src","sources":["utils/animation/spring/springUtils.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/utils/animation/state.js

@@ -1,2 +1,4 @@
 "use strict";
+
+export {};
 //# sourceMappingURL=state.js.map

package/lib/module/utils/bounds/constants.js.map

@@ -1 +1 @@
-{"version":3,"names":["DEFAULT_BOUNDS_OPTIONS","target","method","space","scaleMode","anchor","raw"],"sourceRoot":"../../../../src","sources":["utils/bounds/constants.ts"],"mappings":";;AAEA,OAAO,MAAMA,sBAAsB,GAAG;EACrCC,MAAM,EAAE,OAAO;EACfC,MAAM,EAAE,WAAW;EACnBC,KAAK,EAAE,UAAU;EACjBC,SAAS,EAAE,OAAO;EAClBC,MAAM,EAAE,QAAQ;EAChBC,GAAG,EAAE;AACN,CAAqE","ignoreList":[]}
+{"version":3,"names":["DEFAULT_BOUNDS_OPTIONS","target","method","space","scaleMode","anchor","raw"],"sourceRoot":"../../../../src","sources":["utils/bounds/constants.ts"],"mappings":";;AAEA,OAAO,MAAMA,sBAAsB,GAAG;EACrCC,MAAM,EAAE,OAAO;EACfC,MAAM,EAAE,WAAW;EACnBC,KAAK,EAAE,UAAU;EACjBC,SAAS,EAAE,OAAO;EAClBC,MAAM,EAAE,QAAQ;EAChBC,GAAG,EAAE;AACN,CAA6E","ignoreList":[]}

package/lib/module/utils/bounds/helpers/create-bounds-accessor-core.js

@@ -1,5 +1,6 @@
 "use strict";
 
+import { NO_STYLES } from "../../../constants";
 import { createBoundTag, normalizeBoundIdentity } from "./create-bound-tag";
 import { createLinkAccessor } from "./create-link-accessor";
 import { prepareBoundStyles, syncActiveGroupId } from "./prepare-bound-styles";
@@ -40,6 +41,11 @@ const createBoundsAccessorParts = ({
       styles: options => {
         "worklet";
 
+        // Keep the component at its base layout for pre-animation refresh
+        // measurement, then remove generated styles again after settlement.
+        if (!props.active.animating) {
+          return NO_STYLES;
+        }
         return prepareBoundStyles({
           props,
           options: {
@@ -50,11 +56,6 @@ const createBoundsAccessorParts = ({
         });
       },
       values: getValues,
-      math: options => {
-        "worklet";
-
-        return getValues(options);
-      },
       link: id => {
         "worklet";
 

package/lib/module/utils/bounds/helpers/create-bounds-accessor-core.js.map

@@ -1 +1 @@
-{"version":3,"names":["createBoundTag","normalizeBoundIdentity","createLinkAccessor","prepareBoundStyles","syncActiveGroupId","createBoundsAccessorParts","getProps","extendResult","getLink","createScopedBounds","identity","props","normalizedIdentity","tag","id","group","getValues","options","raw","scoped","styles","values","math","link","linkIdentity","linkTag","target","createBoundsAccessorCore","params"],"sourceRoot":"../../../../../src","sources":["utils/bounds/helpers/create-bounds-accessor-core.ts"],"mappings":";;AAYA,SAASA,cAAc,EAAEC,sBAAsB,QAAQ,oBAAoB;AAC3E,SAASC,kBAAkB,QAAQ,wBAAwB;AAC3D,SAASC,kBAAkB,EAAEC,iBAAiB,QAAQ,wBAAwB;AAc9E,MAAMC,yBAAyB,GAAGA,CAAC;EAClCC,QAAQ;EACRC;AAC+B,CAAC,KAAK;EACrC,SAAS;;EAET,MAAM;IAAEC;EAAQ,CAAC,GAAGN,kBAAkB,CAACI,QAAQ,CAAC;EAEhD,MAAMG,kBAAkB,GACvBC,QAA6B,IACH;IAC1B,SAAS;;IACT,MAAMC,KAAK,GAAGL,QAAQ,CAAC,CAAC;IACxB,MAAMM,kBAAkB,GAAGX,sBAAsB,CAACS,QAAQ,CAAC;IAC3D,MAAMG,GAAG,GAAGb,cAAc,CAACY,kBAAkB,CAAC;IAC9CR,iBAAiB,CAAC;MACjBO,KAAK;MACLG,EAAE,EAAEF,kBAAkB,CAACE,EAAE;MACzBC,KAAK,EAAEH,kBAAkB,CAACG;IAC3B,CAAC,CAAC;IACF,MAAMC,SAAS,GACdC,OAAW,IACgB;MAC3B,SAAS;;MACT,OAAOd,kBAAkB,CAAC;QACzBQ,KAAK;QACLM,OAAO,EAAE;UACR,GAAGA,OAAO;UACVH,EAAE,EAAEF,kBAAkB,CAACE,EAAE;UACzBC,KAAK,EAAEH,kBAAkB,CAACG,KAAK;UAC/BG,GAAG,EAAE;QACN;MACD,CAAC,CAAC;IACH,CAAC;IAED,MAAMC,MAA4B,GAAG;MACpCC,MAAM,EAAGH,OAA8B,IAAwB;QAC9D,SAAS;;QACT,OAAOd,kBAAkB,CAAC;UACzBQ,KAAK;UACLM,OAAO,EAAE;YACR,GAAGA,OAAO;YACVH,EAAE,EAAEF,kBAAkB,CAACE,EAAE;YACzBC,KAAK,EAAEH,kBAAkB,CAACG;UAC3B;QACD,CAAC,CAAC;MACH,CAAC;MACDM,MAAM,EAAEL,SAAS;MACjBM,IAAI,EACHL,OAAW,IACP;QACJ,SAAS;;QACT,OAAOD,SAAS,CAACC,OAAO,CAAC;MAC1B,CAAC;MACDM,IAAI,EAAGT,EAAwB,IAAK;QACnC,SAAS;;QACT,MAAMU,YAAY,GACjBV,EAAE,IAAI,IAAI,GACPF,kBAAkB,GAClBX,sBAAsB,CAACa,EAAE,EAAEF,kBAAkB,CAACG,KAAK,CAAC;QACxD,MAAMU,OAAO,GAAGzB,cAAc,CAACwB,YAAY,CAAC;QAC5C,OAAOhB,OAAO,CAACiB,OAAO,IAAI,EAAE,CAAC;MAC9B;IACD,CAAyB;IAEzBlB,YAAY,GAAG;MACdmB,MAAM,EAAEP,MAAM;MACdT,QAAQ,EAAEE,kBAAkB;MAC5BD,KAAK;MACLE;IACD,CAAC,CAAC;IAEF,OAAOM,MAAM;EACd,CAAoB;EAEpB,OAAO;IACNV;EACD,CAAC;AACF,CAAC;AAED,OAAO,MAAMkB,wBAAwB,GACpCC,MAAsC,IAClB;EACpB,SAAS;;EAET,MAAM;IAAEnB;EAAmB,CAAC,GAAGJ,yBAAyB,CAACuB,MAAM,CAAC;EAEhE,OAAOnB,kBAAkB;AAC1B,CAAC","ignoreList":[]}
+{"version":3,"names":["NO_STYLES","createBoundTag","normalizeBoundIdentity","createLinkAccessor","prepareBoundStyles","syncActiveGroupId","createBoundsAccessorParts","getProps","extendResult","getLink","createScopedBounds","identity","props","normalizedIdentity","tag","id","group","getValues","options","raw","scoped","styles","active","animating","values","link","linkIdentity","linkTag","target","createBoundsAccessorCore","params"],"sourceRoot":"../../../../../src","sources":["utils/bounds/helpers/create-bounds-accessor-core.ts"],"mappings":";;AAAA,SAASA,SAAS,QAAQ,oBAAoB;AAa9C,SAASC,cAAc,EAAEC,sBAAsB,QAAQ,oBAAoB;AAC3E,SAASC,kBAAkB,QAAQ,wBAAwB;AAC3D,SAASC,kBAAkB,EAAEC,iBAAiB,QAAQ,wBAAwB;AAc9E,MAAMC,yBAAyB,GAAGA,CAAC;EAClCC,QAAQ;EACRC;AAC+B,CAAC,KAAK;EACrC,SAAS;;EAET,MAAM;IAAEC;EAAQ,CAAC,GAAGN,kBAAkB,CAACI,QAAQ,CAAC;EAEhD,MAAMG,kBAAkB,GACvBC,QAA6B,IACH;IAC1B,SAAS;;IACT,MAAMC,KAAK,GAAGL,QAAQ,CAAC,CAAC;IACxB,MAAMM,kBAAkB,GAAGX,sBAAsB,CAACS,QAAQ,CAAC;IAC3D,MAAMG,GAAG,GAAGb,cAAc,CAACY,kBAAkB,CAAC;IAC9CR,iBAAiB,CAAC;MACjBO,KAAK;MACLG,EAAE,EAAEF,kBAAkB,CAACE,EAAE;MACzBC,KAAK,EAAEH,kBAAkB,CAACG;IAC3B,CAAC,CAAC;IACF,MAAMC,SAAS,GACdC,OAAW,IACgB;MAC3B,SAAS;;MACT,OAAOd,kBAAkB,CAAC;QACzBQ,KAAK;QACLM,OAAO,EAAE;UACR,GAAGA,OAAO;UACVH,EAAE,EAAEF,kBAAkB,CAACE,EAAE;UACzBC,KAAK,EAAEH,kBAAkB,CAACG,KAAK;UAC/BG,GAAG,EAAE;QACN;MACD,CAAC,CAAC;IACH,CAAC;IAED,MAAMC,MAA4B,GAAG;MACpCC,MAAM,EAAGH,OAA8B,IAAwB;QAC9D,SAAS;;QACT;QACA;QACA,IAAI,CAACN,KAAK,CAACU,MAAM,CAACC,SAAS,EAAE;UAC5B,OAAOvB,SAAS;QACjB;QAEA,OAAOI,kBAAkB,CAAC;UACzBQ,KAAK;UACLM,OAAO,EAAE;YACR,GAAGA,OAAO;YACVH,EAAE,EAAEF,kBAAkB,CAACE,EAAE;YACzBC,KAAK,EAAEH,kBAAkB,CAACG;UAC3B;QACD,CAAC,CAAC;MACH,CAAC;MACDQ,MAAM,EAAEP,SAAS;MACjBQ,IAAI,EAAGV,EAAwB,IAAK;QACnC,SAAS;;QACT,MAAMW,YAAY,GACjBX,EAAE,IAAI,IAAI,GACPF,kBAAkB,GAClBX,sBAAsB,CAACa,EAAE,EAAEF,kBAAkB,CAACG,KAAK,CAAC;QACxD,MAAMW,OAAO,GAAG1B,cAAc,CAACyB,YAAY,CAAC;QAC5C,OAAOjB,OAAO,CAACkB,OAAO,IAAI,EAAE,CAAC;MAC9B;IACD,CAAyB;IAEzBnB,YAAY,GAAG;MACdoB,MAAM,EAAER,MAAM;MACdT,QAAQ,EAAEE,kBAAkB;MAC5BD,KAAK;MACLE;IACD,CAAC,CAAC;IAEF,OAAOM,MAAM;EACd,CAAoB;EAEpB,OAAO;IACNV;EACD,CAAC;AACF,CAAC;AAED,OAAO,MAAMmB,wBAAwB,GACpCC,MAAsC,IAClB;EACpB,SAAS;;EAET,MAAM;IAAEpB;EAAmB,CAAC,GAAGJ,yBAAyB,CAACwB,MAAM,CAAC;EAEhE,OAAOpB,kBAAkB;AAC1B,CAAC","ignoreList":[]}

package/lib/module/utils/bounds/helpers/create-link-accessor.js

@@ -1,7 +1,6 @@
 "use strict";
 
-import { getResolvedLink } from "../../../stores/bounds/internals/links";
-import { resolveBoundsPairKey } from "./resolve-bounds-pair-key";
+import { getPairKeyForDestination, getResolvedLink } from "../../../stores/bounds/internals/links";
 export const createLinkAccessor = getProps => {
   "worklet";
 
@@ -10,7 +9,8 @@ export const createLinkAccessor = getProps => {
 
     const props = getProps();
     const stringTag = String(tag);
-    const pairKey = resolveBoundsPairKey(props);
+    const destinationScreenKey = props.next?.route.key ?? props.current?.route.key;
+    const pairKey = destinationScreenKey ? getPairKeyForDestination(stringTag, destinationScreenKey) : null;
     if (!pairKey) return null;
     const resolved = getResolvedLink(pairKey, stringTag);
     return resolved.link ? {

package/lib/module/utils/bounds/helpers/create-link-accessor.js.map

@@ -1 +1 @@
-{"version":3,"names":["getResolvedLink","resolveBoundsPairKey","createLinkAccessor","getProps","getLink","tag","props","stringTag","String","pairKey","resolved","link","id"],"sourceRoot":"../../../../../src","sources":["utils/bounds/helpers/create-link-accessor.ts"],"mappings":";;AAAA,SAASA,eAAe,QAAQ,wCAAwC;AAMxE,SAASC,oBAAoB,QAAQ,2BAA2B;AAQhE,OAAO,MAAMC,kBAAkB,GAAIC,QAAkB,IAAmB;EACvE,SAAS;;EAET,MAAMC,OAAO,GAAIC,GAAY,IAAwB;IACpD,SAAS;;IACT,MAAMC,KAAK,GAAGH,QAAQ,CAAC,CAAC;IACxB,MAAMI,SAAS,GAAGC,MAAM,CAACH,GAAG,CAAC;IAC7B,MAAMI,OAAO,GAAGR,oBAAoB,CAACK,KAAK,CAAC;IAC3C,IAAI,CAACG,OAAO,EAAE,OAAO,IAAI;IAEzB,MAAMC,QAAQ,GAAGV,eAAe,CAACS,OAAO,EAAEF,SAAS,CAAC;IACpD,OAAOG,QAAQ,CAACC,IAAI,GACjB;MACAC,EAAE,EAAEF,QAAQ,CAACL,GAAG;MAChB,GAAGK,QAAQ,CAACC;IACb,CAAC,GACA,IAAI;EACR,CAAC;EAED,OAAO;IACNP;EACD,CAAC;AACF,CAAC","ignoreList":[]}
+{"version":3,"names":["getPairKeyForDestination","getResolvedLink","createLinkAccessor","getProps","getLink","tag","props","stringTag","String","destinationScreenKey","next","route","key","current","pairKey","resolved","link","id"],"sourceRoot":"../../../../../src","sources":["utils/bounds/helpers/create-link-accessor.ts"],"mappings":";;AAAA,SACCA,wBAAwB,EACxBC,eAAe,QACT,wCAAwC;AAa/C,OAAO,MAAMC,kBAAkB,GAAIC,QAAkB,IAAmB;EACvE,SAAS;;EAET,MAAMC,OAAO,GAAIC,GAAY,IAAwB;IACpD,SAAS;;IACT,MAAMC,KAAK,GAAGH,QAAQ,CAAC,CAAC;IACxB,MAAMI,SAAS,GAAGC,MAAM,CAACH,GAAG,CAAC;IAC7B,MAAMI,oBAAoB,GACzBH,KAAK,CAACI,IAAI,EAAEC,KAAK,CAACC,GAAG,IAAIN,KAAK,CAACO,OAAO,EAAEF,KAAK,CAACC,GAAG;IAClD,MAAME,OAAO,GAAGL,oBAAoB,GACjCT,wBAAwB,CAACO,SAAS,EAAEE,oBAAoB,CAAC,GACzD,IAAI;IACP,IAAI,CAACK,OAAO,EAAE,OAAO,IAAI;IAEzB,MAAMC,QAAQ,GAAGd,eAAe,CAACa,OAAO,EAAEP,SAAS,CAAC;IACpD,OAAOQ,QAAQ,CAACC,IAAI,GACjB;MACAC,EAAE,EAAEF,QAAQ,CAACV,GAAG;MAChB,GAAGU,QAAQ,CAACC;IACb,CAAC,GACA,IAAI;EACR,CAAC;EAED,OAAO;IACNZ;EACD,CAAC;AACF,CAAC","ignoreList":[]}

package/lib/module/utils/bounds/helpers/prepare-bound-styles.js.map

@@ -1 +1 @@
-{"version":3,"names":["getEntry","getActiveGroupId","setActiveGroupId","DEFAULT_BOUNDS_OPTIONS","createBoundTag","resolveBoundsPairKey","computeBoundStyles","buildBoundsOptions","props","id","group","overrides","tag","currentScreenKey","current","route","key","boundaryConfig","resolved","syncActiveGroupId","params","pairKey","activeId","String","prepareBoundStyles","options","resolvedPair","previous","next","progress","dimensions","layouts","screen","interpolationProps"],"sourceRoot":"../../../../../src","sources":["utils/bounds/helpers/prepare-bound-styles.ts"],"mappings":";;AAAA,SAASA,QAAQ,QAAQ,0CAA0C;AACnE,SACCC,gBAAgB,EAChBC,gBAAgB,QACV,wCAAwC;AAG/C,SAASC,sBAAsB,QAAQ,cAAc;AAMrD,SAASC,cAAc,QAAQ,oBAAoB;AACnD,SAASC,oBAAoB,QAAQ,2BAA2B;AAChE,SAASC,kBAAkB,QAAQ,kBAAkB;AAiBrD,MAAMC,kBAAkB,GAAGA,CAAC;EAC3BC,KAAK;EACLC,EAAE;EACFC,KAAK;EACLC;AACyB,CAAC,KAAoB;EAC9C,SAAS;;EAET,MAAMC,GAAG,GAAGR,cAAc,CAAC;IAAEK,EAAE;IAAEC;EAAM,CAAC,CAAC;EACzC,MAAMG,gBAAgB,GAAGL,KAAK,CAACM,OAAO,EAAEC,KAAK,CAACC,GAAG;EAEjD,MAAMC,cAAc,GACnBL,GAAG,IAAIC,gBAAgB,GACnBb,QAAQ,CAACY,GAAG,EAAEC,gBAAgB,CAAC,EAAEI,cAAc,IAAI,IAAI,GACxD,IAAI;EAER,MAAMC,QAAQ,GAAG;IAChB,GAAGf,sBAAsB;IACzB,IAAIc,cAAc,IAAI,CAAC,CAAC,CAAC;IACzB,IAAIN,SAAS,IAAI,CAAC,CAAC,CAAC;IACpBF,EAAE,EAAEG,GAAG,IAAI,EAAE;IACbF;EACD,CAAC;EAED,OAAOQ,QAAQ;AAChB,CAAC;AAED,OAAO,MAAMC,iBAAiB,GAAIC,MAIjC,IAAK;EACL,SAAS;;EACT,MAAM;IAAEZ,KAAK;IAAEC,EAAE;IAAEC;EAAM,CAAC,GAAGU,MAAM;EACnC,IAAIX,EAAE,IAAI,IAAI,IAAIA,EAAE,KAAK,EAAE,IAAI,CAACC,KAAK,EAAE;EAEvC,MAAMW,OAAO,GAAGhB,oBAAoB,CAACG,KAAK,CAAC;EAC3C,IAAI,CAACa,OAAO,EAAE;EAEd,MAAMC,QAAQ,GAAGC,MAAM,CAACd,EAAE,CAAC;EAC3B,IAAIR,gBAAgB,CAACoB,OAAO,EAAEX,KAAK,CAAC,KAAKY,QAAQ,EAAE;EAEnDpB,gBAAgB,CAACmB,OAAO,EAAEX,KAAK,EAAEY,QAAQ,CAAC;AAC3C,CAAC;AAED,OAAO,MAAME,kBAAkB,GAAGA,CAA0B;EAC3DhB,KAAK;EACLiB,OAAO;EACPC;AACqC,CAAC,KAA6B;EACnE,SAAS;;EAET,MAAMR,QAAQ,GAAGX,kBAAkB,CAAC;IACnCC,KAAK;IACLC,EAAE,EAAEgB,OAAO,CAAChB,EAAE;IACdC,KAAK,EAAEe,OAAO,CAACf,KAAK;IACpBC,SAAS,EAAEc;EACZ,CAAC,CAAC;EAEF,OAAOnB,kBAAkB,CACxB;IACCG,EAAE,EAAES,QAAQ,CAACT,EAAE;IACfkB,QAAQ,EAAEnB,KAAK,CAACmB,QAAQ;IACxBb,OAAO,EAAEN,KAAK,CAACM,OAAO;IACtBc,IAAI,EAAEpB,KAAK,CAACoB,IAAI;IAChBC,QAAQ,EAAEX,QAAQ,CAACW,QAAQ,IAAIrB,KAAK,CAACqB,QAAQ;IAC7CC,UAAU,EAAEtB,KAAK,CAACuB,OAAO,CAACC,MAAM;IAChCC,kBAAkB,EAAEzB;EACrB,CAAC,EACDU,QAAQ,EACRQ,YACD,CAAC;AACF,CAAC","ignoreList":[]}
+{"version":3,"names":["getEntry","getActiveGroupId","setActiveGroupId","DEFAULT_BOUNDS_OPTIONS","createBoundTag","resolveBoundsPairKey","computeBoundStyles","buildBoundsOptions","props","id","group","overrides","tag","currentScreenKey","current","route","key","boundaryConfig","resolved","syncActiveGroupId","params","pairKey","activeId","String","prepareBoundStyles","options","resolvedPair","previous","next","progress","dimensions","layouts","screen","interpolationProps"],"sourceRoot":"../../../../../src","sources":["utils/bounds/helpers/prepare-bound-styles.ts"],"mappings":";;AAAA,SAASA,QAAQ,QAAQ,0CAA0C;AACnE,SACCC,gBAAgB,EAChBC,gBAAgB,QACV,wCAAwC;AAG/C,SAASC,sBAAsB,QAAQ,cAAc;AAMrD,SAASC,cAAc,QAAQ,oBAAoB;AACnD,SAASC,oBAAoB,QAAQ,2BAA2B;AAChE,SAASC,kBAAkB,QAAQ,kBAAkB;AAiBrD,MAAMC,kBAAkB,GAAGA,CAAC;EAC3BC,KAAK;EACLC,EAAE;EACFC,KAAK;EACLC;AACyB,CAAC,KAA4B;EACtD,SAAS;;EAET,MAAMC,GAAG,GAAGR,cAAc,CAAC;IAAEK,EAAE;IAAEC;EAAM,CAAC,CAAC;EACzC,MAAMG,gBAAgB,GAAGL,KAAK,CAACM,OAAO,EAAEC,KAAK,CAACC,GAAG;EAEjD,MAAMC,cAAc,GACnBL,GAAG,IAAIC,gBAAgB,GACnBb,QAAQ,CAACY,GAAG,EAAEC,gBAAgB,CAAC,EAAEI,cAAc,IAAI,IAAI,GACxD,IAAI;EAER,MAAMC,QAAQ,GAAG;IAChB,GAAGf,sBAAsB;IACzB,IAAIc,cAAc,IAAI,CAAC,CAAC,CAAC;IACzB,IAAIN,SAAS,IAAI,CAAC,CAAC,CAAC;IACpBF,EAAE,EAAEG,GAAG,IAAI,EAAE;IACbF;EACD,CAAC;EAED,OAAOQ,QAAQ;AAChB,CAAC;AAED,OAAO,MAAMC,iBAAiB,GAAIC,MAIjC,IAAK;EACL,SAAS;;EACT,MAAM;IAAEZ,KAAK;IAAEC,EAAE;IAAEC;EAAM,CAAC,GAAGU,MAAM;EACnC,IAAIX,EAAE,IAAI,IAAI,IAAIA,EAAE,KAAK,EAAE,IAAI,CAACC,KAAK,EAAE;EAEvC,MAAMW,OAAO,GAAGhB,oBAAoB,CAACG,KAAK,CAAC;EAC3C,IAAI,CAACa,OAAO,EAAE;EAEd,MAAMC,QAAQ,GAAGC,MAAM,CAACd,EAAE,CAAC;EAC3B,IAAIR,gBAAgB,CAACoB,OAAO,EAAEX,KAAK,CAAC,KAAKY,QAAQ,EAAE;EAEnDpB,gBAAgB,CAACmB,OAAO,EAAEX,KAAK,EAAEY,QAAQ,CAAC;AAC3C,CAAC;AAED,OAAO,MAAME,kBAAkB,GAAGA,CAAkC;EACnEhB,KAAK;EACLiB,OAAO;EACPC;AACqC,CAAC,KAA6B;EACnE,SAAS;;EAET,MAAMR,QAAQ,GAAGX,kBAAkB,CAAC;IACnCC,KAAK;IACLC,EAAE,EAAEgB,OAAO,CAAChB,EAAE;IACdC,KAAK,EAAEe,OAAO,CAACf,KAAK;IACpBC,SAAS,EAAEc;EACZ,CAAC,CAAC;EAEF,OAAOnB,kBAAkB,CACxB;IACCG,EAAE,EAAES,QAAQ,CAACT,EAAE;IACfkB,QAAQ,EAAEnB,KAAK,CAACmB,QAAQ;IACxBb,OAAO,EAAEN,KAAK,CAACM,OAAO;IACtBc,IAAI,EAAEpB,KAAK,CAACoB,IAAI;IAChBC,QAAQ,EAAEX,QAAQ,CAACW,QAAQ,IAAIrB,KAAK,CAACqB,QAAQ;IAC7CC,UAAU,EAAEtB,KAAK,CAACuB,OAAO,CAACC,MAAM;IAChCC,kBAAkB,EAAEzB;EACrB,CAAC,EACDU,QAAQ,EACRQ,YACD,CAAC;AACF,CAAC","ignoreList":[]}