fixing regressions

elastic · Apr 7, 2020 · 386b61e · 386b61e
1 parent 2b17ec2
commit 386b61e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/src/components/combo_box/__snapshots__/combo_box.test.tsx.snap b/src/components/combo_box/__snapshots__/combo_box.test.tsx.snap
@@ -322,6 +322,7 @@ exports[`props options list is rendered 1`] = `
           id="htmlid_listbox"
           role="listBox"
           style="height: 270px; width: 100%;"
+          tabindex="0"
         >
           <button
             aria-selected="false"

diff --git a/src/components/combo_box/combo_box.tsx b/src/components/combo_box/combo_box.tsx
@@ -534,6 +534,7 @@ export class EuiComboBox<T> extends Component<
       relatedTarget &&
       this.comboBoxRefInstance &&
       this.comboBoxRefInstance.contains(relatedTarget);
+    console.log({ focusEvent, focusedInOptionsList, focusedInInput });
     if (!focusedInOptionsList && !focusedInInput) {
       this.closeList();
 
@@ -652,6 +653,10 @@ export class EuiComboBox<T> extends Component<
 
     if (singleSelection) {
       requestAnimationFrame(this.closeList);
+    } else {
+      this.setState({
+        activeOptionIndex: this.state.matchingOptions.indexOf(addedOption),
+      });
     }
   };
 

diff --git a/src/components/combo_box/combo_box_options_list/combo_box_options_list.tsx b/src/components/combo_box/combo_box_options_list/combo_box_options_list.tsx
@@ -167,10 +167,6 @@ export class EuiComboBoxOptionsList<T> extends Component<
 
   setListRef = (ref: FixedSizeList | null) => {
     this.listRef = ref;
-
-    if (ref && this.props.activeOptionIndex) {
-      ref.scrollToItem(this.props.activeOptionIndex, 'auto');
-    }
   };
 
   setListBoxRef = (ref: HTMLUListElement | null) => {
@@ -179,6 +175,7 @@ export class EuiComboBoxOptionsList<T> extends Component<
     if (ref) {
       ref.setAttribute('id', this.props.rootId('listbox'));
       ref.setAttribute('role', 'listBox');
+      ref.setAttribute('tabIndex', '0');
     }
   };