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.

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

Bug: Don't fallback to checking implicit role if role is set #483

Merged
merged 3 commits into from
Sep 26, 2023
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
3 changes: 3 additions & 0 deletions lib/utils/get-role.js
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,9 @@ function getRole(context, node) {
const explicitRole = getLiteralPropValue(getProp(node.attributes, 'role'))
if (explicitRole) {
return explicitRole
} else if (getProp(node.attributes, 'role')) {
// If role is set to anything other than a literal prop
return undefined
}

// Assemble a key for looking-up the element’s role in the `elementRolesMap`
Expand Down
12 changes: 12 additions & 0 deletions tests/a11y-role-supports-aria-props.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,18 @@ function getErrorMessage(attribute, role) {

ruleTester.run('a11y-role-supports-aria-props', rule, {
valid: [
{
code: `
<div
id={id}
role={
sectionHasHeader && rowIndex.row === 0 ? 'presentation' : 'option'
}
aria-label={this.props.ariaLabel}
>
{children}
</div>`,
},
{code: '<Foo bar />'},
{code: '<div />'},
{code: '<div id="main" />'},
Expand Down
4 changes: 2 additions & 2 deletions tests/utils/get-role.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ describe('getRole', function () {
})

it('returns undefined when role is set to non-literal expression', function () {
// <Box role={isNavigationOpen ? 'generic' : 'navigation'} />
const node = mockJSXOpeningElement('Box', [
// <div role={isNavigationOpen ? 'generic' : 'navigation'} />
const node = mockJSXOpeningElement('div', [
mockJSXConditionalAttribute('role', 'isNavigationOpen', 'generic', 'navigation'),
])
expect(getRole({}, node)).to.equal(undefined)
Expand Down