Skip to content

Commit

Permalink
fix(color-contrast): correctly compute color contrast of <slot> eleme…
Browse files Browse the repository at this point in the history
…nts (#3847)

* fix(color-contrast): correctly compute color contrast of <slot> elements

* Update lib/commons/dom/create-grid.js

Co-authored-by: Wilco Fiers <WilcoFiers@users.noreply.github.com>

Co-authored-by: Wilco Fiers <WilcoFiers@users.noreply.github.com>
  • Loading branch information
straker and WilcoFiers authored Jan 6, 2023
1 parent 32f6784 commit 4c3a00c
Show file tree
Hide file tree
Showing 3 changed files with 51 additions and 1 deletion.
9 changes: 8 additions & 1 deletion lib/commons/dom/create-grid.js
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,17 @@ export default function createGrid(
while (node) {
let vNode = getNodeFromTree(node);

if (vNode && vNode.parent) {
parentVNode = vNode.parent;
}
// elements with an assigned slot need to be a child of the slot element
else if (node.assignedSlot) {
parentVNode = getNodeFromTree(node.assignedSlot);
}
// an svg in IE11 does not have a parentElement but instead has a
// parentNode. but parentNode could be a shadow root so we need to
// verify it's in the tree first
if (node.parentElement) {
else if (node.parentElement) {
parentVNode = getNodeFromTree(node.parentElement);
} else if (node.parentNode && getNodeFromTree(node.parentNode)) {
parentVNode = getNodeFromTree(node.parentNode);
Expand Down
23 changes: 23 additions & 0 deletions test/checks/color/color-contrast.js
Original file line number Diff line number Diff line change
Expand Up @@ -906,6 +906,29 @@ describe('color-contrast', function () {
}
);

(shadowSupported ? it : xit)('handles <slot> elements', () => {
fixture.innerHTML =
'<div id="container" style="height: 100px;"><p id="target" style="color: #333;">Slotted text</p></div>';
const container = fixture.querySelector('#container');
const shadow = container.attachShadow({ mode: 'open' });

shadow.innerHTML =
'<div id="shadowContainer" style="position: absolute; background: black;"><slot></slot></div>';
const shadowContainer = shadow.querySelector('#shadowContainer');
axe.testUtils.flatTreeSetup(fixture);

const target = fixture.querySelector('#target');
const vNode = axe.utils.getNodeFromTree(target);
const result = contrastEvaluate.call(
checkContext,
vNode.actualNode,
null,
vNode
);
assert.isFalse(result);
assert.deepEqual(checkContext._relatedNodes, [shadowContainer]);
});

describe('with text-shadow', function () {
it('passes if thin text shadows have sufficient contrast with the text', function () {
var params = checkSetup(
Expand Down
20 changes: 20 additions & 0 deletions test/commons/dom/get-element-stack.js
Original file line number Diff line number Diff line change
Expand Up @@ -570,6 +570,26 @@ describe('dom.getElementStack', function () {
]);
}
);

(shadowSupported ? it : xit)('should sort <slot> elements', () => {
fixture.innerHTML =
'<div id="container" style="height: 100px;"><p id="target">Slotted text</p></div>';
const container = fixture.querySelector('#container');
const shadow = container.attachShadow({ mode: 'open' });

shadow.innerHTML =
'<div id="shadowContainer" style="position: absolute;"><slot></slot></div>';
axe.testUtils.flatTreeSetup(fixture);

const target = fixture.querySelector('#target');
const stack = mapToIDs(getElementStack(target));
assert.deepEqual(stack, [
'target',
'shadowContainer',
'container',
'fixture'
]);
});
});

describe('scroll regions', function () {
Expand Down

0 comments on commit 4c3a00c

Please sign in to comment.