Merge branch 'master' into fix/doc-deprecation

Author: jessebeach

__tests__/src/rules/label-has-associated-control-test.js

@@ -63,6 +63,7 @@ const bothValid = [
   { code: '<CustomLabel htmlFor="js_id" label="A label"><input /></CustomLabel>', options: [{ labelAttributes: ['label'], labelComponents: ['CustomLabel'] }] },
   // Custom label attributes.
   { code: '<label htmlFor="js_id" label="A label"><input /></label>', options: [{ labelAttributes: ['label'] }] },
+  { code: '<label htmlFor="selectInput">Some text<select id="selectInput" /></label>' },
 ];
 
 const alwaysValid = [

__tests__/src/rules/role-supports-aria-props-test.js

@@ -141,23 +141,8 @@ ruleTester.run('role-supports-aria-props', rule, {
     // this will have global
     { code: '<link aria-checked />' },
 
-    // IMG TESTS - implicit role is `presentation`
-    { code: '<img alt="" aria-atomic />' },
-    { code: '<img alt="" aria-busy />' },
-    { code: '<img alt="" aria-controls />' },
-    { code: '<img alt="" aria-describedby />' },
-    { code: '<img alt="" aria-disabled />' },
-    { code: '<img alt="" aria-dropeffect />' },
-    { code: '<img alt="" aria-flowto />' },
-    { code: '<img alt="" aria-grabbed />' },
-    { code: '<img alt="" aria-haspopup />' },
-    { code: '<img alt="" aria-hidden />' },
-    { code: '<img alt="" aria-invalid />' },
-    { code: '<img alt="" aria-label />' },
-    { code: '<img alt="" aria-labelledby />' },
-    { code: '<img alt="" aria-live />' },
-    { code: '<img alt="" aria-owns />' },
-    { code: '<img alt="" aria-relevant />' },
+    // IMG TESTS - no implicit role
+    { code: '<img alt="" aria-checked />' },
 
     // this will have role of `img`
     { code: '<img alt="foobar" aria-busy />' },
@@ -444,8 +429,8 @@ ruleTester.run('role-supports-aria-props', rule, {
       errors: [errorMessage('aria-checked', 'link', 'link', true)],
     },
     {
-      code: '<img alt="" aria-checked />',
-      errors: [errorMessage('aria-checked', 'presentation', 'img', true)],
+      code: '<img alt="foobar" aria-checked />',
+      errors: [errorMessage('aria-checked', 'img', 'img', true)],
     },
     {
       code: '<menu type="toolbar" aria-checked />',

package.json

@@ -46,7 +46,7 @@
     "eslint-plugin-import": "^2.13.0",
     "estraverse": "^4.2.0",
     "expect": "^21.2.1",
-    "flow-bin": "^0.66.0",
+    "flow-bin": "^0.87.0",
     "in-publish": "^2.0.0",
     "jest": "^21.2.1",
     "jscodeshift": "^0.4.0",

src/index.js

@@ -39,6 +39,9 @@ module.exports = {
   },
   configs: {
     recommended: {
+      plugins: [
+        'jsx-a11y',
+      ],
       parserOptions: {
         ecmaFeatures: {
           jsx: true,
@@ -100,7 +103,9 @@ module.exports = {
               'onKeyDown',
               'onKeyUp',
             ],
+            alert: ['onKeyUp', 'onKeyDown', 'onKeyPress'],
             body: ['onError', 'onLoad'],
+            dialog: ['onKeyUp', 'onKeyDown', 'onKeyPress'],
             iframe: ['onError', 'onLoad'],
             img: ['onError', 'onLoad'],
           },
@@ -160,6 +165,9 @@ module.exports = {
       },
     },
     strict: {
+      plugins: [
+        'jsx-a11y',
+      ],
       parserOptions: {
         ecmaFeatures: {
           jsx: true,

src/rules/label-has-associated-control.js

@@ -57,7 +57,7 @@ module.exports = {
       if (componentNames.indexOf(elementType(node.openingElement)) === -1) {
         return;
       }
-      const controlComponents = ['input', 'textarea'].concat((options.controlComponents || []));
+      const controlComponents = ['input', 'select', 'textarea'].concat((options.controlComponents || []));
       // Prevent crazy recursion.
       const recursionDepth = Math.min(
         options.depth === undefined ? 2 : options.depth,

src/util/implicitRoles/img.js

@@ -7,7 +7,7 @@ export default function getImplicitRoleForImg(attributes) {
   const alt = getProp(attributes, 'alt');
 
   if (alt && getLiteralPropValue(alt) === '') {
-    return 'presentation';
+    return '';
   }
 
   return 'img';