feat(aria-required-children): fail for children which are not listed as required

lib/checks/aria/aria-required-children-evaluate.js

@@ -4,7 +4,8 @@ import {
   getExplicitRole,
   getOwnedVirtual
 } from '../../commons/aria';
-import { hasContentVirtual, idrefs } from '../../commons/dom';
+import { getGlobalAriaAttrs } from '../../commons/standards';
+import { hasContentVirtual, idrefs, isFocusable } from '../../commons/dom';
 
 /**
  * Get all owned roles of an element
@@ -16,18 +17,24 @@ function getOwnedRoles(virtualNode, required) {
     const ownedElement = ownedElements[i];
     const role = getRole(ownedElement, { noPresentational: true });
 
+    const hasGlobalAria = getGlobalAriaAttrs().some(attr =>
+      ownedElement.hasAttr(attr)
+    );
+    const includedInAccessibilityTree =
+      hasGlobalAria || isFocusable(ownedElement);
+
     // if owned node has no role or is presentational, or if role
     // allows group or rowgroup, we keep parsing the descendant tree.
     // this means intermediate roles between a required parent and
     // child will fail the check
     if (
-      !role ||
+      (!role && !includedInAccessibilityTree) ||
       (['group', 'rowgroup'].includes(role) &&
         required.some(requiredRole => requiredRole === role))
     ) {
       ownedElements.push(...ownedElement.children);
-    } else if (role) {
-      ownedRoles.push(role);
+    } else if (role || includedInAccessibilityTree) {
+      ownedRoles.push({ role, ownedElement });
     }
   }
 
@@ -39,10 +46,10 @@ function getOwnedRoles(virtualNode, required) {
  */
 function missingRequiredChildren(virtualNode, role, required, ownedRoles) {
   for (let i = 0; i < ownedRoles.length; i++) {
-    var ownedRole = ownedRoles[i];
+    const { role } = ownedRoles[i];
 
-    if (required.includes(ownedRole)) {
-      required = required.filter(requiredRole => requiredRole !== ownedRole);
+    if (required.includes(role)) {
+      required = required.filter(requiredRole => requiredRole !== role);
       return null;
     }
   }
@@ -74,6 +81,16 @@ function ariaRequiredChildrenEvaluate(node, options, virtualNode) {
   }
 
   const ownedRoles = getOwnedRoles(virtualNode, required);
+  const unallowed = ownedRoles.filter(({ role }) => !required.includes(role));
+
+  if (unallowed.length) {
+    this.relatedNodes(unallowed.map(({ ownedElement }) => ownedElement));
+    this.data({
+      messageKey: 'unallowed'
+    });
+    return false;
+  }
+
   const missing = missingRequiredChildren(
     virtualNode,
     role,

lib/checks/aria/aria-required-children.json

@@ -21,7 +21,8 @@
       "pass": "Required ARIA children are present",
       "fail": {
         "singular": "Required ARIA child role not present: ${data.values}",
-        "plural": "Required ARIA children role not present: ${data.values}"
+        "plural": "Required ARIA children role not present: ${data.values}",
+        "unallowed": "Element has children which are not allowed"
       },
       "incomplete": {
         "singular": "Expecting ARIA child role to be added: ${data.values}",