From 97c3d06241c01c7f727cc673b9871b793ae95d87 Mon Sep 17 00:00:00 2001
From: dominik-zeglen <flesz3@o2.pl>
Date: Mon, 7 Sep 2020 17:36:55 +0200
Subject: [PATCH] Improve accessibility

---
 src/components/SideBar/MenuItem.tsx | 31 ++++++++++++++++++++---------
 1 file changed, 22 insertions(+), 9 deletions(-)

diff --git a/src/components/SideBar/MenuItem.tsx b/src/components/SideBar/MenuItem.tsx
index 7a583a7e9..761115e96 100644
--- a/src/components/SideBar/MenuItem.tsx
+++ b/src/components/SideBar/MenuItem.tsx
@@ -33,6 +33,7 @@ const useStyles = makeStyles(
     },
     label: {
       cursor: "pointer",
+      display: "block",
       fontSize: 16,
       fontWeight: "bold",
       opacity: 1,
@@ -41,16 +42,20 @@ const useStyles = makeStyles(
     paper: {
       borderRadius: 16,
       cursor: "default",
-      padding: theme.spacing(3)
+      padding: theme.spacing(3),
+      textAlign: "left"
     },
     popper: {
       marginLeft: theme.spacing(3),
       zIndex: 2
     },
     root: {
-      "&:hover": {
-        color: theme.palette.primary.main
+      "&:hover, &:focus": {
+        color: theme.palette.primary.main,
+        outline: 0
       },
+      background: "none",
+      border: "none",
       borderBottomRightRadius: 100,
       borderTopRightRadius: 100,
       color: theme.palette.text.disabled,
@@ -79,9 +84,11 @@ const useStyles = makeStyles(
           marginBottom: theme.spacing(2)
         }
       },
-      "&:hover": {
+      "&:hover, &:focus": {
         color: theme.palette.primary.main
-      }
+      },
+      background: "none",
+      border: "none"
     }
   }),
   {
@@ -97,7 +104,7 @@ const MenuItem: React.FC<MenuItemProps> = ({
 }) => {
   const classes = useStyles({});
   const [open, setOpen] = React.useState(false);
-  const anchor = React.useRef<HTMLDivElement>(null);
+  const anchor = React.useRef<HTMLButtonElement>(null);
 
   const handleClick = (event: React.MouseEvent, menuItem: IMenuItem) => {
     if (menuItem.children) {
@@ -109,7 +116,7 @@ const MenuItem: React.FC<MenuItemProps> = ({
   };
 
   return (
-    <div
+    <button
       className={classNames(classes.root, {
         [classes.rootActive]: active,
         [classes.rootExpanded]: !isMenuShrunk
@@ -119,6 +126,7 @@ const MenuItem: React.FC<MenuItemProps> = ({
     >
       {menuItem.icon && <SVG className={classes.icon} src={menuItem.icon} />}
       <Typography
+        aria-label={menuItem.ariaLabel}
         className={classNames(classes.label, {
           [classes.hideLabel]: isMenuShrunk
         })}
@@ -144,9 +152,14 @@ const MenuItem: React.FC<MenuItemProps> = ({
             <Paper elevation={6} className={classes.paper}>
               {menuItem.children.map(subMenuItem => (
                 <Typography
+                  aria-label={subMenuItem.ariaLabel}
+                  component="button"
                   className={classNames(classes.label, classes.subMenuLabel)}
                   key={subMenuItem.url}
-                  onClick={event => handleClick(event, subMenuItem)}
+                  onClick={event => {
+                    event.preventDefault();
+                    handleClick(event, subMenuItem);
+                  }}
                   data-test="submenu-item-label"
                   data-test-id={subMenuItem.testingContextId}
                   variant="body2"
@@ -158,7 +171,7 @@ const MenuItem: React.FC<MenuItemProps> = ({
           </ClickAwayListener>
         </Popper>
       )}
-    </div>
+    </button>
   );
 };