react-native-screen-transitions 3.9.0 → 3.10.0

package/lib/module/shared/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/shared/utils/animation/animate.js.map

@@ -1 +1 @@
-{"version":3,"names":["withTiming","withInternalSpring","isSpringAnimationConfig","config","animate","toValue","callback","finished","didFinish","settled"],"sourceRoot":"../../../../../src","sources":["shared/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":["shared/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/shared/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/shared/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":["shared/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":["shared/utils/animation/spring/spring.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/shared/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/shared/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":["shared/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":["shared/utils/animation/spring/springUtils.ts"],"mappings":"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","ignoreList":[]}

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

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

package/lib/module/shared/utils/bounds/navigation/reveal/math.js

@@ -118,6 +118,18 @@ function getBoundsCenterY(bounds) {
 
   return bounds.pageY + bounds.height / 2;
 }
+export function resolveRevealContentBaseTransformFromGeometry({
+  progress,
+  geometry
+}) {
+  "worklet";
+
+  return {
+    translateX: mixUnit(geometry.tx, 0, progress),
+    translateY: mixUnit(geometry.ty, 0, progress),
+    scale: mixUnit(geometry.s, 1, progress)
+  };
+}
 export function resolveRevealContentBaseTransform({
   progress,
   sourceBounds,
@@ -135,11 +147,10 @@ export function resolveRevealContentBaseTransform({
     anchor,
     scaleMode: "uniform"
   });
-  return {
-    translateX: mixUnit(geometry.tx, 0, progress),
-    translateY: mixUnit(geometry.ty, 0, progress),
-    scale: mixUnit(geometry.s, 1, progress)
-  };
+  return resolveRevealContentBaseTransformFromGeometry({
+    geometry,
+    progress
+  });
 }
 export function resolveTrackedSourceElementTransform({
   sourceBounds,

package/lib/module/shared/utils/bounds/navigation/reveal/math.js.map

@@ -1 +1 @@
-{"version":3,"names":["EPSILON","computeContentTransformGeometry","DRAG_DIRECTIONAL_SCALE_EXPONENT","DRAG_DIRECTIONAL_SCALE_MAX","DRAG_DIRECTIONAL_SCALE_MIN","clampUnit","value","Math","min","max","mixUnit","from","to","progress","interpolateClamped","inputStart","inputEnd","outputStart","outputEnd","resolveSafeScale","scale","abs","resolveUnitDragTranslation","translation","dimension","baseDistance","resolveRevealDirectionalDragScale","normalized","inverted","dismissalRelative","rawScale","oppositeDrag","resolveUniformScale","sourceWidth","sourceHeight","destinationWidth","destinationHeight","sx","sy","sourceAspect","destinationAspect","aspectDifference","resolveRevealGestureHandoff","rawDrag","maxSensitivity","clampedRawDrag","gestureSensitivity","releaseBoost","releaseSensitivity","gestureReleaseVelocityScale","resolveDismissScaleHandoff","releaseScale","targetScale","velocity","velocityDepth","closeProgress","easeIn","cos","PI","scaleProgress","baseScale","orbitDepth","orbitScale","sin","resolveAspectRatioMaskHeight","maskWidth","maskHeight","targetWidth","targetHeight","safeMaskWidth","safeMaskHeight","safeTargetWidth","safeTargetHeight","targetAspectHeight","getBoundsCenterX","bounds","pageX","width","getBoundsCenterY","pageY","height","resolveRevealContentBaseTransform","sourceBounds","destinationBounds","screenLayout","anchor","geometry","start","end","entering","dimensions","scaleMode","translateX","tx","translateY","ty","s","resolveTrackedSourceElementTransform","contentTranslateX","contentTranslateY","contentScale","parentScale","screenWidth","screenHeight","screenCenterX","screenCenterY","safeParentScale","safeSourceWidth","safeSourceHeight","sourceCenterX","sourceCenterY","destinationCenterX","destinationCenterY","trackedCenterX","trackedCenterY","scaleX","scaleY"],"sourceRoot":"../../../../../../../src","sources":["shared/utils/bounds/navigation/reveal/math.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["EPSILON","computeContentTransformGeometry","DRAG_DIRECTIONAL_SCALE_EXPONENT","DRAG_DIRECTIONAL_SCALE_MAX","DRAG_DIRECTIONAL_SCALE_MIN","clampUnit","value","Math","min","max","mixUnit","from","to","progress","interpolateClamped","inputStart","inputEnd","outputStart","outputEnd","resolveSafeScale","scale","abs","resolveUnitDragTranslation","translation","dimension","baseDistance","resolveRevealDirectionalDragScale","normalized","inverted","dismissalRelative","rawScale","oppositeDrag","resolveUniformScale","sourceWidth","sourceHeight","destinationWidth","destinationHeight","sx","sy","sourceAspect","destinationAspect","aspectDifference","resolveRevealGestureHandoff","rawDrag","maxSensitivity","clampedRawDrag","gestureSensitivity","releaseBoost","releaseSensitivity","gestureReleaseVelocityScale","resolveDismissScaleHandoff","releaseScale","targetScale","velocity","velocityDepth","closeProgress","easeIn","cos","PI","scaleProgress","baseScale","orbitDepth","orbitScale","sin","resolveAspectRatioMaskHeight","maskWidth","maskHeight","targetWidth","targetHeight","safeMaskWidth","safeMaskHeight","safeTargetWidth","safeTargetHeight","targetAspectHeight","getBoundsCenterX","bounds","pageX","width","getBoundsCenterY","pageY","height","resolveRevealContentBaseTransformFromGeometry","geometry","translateX","tx","translateY","ty","s","resolveRevealContentBaseTransform","sourceBounds","destinationBounds","screenLayout","anchor","start","end","entering","dimensions","scaleMode","resolveTrackedSourceElementTransform","contentTranslateX","contentTranslateY","contentScale","parentScale","screenWidth","screenHeight","screenCenterX","screenCenterY","safeParentScale","safeSourceWidth","safeSourceHeight","sourceCenterX","sourceCenterY","destinationCenterX","destinationCenterY","trackedCenterX","trackedCenterY","scaleX","scaleY"],"sourceRoot":"../../../../../../../src","sources":["shared/utils/bounds/navigation/reveal/math.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/shared/utils/bounds/navigation/zoom/build.js

@@ -2,11 +2,13 @@
 
 import { interpolate } from "react-native-reanimated";
 import { EPSILON, NAVIGATION_MASK_ELEMENT_STYLE_ID } from "../../../../constants";
+import { getVisualScrollAxisDelta } from "../../../../stores/scroll.store";
 import { createBoundsAccessorCore } from "../../helpers/create-bounds-accessor-core";
+import { computeContentTransformGeometry } from "../../helpers/geometry";
 import { getSourceBorderRadius } from "../helpers";
-import { resolveRevealContentBaseTransform } from "../reveal/math";
+import { resolveRevealContentBaseTransformFromGeometry } from "../reveal/math";
 import { ZOOM_BACKDROP_MAX_OPACITY, ZOOM_BACKGROUND_SCALE, ZOOM_FOCUSED_ELEMENT_CLOSE_OPACITY_RANGE, ZOOM_FOCUSED_ELEMENT_OPEN_OPACITY_RANGE, ZOOM_SCREEN_A_FADE_END, ZOOM_SHARED_OPTIONS, ZOOM_UNFOCUSED_ELEMENT_CLOSE_OPACITY_RANGE, ZOOM_UNFOCUSED_ELEMENT_OPEN_OPACITY_RANGE } from "./config";
-import { resolveZoomDragState, resolveZoomTrackedGestureScale } from "./drag";
+import { resolveZoomDragState } from "./drag";
 import { resolveZoomBackdropOpacity, resolveZoomPinchFocalOffset, resolveZoomTrackedSourceTransform } from "./helpers";
 import { resolveZoomNavigationMaskStyle, ZOOM_NAVIGATION_MASK_BORDER_RADIUS } from "./mask";
 import { getZoomContentAnchor, getZoomContentTarget, resolveZoomTrackingContentTarget } from "./targets";
@@ -72,25 +74,30 @@ export function buildZoomStyles({
   if (!trackingContentTarget) {
     return {};
   }
+  const isDismissing = active.gesture.dismissing === 1;
+  const dismissalTrackingGeometry = isDismissing ? computeContentTransformGeometry({
+    start: sourceBounds,
+    end: trackingContentTarget,
+    entering: true,
+    dimensions: screenLayout,
+    anchor: zoomContentAnchor,
+    scaleMode: "uniform"
+  }) : null;
+  const dismissalCollapsedContentScale = dismissalTrackingGeometry ? resolveRevealContentBaseTransformFromGeometry({
+    geometry: dismissalTrackingGeometry,
+    progress: 0
+  }).scale : 1;
   const drag = resolveZoomDragState({
     gesture: active.gesture,
     activeTransitionProgress,
     screenLayout,
-    sourceBounds,
-    trackingContentTarget,
+    collapsedContentScale: dismissalCollapsedContentScale,
     dragOptions: zoomOptions?.drag
   });
-  const trackedGestureScale = resolveZoomTrackedGestureScale({
-    drag,
-    activeTransitionProgress,
-    screenLayout,
-    sourceBounds,
-    trackingContentTarget
-  });
   const focalGesture = drag.isDismissing ? active.gesture.handoff : active.gesture;
   const focalProgress = drag.isDismissing ? activeTransitionProgress : 1;
   const pinchFocalOffset = active.gesture.handoff.active === "pinch-in" ? resolveZoomPinchFocalOffset({
-    gestureScale: drag.isDismissing ? focalGesture.scale : trackedGestureScale,
+    gestureScale: drag.isDismissing ? focalGesture.scale : drag.gestureScale,
     pinchOriginX: focalGesture.pinchOriginX,
     pinchOriginY: focalGesture.pinchOriginY,
     progress: focalProgress,
@@ -101,6 +108,11 @@ export function buildZoomStyles({
     y: 0
   };
   if (focused) {
+    const capturedSourceScroll = sourceBounds.scroll;
+    const liveSourceScroll = props.inactive?.layouts.scroll;
+    const sourceScrollWeight = keepFocusedVisible && (active.entering || active.closing) ? 1 - Math.min(Math.max(activeTransitionProgress, 0), 1) : 0;
+    const sourceScrollDeltaX = getVisualScrollAxisDelta(liveSourceScroll, capturedSourceScroll, "horizontal") * sourceScrollWeight;
+    const sourceScrollDeltaY = getVisualScrollAxisDelta(liveSourceScroll, capturedSourceScroll, "vertical") * sourceScrollWeight;
     const sourceBorderRadius = getSourceBorderRadius(link);
     const navigationMaskEnabled = current.options.navigationMaskEnabled;
     const backdropOpacity = resolveZoomBackdropOpacity({
@@ -121,8 +133,8 @@ export function buildZoomStyles({
     const contentBaseTranslateX = contentRaw.translateX;
     const contentBaseTranslateY = contentRaw.translateY;
     const contentBaseScale = contentRaw.scale;
-    const contentTranslateX = contentBaseTranslateX + drag.dragX + pinchFocalOffset.x * contentBaseScale;
-    const contentTranslateY = contentBaseTranslateY + drag.dragY + pinchFocalOffset.y * contentBaseScale;
+    const contentTranslateX = contentBaseTranslateX + drag.dragX + pinchFocalOffset.x * contentBaseScale - sourceScrollDeltaX;
+    const contentTranslateY = contentBaseTranslateY + drag.dragY + pinchFocalOffset.y * contentBaseScale - sourceScrollDeltaY;
     const contentScale = drag.isDismissing ? drag.dismissContentScale : contentBaseScale * drag.gestureScale;
     return {
       options: {
@@ -201,16 +213,29 @@ export function buildZoomStyles({
       }
     };
   }
-  const trackedContentBaseScale = resolveRevealContentBaseTransform({
-    progress: activeTransitionProgress,
-    sourceBounds,
-    destinationBounds: trackingContentTarget,
-    screenLayout
+  const trackingGeometry = dismissalTrackingGeometry ?? computeContentTransformGeometry({
+    start: sourceBounds,
+    end: trackingContentTarget,
+    entering: true,
+    dimensions: screenLayout,
+    anchor: zoomContentAnchor,
+    scaleMode: "uniform"
+  });
+  const trackedContentBaseTransform = resolveRevealContentBaseTransformFromGeometry({
+    geometry: trackingGeometry,
+    progress: activeTransitionProgress
+  });
+  const collapsedContentScale = drag.isDismissing ? dismissalCollapsedContentScale : resolveRevealContentBaseTransformFromGeometry({
+    geometry: trackingGeometry,
+    progress: 0
   }).scale;
+  const trackedGestureScale = drag.isDismissing ? drag.dismissContentScale / trackedContentBaseTransform.scale : drag.gestureScale;
+  const trackedContentBaseScale = trackedContentBaseTransform.scale;
   const trackedDragX = drag.dragX + pinchFocalOffset.x * trackedContentBaseScale;
   const trackedDragY = drag.dragY + pinchFocalOffset.y * trackedContentBaseScale;
   const trackedSourceElement = resolveZoomTrackedSourceTransform({
-    progress: activeTransitionProgress,
+    contentBaseTransform: trackedContentBaseTransform,
+    collapsedContentScale,
     sourceBounds,
     destinationBounds: trackingContentTarget,
     screenLayout,
@@ -218,8 +243,7 @@ export function buildZoomStyles({
     dragY: trackedDragY,
     gestureScale: trackedGestureScale,
     parentScale: unfocusedContentScale,
-    rotation: drag.rotation,
-    anchor: zoomContentAnchor
+    rotation: drag.rotation
   });
   return {
     content: unfocusedContent,