fix(scrollable-region-focus): ignore scrollable regions without conte…

…nt (#1788) * fix(has-content-virtual): fix bug with ignoreAria flag * add test
dequelabs · Aug 28, 2019 · b36754e · b36754e
1 parent 281653d
commit b36754e
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/lib/commons/dom/has-content-virtual.js b/lib/commons/dom/has-content-virtual.js
@@ -39,7 +39,7 @@ dom.hasContentVirtual = function(elm, noRecursion, ignoreAria) {
 		// It is a graphical element
 		dom.isVisualContent(elm.actualNode) ||
 		// It has an ARIA label
-		(!!ignoreAria || !!aria.labelVirtual(elm)) ||
+		(!ignoreAria && !!aria.labelVirtual(elm)) ||
 		// or one of it's descendants does
 		(!noRecursion &&
 			elm.children.some(

diff --git a/test/commons/dom/has-content-virtual.js b/test/commons/dom/has-content-virtual.js
@@ -41,7 +41,7 @@ describe('dom.hasContentVirtual', function() {
 	it('is false if the element has an aria label but `ignoreAria=true`', function() {
 		fixture.innerHTML = '<div id="target" aria-label="my-label">	</div>';
 		tree = axe.utils.getFlattenedTree(fixture);
-		assert.isTrue(
+		assert.isFalse(
 			hasContentVirtual(
 				axe.utils.querySelectorAll(tree, '#target')[0],
 				true,

diff --git a/test/rule-matches/scrollable-region-focusable-matches.js b/test/rule-matches/scrollable-region-focusable-matches.js
@@ -82,6 +82,14 @@ describe('scrollable-region-focusable-matches', function() {
 		assert.isTrue(actual);
 	});
 
+	it('returns false when element overflow is scroll but has no content', function() {
+		var target = queryFixture(
+			'<div id="target" style="width: 12em; height: 2em; border: dotted; overflow: scroll;"><div style="height: 15rem"></div></div>'
+		);
+		var actual = rule.matches(target.actualNode, target);
+		assert.isFalse(actual);
+	});
+
 	describe('shadowDOM - scrollable-region-focusable-matches', function() {
 		before(function() {
 			if (!shadowSupported) {