aria-api 0.4.7 → 0.6.0

package/lib/atree.js

@@ -1,10 +1,10 @@
-var attrs = require('./attrs');
+const attrs = require('./attrs');
 
-var _getOwner = function(node, owners) {
+const _getOwner = function(node, owners) {
 	if (node.nodeType === node.ELEMENT_NODE && node.id) {
-		var selector = '[aria-owns~="' + CSS.escape(node.id) + '"]';
+		const selector = '[aria-owns~="' + CSS.escape(node.id) + '"]';
 		if (owners) {
-			for (var owner of owners) {
+			for (const owner of owners) {
 				if (owner.matches(selector)) {
 					return owner;
 				}
@@ -15,12 +15,12 @@ var _getOwner = function(node, owners) {
 	}
 };
 
-var _getParentNode = function(node, owners) {
+const _getParentNode = function(node, owners) {
 	return _getOwner(node, owners) || node.parentNode;
 };
 
-var detectLoop = function(node, owners) {
-	var seen = [node];
+const detectLoop = function(node, owners) {
+	const seen = [node];
 	while ((node = _getParentNode(node, owners))) {
 		if (seen.includes(node)) {
 			return true;
@@ -29,35 +29,35 @@ var detectLoop = function(node, owners) {
 	}
 };
 
-var getOwner = function(node, owners) {
-	var owner = _getOwner(node, owners);
+const getOwner = function(node, owners) {
+	const owner = _getOwner(node, owners);
 	if (owner && !detectLoop(node, owners)) {
 		return owner;
 	}
 };
 
-var getParentNode = function(node, owners) {
+const getParentNode = function(node, owners) {
 	return getOwner(node, owners) || node.parentNode;
 };
 
-var isHidden = function(node) {
+const isHidden = function(node) {
 	return node.nodeType === node.ELEMENT_NODE && attrs.getAttribute(node, 'hidden');
 };
 
-var getChildNodes = function(node, owners) {
-	var childNodes = [];
+const getChildNodes = function(node, owners) {
+	const childNodes = [];
 
-	for (var i = 0; i < node.childNodes.length; i++) {
-		var child = node.childNodes[i];
+	for (let i = 0; i < node.childNodes.length; i++) {
+		const child = node.childNodes[i];
 		if (!getOwner(child, owners) && !isHidden(child)) {
 			childNodes.push(child);
 		}
 	}
 
 	if (node.nodeType === node.ELEMENT_NODE) {
-		var owns = attrs.getAttribute(node, 'owns') || [];
-		for (var i = 0; i < owns.length; i++) {
-			var child = document.getElementById(owns[i]);
+		const owns = attrs.getAttribute(node, 'owns') || [];
+		for (let i = 0; i < owns.length; i++) {
+			const child = document.getElementById(owns[i]);
 			// double check with getOwner for consistency
 			if (child && getOwner(child, owners) === node && !isHidden(child)) {
 				childNodes.push(child);
@@ -68,18 +68,18 @@ var getChildNodes = function(node, owners) {
 	return childNodes;
 };
 
-var walk = function(root, fn) {
-	var owners = document.querySelectorAll('[aria-owns]');
-	var queue = [root];
+const walk = function(root, fn) {
+	const owners = document.querySelectorAll('[aria-owns]');
+	let queue = [root];
 	while (queue.length) {
-		var item = queue.shift();
+		const item = queue.shift();
 		fn(item);
 		queue = getChildNodes(item, owners).concat(queue);
 	}
 };
 
-var searchUp = function(node, test) {
-	var candidate = getParentNode(node);
+const searchUp = function(node, test) {
+	const candidate = getParentNode(node);
 	if (candidate) {
 		if (test(candidate)) {
 			return candidate;

package/lib/attrs.js

@@ -1,37 +1,56 @@
-var constants = require('./constants.js');
+const constants = require('./constants.js');
+
+var unique = function(arr) {
+	return arr.filter((a, i) => arr.indexOf(a) === i);
+};
+
+var flatten = function(arr) {
+	return [].concat.apply([], arr);
+};
+
+var normalizeRoles = function(roles, includeAbstract) {
+	return unique(roles
+		.map(r => constants.aliases[r] || r)
+		.filter(r => constants.roles[r])
+		.filter(r => includeAbstract || !constants.roles[r].abstract)
+	);
+};
 
 // candidates can be passed for performance optimization
-var getRole = function(el, candidates) {
-	if (el.hasAttribute('role')) {
-		var role = el.getAttribute('role');
-		if (!candidates || candidates.includes(role)) {
-			return role;
-		} else {
-			return;
+const getRole = function(el, candidates) {
+	// TODO: filter out any invalid roles (e.g. name or context required)
+	const roles = normalizeRoles(
+		(el.getAttribute('role') || '').toLowerCase().split(/\s+/)
+	);
+
+	if (roles.length > 1 && candidates) {
+		return [roles, candidates];
+	} else if (roles.length) {
+		for (const role of roles) {
+			if (!candidates || candidates.includes(role)) {
+				return role;
+			}
 		}
-	}
-	var roles = candidates ? candidates : Object.keys(constants.roles);
-	for (var role of roles) {
-		var r = constants.roles[role];
-		if (r) {
-			var selector = (r.selectors || []).join(',');
-			if (selector && el.matches(selector)) {
+	} else {
+		for (const role of (candidates || Object.keys(constants.roles))) {
+			const r = constants.roles[role];
+			if (!r.abstract && r.selectors && el.matches(r.selectors.join(','))) {
 				return role;
 			}
 		}
 	}
 };
 
-var hasRole = function(el, roles) {
-	var candidates = [].concat.apply([], roles.map(role => {
-		return (constants.roles[role] || {}).subRoles || [role];
-	}));
-	return !!getRole(el, candidates);
+const hasRole = function(el, roles) {
+	const subRoles = normalizeRoles(roles, true).map(role => {
+		return constants.roles[role].subRoles || [role];
+	});
+	return !!getRole(el, unique(flatten(subRoles)));
 };
 
-var getAttribute = function(el, key) {
+const getAttribute = function(el, key) {
 	if (constants.attributeStrongMapping.hasOwnProperty(key)) {
-		var value = el[constants.attributeStrongMapping[key]];
+		const value = el[constants.attributeStrongMapping[key]];
 		if (value) {
 			return value;
 		}
@@ -48,14 +67,14 @@ var getAttribute = function(el, key) {
 		if (el.matches('details:not([open]) > :not(summary)')) {
 			return true;
 		}
-		var style = window.getComputedStyle(el);
+		const style = window.getComputedStyle(el);
 		if (style.display === 'none' || style.visibility === 'hidden') {
 			return true;
 		}
 	}
 
-	var type = constants.attributes[key];
-	var raw = el.getAttribute('aria-' + key);
+	const type = constants.attributes[key];
+	const raw = el.getAttribute('aria-' + key);
 
 	if (raw) {
 		if (type === 'bool') {
@@ -84,7 +103,7 @@ var getAttribute = function(el, key) {
 	// list -> aria-controls
 
 	if (key === 'level') {
-		for (var i = 1; i <= 6; i++) {
+		for (let i = 1; i <= 6; i++) {
 			if (el.tagName.toLowerCase() === 'h' + i) {
 				return i;
 			}
@@ -94,8 +113,8 @@ var getAttribute = function(el, key) {
 	}
 
 	if (key in constants.attrsWithDefaults) {
-		var role = getRole(el);
-		var defaults = (constants.roles[role] || {}).defaults;
+		const role = getRole(el);
+		const defaults = constants.roles[role].defaults;
 		if (defaults && defaults.hasOwnProperty(key)) {
 			return defaults[key];
 		}