@gcorevideo/player 2.28.24 → 2.28.25

package/dist/index.embed.js

@@ -13186,6 +13186,13 @@ class DashPlayback extends BasePlayback {
             this.trigger(Events$1.PLAYBACK_AUDIO_AVAILABLE, tracks.map(toClapprTrack$1));
         }
     }
+    /**
+     * @override
+     */
+    _handleTextTrackChange() {
+        super._handleTextTrackChange();
+        this._dash?.setTextTrack(this.closedCaptionsTrackId);
+    }
 }
 DashPlayback.canPlay = function (resource, mimeType) {
     if (!isDashSource(resource, mimeType)) {
@@ -58491,6 +58498,12 @@ class ClosedCaptions extends UICorePlugin {
         return (this.core.options.cc?.language ??
             this.core.options.subtitles?.language);
     }
+    isPreselectedLanguage(language) {
+        if (!this.preselectedLanguage) {
+            return false;
+        }
+        return language.startsWith(this.preselectedLanguage);
+    }
     /**
      * @internal
      */
@@ -58550,12 +58563,15 @@ class ClosedCaptions extends UICorePlugin {
         this.applyTracks();
         this.mount();
     }
-    onSubtitleChanged({ id: _ }) {
+    onSubtitleChanged({ id: changedId }) {
         // ignoring the subtitle selected by the playback engine or user agent
         const id = this.track?.id ?? -1;
         if (id === -1) {
             this.clearSubtitleText();
         }
+        this.activateTrack(id);
+    }
+    activateTrack(id) {
         for (const track of this.tracks) {
             if (track.id === id) {
                 if (this.useNativeSubtitles) {
@@ -58702,7 +58718,10 @@ class ClosedCaptions extends UICorePlugin {
     selectItem(item) {
         this.clearSubtitleText();
         this.track = item;
+        const trackId = item?.id ?? -1;
+        this.core.activePlayback.closedCaptionsTrackId = trackId;
         this.updateSelection();
+        this.activateTrack(trackId);
     }
     onItemSelect(event) {
         // event.target does not exist for some reason in tests
@@ -58719,7 +58738,7 @@ class ClosedCaptions extends UICorePlugin {
             // 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);
+                this.selectItem(this.tracks.find((t) => this.isPreselectedLanguage(t.track.language)) ?? null);
             }, 0);
         }
     }
@@ -58821,6 +58840,9 @@ class ClosedCaptions extends UICorePlugin {
         }
     }
     get useNativeSubtitles() {
+        if (this.core.activePlayback?.name === 'dash') {
+            return true;
+        }
         const mode = this.core.options.cc?.mode ?? this.core.options.subtitles?.mode ?? 'custom';
         // TODO or Safari? or iOS?
         return mode === 'native';

package/dist/index.js

@@ -13339,6 +13339,13 @@ class DashPlayback extends BasePlayback {
             this.trigger(Events$1.PLAYBACK_AUDIO_AVAILABLE, tracks.map(toClapprTrack$1));
         }
     }
+    /**
+     * @override
+     */
+    _handleTextTrackChange() {
+        super._handleTextTrackChange();
+        this._dash?.setTextTrack(this.closedCaptionsTrackId);
+    }
 }
 DashPlayback.canPlay = function (resource, mimeType) {
     if (!isDashSource(resource, mimeType)) {
@@ -51411,7 +51418,7 @@ class Player {
     }
 }
 
-var version$1 = "2.28.24";
+var version$1 = "2.28.25";
 
 var packages = {
 	"node_modules/@clappr/core": {
@@ -59852,6 +59859,12 @@ class ClosedCaptions extends UICorePlugin {
         return (this.core.options.cc?.language ??
             this.core.options.subtitles?.language);
     }
+    isPreselectedLanguage(language) {
+        if (!this.preselectedLanguage) {
+            return false;
+        }
+        return language.startsWith(this.preselectedLanguage);
+    }
     /**
      * @internal
      */
@@ -59911,12 +59924,19 @@ class ClosedCaptions extends UICorePlugin {
         this.applyTracks();
         this.mount();
     }
-    onSubtitleChanged({ id: _ }) {
+    onSubtitleChanged({ id: changedId }) {
         // ignoring the subtitle selected by the playback engine or user agent
         const id = this.track?.id ?? -1;
+        trace(`${T$3} onSubtitleChanged`, {
+            changedId,
+            id,
+        });
         if (id === -1) {
             this.clearSubtitleText();
         }
+        this.activateTrack(id);
+    }
+    activateTrack(id) {
         for (const track of this.tracks) {
             if (track.id === id) {
                 if (this.useNativeSubtitles) {
@@ -60066,7 +60086,10 @@ class ClosedCaptions extends UICorePlugin {
     selectItem(item) {
         this.clearSubtitleText();
         this.track = item;
+        const trackId = item?.id ?? -1;
+        this.core.activePlayback.closedCaptionsTrackId = trackId;
         this.updateSelection();
+        this.activateTrack(trackId);
     }
     onItemSelect(event) {
         // event.target does not exist for some reason in tests
@@ -60083,7 +60106,7 @@ class ClosedCaptions extends UICorePlugin {
             // 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);
+                this.selectItem(this.tracks.find((t) => this.isPreselectedLanguage(t.track.language)) ?? null);
             }, 0);
         }
     }
@@ -60185,6 +60208,9 @@ class ClosedCaptions extends UICorePlugin {
         }
     }
     get useNativeSubtitles() {
+        if (this.core.activePlayback?.name === 'dash') {
+            return true;
+        }
         const mode = this.core.options.cc?.mode ?? this.core.options.subtitles?.mode ?? 'custom';
         // TODO or Safari? or iOS?
         return mode === 'native';

package/lib/playback/dash-playback/DashPlayback.d.ts

@@ -78,6 +78,10 @@ export default class DashPlayback extends BasePlayback {
     switchAudioTrack(id: string): void;
     load(srcUrl: string): void;
     private checkAudioTracks;
+    /**
+     * @override
+     */
+    _handleTextTrackChange(): void;
 }
 export {};
 //# sourceMappingURL=DashPlayback.d.ts.map

package/lib/playback/dash-playback/DashPlayback.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DashPlayback.d.ts","sourceRoot":"","sources":["../../../src/playback/dash-playback/DashPlayback.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"DashPlayback.d.ts","sourceRoot":"","sources":["../../../src/playback/dash-playback/DashPlayback.ts"],"names":[],"mappings":"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"}

package/lib/playback/dash-playback/DashPlayback.js

@@ -493,6 +493,13 @@ export default class DashPlayback extends BasePlayback {
             this.trigger(Events.PLAYBACK_AUDIO_AVAILABLE, tracks.map(toClapprTrack));
         }
     }
+    /**
+     * @override
+     */
+    _handleTextTrackChange() {
+        super._handleTextTrackChange();
+        this._dash?.setTextTrack(this.closedCaptionsTrackId);
+    }
 }
 DashPlayback.canPlay = function (resource, mimeType) {
     if (!isDashSource(resource, mimeType)) {

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

@@ -86,6 +86,7 @@ export declare class ClosedCaptions extends UICorePlugin {
         'click #gplayer-cc-button': string;
     };
     private get preselectedLanguage();
+    private isPreselectedLanguage;
     /**
      * @internal
      */
@@ -94,6 +95,7 @@ export declare class ClosedCaptions extends UICorePlugin {
     private onContainerChanged;
     private onSubtitleAvailable;
     private onSubtitleChanged;
+    private activateTrack;
     private applyTracks;
     private onContainerResize;
     /**

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;AAiB7C;;;GAGG;AACH,MAAM,MAAM,4BAA4B,GAAG;IACzC;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAA;IAEjB;;OAEG;IACH,IAAI,CAAC,EAAE,QAAQ,GAAG,QAAQ,CAAA;CAC3B,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;IAqD1B,OAAO,CAAC,mBAAmB;IAQ3B,OAAO,CAAC,iBAAiB;IAoCzB,OAAO,CAAC,WAAW;IA8BnB,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;IAOhB,OAAO,CAAC,UAAU;IAclB,OAAO,CAAC,cAAc;IAKtB,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;IAOb,OAAO,KAAK,kBAAkB,GAI7B;IAED,OAAO,CAAC,SAAS,CAA+C;CACjE"}
+{"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;AAiB7C;;;GAGG;AACH,MAAM,MAAM,4BAA4B,GAAG;IACzC;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAA;IAEjB;;OAEG;IACH,IAAI,CAAC,EAAE,QAAQ,GAAG,QAAQ,CAAA;CAC3B,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,OAAO,CAAC,qBAAqB;IAO7B;;OAEG;IACM,UAAU;IASnB,OAAO,CAAC,WAAW;IAkBnB,OAAO,CAAC,kBAAkB;IAqD1B,OAAO,CAAC,mBAAmB;IAQ3B,OAAO,CAAC,iBAAiB;IAazB,OAAO,CAAC,aAAa;IA+BrB,OAAO,CAAC,WAAW;IA8BnB,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;IAWlB,OAAO,CAAC,YAAY;IAYpB,OAAO,CAAC,yBAAyB;IAejC,OAAO,CAAC,QAAQ;IAOhB,OAAO,CAAC,UAAU;IAclB,OAAO,CAAC,cAAc;IAKtB,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;IAOb,OAAO,KAAK,kBAAkB,GAO7B;IAED,OAAO,CAAC,SAAS,CAA+C;CACjE"}

package/lib/plugins/subtitles/ClosedCaptions.js

@@ -96,6 +96,12 @@ export class ClosedCaptions extends UICorePlugin {
         return (this.core.options.cc?.language ??
             this.core.options.subtitles?.language);
     }
+    isPreselectedLanguage(language) {
+        if (!this.preselectedLanguage) {
+            return false;
+        }
+        return language.startsWith(this.preselectedLanguage);
+    }
     /**
      * @internal
      */
@@ -155,12 +161,19 @@ export class ClosedCaptions extends UICorePlugin {
         this.applyTracks();
         this.mount();
     }
-    onSubtitleChanged({ id: _ }) {
+    onSubtitleChanged({ id: changedId }) {
         // ignoring the subtitle selected by the playback engine or user agent
         const id = this.track?.id ?? -1;
+        trace(`${T} onSubtitleChanged`, {
+            changedId,
+            id,
+        });
         if (id === -1) {
             this.clearSubtitleText();
         }
+        this.activateTrack(id);
+    }
+    activateTrack(id) {
         for (const track of this.tracks) {
             if (track.id === id) {
                 if (this.useNativeSubtitles) {
@@ -310,7 +323,10 @@ export class ClosedCaptions extends UICorePlugin {
     selectItem(item) {
         this.clearSubtitleText();
         this.track = item;
+        const trackId = item?.id ?? -1;
+        this.core.activePlayback.closedCaptionsTrackId = trackId;
         this.updateSelection();
+        this.activateTrack(trackId);
     }
     onItemSelect(event) {
         // event.target does not exist for some reason in tests
@@ -327,7 +343,7 @@ export class ClosedCaptions extends UICorePlugin {
             // 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);
+                this.selectItem(this.tracks.find((t) => this.isPreselectedLanguage(t.track.language)) ?? null);
             }, 0);
         }
     }
@@ -429,6 +445,9 @@ export class ClosedCaptions extends UICorePlugin {
         }
     }
     get useNativeSubtitles() {
+        if (this.core.activePlayback?.name === 'dash') {
+            return true;
+        }
         const mode = this.core.options.cc?.mode ?? this.core.options.subtitles?.mode ?? 'custom';
         // TODO or Safari? or iOS?
         return mode === 'native';

package/package.json

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

package/src/playback/BasePlayback.ts

@@ -42,7 +42,7 @@ export class BasePlayback extends HTML5Video {
    * @param rate - The playback rate to set.
    */
   setPlaybackRate(rate: number) {
-    ;(this.el as HTMLMediaElement).playbackRate = rate
+    ; (this.el as HTMLMediaElement).playbackRate = rate
   }
 
   override _onPlaying() {

package/src/playback/dash-playback/DashPlayback.ts

@@ -684,6 +684,14 @@ export default class DashPlayback extends BasePlayback {
       this.trigger(Events.PLAYBACK_AUDIO_AVAILABLE, tracks.map(toClapprTrack))
     }
   }
+
+  /**
+   * @override
+   */
+  _handleTextTrackChange() {
+    super._handleTextTrackChange()
+    this._dash?.setTextTrack(this.closedCaptionsTrackId)
+  }
 }
 
 DashPlayback.canPlay = function (resource, mimeType) {

package/src/plugins/subtitles/ClosedCaptions.ts

@@ -137,6 +137,13 @@ export class ClosedCaptions extends UICorePlugin {
     )
   }
 
+  private isPreselectedLanguage(language: string): boolean {
+    if (!this.preselectedLanguage) {
+      return false
+    }
+    return language.startsWith(this.preselectedLanguage)
+  }
+
   /**
    * @internal
    */
@@ -228,12 +235,20 @@ export class ClosedCaptions extends UICorePlugin {
     this.mount()
   }
 
-  private onSubtitleChanged({ id: _ }: { id: number }) {
+  private onSubtitleChanged({ id: changedId }: { id: number }) {
     // ignoring the subtitle selected by the playback engine or user agent
     const id = this.track?.id ?? -1
+    trace(`${T} onSubtitleChanged`, {
+      changedId,
+      id,
+    })
     if (id === -1) {
       this.clearSubtitleText()
     }
+    this.activateTrack(id)
+  }
+
+  private activateTrack(id: number) {
     for (const track of this.tracks) {
       if (track.id === id) {
         if (this.useNativeSubtitles) {
@@ -404,8 +419,12 @@ export class ClosedCaptions extends UICorePlugin {
   private selectItem(item: TextTrackItem | null) {
     this.clearSubtitleText()
     this.track = item
+    const trackId = item?.id ?? -1
+    this.core.activePlayback.closedCaptionsTrackId = trackId
 
     this.updateSelection()
+
+    this.activateTrack(trackId)
   }
 
   private onItemSelect(event: MouseEvent) {
@@ -428,7 +447,7 @@ export class ClosedCaptions extends UICorePlugin {
       setTimeout(() => {
         this.selectItem(
           this.tracks.find(
-            (t) => t.track.language === this.preselectedLanguage,
+            (t) => this.isPreselectedLanguage(t.track.language),
           ) ?? null,
         )
       }, 0)
@@ -551,6 +570,9 @@ export class ClosedCaptions extends UICorePlugin {
   }
 
   private get useNativeSubtitles() {
+    if (this.core.activePlayback?.name === 'dash') {
+      return true
+    }
     const mode = this.core.options.cc?.mode ?? this.core.options.subtitles?.mode ?? 'custom'
     // TODO or Safari? or iOS?
     return mode === 'native'

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

@@ -235,10 +235,10 @@ describe('ClosedCaptions', () => {
       it('should deactivate subtitle track', () => {
         expect(core.activePlayback.closedCaptionsTrackId).toEqual(-1)
         expect(core.activePlayback.closedCaptionsTracks[0].track.mode).toBe(
-          'hidden',
+          'disabled',
         )
         expect(core.activePlayback.closedCaptionsTracks[1].track.mode).toBe(
-          'hidden',
+          'disabled',
         )
       })
       it('should select menu item', () => {