govuk_publishing_components 21.16.3 → 21.17.0

data/node_modules/axe-core/lib/checks/shared/has-alt.js

@@ -1,4 +1,6 @@
-var nn = node.nodeName.toLowerCase();
-return (
-	node.hasAttribute('alt') && (nn === 'img' || nn === 'input' || nn === 'area')
-);
+const { nodeName } = virtualNode.props;
+if (!['img', 'input', 'area'].includes(nodeName)) {
+	return false;
+}
+
+return virtualNode.hasAttr('alt');

data/node_modules/axe-core/lib/checks/shared/non-empty-alt.js

@@ -1,2 +1,2 @@
-var label = node.getAttribute('alt');
+const label = virtualNode.attr('alt');
 return !!(label ? axe.commons.text.sanitize(label).trim() : '');

data/node_modules/axe-core/lib/checks/tables/caption-faked.json

@@ -5,7 +5,7 @@
 		"impact": "serious",
 		"messages": {
 			"pass": "The first row of a table is not used as a caption",
-			"fail": "The first row of the table should be a caption instead of a table cell"
+			"fail": "The first child of the table should be a caption instead of a table cell"
 		}
 	}
 }

data/node_modules/axe-core/lib/checks/tables/td-has-header.js

@@ -1,6 +1,7 @@
-var tableUtils = axe.commons.table;
-var badCells = [];
-var cells = tableUtils.getAllCells(node);
+const tableUtils = axe.commons.table;
+const badCells = [];
+const cells = tableUtils.getAllCells(node);
+const tableGrid = tableUtils.toGrid(node);
 
 cells.forEach(cell => {
 	// For each non-empty data cell that doesn't have an aria label
@@ -10,7 +11,7 @@ cells.forEach(cell => {
 		!axe.commons.aria.label(cell)
 	) {
 		// Check if it has any headers
-		const hasHeaders = tableUtils.getHeaders(cell).some(header => {
+		const hasHeaders = tableUtils.getHeaders(cell, tableGrid).some(header => {
 			return header !== null && !!axe.commons.dom.hasContent(header);
 		});
 

data/node_modules/axe-core/lib/checks/tables/th-has-data-cells.js

@@ -1,23 +1,23 @@
-var tableUtils = axe.commons.table;
-var cells = tableUtils.getAllCells(node);
-var checkResult = this;
+const tableUtils = axe.commons.table;
+const cells = tableUtils.getAllCells(node);
+const checkResult = this;
 
 // Get a list of all headers reffed to in this rule
-var reffedHeaders = [];
+let reffedHeaders = [];
 cells.forEach(function(cell) {
-	var headers = cell.getAttribute('headers');
+	const headers = cell.getAttribute('headers');
 	if (headers) {
 		reffedHeaders = reffedHeaders.concat(headers.split(/\s+/));
 	}
 
-	var ariaLabel = cell.getAttribute('aria-labelledby');
+	const ariaLabel = cell.getAttribute('aria-labelledby');
 	if (ariaLabel) {
 		reffedHeaders = reffedHeaders.concat(ariaLabel.split(/\s+/));
 	}
 });
 
 // Get all the headers
-var headers = cells.filter(function(cell) {
+const headers = cells.filter(function(cell) {
 	if (axe.commons.text.sanitize(cell.textContent) === '') {
 		return false;
 	}
@@ -27,42 +27,32 @@ var headers = cells.filter(function(cell) {
 	);
 });
 
-var tableGrid = tableUtils.toGrid(node);
+const tableGrid = tableUtils.toGrid(node);
 
-// Look for all the bad headers
-var out = headers.reduce(function(res, header) {
+let out = true;
+headers.forEach(header => {
 	if (
 		header.getAttribute('id') &&
 		reffedHeaders.includes(header.getAttribute('id'))
 	) {
-		return !res ? res : true;
+		return;
 	}
 
-	var hasCell = false;
-	var pos = tableUtils.getCellPosition(header, tableGrid);
+	const pos = tableUtils.getCellPosition(header, tableGrid);
 
-	// Look for any data cells or row headers that this might refer to
+	// ensure column header has at least 1 non-header cell
+	let hasCell = false;
 	if (tableUtils.isColumnHeader(header)) {
 		hasCell = tableUtils
 			.traverse('down', pos, tableGrid)
-			.reduce((out, cell) => {
-				return (
-					out ||
-					(axe.commons.dom.hasContent(cell) && !tableUtils.isColumnHeader(cell))
-				);
-			}, false);
+			.find(cell => !tableUtils.isColumnHeader(cell));
 	}
 
-	// Look for any data cells or column headers that this might refer to
+	// ensure row header has at least 1 non-header cell
 	if (!hasCell && tableUtils.isRowHeader(header)) {
 		hasCell = tableUtils
 			.traverse('right', pos, tableGrid)
-			.reduce((out, cell) => {
-				return (
-					out ||
-					(axe.commons.dom.hasContent(cell) && !tableUtils.isRowHeader(cell))
-				);
-			}, false);
+			.find(cell => !tableUtils.isRowHeader(cell));
 	}
 
 	// report the node as having failed
@@ -70,7 +60,7 @@ var out = headers.reduce(function(res, header) {
 		checkResult.relatedNodes(header);
 	}
 
-	return res && hasCell;
-}, true);
+	out = out && hasCell;
+});
 
 return out ? true : undefined;

data/node_modules/axe-core/lib/commons/aria/get-owned-virtual.js

@@ -16,7 +16,7 @@ aria.getOwnedVirtual = function getOwned({ actualNode, children }) {
 
 	return dom.idrefs(actualNode, 'aria-owns').reduce((ownedElms, element) => {
 		if (element) {
-			const virtualNode = axe.utils.getNodeFromTree(axe._tree[0], element);
+			const virtualNode = axe.utils.getNodeFromTree(element);
 			ownedElms.push(virtualNode);
 		}
 		return ownedElms;

data/node_modules/axe-core/lib/commons/aria/index.js

@@ -198,20 +198,7 @@ lookupTable.attributes = {
 	'aria-roledescription': {
 		type: 'string',
 		allowEmpty: true,
-		unsupported: {
-			exceptions: [
-				'button',
-				{
-					nodeName: 'input',
-					properties: {
-						type: ['button', 'checkbox', 'image', 'radio', 'reset', 'submit']
-					}
-				},
-				'img',
-				'select',
-				'summary'
-			]
-		}
+		unsupported: false
 	},
 	'aria-rowcount': {
 		type: 'int',
@@ -455,7 +442,7 @@ lookupTable.role = {
 			{
 				nodeName: 'input',
 				properties: {
-					type: 'text'
+					type: ['text', 'search', 'tel', 'url', 'email']
 				}
 			}
 		]
@@ -624,7 +611,9 @@ lookupTable.role = {
 		attributes: {
 			allowed: ['aria-expanded', 'aria-errormessage']
 		},
-		owned: null,
+		owned: {
+			one: ['doc-biblioentry']
+		},
 		nameFrom: ['author'],
 		context: null,
 		unsupported: false,
@@ -746,7 +735,9 @@ lookupTable.role = {
 		attributes: {
 			allowed: ['aria-expanded', 'aria-errormessage']
 		},
-		owned: ['doc-endnote'],
+		owned: {
+			one: ['doc-endnote']
+		},
 		namefrom: ['author'],
 		context: null,
 		unsupported: false,
@@ -1024,7 +1015,7 @@ lookupTable.role = {
 	},
 	figure: {
 		type: 'structure',
-		unsupported: true
+		unsupported: false
 	},
 	form: {
 		type: 'landmark',
@@ -1174,6 +1165,7 @@ lookupTable.role = {
 			allowed: [
 				'aria-activedescendant',
 				'aria-multiselectable',
+				'aria-readonly',
 				'aria-required',
 				'aria-expanded',
 				'aria-orientation',
@@ -1280,7 +1272,9 @@ lookupTable.role = {
 				'aria-errormessage'
 			]
 		},
-		owned: null,
+		owned: {
+			one: ['menuitem', 'menuitemradio', 'menuitemcheckbox']
+		},
 		nameFrom: ['author'],
 		context: null,
 		unsupported: false,
@@ -1550,9 +1544,9 @@ lookupTable.role = {
 				'aria-posinset',
 				'aria-setsize',
 				'aria-required',
-				'aria-errormessage'
-			],
-			required: ['aria-checked']
+				'aria-errormessage',
+				'aria-checked'
+			]
 		},
 		owned: null,
 		nameFrom: ['author', 'contents'],
@@ -1653,7 +1647,7 @@ lookupTable.role = {
 			all: ['row']
 		},
 		nameFrom: ['author', 'contents'],
-		context: ['grid', 'table'],
+		context: ['grid', 'table', 'treegrid'],
 		implicit: ['tbody', 'thead', 'tfoot'],
 		unsupported: false
 	},
@@ -1682,13 +1676,14 @@ lookupTable.role = {
 	scrollbar: {
 		type: 'widget',
 		attributes: {
-			required: [
-				'aria-controls',
-				'aria-valuenow',
+			required: ['aria-controls', 'aria-valuenow'],
+			allowed: [
+				'aria-valuetext',
+				'aria-orientation',
+				'aria-errormessage',
 				'aria-valuemax',
 				'aria-valuemin'
-			],
-			allowed: ['aria-valuetext', 'aria-orientation', 'aria-errormessage']
+			]
 		},
 		owned: null,
 		nameFrom: ['author'],
@@ -1775,9 +1770,11 @@ lookupTable.role = {
 				'aria-valuetext',
 				'aria-orientation',
 				'aria-readonly',
-				'aria-errormessage'
+				'aria-errormessage',
+				'aria-valuemax',
+				'aria-valuemin'
 			],
-			required: ['aria-valuenow', 'aria-valuemax', 'aria-valuemin']
+			required: ['aria-valuenow']
 		},
 		owned: null,
 		nameFrom: ['author'],
@@ -1792,9 +1789,11 @@ lookupTable.role = {
 				'aria-valuetext',
 				'aria-required',
 				'aria-readonly',
-				'aria-errormessage'
+				'aria-errormessage',
+				'aria-valuemax',
+				'aria-valuemin'
 			],
-			required: ['aria-valuenow', 'aria-valuemax', 'aria-valuemin']
+			required: ['aria-valuenow']
 		},
 		owned: null,
 		nameFrom: ['author'],
@@ -2147,15 +2146,6 @@ lookupTable.elementsAllowedNoRole = [
 			]
 		}
 	},
-	{
-		nodeName: 'input',
-		attributes: {
-			list: isNull
-		},
-		properties: {
-			type: ['email', 'search', 'tel', 'url']
-		}
-	},
 	{
 		nodeName: 'link',
 		attributes: {
@@ -2244,6 +2234,12 @@ lookupTable.elementsAllowedAnyRole = [
 			href: isNull
 		}
 	},
+	{
+		nodeName: 'img',
+		attributes: {
+			alt: isNull
+		}
+	},
 	{
 		nodeName: [
 			'abbr',
@@ -2311,11 +2307,15 @@ lookupTable.evaluateRoleForElement = {
 		}
 		return out;
 	},
-	IMG: ({ node, out }) => {
-		if (node.alt) {
-			return !out;
+	IMG: ({ node, role, out }) => {
+		switch (node.alt) {
+			case null:
+				return out;
+			case '':
+				return role === 'presentation' || role === 'none';
+			default:
+				return role !== 'presentation' && role !== 'none';
 		}
-		return out;
 	},
 	INPUT: ({ node, role, out }) => {
 		switch (node.type) {
@@ -2333,6 +2333,11 @@ lookupTable.evaluateRoleForElement = {
 				return (
 					role === 'combobox' || role === 'searchbox' || role === 'spinbutton'
 				);
+			case 'tel':
+			case 'url':
+			case 'search':
+			case 'email':
+				return role === 'combobox';
 			default:
 				return false;
 		}
@@ -2391,7 +2396,6 @@ lookupTable.rolesOfType = {
 		'checkbox',
 		'dialog',
 		'gridcell',
-		'heading',
 		'link',
 		'log',
 		'marquee',

data/node_modules/axe-core/lib/commons/aria/is-accessible-ref.js

@@ -1,13 +1,33 @@
 /* global aria, axe, dom */
-function findDomNode(node, functor) {
-	if (functor(node)) {
-		return node;
+const idRefsRegex = /^idrefs?$/;
+
+function cacheIdRefs(node, refAttrs) {
+	if (node.hasAttribute) {
+		const idRefs = axe._cache.get('idRefs');
+
+		if (node.nodeName.toUpperCase() === 'LABEL' && node.hasAttribute('for')) {
+			idRefs[node.getAttribute('for')] = true;
+		}
+
+		for (let i = 0; i < refAttrs.length; ++i) {
+			const attr = refAttrs[i];
+
+			if (!node.hasAttribute(attr)) {
+				continue;
+			}
+
+			const attrValue = node.getAttribute(attr);
+
+			const tokens = axe.utils.tokenList(attrValue);
+
+			for (let k = 0; k < tokens.length; ++k) {
+				idRefs[tokens[k]] = true;
+			}
+		}
 	}
+
 	for (let i = 0; i < node.children.length; i++) {
-		const out = findDomNode(node.children[i], functor);
-		if (out) {
-			return out;
-		}
+		cacheIdRefs(node.children[i], refAttrs);
 	}
 }
 
@@ -22,34 +42,18 @@ aria.isAccessibleRef = function isAccessibleRef(node) {
 	root = root.documentElement || root; // account for shadow roots
 	const id = node.id;
 
-	// Get all idref(s) attributes on the lookup table
-	const refAttrs = Object.keys(aria.lookupTable.attributes).filter(attr => {
-		const { type } = aria.lookupTable.attributes[attr];
-		return /^idrefs?$/.test(type);
-	});
-
-	// Find the first element that IDREF(S) the node
-	let refElm = findDomNode(root, elm => {
-		if (elm.nodeType !== 1) {
-			// Elements only
-			return;
-		}
-		if (
-			elm.nodeName.toUpperCase() === 'LABEL' &&
-			elm.getAttribute('for') === id
-		) {
-			return true;
-		}
-		// See if there are any aria attributes that reference the node
-		return refAttrs
-			.filter(attr => elm.hasAttribute(attr))
-			.some(attr => {
-				const attrValue = elm.getAttribute(attr);
-				if (aria.lookupTable.attributes[attr].type === 'idref') {
-					return attrValue === id;
-				}
-				return axe.utils.tokenList(attrValue).includes(id);
-			});
-	});
-	return typeof refElm !== 'undefined';
+	// because axe.commons is not available in axe.utils, we can't do
+	// this caching when we build up the virtual tree
+	if (!axe._cache.get('idRefs')) {
+		axe._cache.set('idRefs', {});
+		// Get all idref(s) attributes on the lookup table
+		const refAttrs = Object.keys(aria.lookupTable.attributes).filter(attr => {
+			const { type } = aria.lookupTable.attributes[attr];
+			return idRefsRegex.test(type);
+		});
+
+		cacheIdRefs(root, refAttrs);
+	}
+
+	return axe._cache.get('idRefs')[id] === true;
 };