Merge pull request #483 from github/kh-bug-in-get-role

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

Author: khiga8

lib/utils/get-role.js

@@ -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`

tests/a11y-role-supports-aria-props.js

@@ -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" />'},

tests/utils/get-role.js

@@ -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)