Matt review

mui · Sep 10, 2019 · 015f714 · 015f714
1 parent ee1e6a0
commit 015f714
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/packages/material-ui-lab/src/SpeedDial/SpeedDial.js b/packages/material-ui-lab/src/SpeedDial/SpeedDial.js
@@ -178,12 +178,16 @@ const SpeedDial = React.forwardRef(function SpeedDial(props, ref) {
 
     if (event.key === 'Escape') {
       if (onClose) {
+        actions.current[0].focus();
         onClose(event);
       }
       return;
     }
 
-    if (getOrientation(key) === getOrientation(direction)) {
+    if (
+      getOrientation(key) === getOrientation(nextItemArrowKeyCurrent) &&
+      getOrientation(key) !== undefined
+    ) {
       event.preventDefault();
 
       const actionStep = key === nextItemArrowKeyCurrent ? 1 : -1;
@@ -201,7 +205,6 @@ const SpeedDial = React.forwardRef(function SpeedDial(props, ref) {
     if (!open) {
       focusedAction.current = 0;
       nextItemArrowKey.current = undefined;
-      // actions.current[0].focus();
     }
   }, [open]);
 
@@ -290,6 +293,7 @@ const SpeedDial = React.forwardRef(function SpeedDial(props, ref) {
       },
       delay: 30 * (open ? index : allItems.length - index),
       open,
+      id: `${id}-action-${index}`,
     });
   });
 

diff --git a/packages/material-ui-lab/src/SpeedDialAction/SpeedDialAction.js b/packages/material-ui-lab/src/SpeedDialAction/SpeedDialAction.js
@@ -82,6 +82,7 @@ const SpeedDialAction = React.forwardRef(function SpeedDialAction(props, ref) {
     delay = 0,
     FabProps,
     icon,
+    id,
     open,
     TooltipClasses,
     tooltipOpen: tooltipOpenProp = false,
@@ -113,6 +114,7 @@ const SpeedDialAction = React.forwardRef(function SpeedDialAction(props, ref) {
       tabIndex={-1}
       role="menuitem"
       style={transitionStyle}
+      aria-describedby={`${id}-label`}
       {...FabProps}
     >
       {icon}
@@ -122,6 +124,7 @@ const SpeedDialAction = React.forwardRef(function SpeedDialAction(props, ref) {
   if (tooltipOpenProp) {
     return (
       <span
+        id={id}
         ref={ref}
         className={clsx(
           classes.staticTooltip,
@@ -130,7 +133,7 @@ const SpeedDialAction = React.forwardRef(function SpeedDialAction(props, ref) {
         )}
         {...other}
       >
-        <span style={transitionStyle} className={classes.staticTooltipLabel}>
+        <span style={transitionStyle} id={`${id}-label`} className={classes.staticTooltipLabel}>
           {tooltipTitle}
         </span>
         {fab}
@@ -140,6 +143,7 @@ const SpeedDialAction = React.forwardRef(function SpeedDialAction(props, ref) {
 
   return (
     <Tooltip
+      id={id}
       ref={ref}
       title={tooltipTitle}
       placement={tooltipPlacement}
@@ -180,6 +184,10 @@ SpeedDialAction.propTypes = {
    * The Icon to display in the SpeedDial Fab.
    */
   icon: PropTypes.node,
+  /**
+   * @ignore
+   */
+  id: PropTypes.string,
   /**
    * @ignore
    */