From 59fa86429b8325a5f0c666cbf9a5db6360149051 Mon Sep 17 00:00:00 2001
From: Andrew Noblet <andrewbnoblet@gmail.com>
Date: Wed, 8 Mar 2023 14:08:23 -0500
Subject: [PATCH] feat(cxl-ui): [cxl-jw-player] fix saving position when using
 a playlist

---
 .../cxl-jw-player/mixins/BaseMixin.js         |  9 ++-
 .../cxl-jw-player/mixins/StateMixin.js        | 60 ++++++++++---------
 2 files changed, 41 insertions(+), 28 deletions(-)

diff --git a/packages/cxl-ui/src/components/cxl-jw-player/mixins/BaseMixin.js b/packages/cxl-ui/src/components/cxl-jw-player/mixins/BaseMixin.js
index 91f4874c9..6068c042a 100644
--- a/packages/cxl-ui/src/components/cxl-jw-player/mixins/BaseMixin.js
+++ b/packages/cxl-ui/src/components/cxl-jw-player/mixins/BaseMixin.js
@@ -161,6 +161,9 @@ export function BaseMixin(BaseClass) {
      * Each mixin has the ability to hook onto this method.
      */
 
+    // eslint-disable-next-line class-methods-use-this, no-unused-vars, no-empty-function
+    async _onReadyListener() {}
+
     // eslint-disable-next-line class-methods-use-this, no-unused-vars, no-empty-function
     async _onTimeListener(event) {}
 
@@ -193,7 +196,11 @@ export function BaseMixin(BaseClass) {
       });
 
       await new Promise((resolve) => {
-        this._jwPlayer.on('ready', resolve);
+        this._jwPlayer.on('ready', async () => {
+          await this._onReadyListener();
+
+          resolve();
+        });
       });
 
       this._jwPlayerContainer = this._jwPlayer.getContainer();
diff --git a/packages/cxl-ui/src/components/cxl-jw-player/mixins/StateMixin.js b/packages/cxl-ui/src/components/cxl-jw-player/mixins/StateMixin.js
index 14eef3ca9..1046210a7 100644
--- a/packages/cxl-ui/src/components/cxl-jw-player/mixins/StateMixin.js
+++ b/packages/cxl-ui/src/components/cxl-jw-player/mixins/StateMixin.js
@@ -6,6 +6,26 @@ export function StateMixin(BaseClass) {
 
     _userId;
 
+    async _index() {
+      if (this.playlistId) {
+        const index =
+          localStorage.getItem(`cxl-jw-player-${this.playlistId}-index`) ||
+          this._jwPlayer.getPlaylistIndex();
+
+        this._jwPlayer.playlistItem(index);
+
+        this._jwPlayer.on('playlistItem', async ({ index }) => {
+          localStorage.setItem(`cxl-jw-player-${this.playlistId}-index`, index);
+        });
+      }
+    }
+
+    async _onReadyListener() {
+      await this._index();
+      this._position();
+      this._playbackRate();
+    }
+
     async _setup() {
       await super._setup();
 
@@ -14,9 +34,6 @@ export function StateMixin(BaseClass) {
       if (typeof window.cxl_pum_vars !== 'undefined') {
         this._nonce = window.cxl_pum_vars.nonce;
       }
-
-      this._playbackRate();
-      this._position();
     }
 
     _playbackRate() {
@@ -32,39 +49,28 @@ export function StateMixin(BaseClass) {
     }
 
     _position() {
-      const mediaId = this.mediaId || this._jwPlayer.getPlaylistItem().mediaId;
-
-      const position = localStorage.getItem(`cxl-jw-player-${mediaId}-position`);
+      if (this.mediaId) {
+        this._setPosition();
+      }
 
-      if (position) {
-        if (this.mediaId) {
-          this._setPosition(position);
-        } else {
-          this._jwPlayer.on('playlistItem', ({ index }) => {
-            localStorage.setItem(`cxl-jw-player-${this.playlistId}-index`, index);
-
-            // Wait for the player to load the new playlist item
-            setTimeout(() => {
-              this._setPosition(position);
-            }, 1000);
-          });
-
-          const index =
-            localStorage.getItem(`cxl-jw-player-${this.playlistId}-index`) ||
-            this._jwPlayer.getPlaylistIndex();
-
-          this._jwPlayer.playlistItem(index);
-        }
+      if (this.playlistId) {
+        this._jwPlayer.on('playlistItem', async ({ index }) => {
+          await jwplayer().getPlaylistItemPromise(index);
+          this._setPosition();
+        });
       }
 
       this._jwPlayer.on('seek time', ({ position }) => {
+        const mediaId = this.mediaId || this._jwPlayer.getPlaylistItem().mediaid;
         localStorage.setItem(`cxl-jw-player-${mediaId}-position`, position);
       });
     }
 
-    _setPosition(position) {
+    _setPosition() {
+      const mediaId = this.mediaId || this._jwPlayer.getPlaylistItem().mediaid;
+      const position = localStorage.getItem(`cxl-jw-player-${mediaId}-position`);
+
       this._jwPlayer.seek(Number(position));
-      this._jwPlayer.pause();
     }
   }