aria-api 0.4.2 → 0.4.4

package/dist/aria.js

@@ -35,12 +35,12 @@ 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)
 	}
 };
 
@@ -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;
@@ -309,9 +312,6 @@ exports.roles = {
 	article: {
 		selectors: ['article'],
 	},
-	blockquote: {
-		selectors: ['blockquote'],
-	},
 	button: {
 		selectors: [
 			'button',
@@ -323,9 +323,6 @@ exports.roles = {
 		],
 		nameFromContents: true,
 	},
-	caption: {
-		selectors: ['caption'],  // not sure about figcaption, ARIA and HTML-AAM differ
-	},
 	cell: {
 		selectors: ['td'],
 		childRoles: ['gridcell', 'rowheader'],
@@ -333,11 +330,11 @@ exports.roles = {
 	},
 	checkbox: {
 		selectors: ['input[type="checkbox"]'],
-		childRoles: ['switch'],
+		childRoles: ['menuitemcheckbox', 'switch'],
 		nameFromContents: true,
-	},
-	code: {
-		selectors: ['code'],
+		defaults: {
+			'checked': 'false',
+		},
 	},
 	columnheader: {
 		selectors: ['th[scope="col"]'],
@@ -356,6 +353,7 @@ exports.roles = {
 			'select[size="1"]:not([multiple])',
 		],
 		defaults: {
+			'expanded': false,
 			'haspopup': 'listbox',
 		},
 	},
@@ -371,9 +369,6 @@ exports.roles = {
 	definition: {
 		selectors: ['dd'],
 	},
-	deletion: {
-		selectors: ['del'],
-	},
 	dialog: {
 		selectors: ['dialog'],
 		childRoles: ['alertdialog'],
@@ -390,35 +385,16 @@ exports.roles = {
 	'doc-noteref': {
 		nameFromContents: true,
 	},
-	'doc-pagebreak': {
-		nameFromContents: true,
-	},
-	'doc-subtitle': {
-		nameFromContents: true,
-	},
 	document: {
-		selector: ['html'],
+		selectors: ['body'],
 		childRoles: ['article', 'graphics-document'],
 	},
-	emphasis: {
-		selectors: ['em'],
-	},
 	figure: {
 		selectors: ['figure'],
-		childRoles: ['doc-example'],
 	},
 	form: {
 		selectors: ['form[aria-label]', 'form[aria-labelledby]', 'form[title]'],
 	},
-	generic: {
-		selectors: [
-			'body',
-			'div',
-			'form:not([aria-label]):not([aria-labelledby]):not([title])',
-			'hgroup',
-			'span',
-		],
-	},
 	grid: {
 		childRoles: ['treegrid'],
 	},
@@ -427,22 +403,22 @@ exports.roles = {
 		nameFromContents: true,
 	},
 	group: {
-		selectors: ['details', 'fieldset', 'optgroup'],
+		selectors: ['details', 'optgroup'],
 		childRoles: ['row', 'select', 'toolbar', 'graphics-object'],
 	},
 	heading: {
 		selectors: ['h1', 'h2', 'h3', 'h4', 'h5', 'h6'],
 		nameFromContents: true,
+		defaults: {
+			'level': 2,
+		},
 	},
 	img: {
 		selectors: ['img:not([alt=""])', 'graphics-symbol'],
 		childRoles: ['doc-cover'],
 	},
 	input: {
-		childRoles: ['checkbox', 'combobox', 'option', 'radio', 'slider', 'spinbutton', 'textbox'],
-	},
-	insertion: {
-		selectors: ['ins'],
+		childRoles: ['checkbox', 'option', 'radio', 'slider', 'spinbutton', 'textbox'],
 	},
 	landmark: {
 		childRoles: [
@@ -478,12 +454,11 @@ exports.roles = {
 		nameFromContents: true,
 	},
 	list: {
-		selectors: ['ol', 'ul', 'menu'],
+		selectors: ['dl', 'ol', 'ul'],
 		childRoles: ['directory', 'feed'],
 	},
 	listbox: {
 		selectors: [
-			'datalist',
 			'select[multiple]',
 			'select[size]:not([size="0"]):not([size="1"])',
 		],
@@ -492,8 +467,8 @@ exports.roles = {
 		},
 	},
 	listitem: {
-		selectors: ['ul > li', 'ol > li', 'menu > li'],
-		childRoles: ['treeitem'],
+		selectors: ['dt', 'ul > li', 'ol > li'],
+		childRoles: ['doc-biblioentry', 'doc-endnote', 'treeitem'],
 	},
 	log: {
 		defaults: {
@@ -506,14 +481,8 @@ exports.roles = {
 	math: {
 		selectors: ['math'],
 	},
-	meter: {
-		selectors: ['meter'],
-		defaults: {
-			'valuemin': 0,
-			'valuemax': 100,
-		},
-	},
 	menu: {
+		selectors: ['menu[type="context"]'],
 		childRoles: ['menubar'],
 		defaults: {
 			'orientation': 'vertical',
@@ -533,10 +502,16 @@ exports.roles = {
 		selectors: ['menuitem[type="checkbox"]'],
 		childRoles: ['menuitemradio'],
 		nameFromContents: true,
+		defaults: {
+			'checked': 'false',
+		},
 	},
 	menuitemradio: {
 		selectors: ['menuitem[type="radio"]'],
 		nameFromContents: true,
+		defaults: {
+			'checked': 'false',
+		},
 	},
 	navigation: {
 		selectors: ['nav'],
@@ -553,22 +528,19 @@ exports.roles = {
 			'selected': 'false',
 		},
 	},
-	paragraph: {
-		selectors: ['p'],
-	},
 	progressbar: {
 		selectors: ['progress'],
-		defaults: {
-			'valuemin': 0,
-			'valuemax': 100,
-		},
 	},
 	radio: {
 		selectors: ['input[type="radio"]'],
+		childRoles: ['menuitemradio'],
 		nameFromContents: true,
+		defaults: {
+			'checked': 'false',
+		},
 	},
 	range: {
-		childRoles: ['meter', 'progressbar', 'scrollbar', 'slider', 'spinbutton'],
+		childRoles: ['progressbar', 'scrollbar', 'slider', 'spinbutton'],
 	},
 	region: {
 		selectors: ['section[aria-label]', 'section[aria-labelledby]', 'section[title]'],
@@ -582,6 +554,7 @@ exports.roles = {
 	},
 	rowgroup: {
 		selectors: ['tbody', 'thead', 'tfoot'],
+		nameFromContents: true,
 	},
 	rowheader: {
 		selectors: ['th[scope="row"]'],
@@ -602,27 +575,19 @@ exports.roles = {
 	section: {
 		childRoles: [
 			'alert',
-			'blockquote',
-			'caption',
 			'cell',
-			'code',
 			'definition',
-			'deletion',
 			'doc-abstract',
 			'doc-colophon',
 			'doc-credit',
 			'doc-dedication',
 			'doc-epigraph',
+			'doc-example',
 			'doc-footnote',
-			'doc-pagefooter',
-			'doc-pageheader',
-			'doc-pullquote',
 			'doc-qna',
-			'emphasis',
 			'figure',
 			'group',
 			'img',
-			'insertion',
 			'landmark',
 			'list',
 			'listitem',
@@ -630,15 +595,10 @@ exports.roles = {
 			'marquee',
 			'math',
 			'note',
-			'paragraph',
 			'status',
-			'strong',
-			'subscript',
-			'superscript',
 			'table',
 			'tabpanel',
 			'term',
-			'time',
 			'tooltip',
 		],
 	},
@@ -653,7 +613,7 @@ exports.roles = {
 		nameFromContents: true,
 	},
 	select: {
-		childRoles: ['listbox', 'menu', 'radiogroup', 'tree'],
+		childRoles: ['combobox', 'listbox', 'menu', 'radiogroup', 'tree'],
 	},
 	separator: {
 		// assume not focussable because <hr> is not
@@ -676,7 +636,8 @@ exports.roles = {
 	spinbutton: {
 		selectors: ['input[type="number"]'],
 		defaults: {
-			// FIXME: no valuemin/valuemax/valuenow
+			// FIXME: no valuemin/valuemax
+			'valuenow': 0,
 		},
 	},
 	status: {
@@ -687,31 +648,23 @@ exports.roles = {
 			'atomic': true,
 		},
 	},
-	strong: {
-		selectors: ['strong'],
-	},
 	structure: {
 		childRoles: [
 			'application',
 			'document',
 			'none',
-			'generic',
 			'presentation',
-			'range',
 			'rowgroup',
 			'section',
 			'sectionhead',
 			'separator',
 		],
 	},
-	subscript: {
-		selectors: ['sub'],
-	},
-	superscript: {
-		selectors: ['sup'],
-	},
 	switch: {
 		nameFromContents: true,
+		defaults: {
+			'checked': false,
+		},
 	},
 	tab: {
 		nameFromContents: true,
@@ -742,9 +695,6 @@ exports.roles = {
 		],
 		childRoles: ['searchbox'],
 	},
-	time: {
-		selectors: ['time'],
-	},
 	toolbar: {
 		defaults: {
 			'orientation': 'horizontal',
@@ -768,9 +718,8 @@ exports.roles = {
 			'composite',
 			'gridcell',
 			'input',
-			'progressbar',
+			'range',
 			'row',
-			'scrollbar',
 			'tab',
 		],
 	},
@@ -831,17 +780,6 @@ exports.nameDefaults = {
 	'summary': 'Details',
 };
 
-exports.labelable = [
-	'button',
-	'input:not([type="hidden"])',
-	'keygen',
-	'meter',
-	'output',
-	'progress',
-	'select',
-	'textarea',
-];
-
 },{}],5:[function(require,module,exports){
 var constants = require('./constants.js');
 var atree = require('./atree.js');
@@ -894,14 +832,9 @@ var allowNameFromContent = function(el) {
 	return (constants.roles[role] || {}).nameFromContents;
 };
 
-var isLabelable = function(el) {
-	var selector = constants.labelable.join(',');
-	return el.matches(selector);
-};
-
 var isInLabelForOtherWidget = function(el) {
 	var label = el.parentElement.closest('label');
-	return label && !Array.prototype.includes.call(el.labels, label);
+	return label && (!el.label || !Array.prototype.includes.call(el.labels, label));
 };
 
 var getName = function(el, recursive, visited, directReference) {
@@ -936,7 +869,7 @@ var getName = function(el, recursive, visited, directReference) {
 	}
 
 	// D
-	if (!ret.trim() && !recursive && isLabelable(el)) {
+	if (!ret.trim() && !recursive && el.labels) {
 		var strings = Array.prototype.map.call(el.labels, function(label) {
 			return getName(label, true, visited);
 		});

package/lib/atree.js

@@ -14,12 +14,12 @@ 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)
 	}
 };
 

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

@@ -546,14 +546,3 @@ exports.nameDefaults = {
 	'input[type="reset"]': 'Reset',
 	'summary': 'Details',
 };
-
-exports.labelable = [
-	'button',
-	'input:not([type="hidden"])',
-	'keygen',
-	'meter',
-	'output',
-	'progress',
-	'select',
-	'textarea',
-];

package/lib/name.js

@@ -49,14 +49,9 @@ var allowNameFromContent = function(el) {
 	return (constants.roles[role] || {}).nameFromContents;
 };
 
-var isLabelable = function(el) {
-	var selector = constants.labelable.join(',');
-	return el.matches(selector);
-};
-
 var isInLabelForOtherWidget = function(el) {
 	var label = el.parentElement.closest('label');
-	return label && !Array.prototype.includes.call(el.labels, label);
+	return label && (!el.label || !Array.prototype.includes.call(el.labels, label));
 };
 
 var getName = function(el, recursive, visited, directReference) {
@@ -91,7 +86,7 @@ var getName = function(el, recursive, visited, directReference) {
 	}
 
 	// D
-	if (!ret.trim() && !recursive && isLabelable(el)) {
+	if (!ret.trim() && !recursive && el.labels) {
 		var strings = Array.prototype.map.call(el.labels, function(label) {
 			return getName(label, true, visited);
 		});

package/package.json

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