From 66c425c4715f7295000eb49e7b8514a2c4e94d81 Mon Sep 17 00:00:00 2001
From: Jesse Renee Beach <splendidnoise@gmail.com>
Date: Sat, 20 Jun 2020 15:26:21 -0700
Subject: [PATCH 01/21] Additional test case for no-redundant-roles

---
 __tests__/src/rules/no-redundant-roles-test.js | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/__tests__/src/rules/no-redundant-roles-test.js b/__tests__/src/rules/no-redundant-roles-test.js
index 24128668a..abf26a73b 100644
--- a/__tests__/src/rules/no-redundant-roles-test.js
+++ b/__tests__/src/rules/no-redundant-roles-test.js
@@ -50,6 +50,7 @@ ruleTester.run(`${ruleName}:recommended`, rule, {
 });
 
 const noNavExceptionsOptions = { nav: [] };
+const listException = { ul: ['list'], ol: ['list'] };
 
 ruleTester.run(`${ruleName}:recommended`, rule, {
   valid: alwaysValid
@@ -62,3 +63,17 @@ ruleTester.run(`${ruleName}:recommended`, rule, {
     .map(ruleOptionsMapperFactory(noNavExceptionsOptions))
     .map(parserOptionsMapper),
 });
+
+ruleTester.run(`${ruleName}:recommended (valid list role override)`, rule, {
+  valid: [
+    { code: '<ul role="list" />' },
+    { code: '<ol role="list" />' },
+  ]
+    .map(ruleOptionsMapperFactory(listException))
+    .map(parserOptionsMapper),
+  invalid: [
+    { code: '<ul role="list" />', errors: [expectedError('ul', 'list')] },
+    { code: '<ol role="list" />', errors: [expectedError('ol', 'list')] },
+  ]
+    .map(parserOptionsMapper),
+});

From 5cbb71830e1d782d5c26f576257e58d20b086b5e Mon Sep 17 00:00:00 2001
From: Jesse Renee Beach <splendidnoise@gmail.com>
Date: Sat, 20 Jun 2020 16:52:49 -0700
Subject: [PATCH 02/21] Adding test cases for label tests

---
 __tests__/src/rules/control-has-associated-label-test.js | 5 +++++
 __tests__/src/rules/label-has-associated-control-test.js | 1 +
 2 files changed, 6 insertions(+)

diff --git a/__tests__/src/rules/control-has-associated-label-test.js b/__tests__/src/rules/control-has-associated-label-test.js
index cd7666147..de98d8728 100644
--- a/__tests__/src/rules/control-has-associated-label-test.js
+++ b/__tests__/src/rules/control-has-associated-label-test.js
@@ -210,6 +210,9 @@ const alwaysValid = [
   { code: '<input type="datetime" />' },
   { code: '<input type="email" />' },
   { code: '<input type="file" />' },
+  { code: '<input type="hidden" />' },
+  { code: '<input type="hidden" name="bot-field"/>' },
+  { code: '<input type="hidden" name="form-name" value="Contact Form"/>' },
   { code: '<input type="image" />' },
   { code: '<input type="month" />' },
   { code: '<input type="number" />' },
@@ -221,6 +224,8 @@ const alwaysValid = [
   { code: '<input type="submit" />' },
   { code: '<input type="tel" />' },
   { code: '<input type="text" />' },
+  { code: '<label>Foo <input type="text" /></label>' },
+  { code: '<input name={field.name} id="foo" type="text" value={field.value} disabled={isDisabled} onChange={changeText(field.onChange, field.name)} onBlur={field.onBlur} />' },
   { code: '<input type="time" />' },
   { code: '<input type="url" />' },
   { code: '<input type="week" />' },
diff --git a/__tests__/src/rules/label-has-associated-control-test.js b/__tests__/src/rules/label-has-associated-control-test.js
index 3e3f70744..e387d5ae5 100644
--- a/__tests__/src/rules/label-has-associated-control-test.js
+++ b/__tests__/src/rules/label-has-associated-control-test.js
@@ -70,6 +70,7 @@ const bothValid = [
 const alwaysValid = [
   { code: '<div />' },
   { code: '<CustomElement />' },
+  { code: '<input type="hidden" />' },
 ];
 
 const htmlForInvalid = [

From 2234df7edebc0fd401fa1f6369d8de1d803b26a1 Mon Sep 17 00:00:00 2001
From: Jesse Renee Beach <splendidnoise@gmail.com>
Date: Sat, 20 Jun 2020 17:23:35 -0700
Subject: [PATCH 03/21] Account for additional control elements in
 label-has-associated-control

---
 __tests__/src/rules/label-has-associated-control-test.js | 5 +++++
 src/rules/label-has-associated-control.js                | 9 ++++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/__tests__/src/rules/label-has-associated-control-test.js b/__tests__/src/rules/label-has-associated-control-test.js
index 3e3f70744..3f4b64126 100644
--- a/__tests__/src/rules/label-has-associated-control-test.js
+++ b/__tests__/src/rules/label-has-associated-control-test.js
@@ -48,6 +48,11 @@ const nestingValid = [
   { code: '<label><span><span><span><span>A label</span><input /></span></span></span></label>', options: [{ depth: 5 }] },
   { code: '<label><span><span><span><span aria-label="A label" /><input /></span></span></span></label>', options: [{ depth: 5 }] },
   { code: '<label><span><span><span><input aria-label="A label" /></span></span></span></label>', options: [{ depth: 5 }] },
+  // Other controls
+  { code: '<label>foo<meter /></label>' },
+  { code: '<label>foo<output /></label>' },
+  { code: '<label>foo<progress /></label>' },
+  { code: '<label>foo<textarea /></label>' },
   // Custom controlComponents.
   { code: '<label><span>A label<CustomInput /></span></label>', options: [{ controlComponents: ['CustomInput'] }] },
   { code: '<CustomLabel><span>A label<CustomInput /></span></CustomLabel>', options: [{ controlComponents: ['CustomInput'], labelComponents: ['CustomLabel'] }] },
diff --git a/src/rules/label-has-associated-control.js b/src/rules/label-has-associated-control.js
index 98f385461..6d78cbf65 100644
--- a/src/rules/label-has-associated-control.js
+++ b/src/rules/label-has-associated-control.js
@@ -57,7 +57,14 @@ module.exports = {
       if (componentNames.indexOf(elementType(node.openingElement)) === -1) {
         return;
       }
-      const controlComponents = ['input', 'select', 'textarea'].concat((options.controlComponents || []));
+      const controlComponents = [
+        'input',
+        'meter',
+        'output',
+        'progress',
+        'select',
+        'textarea',
+      ].concat((options.controlComponents || []));
       // Prevent crazy recursion.
       const recursionDepth = Math.min(
         options.depth === undefined ? 2 : options.depth,

From 8e6fcd0f3e28ad4bcb0c6b0b1ed93db4924840cd Mon Sep 17 00:00:00 2001
From: Avi Vahl <avi.vahl@wix.com>
Date: Sun, 21 Jun 2020 17:15:13 +0300
Subject: [PATCH 04/21] docs: fix travis badge now points to correct location
 at travis-ci.com

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 0f802e47e..5ccebc172 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 <p align="center">
-  <a href="https://travis-ci.org/evcohen/eslint-plugin-jsx-a11y">
-    <img src="https://api.travis-ci.org/evcohen/eslint-plugin-jsx-a11y.svg?branch=master"
+  <a href="https://travis-ci.com/github/jsx-eslint/eslint-plugin-jsx-a11y">
+    <img src="https://travis-ci.com/jsx-eslint/eslint-plugin-jsx-a11y.svg?branch=master"
          alt="build status">
   </a>
   <a href="https://npmjs.org/package/eslint-plugin-jsx-a11y">

From b315698faf8d593b6b371e0fe7f1a5fc466a94b9 Mon Sep 17 00:00:00 2001
From: Jesse Renee Beach <splendidnoise@gmail.com>
Date: Sat, 20 Jun 2020 16:37:43 -0700
Subject: [PATCH 05/21] Allow negative tabindex in
 aria-activedescendant-has-tabindex

---
 .../aria-activedescendant-has-tabindex-test.js  | 17 ++++++++++-------
 src/rules/aria-activedescendant-has-tabindex.js | 16 ++++++----------
 2 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/__tests__/src/rules/aria-activedescendant-has-tabindex-test.js b/__tests__/src/rules/aria-activedescendant-has-tabindex-test.js
index 941403ccd..917898e80 100644
--- a/__tests__/src/rules/aria-activedescendant-has-tabindex-test.js
+++ b/__tests__/src/rules/aria-activedescendant-has-tabindex-test.js
@@ -18,7 +18,7 @@ import rule from '../../../src/rules/aria-activedescendant-has-tabindex';
 const ruleTester = new RuleTester();
 
 const expectedError = {
-  message: 'An element that manages focus with `aria-activedescendant` must be tabbable',
+  message: 'An element that manages focus with `aria-activedescendant` must have a tabindex',
   type: 'JSXOpeningElement',
 };
 
@@ -57,25 +57,28 @@ ruleTester.run('aria-activedescendant-has-tabindex', rule, {
     {
       code: '<input aria-activedescendant={someID} />;',
     },
+    {
+      code: '<input aria-activedescendant={someID} tabIndex={1} />;',
+    },
     {
       code: '<input aria-activedescendant={someID} tabIndex={0} />;',
     },
-  ].map(parserOptionsMapper),
-  invalid: [
     {
-      code: '<div aria-activedescendant={someID} />;',
-      errors: [expectedError],
+      code: '<input aria-activedescendant={someID} tabIndex={-1} />;',
     },
     {
       code: '<div aria-activedescendant={someID} tabIndex={-1} />;',
-      errors: [expectedError],
     },
     {
       code: '<div aria-activedescendant={someID} tabIndex="-1" />;',
-      errors: [expectedError],
     },
     {
       code: '<input aria-activedescendant={someID} tabIndex={-1} />;',
+    },
+  ].map(parserOptionsMapper),
+  invalid: [
+    {
+      code: '<div aria-activedescendant={someID} />;',
       errors: [expectedError],
     },
   ].map(parserOptionsMapper),
diff --git a/src/rules/aria-activedescendant-has-tabindex.js b/src/rules/aria-activedescendant-has-tabindex.js
index 23546f9b2..50e66f666 100644
--- a/src/rules/aria-activedescendant-has-tabindex.js
+++ b/src/rules/aria-activedescendant-has-tabindex.js
@@ -13,7 +13,7 @@ import isInteractiveElement from '../util/isInteractiveElement';
 // Rule Definition
 // ----------------------------------------------------------------------------
 
-const errorMessage = 'An element that manages focus with `aria-activedescendant` must be tabbable';
+const errorMessage = 'An element that manages focus with `aria-activedescendant` must have a tabindex';
 
 const schema = generateObjSchema();
 
@@ -43,21 +43,17 @@ module.exports = {
       }
       const tabIndex = getTabIndex(getProp(attributes, 'tabIndex'));
 
-      // If this is an interactive element, tabIndex must be either left
-      // unspecified allowing the inherent tabIndex to obtain or it must be
-      // zero (allowing for positive, even though that is not ideal). It cannot
-      // be given a negative value.
+      // If this is an interactive element and the tabindex attribute is not specified,
+      // or the tabIndex property was not mutated, then the tabIndex
+      // property will be undefined.
       if (
         isInteractiveElement(type, attributes)
-        && (
-          tabIndex === undefined
-          || tabIndex >= 0
-        )
+        && tabIndex === undefined
       ) {
         return;
       }
 
-      if (tabIndex >= 0) {
+      if (tabIndex >= -1) {
         return;
       }
 

From 5191053461b1480daf2cd46c00d91e233ccac9f9 Mon Sep 17 00:00:00 2001
From: Jesse Renee Beach <splendidnoise@gmail.com>
Date: Sun, 21 Jun 2020 17:34:56 -0700
Subject: [PATCH 06/21] Update to axobject-query@2.2.0

---
 __mocks__/genInteractives.js                                    | 1 +
 __tests__/src/rules/interactive-supports-focus-test.js          | 1 +
 .../rules/no-interactive-element-to-noninteractive-role-test.js | 1 +
 __tests__/src/rules/no-static-element-interactions-test.js      | 2 +-
 package.json                                                    | 2 +-
 5 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/__mocks__/genInteractives.js b/__mocks__/genInteractives.js
index 722b6b17d..6f8ec847d 100644
--- a/__mocks__/genInteractives.js
+++ b/__mocks__/genInteractives.js
@@ -46,6 +46,7 @@ const interactiveElementsMap = {
   menuitem: [],
   option: [],
   select: [],
+  summary: [],
   // Whereas ARIA makes a distinction between cell and gridcell, the AXObject
   // treats them both as CellRole and since gridcell is interactive, we consider
   // cell interactive as well.
diff --git a/__tests__/src/rules/interactive-supports-focus-test.js b/__tests__/src/rules/interactive-supports-focus-test.js
index 4eb18a41a..a67a34727 100644
--- a/__tests__/src/rules/interactive-supports-focus-test.js
+++ b/__tests__/src/rules/interactive-supports-focus-test.js
@@ -71,6 +71,7 @@ const alwaysValid = [
   { code: '<select onClick={() => void 0} className="foo" />' },
   { code: '<area href="#" onClick={() => void 0} className="foo" />' },
   { code: '<area onClick={() => void 0} className="foo" />' },
+  { code: '<summary onClick={() => void 0} />' },
   { code: '<textarea onClick={() => void 0} className="foo" />' },
   { code: '<a onClick="showNextPage();">Next page</a>' },
   { code: '<a onClick="showNextPage();" tabIndex={undefined}>Next page</a>' },
diff --git a/__tests__/src/rules/no-interactive-element-to-noninteractive-role-test.js b/__tests__/src/rules/no-interactive-element-to-noninteractive-role-test.js
index fc788dad8..4f6de9f03 100644
--- a/__tests__/src/rules/no-interactive-element-to-noninteractive-role-test.js
+++ b/__tests__/src/rules/no-interactive-element-to-noninteractive-role-test.js
@@ -358,6 +358,7 @@ const neverValid = [
   { code: '<menuitem role="listitem" />;', errors: [expectedError] },
   { code: '<option className="foo" role="listitem" />', errors: [expectedError] },
   { code: '<select className="foo" role="listitem" />', errors: [expectedError] },
+  { code: '<summary role="listitem" />;', errors: [expectedError] },
   { code: '<textarea className="foo" role="listitem" />', errors: [expectedError] },
   { code: '<tr role="listitem" />;', errors: [expectedError] },
 ];
diff --git a/__tests__/src/rules/no-static-element-interactions-test.js b/__tests__/src/rules/no-static-element-interactions-test.js
index 66d310d54..b7f98f9d7 100644
--- a/__tests__/src/rules/no-static-element-interactions-test.js
+++ b/__tests__/src/rules/no-static-element-interactions-test.js
@@ -148,6 +148,7 @@ const alwaysValid = [
   { code: '<ruby onClick={() => {}} />;' },
   { code: '<section onClick={() => {}} aria-label="Aa" />;' },
   { code: '<section onClick={() => {}} aria-labelledby="js_1" />;' },
+  { code: '<summary onClick={() => {}} />;' },
   { code: '<table onClick={() => {}} />;' },
   { code: '<tbody onClick={() => {}} />;' },
   { code: '<tfoot onClick={() => {}} />;' },
@@ -329,7 +330,6 @@ const neverValid = [
   { code: '<strong onClick={() => {}} />;', errors: [expectedError] },
   { code: '<style onClick={() => {}} />;', errors: [expectedError] },
   { code: '<sub onClick={() => {}} />;', errors: [expectedError] },
-  { code: '<summary onClick={() => {}} />;', errors: [expectedError] },
   { code: '<sup onClick={() => {}} />;', errors: [expectedError] },
   { code: '<title onClick={() => {}} />;', errors: [expectedError] },
   { code: '<track onClick={() => {}} />;', errors: [expectedError] },
diff --git a/package.json b/package.json
index b92b8273c..839877b6d 100644
--- a/package.json
+++ b/package.json
@@ -63,7 +63,7 @@
     "array-includes": "^3.1.1",
     "ast-types-flow": "^0.0.7",
     "axe-core": "^3.5.4",
-    "axobject-query": "^2.1.2",
+    "axobject-query": "^2.2.0",
     "damerau-levenshtein": "^1.0.6",
     "emoji-regex": "^9.0.0",
     "has": "^1.0.3",

From dac686474692c038f22624c67a4f267448d6c3f3 Mon Sep 17 00:00:00 2001
From: Jesse Renee Beach <splendidnoise@gmail.com>
Date: Sun, 21 Jun 2020 17:51:16 -0700
Subject: [PATCH 07/21] Deprecate the accessible-emoji rule

---
 docs/rules/accessible-emoji.md | 2 +-
 src/rules/accessible-emoji.js  | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/rules/accessible-emoji.md b/docs/rules/accessible-emoji.md
index ba55f4e04..f8920250a 100644
--- a/docs/rules/accessible-emoji.md
+++ b/docs/rules/accessible-emoji.md
@@ -1,4 +1,4 @@
-# accessible-emoji
+# [Deprecated] accessible-emoji
 
 Emoji have become a common way of communicating content to the end user. To a person using a screenreader, however, he/she may not be aware that this content is there at all. By wrapping the emoji in a `<span>`, giving it the `role="img"`, and providing a useful description in `aria-label`, the screenreader will treat the emoji as an image in the accessibility tree with an accessible name for the end user.
 
diff --git a/src/rules/accessible-emoji.js b/src/rules/accessible-emoji.js
index 26d329e9a..e74d8cce0 100644
--- a/src/rules/accessible-emoji.js
+++ b/src/rules/accessible-emoji.js
@@ -21,6 +21,7 @@ module.exports = {
     docs: {
       url: 'https://github.com/evcohen/eslint-plugin-jsx-a11y/tree/master/docs/rules/accessible-emoji.md',
     },
+    deprecated: true,
     schema: [schema],
   },
 

From 4ecaf35052a4019a536352da11cd8dedc0bf405a Mon Sep 17 00:00:00 2001
From: Jesse Renee Beach <splendidnoise@gmail.com>
Date: Sun, 21 Jun 2020 18:09:54 -0700
Subject: [PATCH 08/21] Add a testcase for tablist to interactive supports
 focus

---
 __tests__/src/rules/interactive-supports-focus-test.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/__tests__/src/rules/interactive-supports-focus-test.js b/__tests__/src/rules/interactive-supports-focus-test.js
index 4eb18a41a..07ce58a46 100644
--- a/__tests__/src/rules/interactive-supports-focus-test.js
+++ b/__tests__/src/rules/interactive-supports-focus-test.js
@@ -110,6 +110,7 @@ const alwaysValid = [
   { code: '<div role="radio" tabIndex="0" onClick={() => void 0} />' },
   { code: '<div role="spinbutton" tabIndex="0" onClick={() => void 0} />' },
   { code: '<div role="switch" tabIndex="0" onClick={() => void 0} />' },
+  { code: '<div role="tablist" tabIndex="0" onClick={() => void 0} />' },
   { code: '<div role="tab" tabIndex="0" onClick={() => void 0} />' },
   { code: '<div role="textbox" tabIndex="0" onClick={() => void 0} />' },
   { code: '<div role="textbox" aria-disabled="true" onClick={() => void 0} />' },

From 3c49c9a61b519b055422bfc0b2aeac895f96d629 Mon Sep 17 00:00:00 2001
From: Diane Ko <diane.ko@airbnb.com>
Date: Fri, 26 Jun 2020 18:50:31 -0700
Subject: [PATCH 09/21] Add WCAG guidelines to rule documentation

Adds in a section for every rule that specifies what the WCAG guidelines are (if applicable) in a new Accessibility guidelines section near the bottom of the rule documentation.

Additional changes:
- Move Resources/References underneath Accessibility guidelines section
- Fix up heading level of Resources so that the heading order progresses sequentially
- Fix up resource link text to be clearer
- Fix up some broken links or old references
- Update pronoun usage in `accessible-emoji` to use they instead of he/she
- Add some additional examples and rule clarity to `click-events-have-key-events`
- Fix up code formatting for `tabindex-no-positive`
- Add additional resources to some rules without resources
- Change Resources from ordered list to unordered list since the order really doesn't matter

Partially addresses https://github.com/jsx-eslint/eslint-plugin-jsx-a11y/issues/30
---
 docs/rules/accessible-emoji.md                 | 11 +++++++----
 docs/rules/alt-text.md                         | 15 +++++++++------
 docs/rules/anchor-has-content.md               |  9 ++++++---
 docs/rules/anchor-is-valid.md                  | 16 +++++++++-------
 .../aria-activedescendant-has-tabindex.md      |  9 ++++++---
 docs/rules/aria-props.md                       |  3 +++
 docs/rules/aria-proptypes.md                   | 10 ++++++----
 docs/rules/aria-role.md                        | 10 +++++++---
 docs/rules/aria-unsupported-elements.md        |  9 ++++++---
 docs/rules/autocomplete-valid.md               | 13 ++++++++-----
 docs/rules/click-events-have-key-events.md     |  7 ++++++-
 docs/rules/control-has-associated-label.md     |  5 +++++
 docs/rules/heading-has-content.md              |  9 ++++++---
 docs/rules/html-has-lang.md                    | 11 +++++++----
 docs/rules/iframe-has-title.md                 | 10 +++++++---
 docs/rules/img-redundant-alt.md                |  6 ++++++
 docs/rules/interactive-supports-focus.md       | 15 +++++++++------
 docs/rules/label-has-associated-control.md     |  5 +++++
 docs/rules/label-has-for.md                    |  5 +++++
 docs/rules/lang.md                             | 14 ++++++++------
 docs/rules/media-has-caption.md                | 13 ++++++++-----
 docs/rules/mouse-events-have-key-events.md     |  3 +++
 docs/rules/no-access-key.md                    |  6 ++++++
 docs/rules/no-autofocus.md                     | 10 +++++++---
 docs/rules/no-distracting-elements.md          | 11 +++++++----
 ...teractive-element-to-noninteractive-role.md | 18 +++++++++++-------
 .../no-noninteractive-element-interactions.md  | 16 +++++++++-------
 ...ninteractive-element-to-interactive-role.md | 16 +++++++++-------
 docs/rules/no-noninteractive-tabindex.md       | 10 ++++++----
 docs/rules/no-onchange.md                      | 11 +++++++----
 docs/rules/no-redundant-roles.md               |  9 ++++++---
 docs/rules/no-static-element-interactions.md   | 16 +++++++++-------
 docs/rules/role-has-required-aria-props.md     | 13 ++++++++-----
 docs/rules/role-supports-aria-props.md         | 13 ++++++++-----
 docs/rules/scope.md                            | 10 +++++++---
 docs/rules/tabindex-no-positive.md             | 10 ++++++----
 36 files changed, 248 insertions(+), 129 deletions(-)

diff --git a/docs/rules/accessible-emoji.md b/docs/rules/accessible-emoji.md
index f8920250a..8f77d7c6b 100644
--- a/docs/rules/accessible-emoji.md
+++ b/docs/rules/accessible-emoji.md
@@ -1,9 +1,6 @@
 # [Deprecated] accessible-emoji
 
-Emoji have become a common way of communicating content to the end user. To a person using a screenreader, however, he/she may not be aware that this content is there at all. By wrapping the emoji in a `<span>`, giving it the `role="img"`, and providing a useful description in `aria-label`, the screenreader will treat the emoji as an image in the accessibility tree with an accessible name for the end user.
-
-#### Resources
-1. [Léonie Watson](http://tink.uk/accessible-emoji/)
+Emoji have become a common way of communicating content to the end user. To a person using a screenreader, however, they may not be aware that this content is there at all. By wrapping the emoji in a `<span>`, giving it the `role="img"`, and providing a useful description in `aria-label`, the screenreader will treat the emoji as an image in the accessibility tree with an accessible name for the end user.
 
 ## Rule details
 
@@ -21,3 +18,9 @@ This rule takes no arguments.
 <span>🐼</span>
 <i role="img" aria-label="Panda">🐼</i>
 ```
+
+## Accessibility guidelines
+- [WCAG 1.1.1](https://www.w3.org/WAI/WCAG21/Understanding/non-text-content.html)
+
+### Resources
+- [Léonie Watson, Accessible Emoji](http://tink.uk/accessible-emoji/)
diff --git a/docs/rules/alt-text.md b/docs/rules/alt-text.md
index e86edfc63..3837d0a99 100644
--- a/docs/rules/alt-text.md
+++ b/docs/rules/alt-text.md
@@ -2,12 +2,6 @@
 
 Enforce that all elements that require alternative text have meaningful information to relay back to the end user. This is a critical component of accessibility for screenreader users in order for them to understand the content's purpose on the page. By default, this rule checks for alternative text on the following elements: `<img>`, `<area>`, `<input type="image">`, and `<object>`.
 
-#### Resources
-1. [axe-core, object-alt](https://dequeuniversity.com/rules/axe/3.2/object-alt)
-2. [axe-core, image-alt](https://dequeuniversity.com/rules/axe/3.2/image-alt)
-3. [axe-core, input-image-alt](https://dequeuniversity.com/rules/axe/3.2/input-image-alt)
-4. [axe-core, area-alt](https://dequeuniversity.com/rules/axe/3.2/area-alt)
-
 ## How to resolve
 ### `<img>`
 An `<img>` must have the `alt` prop set with meaningful text or as an empty string to indicate that it is an image for decoration.
@@ -141,3 +135,12 @@ function Foo(props) {
 
 <input type="image" {...props} />
 ```
+
+## Accessibility guidelines
+- [WCAG 1.1.1](https://www.w3.org/WAI/WCAG21/Understanding/non-text-content.html)
+
+### Resources
+- [axe-core, object-alt](https://dequeuniversity.com/rules/axe/3.2/object-alt)
+- [axe-core, image-alt](https://dequeuniversity.com/rules/axe/3.2/image-alt)
+- [axe-core, input-image-alt](https://dequeuniversity.com/rules/axe/3.2/input-image-alt)
+- [axe-core, area-alt](https://dequeuniversity.com/rules/axe/3.2/area-alt)
diff --git a/docs/rules/anchor-has-content.md b/docs/rules/anchor-has-content.md
index 8a6a1cf2d..cbb6e9c62 100644
--- a/docs/rules/anchor-has-content.md
+++ b/docs/rules/anchor-has-content.md
@@ -2,9 +2,6 @@
 
 Enforce that anchors have content and that the content is accessible to screen readers. Accessible means that it is not hidden using the `aria-hidden` prop. Refer to the references to learn about why this is important.
 
-#### References
-1. [axe-core, link-name](https://dequeuniversity.com/rules/axe/3.2/link-name)
-
 ## Rule details
 
 This rule takes one optional object argument of type object:
@@ -51,3 +48,9 @@ return (
 <a />
 <a><TextWrapper aria-hidden /></a>
 ```
+## Accessibility guidelines
+- [WCAG 2.4.4](https://www.w3.org/WAI/WCAG21/Understanding/link-purpose-in-context)
+- [WCAG 4.1.2](https://www.w3.org/WAI/WCAG21/Understanding/name-role-value)
+
+### Resources
+- [axe-core, link-name](https://dequeuniversity.com/rules/axe/3.2/link-name)
diff --git a/docs/rules/anchor-is-valid.md b/docs/rules/anchor-is-valid.md
index afbfb15bd..de5c1f4f7 100644
--- a/docs/rules/anchor-is-valid.md
+++ b/docs/rules/anchor-is-valid.md
@@ -128,12 +128,6 @@ This button element can now also be used inline in text.
 
 Once again we stress that this is an inferior implementation and some users will encounter difficulty to use your website, however, it will allow a larger group of people to interact with your website than the alternative of ignoring the rule's warning.
 
-
-### References
-  1. [WebAIM - Introduction to Links and Hypertext](http://webaim.org/techniques/hypertext/)
-  1. [Links vs. Buttons in Modern Web Applications](https://marcysutton.com/links-vs-buttons-in-modern-web-applications/)
-  1. [Using ARIA - Notes on ARIA use in HTML](https://www.w3.org/TR/using-aria/#NOTES)
-
 ## Rule details
 
 This rule takes one optional object argument of type object:
@@ -221,4 +215,12 @@ Invalid `href` attribute:
 <a href="javascript:void(0)" />
 <a href={"javascript:void(0)"} />
 <a href={`javascript:void(0)`} />
-```
\ No newline at end of file
+```
+
+## Accessibility guidelines
+- [WCAG 2.1.1](https://www.w3.org/WAI/WCAG21/Understanding/keyboard)
+
+### Resources
+- [WebAIM - Introduction to Links and Hypertext](http://webaim.org/techniques/hypertext/)
+- [Links vs. Buttons in Modern Web Applications](https://marcysutton.com/links-vs-buttons-in-modern-web-applications/)
+- [Using ARIA - Notes on ARIA use in HTML](https://www.w3.org/TR/using-aria/#NOTES)
diff --git a/docs/rules/aria-activedescendant-has-tabindex.md b/docs/rules/aria-activedescendant-has-tabindex.md
index 688e9e03f..d3499335d 100644
--- a/docs/rules/aria-activedescendant-has-tabindex.md
+++ b/docs/rules/aria-activedescendant-has-tabindex.md
@@ -14,9 +14,6 @@ Because an element with `aria-activedescendant` must be tabbable, it must either
 have an inherent `tabIndex` of zero or declare a `tabIndex` of zero with the `tabIndex`
 attribute.
 
-#### References
-1. [MDN](https://developer.mozilla.org/en-US/docs/Web/Accessibility/ARIA/ARIA_Techniques/Using_the_aria-activedescendant_attribute)
-
 ## Rule details
 
 This rule takes no arguments.
@@ -44,3 +41,9 @@ This rule takes no arguments.
 <div aria-activedescendant={someID} tabIndex="-1" />
 <input aria-activedescendant={someID} tabIndex={-1} />
 ```
+
+## Accessibility guidelines
+General best practice (reference resources)
+
+### Resources
+- [MDN, Using the aria-activedescendant attribute](https://developer.mozilla.org/en-US/docs/Web/Accessibility/ARIA/ARIA_Techniques/Using_the_aria-activedescendant_attribute)
diff --git a/docs/rules/aria-props.md b/docs/rules/aria-props.md
index 36cb32589..cde013322 100644
--- a/docs/rules/aria-props.md
+++ b/docs/rules/aria-props.md
@@ -20,3 +20,6 @@ This rule takes no arguments.
 <div id="address_label">Enter your address</div>
 <input aria-labeledby="address_label">
 ```
+
+## Accessibility guidelines
+- [WCAG 4.1.2](https://www.w3.org/WAI/WCAG21/Understanding/name-role-value)
diff --git a/docs/rules/aria-proptypes.md b/docs/rules/aria-proptypes.md
index 8d53cd07b..ca98a5a54 100644
--- a/docs/rules/aria-proptypes.md
+++ b/docs/rules/aria-proptypes.md
@@ -2,10 +2,6 @@
 
 ARIA state and property values must be valid.
 
-#### References
-1. [Spec](https://www.w3.org/TR/wai-aria/#states_and_properties)
-2. [AX_ARIA_04](https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_aria_04)
-
 ## Rule details
 
 This rule takes no arguments.
@@ -22,3 +18,9 @@ This rule takes no arguments.
 <span aria-hidden="yes">foo</span>
 ```
 
+## Accessibility guidelines
+- [WCAG 4.1.2](https://www.w3.org/WAI/WCAG21/Understanding/name-role-value)
+
+### Resources
+- [ARIA Spec, States and Properties](https://www.w3.org/TR/wai-aria/#states_and_properties)
+- [Chrome Audit Rules, AX_ARIA_04](https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_aria_04)
diff --git a/docs/rules/aria-role.md b/docs/rules/aria-role.md
index fe5f7f188..122c08a4d 100644
--- a/docs/rules/aria-role.md
+++ b/docs/rules/aria-role.md
@@ -2,9 +2,6 @@
 
 Elements with ARIA roles must use a valid, non-abstract ARIA role. A reference to role definitions can be found at [WAI-ARIA](https://www.w3.org/TR/wai-aria/#role_definitions) site.
 
-[AX_ARIA_01](https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_aria_01)
-[DPUB-ARIA roles](https://www.w3.org/TR/dpub-aria-1.0/)
-
 ## Rule details
 
 This rule takes one optional object argument of type object:
@@ -37,3 +34,10 @@ For the `ignoreNonDOM` option, this determines if developer created components a
 <div role=""></div>           <!-- Bad: An empty ARIA role is not allowed -->
 <Foo role={role}></Foo>       <!-- Bad: ignoreNonDOM is set to false or not set -->
 ```
+
+## Accessibility guidelines
+- [WCAG 4.1.2](https://www.w3.org/WAI/WCAG21/Understanding/name-role-value)
+
+### Resources
+- [Chrome Audit Rules, AX_ARIA_01](https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_aria_01)
+- [DPUB-ARIA roles](https://www.w3.org/TR/dpub-aria-1.0/)
diff --git a/docs/rules/aria-unsupported-elements.md b/docs/rules/aria-unsupported-elements.md
index 452c3d48c..8f13ad852 100644
--- a/docs/rules/aria-unsupported-elements.md
+++ b/docs/rules/aria-unsupported-elements.md
@@ -2,9 +2,6 @@
 
 Certain reserved DOM elements do not support ARIA roles, states and properties. This is often because they are not visible, for example `meta`, `html`, `script`, `style`. This rule enforces that these DOM elements do not contain the `role` and/or `aria-*` props.
 
-#### References
-1. [AX_ARIA_12](https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_aria_12)
-
 ## Rule details
 
 This rule takes no arguments.
@@ -21,3 +18,9 @@ This rule takes no arguments.
 <meta charset="UTF-8" aria-hidden="false" />
 ```
 
+## Accessibility guidelines
+- [WCAG 4.1.2](https://www.w3.org/WAI/WCAG21/Understanding/name-role-value)
+
+### Resources
+- [Chrome Audit Rules, AX_ARIA_12](https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_aria_12)
+- [DPUB-ARIA roles](https://www.w3.org/TR/dpub-aria-1.0/)
diff --git a/docs/rules/autocomplete-valid.md b/docs/rules/autocomplete-valid.md
index 35f261911..19c38d9d1 100644
--- a/docs/rules/autocomplete-valid.md
+++ b/docs/rules/autocomplete-valid.md
@@ -2,10 +2,6 @@
 
 Ensure the autocomplete attribute is correct and suitable for the form field it is used with.
 
-#### References
-1. [axe-core, autocomplete-valid](https://dequeuniversity.com/rules/axe/3.2/autocomplete-valid)
-2. [HTML 5.2, Autocomplete requirements](https://www.w3.org/TR/html52/sec-forms.html#autofilling-form-controls-the-autocomplete-attribute)
-
 ## Rule details
 
 This rule takes one optional object argument of type object:
@@ -39,4 +35,11 @@ This rule takes one optional object argument of type object:
 
 <!-- Bad: MyInput is listed in inputComponents -->
 <MyInput autocomplete="incorrect" /> 
-```
\ No newline at end of file
+```
+
+## Accessibility guidelines
+- [WCAG 1.3.5](https://www.w3.org/WAI/WCAG21/Understanding/identify-input-purpose)
+
+### Resources
+- [axe-core, autocomplete-valid](https://dequeuniversity.com/rules/axe/3.2/autocomplete-valid)
+- [HTML 5.2, Autocomplete requirements](https://www.w3.org/TR/html52/sec-forms.html#autofilling-form-controls-the-autocomplete-attribute)
diff --git a/docs/rules/click-events-have-key-events.md b/docs/rules/click-events-have-key-events.md
index d89869b14..d60e6ae03 100644
--- a/docs/rules/click-events-have-key-events.md
+++ b/docs/rules/click-events-have-key-events.md
@@ -1,6 +1,6 @@
 # click-events-have-key-events
 
-Enforce `onClick` is accompanied by at least one of the following: `onKeyUp`, `onKeyDown`, `onKeyPress`. Coding for the keyboard is important for users with physical disabilities who cannot use a mouse, AT compatibility, and screenreader users.
+Enforce `onClick` is accompanied by at least one of the following: `onKeyUp`, `onKeyDown`, `onKeyPress`. Coding for the keyboard is important for users with physical disabilities who cannot use a mouse, AT compatibility, and screenreader users. This does not apply for interactive or hidden elements.
 
 ## Rule details
 
@@ -11,9 +11,14 @@ This rule takes no arguments.
 <div onClick={() => {}} onKeyDown={this.handleKeyDown} />
 <div onClick={() => {}} onKeyUp={this.handleKeyUp} />
 <div onClick={() => {}} onKeyPress={this.handleKeyPress} />
+<button onClick={() => {}} />
+<div onClick{() => {}} aria-hidden="true" />
 ```
 
 ### Fail
 ```jsx
 <div onClick={() => {}} />
 ```
+
+## Accessibility guidelines
+- [WCAG 2.1.1](https://www.w3.org/WAI/WCAG21/Understanding/keyboard)
diff --git a/docs/rules/control-has-associated-label.md b/docs/rules/control-has-associated-label.md
index f66d1ccb7..344407ecf 100644
--- a/docs/rules/control-has-associated-label.md
+++ b/docs/rules/control-has-associated-label.md
@@ -102,3 +102,8 @@ This rule takes one optional object argument of type object:
 ```jsx
 <button type="button" class="icon-save" />
 ```
+
+## Accessibility guidelines
+- [WCAG 1.3.1](https://www.w3.org/WAI/WCAG21/Understanding/info-and-relationships)
+- [WCAG 3.3.2](https://www.w3.org/WAI/WCAG21/Understanding/labels-or-instructions)
+- [WCAG 4.1.2](https://www.w3.org/WAI/WCAG21/Understanding/name-role-value)
diff --git a/docs/rules/heading-has-content.md b/docs/rules/heading-has-content.md
index 6f5f53e8c..a575ac2d1 100644
--- a/docs/rules/heading-has-content.md
+++ b/docs/rules/heading-has-content.md
@@ -2,9 +2,6 @@
 
 Enforce that heading elements (`h1`, `h2`, etc.) have content and that the content is accessible to screen readers. Accessible means that it is not hidden using the `aria-hidden` prop. Refer to the references to learn about why this is important.
 
-#### References
-1. [axe-core, empty-heading](https://dequeuniversity.com/rules/axe/3.2/empty-heading)
-
 ## Rule details
 
 This rule takes one optional object argument of type object:
@@ -58,3 +55,9 @@ function Foo(props) {
 <h1 />
 <h1><TextWrapper aria-hidden />
 ```
+
+## Accessibility guidelines
+- [WCAG 2.4.6](https://www.w3.org/TR/UNDERSTANDING-WCAG20/navigation-mechanisms-descriptive.html)
+
+### Resources
+- [axe-core, empty-heading](https://dequeuniversity.com/rules/axe/3.2/empty-heading)
diff --git a/docs/rules/html-has-lang.md b/docs/rules/html-has-lang.md
index f5c916239..e99c390ec 100644
--- a/docs/rules/html-has-lang.md
+++ b/docs/rules/html-has-lang.md
@@ -2,10 +2,6 @@
 
 <html> elements must have the lang prop.
 
-#### References
-1. [axe-core, html-has-lang](https://dequeuniversity.com/rules/axe/3.2/html-has-lang)
-1. [axe-core, html-lang-valid](https://dequeuniversity.com/rules/axe/3.2/html-lang-valid)
-
 ## Rule details
 
 This rule takes no arguments.
@@ -22,3 +18,10 @@ This rule takes no arguments.
 ```jsx
 <html>
 ```
+
+## Accessibility guidelines
+- [WCAG 3.1.1](https://www.w3.org/WAI/WCAG21/Understanding/language-of-page)
+
+### Resources
+- [axe-core, html-has-lang](https://dequeuniversity.com/rules/axe/3.2/html-has-lang)
+- [axe-core, html-lang-valid](https://dequeuniversity.com/rules/axe/3.2/html-lang-valid)
diff --git a/docs/rules/iframe-has-title.md b/docs/rules/iframe-has-title.md
index 7880ecc88..fac618527 100644
--- a/docs/rules/iframe-has-title.md
+++ b/docs/rules/iframe-has-title.md
@@ -2,9 +2,6 @@
 
 `<iframe>` elements must have a unique title property to indicate its content to the user.
 
-#### References
-1. [axe-core, frame-title](https://dequeuniversity.com/rules/axe/3.2/frame-title)
-
 ## Rule details
 
 This rule takes no arguments.
@@ -27,3 +24,10 @@ This rule takes no arguments.
 <iframe title={true} />
 <iframe title={42} />
 ```
+
+## Accessibility guidelines
+- [WCAG 2.4.1](https://www.w3.org/WAI/WCAG21/Understanding/bypass-blocks)
+- [WCAG 4.1.2](https://www.w3.org/WAI/WCAG21/Understanding/name-role-value)
+
+### Resources
+- [axe-core, frame-title](https://dequeuniversity.com/rules/axe/3.2/frame-title)
diff --git a/docs/rules/img-redundant-alt.md b/docs/rules/img-redundant-alt.md
index 92d875591..d06aaa79f 100644
--- a/docs/rules/img-redundant-alt.md
+++ b/docs/rules/img-redundant-alt.md
@@ -36,3 +36,9 @@ The rule will first check if `aria-hidden` is true to determine whether to enfor
 <img src="bar" alt="Image of me at a bar!" />
 <img src="baz" alt="Picture of baz fixing a bug." />
 ```
+
+## Accessibility guidelines
+General best practice (reference resources)
+
+### Resources
+- [WebAIM, Alternative Text](https://webaim.org/techniques/alttext/)
diff --git a/docs/rules/interactive-supports-focus.md b/docs/rules/interactive-supports-focus.md
index 81f951407..d7cd0e671 100644
--- a/docs/rules/interactive-supports-focus.md
+++ b/docs/rules/interactive-supports-focus.md
@@ -50,12 +50,6 @@ If your element is catching bubbled click or key events from descendant elements
 
 Marking an element with the role `presentation` indicates to assistive technology that this element should be ignored; it exists to support the web application and is not meant for humans to interact with directly.
 
-### References
-  1. [AX_FOCUS_02](https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_focus_02)
-  1. [Mozilla Developer Network - ARIA Techniques](https://developer.mozilla.org/en-US/docs/Web/Accessibility/ARIA/ARIA_Techniques/Using_the_button_role#Keyboard_and_focus)
-  1. [Fundamental Keyboard Navigation Conventions](https://www.w3.org/TR/wai-aria-practices-1.1/#kbd_generalnav)
-  1. [WAI-ARIA Authoring Practices Guide - Design Patterns and Widgets](https://www.w3.org/TR/wai-aria-practices-1.1/#aria_ex)
-
 ## Rule details
 
 This rule takes an options object with the key `tabbable`. The value is an array of interactive ARIA roles that should be considered tabbable, not just focusable. Any interactive role not included in this list will be flagged as needing to be focusable (tabindex of -1).
@@ -143,3 +137,12 @@ The list of possible values includes:
 <!-- Bad: anchor element without href is not focusable -->
 <a onclick="showNextPage();" role="button">Next page</a>
 ```
+
+## Accessibility guidelines
+- [WCAG 2.1.1](https://www.w3.org/WAI/WCAG21/Understanding/keyboard)
+
+### Resources
+- [Chrome Audit Rules, AX_FOCUS_02](https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_focus_02) 
+- [Mozilla Developer Network - ARIA Techniques](https://developer.mozilla.org/en-US/docs/Web/Accessibility/ARIA/ARIA_Techniques/Using_the_button_role#Keyboard_and_focus)
+- [Fundamental Keyboard Navigation Conventions](https://www.w3.org/TR/wai-aria-practices-1.1/#kbd_generalnav)
+- [WAI-ARIA Authoring Practices Guide - Design Patterns and Widgets](https://www.w3.org/TR/wai-aria-practices-1.1/#aria_ex)
diff --git a/docs/rules/label-has-associated-control.md b/docs/rules/label-has-associated-control.md
index 9d6005961..14e12c134 100644
--- a/docs/rules/label-has-associated-control.md
+++ b/docs/rules/label-has-associated-control.md
@@ -137,3 +137,8 @@ function Foo(props) {
   Surname
 </label>
 ```
+
+## Accessibility guidelines
+- [WCAG 1.3.1](https://www.w3.org/WAI/WCAG21/Understanding/info-and-relationships)
+- [WCAG 3.3.2](https://www.w3.org/WAI/WCAG21/Understanding/labels-or-instructions)
+- [WCAG 4.1.2](https://www.w3.org/WAI/WCAG21/Understanding/name-role-value)
diff --git a/docs/rules/label-has-for.md b/docs/rules/label-has-for.md
index 5fff12caf..77a3beeda 100644
--- a/docs/rules/label-has-for.md
+++ b/docs/rules/label-has-for.md
@@ -112,3 +112,8 @@ function Foo(props) {
 <input type="text" id="firstName" />
 <label>First Name</label>
 ```
+
+## Accessibility guidelines
+- [WCAG 1.3.1](https://www.w3.org/WAI/WCAG21/Understanding/info-and-relationships)
+- [WCAG 3.3.2](https://www.w3.org/WAI/WCAG21/Understanding/labels-or-instructions)
+- [WCAG 4.1.2](https://www.w3.org/WAI/WCAG21/Understanding/name-role-value)
diff --git a/docs/rules/lang.md b/docs/rules/lang.md
index ce133afd4..66ac44f53 100644
--- a/docs/rules/lang.md
+++ b/docs/rules/lang.md
@@ -2,12 +2,6 @@
 
 The `lang` prop on the `<html>` element must be a valid IETF's BCP 47 language tag.
 
-#### References
-
-1. [axe-core, valid-lang](https://dequeuniversity.com/rules/axe/3.2/valid-lang)
-2. [Language tags in HTML and XML](https://www.w3.org/International/articles/language-tags/)
-3. [IANA Language Subtag Registry](https://www.iana.org/assignments/language-subtag-registry/language-subtag-registry)
-
 ## Rule details
 
 This rule takes no arguments.
@@ -25,3 +19,11 @@ This rule takes no arguments.
 <html>
 <html lang="foo">
 ```
+
+## Accessibility guidelines
+- [WCAG 3.1.1](https://www.w3.org/WAI/WCAG21/Understanding/language-of-page)
+
+### Resources
+- [axe-core, valid-lang](https://dequeuniversity.com/rules/axe/3.2/valid-lang)
+- [Language tags in HTML and XML](https://www.w3.org/International/articles/language-tags/)
+- [IANA Language Subtag Registry](https://www.iana.org/assignments/language-subtag-registry/language-subtag-registry)
diff --git a/docs/rules/media-has-caption.md b/docs/rules/media-has-caption.md
index 6857361f5..3c7b020ad 100644
--- a/docs/rules/media-has-caption.md
+++ b/docs/rules/media-has-caption.md
@@ -4,11 +4,6 @@ Providing captions for media is essential for deaf users to follow along. Captio
 
 The captions should contain all important and relevant information to understand the corresponding media. This may mean that the captions are not a 1:1 mapping of the dialogue in the media content. However, captions are *not* necessary for video components with the `muted` attribute.
 
-### References
-
-  1. [audio](https://dequeuniversity.com/rules/axe/2.1/audio-caption)
-  1. [video](https://dequeuniversity.com/rules/axe/2.1/video-caption)
-
 ## Rule details
 
 This rule takes one optional object argument of type object:
@@ -39,3 +34,11 @@ For the `audio`, `video`, and `track` options, these strings determine which JSX
 <audio {...props} />
 <video {...props} />
 ```
+
+## Accessibility guidelines
+- [WCAG 1.2.2](https://www.w3.org/WAI/WCAG21/Understanding/captions-prerecorded.html)
+- [WCAG 1.2.3](https://www.w3.org/WAI/WCAG21/Understanding/audio-description-or-media-alternative-prerecorded.html)
+
+### Resources
+- [axe-core, audio-caption](https://dequeuniversity.com/rules/axe/2.1/audio-caption)
+- [axe-core, video-caption](https://dequeuniversity.com/rules/axe/2.1/video-caption)
diff --git a/docs/rules/mouse-events-have-key-events.md b/docs/rules/mouse-events-have-key-events.md
index 21d85ae4b..53bd10c79 100644
--- a/docs/rules/mouse-events-have-key-events.md
+++ b/docs/rules/mouse-events-have-key-events.md
@@ -23,3 +23,6 @@ In example 3 and 4 below, even if otherProps contains onBlur and/or onFocus, thi
 <div onMouseOver={ () => void 0 } {...otherProps} />
 <div onMouseOut={ () => void 0 } {...otherProps} />
 ```
+
+## Accessibility guidelines
+- [WCAG 2.1.1](https://www.w3.org/WAI/WCAG21/Understanding/keyboard)
diff --git a/docs/rules/no-access-key.md b/docs/rules/no-access-key.md
index 1e62912c4..b3c18500f 100644
--- a/docs/rules/no-access-key.md
+++ b/docs/rules/no-access-key.md
@@ -18,3 +18,9 @@ This rule takes no arguments.
 ```jsx
 <div accessKey="h" />
 ```
+
+## Accessibility guidelines
+General best practice (reference resources)
+
+### Resources
+- [WebAIM, Keyboard Accessibility: Accesskey](http://webaim.org/techniques/keyboard/accesskey#spec)
diff --git a/docs/rules/no-autofocus.md b/docs/rules/no-autofocus.md
index be38a058e..8b01ad3d5 100644
--- a/docs/rules/no-autofocus.md
+++ b/docs/rules/no-autofocus.md
@@ -2,9 +2,6 @@
 
 Enforce that autoFocus prop is not used on elements. Autofocusing elements can cause usability issues for sighted and non-sighted users, alike.
 
-#### References
-1. [w3c](https://w3c.github.io/html/sec-forms.html#autofocusing-a-form-control-the-autofocus-attribute)
-
 ## Rule details
 
 This rule takes one optional object argument of type object:
@@ -33,3 +30,10 @@ For the `ignoreNonDOM` option, this determines if developer created components a
 <div autoFocus="false" />
 <div autoFocus={undefined} />
 ```
+
+## Accessibility guidelines
+General best practice (reference resources)
+
+### Resources
+- [WHATWG HTML Standard, The autofocus attribute](https://html.spec.whatwg.org/multipage/interaction.html#attr-fe-autofocus)
+- [The accessibility of HTML 5 autofocus](https://www.brucelawson.co.uk/2009/the-accessibility-of-html-5-autofocus/)
diff --git a/docs/rules/no-distracting-elements.md b/docs/rules/no-distracting-elements.md
index 85380e275..148ee9811 100644
--- a/docs/rules/no-distracting-elements.md
+++ b/docs/rules/no-distracting-elements.md
@@ -2,10 +2,6 @@
 
 Enforces that no distracting elements are used. Elements that can be visually distracting can cause accessibility issues with visually impaired users. Such elements are most likely deprecated, and should be avoided. By default, the following elements are visually distracting: `<marquee>` and `<blink>`.
 
-#### References
-1. [axe-core, marquee](https://dequeuniversity.com/rules/axe/3.2/marquee)
-2. [axe-core, blink](https://dequeuniversity.com/rules/axe/3.2/blink)
-
 ## Rule details
 
 This rule takes one optional object argument of type object:
@@ -32,3 +28,10 @@ For the `elements` option, these strings determine which JSX elements should be
 <marquee />
 <blink />
 ```
+
+## Accessibility guidelines
+- [WCAG 2.2.2](https://www.w3.org/WAI/WCAG21/Understanding/pause-stop-hide)
+
+### Resources
+- [axe-core, marquee](https://dequeuniversity.com/rules/axe/3.2/marquee)
+- [axe-core, blink](https://dequeuniversity.com/rules/axe/3.2/blink)
diff --git a/docs/rules/no-interactive-element-to-noninteractive-role.md b/docs/rules/no-interactive-element-to-noninteractive-role.md
index 7a71adf1b..5eda0a6de 100644
--- a/docs/rules/no-interactive-element-to-noninteractive-role.md
+++ b/docs/rules/no-interactive-element-to-noninteractive-role.md
@@ -32,13 +32,6 @@ Put the content inside your interactive element.
 </div>
 ```
 
-### References
-
-  1. [WAI-ARIA roles](https://www.w3.org/TR/wai-aria-1.1/#usage_intro)
-  1. [WAI-ARIA Authoring Practices Guide - Design Patterns and Widgets](https://www.w3.org/TR/wai-aria-practices-1.1/#aria_ex)
-  1. [Fundamental Keyboard Navigation Conventions](https://www.w3.org/TR/wai-aria-practices-1.1/#kbd_generalnav)
-  1. [Mozilla Developer Network - ARIA Techniques](https://developer.mozilla.org/en-US/docs/Web/Accessibility/ARIA/ARIA_Techniques/Using_the_button_role#Keyboard_and_focus)
-
 ## Rule details
 
 The recommended options for this rule allow the `tr` element to be given a role of `presentation` (or its semantic equivalent `none`). Under normal circumstances, an element with an interactive role should not be semantically neutralized with `presentation` (or `none`).
@@ -61,3 +54,14 @@ Under the recommended options, the following code is valid. It would be invalid
 ```jsx
 <tr role="presentation" />
 ```
+
+## Accessibility guidelines
+- [WCAG 4.1.2](https://www.w3.org/WAI/WCAG21/Understanding/name-role-value)
+
+### Resources
+- [ARIA Spec, States and Properties](https://www.w3.org/TR/wai-aria/#states_and_properties)
+- [Chrome Audit Rules, AX_ARIA_04](https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_aria_04)
+- [WAI-ARIA roles](https://www.w3.org/TR/wai-aria-1.1/#usage_intro)
+- [WAI-ARIA Authoring Practices Guide - Design Patterns and Widgets](https://www.w3.org/TR/wai-aria-practices-1.1/#aria_ex)
+- [Fundamental Keyboard Navigation Conventions](https://www.w3.org/TR/wai-aria-practices-1.1/#kbd_generalnav)
+- [Mozilla Developer Network - ARIA Techniques](https://developer.mozilla.org/en-US/docs/Web/Accessibility/ARIA/ARIA_Techniques/Using_the_button_role#Keyboard_and_focus)
diff --git a/docs/rules/no-noninteractive-element-interactions.md b/docs/rules/no-noninteractive-element-interactions.md
index 3ad0091f2..954b95a97 100644
--- a/docs/rules/no-noninteractive-element-interactions.md
+++ b/docs/rules/no-noninteractive-element-interactions.md
@@ -89,13 +89,6 @@ If your user interface has a table-like layout, but is filled with interactive c
 
 You can also put the interactive content inside the grid cell. This maintains the semantic distinction between the cell and the interaction content, although a grid cell can be interactive.
 
-### References
-
-  1. [WAI-ARIA roles](https://www.w3.org/TR/wai-aria-1.1/#usage_intro)
-  1. [WAI-ARIA Authoring Practices Guide - Design Patterns and Widgets](https://www.w3.org/TR/wai-aria-practices-1.1/#aria_ex)
-  1. [Fundamental Keyboard Navigation Conventions](https://www.w3.org/TR/wai-aria-practices-1.1/#kbd_generalnav)
-  1. [Mozilla Developer Network - ARIA Techniques](https://developer.mozilla.org/en-US/docs/Web/Accessibility/ARIA/ARIA_Techniques/Using_the_button_role#Keyboard_and_focus)
-
 ## Rule details
 
 You may configure which handler props should be taken into account when applying this rule. The recommended configuration includes the following 6 handlers.
@@ -133,3 +126,12 @@ Adjust the list of handler prop names in the handlers array to increase or decre
 <li onClick={() => void 0} />
 <div onClick={() => void 0} role="listitem" />
 ```
+
+## Accessibility guidelines
+- [WCAG 4.1.2](https://www.w3.org/WAI/WCAG21/Understanding/name-role-value)
+
+### Resources
+- [WAI-ARIA roles](https://www.w3.org/TR/wai-aria-1.1/#usage_intro)
+- [WAI-ARIA Authoring Practices Guide - Design Patterns and Widgets](https://www.w3.org/TR/wai-aria-practices-1.1/#aria_ex)
+- [Fundamental Keyboard Navigation Conventions](https://www.w3.org/TR/wai-aria-practices-1.1/#kbd_generalnav)
+- [Mozilla Developer Network - ARIA Techniques](https://developer.mozilla.org/en-US/docs/Web/Accessibility/ARIA/ARIA_Techniques/Using_the_button_role#Keyboard_and_focus)
diff --git a/docs/rules/no-noninteractive-element-to-interactive-role.md b/docs/rules/no-noninteractive-element-to-interactive-role.md
index c1f905ee0..60c6e37bd 100644
--- a/docs/rules/no-noninteractive-element-to-interactive-role.md
+++ b/docs/rules/no-noninteractive-element-to-interactive-role.md
@@ -36,13 +36,6 @@ Or wrap the content inside your interactive element.
 </div>
 ```
 
-### References
-
-1. [WAI-ARIA roles](https://www.w3.org/TR/wai-aria-1.1/#usage_intro)
-1. [WAI-ARIA Authoring Practices Guide - Design Patterns and Widgets](https://www.w3.org/TR/wai-aria-practices-1.1/#aria_ex)
-1. [Fundamental Keyboard Navigation Conventions](https://www.w3.org/TR/wai-aria-practices-1.1/#kbd_generalnav)
-1. [Mozilla Developer Network - ARIA Techniques](https://developer.mozilla.org/en-US/docs/Web/Accessibility/ARIA/ARIA_Techniques/Using_the_button_role#Keyboard_and_focus)
-
 ## Rule details
 
 The recommended options for this rule allow several common interactive roles to be applied to a non-interactive element. The options are provided as an object keyed by HTML element name; the value is an array of interactive roles that are allowed on the specified element.
@@ -67,3 +60,12 @@ Under the recommended options, the following code is valid. It would be invalid
 ```jsx
 <ul role="menu" />
 ```
+
+## Accessibility guidelines
+- [WCAG 4.1.2](https://www.w3.org/WAI/WCAG21/Understanding/name-role-value)
+
+### Resources
+- [WAI-ARIA roles](https://www.w3.org/TR/wai-aria-1.1/#usage_intro)
+- [WAI-ARIA Authoring Practices Guide - Design Patterns and Widgets](https://www.w3.org/TR/wai-aria-practices-1.1/#aria_ex)
+- [Fundamental Keyboard Navigation Conventions](https://www.w3.org/TR/wai-aria-practices-1.1/#kbd_generalnav)
+- [Mozilla Developer Network - ARIA Techniques](https://developer.mozilla.org/en-US/docs/Web/Accessibility/ARIA/ARIA_Techniques/Using_the_button_role#Keyboard_and_focus)
diff --git a/docs/rules/no-noninteractive-tabindex.md b/docs/rules/no-noninteractive-tabindex.md
index a0dcdb6ff..740c343ce 100644
--- a/docs/rules/no-noninteractive-tabindex.md
+++ b/docs/rules/no-noninteractive-tabindex.md
@@ -46,10 +46,6 @@ It is not necessary to put a tabindex on an `<article>`, for instance or on `<li
 
 Your application might require an exception to this rule in the case of an element that captures incoming tab traversal for a composite widget. In that case, turn off this rule on a per instance basis. This is an uncommon case.
 
-### References
-
-  1. [Fundamental Keyboard Navigation Conventions](https://www.w3.org/TR/wai-aria-practices-1.1/#kbd_generalnav)
-
 ## Rule details
 
 The recommended options for this rule allow `tabIndex` on elements with the noninteractive `tabpanel` role. Adding `tabIndex` to a tabpanel is a recommended practice in some instances.
@@ -85,3 +81,9 @@ The recommended options for this rule allow `tabIndex` on elements with the noni
 <article tabIndex="0" />
 <article tabIndex={0} />
 ```
+
+## Accessibility guidelines
+- [WCAG 2.1.1](https://www.w3.org/WAI/WCAG21/Understanding/keyboard)
+
+### Resources
+- [Fundamental Keyboard Navigation Conventions](https://www.w3.org/TR/wai-aria-practices-1.1/#kbd_generalnav)
diff --git a/docs/rules/no-onchange.md b/docs/rules/no-onchange.md
index b2ea5a0c1..5c4875c77 100644
--- a/docs/rules/no-onchange.md
+++ b/docs/rules/no-onchange.md
@@ -2,10 +2,6 @@
 
 Enforce usage of `onBlur` over/in parallel with `onChange` on select menu elements for accessibility. `onBlur` **should** be used instead of `onChange`, unless absolutely necessary and it causes no negative consequences for keyboard only or screen reader users. `onBlur` is a more declarative action by the user: for instance in a dropdown, using the arrow keys to toggle between options will trigger the `onChange` event in some browsers. Regardless, when a change of context results from an `onBlur` event or an `onChange` event, the user should be notified of the change unless it occurs below the currently focused element.
 
-#### References
-1. [onChange Event Accessibility Issues](http://cita.disability.uiuc.edu/html-best-practices/auto/onchange.php)
-2. [onChange Select Menu](http://www.themaninblue.com/writing/perspective/2004/10/19/)
-
 ## Rule details
 
 This rule takes no arguments.
@@ -25,3 +21,10 @@ This rule takes no arguments.
 ```jsx
 <select onChange={updateModel} />
 ```
+
+## Accessibility guidelines
+- [WCAG 3.2.2](https://www.w3.org/WAI/WCAG21/Understanding/on-input)
+
+### Resources
+- [onChange Event Accessibility Issues](http://cita.disability.uiuc.edu/html-best-practices/auto/onchange.php)
+- [onChange Select Menu](http://www.themaninblue.com/writing/perspective/2004/10/19/)
diff --git a/docs/rules/no-redundant-roles.md b/docs/rules/no-redundant-roles.md
index a0481c00b..ab64c6364 100644
--- a/docs/rules/no-redundant-roles.md
+++ b/docs/rules/no-redundant-roles.md
@@ -2,9 +2,6 @@
 
 Some HTML elements have native semantics that are implemented by the browser. This includes default/implicit ARIA roles. Setting an ARIA role that matches its default/implicit role is redundant since it is already set by the browser.
 
-#### References
-1. [w3](https://www.w3.org/TR/html5/dom.html#aria-role-attribute)
-
 ## Rule details
 
 The default options for this rule allow an implicit role of `navigation` to be applied to a `nav` element as is [advised by w3](https://www.w3.org/WAI/GL/wiki/Using_HTML5_nav_element#Example:The_.3Cnav.3E_element). The options are provided as an object keyed by HTML element name; the value is an array of implicit ARIA roles that are allowed on the specified element.
@@ -31,3 +28,9 @@ The default options for this rule allow an implicit role of `navigation` to be a
 <button role="button" />
 <img role="img" src="foo.jpg" />
 ```
+
+## Accessibility guidelines
+General best practice (reference resources)
+
+### Resources
+- [ARIA Spec, ARIA Adds Nothing to Default Semantics of Most HTML Elements](https://www.w3.org/TR/using-aria/#aria-does-nothing)
diff --git a/docs/rules/no-static-element-interactions.md b/docs/rules/no-static-element-interactions.md
index b2cb6799e..a06c547fe 100644
--- a/docs/rules/no-static-element-interactions.md
+++ b/docs/rules/no-static-element-interactions.md
@@ -53,13 +53,6 @@ If your element is catching bubbled click or key events from descendant elements
 
 Do not use the role `presentation` on the element: it removes the element's semantics, and may also remove its children's semantics, creating big issues with assistive technology.
 
-### References
-
-  1. [WAI-ARIA `role` attribute](https://www.w3.org/TR/wai-aria-1.1/#usage_intro)
-  1. [WAI-ARIA Authoring Practices Guide - Design Patterns and Widgets](https://www.w3.org/TR/wai-aria-practices-1.1/#aria_ex)
-  1. [Fundamental Keyboard Navigation Conventions](https://www.w3.org/TR/wai-aria-practices-1.1/#kbd_generalnav)
-  1. [Mozilla Developer Network - ARIA Techniques](https://developer.mozilla.org/en-US/docs/Web/Accessibility/ARIA/ARIA_Techniques/Using_the_button_role#Keyboard_and_focus)
-
 ## Rule details
 
 You may configure which handler props should be taken into account when applying this rule. The recommended configuration includes the following 6 handlers.
@@ -95,3 +88,12 @@ Adjust the list of handler prop names in the handlers array to increase or decre
 ```jsx
 <div onClick={() => {}} />
 ```
+
+## Accessibility guidelines
+- [WCAG 4.1.2](https://www.w3.org/WAI/WCAG21/Understanding/name-role-value)
+
+### Resources
+- [WAI-ARIA `role` attribute](https://www.w3.org/TR/wai-aria-1.1/#usage_intro)
+- [WAI-ARIA Authoring Practices Guide - Design Patterns and Widgets](https://www.w3.org/TR/wai-aria-practices-1.1/#aria_ex)
+- [Fundamental Keyboard Navigation Conventions](https://www.w3.org/TR/wai-aria-practices-1.1/#kbd_generalnav)
+- [Mozilla Developer Network - ARIA Techniques](https://developer.mozilla.org/en-US/docs/Web/Accessibility/ARIA/ARIA_Techniques/Using_the_button_role#Keyboard_and_focus)
diff --git a/docs/rules/role-has-required-aria-props.md b/docs/rules/role-has-required-aria-props.md
index 092a98d91..e06c90235 100644
--- a/docs/rules/role-has-required-aria-props.md
+++ b/docs/rules/role-has-required-aria-props.md
@@ -2,10 +2,6 @@
 
 Elements with ARIA roles must have all required attributes for that role.
 
-#### References
-1. [Spec](https://www.w3.org/TR/wai-aria/#roles)
-2. [AX_ARIA_03](https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_aria_03)
-
 ## Rule details
 
 This rule takes no arguments.
@@ -21,4 +17,11 @@ This rule takes no arguments.
 ```jsx
 <!-- Bad: the checkbox role requires the aria-checked state -->
 <span role="checkbox" aria-labelledby="foo" tabindex="0"></span>
-```
\ No newline at end of file
+```
+
+## Accessibility guidelines
+- [WCAG 4.1.2](https://www.w3.org/WAI/WCAG21/Understanding/name-role-value)
+
+### Resources
+- [ARIA Spec, Roles](https://www.w3.org/TR/wai-aria/#roles)
+- [Chrome Audit Rules, AX_ARIA_03](https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_aria_03)
diff --git a/docs/rules/role-supports-aria-props.md b/docs/rules/role-supports-aria-props.md
index e089bc073..287d0ff98 100644
--- a/docs/rules/role-supports-aria-props.md
+++ b/docs/rules/role-supports-aria-props.md
@@ -2,10 +2,6 @@
 
 Enforce that elements with explicit or implicit roles defined contain only `aria-*` properties supported by that `role`. Many ARIA attributes (states and properties) can only be used on elements with particular roles. Some elements have implicit roles, such as `<a href="#" />`, which will resolve to `role="link"`.
 
-#### References
-1. [AX_ARIA_10](https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_aria_10)
-2. [Supported States & Properties](https://www.w3.org/TR/wai-aria/#states_and_properties)
-
 ## Rule details
 
 This rule takes no arguments.
@@ -29,4 +25,11 @@ This rule takes no arguments.
     <li aria-required tabIndex="-1" role="radio" aria-checked="false">Brook Trout</li>
     <li aria-required tabIndex="0" role="radio" aria-checked="true">Lake Trout</li>
 </ul>
-```
\ No newline at end of file
+```
+
+## Accessibility guidelines
+- [WCAG 4.1.2](https://www.w3.org/WAI/WCAG21/Understanding/name-role-value)
+
+### Resources
+- [ARIA Spec, States and Properties](https://www.w3.org/TR/wai-aria/#states_and_properties)
+- [Chrome Audit Rules, AX_ARIA_10](https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_aria_10)
diff --git a/docs/rules/scope.md b/docs/rules/scope.md
index d47a56cff..ba1bc0b11 100644
--- a/docs/rules/scope.md
+++ b/docs/rules/scope.md
@@ -2,9 +2,6 @@
 
 The `scope` scope should be used only on `<th>` elements.
 
-#### References
-1. [axe-core, scope](https://dequeuniversity.com/rules/axe/1.1/scope)
-
 ## Rule details
 
 This rule takes no arguments.
@@ -20,3 +17,10 @@ This rule takes no arguments.
 ```jsx
 <div scope />
 ```
+
+## Accessibility guidelines
+- [WCAG 1.3.1](https://www.w3.org/WAI/WCAG21/Understanding/info-and-relationships)
+- [WCAG 4.1.1](https://www.w3.org/WAI/WCAG21/Understanding/parsing)
+
+### Resources
+- [axe-core, scope-attr-valid](https://dequeuniversity.com/rules/axe/3.5/scope-attr-valid)
diff --git a/docs/rules/tabindex-no-positive.md b/docs/rules/tabindex-no-positive.md
index 3ea9b082f..e0762de2b 100644
--- a/docs/rules/tabindex-no-positive.md
+++ b/docs/rules/tabindex-no-positive.md
@@ -1,9 +1,6 @@
 # tabindex-no-positive
 
-Avoid positive tabIndex property values to synchronize the flow of the page with keyboard tab order.
-
-#### References
-1. [AX_FOCUS_03](https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_focus_03)
+Avoid positive `tabIndex` property values to synchronize the flow of the page with keyboard tab order.
 
 ## Rule details
 
@@ -24,3 +21,8 @@ This rule takes no arguments.
 <span tabIndex="2">never really sure what goes after baz</span>
 ```
 
+## Accessibility guidelines
+- [WCAG 2.4.3](https://www.w3.org/WAI/WCAG21/Understanding/focus-order)
+
+### Resources
+- [Chrome Audit Rules, AX_FOCUS_03](https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_focus_03)

From 00bd6d8198815883a6453173dcbe0c8b17f9f336 Mon Sep 17 00:00:00 2001
From: Joe Lencioni <joe.lencioni@airbnb.com>
Date: Tue, 30 Jun 2020 10:42:17 -0500
Subject: [PATCH 10/21] Add failing test for autocomplete with dynamic type

This will cause axe to throw an error like:

> TypeError: Cannot read property 'replace' of null

I believe that the problem might be related to getLiteralPropValue
returning `null` instead of `undefined` for dynamic props.
---
 __tests__/src/rules/autocomplete-valid-test.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/__tests__/src/rules/autocomplete-valid-test.js b/__tests__/src/rules/autocomplete-valid-test.js
index da7b39a1a..020c583f1 100644
--- a/__tests__/src/rules/autocomplete-valid-test.js
+++ b/__tests__/src/rules/autocomplete-valid-test.js
@@ -54,6 +54,7 @@ ruleTester.run('autocomplete-valid', rule, {
     { code: '<input type="text" autocomplete="invalid name" />;', errors: invalidAutocomplete },
     { code: '<input type="text" autocomplete="home url" />;', errors: invalidAutocomplete },
     { code: '<Bar autocomplete="baz"></Bar>;', errors: invalidAutocomplete, options: [{ inputComponents: ['Bar'] }] },
+    { code: '<input type={isEmail ? "email" : "text"} autocomplete="none" />;', errors: invalidAutocomplete },
 
     // FAILED "autocomplete-appropriate"
     { code: '<input type="date" autocomplete="email" />;', errors: inappropriateAutocomplete },

From 2c47f0ada2d71273a7d4adea856ad14636caaf42 Mon Sep 17 00:00:00 2001
From: Jordan Harband <ljharb@gmail.com>
Date: Tue, 30 Jun 2020 10:22:16 -0700
Subject: [PATCH 11/21] [Fix] `autocomplete-valid`: workaround for axe not
 being able to handle `null`

---
 src/rules/autocomplete-valid.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/rules/autocomplete-valid.js b/src/rules/autocomplete-valid.js
index 9b3f5a091..a1c1e1c7c 100644
--- a/src/rules/autocomplete-valid.js
+++ b/src/rules/autocomplete-valid.js
@@ -35,12 +35,13 @@ module.exports = {
         return;
       }
 
+      const type = getLiteralPropValue(getProp(node.attributes, 'type'));
       const { violations } = runVirtualRule('autocomplete-valid', {
         nodeName: 'input',
         attributes: {
           autocomplete,
           // Which autocomplete is valid depends on the input type
-          type: getLiteralPropValue(getProp(node.attributes, 'type')),
+          type: type === null ? undefined : type,
         },
       });
 

From 381b9d6ff71e4e31c773b104e3556a1391c50e54 Mon Sep 17 00:00:00 2001
From: Jesse Renee Beach <splendidnoise@gmail.com>
Date: Sat, 4 Jul 2020 16:17:13 -0700
Subject: [PATCH 12/21] [fix:634] Ignore control elements that are hidden

---
 .../src/rules/control-has-associated-label-test.js   | 12 ++++++++++++
 src/rules/control-has-associated-label.js            |  6 ++++++
 2 files changed, 18 insertions(+)

diff --git a/__tests__/src/rules/control-has-associated-label-test.js b/__tests__/src/rules/control-has-associated-label-test.js
index de98d8728..17482d4ea 100644
--- a/__tests__/src/rules/control-has-associated-label-test.js
+++ b/__tests__/src/rules/control-has-associated-label-test.js
@@ -311,3 +311,15 @@ ruleTester.run(`${ruleName}:strict`, rule, {
     .map(ruleOptionsMapperFactory(strictOptions))
     .map(parserOptionsMapper),
 });
+
+ruleTester.run(`${ruleName}:no-config`, rule, {
+  valid: [
+    { code: '<input type="hidden" />' },
+    { code: '<input type="text" aria-hidden="true" />' },
+  ]
+    .map(parserOptionsMapper),
+  invalid: [
+    { code: '<input type="text" />', errors: [expectedError] },
+  ]
+    .map(parserOptionsMapper),
+});
diff --git a/src/rules/control-has-associated-label.js b/src/rules/control-has-associated-label.js
index cab2611d4..481aa3bb0 100644
--- a/src/rules/control-has-associated-label.js
+++ b/src/rules/control-has-associated-label.js
@@ -15,6 +15,7 @@ import includes from 'array-includes';
 import { generateObjSchema, arraySchema } from '../util/schemas';
 import type { ESLintContext } from '../../flow/eslint';
 import isDOMElement from '../util/isDOMElement';
+import isHiddenFromScreenReader from '../util/isHiddenFromScreenReader';
 import isInteractiveElement from '../util/isInteractiveElement';
 import isInteractiveRole from '../util/isInteractiveRole';
 import mayHaveAccessibleLabel from '../util/mayHaveAccessibleLabel';
@@ -67,10 +68,15 @@ module.exports = {
       }
       const props = node.openingElement.attributes;
       const nodeIsDOMElement = isDOMElement(tag);
+      const nodeIsHiddenFromScreenReader = isHiddenFromScreenReader(tag, props);
       const nodeIsInteractiveElement = isInteractiveElement(tag, props);
       const nodeIsInteractiveRole = isInteractiveRole(tag, props);
       const nodeIsControlComponent = controlComponents.indexOf(tag) > -1;
 
+      if (nodeIsHiddenFromScreenReader) {
+        return;
+      }
+
       let hasAccessibleLabel = true;
       if (
         nodeIsInteractiveElement

From 645900a0e296ca7053dbf6cd9e12cc85849de2d5 Mon Sep 17 00:00:00 2001
From: Chirag Swadia <1291774+chiragswadia@users.noreply.github.com>
Date: Mon, 6 Jul 2020 17:21:14 +0200
Subject: [PATCH 13/21] Fixed rule name in comments

---
 docs/rules/no-static-element-interactions.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/rules/no-static-element-interactions.md b/docs/rules/no-static-element-interactions.md
index a06c547fe..13306e1a8 100644
--- a/docs/rules/no-static-element-interactions.md
+++ b/docs/rules/no-static-element-interactions.md
@@ -44,7 +44,7 @@ If your element is catching bubbled click or key events from descendant elements
 
 ```jsx
 {/* The <div> element has a child <button> element that allows keyboard interaction */}
-{/* eslint-disable-next-line no-static-element-interactions */}
+{/* eslint-disable-next-line jsx-a11y/no-static-element-interactions */}
 <div onClick={this.handleButtonClick}>
   <button>Save</button>
   <button>Cancel</button>

From b90e20d6ab585e0afbdae07b98934fcc08de4ca8 Mon Sep 17 00:00:00 2001
From: Piper <piperchester@users.noreply.github.com>
Date: Mon, 6 Jul 2020 09:24:53 -0700
Subject: [PATCH 14/21] Fix screenreader -> screen reader

---
 docs/rules/alt-text.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/rules/alt-text.md b/docs/rules/alt-text.md
index 3837d0a99..8e3b4e17f 100644
--- a/docs/rules/alt-text.md
+++ b/docs/rules/alt-text.md
@@ -1,6 +1,6 @@
 # alt-text
 
-Enforce that all elements that require alternative text have meaningful information to relay back to the end user. This is a critical component of accessibility for screenreader users in order for them to understand the content's purpose on the page. By default, this rule checks for alternative text on the following elements: `<img>`, `<area>`, `<input type="image">`, and `<object>`.
+Enforce that all elements that require alternative text have meaningful information to relay back to the end user. This is a critical component of accessibility for screen reader users in order for them to understand the content's purpose on the page. By default, this rule checks for alternative text on the following elements: `<img>`, `<area>`, `<input type="image">`, and `<object>`.
 
 ## How to resolve
 ### `<img>`

From f702f627a2afdbce0184b5bcad66be969ae8aa6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?ArielRen=C3=A9e?= <rios94.a@gmail.com>
Date: Thu, 6 Aug 2020 14:11:20 -0700
Subject: [PATCH 15/21] [readme] add Spanish translation

See #726.
---
 README.md | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 5ccebc172..54cb6ab56 100644
--- a/README.md
+++ b/README.md
@@ -26,6 +26,12 @@
 
 Static AST checker for accessibility rules on JSX elements.
 
+
+
+#### *Read this in [other languages](https://github.com/ari-os310/eslint-plugin-jsx-a11y/blob/master/translations/Translations.md).*
+
+[Mexican Spanish🇲🇽](https://github.com/ari-os310/eslint-plugin-jsx-a11y/blob/master/translations/README.mx.md)
+
 ## Why?
 Ryan Florence built out this awesome runtime-analysis tool called [react-a11y](https://github.com/reactjs/react-a11y). It is super useful. However, since you're probably already using linting in your project, this plugin comes for free and closer to the actual development process. Pairing this plugin with an editor lint plugin, you can bake accessibility standards into your application in real-time.
 
@@ -80,7 +86,6 @@ Then configure the rules you want to use under the rules section.
 }
 ```
 
-
 You can also enable all the recommended or strict rules at once.
 Add `plugin:jsx-a11y/recommended` or `plugin:jsx-a11y/strict` in `extends`:
 

From 3d98d7a03a55fb165e3bf868acc927f48199e13c Mon Sep 17 00:00:00 2001
From: Jordan Harband <ljharb@gmail.com>
Date: Tue, 6 Oct 2020 23:55:20 -0700
Subject: [PATCH 16/21] [Deps] update `@babel/runtime`, `axe-core`

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 839877b6d..4dc34f190 100644
--- a/package.json
+++ b/package.json
@@ -58,11 +58,11 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@babel/runtime": "^7.10.2",
+    "@babel/runtime": "^7.11.2",
     "aria-query": "^4.2.2",
     "array-includes": "^3.1.1",
     "ast-types-flow": "^0.0.7",
-    "axe-core": "^3.5.4",
+    "axe-core": "^3.5.5",
     "axobject-query": "^2.2.0",
     "damerau-levenshtein": "^1.0.6",
     "emoji-regex": "^9.0.0",

From eb92b071efa1c76f6690f7e6d07d4b6c2e8ba29f Mon Sep 17 00:00:00 2001
From: Jordan Harband <ljharb@gmail.com>
Date: Tue, 6 Oct 2020 23:57:01 -0700
Subject: [PATCH 17/21] [Dev Deps] update `@babel/cli`, `@babel/core`,
 `@babel/plugin-transform-flow-strip-types`, `eslint-plugin-flowtype`,
 `eslint-plugin-import`, `estraverse`, `expect`, `object.assign`

---
 package.json | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/package.json b/package.json
index 4dc34f190..39f105849 100644
--- a/package.json
+++ b/package.json
@@ -30,25 +30,25 @@
     "jest": "jest --coverage __tests__/**/*"
   },
   "devDependencies": {
-    "@babel/cli": "^7.10.1",
-    "@babel/core": "^7.10.2",
-    "@babel/plugin-transform-flow-strip-types": "^7.10.1",
+    "@babel/cli": "^7.11.6",
+    "@babel/core": "^7.11.6",
+    "@babel/plugin-transform-flow-strip-types": "^7.10.4",
     "babel-eslint": "^10.1.0",
     "babel-jest": "^24.9.0",
     "babel-preset-airbnb": "^5.0.0",
     "coveralls": "^3.1.0",
     "eslint": "^3 || ^4 || ^5 || ^6 || ^7",
     "eslint-config-airbnb-base": "^14.2.0",
-    "eslint-plugin-flowtype": "^5.1.3",
-    "eslint-plugin-import": "^2.21.2",
-    "estraverse": "^5.0.0",
-    "expect": "^24.3.1",
+    "eslint-plugin-flowtype": "^5.2.0",
+    "eslint-plugin-import": "^2.22.1",
+    "estraverse": "^5.2.0",
+    "expect": "^24.9.0",
     "flow-bin": "^0.113.0",
     "in-publish": "^2.0.1",
     "jest": "^24.9.0",
     "jscodeshift": "^0.7.0",
     "minimist": "^1.2.5",
-    "object.assign": "^4.1.0",
+    "object.assign": "^4.1.1",
     "rimraf": "^3.0.2",
     "safe-publish-latest": "^1.1.4",
     "to-ast": "^1.0.0"

From 83e4ff28705875d8d28afd0791784a62ac5d77fd Mon Sep 17 00:00:00 2001
From: Jordan Harband <ljharb@gmail.com>
Date: Wed, 7 Oct 2020 00:09:39 -0700
Subject: [PATCH 18/21] [Deps] update `axe-core`, `jsx-ast-utils`

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 39f105849..96c1c6d08 100644
--- a/package.json
+++ b/package.json
@@ -62,12 +62,12 @@
     "aria-query": "^4.2.2",
     "array-includes": "^3.1.1",
     "ast-types-flow": "^0.0.7",
-    "axe-core": "^3.5.5",
+    "axe-core": "^4.0.2",
     "axobject-query": "^2.2.0",
     "damerau-levenshtein": "^1.0.6",
     "emoji-regex": "^9.0.0",
     "has": "^1.0.3",
-    "jsx-ast-utils": "^2.4.1",
+    "jsx-ast-utils": "^3.0.0",
     "language-tags": "^1.0.5"
   },
   "peerDependencies": {

From a6d883d4c63e37de70fd92e6ff89561f2a90b0eb Mon Sep 17 00:00:00 2001
From: Jesse Renee Beach <splendidnoise@gmail.com>
Date: Sun, 11 Oct 2020 21:58:40 -0700
Subject: [PATCH 19/21] CHANGELOG update for v6.4.0

6.4.0
---
 CHANGELOG.md | 23 +++++++++++++++++++++++
 package.json |  2 +-
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a10c40d7a..31cb54fd3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,26 @@
+6.4.0 / 2020-10-26
+==================
+
+- 83e4ff2 [Deps] update `axe-core`, `jsx-ast-utils`
+- eb92b07 [Dev Deps] update `@babel/cli`, `@babel/core`, `@babel/plugin-transform-flow-strip-types`, `eslint-plugin-flowtype`, `eslint-plugin-import`, `estraverse`, `expect`, `object.assign`
+- 3d98d7a [Deps] update `@babel/runtime`, `axe-core`
+- f702f62 [readme] add Spanish translation
+- c2ae092 [Docs] `no-static-element-interactions`: Fixed rule name in comments
+- b90e20d Fix screenreader -> screen reader
+- 645900a Fixed rule name in comments
+- 381b9d6 [fix:634] Ignore control elements that are hidden
+- 2c47f0a [Fix] `autocomplete-valid`: workaround for axe not being able to handle `null`
+- 00bd6d8 Add failing test for autocomplete with dynamic type
+- 3c49c9a Add WCAG guidelines to rule documentation
+- 4ecaf35 Add a testcase for tablist to interactive supports focus
+- dac6864 Deprecate the accessible-emoji rule
+- 5191053 Update to axobject-query@2.2.0
+- b315698 Allow negative tabindex in aria-activedescendant-has-tabindex
+- 8e6fcd0 docs: fix travis badge now points to correct location at travis-ci.com
+- 2234df7 Account for additional control elements in label-has-associated-control
+- 5cbb718 Adding test cases for label tests
+- 66c425c Additional test case for no-redundant-roles
+
 6.3.1 / 2020-06-19
 ==================
 
diff --git a/package.json b/package.json
index 96c1c6d08..c703f208b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-jsx-a11y",
-  "version": "6.3.1",
+  "version": "6.4.0",
   "description": "Static AST checker for accessibility rules on JSX elements.",
   "keywords": [
     "eslint",

From f8a4496b55b113ae835d04a7d4300b824a4a4680 Mon Sep 17 00:00:00 2001
From: Jesse Renee Beach <splendidnoise@gmail.com>
Date: Sun, 25 Oct 2020 22:31:57 -0700
Subject: [PATCH 20/21] Upgrade jsx-ast-utils to v3.1.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index c703f208b..b0ee7c994 100644
--- a/package.json
+++ b/package.json
@@ -67,7 +67,7 @@
     "damerau-levenshtein": "^1.0.6",
     "emoji-regex": "^9.0.0",
     "has": "^1.0.3",
-    "jsx-ast-utils": "^3.0.0",
+    "jsx-ast-utils": "^3.1.0",
     "language-tags": "^1.0.5"
   },
   "peerDependencies": {

From c99beef4f30c3dd3d4a11dd9b0727caa4bb37d5e Mon Sep 17 00:00:00 2001
From: Jesse Renee Beach <splendidnoise@gmail.com>
Date: Sun, 25 Oct 2020 22:33:28 -0700
Subject: [PATCH 21/21] 6.4.1

---
 CHANGELOG.md | 4 ++++
 package.json | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 31cb54fd3..e6b58ee28 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+6.4.1 / 2020-10-26
+==================
+- f8a4496 Upgrade jsx-ast-utils to v3.1.0
+
 6.4.0 / 2020-10-26
 ==================
 
diff --git a/package.json b/package.json
index b0ee7c994..cf6c08719 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-jsx-a11y",
-  "version": "6.4.0",
+  "version": "6.4.1",
   "description": "Static AST checker for accessibility rules on JSX elements.",
   "keywords": [
     "eslint",