aria-api 0.4.7 → 0.6.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,40 +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 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;
 		}
@@ -168,14 +187,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') {
@@ -204,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;
 			}
@@ -214,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];
 		}
@@ -301,13 +320,8 @@ exports.attributeWeakMapping = {
 	'selected': 'selected',
 };
 
-var scoped = [
-	'main *',
-	// https://www.w3.org/TR/html/dom.html#sectioning-content-2
-	'article *', 'aside *', 'nav *', 'section *',
-	// https://www.w3.org/TR/html/sections.html#sectioning-roots
-	'blockquote *', 'details *', 'dialog *', 'fieldset *', 'figure *', 'td *',
-].join(',');
+// https://www.w3.org/TR/html/dom.html#sectioning-content-2
+const scoped = ['article *', 'aside *', 'nav *', 'section *'].join(',');
 
 // https://www.w3.org/TR/html-aam-1.0/#html-element-role-mappings
 // https://www.w3.org/TR/wai-aria/roles
@@ -319,11 +333,16 @@ exports.roles = {
 			'atomic': true,
 		},
 	},
+	alertdialog: {},
+	application: {},
 	article: {
 		selectors: ['article'],
 	},
 	banner: {
-		selectors: ['header:not(' + scoped + ')'],
+		selectors: [`header:not(main *, ${scoped})`],
+	},
+	blockquote: {
+		selectors: ['blockquote'],
 	},
 	button: {
 		selectors: [
@@ -336,26 +355,32 @@ exports.roles = {
 		],
 		nameFromContents: true,
 	},
+	caption: {
+		selectors: ['caption', 'figcaption'],
+	},
 	cell: {
-		selectors: ['td'],
-		childRoles: ['gridcell', 'rowheader'],
+		selectors: ['td', 'td ~ th:not([scope])'],
+		childRoles: ['columnheader', 'gridcell', 'rowheader'],
 		nameFromContents: true,
 	},
 	checkbox: {
 		selectors: ['input[type="checkbox"]'],
-		childRoles: ['menuitemcheckbox', 'switch'],
+		childRoles: ['switch'],
 		nameFromContents: true,
 		defaults: {
 			'checked': 'false',
 		},
 	},
+	code: {
+		selectors: ['code'],
+	},
 	columnheader: {
 		selectors: ['th[scope="col"]'],
 		nameFromContents: true,
 	},
 	combobox: {
 		selectors: [
-		'input:not([type])[list]',
+			'input:not([type])[list]',
 			'input[type="email"][list]',
 			'input[type="search"][list]',
 			'input[type="tel"][list]',
@@ -371,46 +396,131 @@ exports.roles = {
 		},
 	},
 	command: {
+		abstract: true,
 		childRoles: ['button', 'link', 'menuitem'],
 	},
 	complementary: {
-		selectors: ['aside'],
+		selectors: [
+			`aside:not(${scoped})`,
+			'aside[aria-label]',
+			'aside[aria-labelledby]',
+			'aside[title]',
+		],
 	},
 	composite: {
+		abstract: true,
 		childRoles: ['grid', 'select', 'spinbutton', 'tablist'],
 	},
 	contentinfo: {
-		selectors: ['footer:not(' + scoped + ')'],
+		selectors: [`footer:not(main *, ${scoped})`],
 	},
 	definition: {
 		selectors: ['dd'],
 	},
+	deletion: {
+		selectors: ['del', 's'],
+	},
 	dialog: {
 		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: ['body'],
+		selectors: ['html'],
 		childRoles: ['article', 'graphics-document'],
 	},
+	emphasis: {
+		selectors: ['em'],
+	},
+	feed: {},
 	figure: {
 		selectors: ['figure'],
+		childRoles: ['doc-example'],
 	},
 	form: {
 		selectors: ['form[aria-label]', 'form[aria-labelledby]', 'form[title]'],
 	},
+	generic: {
+		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': {},
+	'graphics-symbol': {},
 	grid: {
 		childRoles: ['treegrid'],
 	},
@@ -419,7 +529,14 @@ exports.roles = {
 		nameFromContents: true,
 	},
 	group: {
-		selectors: ['details', 'optgroup'],
+		selectors: [
+			'address',
+			'details',
+			'fieldset',
+			'hgroup',
+			'optgroup',
+			'text',
+		],
 		childRoles: ['row', 'select', 'toolbar', 'graphics-object'],
 	},
 	heading: {
@@ -434,9 +551,22 @@ exports.roles = {
 		childRoles: ['doc-cover'],
 	},
 	input: {
-		childRoles: ['checkbox', 'option', 'radio', 'slider', 'spinbutton', 'textbox'],
+		abstract: true,
+		childRoles: [
+			'checkbox',
+			'combobox',
+			'option',
+			'radio',
+			'slider',
+			'spinbutton',
+			'textbox',
+		],
+	},
+	insertion: {
+		selectors: ['ins'],
 	},
 	landmark: {
+		abstract: true,
 		childRoles: [
 			'banner',
 			'complementary',
@@ -465,16 +595,17 @@ exports.roles = {
 		],
 	},
 	link: {
-		selectors: ['a[href]', 'area[href]', 'link[href]'],
+		selectors: ['a[href]', 'area[href]'],
 		childRoles: ['doc-backlink', 'doc-biblioref', 'doc-glossref', 'doc-noteref'],
 		nameFromContents: true,
 	},
 	list: {
-		selectors: ['dl', 'ol', 'ul'],
-		childRoles: ['directory', 'feed'],
+		selectors: ['dl', 'ol', 'ul', 'menu'],
+		childRoles: ['feed'],
 	},
 	listbox: {
 		selectors: [
+			'datalist',
 			'select[multiple]',
 			'select[size]:not([size="0"]):not([size="1"])',
 		],
@@ -483,7 +614,7 @@ exports.roles = {
 		},
 	},
 	listitem: {
-		selectors: ['dt', 'ul > li', 'ol > li'],
+		selectors: ['ol > li', 'ul > li'],
 		childRoles: ['doc-biblioentry', 'doc-endnote', 'treeitem'],
 	},
 	log: {
@@ -494,11 +625,18 @@ exports.roles = {
 	main: {
 		selectors: ['main'],
 	},
+	marquee: {},
 	math: {
 		selectors: ['math'],
 	},
+	meter: {
+		selectors: ['meter'],
+		defaults: {
+			'valuemin': 0,
+			'valuemax': 100,
+		},
+	},
 	menu: {
-		selectors: ['menu[type="context"]'],
 		childRoles: ['menubar'],
 		defaults: {
 			'orientation': 'vertical',
@@ -510,12 +648,10 @@ exports.roles = {
 		},
 	},
 	menuitem: {
-		selectors: ['menuitem[type="command"]'],
 		childRoles: ['menuitemcheckbox'],
 		nameFromContents: true,
 	},
 	menuitemcheckbox: {
-		selectors: ['menuitem[type="checkbox"]'],
 		childRoles: ['menuitemradio'],
 		nameFromContents: true,
 		defaults: {
@@ -523,7 +659,6 @@ exports.roles = {
 		},
 	},
 	menuitemradio: {
-		selectors: ['menuitem[type="radio"]'],
 		nameFromContents: true,
 		defaults: {
 			'checked': 'false',
@@ -533,6 +668,9 @@ exports.roles = {
 		selectors: ['nav'],
 		childRoles: ['doc-index', 'doc-pagelist', 'doc-toc'],
 	},
+	none: {
+		selectors: ['img[alt=""]'],
+	},
 	note: {
 		childRoles: ['doc-notice', 'doc-tip'],
 	},
@@ -544,11 +682,15 @@ exports.roles = {
 			'selected': 'false',
 		},
 	},
-	presentation: {
-		selectors: ['img[alt=""]'],
+	paragraph: {
+		selectors: ['p'],
 	},
 	progressbar: {
 		selectors: ['progress'],
+		defaults: {
+			'valuemin': 0,
+			'valuemax': 100,
+		},
 	},
 	radio: {
 		selectors: ['input[type="radio"]'],
@@ -558,13 +700,16 @@ exports.roles = {
 			'checked': 'false',
 		},
 	},
+	radiogroup: {},
 	range: {
-		childRoles: ['progressbar', 'scrollbar', 'slider', 'spinbutton'],
+		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: {
@@ -573,10 +718,9 @@ exports.roles = {
 	},
 	rowgroup: {
 		selectors: ['tbody', 'thead', 'tfoot'],
-		nameFromContents: true,
 	},
 	rowheader: {
-		selectors: ['th[scope="row"]'],
+		selectors: ['th[scope="row"]', 'th:not([scope]):not(td ~ th)'],
 		nameFromContents: true,
 	},
 	scrollbar: {
@@ -584,29 +728,39 @@ exports.roles = {
 			'orientation': 'vertical',
 			'valuemin': 0,
 			'valuemax': 100,
-			// FIXME: halfway between actual valuemin and valuemax
-			'valuenow': 50,
 		},
 	},
+	search: {
+		selectors: ['search'],
+	},
 	searchbox: {
 		selectors: ['input[type="search"]:not([list])'],
 	},
 	section: {
+		abstract: true,
 		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',
@@ -614,14 +768,20 @@ exports.roles = {
 			'marquee',
 			'math',
 			'note',
+			'paragraph',
 			'status',
+			'strong',
+			'subscript',
+			'superscript',
 			'table',
 			'tabpanel',
 			'term',
+			'time',
 			'tooltip',
 		],
 	},
 	sectionhead: {
+		abstract: true,
 		childRoles: [
 			'columnheader',
 			'doc-subtitle',
@@ -632,7 +792,8 @@ exports.roles = {
 		nameFromContents: true,
 	},
 	select: {
-		childRoles: ['combobox', 'listbox', 'menu', 'radiogroup', 'tree'],
+		abstract: true,
+		childRoles: ['listbox', 'menu', 'radiogroup', 'tree'],
 	},
 	separator: {
 		// assume not focussable because <hr> is not
@@ -640,6 +801,8 @@ exports.roles = {
 		childRoles: ['doc-pagebreak'],
 		defaults: {
 			'orientation': 'horizontal',
+			'valuemin': 0,
+			'valuemax': 100,
 		},
 	},
 	slider: {
@@ -655,8 +818,7 @@ exports.roles = {
 	spinbutton: {
 		selectors: ['input[type="number"]'],
 		defaults: {
-			// FIXME: no valuemin/valuemax
-			'valuenow': 0,
+			// FIXME: no valuemin/valuemax/valuenow
 		},
 	},
 	status: {
@@ -667,18 +829,30 @@ exports.roles = {
 			'atomic': true,
 		},
 	},
+	strong: {
+		selectors: ['strong'],
+	},
 	structure: {
+		abstract: true,
 		childRoles: [
 			'application',
 			'document',
 			'none',
-			'presentation',
+			'generic',
+			'range',
 			'rowgroup',
 			'section',
 			'sectionhead',
 			'separator',
 		],
 	},
+	suggestion: {},
+	subscript: {
+		selectors: ['sub'],
+	},
+	superscript: {
+		selectors: ['sup'],
+	},
 	switch: {
 		nameFromContents: true,
 		defaults: {
@@ -700,6 +874,7 @@ exports.roles = {
 			'orientation': 'horizontal',
 		},
 	},
+	tabpanel: {},
 	term: {
 		selectors: ['dfn', 'dt'],
 	},
@@ -714,6 +889,14 @@ exports.roles = {
 		],
 		childRoles: ['searchbox'],
 	},
+	time: {
+		selectors: ['time'],
+	},
+	timer: {
+		defaults: {
+			'live': 'off',
+		},
+	},
 	toolbar: {
 		defaults: {
 			'orientation': 'horizontal',
@@ -728,30 +911,35 @@ exports.roles = {
 			'orientation': 'vertical',
 		},
 	},
+	treegrid: {},
 	treeitem: {
 		nameFromContents: true,
 	},
 	widget: {
+		abstract: true,
 		childRoles: [
 			'command',
 			'composite',
 			'gridcell',
 			'input',
-			'range',
+			'progressbar',
 			'row',
+			'scrollbar',
+			'separator',
 			'tab',
 		],
 	},
 	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 => {
@@ -766,18 +954,19 @@ 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',
+};
 
 exports.nameFromDescendant = {
 	'figure': 'figcaption',
@@ -792,14 +981,14 @@ 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';
+const constants = require('./constants.js');
+const atree = require('./atree.js');
+const query = require('./query.js');
+
+const getPseudoContent = function(node, selector) {
+	const styles = window.getComputedStyle(node, selector);
+	const ret = styles.getPropertyValue('content');
+	const inline = styles.display.substr(0, 6) === 'inline';
 	if (!ret) {
 		return '';
 	}
@@ -814,12 +1003,12 @@ var getPseudoContent = function(node, selector) {
 	}
 };
 
-var getContent = function(root, visited) {
-	var children = atree.getChildNodes(root);
+const getContent = function(root, 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) {
@@ -838,18 +1027,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, visited, directReference) {
+	let ret = '';
 
 	visited = visited || [];
 	if (visited.includes(el)) {
@@ -865,14 +1051,30 @@ var getName = function(el, recursive, visited, directReference) {
 
 	// 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);
+		const ids = el.getAttribute('aria-labelledby').split(/\s+/);
+		const strings = ids.map(id => {
+			const label = document.getElementById(id);
 			return label ? getName(label, 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,button')) {
+			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, 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
@@ -881,7 +1083,7 @@ var getName = function(el, recursive, visited, directReference) {
 
 	// D
 	if (!ret.trim() && !recursive && el.labels) {
-		var strings = Array.prototype.map.call(el.labels, label => {
+		const strings = Array.prototype.map.call(el.labels, label => {
 			return getName(label, true, visited);
 		});
 		ret = strings.join(' ');
@@ -896,31 +1098,19 @@ 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);
 				}
 			}
 		}
 	}
-
-	// 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('svg *')) {
+		const svgTitle = el.querySelector('title');
+		if (svgTitle && svgTitle.parentElement === el) {
+			ret = svgTitle.textContent;
 		}
 	}
 
@@ -930,8 +1120,12 @@ var getName = function(el, recursive, visited, directReference) {
 		ret = getContent(el, 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];
 			}
@@ -953,29 +1147,34 @@ var getName = function(el, recursive, visited, directReference) {
 		ret = ' ';
 	}
 
-	var before = getPseudoContent(el, ':before');
-	var after = getPseudoContent(el, ':after');
+	const before = getPseudoContent(el, ':before');
+	const after = getPseudoContent(el, ':after');
 	return before + ret + after;
 };
 
-var getNameTrimmed = function(el) {
+const getNameTrimmed = function(el) {
 	return getName(el).replace(/\s+/g, ' ').trim();
 };
 
-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);
+		const ids = el.getAttribute('aria-describedby').split(/\s+/);
+		const strings = ids.map(id => {
+			const label = document.getElementById(id);
 			return label ? getName(label, true) : '';
 		});
 		ret = strings.join(' ');
+	} else if (el.matches('[aria-description]')) {
+		ret = el.getAttribute('aria-description');
+	} else if (el.matches('svg *')) {
+		const svgDesc = el.querySelector('desc');
+		if (svgDesc && svgDesc.parentElement === el) {
+			ret = svgDesc.textContent;
+		}
 	} else if (el.title) {
 		ret = el.title;
-	} else if (el.placeholder) {
-		ret = el.placeholder;
 	}
 
 	ret = (ret || '').trim().replace(/\s+/g, ' ');
@@ -993,34 +1192,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';
@@ -1037,7 +1234,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);