[MenuList] Fix text navigation for v4 (mui#27513)

Fixes bug introduced by mui#19967
ryancogswell · Jul 30, 2021 · 53be5a3 · 53be5a3
1 parent 77a8dae
commit 53be5a3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/packages/material-ui/src/MenuList/MenuList.js b/packages/material-ui/src/MenuList/MenuList.js
@@ -61,7 +61,7 @@ function moveFocus(
     // Prevent infinite loop.
     if (nextFocus === list.firstChild) {
       if (wrappedOnce) {
-        return;
+        return false;
       }
       wrappedOnce = true;
     }
@@ -80,9 +80,10 @@ function moveFocus(
       nextFocus = traversalFunction(list, nextFocus, disableListWrap);
     } else {
       nextFocus.focus();
-      return;
+      return true;
     }
   }
+  return false;
 }
 
 const useEnhancedEffect = typeof window === 'undefined' ? React.useEffect : React.useLayoutEffect;

diff --git a/packages/material-ui/test/integration/MenuList.test.js b/packages/material-ui/test/integration/MenuList.test.js
@@ -519,13 +519,14 @@ describe('<MenuList> integration', () => {
     it('matches rapidly typed text', () => {
       render(
         <MenuList autoFocus>
+          <MenuItem>War</MenuItem>
           <MenuItem>Worm</MenuItem>
           <MenuItem>Ordinary</MenuItem>
         </MenuList>,
       );
 
       fireEvent.keyDown(screen.getByRole('menu'), { key: 'W' });
-      fireEvent.keyDown(screen.getByText('Worm'), { key: 'o' });
+      fireEvent.keyDown(screen.getByText('War'), { key: 'o' });
 
       expect(screen.getByText('Worm')).toHaveFocus();
     });