Merge branch 'support/v3.x' into feature/improve-timeline-markers-in-live

stonko1994 · stonko1994 · commit b5136f9414b8 · 2025-12-11T16:44:04.000+01:00
# Conflicts:
#	CHANGELOG.md
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,9 +10,14 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 - `SeekBarConfig.markerUpdateIntervalMs` to customize the update interval of the TimeLine markers in a live stream
 
 ### Fixed
-- Incorrect syntax of CSS `URL` functions, leading to problems with URLs containing special characters like `(` or `)`
 - `TimelineMarker`s no longer move unexpected during time-shifting in a live stream
 
+## [3.104.0] - 2025-12-09
+
+### Fixed
+- Incorrect sytnax of CSS `URL` functions, leading to problems with URLs containing special characters like `(` or `)`
+- Type incompatibility warnings with Player version 8.235.0 and higher
+
 ## [3.103.1] - 2025-10-07
 
 ### Changed
@@ -1191,6 +1196,7 @@ Version 2.0 of the UI framework is built for player 7.1. If absolutely necessary
 ## 1.0.0 (2017-02-03)
 - First release
 
+[3.104.0]: https://github.com/bitmovin/bitmovin-player-ui/compare/v3.103.1...v3.104.0
 [3.103.1]: https://github.com/bitmovin/bitmovin-player-ui/compare/v3.102.0...v3.103.1
 [3.102.0]: https://github.com/bitmovin/bitmovin-player-ui/compare/v3.101.0...v3.102.0
 [3.101.0]: https://github.com/bitmovin/bitmovin-player-ui/compare/v3.100.0...v3.101.0
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "bitmovin-player-ui",
-  "version": "3.103.1",
+  "version": "3.104.0",
   "description": "Bitmovin Player UI Framework",
   "main": "./dist/js/framework/main.js",
   "types": "./dist/js/framework/main.d.ts",
@@ -34,7 +34,7 @@
     "@types/jest": "^29.5.0",
     "@types/jsdom": "^21.1.0",
     "autoprefixer": "^10.4.14",
-    "bitmovin-player": "^8.129.0",
+    "bitmovin-player": "^8.237.0",
     "browser-sync": "^2.29.0",
     "browserify": "^17.0.0",
     "cssnano": "^5.1.15",
