Skip to content

Commit b6ca02a

Browse files
committed
fix: added aria roles to file menu and menu items
1 parent 5182324 commit b6ca02a

File tree

4 files changed

+15
-14
lines changed

4 files changed

+15
-14
lines changed

client/components/Nav/NavBar.jsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,11 +69,11 @@ function NavBar({ children, className }) {
6969
return (
7070
<NavBarContext.Provider value={contextValue}>
7171
<header>
72-
<nav className={className} ref={nodeRef} role="menubar">
72+
<div className={className} ref={nodeRef} role="menubar">
7373
<MenuOpenContext.Provider value={dropdownOpen}>
7474
{children}
7575
</MenuOpenContext.Provider>
76-
</nav>
76+
</div>
7777
</header>
7878
</NavBarContext.Provider>
7979
);

client/components/Nav/NavDropdownMenu.jsx

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

2525
return (
26-
<li
27-
role="menuitem"
28-
className={classNames('nav__item', isOpen && 'nav__item--open')}
29-
aria-haspopup="menu"
30-
>
31-
<button {...handlers}>
26+
<li className={classNames('nav__item', isOpen && 'nav__item--open')}>
27+
<button
28+
{...handlers}
29+
role="menuitem"
30+
aria-haspopup="menu"
31+
aria-expanded={isOpen}
32+
>
3233
<span className="nav__item-header">{title}</span>
3334
<TriangleIcon
3435
className="nav__item-header-triangle"

client/components/Nav/NavMenuItem.jsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ function NavMenuItem({ hideIf, className, ...rest }) {
1818
}
1919

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

client/modules/IDE/components/Header/Nav.jsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -272,18 +272,18 @@ const LanguageMenu = () => {
272272
const UnauthenticatedUserMenu = () => {
273273
const { t } = useTranslation();
274274
return (
275-
<ul className="nav__items-right" title="user-menu">
275+
<ul className="nav__items-right" title="user-menu" role="navigation">
276276
{getConfig('TRANSLATIONS_ENABLED') && <LanguageMenu />}
277277
<li className="nav__item">
278-
<Link to="/login" className="nav__auth-button">
278+
<Link to="/login" className="nav__auth-button" role="menuitem">
279279
<span className="nav__item-header" title="Login">
280280
{t('Nav.Login')}
281281
</span>
282282
</Link>
283283
</li>
284284
<li className="nav__item-or">{t('Nav.LoginOr')}</li>
285285
<li className="nav__item">
286-
<Link to="/signup" className="nav__auth-button">
286+
<Link to="/signup" className="nav__auth-button" role="menuitem">
287287
<span className="nav__item-header" title="SignUp">
288288
{t('Nav.SignUp')}
289289
</span>
@@ -300,7 +300,7 @@ const AuthenticatedUserMenu = () => {
300300
const dispatch = useDispatch();
301301

302302
return (
303-
<ul className="nav__items-right" title="user-menu">
303+
<ul className="nav__items-right" title="user-menu" role="navigation">
304304
{getConfig('TRANSLATIONS_ENABLED') && <LanguageMenu />}
305305
<NavDropdownMenu
306306
id="account"

0 commit comments

Comments
 (0)