InfoWindow close button Prevent event bubbling (#2367)

maptalks · Jul 3, 2024 · 670c0f6 · 670c0f6
1 parent 7a3aaf3
commit 670c0f6
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/src/ui/InfoWindow.ts b/src/ui/InfoWindow.ts
@@ -1,5 +1,5 @@
 import { isFunction, isNumber, isObject, isString } from '../core/util';
-import { createEl, addDomEvent, removeDomEvent } from '../core/util/dom';
+import { createEl, addDomEvent, removeDomEvent, stopPropagation, preventDefault } from '../core/util/dom';
 import Coordinate from '../geo/Coordinate';
 import Point from '../geo/Point';
 import Size from '../geo/Size';
@@ -49,7 +49,7 @@ const EMPTY_SIZE = new Size(0, 0);
 class InfoWindow extends UIComponent {
 
     options: InfoWindowOptionsType;
-    _onCloseBtnClick: () => void;
+    _onCloseBtnClick: (event: MouseEvent | TouchEvent) => void;
 
     // TODO: obtain class in super
     _getClassName() {
@@ -198,7 +198,13 @@ class InfoWindow extends UIComponent {
         } else {
             msgContent.appendChild(this.options['content'] as HTMLElement);
         }
-        this._onCloseBtnClick = this.hide.bind(this);
+        this._onCloseBtnClick = (event) => {
+            if (!this.options.eventsPropagation) {
+                preventDefault(event);
+                stopPropagation(event);
+            }
+            this.hide();
+        }
         const closeBtn = dom.querySelector('.maptalks-close');
         addDomEvent(closeBtn as HTMLElement, 'click touchend', this._onCloseBtnClick);
         //reslove content