prevent search button and input from triggering click events on map

Dominique92 · Oct 3, 2019 · 062d07c · 062d07c
1 parent 09cd51a
commit 062d07c
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/src/nominatim.js b/src/nominatim.js
@@ -57,7 +57,9 @@ export class Nominatim {
 
   setListeners() {
     let timeout, lastQuery;
-    const openSearch = () => {
+    const openSearch = evt => {
+      evt.stopPropagation();
+
       hasClass(this.els.control, klasses.glass.expanded)
         ? this.collapse()
         : this.expand();
@@ -77,6 +79,9 @@ export class Nominatim {
         this.query(value);
       }
     };
+    const stopBubbling = evt => {
+      evt.stopPropagation();
+    };
     const reset = evt => {
       this.els.input.focus();
       this.els.input.value = '';
@@ -102,6 +107,7 @@ export class Nominatim {
       }
     };
     this.els.input.addEventListener('keypress', query, false);
+    this.els.input.addEventListener('click', stopBubbling, false);
     this.els.input.addEventListener('input', handleValue, false);
     this.els.reset.addEventListener('click', reset, false);
     if (this.options.targetType === TARGET_TYPE.GLASS) {
@@ -299,10 +305,8 @@ export class Nominatim {
   expand() {
     removeClass(this.els.input, klasses.spin);
     addClass(this.els.control, klasses.glass.expanded);
-    window.setTimeout(() => {
-      this.listenMapClick();
-      this.els.input.focus();
-    }, 100);
+    window.setTimeout(() => this.els.input.focus(), 100);
+    this.listenMapClick();
   }
 
   collapse() {