fix dynamic and spring number animators

TahaSh · Jul 2, 2024 · 2f59f5f · 2f59f5f
1 parent 127b8ca
commit 2f59f5f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 12 deletions.
diff --git a/src/animators/DynamicAnimator.ts b/src/animators/DynamicAnimator.ts
@@ -1,5 +1,6 @@
 import { Vec2 } from '../math'
 import { CSSNumber, createCSSNumber } from '../utils/CSSNumber'
+import { almostEqual } from '../utils/Math'
 import {
   Animator,
   AnimatorUpdateData,
@@ -61,7 +62,7 @@ export class NumberDynamicAnimator extends DynamicAnimator<number> {
 
     let result = current + velocity * dt
 
-    if (this._shouldFinish(target, current, velocity)) {
+    if (almostEqual(result, target)) {
       result = target
       requestAnimationFrame(() => {
         animatorProp.callCompleteCallback()
@@ -72,11 +73,6 @@ export class NumberDynamicAnimator extends DynamicAnimator<number> {
 
     return result
   }
-
-  private _shouldFinish(target: number, current: number, velocity: number) {
-    const diff = Math.abs(target - current)
-    return diff < ERROR_OFFSET && Math.abs(velocity) < ERROR_OFFSET
-  }
 }
 
 export class CSSNumbersDynamicAnimator extends DynamicAnimator<CSSNumber[]> {

diff --git a/src/animators/SpringAnimator.ts b/src/animators/SpringAnimator.ts
@@ -1,5 +1,6 @@
 import { Vec2 } from '../math'
 import { CSSNumber, createCSSNumber } from '../utils/CSSNumber'
+import { almostEqual } from '../utils/Math'
 import {
   Animator,
   AnimatorUpdateData,
@@ -76,7 +77,7 @@ export class NumberSpringAnimator extends SpringAnimator<number> {
 
     let result = current + this._velocity * dt * this._config.speed
 
-    if (this._shouldFinish(target, current)) {
+    if (almostEqual(result, target)) {
       result = target
       requestAnimationFrame(() => {
         animatorProp.callCompleteCallback()
@@ -85,11 +86,6 @@ export class NumberSpringAnimator extends SpringAnimator<number> {
 
     return result
   }
-
-  private _shouldFinish(target: number, current: number) {
-    const diff = Math.abs(target - current)
-    return diff < ERROR_OFFSET && Math.abs(this._velocity) < ERROR_OFFSET
-  }
 }
 
 export class CSSNumbersSpringAnimator extends SpringAnimator<CSSNumber[]> {