Account for the first option (or any/all options) potentially being disabled

cee-chen · cee-chen · commit 9566eed3ffa4 · 2021-08-25T16:06:22.000-07:00
diff --git a/src/components/form/super_select/super_select.tsx b/src/components/form/super_select/super_select.tsx
@@ -137,7 +137,10 @@ export class EuiSuperSelect<T extends string> extends Component<
             focusSelected();
           }
         } else {
-          this.focusItemAt(0);
+          const firstFocusableOption = this.props.options.findIndex(
+            ({ disabled }) => disabled !== true
+          );
+          this.focusItemAt(firstFocusableOption);
         }
       });
     };

Original file line number	Diff line number	Diff line change
`@@ -137,7 +137,10 @@ export class EuiSuperSelect<T extends string> extends Component<`
`137`	`137`	`focusSelected();`
`138`	`138`	`}`
`139`	`139`	`} else {`
`140`		`- this.focusItemAt(0);`
	`140`	`+ const firstFocusableOption = this.props.options.findIndex(`
	`141`	`+ ({ disabled }) => disabled !== true`
	`142`	`+ );`
	`143`	`+ this.focusItemAt(firstFocusableOption);`
`141`	`144`	`}`
`142`	`145`	`});`
`143`	`146`	`};`