fix(UI): Fix replay button when the post-roll is running using CS (#6072

)
shaka-project · Jan 10, 2024 · 6b7a02a · 6b7a02a
1 parent 44cb8a2
commit 6b7a02a
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 2 deletions.
diff --git a/ui/play_button.js b/ui/play_button.js
@@ -72,6 +72,11 @@ shaka.ui.PlayButton = class extends shaka.ui.Element {
       this.updateIcon();
     });
 
+    this.eventManager.listen(this.adManager, AdManager.AD_STOPPED, () => {
+      this.updateAriaLabel();
+      this.updateIcon();
+    });
+
     this.eventManager.listen(this.button, 'click', () => {
       if (this.ad && this.ad.isLinear()) {
         this.controls.playPauseAd();
@@ -99,6 +104,18 @@ shaka.ui.PlayButton = class extends shaka.ui.Element {
     return this.controls.presentationIsPaused();
   }
 
+  /**
+   * @return {boolean}
+   * @protected
+   */
+  isEnded() {
+    if (this.ad && this.ad.isLinear()) {
+      return false;
+    }
+
+    return this.video.ended;
+  }
+
   /**
    * Called when the button's aria label needs to change.
    * To be overridden by subclasses.

diff --git a/ui/small_play_button.js b/ui/small_play_button.js
@@ -38,7 +38,7 @@ shaka.ui.SmallPlayButton = class extends shaka.ui.PlayButton {
   /** @override */
   updateIcon() {
     const Icons = shaka.ui.Enums.MaterialDesignIcons;
-    if (this.video.ended) {
+    if (this.isEnded()) {
       this.button.textContent = Icons.REPLAY;
     } else {
       this.button.textContent = this.isPaused() ? Icons.PLAY : Icons.PAUSE;
@@ -48,7 +48,7 @@ shaka.ui.SmallPlayButton = class extends shaka.ui.PlayButton {
   /** @override */
   updateAriaLabel() {
     const LocIds = shaka.ui.Locales.Ids;
-    if (this.video.ended) {
+    if (this.isEnded()) {
       this.button.ariaLabel = this.localization.resolve(LocIds.REPLAY);
     } else {
       const label = this.isPaused() ? LocIds.PLAY : LocIds.PAUSE;