fix: restore COMPOSITE_WIDGET_CHILDREN export lost in 55471af rewrite; prettier-format rule

Author: johanrd

lib/rules/template-no-noninteractive-element-to-interactive-role.js

@@ -110,7 +110,10 @@ function buildNonInteractiveTagSet() {
 const ALLOWED_ROLE_OVERRIDE = new Map([
   ['ul', new Set(['listbox', 'menu', 'menubar', 'radiogroup', 'tablist', 'tree', 'treegrid'])],
   ['ol', new Set(['listbox', 'menu', 'menubar', 'radiogroup', 'tablist', 'tree', 'treegrid'])],
-  ['li', new Set(['menuitem', 'menuitemcheckbox', 'menuitemradio', 'option', 'row', 'tab', 'treeitem'])],
+  [
+    'li',
+    new Set(['menuitem', 'menuitemcheckbox', 'menuitemradio', 'option', 'row', 'tab', 'treeitem']),
+  ],
   ['table', new Set(['grid'])],
   ['td', new Set(['gridcell'])],
   ['fieldset', new Set(['radiogroup'])],

lib/utils/interactive-roles.js

@@ -18,6 +18,18 @@ const { roles } = require('aria-query');
 // are not usually interactive." jsx-a11y and lit-a11y agree.
 module.exports.INTERACTIVE_ROLES = buildInteractiveRoleSet();
 
+// Composite-widget child map — for each composite-widget parent role, the
+// set of child roles that are legitimately nested inside it per ARIA's
+// "Required Owned Elements" (aria-query's `requiredOwnedElements`). Closed
+// transitively over chains of composite widgets (e.g. `grid` owns `row`,
+// `row` owns `gridcell` / `columnheader` / `rowheader`, so `grid` transitively
+// allows all of them).
+//
+// This drives the nested-interactive exception so canonical composite-widget
+// patterns (`listbox > option`, `tablist > tab`, `tree > treeitem`,
+// `grid > row > gridcell`, `radiogroup > radio`, etc.) are not flagged.
+module.exports.COMPOSITE_WIDGET_CHILDREN = buildCompositeWidgetChildren();
+
 function buildInteractiveRoleSet() {
   const result = new Set(['toolbar']);
   for (const [role, def] of roles) {
@@ -31,3 +43,71 @@ function buildInteractiveRoleSet() {
   }
   return result;
 }
+
+function buildCompositeWidgetChildren() {
+  const own = new Map();
+  for (const [role, def] of roles) {
+    if (def.abstract) {
+      continue;
+    }
+    const owned = def.requiredOwnedElements;
+    if (!owned || owned.length === 0) {
+      continue;
+    }
+    const kids = new Set();
+    for (const chain of owned) {
+      for (const child of chain) {
+        kids.add(child);
+      }
+    }
+    own.set(role, kids);
+  }
+
+  const direct = new Map();
+  for (const [role, def] of roles) {
+    if (def.abstract) {
+      continue;
+    }
+    const merged = new Set(own.get(role) || []);
+    for (const chain of def.superClass || []) {
+      for (const ancestor of chain) {
+        const inherited = own.get(ancestor);
+        if (inherited) {
+          for (const child of inherited) {
+            merged.add(child);
+          }
+        }
+      }
+    }
+    if (merged.size > 0) {
+      direct.set(role, merged);
+    }
+  }
+
+  const closed = new Map();
+  function expand(role, visited) {
+    if (closed.has(role)) {
+      return closed.get(role);
+    }
+    const out = new Set();
+    const kids = direct.get(role);
+    if (!kids) {
+      closed.set(role, out);
+      return out;
+    }
+    for (const child of kids) {
+      out.add(child);
+      if (!visited.has(child)) {
+        for (const grandchild of expand(child, new Set([...visited, child]))) {
+          out.add(grandchild);
+        }
+      }
+    }
+    closed.set(role, out);
+    return out;
+  }
+  for (const role of direct.keys()) {
+    expand(role, new Set([role]));
+  }
+  return closed;
+}