aria-api 0.4.1 → 0.4.3

package/README.md

@@ -110,7 +110,7 @@ That said, this is what I think it could also be used for:
 -   [Core Accessibility API Mappings 1.1](https://www.w3.org/TR/core-aam-1.1/)
 -   [HTML Accessibility API Mappings 1.0](https://www.w3.org/TR/html-aam-1.0/)
 -   [WAI-ARIA Graphics Module 1.0](https://www.w3.org/TR/graphics-aria-1.0/)
--   [Digital Publishing WAI-ARIA Module 1.0](https://www.w3.org/TR/graphics-aria-1.0/)
+-   [Digital Publishing WAI-ARIA Module 1.0](https://www.w3.org/TR/dpub-aria-1.0/)
 -   [Accessible Name and Description Computation 1.1](https://www.w3.org/TR/accname-1.1/)
 
 I try to update the code whenever a new version of these specs becomes a

package/dist/aria.js

@@ -23,7 +23,7 @@ var attrs = require('./attrs');
 
 var _getOwner = function(node) {
 	if (node.nodeType === node.ELEMENT_NODE && node.id) {
-		var owner = document.querySelector('[aria-owns~="' + node.id + '"]');
+		var owner = document.querySelector('[aria-owns~="' + CSS.escape(node.id) + '"]');
 		if (owner) {
 			return owner;
 		}
@@ -35,18 +35,18 @@ var _getParentNode = function(node) {
 };
 
 var detectLoop = function(node) {
-	var tmp = _getParentNode(node);
-	while (tmp) {
-		if (tmp === node) {
+	var seen = [node]
+	while ((node = _getParentNode(node))) {
+		if (seen.includes(node)) {
 			return true;
 		}
-		tmp = _getParentNode(tmp);
+		seen.push(node)
 	}
 };
 
 var getOwner = function(node) {
 	if (node.nodeType === node.ELEMENT_NODE && node.id) {
-		var owner = document.querySelector('[aria-owns~="' + node.id + '"]');
+		var owner = document.querySelector('[aria-owns~="' + CSS.escape(node.id) + '"]');
 		if (owner && !detectLoop(node)) {
 			return owner;
 		}
@@ -163,6 +163,9 @@ var getAttribute = function(el, key) {
 		if (el.matches('noscript')) {
 			return true;
 		}
+		if (el.matches('details:not([open]) :not(summary)')) {
+			return true;
+		}
 		var style = window.getComputedStyle(el);
 		if (style.display === 'none' || style.visibility === 'hidden') {
 			return true;
@@ -228,62 +231,56 @@ module.exports = {
 };
 
 },{"./constants.js":4}],4:[function(require,module,exports){
+// https://www.w3.org/TR/wai-aria/#state_prop_def
 exports.attributes = {
-	// widget
+	'activedescendant': 'id',
+	'atomic': 'bool',
 	'autocomplete': 'token',
+	'busy': 'bool',
 	'checked': 'tristate',
+	'colcount': 'int',
+	'colindex': 'int',
+	'colspan': 'int',
+	'controls': 'id-list',
 	'current': 'token',
+	'describedby': 'id-list',
+	'details': 'id',
 	'disabled': 'bool',
+	'dropeffect': 'token-list',
+	'errormessage': 'id',
 	'expanded': 'bool-undefined',
+	'flowto': 'id-list',
+	'grabbed': 'bool-undefined',
 	'haspopup': 'token',
-	'hidden': 'bool',  // !
+	'hidden': 'bool-undefined',
 	'invalid': 'token',
 	'keyshortcuts': 'string',
 	'label': 'string',
+	'labelledby': 'id-list',
 	'level': 'int',
+	'live': 'token',
 	'modal': 'bool',
 	'multiline': 'bool',
 	'multiselectable': 'bool',
 	'orientation': 'token',
+	'owns': 'id-list',
 	'placeholder': 'string',
+	'posinset': 'int',
 	'pressed': 'tristate',
 	'readonly': 'bool',
+	'relevant': 'token-list',
 	'required': 'bool',
 	'roledescription': 'string',
-	'selected': 'bool-undefined',
-	'valuemax': 'number',
-	'valuemin': 'number',
-	'valuenow': 'number',
-	'valuetext': 'string',
-
-	// live
-	'atomic': 'bool',
-	'busy': 'bool',
-	'live': 'token',
-	'relevant': 'token-list',
-
-	// dragndrop
-	'dropeffect': 'token-list',
-	'grabbed': 'bool-undefined',
-
-	// relationship
-	'activedescendant': 'id',
-	'colcount': 'int',
-	'colindex': 'int',
-	'colspan': 'int',
-	'controls': 'id-list',
-	'describedby': 'id-list',
-	'details': 'id',
-	'errormessage': 'id',
-	'flowto': 'id-list',
-	'labelledby': 'id-list',
-	'owns': 'id-list',
-	'posinset': 'int',
 	'rowcount': 'int',
 	'rowindex': 'int',
 	'rowspan': 'int',
+	'selected': 'bool-undefined',
 	'setsize': 'int',
 	'sort': 'token',
+	'valuemax': 'number',
+	'valuemin': 'number',
+	'valuenow': 'number',
+	'valuetext': 'string',
 };
 
 exports.attributeStrongMapping = {
@@ -329,6 +326,7 @@ exports.roles = {
 	cell: {
 		selectors: ['td'],
 		childRoles: ['gridcell', 'rowheader'],
+		nameFromContents: true,
 	},
 	checkbox: {
 		selectors: ['input[type="checkbox"]'],
@@ -554,14 +552,14 @@ exports.roles = {
 		selectors: ['tr'],
 		nameFromContents: true,
 	},
-	rowheader: {
-		selectors: ['th[scope="row"]'],
-		nameFromContents: true,
-	},
 	rowgroup: {
 		selectors: ['tbody', 'thead', 'tfoot'],
 		nameFromContents: true,
 	},
+	rowheader: {
+		selectors: ['th[scope="row"]'],
+		nameFromContents: true,
+	},
 	scrollbar: {
 		defaults: {
 			'orientation': 'vertical',
@@ -618,13 +616,11 @@ exports.roles = {
 		childRoles: ['combobox', 'listbox', 'menu', 'radiogroup', 'tree'],
 	},
 	separator: {
+		// assume not focussable because <hr> is not
 		selectors: ['hr'],
 		childRoles: ['doc-pagebreak'],
 		defaults: {
 			'orientation': 'horizontal',
-			'valuemin': 0,
-			'valuemax': 100,
-			'valuenow': 50,
 		},
 	},
 	slider: {
@@ -652,12 +648,6 @@ exports.roles = {
 			'atomic': true,
 		},
 	},
-	switch: {
-		nameFromContents: true,
-		defaults: {
-			'checked': false,
-		},
-	},
 	structure: {
 		childRoles: [
 			'application',
@@ -670,6 +660,12 @@ exports.roles = {
 			'separator',
 		],
 	},
+	switch: {
+		nameFromContents: true,
+		defaults: {
+			'checked': false,
+		},
+	},
 	tab: {
 		nameFromContents: true,
 		defaults: {
@@ -724,7 +720,6 @@ exports.roles = {
 			'input',
 			'range',
 			'row',
-			'separator',
 			'tab',
 		],
 	},

package/lib/atree.js

@@ -2,7 +2,7 @@ var attrs = require('./attrs');
 
 var _getOwner = function(node) {
 	if (node.nodeType === node.ELEMENT_NODE && node.id) {
-		var owner = document.querySelector('[aria-owns~="' + node.id + '"]');
+		var owner = document.querySelector('[aria-owns~="' + CSS.escape(node.id) + '"]');
 		if (owner) {
 			return owner;
 		}
@@ -14,18 +14,18 @@ var _getParentNode = function(node) {
 };
 
 var detectLoop = function(node) {
-	var tmp = _getParentNode(node);
-	while (tmp) {
-		if (tmp === node) {
+	var seen = [node]
+	while ((node = _getParentNode(node))) {
+		if (seen.includes(node)) {
 			return true;
 		}
-		tmp = _getParentNode(tmp);
+		seen.push(node)
 	}
 };
 
 var getOwner = function(node) {
 	if (node.nodeType === node.ELEMENT_NODE && node.id) {
-		var owner = document.querySelector('[aria-owns~="' + node.id + '"]');
+		var owner = document.querySelector('[aria-owns~="' + CSS.escape(node.id) + '"]');
 		if (owner && !detectLoop(node)) {
 			return owner;
 		}

package/lib/attrs.js

@@ -50,6 +50,9 @@ var getAttribute = function(el, key) {
 		if (el.matches('noscript')) {
 			return true;
 		}
+		if (el.matches('details:not([open]) :not(summary)')) {
+			return true;
+		}
 		var style = window.getComputedStyle(el);
 		if (style.display === 'none' || style.visibility === 'hidden') {
 			return true;

package/lib/constants.js

@@ -1,59 +1,53 @@
+// https://www.w3.org/TR/wai-aria/#state_prop_def
 exports.attributes = {
-	// widget
+	'activedescendant': 'id',
+	'atomic': 'bool',
 	'autocomplete': 'token',
+	'busy': 'bool',
 	'checked': 'tristate',
+	'colcount': 'int',
+	'colindex': 'int',
+	'colspan': 'int',
+	'controls': 'id-list',
 	'current': 'token',
+	'describedby': 'id-list',
+	'details': 'id',
 	'disabled': 'bool',
+	'dropeffect': 'token-list',
+	'errormessage': 'id',
 	'expanded': 'bool-undefined',
+	'flowto': 'id-list',
+	'grabbed': 'bool-undefined',
 	'haspopup': 'token',
-	'hidden': 'bool',  // !
+	'hidden': 'bool-undefined',
 	'invalid': 'token',
 	'keyshortcuts': 'string',
 	'label': 'string',
+	'labelledby': 'id-list',
 	'level': 'int',
+	'live': 'token',
 	'modal': 'bool',
 	'multiline': 'bool',
 	'multiselectable': 'bool',
 	'orientation': 'token',
+	'owns': 'id-list',
 	'placeholder': 'string',
+	'posinset': 'int',
 	'pressed': 'tristate',
 	'readonly': 'bool',
+	'relevant': 'token-list',
 	'required': 'bool',
 	'roledescription': 'string',
-	'selected': 'bool-undefined',
-	'valuemax': 'number',
-	'valuemin': 'number',
-	'valuenow': 'number',
-	'valuetext': 'string',
-
-	// live
-	'atomic': 'bool',
-	'busy': 'bool',
-	'live': 'token',
-	'relevant': 'token-list',
-
-	// dragndrop
-	'dropeffect': 'token-list',
-	'grabbed': 'bool-undefined',
-
-	// relationship
-	'activedescendant': 'id',
-	'colcount': 'int',
-	'colindex': 'int',
-	'colspan': 'int',
-	'controls': 'id-list',
-	'describedby': 'id-list',
-	'details': 'id',
-	'errormessage': 'id',
-	'flowto': 'id-list',
-	'labelledby': 'id-list',
-	'owns': 'id-list',
-	'posinset': 'int',
 	'rowcount': 'int',
 	'rowindex': 'int',
 	'rowspan': 'int',
+	'selected': 'bool-undefined',
 	'setsize': 'int',
 	'sort': 'token',
+	'valuemax': 'number',
+	'valuemin': 'number',
+	'valuenow': 'number',
+	'valuetext': 'string',
 };
 
 exports.attributeStrongMapping = {
@@ -99,6 +93,7 @@ exports.roles = {
 	cell: {
 		selectors: ['td'],
 		childRoles: ['gridcell', 'rowheader'],
+		nameFromContents: true,
 	},
 	checkbox: {
 		selectors: ['input[type="checkbox"]'],
@@ -324,14 +319,14 @@ exports.roles = {
 		selectors: ['tr'],
 		nameFromContents: true,
 	},
-	rowheader: {
-		selectors: ['th[scope="row"]'],
-		nameFromContents: true,
-	},
 	rowgroup: {
 		selectors: ['tbody', 'thead', 'tfoot'],
 		nameFromContents: true,
 	},
+	rowheader: {
+		selectors: ['th[scope="row"]'],
+		nameFromContents: true,
+	},
 	scrollbar: {
 		defaults: {
 			'orientation': 'vertical',
@@ -388,13 +383,11 @@ exports.roles = {
 		childRoles: ['combobox', 'listbox', 'menu', 'radiogroup', 'tree'],
 	},
 	separator: {
+		// assume not focussable because <hr> is not
 		selectors: ['hr'],
 		childRoles: ['doc-pagebreak'],
 		defaults: {
 			'orientation': 'horizontal',
-			'valuemin': 0,
-			'valuemax': 100,
-			'valuenow': 50,
 		},
 	},
 	slider: {
@@ -422,12 +415,6 @@ exports.roles = {
 			'atomic': true,
 		},
 	},
-	switch: {
-		nameFromContents: true,
-		defaults: {
-			'checked': false,
-		},
-	},
 	structure: {
 		childRoles: [
 			'application',
@@ -440,6 +427,12 @@ exports.roles = {
 			'separator',
 		],
 	},
+	switch: {
+		nameFromContents: true,
+		defaults: {
+			'checked': false,
+		},
+	},
 	tab: {
 		nameFromContents: true,
 		defaults: {
@@ -494,7 +487,6 @@ exports.roles = {
 			'input',
 			'range',
 			'row',
-			'separator',
 			'tab',
 		],
 	},

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aria-api",
-  "version": "0.4.1",
+  "version": "0.4.3",
   "description": "Access ARIA information from JavaScript",
   "main": "index.js",
   "keywords": [