From 4925ba8d0bf80a4b1d8e8645d310590bf1b40b64 Mon Sep 17 00:00:00 2001
From: Jordan Harband <ljharb@gmail.com>
Date: Fri, 20 Sep 2024 14:09:27 -0700
Subject: [PATCH] [Fix] handle interactive/noninteractive changes from
 aria-query

---
 __mocks__/genInteractives.js                  | 22 +++++++-----
 .../control-has-associated-label-test.js      |  2 +-
 ...oninteractive-element-interactions-test.js | 24 ++++++-------
 ...active-element-to-interactive-role-test.js | 32 ++++++++---------
 .../no-static-element-interactions-test.js    | 34 +++++++++----------
 .../src/rules/prefer-tag-over-role-test.js    |  2 +-
 src/util/isInteractiveElement.js              |  5 ---
 src/util/isNonInteractiveElement.js           |  1 +
 8 files changed, 62 insertions(+), 60 deletions(-)

diff --git a/__mocks__/genInteractives.js b/__mocks__/genInteractives.js
index 68b239260..70c7c877d 100644
--- a/__mocks__/genInteractives.js
+++ b/__mocks__/genInteractives.js
@@ -45,14 +45,14 @@ const interactiveElementsMap = {
   'input[type="time"]': [{ prop: 'type', value: 'time' }],
   'input[type="url"]': [{ prop: 'type', value: 'url' }],
   'input[type="week"]': [{ prop: 'type', value: 'week' }],
-  link: [{ prop: 'href', value: '#' }],
   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.
-  // td: [],
+  td: [],
   th: [],
   tr: [],
   textarea: [],
@@ -61,25 +61,27 @@ const interactiveElementsMap = {
 
 const nonInteractiveElementsMap: {[string]: Array<{[string]: string}>} = {
   abbr: [],
-  aside: [],
+  address: [],
   article: [],
+  aside: [],
   blockquote: [],
-  body: [],
   br: [],
   caption: [],
+  code: [],
   dd: [],
+  del: [],
   details: [],
   dfn: [],
   dialog: [],
   dir: [],
   dl: [],
   dt: [],
+  em: [],
   fieldset: [],
   figcaption: [],
   figure: [],
   footer: [],
   form: [],
-  frame: [],
   h1: [],
   h2: [],
   h3: [],
@@ -87,8 +89,10 @@ const nonInteractiveElementsMap: {[string]: Array<{[string]: string}>} = {
   h5: [],
   h6: [],
   hr: [],
+  html: [],
   iframe: [],
   img: [],
+  ins: [],
   label: [],
   legend: [],
   li: [],
@@ -107,20 +111,22 @@ const nonInteractiveElementsMap: {[string]: Array<{[string]: string}>} = {
   ruby: [],
   'section[aria-label]': [{ prop: 'aria-label' }],
   'section[aria-labelledby]': [{ prop: 'aria-labelledby' }],
+  strong: [],
+  sub: [],
+  sup: [],
   table: [],
   tbody: [],
-  td: [],
   tfoot: [],
   thead: [],
   time: [],
   ul: [],
 };
 
-const indeterminantInteractiveElementsMap: { [key: string]: Array<any> } = fromEntries(domElements.map((name: string) => [name, []]));
+const indeterminantInteractiveElementsMap: { [key: string]: Array<any> } = fromEntries(domElements.map((name) => [name, []]));
 
 Object.keys(interactiveElementsMap)
   .concat(Object.keys(nonInteractiveElementsMap))
-  .forEach((name: string) => delete indeterminantInteractiveElementsMap[name]);
+  .forEach((name) => delete indeterminantInteractiveElementsMap[name]);
 
 const abstractRoles = roleNames.filter((role) => roles.get(role).abstract);
 
diff --git a/__tests__/src/rules/control-has-associated-label-test.js b/__tests__/src/rules/control-has-associated-label-test.js
index e175f316e..d973f2cd7 100644
--- a/__tests__/src/rules/control-has-associated-label-test.js
+++ b/__tests__/src/rules/control-has-associated-label-test.js
@@ -157,7 +157,6 @@ const alwaysValid = [
   { code: '<section />' },
   { code: '<table />' },
   { code: '<tbody />' },
-  { code: '<td />' },
   { code: '<tfoot />' },
   { code: '<thead />' },
   { code: '<time />' },
@@ -263,6 +262,7 @@ const neverValid = [
   { code: '<menuitem />', errors: [expectedError] },
   { code: '<option />', errors: [expectedError] },
   { code: '<th />', errors: [expectedError] },
+  { code: '<td />', errors: [expectedError] },
   // Interactive Roles
   { code: '<div role="button" />', errors: [expectedError] },
   { code: '<div role="checkbox" />', errors: [expectedError] },
diff --git a/__tests__/src/rules/no-noninteractive-element-interactions-test.js b/__tests__/src/rules/no-noninteractive-element-interactions-test.js
index c75311cd5..759fcf9a1 100644
--- a/__tests__/src/rules/no-noninteractive-element-interactions-test.js
+++ b/__tests__/src/rules/no-noninteractive-element-interactions-test.js
@@ -69,6 +69,7 @@ const alwaysValid = [
   { code: '<a onClick={() => void 0} href="http://x.y.z" />' },
   { code: '<a onClick={() => void 0} href="http://x.y.z" tabIndex="0" />' },
   { code: '<area onClick={() => {}} />;' },
+  { code: '<body onClick={() => {}} />;' },
   { code: '<button onClick={() => void 0} className="foo" />' },
   { code: '<menuitem onClick={() => {}} />;' },
   { code: '<option onClick={() => void 0} className="foo" />' },
@@ -77,7 +78,6 @@ const alwaysValid = [
   { code: '<tr onClick={() => {}} />;' },
   /* HTML elements with neither an interactive or non-interactive valence (static) */
   { code: '<acronym onClick={() => {}} />;' },
-  { code: '<address onClick={() => {}} />;' },
   { code: '<applet onClick={() => {}} />;' },
   { code: '<audio onClick={() => {}} />;' },
   { code: '<b onClick={() => {}} />;' },
@@ -90,13 +90,11 @@ const alwaysValid = [
   { code: '<canvas onClick={() => {}} />;' },
   { code: '<center onClick={() => {}} />;' },
   { code: '<cite onClick={() => {}} />;' },
-  { code: '<code onClick={() => {}} />;' },
   { code: '<col onClick={() => {}} />;' },
   { code: '<colgroup onClick={() => {}} />;' },
   { code: '<content onClick={() => {}} />;' },
   { code: '<data onClick={() => {}} />;' },
   { code: '<datalist onClick={() => {}} />;' },
-  { code: '<del onClick={() => {}} />;' },
   { code: '<div />;' },
   { code: '<div className="foo" />;' },
   { code: '<div className="foo" {...props} />;' },
@@ -107,7 +105,6 @@ const alwaysValid = [
   { code: '<div onClick={() => void 0} {...props} />;' },
   { code: '<div onClick={null} />;' },
   { code: '<div onKeyUp={() => void 0} aria-hidden={false} />;' },
-  { code: '<em onClick={() => {}} />;' },
   { code: '<embed onClick={() => {}} />;' },
   { code: '<font onClick={() => {}} />;' },
   { code: '<font onSubmit={() => {}} />;' },
@@ -121,11 +118,11 @@ const alwaysValid = [
       </form>
     `,
   },
+  { code: '<frame onClick={() => {}} />;' },
   { code: '<frameset onClick={() => {}} />;' },
   { code: '<head onClick={() => {}} />;' },
   { code: '<header onClick={() => {}} />;' },
   { code: '<hgroup onClick={() => {}} />;' },
-  { code: '<html onClick={() => {}} />;' },
   { code: '<i onClick={() => {}} />;' },
   { code: '<iframe onLoad={() => {}} />;' },
   {
@@ -153,7 +150,6 @@ const alwaysValid = [
       />
     `,
   },
-  { code: '<ins onClick={() => {}} />;' },
   { code: '<kbd onClick={() => {}} />;' },
   { code: '<keygen onClick={() => {}} />;' },
   { code: '<link onClick={() => {}} />;' },
@@ -178,14 +174,12 @@ const alwaysValid = [
   { code: '<spacer onClick={() => {}} />;' },
   { code: '<span onClick={() => {}} />;' },
   { code: '<strike onClick={() => {}} />;' },
-  { code: '<strong onClick={() => {}} />;' },
   { code: '<style onClick={() => {}} />;' },
-  { code: '<sub onClick={() => {}} />;' },
   { code: '<summary onClick={() => {}} />;' },
-  { code: '<sup onClick={() => {}} />;' },
   { code: '<th onClick={() => {}} />;' },
   { code: '<title onClick={() => {}} />;' },
   { code: '<track onClick={() => {}} />;' },
+  { code: '<td onClick={() => {}} />;' },
   { code: '<tt onClick={() => {}} />;' },
   { code: '<u onClick={() => {}} />;' },
   { code: '<var onClick={() => {}} />;' },
@@ -286,24 +280,26 @@ const alwaysValid = [
 const neverValid = [
   /* HTML elements with an inherent, non-interactive role */
   { code: '<main onClick={() => void 0} />;', errors: [expectedError] },
+  { code: '<address onClick={() => {}} />;', errors: [expectedError] },
   { code: '<article onClick={() => {}} />;', errors: [expectedError] },
   { code: '<aside onClick={() => {}} />;', errors: [expectedError] },
   { code: '<blockquote onClick={() => {}} />;', errors: [expectedError] },
-  { code: '<body onClick={() => {}} />;', errors: [expectedError] },
   { code: '<br onClick={() => {}} />;', errors: [expectedError] },
   { code: '<caption onClick={() => {}} />;', errors: [expectedError] },
+  { code: '<code onClick={() => {}} />;', errors: [expectedError] },
   { code: '<dd onClick={() => {}} />;', errors: [expectedError] },
+  { code: '<del onClick={() => {}} />;', errors: [expectedError] },
   { code: '<details onClick={() => {}} />;', errors: [expectedError] },
   { code: '<dfn onClick={() => {}} />;', errors: [expectedError] },
   { code: '<dl onClick={() => {}} />;', errors: [expectedError] },
   { code: '<dir onClick={() => {}} />;', errors: [expectedError] },
   { code: '<dt onClick={() => {}} />;', errors: [expectedError] },
+  { code: '<em onClick={() => {}} />;', errors: [expectedError] },
   { code: '<fieldset onClick={() => {}} />;', errors: [expectedError] },
   { code: '<figcaption onClick={() => {}} />;', errors: [expectedError] },
   { code: '<figure onClick={() => {}} />;', errors: [expectedError] },
   { code: '<footer onClick={() => {}} />;', errors: [expectedError] },
   { code: '<form onClick={() => {}} />;', errors: [expectedError] },
-  { code: '<frame onClick={() => {}} />;', errors: [expectedError] },
   { code: '<h1 onClick={() => {}} />;', errors: [expectedError] },
   { code: '<h2 onClick={() => {}} />;', errors: [expectedError] },
   { code: '<h3 onClick={() => {}} />;', errors: [expectedError] },
@@ -311,8 +307,10 @@ const neverValid = [
   { code: '<h5 onClick={() => {}} />;', errors: [expectedError] },
   { code: '<h6 onClick={() => {}} />;', errors: [expectedError] },
   { code: '<hr onClick={() => {}} />;', errors: [expectedError] },
+  { code: '<html onClick={() => {}} />;', errors: [expectedError] },
   { code: '<iframe onClick={() => {}} />;', errors: [expectedError] },
   { code: '<img onClick={() => {}} />;', errors: [expectedError] },
+  { code: '<ins onClick={() => {}} />;', errors: [expectedError] },
   { code: '<label onClick={() => {}} />;', errors: [expectedError] },
   { code: '<legend onClick={() => {}} />;', errors: [expectedError] },
   { code: '<li onClick={() => {}} />;', errors: [expectedError] },
@@ -330,9 +328,11 @@ const neverValid = [
   { code: '<ruby onClick={() => {}} />;', errors: [expectedError] },
   { code: '<section onClick={() => {}} aria-label="Aardvark" />;', errors: [expectedError] },
   { code: '<section onClick={() => {}} aria-labelledby="js_1" />;', errors: [expectedError] },
+  { code: '<strong onClick={() => {}} />;', errors: [expectedError] },
+  { code: '<sub onClick={() => {}} />;', errors: [expectedError] },
+  { code: '<sup onClick={() => {}} />;', errors: [expectedError] },
   { code: '<table onClick={() => {}} />;', errors: [expectedError] },
   { code: '<tbody onClick={() => {}} />;', errors: [expectedError] },
-  { code: '<td onClick={() => {}} />;', errors: [expectedError] },
   { code: '<tfoot onClick={() => {}} />;', errors: [expectedError] },
   { code: '<thead onClick={() => {}} />;', errors: [expectedError] },
   { code: '<time onClick={() => {}} />;', errors: [expectedError] },
diff --git a/__tests__/src/rules/no-noninteractive-element-to-interactive-role-test.js b/__tests__/src/rules/no-noninteractive-element-to-interactive-role-test.js
index 7dd52cbe5..2252b79a9 100644
--- a/__tests__/src/rules/no-noninteractive-element-to-interactive-role-test.js
+++ b/__tests__/src/rules/no-noninteractive-element-to-interactive-role-test.js
@@ -50,6 +50,11 @@ const alwaysValid = [
   { code: '<area role="button" />;' },
   { code: '<area role="menuitem" />;' },
   { code: '<button className="foo" role="button" />' },
+  { code: '<body role="button" />;' },
+  { code: '<frame role="button" />;' },
+  { code: '<td role="button" />;' },
+  { code: '<frame role="menuitem" />;' },
+  { code: '<td role="menuitem" />;' },
   /* All flavors of input */
   { code: '<input role="button" />' },
   { code: '<input type="button" role="button" />' },
@@ -154,7 +159,6 @@ const alwaysValid = [
   { code: '<tr role="listitem" />;' },
   /* HTML elements with neither an interactive or non-interactive valence (static) */
   { code: '<acronym role="button" />;' },
-  { code: '<address role="button" />;' },
   { code: '<applet role="button" />;' },
   { code: '<audio role="button" />;' },
   { code: '<b role="button" />;' },
@@ -166,13 +170,11 @@ const alwaysValid = [
   { code: '<canvas role="button" />;' },
   { code: '<center role="button" />;' },
   { code: '<cite role="button" />;' },
-  { code: '<code role="button" />;' },
   { code: '<col role="button" />;' },
   { code: '<colgroup role="button" />;' },
   { code: '<content role="button" />;' },
   { code: '<data role="button" />;' },
   { code: '<datalist role="button" />;' },
-  { code: '<del role="button" />;' },
   { code: '<div role="button" />;' },
   { code: '<div className="foo" role="button" />;' },
   { code: '<div className="foo" {...props} role="button" />;' },
@@ -182,16 +184,13 @@ const alwaysValid = [
   { code: '<div role={undefined} role="button" />;' },
   { code: '<div {...props} role="button" />;' },
   { code: '<div onKeyUp={() => void 0} aria-hidden={false} role="button" />;' },
-  { code: '<em role="button" />;' },
   { code: '<embed role="button" />;' },
   { code: '<font role="button" />;' },
   { code: '<frameset role="button" />;' },
   { code: '<head role="button" />;' },
   { code: '<header role="button" />;' },
   { code: '<hgroup role="button" />;' },
-  { code: '<html role="button" />;' },
   { code: '<i role="button" />;' },
-  { code: '<ins role="button" />;' },
   { code: '<kbd role="button" />;' },
   { code: '<keygen role="button" />;' },
   { code: '<link role="button" />;' },
@@ -214,11 +213,8 @@ const alwaysValid = [
   { code: '<spacer role="button" />;' },
   { code: '<span role="button" />;' },
   { code: '<strike role="button" />;' },
-  { code: '<strong role="button" />;' },
   { code: '<style role="button" />;' },
-  { code: '<sub role="button" />;' },
   { code: '<summary role="button" />;' },
-  { code: '<sup role="button" />;' },
   { code: '<th role="button" />;' },
   { code: '<title role="button" />;' },
   { code: '<track role="button" />;' },
@@ -358,25 +354,26 @@ const alwaysValid = [
 const neverValid = [
   /* HTML elements with an inherent non-interactive role, assigned an
    * interactive role. */
-  { code: '<main role="button" />;', errors: [expectedError] },
+  { code: '<address role="button" />;', errors: [expectedError] },
   { code: '<article role="button" />;', errors: [expectedError] },
   { code: '<aside role="button" />;', errors: [expectedError] },
   { code: '<blockquote role="button" />;', errors: [expectedError] },
-  { code: '<body role="button" />;', errors: [expectedError] },
   { code: '<br role="button" />;', errors: [expectedError] },
   { code: '<caption role="button" />;', errors: [expectedError] },
+  { code: '<code role="button" />;', errors: [expectedError] },
   { code: '<dd role="button" />;', errors: [expectedError] },
+  { code: '<del role="button" />;', errors: [expectedError] },
   { code: '<details role="button" />;', errors: [expectedError] },
+  { code: '<dfn role="button" />;', errors: [expectedError] },
   { code: '<dir role="button" />;', errors: [expectedError] },
   { code: '<dl role="button" />;', errors: [expectedError] },
-  { code: '<dfn role="button" />;', errors: [expectedError] },
   { code: '<dt role="button" />;', errors: [expectedError] },
+  { code: '<em role="button" />;', errors: [expectedError] },
   { code: '<fieldset role="button" />;', errors: [expectedError] },
   { code: '<figcaption role="button" />;', errors: [expectedError] },
   { code: '<figure role="button" />;', errors: [expectedError] },
   { code: '<footer role="button" />;', errors: [expectedError] },
   { code: '<form role="button" />;', errors: [expectedError] },
-  { code: '<frame role="button" />;', errors: [expectedError] },
   { code: '<h1 role="button" />;', errors: [expectedError] },
   { code: '<h2 role="button" />;', errors: [expectedError] },
   { code: '<h3 role="button" />;', errors: [expectedError] },
@@ -384,11 +381,14 @@ const neverValid = [
   { code: '<h5 role="button" />;', errors: [expectedError] },
   { code: '<h6 role="button" />;', errors: [expectedError] },
   { code: '<hr role="button" />;', errors: [expectedError] },
+  { code: '<html role="button" />;', errors: [expectedError] },
   { code: '<iframe role="button" />;', errors: [expectedError] },
   { code: '<img role="button" />;', errors: [expectedError] },
+  { code: '<ins role="button" />;', errors: [expectedError] },
   { code: '<label role="button" />;', errors: [expectedError] },
   { code: '<legend role="button" />;', errors: [expectedError] },
   { code: '<li role="button" />;', errors: [expectedError] },
+  { code: '<main role="button" />;', errors: [expectedError] },
   { code: '<mark role="button" />;', errors: [expectedError] },
   { code: '<marquee role="button" />;', errors: [expectedError] },
   { code: '<menu role="button" />;', errors: [expectedError] },
@@ -400,9 +400,11 @@ const neverValid = [
   { code: '<pre role="button" />;', errors: [expectedError] },
   { code: '<progress role="button" />;', errors: [expectedError] },
   { code: '<ruby role="button" />;', errors: [expectedError] },
+  { code: '<strong role="button" />;', errors: [expectedError] },
+  { code: '<sub role="button" />;', errors: [expectedError] },
+  { code: '<sup role="button" />;', errors: [expectedError] },
   { code: '<table role="button" />;', errors: [expectedError] },
   { code: '<tbody role="button" />;', errors: [expectedError] },
-  { code: '<td role="button" />;', errors: [expectedError] },
   { code: '<tfoot role="button" />;', errors: [expectedError] },
   { code: '<thead role="button" />;', errors: [expectedError] },
   { code: '<time role="button" />;', errors: [expectedError] },
@@ -417,7 +419,6 @@ const neverValid = [
   { code: '<fieldset role="menuitem" />;', errors: [expectedError] },
   { code: '<figure role="menuitem" />;', errors: [expectedError] },
   { code: '<form role="menuitem" />;', errors: [expectedError] },
-  { code: '<frame role="menuitem" />;', errors: [expectedError] },
   { code: '<h1 role="menuitem" />;', errors: [expectedError] },
   { code: '<h2 role="menuitem" />;', errors: [expectedError] },
   { code: '<h3 role="menuitem" />;', errors: [expectedError] },
@@ -432,7 +433,6 @@ const neverValid = [
   { code: '<section role="button" aria-label="Aardvark" />;', errors: [expectedError] },
   { code: '<table role="menuitem" />;', errors: [expectedError] },
   { code: '<tbody role="menuitem" />;', errors: [expectedError] },
-  { code: '<td role="menuitem" />;', errors: [expectedError] },
   { code: '<tfoot role="menuitem" />;', errors: [expectedError] },
   { code: '<thead role="menuitem" />;', errors: [expectedError] },
   /* Custom components */
diff --git a/__tests__/src/rules/no-static-element-interactions-test.js b/__tests__/src/rules/no-static-element-interactions-test.js
index f1643120c..cbe4db9c8 100644
--- a/__tests__/src/rules/no-static-element-interactions-test.js
+++ b/__tests__/src/rules/no-static-element-interactions-test.js
@@ -85,7 +85,7 @@ const alwaysValid = [
   { code: '<audio onClick={() => {}} />;' },
   { code: '<form onClick={() => {}} />;' },
   { code: '<form onSubmit={() => {}} />;' },
-  { code: '<link onClick={() => {}} href="#" />;' },
+  // { code: '<link onClick={() => {}} href="#" />;' },
   /* HTML elements attributed with an interactive role */
   { code: '<div role="button" onClick={() => {}} />;' },
   { code: '<div role="checkbox" onClick={() => {}} />;' },
@@ -111,26 +111,28 @@ const alwaysValid = [
   { code: '<div role="presentation" onClick={() => {}} />;' },
   { code: '<div role="presentation" onKeyDown={() => {}} />;' },
   /* HTML elements with an inherent, non-interactive role */
+  { code: '<address onClick={() => {}} />;' },
   { code: '<article onClick={() => {}} />;' },
   { code: '<article onDblClick={() => void 0} />;' },
   { code: '<aside onClick={() => {}} />;' },
   { code: '<blockquote onClick={() => {}} />;' },
-  { code: '<body onClick={() => {}} />;' },
   { code: '<br onClick={() => {}} />;' },
   { code: '<canvas onClick={() => {}} />;' },
   { code: '<caption onClick={() => {}} />;' },
-  { code: '<details onClick={() => {}} />;' },
+  { code: '<code onClick={() => {}} />;' },
   { code: '<dd onClick={() => {}} />;' },
+  { code: '<del onClick={() => {}} />;' },
+  { code: '<details onClick={() => {}} />;' },
   { code: '<dfn onClick={() => {}} />;' },
   { code: '<dir onClick={() => {}} />;' },
   { code: '<dl onClick={() => {}} />;' },
   { code: '<dt onClick={() => {}} />;' },
+  { code: '<em onClick={() => {}} />;' },
   { code: '<embed onClick={() => {}} />;' },
   { code: '<fieldset onClick={() => {}} />;' },
   { code: '<figcaption onClick={() => {}} />;' },
   { code: '<figure onClick={() => {}} />;' },
   { code: '<footer onClick={() => {}} />;' },
-  { code: '<frame onClick={() => {}} />;' },
   { code: '<h1 onClick={() => {}} />;' },
   { code: '<h2 onClick={() => {}} />;' },
   { code: '<h3 onClick={() => {}} />;' },
@@ -138,8 +140,10 @@ const alwaysValid = [
   { code: '<h5 onClick={() => {}} />;' },
   { code: '<h6 onClick={() => {}} />;' },
   { code: '<hr onClick={() => {}} />;' },
+  { code: '<html onClick={() => {}} />;' },
   { code: '<iframe onClick={() => {}} />;' },
   { code: '<img onClick={() => {}} />;' },
+  { code: '<ins onClick={() => {}} />;' },
   { code: '<label onClick={() => {}} />;' },
   { code: '<legend onClick={() => {}} />;' },
   { code: '<li onClick={() => {}} />;' },
@@ -158,6 +162,10 @@ const alwaysValid = [
   { code: '<ruby onClick={() => {}} />;' },
   { code: '<section onClick={() => {}} aria-label="Aa" />;' },
   { code: '<section onClick={() => {}} aria-labelledby="js_1" />;' },
+  { code: '<strong onClick={() => {}} />;' },
+  { code: '<sub onClick={() => {}} />;' },
+  { code: '<summary onClick={() => {}} />;' },
+  { code: '<sup onClick={() => {}} />;' },
   { code: '<table onClick={() => {}} />;' },
   { code: '<tbody onClick={() => {}} />;' },
   { code: '<tfoot onClick={() => {}} />;' },
@@ -222,7 +230,7 @@ const alwaysValid = [
   { code: '<div role="table" onClick={() => {}} />;' },
   { code: '<div role="tablist" onClick={() => {}} />;' },
   { code: '<div role="tabpanel" onClick={() => {}} />;' },
-  { code: '<td onClick={() => {}} />;' },
+  // { code: '<td onClick={() => {}} />;' },
   { code: '<div role="term" onClick={() => {}} />;' },
   { code: '<div role="timer" onClick={() => {}} />;' },
   { code: '<div role="toolbar" onClick={() => {}} />;' },
@@ -283,36 +291,32 @@ const neverValid = [
   { code: '<div onClick={() => void 0} {...props} />;', errors: [expectedError] },
   { code: '<div onKeyUp={() => void 0} aria-hidden={false} />;', errors: [expectedError] },
   /* Static elements; no inherent role */
-  { code: '<a onClick={() => void 0} />', errors: [expectedError] },
   { code: '<a onClick={() => {}} />;', errors: [expectedError] },
+  { code: '<a onClick={() => void 0} />', errors: [expectedError] },
   { code: '<a tabIndex="0" onClick={() => void 0} />', errors: [expectedError] },
-  { code: '<area onClick={() => {}} />;', errors: [expectedError] },
   { code: '<acronym onClick={() => {}} />;', errors: [expectedError] },
-  { code: '<address onClick={() => {}} />;', errors: [expectedError] },
   { code: '<applet onClick={() => {}} />;', errors: [expectedError] },
+  { code: '<area onClick={() => {}} />;', errors: [expectedError] },
   { code: '<b onClick={() => {}} />;', errors: [expectedError] },
   { code: '<base onClick={() => {}} />;', errors: [expectedError] },
   { code: '<bdi onClick={() => {}} />;', errors: [expectedError] },
   { code: '<bdo onClick={() => {}} />;', errors: [expectedError] },
   { code: '<big onClick={() => {}} />;', errors: [expectedError] },
   { code: '<blink onClick={() => {}} />;', errors: [expectedError] },
+  { code: '<body onClick={() => {}} />;', errors: [expectedError] },
   { code: '<center onClick={() => {}} />;', errors: [expectedError] },
   { code: '<cite onClick={() => {}} />;', errors: [expectedError] },
-  { code: '<code onClick={() => {}} />;', errors: [expectedError] },
   { code: '<col onClick={() => {}} />;', errors: [expectedError] },
   { code: '<colgroup onClick={() => {}} />;', errors: [expectedError] },
   { code: '<content onClick={() => {}} />;', errors: [expectedError] },
   { code: '<data onClick={() => {}} />;', errors: [expectedError] },
-  { code: '<del onClick={() => {}} />;', errors: [expectedError] },
-  { code: '<em onClick={() => {}} />;', errors: [expectedError] },
   { code: '<font onClick={() => {}} />;', errors: [expectedError] },
+  { code: '<frame onClick={() => {}} />;', errors: [expectedError] },
   { code: '<frameset onClick={() => {}} />;', errors: [expectedError] },
   { code: '<head onClick={() => {}} />;', errors: [expectedError] },
   { code: '<header onClick={() => {}} />;', errors: [expectedError] },
   { code: '<hgroup onClick={() => {}} />;', errors: [expectedError] },
-  { code: '<html onClick={() => {}} />;', errors: [expectedError] },
   { code: '<i onClick={() => {}} />;', errors: [expectedError] },
-  { code: '<ins onClick={() => {}} />;', errors: [expectedError] },
   { code: '<kbd onClick={() => {}} />;', errors: [expectedError] },
   { code: '<keygen onClick={() => {}} />;', errors: [expectedError] },
   { code: '<map onClick={() => {}} />;', errors: [expectedError] },
@@ -335,11 +339,7 @@ const neverValid = [
   { code: '<spacer onClick={() => {}} />;', errors: [expectedError] },
   { code: '<span onClick={() => {}} />;', errors: [expectedError] },
   { code: '<strike onClick={() => {}} />;', errors: [expectedError] },
-  { code: '<strong onClick={() => {}} />;', errors: [expectedError] },
   { code: '<style onClick={() => {}} />;', errors: [expectedError] },
-  { code: '<sub onClick={() => {}} />;', errors: [expectedError] },
-  { code: '<sup onClick={() => {}} />;', errors: [expectedError] },
-  { code: '<summary onClick={() => {}} />;', errors: [expectedError] },
   { code: '<title onClick={() => {}} />;', errors: [expectedError] },
   { code: '<track onClick={() => {}} />;', errors: [expectedError] },
   { code: '<tt onClick={() => {}} />;', errors: [expectedError] },
diff --git a/__tests__/src/rules/prefer-tag-over-role-test.js b/__tests__/src/rules/prefer-tag-over-role-test.js
index 1f292658c..9a1a74631 100644
--- a/__tests__/src/rules/prefer-tag-over-role-test.js
+++ b/__tests__/src/rules/prefer-tag-over-role-test.js
@@ -39,7 +39,7 @@ ruleTester.run('prefer-tag-over-role', rule, {
       errors: [
         expectedError(
           'link',
-          '<a href=...>, <area href=...>, or <link href=...>',
+          '<a href=...>, or <area href=...>',
         ),
       ],
     },
diff --git a/src/util/isInteractiveElement.js b/src/util/isInteractiveElement.js
index a9e3f9914..e317c9101 100644
--- a/src/util/isInteractiveElement.js
+++ b/src/util/isInteractiveElement.js
@@ -83,11 +83,6 @@ function checkIsInteractiveElement(tagName, attributes): boolean {
     );
   }
 
-  // TODO: remove this when aria-query and axobject-query are upgraded
-  if (tagName === 'summary') {
-    return false;
-  }
-
   // Check in elementRoles for inherent interactive role associations for
   // this element.
   const isInherentInteractiveElement = some(iterFrom(interactiveElementRoleSchemas), elementSchemaMatcher);
diff --git a/src/util/isNonInteractiveElement.js b/src/util/isNonInteractiveElement.js
index f7416fbc8..034cb7164 100644
--- a/src/util/isNonInteractiveElement.js
+++ b/src/util/isNonInteractiveElement.js
@@ -86,6 +86,7 @@ function checkIsNonInteractiveElement(tagName, attributes): boolean {
   function elementSchemaMatcher(elementSchema) {
     return (
       tagName === elementSchema.name
+      && tagName !== 'td' // TODO: investigate why this is needed
       && attributesComparator(elementSchema.attributes, attributes)
     );
   }