Merge

software-mansion · Oct 19, 2023 · 3a27ddd · 3a27ddd
2 parents 7b5f66f + 4801045
commit 3a27ddd
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 28 deletions.
diff --git a/src/reanimated2/animation/spring.ts b/src/reanimated2/animation/spring.ts
@@ -20,7 +20,7 @@ import {
   criticallyDampedSpringCalculations,
   isAnimationTerminatingCalculation,
   scaleZetaToMatchClamps,
-  isConfigValid,
+  checkIfConfigIsValid,
 } from './springUtils';
 
 // TODO TYPESCRIPT This is a temporary type to get rid of .d.ts file.
@@ -60,7 +60,7 @@ export const withSpring = ((
       skipAnimation: false,
     };
 
-    config.skipAnimation = !isConfigValid(config);
+    config.skipAnimation = !checkIfConfigIsValid(config);
 
     if (config.duration === 0) {
       config.skipAnimation = true;
@@ -82,13 +82,9 @@ export const withSpring = ((
       }
 
       if (config.skipAnimation) {
-        // If we use duration we want to wait the provided time before stopping
-        if (config.useDuration) return false;
-        else {
-          animation.current = toValue;
-          animation.lastTimestamp = 0;
-          return true;
-        }
+        animation.current = toValue;
+        animation.lastTimestamp = 0;
+        return true;
       }
       const { lastTimestamp, velocity } = animation;
 

diff --git a/src/reanimated2/animation/springUtils.ts b/src/reanimated2/animation/springUtils.ts
@@ -61,9 +61,9 @@ export interface InnerSpringAnimation
   toValue: number;
   current: number;
 }
-export function isConfigValid(config: DefaultSpringConfig): boolean {
+export function checkIfConfigIsValid(config: DefaultSpringConfig): boolean {
   'worklet';
-  let errorMessage: string | null = null;
+  let errorMessage = '';
 
   (
     [
@@ -77,34 +77,19 @@ export function isConfigValid(config: DefaultSpringConfig): boolean {
   ).forEach((prop) => {
     const value = config[prop];
     if (value <= 0) {
-      if (errorMessage === null) {
-        errorMessage = '';
-      }
       errorMessage += `, ${prop} must be grater than zero but got ${value}`;
     }
   });
 
   if (config.duration < 0) {
-    if (errorMessage === null) {
-      errorMessage = '';
-    }
-
     errorMessage += `, duration can't be negative, got ${config.duration}`;
   }
 
-  if (config.clamp && config.clamp[0] > config.clamp[1]) {
-    if (errorMessage === null) {
-      errorMessage = '';
-    }
-    errorMessage +=
-      'clamp is incorrect, lower bound should not be greater than the upper band';
-  }
-
-  if (errorMessage !== null) {
+  if (errorMessage !== '') {
     console.warn('[Reanimated] Invalid spring config' + errorMessage);
   }
 
-  return errorMessage === null;
+  return errorMessage === '';
 }
 
 function bisectRoot({