Fix focus on single selection (#1965)

* Fix focus on single selection * Fix focus on single selection; now it just closes the list so that you can type another query and select smth else again. * update CHANGELOG * Return focus to searchInput * Updated CHANGELOG.md
elastic · May 30, 2019 · ab169aa · ab169aa
1 parent 59cb02a
commit ab169aa
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,7 @@
 **Bug fixes**
 
 - Fixed environment setup for running `test-unit` script on Windows ([#1971](https://github.com/elastic/eui/pull/1971))
+- Fixed focus on single selection of EuiComboBox ([#1965](https://github.com/elastic/eui/pull/1965))
 
 ## [`11.2.1`](https://github.com/elastic/eui/tree/v11.2.1)
 

diff --git a/src/components/combo_box/combo_box.js b/src/components/combo_box/combo_box.js
@@ -430,17 +430,15 @@ export class EuiComboBox extends Component {
     );
 
     this.clearSearchValue();
-
-    if (singleSelection) {
-      this.closeList();
-      this.searchInput.blur();
-      return;
-    }
-
     this.clearActiveOption();
+
     if (!isContainerBlur) {
       this.searchInput.focus();
     }
+
+    if (singleSelection) {
+      this.closeList();
+    }
   };
 
   onRemoveOption = removedOption => {