Skip to content

fix: allow keyboard-only menu navigation #2384

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vhscom merged 2 commits into from
May 15, 2024
Merged

fix: allow keyboard-only menu navigation #2384

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b5755c6
fix: allow keyboard-only menu navigation
vhscom May 14, 2024
209ea0e
test: update snapshot of menu test again
vhscom May 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions web-ui/src/components/menu/Menu.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@
font-size: 14px;
}

.Menu-listItem,
.Menu-subListItem,
.MuiListItem-root {
color: var(--checkins-palette-primary-menuItem);
Expand Down
43 changes: 27 additions & 16 deletions web-ui/src/components/menu/Menu.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ import {
IconButton,
List,
ListItem,
ListItemButton,
ListItemText,
Modal,
Toolbar
Expand All @@ -44,6 +45,7 @@ const classes = {
menuButton: `${PREFIX}-menuButton`,
drawerPaper: `${PREFIX}-drawerPaper`,
content: `${PREFIX}-content`,
listItem: `${PREFIX}-listItem`,
listStyle: `${PREFIX}-listStyle`,
nested: `${PREFIX}-nested`,
subListItem: `${PREFIX}-subListItem`
Expand Down Expand Up @@ -238,7 +240,7 @@ function Menu({ children }) {

const createLinkJsx = (path, name, isSubLink) => {
return (
<ListItem
<ListItemButton
key={path}
component={Link}
to={path}
Expand All @@ -256,7 +258,7 @@ function Menu({ children }) {
classes={isSubLink ? { primary: classes.subListItem } : null}
primary={name}
/>
</ListItem>
</ListItemButton>
);
};

Expand Down Expand Up @@ -284,48 +286,57 @@ function Menu({ children }) {

<List component="nav" className={classes.listStyle}>
<div>
{createLinkJsx('/', 'HOME', false)}
<span className="Menu-listItem">
{createLinkJsx('/', 'HOME', false)}
</span>
{isAdmin && (
<>
<ListItem onClick={toggleAdmin} className={classes.listItem}>
<ListItemButton
onClick={toggleAdmin}
className={classes.listItem}
>
<ListItemText primary="ADMIN" />
</ListItem>
</ListItemButton>
<Collapse in={adminOpen} timeout="auto" unmountOnExit>
{createListJsx(adminLinks, true)}
{isAdmin && (
<ListItem
<ListItemButton
sx={{ pl: 4, py: 1.5 }}
className={classes.listItem}
onClick={openHoursUpload}
style={{ marginLeft: '1rem' }}
>
Upload Hours
</ListItem>
</ListItemButton>
)}
</Collapse>
</>
)}
{createLinkJsx('/checkins', 'CHECK-INS', false)}
<ListItem onClick={toggleDirectory} className={classes.listItem}>
<span className="Menu-listItem">
{createLinkJsx('/checkins', 'CHECK-INS', false)}
</span>
<ListItemButton
onClick={toggleDirectory}
className={classes.listItem}
>
<ListItemText primary="DIRECTORY" />
</ListItem>
</ListItemButton>
<Collapse in={directoryOpen} timeout="auto" unmountOnExit>
{createListJsx(directoryLinks, true)}
</Collapse>
<ListItem onClick={toggleFeedback} className={classes.listItem}>
<ListItemButton onClick={toggleFeedback} className={classes.listItem}>
<ListItemText primary="FEEDBACK" />
</ListItem>
</ListItemButton>
<Collapse in={feedbackOpen} timeout="auto" unmountOnExit>
{createListJsx(feedbackLinks, true)}
</Collapse>
{hasReportPermission && (
<React.Fragment>
<ListItem
button
<ListItemButton
onClick={toggleReports}
className={classes.listItem}
>
<ListItemText primary="REPORTS" />
</ListItem>
</ListItemButton>
<Collapse in={reportsOpen} timeout="auto" unmountOnExit>
{createListJsx(getReportLinks(), true)}
</Collapse>
Expand Down
Loading