Update dropdown.jsGeoSot-patch-2

minor refactoring

1 files changed, 9 insertions, 12 deletions

diff --git a/js/src/dropdown.js b/js/src/dropdown.js
index 65b3aa372a..dfa9a63aad 100644
--- a/js/src/dropdown.js
+++ b/js/src/dropdown.js
@@ -404,25 +404,22 @@ class Dropdown extends BaseComponent {
     }
 
     event.preventDefault()
-    if (!isEscapeEvent) {
-      event.stopPropagation()
-    }
 
     const getToggleButton = SelectorEngine.findOne(SELECTOR_DATA_TOGGLE, event.delegateTarget.parentNode)
     const instance = Dropdown.getOrCreateInstance(getToggleButton)
 
-    if (isEscapeEvent) {
-      if (getToggleButton.classList.contains(CLASS_NAME_SHOW)) {
-        instance.hide()
-        getToggleButton.focus()
-        event.stopPropagation()
-      }
-
+    if (isUpOrDownEvent) {
+      event.stopPropagation()
+      instance.show()
+      instance._selectMenuItem(event)
       return
     }
 
-    instance.show()
-    instance._selectMenuItem(event)
+    if (instance._isShown()) { // else is escape and we check if it is shown
+      event.stopPropagation()
+      instance.hide()
+      getToggleButton.focus()
+    }
   }
 }