Add selected tagName check for itemClicked

2 files changed, 20 insertions, 15 deletions

diff --git a/app/assets/javascripts/filtered_search/dropdown_hint.js.es6 b/app/assets/javascripts/filtered_search/dropdown_hint.js.es6
index b9f552b62b9..bdcece61984 100644
--- a/app/assets/javascripts/filtered_search/dropdown_hint.js.es6
+++ b/app/assets/javascripts/filtered_search/dropdown_hint.js.es6
@@ -35,18 +35,20 @@
     itemClicked(e) {
       const { selected } = e.detail;
 
-      if (selected.hasAttribute('data-value')) {
+      if (selected.tagName === 'LI') {
+        if (selected.hasAttribute('data-value')) {
         this.dismissDropdown();
-      } else {
-        const token = selected.querySelector('.js-filter-hint').innerText.trim();
-        const tag = selected.querySelector('.js-filter-tag').innerText.trim();
+        } else {
+          const token = selected.querySelector('.js-filter-hint').innerText.trim();
+          const tag = selected.querySelector('.js-filter-tag').innerText.trim();
 
-        if (tag.length) {
-          gl.FilteredSearchDropdownManager
-            .addWordToInput(this.getSelectedTextWithoutEscaping(token));
+          if (tag.length) {
+            gl.FilteredSearchDropdownManager
+              .addWordToInput(this.getSelectedTextWithoutEscaping(token));
+          }
+          this.dismissDropdown();
+          this.dispatchInputEvent();
         }
-        this.dismissDropdown();
-        this.dispatchInputEvent();
       }
     }
 
diff --git a/app/assets/javascripts/filtered_search/filtered_search_dropdown.js.es6 b/app/assets/javascripts/filtered_search/filtered_search_dropdown.js.es6
index 6c66a3b0613..68014e27462 100644
--- a/app/assets/javascripts/filtered_search/filtered_search_dropdown.js.es6
+++ b/app/assets/javascripts/filtered_search/filtered_search_dropdown.js.es6
@@ -28,14 +28,17 @@
 
     itemClicked(e, getValueFunction) {
       const { selected } = e.detail;
-      const dataValueSet = gl.DropdownUtils.setDataValueIfSelected(selected);
 
-      if (!dataValueSet) {
-        const value = getValueFunction(selected);
-        gl.FilteredSearchDropdownManager.addWordToInput(value);
-      }
+      if (selected.tagName === 'LI') {
+        const dataValueSet = gl.DropdownUtils.setDataValueIfSelected(selected);
+
+        if (!dataValueSet) {
+          const value = getValueFunction(selected);
+          gl.FilteredSearchDropdownManager.addWordToInput(value);
+        }
 
-      this.dismissDropdown();
+        this.dismissDropdown();
+      }
     }
 
     setAsDropdown() {