fix(aria-roles): correct abstract roles (types) for aria-roles

doc/standards-object.md

@@ -67,9 +67,11 @@ The [`ariaRoles`](../lib/standards/aria-roles.js) object defines valid ARIA role
 
 - `type` - string(required). [The role type](https://www.w3.org/TR/wai-aria-1.1/#roles_categorization). Valid types are:
   - `abstract`
-  - `widget`
-  - `structure`
+  - `composite`
   - `landmark`
+  - `structure`
+  - `widget`
+  - `window`
 - `requiredContext` - array(optional). List of required parent roles.
 - `requiredOwned` - array(optional). List of required owned roles.
 - `requiredAttrs` - array(optional). List of required attributes.

lib/checks/aria/has-widget-or-window-role-evaluate.js

@@ -0,0 +1,26 @@
+import { getRoleType } from '../../commons/aria';
+
+const acceptedRoles = {
+  widget: true,
+  composite: true,
+  window: true
+};
+
+/**
+ * Check if an elements `role` attribute uses any widget, composite, window abstract role values.
+ *
+ * Widget roles are taken from the `ariaRoles` standards object from the roles `type` property.
+ *
+ * @memberof checks
+ * @return {Boolean} True if the element uses a `widget`, `composite`, or `window` abstract role (type). False otherwise.
+ */
+// # TODO: change to abstract role for widget and window
+function hasWidgetOrWindowRoleEvaluate(node) {
+  const role = node.getAttribute('role');
+  if (role === null) {
+    return false;
+  }
+  return !!acceptedRoles[getRoleType(role)];
+}
+
+export default hasWidgetOrWindowRoleEvaluate;

lib/checks/aria/has-widget-or-window-role.json

@@ -0,0 +1,12 @@
+{
+  "id": "has-widget-or-window-role",
+  "evaluate": "has-widget-or-window-role-evaluate",
+  "options": [],
+  "metadata": {
+    "impact": "minor",
+    "messages": {
+      "pass": "Element has a widget or window role.",
+      "fail": "Element does not have a widget or window role."
+    }
+  }
+}

lib/rules/focus-order-semantics.json

@@ -9,6 +9,6 @@
     "help": "Elements in the focus order should have an appropriate role"
   },
   "all": [],
-  "any": ["has-widget-role", "valid-scrollable-semantics"],
+  "any": ["has-widget-or-window-role", "valid-scrollable-semantics"],
   "none": []
 }

lib/standards/aria-roles.js

@@ -1,4 +1,5 @@
 // Source: https://www.w3.org/TR/wai-aria-1.1/#roles
