Skip to content

Commit

Permalink
fix(multiple-label): considers explicit labels in the same shadow tree (
Browse files Browse the repository at this point in the history
  • Loading branch information
AutoSponge authored and WilcoFiers committed May 24, 2019
1 parent 381cadb commit b9a324a
Show file tree
Hide file tree
Showing 2 changed files with 62 additions and 2 deletions.
4 changes: 3 additions & 1 deletion lib/checks/label/multiple-label.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
const id = axe.utils.escapeSelector(node.getAttribute('id'));
let labels = Array.from(document.querySelectorAll(`label[for="${id}"]`));
let parent = node.parentNode;
let root = axe.commons.dom.getRootNode(node);
root = root.documentElement || root;
let labels = Array.from(root.querySelectorAll(`label[for="${id}"]`));

if (labels.length) {
// filter out CSS hidden labels because they're fine
Expand Down
60 changes: 59 additions & 1 deletion test/checks/label/multiple-label.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ describe('multiple-label', function() {
'use strict';

var fixture = document.getElementById('fixture');

var shadowSupported = axe.testUtils.shadowSupport.v1;
var checkContext = axe.testUtils.MockCheckContext();

afterEach(function() {
Expand Down Expand Up @@ -176,4 +176,62 @@ describe('multiple-label', function() {
var target = fixture.querySelector('#Q');
assert.isTrue(checks['multiple-label'].evaluate.call(checkContext, target));
});

(shadowSupported ? it : xit)(
'should consider labels in the same document/shadow tree',
function() {
fixture.innerHTML = '<div id="target"></div>';
var target = document.querySelector('#target');
var shadowRoot = target.attachShadow({ mode: 'open' });
shadowRoot.innerHTML =
'<input id="myinput" /><label for="myinput">normal</label>';
var shadowTarget = target.shadowRoot;
assert.isFalse(
checks['multiple-label'].evaluate.call(
checkContext,
shadowTarget.firstElementChild
)
);
}
);

(shadowSupported ? it : xit)(
'should return false for valid multiple labels in the same document/shadow tree',
function() {
fixture.innerHTML = '<div id="target"></div>';
var target = document.querySelector('#target');
var shadowRoot = target.attachShadow({ mode: 'open' });
var innerHTML = '<input type="checkbox" id="D" aria-labelledby="E"/>';
innerHTML += '<label for="D" aria-hidden="true">Please</label>';
innerHTML += '<label for="D" id="E">Excuse</label>';
shadowRoot.innerHTML = innerHTML;
var shadowTarget = target.shadowRoot;
assert.isFalse(
checks['multiple-label'].evaluate.call(
checkContext,
shadowTarget.firstElementChild
)
);
}
);

(shadowSupported ? it : xit)(
'should return true for invalid multiple labels in the same document/shadow tree',
function() {
fixture.innerHTML = '<div id="target"></div>';
var target = document.querySelector('#target');
var shadowRoot = target.attachShadow({ mode: 'open' });
var innerHTML = '<input type="checkbox" id="Q"/>';
innerHTML += '<label for="Q" aria-hidden="true"></label>';
innerHTML += '<label for="Q" >Excuse</label>';
shadowRoot.innerHTML = innerHTML;
var shadowTarget = target.shadowRoot;
assert.isTrue(
checks['multiple-label'].evaluate.call(
checkContext,
shadowTarget.firstElementChild
)
);
}
);
});

0 comments on commit b9a324a

Please sign in to comment.