fix: always open popup with single click (#398)

dhis2 · Sep 13, 2021 · bd2b9ac · bd2b9ac
1 parent 491bda4
commit bd2b9ac
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/src/Map.js b/src/Map.js
@@ -341,11 +341,16 @@ export class MapGL extends Evented {
             this._popup = new Popup()
         }
 
+        // Remove previous attached onClose event before setting new content
+        this._popup.clear()
+
         this._popup
             .setLngLat(lnglat)
             .setDOMContent(content)
-            .onClose(onClose)
             .addTo(this)
+
+        // (Re)set onClose event
+        this._popup.onClose(onClose)
     }
 
     closePopup() {

diff --git a/src/ui/Popup.js b/src/ui/Popup.js
@@ -22,8 +22,18 @@ class Popup extends PopupGL {
         }
     }
 
+    // Remove onClose event if it exists
+    clear() {
+        if (this._onCloseFunc) {
+            this.off('close', this._onCloseFunc)
+            this._onCloseFunc = null
+        }
+        return this
+    }
+
     onClose(onClose) {
         if (typeof onClose === 'function') {
+            this._onCloseFunc = onClose
             this.on('close', onClose)
         }
         return this