aria-api 0.5.0 → 0.7.0

package/dist/aria.js

@@ -19,13 +19,13 @@ module.exports = {
 };
 
 },{"./lib/atree.js":2,"./lib/name.js":5,"./lib/query.js":6}],2:[function(require,module,exports){
-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;
 				}
@@ -36,12 +36,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;
@@ -50,35 +50,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);
@@ -89,18 +89,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;
@@ -118,44 +118,59 @@ module.exports = {
 };
 
 },{"./attrs":3}],3:[function(require,module,exports){
-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 roles = el.getAttribute('role').toLowerCase().split(/\s+/);
-		if (roles.length > 1 && candidates) {
-			return [roles, candidates];
-		}
-		for (var role of roles) {
+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;
 			}
 		}
 	} else {
-		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)) {
-					return role;
-				}
+		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;
 		}
@@ -172,14 +187,14 @@ var getAttribute = function(el, key) {
 		if (el.matches('details:not([open]) > :not(summary)')) {
 			return true;
 		}
-		var style = window.getComputedStyle(el);
-		if (style.display === 'none' || style.visibility === 'hidden') {
+		const style = window.getComputedStyle(el);
+		if (style.display === 'none' || style.visibility === 'hidden' || style.visibility === 'collapse') {
 			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') {
@@ -208,7 +223,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;
 			}
@@ -218,8 +233,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];
 		}