+// Source for abstract roles (types): https://www.w3.org/TR/wai-aria/#abstract_roles
 
 /* easiest way to see allowed roles is to filter out the global ones
    from the list of inherited states and properties. The dpub spec
@@ -17,13 +18,13 @@
 */
 const ariaRoles = {
   alert: {
-    type: 'widget',
+    type: 'structure',
     // Spec difference: Aria-expanded removed in 1.2
     allowedAttrs: ['aria-expanded'],
     superclassRole: ['section']
   },
   alertdialog: {
-    type: 'widget',
+    type: 'window',
     // Spec difference: Aria-expanded removed in 1.2
     allowedAttrs: ['aria-expanded', 'aria-modal'],
     superclassRole: ['alert', 'dialog'],
@@ -119,6 +120,7 @@ const ariaRoles = {
     nameFromContent: true
   },
   combobox: {
+    // Note: spec difference
     type: 'widget',
     requiredAttrs: ['aria-expanded', 'aria-controls'],
     allowedAttrs: [
@@ -169,7 +171,7 @@ const ariaRoles = {
     prohibitedAttrs: ['aria-label', 'aria-labelledby']
   },
   dialog: {
-    type: 'widget',
+    type: 'window',
     // Spec difference: Aria-expanded removed in 1.2
     allowedAttrs: ['aria-expanded', 'aria-modal'],
     superclassRole: ['window'],
@@ -301,6 +303,7 @@ const ariaRoles = {
     superclassRole: ['section']
   },
   listbox: {
+    // Note: spec difference
     type: 'widget',
     requiredOwned: ['group', 'option'],
     allowedAttrs: [
@@ -328,7 +331,7 @@ const ariaRoles = {
     nameFromContent: true
   },
   log: {
-    type: 'widget',
+    type: 'structure',
     // Spec difference: Aria-expanded removed in 1.2
     allowedAttrs: ['aria-expanded'],
     superclassRole: ['section']
@@ -340,7 +343,7 @@ const ariaRoles = {
     superclassRole: ['landmark']
   },
   marquee: {
-    type: 'widget',
+    type: 'structure',
     // Spec difference: Aria-expanded removed in 1.2
     allowedAttrs: ['aria-expanded'],
     superclassRole: ['section']
@@ -696,7 +699,7 @@ const ariaRoles = {
     accessibleNameRequired: true
   },
   status: {
-    type: 'widget',
+    type: 'structure',
     // Spec difference: Aria-expanded removed in 1.2
     allowedAttrs: ['aria-expanded'],
     superclassRole: ['section']
@@ -816,7 +819,7 @@ const ariaRoles = {
     superclassRole: ['section']
   },
   timer: {
-    type: 'widget',
+    type: 'structure',
     // Spec difference: Aria-expanded removed in 1.2
     allowedAttrs: ['aria-expanded'],
     superclassRole: ['status']

locales/_template.json

@@ -576,9 +576,9 @@
       },
       "fail": "Element does not have global ARIA attribute"
     },
-    "has-widget-role": {
-      "pass": "Element has a widget role.",
-      "fail": "Element does not have a widget role."
+    "has-widget-or-window-role": {
+      "pass": "Element has a widget or window role.",
+      "fail": "Element does not have a widget or window role."
     },
     "invalidrole": {
       "pass": "ARIA role is valid",

locales/da.json

@@ -365,10 +365,6 @@
         "plural": "'aria-errormessage'-værdi ${data.values}` bør bruge en teknik til at annoncere beskeden (fx 'aria-live', 'aria-describedby', 'role=alert', osv.)"
       }
     },
-    "has-widget-role": {
-      "pass": "Elementet har en 'widget'-rolle.",
-      "fail": "Elementet har ikke en 'widget'-rolle."
-    },
     "invalidrole": {
       "pass": "ARIA-rollen er korrekt",
       "fail": "Rollen skal være en af de mulige ARIA-roller"

locales/de.json

@@ -576,10 +576,6 @@
       },
       "fail": "Das Element hat keine globalen ARIA Attribute."
     },
-    "has-widget-role": {
-      "pass": "Element hat eine widget-Rolle.",
-      "fail": "Das Element besitzt keine widget-Rolle."
-    },
     "invalidrole": {
       "pass": "ARIA Rolle ist gültig.",
       "fail": {

locales/el.json

@@ -539,10 +539,6 @@
       },
       "fail": "Το στοιχείο δεν έχει καθολικό χαρακτηριστικό ARIA"
     },
-    "has-widget-role": {
-      "pass": "Το στοιχείο έχει ρόλο widget.",
-      "fail": "Το στοιχείο δεν έχει ρόλο widget."
-    },
     "invalidrole": {
       "pass": "Ο ρόλος ARIA είναι έγκυρος",
       "fail": {

locales/es.json

@@ -356,10 +356,6 @@
         "plural": "En aria-errormessage, valor  ${data.values}`, se debe usar una técnica para anunciar el mensaje (p. ej., aria-live, aria-describedby, role=alert, etc.)"
       }
     },
-    "has-widget-role": {
-      "pass": "El elemento tiene un rol de widget.",
-      "fail": "El elemento no tiene un rol de widget."
-    },
     "invalidrole": {
       "pass": "El rol ARIA es válido",
       "fail": "El rol debe ser uno de los roles ARIA válidos"

locales/eu.json

@@ -356,10 +356,6 @@
         "plural": "aria-errormessagen, bailioa  ${data.values}`, mezua iragartzeko teknika bat erabili behar da (adibidez: aria-live, aria-describedby, role = alert, etab.)."
       }
     },
-    "has-widget-role": {
-      "pass": "Elementuak widget rola du.",
-      "fail": "Elementuak ez du widget rolik."
-    },
     "invalidrole": {
       "pass": "ARIA rola baliozkoa da",
       "fail": "Rolak baliozko ARIA rola izan behar du"

locales/fr.json

@@ -519,10 +519,6 @@
       },
       "fail": "L’élément n’a pas d’attribut ARIA global"
     },
-    "has-widget-role": {
-      "pass": "L’élément a un rôle widget.",
-      "fail": "L’élément n’a pas de rôle widget."
-    },
     "invalidrole": {
       "pass": "Le rôle ARIA est valide",
       "fail": {

locales/he.json

@@ -529,10 +529,6 @@
       },
       "fail": "לאלמנט אין תכונת ARIA גלובלית: "
     },
-    "has-widget-role": {
-      "pass": "לאלמנט יש תפקיד של וגדג'ט.",
-      "fail": "לאלמנט אין תפקיד של וגדג'ט."
-    },
     "invalidrole": {
       "pass": "תפקיד ARIA קביל",
       "fail": {

locales/it.json

@@ -573,10 +573,6 @@
       },
       "fail": "L'elemento non ha un attributo ARIA globale"
     },
-    "has-widget-role": {
-      "pass": "L'elemento ha un ruolo widget.",
-      "fail": "L'elemento non ha un ruolo widget."
-    },
     "invalidrole": {
       "pass": "Il ruolo ARIA è valido",
       "fail": {

locales/ja.json

@@ -575,10 +575,6 @@
       },
       "fail": "要素にはグローバルなARIA属性が指定されていません"
     },
-    "has-widget-role": {
-      "pass": "要素にはwidgetロールが存在します",
-      "fail": "要素にはwidgetロールが存在しません"
-    },
     "invalidrole": {
       "pass": "ARIAロールが有効です",
       "fail": {

locales/ko.json

@@ -524,10 +524,6 @@
       },
       "fail": "엘리먼트가 전역 ARIA 어트리뷰트를 가지고 있지 않습니다."
     },
-    "has-widget-role": {
-      "pass": "엘리먼트가 위젯 역할(role)을 가지고 있습니다.",
-      "fail": "엘리먼트가 위젯 역할(role)을 가지고 있지 않습니다."
-    },
     "invalidrole": {
       "pass": "ARIA 역할(role)이 유효합니다.",
       "fail": {

locales/no_NB.json

@@ -365,10 +365,6 @@
         "plural": "'aria-errormessage'-verdier ${data.values}` skal bruke en metode for å annonsere beskeden (f.eks. 'aria-live', 'aria-describedby', 'role=alert', osv.)"
       }
     },
-    "has-widget-role": {
-      "pass": "Elementet har en 'widget'-rolle.",
-      "fail": "Elementet har ikke en 'widget'-rolle."
-    },
     "invalidrole": {
       "pass": "ARIA-rollen er korrekt",
       "fail": "Rollen skal være en av de mulige ARIA-roller"

locales/pl.json

@@ -575,10 +575,6 @@
       },
       "fail": "Element nie ma ogólnego atrybutu ARIA"
     },
-    "has-widget-role": {
-      "pass": "Element ma rolę widżetu.",
-      "fail": "Element nie ma roli widżetu."
-    },
     "invalidrole": {
       "pass": "Rola ARIA jest poprawna.",
       "fail": {

locales/pt_BR.json

@@ -504,10 +504,6 @@
       },
       "fail": "O elemento não tem atributo ARIA global"
     },
-    "has-widget-role": {
-      "pass": "Elemento tem um 'role' de 'widget'.",
-      "fail": "Elemento não tem um 'role' de 'widget'."
-    },
     "invalidrole": {
       "pass": "O ARIA 'role' é válido",
       "fail": {

locales/zh_CN.json

@@ -576,10 +576,6 @@
       },
       "fail": "元素没有全局 ARIA 属性"
     },
-    "has-widget-role": {
-      "pass": "元素有小部件角色",
-      "fail": "元素没有小部件角色"
-    },
     "invalidrole": {
       "pass": "ARIA 角色有效",
       "fail": {

locales/zh_TW.json

@@ -573,10 +573,6 @@
       },
       "fail": "元素沒有全域 ARIA 屬性"
     },
-    "has-widget-role": {
-      "pass": "元素具有小部件角色",
-      "fail": "元素沒有小部件角色"
-    },
     "invalidrole": {
       "pass": "ARIA 角色有效",
       "fail": {