diff --git a/spec/helper/PlayerEventEmitter.ts b/spec/helper/PlayerEventEmitter.ts
@@ -30,9 +30,9 @@ export interface ViewModeAvailabilityChangedEvent extends PlayerEventBase {
 }
 
 export class PlayerEventEmitter {
-  private eventHandlers: { [eventType: string]: PlayerEventCallback[]; } = {};
+  private eventHandlers: { [eventType: string]: PlayerEventCallback<PlayerEvent>[]; } = {};
 
-  public on(eventType: PlayerEvent, callback: PlayerEventCallback) {
+  public on<T extends PlayerEvent>(eventType: T, callback: PlayerEventCallback<T>) {
     if (!this.eventHandlers[eventType]) {
       this.eventHandlers[eventType] = [];
     }
@@ -42,7 +42,7 @@ export class PlayerEventEmitter {
 
   public fireEvent<E extends PlayerEventBase>(event: E) {
     if (this.eventHandlers[event.type]) {
-      this.eventHandlers[event.type].forEach((callback: PlayerEventCallback) => callback(event));
+      this.eventHandlers[event.type].forEach(callback => callback(event));
     }
   }
 
@@ -75,6 +75,8 @@ export class PlayerEventEmitter {
       size: 1,
       duration: 1,
       isInit: false,
+      url: 'https://bitmovin.com/seg.m4s',
+      timeToFirstByte: 0.5,
     });
   }
 
diff --git a/src/ts/mobilev3playerapi.ts b/src/ts/mobilev3playerapi.ts
@@ -20,7 +20,8 @@ export interface MobileV3SourceErrorEvent extends PlayerEventBase {
 export type MobileV3PlayerEventType = PlayerEvent | MobileV3PlayerEvent;
 
 export interface MobileV3PlayerAPI extends PlayerAPI {
-  on(eventType: MobileV3PlayerEventType, callback: PlayerEventCallback): void;
+  on<T extends PlayerEvent>(eventType: T, callback: PlayerEventCallback<T>): void;
+  on<T extends MobileV3PlayerEvent>(eventType: T, callback: (event: PlayerEventBase) => void): void;
   exports: PlayerAPI['exports'] & { PlayerEvent: MobileV3PlayerEventType };
 }
 
diff --git a/src/ts/uimanager.ts b/src/ts/uimanager.ts
@@ -859,7 +859,7 @@ export class PlayerWrapper {
   private player: PlayerAPI;
   private wrapper: WrappedPlayer;
 
-  private eventHandlers: { [eventType: string]: PlayerEventCallback[]; } = {};
+  private eventHandlers: { [eventType: string]: PlayerEventCallback<PlayerEvent>[]; } = {};
 
   constructor(player: PlayerAPI) {
     this.player = player;
@@ -921,7 +921,7 @@ export class PlayerWrapper {
     }
 
     // Explicitly add a wrapper method for 'on' that adds added event handlers to the event list
-    wrapper.on = (eventType: PlayerEvent, callback: PlayerEventCallback) => {
+    wrapper.on = <T extends PlayerEvent>(eventType: T, callback: PlayerEventCallback<T>) => {
       player.on(eventType, callback);
 
       if (!this.eventHandlers[eventType]) {
@@ -934,7 +934,7 @@ export class PlayerWrapper {
     };
 
     // Explicitly add a wrapper method for 'off' that removes removed event handlers from the event list
-    wrapper.off = (eventType: PlayerEvent, callback: PlayerEventCallback) => {
+    wrapper.off = <T extends PlayerEvent>(eventType: T, callback: PlayerEventCallback<T>) => {
       player.off(eventType, callback);
 
       if (this.eventHandlers[eventType]) {

Original file line number	Diff line number	Diff line change
`@@ -30,9 +30,9 @@ export interface ViewModeAvailabilityChangedEvent extends PlayerEventBase {`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`export class PlayerEventEmitter {`
`33`		`- private eventHandlers: { [eventType: string]: PlayerEventCallback[]; } = {};`
	`33`	`+ private eventHandlers: { [eventType: string]: PlayerEventCallback<PlayerEvent>[]; } = {};`
`34`	`34`
`35`		`- public on(eventType: PlayerEvent, callback: PlayerEventCallback) {`
	`35`	`+ public on<T extends PlayerEvent>(eventType: T, callback: PlayerEventCallback<T>) {`
`36`	`36`	`if (!this.eventHandlers[eventType]) {`
`37`	`37`	`this.eventHandlers[eventType] = [];`
`38`	`38`	`}`
`@@ -42,7 +42,7 @@ export class PlayerEventEmitter {`
`42`	`42`
`43`	`43`	`public fireEvent<E extends PlayerEventBase>(event: E) {`
`44`	`44`	`if (this.eventHandlers[event.type]) {`
`45`		`- this.eventHandlers[event.type].forEach((callback: PlayerEventCallback) => callback(event));`
	`45`	`+ this.eventHandlers[event.type].forEach(callback => callback(event));`
`46`	`46`	`}`
`47`	`47`	`}`
`48`	`48`
`@@ -75,6 +75,8 @@ export class PlayerEventEmitter {`
`75`	`75`	`size: 1,`
`76`	`76`	`duration: 1,`
`77`	`77`	`isInit: false,`
	`78`	`+ url: 'https://bitmovin.com/seg.m4s',`
	`79`	`+ timeToFirstByte: 0.5,`
`78`	`80`	`});`
`79`	`81`	`}`
`80`	`82`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,8 @@ export interface MobileV3SourceErrorEvent extends PlayerEventBase {`
`20`	`20`	`export type MobileV3PlayerEventType = PlayerEvent \| MobileV3PlayerEvent;`
`21`	`21`
`22`	`22`	`export interface MobileV3PlayerAPI extends PlayerAPI {`
`23`		`- on(eventType: MobileV3PlayerEventType, callback: PlayerEventCallback): void;`
	`23`	`+ on<T extends PlayerEvent>(eventType: T, callback: PlayerEventCallback<T>): void;`
	`24`	`+ on<T extends MobileV3PlayerEvent>(eventType: T, callback: (event: PlayerEventBase) => void): void;`
`24`	`25`	`exports: PlayerAPI['exports'] & { PlayerEvent: MobileV3PlayerEventType };`
`25`	`26`	`}`
`26`	`27`