fix: Last frame of animations was not always applied (#798)

marc2332 · Jul 16, 2024 · 8ad268b · 8ad268b
1 parent c3821a3
commit 8ad268b
Showing 1 changed file with 16 additions and 15 deletions.
diff --git a/crates/hooks/src/use_animation.rs b/crates/hooks/src/use_animation.rs
@@ -200,17 +200,17 @@ impl AnimatedValue for AnimColor {
         match direction {
             AnimDirection::Forward => {
                 index > self.time.as_millis() as i32
-                    && self.value.r() >= self.destination.r()
-                    && self.value.g() >= self.destination.g()
-                    && self.value.b() >= self.destination.b()
-                    && self.value.a() >= self.destination.a()
+                    && self.value.r() == self.destination.r()
+                    && self.value.g() == self.destination.g()
+                    && self.value.b() == self.destination.b()
+                    && self.value.a() == self.destination.a()
             }
             AnimDirection::Reverse => {
                 index > self.time.as_millis() as i32
-                    && self.value.r() <= self.origin.r()
-                    && self.value.g() <= self.origin.g()
-                    && self.value.b() <= self.origin.b()
-                    && self.value.a() >= self.origin.a()
+                    && self.value.r() == self.origin.r()
+                    && self.value.g() == self.origin.g()
+                    && self.value.b() == self.origin.b()
+                    && self.value.a() == self.origin.a()
             }
         }
     }
@@ -524,6 +524,14 @@ impl<Animated: PartialEq + Clone + 'static> UseAnimator<Animated> {
                 let is_finished = values
                     .iter()
                     .all(|value| value.peek().is_finished(index, direction));
+
+                // Advance the animations
+                for value in values.iter_mut() {
+                    value.write().advance(index, direction);
+                }
+
+                prev_frame = Instant::now();
+
                 if is_finished {
                     if OnFinish::Reverse == on_finish {
                         // Toggle direction
@@ -544,13 +552,6 @@ impl<Animated: PartialEq + Clone + 'static> UseAnimator<Animated> {
                         }
                     }
                 }
-
-                // Advance the animations
-                for value in values.iter_mut() {
-                    value.write().advance(index, direction);
-                }
-
-                prev_frame = Instant::now();
             }
 
             is_running.set(false);