Improve ContextMenuEvent to extend MapBrowserEvent

jonataswalker · Oct 18, 2022 · 8d7d1ff · 8d7d1ff
1 parent c602f66
commit 8d7d1ff
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 18 deletions.
diff --git a/src/main.ts b/src/main.ts
@@ -268,8 +268,8 @@ export default class ContextMenu extends Control {
         this.dispatchEvent(
             new ContextMenuEvent({
                 type: CustomEventTypes.BEFOREOPEN,
-                pixel: this.pixel,
-                coordinate: this.coordinate,
+                map: this.map,
+                originalEvent: evt
             })
         );
 
@@ -281,7 +281,7 @@ export default class ContextMenu extends Control {
         }
 
         setTimeout(() => { 
-            this.openMenu(); 
+            this.openMenu(evt); 
         });
 
         evt.target?.addEventListener(
@@ -296,7 +296,7 @@ export default class ContextMenu extends Control {
         );
     }
 
-    protected openMenu() {
+    protected openMenu(evt: MouseEvent) {
         if (this.menuEntries.size === 0) return;
 
         this.opened = true;
@@ -306,8 +306,8 @@ export default class ContextMenu extends Control {
         this.dispatchEvent(
             new ContextMenuEvent({
                 type: CustomEventTypes.OPEN,
-                pixel: this.pixel,
-                coordinate: this.coordinate,
+                map: this.map,
+                originalEvent: evt
             })
         );
     }

diff --git a/src/types.ts b/src/types.ts
@@ -1,7 +1,5 @@
 import type { Coordinate } from 'ol/coordinate';
-import type { Pixel } from 'ol/pixel';
-import { Map as OlMap } from 'ol';
-import BaseEvent from 'ol/events/Event.js';
+import { Map as OlMap, MapBrowserEvent } from 'ol';
 
 export enum EventTypes {
     CONTEXTMENU = 'contextmenu',
@@ -16,18 +14,13 @@ export enum CustomEventTypes {
     ADD_MENU_ENTRY = 'add-menu-entry',
 }
 
-export class ContextMenuEvent extends BaseEvent {
-    public coordinate: Coordinate;
-    public pixel: Pixel;
-
+export class ContextMenuEvent extends MapBrowserEvent<MouseEvent> {
     constructor(options: {
         type: `${CustomEventTypes.BEFOREOPEN}` | `${CustomEventTypes.OPEN}`;
-        coordinate: Coordinate;
-        pixel: Pixel;
+        map: OlMap;
+        originalEvent: MouseEvent;
     }) {
-        super(options.type);
-        this.pixel = options.pixel;
-        this.coordinate = options.coordinate;
+        super(options.type, options.map, options.originalEvent);
     }
 }