Move interactive roles and non-interactive roles lists to isInteractiveRole

Author: jessebeach

__tests__/src/util/isInteractiveRole-test.js

@@ -1,6 +1,9 @@
 /* eslint-env mocha */
 import assert from 'assert';
-import isInteractiveRole from '../../../src/util/isInteractiveRole';
+import isInteractiveRole, {
+  interactiveRoles,
+  nonInteractiveRoles,
+} from '../../../src/util/isInteractiveRole';
 import attrMock from '../../__mocks__/attrMock';
 
 describe('isInteractiveRole', () => {
@@ -11,77 +14,14 @@ describe('isInteractiveRole', () => {
   });
   describe('elements with an interactive role', () => {
     it('should identify them as interactive elements', () => {
-      [
-        'button',
-        'checkbox',
-        'link',
-        'menuitem',
-        'menuitemcheckbox',
-        'menuitemradio',
-        'option',
-        'radio',
-        'spinbutton',
-        'tab',
-        'textbox',
-      ].forEach(role => expect(isInteractiveRole('div', [
+      interactiveRoles.forEach(role => expect(isInteractiveRole('div', [
         attrMock('role', role)
       ])).toBe(true));
     });
   });
   describe('elements with a non-interactive role', () => {
     it('should not identify them as interactive elements', () => {
-      [
-        'alert',
-        'alertdialog',
-        'dialog',
-        'gridcell',
-        'log',
-        'marquee',
-        'progressbar',
-        'scrollbar',
-        'slider',
-        'status',
-        'tabpanel',
-        'timer',
-        'tooltip',
-        'treeitem',
-        'combobox',
-        'grid',
-        'listbox',
-        'menu',
-        'menubar',
-        'radiogroup',
-        'tablist',
-        'tree',
-        'treegrid',
-        'article',
-        'columnheader',
-        'definition',
-        'directory',
-        'document',
-        'group',
-        'heading',
-        'img',
-        'list',
-        'listitem',
-        'math',
-        'note',
-        'presentation',
-        'region',
-        'row',
-        'rowgroup',
-        'rowheader',
-        'separator',
-        'toolbar',
-        'application',
-        'banner',
-        'complementary',
-        'contentinfo',
-        'form',
-        'main',
-        'navigation',
-        'search',
-      ].forEach(role => expect(isInteractiveRole('div', [
+      nonInteractiveRoles.forEach(role => expect(isInteractiveRole('div', [
         attrMock('role', role)
       ])).toBe(false));
     });

src/util/isInteractiveRole.js

@@ -2,7 +2,7 @@ import { getProp, getLiteralPropValue } from 'jsx-ast-utils';
 import DOMElements from './attributes/DOM.json';
 
 // Map of tagNames to functions that return whether that element is interactive or not.
-const interactiveSet = [
+export const interactiveRoles = [
   'button',
   'checkbox',
   'link',
@@ -16,6 +16,59 @@ const interactiveSet = [
   'textbox',
 ];
 
+export const nonInteractiveRoles = [
+  'alert',
+  'alertdialog',
+  'dialog',
+  'gridcell',
+  'log',
+  'marquee',
+  'progressbar',
+  'scrollbar',
+  'slider',
+  'status',
+  'tabpanel',
+  'timer',
+  'tooltip',
+  'treeitem',
+  'combobox',
+  'grid',
+  'listbox',
+  'menu',
+  'menubar',
+  'radiogroup',
+  'tablist',
+  'tree',
+  'treegrid',
+  'article',
+  'columnheader',
+  'definition',
+  'directory',
+  'document',
+  'group',
+  'heading',
+  'img',
+  'list',
+  'listitem',
+  'math',
+  'note',
+  'presentation',
+  'region',
+  'row',
+  'rowgroup',
+  'rowheader',
+  'separator',
+  'toolbar',
+  'application',
+  'banner',
+  'complementary',
+  'contentinfo',
+  'form',
+  'main',
+  'navigation',
+  'search',
+];
+
 /**
  * Returns boolean indicating whether the given element has a role
  * that is associated with an interactive component. Used when an element
@@ -28,7 +81,7 @@ const isInteractiveRole = (tagName, attributes) => {
   if (Object.keys(DOMElements).indexOf(tagName) === -1) {
     return true;
   }
-  return (interactiveSet.indexOf(
+  return (interactiveRoles.indexOf(
     (getLiteralPropValue(getProp(attributes, 'role')) || '').toLowerCase(),
   ) > -1);
 };