fix(aria-required-children): do not fail for children with aria-hidden (

#3949) * fix(aria-required-children): do not fail for children with aria-hidden * es6
dequelabs · Mar 22, 2023 · 8714d6b · 8714d6b
1 parent 8db2c24
commit 8714d6b
Show file tree

Hide file tree

Showing 9 changed files with 144 additions and 99 deletions.
diff --git a/lib/checks/aria/aria-required-children-evaluate.js b/lib/checks/aria/aria-required-children-evaluate.js
@@ -5,7 +5,12 @@ import {
   getOwnedVirtual
 } from '../../commons/aria';
 import { getGlobalAriaAttrs } from '../../commons/standards';
-import { hasContentVirtual, idrefs, isFocusable } from '../../commons/dom';
+import {
+  hasContentVirtual,
+  idrefs,
+  isFocusable,
+  isVisibleToScreenReaders
+} from '../../commons/dom';
 
 /**
  * Get all owned roles of an element
@@ -15,6 +20,10 @@ function getOwnedRoles(virtualNode, required) {
   const ownedElements = getOwnedVirtual(virtualNode);
   for (let i = 0; i < ownedElements.length; i++) {
     const ownedElement = ownedElements[i];
+    if (ownedElement.props.nodeType !== 1) {
+      continue;
+    }
+
     const role = getRole(ownedElement, { noPresentational: true });
 
     const hasGlobalAria = getGlobalAriaAttrs().some(attr =>
@@ -27,6 +36,7 @@ function getOwnedRoles(virtualNode, required) {
     // this means intermediate roles between a required parent and
     // child will fail the check
     if (
+      !isVisibleToScreenReaders(ownedElement) ||
       (!role && !hasGlobalAriaOrFocusable) ||
       (['group', 'rowgroup'].includes(role) &&
         required.some(requiredRole => requiredRole === role))

diff --git a/lib/commons/dom/index.js b/lib/commons/dom/index.js
@@ -40,7 +40,7 @@ export { default as isNode } from './is-node';
 export { default as isOffscreen } from './is-offscreen';
 export { default as isOpaque } from './is-opaque';
 export { default as isSkipLink } from './is-skip-link';
-export { default as isVisibleToScreenReaders } from './is-visible-for-screenreader';
+export { default as isVisibleToScreenReaders } from './is-visible-to-screenreader';
 export { default as isVisibleOnScreen } from './is-visible-on-screen';
 export { default as isVisible } from './is-visible';
 export { default as isVisualContent } from './is-visual-content';

diff --git a/...ommons/dom/is-visible-for-screenreader.js → ...commons/dom/is-visible-to-screenreader.js b/...ommons/dom/is-visible-for-screenreader.js → ...commons/dom/is-visible-to-screenreader.js
diff --git a/lib/commons/text/accessible-text-virtual.js b/lib/commons/text/accessible-text-virtual.js
@@ -5,7 +5,7 @@ import formControlValue from './form-control-value';
 import subtreeText from './subtree-text';
 import titleText from './title-text';
 import sanitize from './sanitize';
-import isVisibleToScreenReaders from '../dom/is-visible-for-screenreader';
+import isVisibleToScreenReaders from '../dom/is-visible-to-screenreader';
 import isIconLigature from '../text/is-icon-ligature';
 
 /**

diff --git a/lib/commons/text/visible-virtual.js b/lib/commons/text/visible-virtual.js
@@ -1,6 +1,6 @@
 import sanitize from './sanitize';
 import isVisibleOnScreen from '../dom/is-visible-on-screen';
-import isVisibleToScreenReaders from '../dom/is-visible-for-screenreader';
+import isVisibleToScreenReaders from '../dom/is-visible-to-screenreader';
 import AbstractVirtualNode from '../../core/base/virtual-node/abstract-virtual-node';
 import { getNodeFromTree } from '../../core/utils';