Restore bounded listeners

software-mansion · Jan 15, 2024 · 471002e · 471002e
1 parent 8279c90
commit 471002e
Showing 1 changed file with 15 additions and 4 deletions.
diff --git a/src/web/tools/GestureHandlerWebDelegate.ts b/src/web/tools/GestureHandlerWebDelegate.ts
@@ -18,6 +18,14 @@ export class GestureHandlerWebDelegate
   private gestureHandler!: GestureHandler;
   private eventManagers: EventManager<unknown>[] = [];
 
+  private boundDisableContextMenu: (e: MouseEvent) => void;
+  private boundEnableContextMenu: (e: MouseEvent) => void;
+
+  constructor() {
+    this.boundDisableContextMenu = this.disableContextMenu.bind(this);
+    this.boundEnableContextMenu = this.enableContextMenu.bind(this);
+  }
+
   getView(): HTMLElement {
     return this.view;
   }
@@ -99,17 +107,20 @@ export class GestureHandlerWebDelegate
 
   private addContextMenuListeners(config: Config): void {
     if (this.shouldDisableContextMenu(config)) {
-      this.view.addEventListener('contextmenu', this.disableContextMenu);
+      this.view.addEventListener('contextmenu', this.boundDisableContextMenu);
     } else if (config.enableContextMenu) {
-      this.view.addEventListener('contextmenu', this.enableContextMenu);
+      this.view.addEventListener('contextmenu', this.boundEnableContextMenu);
     }
   }
 
   private removeContextMenuListeners(config: Config): void {
     if (this.shouldDisableContextMenu(config)) {
-      this.view.removeEventListener('contextmenu', this.disableContextMenu);
+      this.view.removeEventListener(
+        'contextmenu',
+        this.boundDisableContextMenu
+      );
     } else if (config.enableContextMenu) {
-      this.view.removeEventListener('contextmenu', this.enableContextMenu);
+      this.view.removeEventListener('contextmenu', this.boundEnableContextMenu);
     }
   }