Skip to content
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

[WIP] Add aria attributes to menus #2968

Closed
wants to merge 1 commit into from
Closed

[WIP] Add aria attributes to menus #2968

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion client/components/Dropdown/DropdownMenu.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ const DropdownMenu = forwardRef(
};

return (
<div ref={anchorRef} className={className}>
<div ref={anchorRef} className={className} aria-haspopup="menu">
<button
className={classes.button}
aria-label={ariaLabel}
Expand All @@ -51,6 +51,7 @@ const DropdownMenu = forwardRef(
</button>
{isOpen && (
<DropdownWrapper
role="menu"
className={classes.list}
align={align}
onMouseUp={() => {
Expand Down
2 changes: 1 addition & 1 deletion client/components/Dropdown/MenuItem.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ function MenuItem({ hideIf, ...rest }) {
}

return (
<li>
<li role="menuitem">
<ButtonOrLink {...rest} />
</li>
);
Expand Down
2 changes: 1 addition & 1 deletion client/components/Nav/NavBar.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ function NavBar({ children, className }) {
return (
<NavBarContext.Provider value={contextValue}>
<header>
<nav className={className} ref={nodeRef}>
<nav className={className} ref={nodeRef} role="menubar">
<MenuOpenContext.Provider value={dropdownOpen}>
{children}
</MenuOpenContext.Provider>
Expand Down
8 changes: 6 additions & 2 deletions client/components/Nav/NavDropdownMenu.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,11 @@ function NavDropdownMenu({ id, title, children }) {
const { isOpen, handlers } = useMenuProps(id);

return (
<li className={classNames('nav__item', isOpen && 'nav__item--open')}>
<li
role="menuitem"
className={classNames('nav__item', isOpen && 'nav__item--open')}
aria-haspopup="menu"
>
<button {...handlers}>
<span className="nav__item-header">{title}</span>
<TriangleIcon
Expand All @@ -32,7 +36,7 @@ function NavDropdownMenu({ id, title, children }) {
aria-hidden="true"
/>
</button>
<ul className="nav__dropdown">
<ul className="nav__dropdown" role="menu">
<ParentMenuContext.Provider value={id}>
{children}
</ParentMenuContext.Provider>
Expand Down
2 changes: 1 addition & 1 deletion client/components/Nav/NavMenuItem.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ function NavMenuItem({ hideIf, className, ...rest }) {
}

return (
<li className={className}>
<li className={className} role="menuitem">
<ButtonOrLink {...rest} {...handlers} />
</li>
);
Expand Down