Merge branch 'master' into update-aria-query

Author: jessebeach

__tests__/src/rules/heading-has-content-test.js

@@ -38,6 +38,7 @@ ruleTester.run('heading-has-content', rule, {
     { code: '<h1>{foo.bar}</h1>' },
     { code: '<h1 dangerouslySetInnerHTML={{ __html: "foo" }} />' },
     { code: '<h1 children={children} />' },
+    { code: '<h1 aria-hidden />' },
   ].map(parserOptionsMapper),
   invalid: [
     { code: '<h1 />', errors: [expectedError] },

package.json

@@ -63,7 +63,7 @@
     "aria-query": "^2.0.0",
     "array-includes": "^3.0.3",
     "ast-types-flow": "^0.0.7",
-    "axobject-query": "^1.0.2",
+    "axobject-query": "^2.0.1",
     "damerau-levenshtein": "^1.0.4",
     "emoji-regex": "^6.5.1",
     "has": "^1.0.1",

src/rules/heading-has-content.js

@@ -10,6 +10,7 @@
 import { elementType } from 'jsx-ast-utils';
 import { generateObjSchema, arraySchema } from '../util/schemas';
 import hasAccessibleChild from '../util/hasAccessibleChild';
+import isHiddenFromScreenReader from '../util/isHiddenFromScreenReader';
 
 const errorMessage =
   'Headings must have content and the content must be accessible by a screen reader.';
@@ -43,6 +44,8 @@ module.exports = {
         return;
       } else if (hasAccessibleChild(node.parent)) {
         return;
+      } else if (isHiddenFromScreenReader(nodeType, node.attributes)) {
+        return;
       }
 
       context.report({