Skip to content

Adds menubar ARIA semantics to editor menu #3191

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
merged 6 commits into from
Jul 19, 2024
Merged

Adds menubar ARIA semantics to editor menu #3191

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5182324
Add aria attributes to menus.
lindapaiste Jan 27, 2024
b6ca02a
fix: added aria roles to file menu and menu items
tespin Jul 16, 2024
f5c0fad
fix: updated test to find menubar role
tespin Jul 17, 2024
814f0fb
fix: removed role
tespin Jul 17, 2024
041ebd8
fix: added menubar roles
tespin Jul 17, 2024
6b8ccd5
fix: updated snapshots
tespin Jul 17, 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
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
4 changes: 2 additions & 2 deletions client/components/Nav/NavBar.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,11 +69,11 @@ function NavBar({ children, className }) {
return (
<NavBarContext.Provider value={contextValue}>
<header>
<nav className={className} ref={nodeRef}>
<div className={className} ref={nodeRef}>
<MenuOpenContext.Provider value={dropdownOpen}>
{children}
</MenuOpenContext.Provider>
</nav>
</div>
</header>
</NavBarContext.Provider>
);
Expand Down
9 changes: 7 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 @@ -24,15 +24,20 @@ function NavDropdownMenu({ id, title, children }) {

return (
<li className={classNames('nav__item', isOpen && 'nav__item--open')}>
<button {...handlers}>
<button
{...handlers}
role="menuitem"
aria-haspopup="menu"
aria-expanded={isOpen}
>
<span className="nav__item-header">{title}</span>
<TriangleIcon
className="nav__item-header-triangle"
focusable="false"
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 @@ -19,7 +19,7 @@ function NavMenuItem({ hideIf, className, ...rest }) {

return (
<li className={className}>
<ButtonOrLink {...rest} {...handlers} />
<ButtonOrLink {...rest} {...handlers} role="menuitem" />
</li>
);
}
Expand Down
12 changes: 6 additions & 6 deletions client/index.integration.test.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,15 +73,15 @@ describe('index.jsx integration', () => {
});

it('navbar items and the dropdowns in the navbar exist', () => {
const navigation = screen.getByRole('navigation');
const navigation = screen.getByRole('menubar');
expect(navigation).toBeInTheDocument();

const fileButton = within(navigation).getByRole('button', {
const fileButton = within(navigation).getByRole('menuitem', {
name: /^file$/i
});
expect(fileButton).toBeInTheDocument();

const newFileButton = within(navigation).getByRole('button', {
const newFileButton = within(navigation).getByRole('menuitem', {
name: /^new$/i
});
expect(newFileButton).toBeInTheDocument();
Expand All @@ -91,17 +91,17 @@ describe('index.jsx integration', () => {
// const exampleFileButton = within(navigation).getByRole('link', {name: /^examples$/i});
// expect(exampleFileButton).toBeInTheDocument();

const editButton = within(navigation).getByRole('button', {
const editButton = within(navigation).getByRole('menuitem', {
name: /^edit$/i
});
expect(editButton).toBeInTheDocument();

const sketchButton = within(navigation).getByRole('button', {
const sketchButton = within(navigation).getByRole('menuitem', {
name: /^sketch$/i
});
expect(sketchButton).toBeInTheDocument();

const helpButton = within(navigation).getByRole('button', {
const helpButton = within(navigation).getByRole('menuitem', {
name: /^help$/i
});
expect(helpButton).toBeInTheDocument();
Expand Down
10 changes: 5 additions & 5 deletions client/modules/IDE/components/Header/Nav.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ const ProjectMenu = () => {
metaKey === 'Ctrl' ? `${metaKeyName}+H` : `${metaKeyName}+⌥+F`;

return (
<ul className="nav__items-left">
<ul className="nav__items-left" role="menubar">
<li className="nav__item-logo">
{user && user.username !== undefined ? (
<Link to={userSketches}>
Expand Down Expand Up @@ -272,18 +272,18 @@ const LanguageMenu = () => {
const UnauthenticatedUserMenu = () => {
const { t } = useTranslation();
return (
<ul className="nav__items-right" title="user-menu">
<ul className="nav__items-right" title="user-menu" role="navigation">
{getConfig('TRANSLATIONS_ENABLED') && <LanguageMenu />}
<li className="nav__item">
<Link to="/login" className="nav__auth-button">
<Link to="/login" className="nav__auth-button" role="menuitem">
<span className="nav__item-header" title="Login">
{t('Nav.Login')}
</span>
</Link>
</li>
<li className="nav__item-or">{t('Nav.LoginOr')}</li>
<li className="nav__item">
<Link to="/signup" className="nav__auth-button">
<Link to="/signup" className="nav__auth-button" role="menuitem">
<span className="nav__item-header" title="SignUp">
{t('Nav.SignUp')}
</span>
Expand All @@ -300,7 +300,7 @@ const AuthenticatedUserMenu = () => {
const dispatch = useDispatch();

return (
<ul className="nav__items-right" title="user-menu">
<ul className="nav__items-right" title="user-menu" role="navigation">
{getConfig('TRANSLATIONS_ENABLED') && <LanguageMenu />}
<NavDropdownMenu
id="account"
Expand Down
Loading