[SpeedDial] Call focus on escape (#25509)

Co-authored-by: eps1lon <silbermann.sebastian@gmail.com>
mui · Mar 27, 2021 · 30b31b8 · 30b31b8
1 parent 47db37b
commit 30b31b8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/packages/material-ui/src/SpeedDial/SpeedDial.js b/packages/material-ui/src/SpeedDial/SpeedDial.js
@@ -233,8 +233,9 @@ const SpeedDial = React.forwardRef(function SpeedDial(inProps, ref) {
 
     if (event.key === 'Escape') {
       setOpenState(false);
+      actions.current[0].focus();
+
       if (onClose) {
-        actions.current[0].focus();
         onClose(event, 'escapeKeyDown');
       }
       return;

diff --git a/packages/material-ui/src/SpeedDial/SpeedDial.test.js b/packages/material-ui/src/SpeedDial/SpeedDial.test.js
@@ -246,13 +246,15 @@ describe('<SpeedDial />', () => {
 
       expect(queryByRole('tooltip')).to.equal(null);
       expect(fab).to.have.attribute('aria-expanded', 'false');
+      expect(fab).toHaveFocus();
 
-      fab.focus();
       act(() => {
         clock.runAll();
       });
+
       expect(queryByRole('tooltip')).to.equal(null);
-      expect(fab).to.have.attribute('aria-expanded', 'true');
+      expect(fab).to.have.attribute('aria-expanded', 'false');
+      expect(fab).toHaveFocus();
     });
   });