Refactor, new release

pavelbabenko · Mar 31, 2021 · 128c0e8 · 128c0e8
1 parent 7083e78
commit 128c0e8
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-native-awesome-gallery",
-  "version": "0.0.5",
+  "version": "0.0.6",
   "description": "Awesome gallery with Reanimated v2",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",
@@ -75,8 +75,8 @@
   "peerDependencies": {
     "react": "*",
     "react-native": "*",
-    "react-native-reanimated": "^2.0.0-rc.3",
-    "react-native-gesture-handler": "^1.10.1"
+    "react-native-gesture-handler": "^1.10.1",
+    "react-native-reanimated": "^2.0.0-rc.3"
   },
   "jest": {
     "preset": "react-native",

diff --git a/src/utils/withDecaySpring.ts b/src/utils/withDecaySpring.ts
@@ -46,7 +46,7 @@ export function withDecaySpring(
           const m = config.mass;
           const k = config.stiffness;
 
-          const v0 = -velocity;
+          const springV0 = -velocity;
           const x0 = toValue - current;
 
           const zeta = c / (2 * Math.sqrt(k * m)); // damping ratio
@@ -62,23 +62,24 @@ export function withDecaySpring(
           const underDampedEnvelope = Math.exp(-zeta * omega0 * t);
           const underDampedFrag1 =
             underDampedEnvelope *
-            (sin1 * ((v0 + zeta * omega0 * x0) / omega1) + x0 * cos1);
+            (sin1 * ((springV0 + zeta * omega0 * x0) / omega1) + x0 * cos1);
 
           const underDampedPosition = toValue - underDampedFrag1;
           // This looks crazy -- it's actually just the derivative of the oscillation function
           const underDampedVelocity =
             zeta * omega0 * underDampedFrag1 -
             underDampedEnvelope *
-              (cos1 * (v0 + zeta * omega0 * x0) - omega1 * x0 * sin1);
+              (cos1 * (springV0 + zeta * omega0 * x0) - omega1 * x0 * sin1);
 
           // critically damped
           const criticallyDampedEnvelope = Math.exp(-omega0 * t);
           const criticallyDampedPosition =
-            toValue - criticallyDampedEnvelope * (x0 + (v0 + omega0 * x0) * t);
+            toValue -
+            criticallyDampedEnvelope * (x0 + (springV0 + omega0 * x0) * t);
 
           const criticallyDampedVelocity =
             criticallyDampedEnvelope *
-            (v0 * (t * omega0 - 1) + t * x0 * omega0 * omega0);
+            (springV0 * (t * omega0 - 1) + t * x0 * omega0 * omega0);
 
           const isOvershooting = () => {
             if (config.overshootClamping && config.stiffness !== 0) {