From f71640f04844f921613efee90b4868871f96f701 Mon Sep 17 00:00:00 2001
From: GeoSot <geo.sotis@gmail.com>
Date: Sun, 10 Oct 2021 16:47:02 +0300
Subject: [PATCH] Dropdown: Clean more

---
 js/src/dropdown.js | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/js/src/dropdown.js b/js/src/dropdown.js
index d5dfe2e20b..510fcf1a40 100644
--- a/js/src/dropdown.js
+++ b/js/src/dropdown.js
@@ -399,8 +399,7 @@ class Dropdown extends BaseComponent {
   static dataApiKeydownHandler(event) {
     // If not input/textarea:
     //  - And not a key in UP | DOWN | ESCAPE => not a dropdown command
-    // If input/textarea:
-    //  - If key is other than ESCAPE
+    // If input/textarea && If key is other than ESCAPE
     //    - If key is not UP or DOWN => not a dropdown command
     //    - If trigger inside the menu => not a dropdown command
 
@@ -412,9 +411,9 @@ class Dropdown extends BaseComponent {
       return
     }
 
-    if (isInput) {
+    if (isInput && !isEscapeEvent) {
       // eslint-disable-next-line unicorn/no-lonely-if
-      if (!isEscapeEvent && (!isUpOrDownEvent || event.target.closest(SELECTOR_MENU))) {
+      if (!isUpOrDownEvent || event.target.closest(SELECTOR_MENU)) {
         return
       }
     }