fix(animations): implement getPosition in browser animation builder

angular · Jan 20, 2019 · 93b7b76 · 93b7b76
1 parent 73dcd72
commit 93b7b76
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/packages/animations/src/players/animation_group_player.ts b/packages/animations/src/players/animation_group_player.ts
@@ -132,12 +132,15 @@ export class AnimationGroupPlayer implements AnimationPlayer {
   }
 
   getPosition(): number {
-    let min = 0;
-    this.players.forEach(player => {
-      const p = player.getPosition();
-      min = Math.min(p, min);
-    });
-    return min;
+    const longestPlayer = this.players.reduce((longestSoFar, player) => {
+      const newPlayerIsLongest = player.totalTime > (longestSoFar! as AnimationPlayer).totalTime;
+      if (longestSoFar === undefined || newPlayerIsLongest) {
+        return player;
+      } else {
+        return longestSoFar;
+      }
+    }, undefined);
+    return longestPlayer !== undefined ? longestPlayer.getPosition() / longestPlayer.totalTime : 0;
   }
 
   beforeDestroy(): void {

diff --git a/packages/platform-browser/animations/src/animation_builder.ts b/packages/platform-browser/animations/src/animation_builder.ts
@@ -89,7 +89,7 @@ export class RendererAnimationPlayer implements AnimationPlayer {
 
   setPosition(p: number): void { this._command('setPosition', p); }
 
-  getPosition(): number { return 0; }
+  getPosition(): number { return this._renderer.engine.players[+this.id].getPosition(); }
 
   public totalTime = 0;
 }