@gcorevideo/player 2.28.18 → 2.28.20

package/lib/plugins/subtitles/ClosedCaptions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ClosedCaptions.d.ts","sourceRoot":"","sources":["../../../src/plugins/subtitles/ClosedCaptions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,YAAY,EAAwB,MAAM,cAAc,CAAA;AAOzE,OAAO,sCAAsC,CAAA;AAgB7C;;;GAGG;AACH,MAAM,MAAM,4BAA4B,GAAG;IACzC;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAA;CAClB,CAAA;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAkCG;AACH,qBAAa,cAAe,SAAQ,YAAY;IAC9C,OAAO,CAAC,oBAAoB,CAAQ;IAEpC,OAAO,CAAC,MAAM,CAAQ;IAEtB,OAAO,CAAC,IAAI,CAAQ;IAEpB,OAAO,CAAC,KAAK,CAA6B;IAE1C,OAAO,CAAC,MAAM,CAAsB;IAEpC,OAAO,CAAC,KAAK,CAA2B;IAExC;;OAEG;IACH,IAAI,IAAI,WAEP;IAED;;OAEG;IACH,IAAI,gBAAgB;;MAEnB;IAED;;OAEG;IACH,MAAM,KAAK,OAAO,WAEjB;IAED,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,eAAe,CAAyB;IAEhE,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,YAAY,CAAuB;IAE3D;;OAEG;IACH,IAAa,UAAU;;MAItB;IAED;;OAEG;IACH,IAAa,MAAM;;;MAKlB;IAED,OAAO,KAAK,mBAAmB,GAM9B;IAED;;OAEG;IACM,UAAU;IASnB,OAAO,CAAC,WAAW;IAkBnB,OAAO,CAAC,kBAAkB;IAgD1B,OAAO,CAAC,mBAAmB;IAQ3B,OAAO,CAAC,iBAAiB;IA+BzB,OAAO,CAAC,WAAW;IAUnB,OAAO,CAAC,SAAS;IAWjB,OAAO,CAAC,UAAU;IASlB,OAAO,CAAC,iBAAiB;IAqBzB;;OAEG;IACH,IAAI;IAcJ;;OAEG;IACH,IAAI;IAiBJ,OAAO,CAAC,YAAY;IAIpB,OAAO,CAAC,UAAU;IAUlB;;OAEG;IACM,MAAM;IA4Bf,OAAO,CAAC,QAAQ;IAIhB,OAAO,CAAC,UAAU;IAOlB,OAAO,CAAC,YAAY;IAYpB,OAAO,CAAC,yBAAyB;IAgBjC,OAAO,CAAC,QAAQ;IAMhB,OAAO,CAAC,UAAU;IAalB,OAAO,CAAC,WAAW;IAKnB,OAAO,CAAC,eAAe;IAIvB,OAAO,CAAC,eAAe;IAMvB,OAAO,CAAC,eAAe;IAiBvB,OAAO,CAAC,eAAe;IAIvB,OAAO,CAAC,iBAAiB;IAIzB,OAAO,CAAC,eAAe;IAUvB,OAAO,CAAC,yBAAyB;IAiBjC,OAAO,CAAC,UAAU;IAMlB,OAAO,CAAC,UAAU;IAOlB,OAAO,CAAC,KAAK;CAMd"}
+{"version":3,"file":"ClosedCaptions.d.ts","sourceRoot":"","sources":["../../../src/plugins/subtitles/ClosedCaptions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,YAAY,EAAwB,MAAM,cAAc,CAAA;AAOzE,OAAO,sCAAsC,CAAA;AAgB7C;;;GAGG;AACH,MAAM,MAAM,4BAA4B,GAAG;IACzC;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAA;CAClB,CAAA;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAkCG;AACH,qBAAa,cAAe,SAAQ,YAAY;IAC9C,OAAO,CAAC,oBAAoB,CAAQ;IAEpC,OAAO,CAAC,MAAM,CAAQ;IAEtB,OAAO,CAAC,IAAI,CAAQ;IAEpB,OAAO,CAAC,KAAK,CAA6B;IAE1C,OAAO,CAAC,MAAM,CAAsB;IAEpC,OAAO,CAAC,KAAK,CAA2B;IAExC;;OAEG;IACH,IAAI,IAAI,WAEP;IAED;;OAEG;IACH,IAAI,gBAAgB;;MAEnB;IAED;;OAEG;IACH,MAAM,KAAK,OAAO,WAEjB;IAED,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,eAAe,CAAyB;IAEhE,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,YAAY,CAAuB;IAE3D;;OAEG;IACH,IAAa,UAAU;;MAItB;IAED;;OAEG;IACH,IAAa,MAAM;;;MAKlB;IAED,OAAO,KAAK,mBAAmB,GAK9B;IAED;;OAEG;IACM,UAAU;IASnB,OAAO,CAAC,WAAW;IAkBnB,OAAO,CAAC,kBAAkB;IAgD1B,OAAO,CAAC,mBAAmB;IAQ3B,OAAO,CAAC,iBAAiB;IAkCzB,OAAO,CAAC,WAAW;IAUnB,OAAO,CAAC,SAAS;IAWjB,OAAO,CAAC,UAAU;IASlB,OAAO,CAAC,iBAAiB;IAqBzB;;OAEG;IACH,IAAI;IAcJ;;OAEG;IACH,IAAI;IAiBJ,OAAO,CAAC,YAAY;IAIpB,OAAO,CAAC,UAAU;IAUlB;;OAEG;IACM,MAAM;IA4Bf,OAAO,CAAC,QAAQ;IAIhB,OAAO,CAAC,UAAU;IAOlB,OAAO,CAAC,YAAY;IAYpB,OAAO,CAAC,yBAAyB;IAejC,OAAO,CAAC,QAAQ;IAMhB,OAAO,CAAC,UAAU;IAalB,OAAO,CAAC,WAAW;IAKnB,OAAO,CAAC,eAAe;IAIvB,OAAO,CAAC,eAAe;IAQvB,OAAO,CAAC,eAAe;IAiBvB,OAAO,CAAC,eAAe;IAIvB,OAAO,CAAC,iBAAiB;IAIzB,OAAO,CAAC,eAAe;IAUvB,OAAO,CAAC,yBAAyB;IAiBjC,OAAO,CAAC,UAAU;IAMlB,OAAO,CAAC,UAAU;IAOlB,OAAO,CAAC,KAAK;CAMd"}

package/lib/plugins/subtitles/ClosedCaptions.js

@@ -93,8 +93,7 @@ export class ClosedCaptions extends UICorePlugin {
     }
     get preselectedLanguage() {
         return (this.core.options.cc?.language ??
-            this.core.options.subtitles?.language ??
-            '');
+            this.core.options.subtitles?.language);
     }
     /**
      * @internal
@@ -147,14 +146,17 @@ export class ClosedCaptions extends UICorePlugin {
         this.applyTracks();
         this.mount();
     }
-    onSubtitleChanged({ id }) {
-        trace(`${T} onSubtitleChanged`, { id });
+    onSubtitleChanged({ id: _ }) {
+        // ignoring the subtitle selected by the playback engine or user agent
+        const id = this.track?.id ?? -1;
         if (id === -1) {
             this.clearSubtitleText();
         }
         for (const track of this.tracks) {
+            // Native subtitles are always hidden
+            track.track.mode = 'hidden';
             if (track.id === id) {
-                track.track.mode = 'showing';
+                // track.track.mode = 'showing'
                 this.setSubtitleText(this.getSubtitleText(track.track));
                 track.track.oncuechange = (e) => {
                     try {
@@ -173,7 +175,7 @@ export class ClosedCaptions extends UICorePlugin {
             }
             else {
                 track.track.oncuechange = null;
-                track.track.mode = 'hidden';
+                // track.track.mode = 'hidden'
             }
         }
     }
@@ -302,12 +304,11 @@ export class ClosedCaptions extends UICorePlugin {
     applyPreselectedSubtitles() {
         if (!this.isPreselectedApplied) {
             this.isPreselectedApplied = true;
-            if (!this.preselectedLanguage) {
-                return;
-            }
+            // if the language is undefined, then let the engine decide
+            // to hide the subtitles forcefully, set the language to 'none'
             setTimeout(() => {
                 this.selectItem(this.tracks.find((t) => t.track.language === this.preselectedLanguage) ?? null);
-            }, 300); // TODO why delay?
+            }, 0);
         }
     }
     hideMenu() {
@@ -337,7 +338,9 @@ export class ClosedCaptions extends UICorePlugin {
     }
     selectSubtitles() {
         const trackId = this.track ? this.track.id : -1;
-        this.core.activePlayback.closedCaptionsTrackId = trackId; // TODO test
+        // TODO find out if this is needed
+        // this.core.activePlayback.closedCaptionsTrackId = trackId
+        this.core.activePlayback.closedCaptionsTrackId = -1;
     }
     getSubtitleText(track) {
         const currentTime = this.core.activePlayback?.getCurrentTime() ?? 0;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gcorevideo/player",
-  "version": "2.28.18",
+  "version": "2.28.20",
   "description": "Gcore JavaScript video player",
   "main": "dist/index.js",
   "type": "module",

package/src/plugins/level-selector/QualityLevels.ts

@@ -217,6 +217,7 @@ export class QualityLevels extends UICorePlugin {
    */
   override render() {
     if (!this.shouldRender()) {
+      this.$el.hide()
       return this
     }
     this.renderDropdown()
@@ -241,6 +242,9 @@ export class QualityLevels extends UICorePlugin {
   }
 
   private updateButton() {
+    if (!this.shouldRender()) {
+      return
+    }
     ;(this.core.getPlugin('bottom_gear') as BottomGear)
       ?.addItem('quality', this.$el)
       .html(

package/src/plugins/media-control/MediaControl.ts

@@ -471,9 +471,7 @@ export class MediaControl extends UICorePlugin {
     this.listenTo(
       this.core.activeContainer,
       Events.CONTAINER_CLICK,
-      () => {
-        this.clickaway(this.core.activeContainer.$el[0])
-      },
+      () => this.clickaway(this.core.activeContainer.$el[0]),
     )
     this.listenTo(
       this.core.activeContainer,
@@ -951,9 +949,6 @@ export class MediaControl extends UICorePlugin {
     } else {
       this.hideVolumeId = setTimeout(() => {
         this.hideVolumeId = null
-        trace(`${T} hideVolumeBar`, {
-          volumeBarContainer: !!this.$volumeBarContainer,
-        })
         this.$volumeBarContainer?.addClass('volume-bar-hide')
       }, timeout)
     }
@@ -1045,17 +1040,12 @@ export class MediaControl extends UICorePlugin {
     this.setSeekPercentage(pos)
   }
 
-  private setUserKeepVisible() {
-    trace(`${T} setUserKeepVisible`, {
-      userKeepVisible: this.userKeepVisible,
-    })
+  private setUserKeepVisible(e?: MouseEvent) {
     this.userKeepVisible = true
+    this.clickaway(this.core.activeContainer.$el[0])
   }
 
-  private resetUserKeepVisible = () => {
-    trace(`${T} resetUserKeepVisible`, {
-      userKeepVisible: this.userKeepVisible,
-    })
+  private resetUserKeepVisible = (e?: MouseEvent) => {
     this.userKeepVisible = false
   }
 
@@ -1064,11 +1054,6 @@ export class MediaControl extends UICorePlugin {
   }
 
   private show(event?: MouseEvent) {
-    trace(`${T} show`, {
-      disabled: this.disabled,
-      disableControlPanel: this.options.disableControlPanel,
-      event,
-    })
     if (this.disabled || this.options.disableControlPanel) {
       return
     }
@@ -1103,17 +1088,6 @@ export class MediaControl extends UICorePlugin {
   }
 
   private hide(delay = 0) {
-    trace(`${T} hide`, {
-      delay,
-      visible: this.isVisible(),
-      disabled: this.disabled,
-      hideMediaControl: this.options.hideMediaControl,
-      userKeepVisible: this.userKeepVisible,
-      keepVisible: this.keepVisible,
-      draggingSeekBar: this.draggingSeekBar,
-      draggingVolumeBar: this.draggingVolumeBar,
-    })
-
     if (!this.isVisible()) {
       return
     }
@@ -1650,14 +1624,17 @@ export class MediaControl extends UICorePlugin {
     }
   }
 
-  private delayHide(e: unknown) {
-    trace(`${T} delayHide`, {
-      e,
-    })
+  private delayHide() {
     this.hide(this.options.hideMediaControlDelay || DEFAULT_HIDE_DELAY)
   }
 
-  private clickaway = clickaway(this.resetUserKeepVisible)
+  // 2 seconds delay is needed since on mobile devices mouse(touch)move events are not dispatched immediately
+  // as opposed to the click event
+  private clickaway = clickaway(() => {
+    if (Browser.isMobile) {
+      setTimeout(this.resetUserKeepVisible, 0)
+    }
+  })
 }
 
 MediaControl.extend = function (properties) {
@@ -1721,13 +1698,9 @@ function clickaway(callback: () => void) {
       return
     }
     handler = (event: MouseEvent | TouchEvent) => {
-      trace(`${T} clickaway`, {
-        node,
-        event,
-      })
       if (!node.contains(event.target as Node)) {
-        callback()
         window.removeEventListener('click', handler)
+        callback()
       }
     }
     window.addEventListener('click', handler)

package/src/plugins/subtitles/ClosedCaptions.ts

@@ -124,11 +124,10 @@ export class ClosedCaptions extends UICorePlugin {
     }
   }
 
-  private get preselectedLanguage(): string {
+  private get preselectedLanguage(): string | undefined {
     return (
       this.core.options.cc?.language ??
-      this.core.options.subtitles?.language ??
-      ''
+      this.core.options.subtitles?.language
     )
   }
 
@@ -218,14 +217,17 @@ export class ClosedCaptions extends UICorePlugin {
     this.mount()
   }
 
-  private onSubtitleChanged({ id }: { id: number }) {
-    trace(`${T} onSubtitleChanged`, { id })
+  private onSubtitleChanged({ id: _ }: { id: number }) {
+    // ignoring the subtitle selected by the playback engine or user agent
+    const id = this.track?.id ?? -1
     if (id === -1) {
       this.clearSubtitleText()
     }
     for (const track of this.tracks) {
+      // Native subtitles are always hidden
+      track.track.mode = 'hidden'
       if (track.id === id) {
-        track.track.mode = 'showing'
+        // track.track.mode = 'showing'
 
         this.setSubtitleText(this.getSubtitleText(track.track))
 
@@ -244,7 +246,7 @@ export class ClosedCaptions extends UICorePlugin {
         }
       } else {
         track.track.oncuechange = null
-        track.track.mode = 'hidden'
+        // track.track.mode = 'hidden'
       }
     }
   }
@@ -408,16 +410,15 @@ export class ClosedCaptions extends UICorePlugin {
   private applyPreselectedSubtitles() {
     if (!this.isPreselectedApplied) {
       this.isPreselectedApplied = true
-      if (!this.preselectedLanguage) {
-        return
-      }
+      // if the language is undefined, then let the engine decide
+      // to hide the subtitles forcefully, set the language to 'none'
       setTimeout(() => {
         this.selectItem(
           this.tracks.find(
             (t) => t.track.language === this.preselectedLanguage,
           ) ?? null,
         )
-      }, 300) // TODO why delay?
+      }, 0)
     }
   }
 
@@ -452,7 +453,9 @@ export class ClosedCaptions extends UICorePlugin {
   private selectSubtitles() {
     const trackId = this.track ? this.track.id : -1
 
-    this.core.activePlayback.closedCaptionsTrackId = trackId // TODO test
+    // TODO find out if this is needed
+    // this.core.activePlayback.closedCaptionsTrackId = trackId
+    this.core.activePlayback.closedCaptionsTrackId = -1
   }
 
   private getSubtitleText(track: TextTrack) {

package/src/plugins/subtitles/__tests__/ClosedCaptions.test.ts

@@ -132,6 +132,7 @@ describe('ClosedCaptions', () => {
     describe('when subtitle is changed', () => {
       beforeEach(async () => {
         emitSubtitleAvailable(core)
+        cc.$el.find('#gplayer-cc-button').click()
         await new Promise((resolve) => setTimeout(resolve, 100))
         core.activePlayback.getCurrentTime = vi.fn().mockReturnValue(7)
         core.activeContainer.getCurrentTime = vi.fn().mockReturnValue(7)
@@ -167,11 +168,16 @@ describe('ClosedCaptions', () => {
               ),
           },
         ]
+        cc.$el.find('#gplayer-cc-menu li:nth-child(2) a').click()
+        await new Promise((resolve) => setTimeout(resolve, 100))
+        // TODO test explicitly that PLAYBACK_SUBTITLE_CHANGED event does not cause track switch
         core.activePlayback.emit(Events.PLAYBACK_SUBTITLE_CHANGED, { id: 2 })
+        await new Promise((resolve) => setTimeout(resolve, 100))
+
       })
       it('should activate subtitle track', () => {
         expect(core.activePlayback.closedCaptionsTracks[1].track.mode).toBe(
-          'showing',
+          'hidden',
         )
         expect(core.activePlayback.closedCaptionsTracks[0].track.mode).toBe(
           'hidden',
@@ -188,8 +194,8 @@ describe('ClosedCaptions', () => {
         emitSubtitleAvailable(core)
         cc.$el.find('#gplayer-cc-menu li:nth-child(2) a').click()
       })
-      it('should activate subtitle track', () => {
-        expect(core.activePlayback.closedCaptionsTrackId).toEqual(2)
+      it('should deactivate native subtitles track', () => {
+        expect(core.activePlayback.closedCaptionsTrackId).toEqual(-1)
       })
       it('should highlight selected menu item', () => {
         expect(