Merge branch 'main' into @mstach60161/fix-android-web-sensors

software-mansion · May 30, 2023 · 43a92d3 · 43a92d3
2 parents db43327 + 548581a
commit 43a92d3
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/reanimated2/animation/spring.ts b/src/reanimated2/animation/spring.ts
@@ -149,7 +149,7 @@ export function withSpring(
         animation.omega0 = previousAnimation?.omega0 || 0;
         animation.omega1 = previousAnimation?.omega1 || 0;
       } else {
-        if (duration) {
+        if (config.useDuration) {
           const acutalDuration = triggeredTwice
             ? // If animation is triggered twice we want to continue the previous animation
               // so we need to include the time that already elapsed
@@ -168,7 +168,8 @@ export function withSpring(
         animation.omega1 = omega1;
       }
 
-      animation.lastTimestamp = now;
+      animation.lastTimestamp = previousAnimation?.lastTimestamp || now;
+
       animation.startTimestamp = triggeredTwice
         ? previousAnimation?.startTimestamp || now
         : now;