fix(color-contrast): Include THEAD and TBODY in contrast checks (#…

…514)
dequelabs · Sep 7, 2017 · f98f8bd · f98f8bd
1 parent 6296a5f
commit f98f8bd
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 15 deletions.
diff --git a/lib/commons/color/get-background-color.js b/lib/commons/color/get-background-color.js
@@ -121,29 +121,34 @@ function elmPartiallyObscured(elm, bgElm, bgColor) {
  * @param {Element} elm
  */
 function includeMissingElements(elmStack, elm) {
-	const elementMap = {'TD': 'TR', 'TH': 'TR', 'INPUT': 'LABEL'};
+	const elementMap = {'TD': ['TR', 'TBODY'], 'TH': ['TR', 'THEAD'], 'INPUT': ['LABEL']};
 	const tagArray = elmStack.map((elm) => {
 		return elm.tagName;
 	});
 	let bgNodes = elmStack;
+	//jshint maxdepth:7
 	for (let candidate in elementMap) {
-		// check that TR or LABEL has paired nodeName from elementMap, but don't expect elm to be that candidate 
+		// check that TR or LABEL has paired nodeName from elementMap, but don't expect elm to be that candidate
 		if (tagArray.includes(candidate)) {
-			// look up the tree for a matching candidate
-			let ancestorMatch = axe.commons.dom.findUp(elm, elementMap[candidate]);
-			if (ancestorMatch && elmStack.indexOf(ancestorMatch) === -1) {
-				// found an ancestor not in elmStack, and it overlaps
-				let overlaps = axe.commons.dom.visuallyOverlaps(elm.getBoundingClientRect(), ancestorMatch);
-				if (overlaps) {
-					// if target is in the elementMap, use its position. 
-					bgNodes.splice(tagArray.indexOf(candidate) + 1, 0, ancestorMatch);
+			for (let candidateIndex in elementMap[candidate]) {
+				if (candidate.hasOwnProperty(candidateIndex)) {
+					// look up the tree for a matching candidate
+					let ancestorMatch = axe.commons.dom.findUp(elm, elementMap[candidate][candidateIndex]);
+					if (ancestorMatch && elmStack.indexOf(ancestorMatch) === -1) {
+						// found an ancestor not in elmStack, and it overlaps
+						let overlaps = axe.commons.dom.visuallyOverlaps(elm.getBoundingClientRect(), ancestorMatch);
+						if (overlaps) {
+							// if target is in the elementMap, use its position. 
+							bgNodes.splice(tagArray.indexOf(candidate) + 1, 0, ancestorMatch);
+						}
+					}
+					// tagName matches value
+					// (such as LABEL, when matching itself. It should be in the list, but Phantom skips it)
+					if (elm.tagName === elementMap[candidate][candidateIndex] && tagArray.indexOf(elm.tagName) === -1) {
+						bgNodes.splice(tagArray.indexOf(candidate) + 1, 0, elm);
+					}
 				}
 			}
-			// tagName matches value
-			// (such as LABEL, when matching itself. It should be in the list, but Phantom skips it)
-			if (elm.tagName === elementMap[candidate] && tagArray.indexOf(elm.tagName) === -1) {
-				bgNodes.splice(tagArray.indexOf(candidate) + 1, 0, elm);
-			}
 		}
 	}
 	return bgNodes;

diff --git a/test/checks/color/color-contrast.js b/test/checks/color/color-contrast.js
@@ -190,6 +190,20 @@ describe('color-contrast', function () {
 		assert.isTrue(result);
 	});
 
+	it('should return true when there is sufficient contrast based on thead', function () {
+		fixture.innerHTML = '<table><thead style="background: #d00d2c"><tr><th id="target" style="color: #fff; padding: .5em">Col 1</th></tr></thead></table>';
+		var target = fixture.querySelector('#target');
+		assert.isTrue(checks['color-contrast'].evaluate.call(checkContext, target));
+		assert.deepEqual(checkContext._relatedNodes, []);
+	});
+
+	it('should return true when there is sufficient contrast based on tbody', function () {
+		fixture.innerHTML = '<table><tbody style="background: #d00d2c"><tr><td id="target" style="color: #fff; padding: .5em">Col 1</td></tr></tbody></table>';
+		var target = fixture.querySelector('#target');
+		assert.isTrue(checks['color-contrast'].evaluate.call(checkContext, target));
+		assert.deepEqual(checkContext._relatedNodes, []);
+	});
+
 	it('should return undefined if element overlaps text content', function () {
 		fixture.innerHTML = '<div style="background-color: white; height: 60px; width: 80px; border:1px solid;position: relative;">' +
 			'<div id="target" style="color: white; height: 40px; width: 60px; border:1px solid red;">Hi</div>' +