mirrors/wagtail
mirrors/wagtail
0
0
Fork 0
mirror of https://github.com/wagtail/wagtail.git synced 2024-11-29 01:22:07 +01:00
Code Issues Releases Wiki Activity

a11y results - coerce CrossTreeSelector into a string

Browse Source 
- Ensures that TypeScript will allow these values to be passed into querySelector
This commit is contained in:
LB Johnston 2024-02-06 09:54:28 +10:00 committed by Matt Westcott
parent 7dff7ff364
commit ba516ef492
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
client/src/includes/a11y-result.ts
View File

@ -6,10 +6,17 @@ import {
RunOptions,
} from 'axe-core';
const toSelector = (str: string | string[]) =>
Array.isArray(str) ? str.join(' ') : str;
const sortAxeNodes = (nodeResultA?: NodeResult, nodeResultB?: NodeResult) => {
if (!nodeResultA || !nodeResultB) return 0;
const nodeA = document.querySelector<HTMLElement>(nodeResultA.target[0]);
const nodeB = document.querySelector<HTMLElement>(nodeResultB.target[0]);
const nodeA = document.querySelector<HTMLElement>(
toSelector(nodeResultA.target[0]),
);
const nodeB = document.querySelector<HTMLElement>(
toSelector(nodeResultB.target[0]),
);
if (!nodeA || !nodeB) return 0;
// Method works with bitwise https://developer.mozilla.org/en-US/docs/Web/API/Node/compareDocumentPosition
// eslint-disable-next-line no-bitwise
@ -117,10 +124,11 @@ export const renderA11yResults = (
'[data-a11y-result-selector-text]',
) as HTMLSpanElement;
// Special-case when displaying accessibility results within the admin interface.
const selectorName =
const selectorName = toSelector(
node.target[0] === '#preview-iframe'
? node.target[1]
: node.target[0];
: node.target[0],
);
// Remove unnecessary details before displaying selectors to the user
currentA11ySelectorText.textContent = selectorName.replace(
/\[data-block-key="\w{5}"\]/,