change how aliases work

xi · Jan 30, 2024 · e21f6d6 · e21f6d6
1 parent d07b2af
commit e21f6d6
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 10 deletions.
diff --git a/lib/attrs.js b/lib/attrs.js
@@ -8,10 +8,15 @@ var flatten = function(arr) {
 	return [].concat.apply([], arr);
 };
 
+var normalizeRoles = function(roles) {
+	return unique(roles.map(r => constants.aliases[r] || r));
+};
+
 // candidates can be passed for performance optimization
 const getRole = function(el, candidates) {
 	if (el.hasAttribute('role')) {
-		const roles = el.getAttribute('role').toLowerCase().split(/\s+/);
+		let roles = el.getAttribute('role').toLowerCase().split(/\s+/);
+		roles = normalizeRoles(roles);
 		if (roles.length > 1 && candidates) {
 			return [roles, candidates];
 		}
@@ -35,7 +40,7 @@ const getRole = function(el, candidates) {
 };
 
 const hasRole = function(el, roles) {
-	const subRoles = roles.map(role => {
+	const subRoles = normalizeRoles(roles).map(role => {
 		return (constants.roles[role] || {}).subRoles || [role];
 	});
 	return !!getRole(el, unique(flatten(subRoles)));

diff --git a/lib/constants.js b/lib/constants.js
@@ -348,6 +348,9 @@ exports.roles = {
 		selectors: ['nav'],
 		childRoles: ['doc-index', 'doc-pagelist', 'doc-toc'],
 	},
+	none: {
+		selectors: ['img[alt=""]'],
+	},
 	note: {
 		childRoles: ['doc-notice', 'doc-tip'],
 	},
@@ -362,9 +365,6 @@ exports.roles = {
 	paragraph: {
 		selectors: ['p'],
 	},
-	presentation: {
-		selectors: ['img[alt=""]'],
-	},
 	progressbar: {
 		selectors: ['progress'],
 		defaults: {
@@ -512,7 +512,6 @@ exports.roles = {
 			'document',
 			'none',
 			'generic',
-			'presentation',
 			'range',
 			'rowgroup',
 			'section',
@@ -631,10 +630,10 @@ for (const role in exports.roles) {
 		}
 	}
 }
-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',
+};
 
 exports.nameFromDescendant = {
 	'figure': 'figcaption',

diff --git a/test/test-role.js b/test/test-role.js
@@ -74,6 +74,12 @@ describe('query', () => {
 			var actual = aria.getRole(testbed.children[0]);
 			expect(actual).toEqual('link');
 		});
+
+		it('does treat presentation as alias of none', () => {
+			testbed.innerHTML = '<a role="presentation">';
+			var actual = aria.getRole(testbed.children[0]);
+			expect(actual).toEqual('none');
+		});
 	});
 
 	describe('closest', () => {