Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 6 additions & 3 deletions src/MenuItem.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ export class MenuItem extends React.Component {
title: props.title,
className,
// set to menuitem by default
role: 'menuitem',
role: props.role || 'menuitem',
'aria-disabled': props.disabled,
};

Expand All @@ -161,10 +161,13 @@ export class MenuItem extends React.Component {
role: 'option',
'aria-selected': props.isSelected,
};
} else if (props.role === null) {
} else if (props.role === null || props.role === 'none') {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I left the null option in here for backward compatibility, but I'm also ok with removing it.

// sometimes we want to specify role inside <li/> element
// <li><a role='menuitem'>Link</a></li> would be a good example
delete attrs.role;
// in this case the role on <li/> should be "none" to
// remove the implied listitem role.
// https://www.w3.org/TR/wai-aria-practices-1.1/examples/menubar/menubar-1/menubar-1.html
attrs.role = 'none';
}
// In case that onClick/onMouseLeave/onMouseEnter is passed down from owner
const mouseEvent = {
Expand Down
16 changes: 14 additions & 2 deletions tests/MenuItem.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -117,13 +117,25 @@ describe('MenuItem', () => {
});

describe('overwrite default role', () => {
it('should set empty role', () => {
it('should set role to none if null', () => {
const wrapper = shallow(<NakedMenuItem role={null}>test</NakedMenuItem>);

expect(wrapper.render()).toMatchSnapshot();
});

it('should set specific role', () => {
it('should set role to none if none', () => {
const wrapper = shallow(<NakedMenuItem role="none">test</NakedMenuItem>);

expect(wrapper.render()).toMatchSnapshot();
});

it('should set role to listitem', () => {
const wrapper = shallow(<NakedMenuItem role="listitem">test</NakedMenuItem>);

expect(wrapper.render()).toMatchSnapshot();
});

it('should set role to option', () => {
const wrapper = shallow(<NakedMenuItem role="option">test</NakedMenuItem>);

expect(wrapper.render()).toMatchSnapshot();
Expand Down
23 changes: 21 additions & 2 deletions tests/__snapshots__/MenuItem.spec.js.snap
Original file line number Diff line number Diff line change
@@ -1,14 +1,33 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP

exports[`MenuItem overwrite default role should set empty role 1`] = `
exports[`MenuItem overwrite default role should set role to listitem 1`] = `
<li
class="undefined-item"
role="listitem"
>
test
</li>
`;

exports[`MenuItem overwrite default role should set specific role 1`] = `
exports[`MenuItem overwrite default role should set role to none if none 1`] = `
<li
class="undefined-item"
role="none"
>
test
</li>
`;

exports[`MenuItem overwrite default role should set role to none if null 1`] = `
<li
class="undefined-item"
role="none"
>
test
</li>
`;

exports[`MenuItem overwrite default role should set role to option 1`] = `
<li
class="undefined-item"
role="option"
Expand Down