Fix usage of Player event map

felix-hoc · felix-hoc · commit 4de7e18cce52 · 2025-12-09T09:20:35.000+01:00
diff --git a/src/ts/UIManager.ts b/src/ts/UIManager.ts
@@ -911,7 +911,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;
@@ -973,7 +973,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]) {
@@ -986,7 +986,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]) {
diff --git a/src/ts/utils/MobileV3PlayerAPI.ts b/src/ts/utils/MobileV3PlayerAPI.ts
@@ -1,5 +1,6 @@
 import { PlayerAPI, PlayerEvent, PlayerEventBase, PlayerEventCallback } from 'bitmovin-player';
 import { WrappedPlayer } from '../UIManager';
+import type { PlayerEventMap } from 'bitmovin-player/types/core/Events';
 
 export enum MobileV3PlayerEvent {
   SourceError = 'sourceerror',
@@ -20,7 +21,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 };
 }
 