@@ -242,14 +257,18 @@ exports.attributes = {
 	'activedescendant': 'id',
 	'atomic': 'bool',
 	'autocomplete': 'token',
+	'braillelabel': 'string',
+	'brailleroledescription': 'string',
 	'busy': 'bool',
 	'checked': 'tristate',
 	'colcount': 'int',
 	'colindex': 'int',
+	'colindextext': 'string',
 	'colspan': 'int',
 	'controls': 'id-list',
 	'current': 'token',
 	'describedby': 'id-list',
+	'description': 'string',
 	'details': 'id',
 	'disabled': 'bool',
 	'dropeffect': 'token-list',
@@ -279,6 +298,7 @@ exports.attributes = {
 	'roledescription': 'string',
 	'rowcount': 'int',
 	'rowindex': 'int',
+	'rowindextext': 'string',
 	'rowspan': 'int',
 	'selected': 'bool-undefined',
 	'setsize': 'int',
@@ -306,7 +326,20 @@ exports.attributeWeakMapping = {
 };
 
 // https://www.w3.org/TR/html/dom.html#sectioning-content-2
-var scoped = ['article *', 'aside *', 'nav *', 'section *'].join(',');
+const scoped = ['article *', 'aside *', 'nav *', 'section *'].join(',');
+
+const svgSelectors = function(selector) {
+	return [
+		// `${selector}:has(> title:not(:empty))`,
+		// `${selector}:has(> desc:not(:empty))`,
+		`${selector}[aria-label]`,
+		`${selector}[aria-roledescription]`,
+		`${selector}[aria-labelledby]`,
+		`${selector}[aria-describedby]`,
+		`${selector}[tabindex]`,
+		`${selector}[role]`,
+	];
+};
 
 // https://www.w3.org/TR/html-aam-1.0/#html-element-role-mappings
 // https://www.w3.org/TR/wai-aria/roles
@@ -318,8 +351,11 @@ exports.roles = {
 			'atomic': true,
 		},
 	},
+	alertdialog: {},
+	application: {},
 	article: {
 		selectors: ['article'],
+		childRoles: ['comment'],
 	},
 	banner: {
 		selectors: [`header:not(main *, ${scoped})`],
@@ -342,7 +378,7 @@ exports.roles = {
 		selectors: ['caption', 'figcaption'],
 	},
 	cell: {
-		selectors: ['td', 'th:not([scope])'],
+		selectors: ['td', 'td ~ th:not([scope])'],
 		childRoles: ['columnheader', 'gridcell', 'rowheader'],
 		nameFromContents: true,
 	},
@@ -379,8 +415,12 @@ exports.roles = {
 		},
 	},
 	command: {
+		abstract: true,
 		childRoles: ['button', 'link', 'menuitem'],
 	},
+	comment: {
+		nameFromContents: true,
+	},
 	complementary: {
 		selectors: [
 			`aside:not(${scoped})`,
@@ -390,6 +430,7 @@ exports.roles = {
 		],
 	},
 	composite: {
+		abstract: true,
 		childRoles: ['grid', 'select', 'spinbutton', 'tablist'],
 	},
 	contentinfo: {
@@ -405,24 +446,59 @@ exports.roles = {
 		selectors: ['dialog'],
 		childRoles: ['alertdialog'],
 	},
+	'doc-abstract': {},
+	'doc-acknowledgments': {},
+	'doc-afterword': {},
+	'doc-appendix': {},
 	'doc-backlink': {
 		nameFromContents: true,
 	},
+	'doc-biblioentry': {},
+	'doc-bibliography': {},
 	'doc-biblioref': {
 		nameFromContents: true,
 	},
+	'doc-chapter': {},
+	'doc-colophon': {},
+	'doc-conclusion': {},
+	'doc-cover': {},
+	'doc-credit': {},
+	'doc-credits': {},
+	'doc-dedication': {},
+	'doc-endnote': {},
+	'doc-endnotes': {},
+	'doc-epilogue': {},
+	'doc-epigraph': {},
+	'doc-errata': {},
+	'doc-example': {},
+	'doc-footnote': {},
+	'doc-foreword': {},
+	'doc-glossary': {},
 	'doc-glossref': {
 		nameFromContents: true,
 	},
+	'doc-index': {},
+	'doc-introduction': {},
 	'doc-noteref': {
 		nameFromContents: true,
 	},
+	'doc-notice': {},
 	'doc-pagebreak': {
 		nameFromContents: true,
 	},
+	'doc-pagefooter': {},
+	'doc-pageheader': {},
+	'doc-pagelist': {},
+	'doc-part': {},
+	'doc-preface': {},
+	'doc-prologue': {},
+	'doc-pullquote': {},
+	'doc-qna': {},
 	'doc-subtitle': {
 		nameFromContents: true,
 	},
+	'doc-tip': {},
+	'doc-toc': {},
 	document: {
 		selectors: ['html'],
 		childRoles: ['article', 'graphics-document'],
@@ -430,6 +506,7 @@ exports.roles = {
 	emphasis: {
 		selectors: ['em'],
 	},
+	feed: {},
 	figure: {
 		selectors: ['figure'],
 		childRoles: ['doc-example'],
@@ -438,11 +515,49 @@ exports.roles = {
 		selectors: ['form[aria-label]', 'form[aria-labelledby]', 'form[title]'],
 	},
 	generic: {
-		// too many selectors to list
+		selectors: [
+			'a:not([*|href])',
+			'area:not([*|href])',
+			`aside:not(${scoped}):not([aria-label]):not([aria-labelledby]):not([title])`,
+			'b',
+			'bdi',
+			'bdo',
+			'body',
+			'data',
+			'div',
+			// footer scoped
+			// header scoped
+			'i',
+			'li:not(ul > li):not(ol > li)',
+			'pre',
+			'q',
+			'samp',
+			'section:not([aria-label]):not([aria-labelledby]):not([title])',
+			'small',
+			'span',
+			'u',
+		],
 	},
 	'graphics-document': {
 		selectors: ['svg'],
 	},
+	'graphics-object': {
+		selectors: [
+			...svgSelectors('symbol'),
+			...svgSelectors('use'),
+		],
+	},
+	'graphics-symbol': {
+		selectors: [
+			...svgSelectors('circle'),
+			...svgSelectors('ellipse'),
+			...svgSelectors('line'),
+			...svgSelectors('path'),
+			...svgSelectors('polygon'),
+			...svgSelectors('polyline'),
+			...svgSelectors('rect'),
+		],
+	},
 	grid: {
 		childRoles: ['treegrid'],
 	},
@@ -457,7 +572,11 @@ exports.roles = {
 			'fieldset',
 			'hgroup',
 			'optgroup',
+			...svgSelectors('foreignObject'),
+			...svgSelectors('g'),
 			'text',
+			...svgSelectors('textPath'),
+			...svgSelectors('tspan'),
 		],
 		childRoles: ['row', 'select', 'toolbar', 'graphics-object'],
 	},
@@ -468,11 +587,17 @@ exports.roles = {
 			'level': 2,
 		},
 	},
-	img: {
-		selectors: ['img:not([alt=""])', 'graphics-symbol'],
+	image: {
+		selectors: [
+			'img:not([alt=""])',
+			'graphics-symbol',
+			...svgSelectors('image'),
+			...svgSelectors('mesh'),
+		],
 		childRoles: ['doc-cover'],
 	},
 	input: {
+		abstract: true,
 		childRoles: [
 			'checkbox',
 			'combobox',
@@ -487,6 +612,7 @@ exports.roles = {
 		selectors: ['ins'],
 	},
 	landmark: {
+		abstract: true,
 		childRoles: [
 			'banner',
 			'complementary',
@@ -515,13 +641,13 @@ exports.roles = {
 		],
 	},
 	link: {
-		selectors: ['a[href]', 'area[href]'],
+		selectors: ['a[*|href]', 'area[href]'],
 		childRoles: ['doc-backlink', 'doc-biblioref', 'doc-glossref', 'doc-noteref'],
 		nameFromContents: true,
 	},
 	list: {
 		selectors: ['dl', 'ol', 'ul', 'menu'],
-		childRoles: ['directory', 'feed'],
+		childRoles: ['feed'],
 	},
 	listbox: {
 		selectors: [
@@ -534,7 +660,7 @@ exports.roles = {
 		},
 	},
 	listitem: {
-		selectors: ['li'],
+		selectors: ['ol > li', 'ul > li'],
 		childRoles: ['doc-biblioentry', 'doc-endnote', 'treeitem'],
 	},
 	log: {
@@ -545,6 +671,10 @@ exports.roles = {
 	main: {
 		selectors: ['main'],
 	},
+	mark: {
+		selectors: ['mark'],
+	},
+	marquee: {},
 	math: {
 		selectors: ['math'],
 	},
@@ -567,11 +697,10 @@ exports.roles = {
 		},
 	},
 	menuitem: {
-		childRoles: ['menuitemcheckbox'],
+		childRoles: ['menuitemcheckbox', 'menuitemradio'],
 		nameFromContents: true,
 	},
 	menuitemcheckbox: {
-		childRoles: ['menuitemradio'],
 		nameFromContents: true,
 		defaults: {
 			'checked': 'false',
@@ -587,6 +716,9 @@ exports.roles = {
 		selectors: ['nav'],
 		childRoles: ['doc-index', 'doc-pagelist', 'doc-toc'],
 	},
+	none: {
+		selectors: ['img[alt=""]'],
+	},
 	note: {
 		childRoles: ['doc-notice', 'doc-tip'],
 	},
@@ -601,9 +733,6 @@ exports.roles = {
 	paragraph: {
 		selectors: ['p'],
 	},
-	presentation: {
-		selectors: ['img[alt=""]'],
-	},
 	progressbar: {
 		selectors: ['progress'],
 		defaults: {
@@ -619,13 +748,16 @@ exports.roles = {
 			'checked': 'false',
 		},
 	},
+	radiogroup: {},
 	range: {
+		abstract: true,
 		childRoles: ['meter', 'progressbar', 'scrollbar', 'slider', 'spinbutton'],
 	},
 	region: {
 		selectors: ['section[aria-label]', 'section[aria-labelledby]', 'section[title]'],
 	},
 	roletype: {
+		abstract: true,
 		childRoles: ['structure', 'widget', 'window'],
 	},
 	row: {
@@ -636,7 +768,7 @@ exports.roles = {
 		selectors: ['tbody', 'thead', 'tfoot'],
 	},
 	rowheader: {
-		selectors: ['th[scope="row"]'],
+		selectors: ['th[scope="row"]', 'th:not([scope]):not(td ~ th)'],
 		nameFromContents: true,
 	},
 	scrollbar: {
@@ -653,6 +785,7 @@ exports.roles = {
 		selectors: ['input[type="search"]:not([list])'],
 	},
 	section: {
+		abstract: true,
 		childRoles: [
 			'alert',
 			'blockquote',
@@ -674,12 +807,13 @@ exports.roles = {
 			'emphasis',
 			'figure',
 			'group',
-			'img',
+			'image',
 			'insertion',
 			'landmark',
 			'list',
 			'listitem',
 			'log',
+			'mark',
 			'marquee',
 			'math',
 			'note',
@@ -687,6 +821,7 @@ exports.roles = {
 			'status',
 			'strong',
 			'subscript',
+			'suggestion',
 			'superscript',
 			'table',
 			'tabpanel',
@@ -696,6 +831,7 @@ exports.roles = {
 		],
 	},
 	sectionhead: {
+		abstract: true,
 		childRoles: [
 			'columnheader',
 			'doc-subtitle',
@@ -706,6 +842,7 @@ exports.roles = {
 		nameFromContents: true,
 	},
 	select: {
+		abstract: true,
 		childRoles: ['listbox', 'menu', 'radiogroup', 'tree'],
 	},
 	separator: {
@@ -746,12 +883,12 @@ exports.roles = {
 		selectors: ['strong'],
 	},
 	structure: {
+		abstract: true,
 		childRoles: [
 			'application',
 			'document',
 			'none',
 			'generic',
-			'presentation',
 			'range',
 			'rowgroup',
 			'section',
@@ -759,6 +896,7 @@ exports.roles = {
 			'separator',
 		],
 	},
+	suggestion: {},
 	subscript: {
 		selectors: ['sub'],
 	},
@@ -786,6 +924,7 @@ exports.roles = {
 			'orientation': 'horizontal',
 		},
 	},
+	tabpanel: {},
 	term: {
 		selectors: ['dfn', 'dt'],
 	},
@@ -822,10 +961,12 @@ exports.roles = {
 			'orientation': 'vertical',
 		},
 	},
+	treegrid: {},
 	treeitem: {
 		nameFromContents: true,
 	},
 	widget: {
+		abstract: true,
 		childRoles: [
 			'command',
 			'composite',
@@ -839,15 +980,16 @@ exports.roles = {
 		],
 	},
 	window: {
+		abstract: true,
 		childRoles: ['dialog'],
 	},
 };
 
-var getSubRoles = function(role) {
-	var children = (exports.roles[role] || {}).childRoles || [];
-	var descendents = children.map(getSubRoles);
+const getSubRoles = function(role) {
+	const children = (exports.roles[role]).childRoles || [];
+	const descendents = children.map(getSubRoles);
 
-	var result = [role];
+	const result = [role];
 
 	descendents.forEach(list => {
 		list.forEach(r => {
@@ -862,18 +1004,20 @@ var getSubRoles = function(role) {
 
 exports.attrsWithDefaults = [];
 
-for (var role in exports.roles) {
+for (const role in exports.roles) {
 	exports.roles[role].subRoles = getSubRoles(role);
-	for (var key in exports.roles[role].defaults) {
+	for (const key in exports.roles[role].defaults) {
 		if (!exports.attrsWithDefaults.includes(key)) {
 			exports.attrsWithDefaults.push(key);
 		}
 	}
 }
-exports.roles['none'] = exports.roles['none'] || {};
-exports.roles['none'].subRoles = ['none', 'presentation'];
-exports.roles['presentation'] = exports.roles['presentation'] || {};
-exports.roles['presentation'].subRoles = ['presentation', 'none'];
+
+exports.aliases = {
+	'presentation': 'none',
+	'directory': 'list',
+	'img': 'image',
+};
 
 exports.nameFromDescendant = {
 	'figure': 'figcaption',
@@ -888,45 +1032,59 @@ exports.nameDefaults = {
 };
 
 },{}],5:[function(require,module,exports){
-var constants = require('./constants.js');
-var atree = require('./atree.js');
-var query = require('./query.js');
-
-var getPseudoContent = function(node, selector) {
-	var styles = window.getComputedStyle(node, selector);
-	var ret = styles.getPropertyValue('content');
-	var inline = styles.display.substr(0, 6) === 'inline';
-	if (!ret) {
-		return '';
-	}
-	if (ret.substr(0, 1) !== '"') {
-		return '';
-	} else {
-		if (inline) {
-			return ret.slice(1, -1);
+const constants = require('./constants.js');
+const atree = require('./atree.js');
+const query = require('./query.js');
+
+const addSpaces = function(text, el, pseudoSelector) {
+	// https://github.com/w3c/accname/issues/3
+	const styles = window.getComputedStyle(el, pseudoSelector);
+	const inline = styles.display === 'inline';
+	return inline ? text : ` ${text} `;
+};
+
+const getPseudoContent = function(el, pseudoSelector) {
+	const styles = window.getComputedStyle(el, pseudoSelector);
+	let tail = styles.getPropertyValue('content').trim();
+	let ret = [];
+
+	let match;
+	while (tail.length) {
+		if (match = tail.match(/^"([^"]*)"/)) {
+			ret.push(match[1]);
+		} else if (match = tail.match(/^([a-z-]+)\(([^)]*)\)/)) {
+			if (match[1] === 'attr') {
+				ret.push(el.getAttribute(match[2]) || '');
+			}
+		} else if (match = tail.match(/^([a-z-]+)/)) {
+			if (match[1] === 'open-quote' || match[1] === 'close-quote') {
+				ret.push('"');
+			}
+		} else if (match = tail.match(/^\//)) {
+			ret = [];
 		} else {
-			return ' ' + ret.slice(1, -1) + ' ';
+			// invalid content, ignore
+			return '';
 		}
+		tail = tail.slice(match[0].length).trim();
 	}
+
+	return addSpaces(ret.join(''), el, pseudoSelector);
 };
 
-var getContent = function(root, visited) {
-	var children = atree.getChildNodes(root);
+const getContent = function(root, ongoingLabelledBy, visited) {
+	const children = atree.getChildNodes(root);
 
-	var ret = '';
-	for (var i = 0; i < children.length; i++) {
-		var node = children[i];
+	let ret = '';
+	for (let i = 0; i < children.length; i++) {
+		const node = children[i];
 		if (node.nodeType === node.TEXT_NODE) {
 			ret += node.textContent;
 		} else if (node.nodeType === node.ELEMENT_NODE) {
 			if (node.tagName.toLowerCase() === 'br') {
 				ret += '\n';
-			} else if (window.getComputedStyle(node).display.substr(0, 6) === 'inline' &&
-					node.tagName.toLowerCase() !== 'input' &&
-					node.tagName.toLowerCase() !== 'img') {  // https://github.com/w3c/accname/issues/3
-				ret += getName(node, true, visited);
 			} else {
-				ret += ' ' + getName(node, true, visited) + ' ';
+				ret += getName(node, true, ongoingLabelledBy, visited);
 			}
 		}
 	}
@@ -934,18 +1092,15 @@ var getContent = function(root, visited) {
 	return ret;
 };
 
-var allowNameFromContent = function(el) {
-	var role = query.getRole(el);
-	return (constants.roles[role] || {}).nameFromContents;
-};
-
-var isInLabelForOtherWidget = function(el) {
-	var label = el.parentElement.closest('label');
-	return label && (!el.labels || !Array.prototype.includes.call(el.labels, label));
+const allowNameFromContent = function(el) {
+	const role = query.getRole(el);
+	if (role) {
+		return constants.roles[role].nameFromContents;
+	}
 };
 
-var getName = function(el, recursive, visited, directReference) {
-	var ret = '';
+const getName = function(el, recursive, ongoingLabelledBy, visited, directReference) {
+	let ret = '';
 
 	visited = visited || [];
 	if (visited.includes(el)) {
@@ -960,15 +1115,31 @@ var getName = function(el, recursive, visited, directReference) {
 	// handled in atree
 
 	// B
-	if (!recursive && el.matches('[aria-labelledby]')) {
-		var ids = el.getAttribute('aria-labelledby').split(/\s+/);
-		var strings = ids.map(id => {
-			var label = document.getElementById(id);
-			return label ? getName(label, true, visited, true) : '';
+	if (!ongoingLabelledBy && el.matches('[aria-labelledby]')) {
+		const ids = el.getAttribute('aria-labelledby').split(/\s+/);
+		const strings = ids.map(id => {
+			const label = document.getElementById(id);
+			return label ? getName(label, true, true, visited, true) : '';
 		});
 		ret = strings.join(' ');
 	}
 
+	// E (the current draft has this at this high priority)
+	if (!ret.trim() && recursive) {
+		if (query.matches(el, 'textbox')) {
+			ret = el.value || el.textContent;
+		} else if (query.matches(el, 'combobox,listbox')) {
+			const selected = query.querySelector(el, ':selected') || query.querySelector(el, 'option');
+			if (selected) {
+				ret = getName(selected, recursive, ongoingLabelledBy, visited);
+			} else {
+				ret = el.value || '';
+			}
+		} else if (query.matches(el, 'range')) {
+			ret = '' + (query.getAttribute(el, 'valuetext') || query.getAttribute(el, 'valuenow') || el.value);
+		}
+	}
+
 	// C
 	if (!ret.trim() && el.matches('[aria-label]')) {
 		// FIXME: may skip to 2E
@@ -977,14 +1148,11 @@ var getName = function(el, recursive, visited, directReference) {
 
 	// D
 	if (!ret.trim() && !recursive && el.labels) {
-		var strings = Array.prototype.map.call(el.labels, label => {
-			return getName(label, true, visited);
+		const strings = Array.prototype.map.call(el.labels, label => {
+			return getName(label, true, ongoingLabelledBy, visited);
 		});
 		ret = strings.join(' ');
 	}
-	if (!ret.trim()) {
-		ret = el.placeholder || '';
-	}
 	if (!ret.trim()) {
 		ret = el.alt || '';
 	}
@@ -992,48 +1160,37 @@ var getName = function(el, recursive, visited, directReference) {
 		ret = el.title;
 	}
 	if (!ret.trim()) {
-		for (var selector in constants.nameFromDescendant) {
+		for (const selector in constants.nameFromDescendant) {
 			if (el.matches(selector)) {
-				var descendant = el.querySelector(constants.nameFromDescendant[selector]);
+				const descendant = el.querySelector(constants.nameFromDescendant[selector]);
 				if (descendant) {
-					ret = getName(descendant, true, visited);
+					ret = getName(descendant, true, ongoingLabelledBy, visited);
 				}
 			}
 		}
 	}
 	if (!ret.trim() && el.matches('svg *')) {
-		var svgTitle = el.querySelector('title');
+		const svgTitle = el.querySelector('title');
 		if (svgTitle && svgTitle.parentElement === el) {
 			ret = svgTitle.textContent;
 		}
 	}
-
-	// E
-	if (!ret.trim() && (recursive || isInLabelForOtherWidget(el) || query.matches(el, 'button'))) {
-		if (query.matches(el, 'textbox,button,combobox,listbox,range')) {
-			if (query.matches(el, 'textbox,button')) {
-				ret = el.value || el.textContent;
-			} else if (query.matches(el, 'combobox,listbox')) {
-				var selected = query.querySelector(el, ':selected') || query.querySelector(el, 'option');
-				if (selected) {
-					ret = getName(selected, recursive, visited);
-				} else {
-					ret = el.value || '';
-				}
-			} else if (query.matches(el, 'range')) {
-				ret = '' + (query.getAttribute(el, 'valuetext') || query.getAttribute(el, 'valuenow') || el.value);
-			}
-		}
+	if (!ret.trim() && el.matches('a')) {
+		ret = el.getAttribute('xlink:title') || '';
 	}
 
 	// F
 	// FIXME: menu is not mentioned in the spec
 	if (!ret.trim() && (recursive || allowNameFromContent(el) || el.closest('label')) && !query.matches(el, 'menu')) {
-		ret = getContent(el, visited);
+		ret = getContent(el, ongoingLabelledBy, visited);
+	}
+
+	if (!ret.trim() && query.matches(el, 'button')) {
+		ret = el.value || '';
 	}
 
 	if (!ret.trim()) {
-		for (var selector in constants.nameDefaults) {
+		for (const selector in constants.nameDefaults) {
 			if (el.matches(selector)) {
 				ret = constants.nameDefaults[selector];
 			}
@@ -1044,9 +1201,8 @@ var getName = function(el, recursive, visited, directReference) {
 	// handled in getContent
 
 	// I
-	// FIXME: presentation not mentioned in the spec
-	if (!ret.trim() && (directReference || !query.matches(el, 'presentation'))) {
-		ret = el.title || '';
+	if (!ret.trim()) {
+		ret = el.title || el.placeholder || '';
 	}
 
 	// FIXME: not exactly sure about this, but it reduces the number of failing
@@ -1055,35 +1211,41 @@ var getName = function(el, recursive, visited, directReference) {
 		ret = ' ';
 	}
 
-	var before = getPseudoContent(el, ':before');
-	var after = getPseudoContent(el, ':after');
-	return before + ret + after;
+	const before = getPseudoContent(el, ':before');
+	const after = getPseudoContent(el, ':after');
+	return addSpaces(before + ret + after, el);
 };
 
-var getNameTrimmed = function(el) {
-	return getName(el).replace(/\s+/g, ' ').trim();
+const getNameTrimmed = function(el) {
+	return getName(el)
+		.replace(/[ \n\r\t\f]+/g, ' ')
+		.replace(/^ /, '')
+		.replace(/ $/, '');
 };
 
-var getDescription = function(el) {
-	var ret = '';
+const getDescription = function(el) {
+	let ret = '';
 
 	if (el.matches('[aria-describedby]')) {
-		var ids = el.getAttribute('aria-describedby').split(/\s+/);
-		var strings = ids.map(id => {
-			var label = document.getElementById(id);
-			return label ? getName(label, true) : '';
+		const ids = el.getAttribute('aria-describedby').split(/\s+/);
+		const strings = ids.map(id => {
+			const label = document.getElementById(id);
+			return label ? getName(label, true, true) : '';
 		});
 		ret = strings.join(' ');
 	} else if (el.matches('[aria-description]')) {
 		ret = el.getAttribute('aria-description');
 	} else if (el.matches('svg *')) {
-		var svgDesc = el.querySelector('desc');
+		const svgDesc = el.querySelector('desc');
 		if (svgDesc && svgDesc.parentElement === el) {
 			ret = svgDesc.textContent;
 		}
 	} else if (el.title) {
 		ret = el.title;
 	}
+	if (!ret.trim() && el.matches('a')) {
+		ret = el.getAttribute('xlink:title') || '';
+	}
 
 	ret = (ret || '').trim().replace(/\s+/g, ' ');
 
@@ -1100,34 +1262,32 @@ module.exports = {
 };
 
 },{"./atree.js":2,"./constants.js":4,"./query.js":6}],6:[function(require,module,exports){
-var attrs = require('./attrs.js');
-var atree = require('./atree.js');
-
+const attrs = require('./attrs.js');
+const atree = require('./atree.js');
 
-var matches = function(el, selector) {
-	var actual;
 
+const matches = function(el, selector) {
 	if (selector.substr(0, 1) === ':') {
-		var attr = selector.substr(1);
+		const attr = selector.substr(1);
 		return attrs.getAttribute(el, attr);
 	} else if (selector.substr(0, 1) === '[') {
-		var match = /\[([a-z]+)="(.*)"\]/.exec(selector);
-		actual = attrs.getAttribute(el, match[1]);
-		var rawValue = match[2];
+		const match = /\[([a-z]+)="(.*)"\]/.exec(selector);
+		const actual = attrs.getAttribute(el, match[1]);
+		const rawValue = match[2];
 		return actual.toString() === rawValue;
 	} else {
 		return attrs.hasRole(el, selector.split(','));
 	}
 };
 
-var _querySelector = function(all) {
-	return function(root, role) {
-		var results = [];
+const _querySelector = function(all) {
+	return function(root, selector) {
+		const results = [];
 		try {
 			atree.walk(root, node => {
 				if (node.nodeType === node.ELEMENT_NODE) {
 					// FIXME: skip hidden elements
-					if (matches(node, role)) {
+					if (matches(node, selector)) {
 						results.push(node);
 						if (!all) {
 							throw 'StopIteration';
@@ -1144,7 +1304,7 @@ var _querySelector = function(all) {
 	};
 };
 
-var closest = function(el, selector) {
+const closest = function(el, selector) {
 	return atree.searchUp(el, candidate => {
 		if (candidate.nodeType === candidate.ELEMENT_NODE) {
 			return matches(candidate, selector);