Skip to content

Commit 5182324

Browse files
lindapaistetespin
authored andcommitted
Add aria attributes to menus.
1 parent 88b97b2 commit 5182324

File tree

5 files changed

+11
-6
lines changed

5 files changed

+11
-6
lines changed

client/components/Dropdown/DropdownMenu.jsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ const DropdownMenu = forwardRef(
3838
};
3939

4040
return (
41-
<div ref={anchorRef} className={className}>
41+
<div ref={anchorRef} className={className} aria-haspopup="menu">
4242
<button
4343
className={classes.button}
4444
aria-label={ariaLabel}
@@ -51,6 +51,7 @@ const DropdownMenu = forwardRef(
5151
</button>
5252
{isOpen && (
5353
<DropdownWrapper
54+
role="menu"
5455
className={classes.list}
5556
align={align}
5657
onMouseUp={() => {

client/components/Dropdown/MenuItem.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ function MenuItem({ hideIf, ...rest }) {
1010
}
1111

1212
return (
13-
<li>
13+
<li role="menuitem">
1414
<ButtonOrLink {...rest} />
1515
</li>
1616
);

client/components/Nav/NavBar.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ function NavBar({ children, className }) {
6969
return (
7070
<NavBarContext.Provider value={contextValue}>
7171
<header>
72-
<nav className={className} ref={nodeRef}>
72+
<nav className={className} ref={nodeRef} role="menubar">
7373
<MenuOpenContext.Provider value={dropdownOpen}>
7474
{children}
7575
</MenuOpenContext.Provider>

client/components/Nav/NavDropdownMenu.jsx

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,11 @@ function NavDropdownMenu({ id, title, children }) {
2323
const { isOpen, handlers } = useMenuProps(id);
2424

2525
return (
26-
<li className={classNames('nav__item', isOpen && 'nav__item--open')}>
26+
<li
27+
role="menuitem"
28+
className={classNames('nav__item', isOpen && 'nav__item--open')}
29+
aria-haspopup="menu"
30+
>
2731
<button {...handlers}>
2832
<span className="nav__item-header">{title}</span>
2933
<TriangleIcon
@@ -32,7 +36,7 @@ function NavDropdownMenu({ id, title, children }) {
3236
aria-hidden="true"
3337
/>
3438
</button>
35-
<ul className="nav__dropdown">
39+
<ul className="nav__dropdown" role="menu">
3640
<ParentMenuContext.Provider value={id}>
3741
{children}
3842
</ParentMenuContext.Provider>

client/components/Nav/NavMenuItem.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ function NavMenuItem({ hideIf, className, ...rest }) {
1818
}
1919

2020
return (
21-
<li className={className}>
21+
<li className={className} role="menuitem">
2222
<ButtonOrLink {...rest} {...handlers} />
2323
</li>
2424
);

0 commit comments

Comments
 (0)