Merge pull request #17 from samuelOsborne/FAST-migration

fix(Morphing Interactions): Fixed morphing interactions restarting on second half, bumped version
samuelOsborne · Jun 20, 2021 · 0290345 · 0290345
2 parents 55812e6 + a80f9aa
commit 0290345
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 7 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "lottie-interactive",
-  "version": "1.2.4",
+  "version": "1.3.0",
   "description": "A custom element that adds interactions and quality of life changes to Lottie animations.",
   "main": "dist/lottie-interactive.js",
   "types": "./types/lottie.d.ts",

diff --git a/src/index.ts b/src/index.ts
@@ -240,10 +240,9 @@ export class LottieInteractive extends FASTElement {
     private data: any;
 
     /**
-     * Array of all the possible interactions
+     * The currently used interaction on the animation
      * @private
      */
-    //private interactions: Array<BaseInteraction>;
     private currentInteraction: BaseInteraction;
 
     /**

diff --git a/src/interactions/morph-lock.ts b/src/interactions/morph-lock.ts
@@ -40,13 +40,12 @@ export class MorphLock extends BaseInteraction {
             this.direction = 1;
             this.playing = true;
             this.lottiePlayer.setDirection(this.direction);
-            this.lottiePlayer.goToAndPlay(0, true);
         } else if (this.direction === 1) {
             this.direction = -1;
             this.playing = true;
             this.lottiePlayer.setDirection(this.direction);
-            this.lottiePlayer.play();
         }
+        this.lottiePlayer.play();
     }
 
     public playOnHover(): void {

diff --git a/src/interactions/morph.ts b/src/interactions/morph.ts
@@ -31,13 +31,12 @@ export class Morph extends BaseInteraction {
             this.direction = 1;
             this.playing = true;
             this.lottiePlayer.setDirection(this.direction);
-            this.lottiePlayer.goToAndPlay(0, true);
         } else if (this.direction === 1) {
             this.direction = -1;
             this.playing = true;
             this.lottiePlayer.setDirection(this.direction);
-            this.lottiePlayer.play();
         }
+        this.lottiePlayer.play();
     }
 
     public playOnHover(): void {