fix(UI): Disable PiP on casting (#6110)

shaka-project · Jan 16, 2024 · 6312fa3 · 6312fa3
1 parent de7d8d3
commit 6312fa3
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 21 deletions.
diff --git a/ui/controls.js b/ui/controls.js
@@ -650,6 +650,9 @@ shaka.ui.Controls = class extends shaka.util.FakeEventTarget {
    * @export
    */
   isPiPAllowed() {
+    if (this.castProxy_.isCasting()) {
+      return false;
+    }
     if ('documentPictureInPicture' in window &&
         this.config_.preferDocumentPictureInPicture) {
       const video = /** @type {HTMLVideoElement} */(this.localVideo_);

diff --git a/ui/pip_button.js b/ui/pip_button.js
@@ -98,8 +98,8 @@ shaka.ui.PipButton = class extends shaka.ui.Element {
       this.onLeavePictureInPicture_();
     });
 
-    this.eventManager.listen(this.controls, 'caststatuschanged', (e) => {
-      this.onCastStatusChange_(e);
+    this.eventManager.listen(this.controls, 'caststatuschanged', () => {
+      this.onTracksChanged_();
     });
 
     this.eventManager.listen(this.player, 'trackschanged', () => {
@@ -164,25 +164,6 @@ shaka.ui.PipButton = class extends shaka.ui.Element {
         this.localization.resolve(currentPipState);
   }
 
-  /**
-   * @param {Event} e
-   * @private
-   */
-  onCastStatusChange_(e) {
-    const isCasting = e['newStatus'];
-
-    if (isCasting) {
-      // Picture-in-picture is not applicable if we're casting
-      if (this.controls.isPiPAllowed()) {
-        shaka.ui.Utils.setDisplay(this.pipButton_, false);
-      }
-    } else {
-      if (this.controls.isPiPAllowed()) {
-        shaka.ui.Utils.setDisplay(this.pipButton_, true);
-      }
-    }
-  }
-
 
   /**
    * Display the picture-in-picture button only when the content contains video.
@@ -194,6 +175,9 @@ shaka.ui.PipButton = class extends shaka.ui.Element {
   async onTracksChanged_() {
     if (!this.controls.isPiPAllowed()) {
       shaka.ui.Utils.setDisplay(this.pipButton_, false);
+      if (this.controls.isPiPEnabled()) {
+        await this.controls.togglePiP();
+      }
     } else if (this.player && this.player.isAudioOnly()) {
       shaka.ui.Utils.setDisplay(this.pipButton_, false);
       if (this.controls.isPiPEnabled()) {