Merge pull request #6907 from harishsurf/accessibility_dropdown

Bug 1874968: Pressing escape key doesn't exit the dropdown list
openshift · Dec 4, 2020 · 3493431 · 3493431
2 parents 12f6d06 + cb887e5
commit 3493431
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/frontend/public/components/utils/dropdown.jsx b/frontend/public/components/utils/dropdown.jsx
@@ -235,7 +235,13 @@ export class Dropdown extends DropdownMixin {
     this.onKeyDown = (e) => this.onKeyDown_(e);
     this.changeTextFilter = (e) => this.applyTextFilter_(e.target.value, this.props.items);
     const { shortCut } = this.props;
+
     this.globalKeyDown = (e) => {
+      if (e.key === 'Escape' && this.state.active) {
+        this.hide(e);
+        return;
+      }
+
       const { nodeName } = e.target;
 
       if (nodeName === 'INPUT' || nodeName === 'TEXTAREA') {
@@ -302,10 +308,6 @@ export class Dropdown extends DropdownMixin {
 
   onKeyDown_(e) {
     const { key } = e;
-    if (key === 'Escape') {
-      this.hide(e);
-      return;
-    }
 
     if (key !== 'ArrowDown' && key !== 'ArrowUp' && key !== 'Enter') {
       return;