fix: fix animator's play & pause bug

b-xiang · Jun 8, 2019 · 84dd631 · 84dd631
1 parent 33dbc72
commit 84dd631
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 1 deletion.
diff --git a/src/Animator.ts b/src/Animator.ts
@@ -229,7 +229,6 @@ class Animator
         if (this.isEnded() && (currentTime === 0 || currentTime >= this.getActiveDuration())) {
             this.setTime(-delay, true);
         }
-        state[TICK_TIME] = this.getTime();
 
         this.timerId = requestAnimationFrame((time: number) => {
             state[PREV_TIME] = time;

diff --git a/test/unit/Animator.spec.ts b/test/unit/Animator.spec.ts
@@ -1,5 +1,6 @@
 import * as sinon from "sinon";
 import Animator, { isDirectionReverse } from "../../src/Animator";
+import { TICK_TIME } from "../../src/consts";
 
 describe("Animator Test", () => {
   describe("test Animator initialize", () => {
@@ -241,6 +242,33 @@ describe("Animator Test", () => {
 
       animator.play();
     });
+    it("should check play with (delay, playSpeed)", async () => {
+        const animator = new Animator({
+            delay: 2,
+            fillMode: "forwards",
+            direction: "normal",
+            duration: 5,
+            playSpeed: 1.5,
+        });
+
+        animator.setTime(2, true, true);
+        const tick1 = animator.state[TICK_TIME];
+
+
+        animator.play();
+        animator.pause();
+
+        const tick2 = animator.state[TICK_TIME];
+
+        animator.play();
+        animator.pause();
+
+        const tick3 = animator.state[TICK_TIME];
+
+        expect(tick1).to.be.equals(4);
+        expect(tick2).to.be.equals(4);
+        expect(tick3).to.be.equals(4);
+    });
     it("should check paused", done => {
       const animator = new Animator({
         delay: 1,
@@ -288,6 +316,7 @@ describe("Animator Test", () => {
       });
       animator.play();
     });
+
     it("should check ended (delay)", done => {
       const animator = new Animator({
         delay: 1,