Convert options to object from array

Author: jessebeach

__tests__/src/rules/no-noninteractive-element-interactions-test.js

@@ -291,7 +291,8 @@ const neverValid = [
   { code: '<div role="tooltip" onClick={() => {}} />;', errors: [expectedError] },
 ];
 
-const recommendedOptions = [configs.recommended.rules[`jsx-a11y/${ruleName}`][1]];
+const recommendedOptions =
+  (configs.recommended.rules[`jsx-a11y/${ruleName}`][1] || {});
 ruleTester.run(`${ruleName}:recommended`, rule, {
   valid: [
     ...alwaysValid,

__tests__/src/rules/no-static-element-interactions-test.js

@@ -291,7 +291,8 @@ const neverValid = [
   { code: '<xmp onClick={() => {}} />;', errors: [expectedError] },
 ];
 
-const recommendedOptions = [configs.recommended.rules[`jsx-a11y/${ruleName}`][1]];
+const recommendedOptions =
+  (configs.recommended.rules[`jsx-a11y/${ruleName}`][1] || {});
 ruleTester.run(`${ruleName}:recommended`, rule, {
   valid: [
     ...alwaysValid,

src/index.js

@@ -74,14 +74,16 @@ module.exports = {
         ],
         'jsx-a11y/no-noninteractive-element-interactions': [
           'error',
-          [
-            'onClick',
-            'onMouseDown',
-            'onMouseUp',
-            'onKeyPress',
-            'onKeyDown',
-            'onKeyUp',
-          ],
+          {
+            handlers: [
+              'onClick',
+              'onMouseDown',
+              'onMouseUp',
+              'onKeyPress',
+              'onKeyDown',
+              'onKeyUp',
+            ],
+          },
         ],
         'jsx-a11y/no-noninteractive-element-to-interactive-role': [
           'error',
@@ -120,14 +122,16 @@ module.exports = {
         'jsx-a11y/no-redundant-roles': 'error',
         'jsx-a11y/no-static-element-interactions': [
           'error',
-          [
-            'onClick',
-            'onMouseDown',
-            'onMouseUp',
-            'onKeyPress',
-            'onKeyDown',
-            'onKeyUp',
-          ],
+          {
+            handlers: [
+              'onClick',
+              'onMouseDown',
+              'onMouseUp',
+              'onKeyPress',
+              'onKeyDown',
+              'onKeyUp',
+            ],
+          },
         ],
         'jsx-a11y/role-has-required-aria-props': 'error',
         'jsx-a11y/role-supports-aria-props': 'error',

src/rules/no-noninteractive-element-interactions.js

@@ -18,7 +18,7 @@ import {
   hasProp,
 } from 'jsx-ast-utils';
 import type { JSXOpeningElement } from 'ast-types-flow';
-import { arraySchema } from '../util/schemas';
+import { arraySchema, generateObjSchema } from '../util/schemas';
 import isAbstractRole from '../util/isAbstractRole';
 import isHiddenFromScreenReader from '../util/isHiddenFromScreenReader';
 import isInteractiveElement from '../util/isInteractiveElement';
@@ -32,11 +32,14 @@ const errorMessage =
 
 const domElements = [...dom.keys()];
 const defaultInteractiveProps = eventHandlers;
+const schema = generateObjSchema({
+  handlers: arraySchema,
+});
 
 module.exports = {
   meta: {
     docs: {},
-    schema: [arraySchema],
+    schema: [schema],
   },
 
   create: (context: ESLintContext) => {
@@ -47,7 +50,9 @@ module.exports = {
       ) => {
         const attributes = node.attributes;
         const type = elementType(node);
-        const interactiveProps = options[0] || defaultInteractiveProps;
+        const interactiveProps = options[0]
+          ? options[0].handlers
+          : defaultInteractiveProps;
 
         const hasInteractiveProps = interactiveProps
           .some(prop => (

src/rules/no-static-element-interactions.js

@@ -19,7 +19,7 @@ import {
   hasProp,
 } from 'jsx-ast-utils';
 import type { JSXOpeningElement } from 'ast-types-flow';
-import { arraySchema } from '../util/schemas';
+import { arraySchema, generateObjSchema } from '../util/schemas';
 import isAbstractRole from '../util/isAbstractRole';
 import isHiddenFromScreenReader from '../util/isHiddenFromScreenReader';
 import isInteractiveElement from '../util/isInteractiveElement';
@@ -33,11 +33,14 @@ const errorMessage =
 
 const domElements = [...dom.keys()];
 const defaultInteractiveProps = eventHandlers;
+const schema = generateObjSchema({
+  handlers: arraySchema,
+});
 
 module.exports = {
   meta: {
     docs: {},
-    schema: [arraySchema],
+    schema: [schema],
   },
 
   create: (context: ESLintContext) => {
@@ -48,7 +51,9 @@ module.exports = {
       ) => {
         const attributes = node.attributes;
         const type = elementType(node);
-        const interactiveProps = options[0] || defaultInteractiveProps;
+        const interactiveProps = options[0]
+          ? options[0].handlers
+          : defaultInteractiveProps;
 
         const hasInteractiveProps = interactiveProps
           .some(prop => (