Adjustments for [email protected]

Author: jessebeach

__mocks__/genInteractives.js

@@ -89,7 +89,7 @@ Object.keys(interactiveElementsMap)
   );
 
 const interactiveRoles = roleNames.filter(
-  role => roles[role].interactive === true
+  role => roles.get(role).interactive === true
 );
 
 const nonInteractiveRoles = roleNames.filter(

src/util/isNonInteractiveElement.js

@@ -3,8 +3,9 @@
  */
 
 import {
-  roles,
+  dom,
   elementRoles,
+  roles,
 } from 'aria-query';
 import type {
   JSXAttribute,
@@ -16,7 +17,6 @@ import {
   propName,
 } from 'jsx-ast-utils';
 import getTabIndex from './getTabIndex';
-import DOMElements from './attributes/DOM.json';
 
 const nonInteractiveRoles = new Set(
   [...roles.keys()].filter(name => !roles.get(name).interactive),
@@ -84,7 +84,7 @@ const isNonInteractiveElement = (
 ): boolean => {
   // Do not test higher level JSX components, as we do not know what
   // low-level DOM element this maps to.
-  if (Object.keys(DOMElements).indexOf(tagName) === -1) {
+  if ([...dom.keys()].indexOf(tagName) === -1) {
     return false;
   }
 

src/util/isNonInteractiveRole.js

@@ -1,10 +1,12 @@
+import {
+  dom,
+  roles,
+} from 'aria-query';
 import { getProp, getLiteralPropValue } from 'jsx-ast-utils';
-import DOMElements from './attributes/DOM.json';
-import roles from './attributes/role.json';
 
 
-const VALID_ROLES = Object.keys(roles)
-  .filter(role => roles[role].interactive === false);
+const VALID_ROLES = [...roles.keys()]
+  .filter(role => roles.get(role).interactive === false);
 /**
  * Returns boolean indicating whether the given element has a role
  * that is associated with a non-interactive component. Non-interactive roles
@@ -25,7 +27,7 @@ const VALID_ROLES = Object.keys(roles)
 const isNonInteractiveRole = (tagName, attributes) => {
   // Do not test higher level JSX components, as we do not know what
   // low-level DOM element this maps to.
-  if (Object.keys(DOMElements).indexOf(tagName) === -1) {
+  if ([...dom.keys()].indexOf(tagName) === -1) {
     return false;
   }