Added conditions to focus on selected option other than clicking on the input

wenchonglee · wenchonglee · commit 6b993adfa9cf · 2020-09-30T00:36:06.000+08:00
diff --git a/src/components/combo_box/combo_box.tsx b/src/components/combo_box/combo_box.tsx
@@ -365,6 +365,21 @@ export class EuiComboBox<T> extends Component<
     });
   };
 
+  focusSelectedOption = () => {
+    // If singleSelection is on and an option has been selected, set that option as active
+    if (
+      Boolean(this.props.singleSelection) &&
+      this.props.selectedOptions.length === 1
+    ) {
+      const selectedOptionIndex = this.state.matchingOptions.findIndex(
+        option => option.label === this.props.selectedOptions[0].label
+      );
+      this.setState({
+        activeOptionIndex: selectedOptionIndex,
+      });
+    }
+  };
+
   incrementActiveOptionIndex = (amount: number) => {
     // If there are no options available, do nothing.
     if (!this.state.matchingOptions.length) {
@@ -530,6 +545,7 @@ export class EuiComboBox<T> extends Component<
     }
 
     this.openList();
+    this.focusSelectedOption();
 
     this.setState({ hasFocus: true });
   };
@@ -595,6 +611,7 @@ export class EuiComboBox<T> extends Component<
           this.incrementActiveOptionIndex(-1);
         } else {
           this.openList();
+          this.focusSelectedOption();
         }
         break;
 
@@ -605,6 +622,7 @@ export class EuiComboBox<T> extends Component<
           this.incrementActiveOptionIndex(1);
         } else {
           this.openList();
+          this.focusSelectedOption();
         }
         break;
 
@@ -726,17 +744,7 @@ export class EuiComboBox<T> extends Component<
     }
 
     // If the user does this from a state in which an option has focus, then we need to reset it or clear it.
-    if (
-      Boolean(this.props.singleSelection) &&
-      this.props.selectedOptions.length === 1
-    ) {
-      const selectedOptionIndex = this.state.matchingOptions.findIndex(
-        option => option.label === this.props.selectedOptions[0].label
-      );
-      this.setState({
-        activeOptionIndex: selectedOptionIndex,
-      });
-    } else {
+    if (!Boolean(this.props.singleSelection)) {
       this.clearActiveOption();
     }
   };
