Merge branch 'master' into babel-runtime

JedWatson · Feb 4, 2021 · a496e40 · a496e40
2 parents 3fd3b8e + d48fafa
commit a496e40
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 1 deletion.
diff --git a/.changeset/eighty-lemons-happen.md b/.changeset/eighty-lemons-happen.md
@@ -0,0 +1,5 @@
+---
+"react-select": patch
+---
+
+Fix finding focusable options for groups
diff --git a/cypress/integration/single-select.spec.js b/cypress/integration/single-select.spec.js
@@ -171,6 +171,16 @@ describe('Single Select', () => {
           .get(selector.focusedOption)
           .should('exist');
       });
+
+      it(`Should focus next option on down arrow key press after filtering: ${viewport}`, () => {
+        cy.get(selector.singleGroupedSelect)
+          .click()
+          .find('input')
+          .type('o', { force: true })
+          .type('{downarrow}', { force: true })
+          .get(selector.focusedOption)
+          .should('exist');
+      });
     });
 
     context(`Clearable in view: ${viewport}`, () => {

diff --git a/packages/react-select/src/Select.js b/packages/react-select/src/Select.js
@@ -375,7 +375,9 @@ function buildFocusableOptionsFromCategorizedOptions(
 ) {
   return categorizedOptions.reduce((optionsAccumulator, categorizedOption) => {
     if (categorizedOption.type === 'group') {
-      optionsAccumulator.push(...categorizedOption.data.options);
+      optionsAccumulator.push(
+        ...categorizedOption.options.map(option => option.data)
+      );
     } else {
       optionsAccumulator.push(categorizedOption.data);
     }