Filip/playwright
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

chore: remove includeHidden props with getElementAccessibleErrorMessage

Browse source
This commit is contained in:
Pengoose 2024-12-15 00:58:00 +09:00
parent 1b6b126799
commit e49de50a3b
2 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
packages/playwright-core/src/server/injected/injectedScript.ts
View file

@ -1322,7 +1322,7 @@ export class InjectedScript {
} else if (expression === 'to.have.accessible.description') { } else if (expression === 'to.have.accessible.description') {
received = getElementAccessibleDescription(element, false /* includeHidden */); received = getElementAccessibleDescription(element, false /* includeHidden */);
} else if (expression === 'to.have.accessible.error.message') { } else if (expression === 'to.have.accessible.error.message') {
received = getElementAccessibleErrorMessage(element, false /* includeHidden */); received = getElementAccessibleErrorMessage(element);
} else if (expression === 'to.have.role') { } else if (expression === 'to.have.role') {
received = getAriaRole(element) || ''; received = getAriaRole(element) || '';
} else if (expression === 'to.have.title') { } else if (expression === 'to.have.title') {

11
packages/playwright-core/src/server/injected/roleUtils.ts
View file

@ -461,15 +461,14 @@ export function getElementAccessibleDescription(element: Element, includeHidden:
return accessibleDescription; return accessibleDescription;
} }
export function getElementAccessibleErrorMessage(element: Element, includeHidden: boolean): string { export function getElementAccessibleErrorMessage(element: Element): string {
const cache = includeHidden ? cacheAccessibleErrorMessageHidden : cacheAccessibleErrorMessage; const cache = cacheAccessibleErrorMessage;
let accessibleErrorMessage = cache?.get(element); let accessibleErrorMessage = cacheAccessibleErrorMessage?.get(element);
if (accessibleErrorMessage === undefined) { if (accessibleErrorMessage === undefined) {
accessibleErrorMessage = ''; accessibleErrorMessage = '';
const ariaInvalid = element.getAttribute('aria-invalid'); const ariaInvalid = element.getAttribute('aria-invalid');
// const isAriaInvalid = ariaInvalid === 'true' || (ariaInvalid !== 'false' && ariaInvalid !== null && ariaInvalid !== '');
const isAriaInvalid = ariaInvalid !== null && ariaInvalid.toLowerCase() !== 'false'; const isAriaInvalid = ariaInvalid !== null && ariaInvalid.toLowerCase() !== 'false';
if (isAriaInvalid) { if (isAriaInvalid) {
const errorMessageId = element.getAttribute('aria-errormessage'); const errorMessageId = element.getAttribute('aria-errormessage');
@ -481,7 +480,6 @@ export function getElementAccessibleErrorMessage(element: Element, includeHidden
if (errorElement) { if (errorElement) {
accessibleErrorMessage = asFlatString( accessibleErrorMessage = asFlatString(
getTextAlternativeInternal(errorElement, { getTextAlternativeInternal(errorElement, {
includeHidden,
visitedElements: new Set(), visitedElements: new Set(),
embeddedInDescribedBy: { element: errorElement, hidden: isElementHiddenForAria(errorElement) }, embeddedInDescribedBy: { element: errorElement, hidden: isElementHiddenForAria(errorElement) },
}) })
@ -1007,7 +1005,6 @@ let cacheAccessibleNameHidden: Map<Element, string> | undefined;
let cacheAccessibleDescription: Map<Element, string> | undefined; let cacheAccessibleDescription: Map<Element, string> | undefined;
let cacheAccessibleDescriptionHidden: Map<Element, string> | undefined; let cacheAccessibleDescriptionHidden: Map<Element, string> | undefined;
let cacheAccessibleErrorMessage: Map<Element, string> | undefined; let cacheAccessibleErrorMessage: Map<Element, string> | undefined;
let cacheAccessibleErrorMessageHidden: Map<Element, string> | undefined;
let cacheIsHidden: Map<Element, boolean> | undefined; let cacheIsHidden: Map<Element, boolean> | undefined;
let cachePseudoContentBefore: Map<Element, string> | undefined; let cachePseudoContentBefore: Map<Element, string> | undefined;
let cachePseudoContentAfter: Map<Element, string> | undefined; let cachePseudoContentAfter: Map<Element, string> | undefined;
@ -1020,7 +1017,6 @@ export function beginAriaCaches() {
cacheAccessibleDescription ??= new Map(); cacheAccessibleDescription ??= new Map();
cacheAccessibleDescriptionHidden ??= new Map(); cacheAccessibleDescriptionHidden ??= new Map();
cacheAccessibleErrorMessage ??= new Map(); cacheAccessibleErrorMessage ??= new Map();
cacheAccessibleErrorMessageHidden ??= new Map();
cacheIsHidden ??= new Map(); cacheIsHidden ??= new Map();
cachePseudoContentBefore ??= new Map(); cachePseudoContentBefore ??= new Map();
cachePseudoContentAfter ??= new Map(); cachePseudoContentAfter ??= new Map();
@ -1033,7 +1029,6 @@ export function endAriaCaches() {
cacheAccessibleDescription = undefined; cacheAccessibleDescription = undefined;
cacheAccessibleDescriptionHidden = undefined; cacheAccessibleDescriptionHidden = undefined;
cacheAccessibleErrorMessage = undefined; cacheAccessibleErrorMessage = undefined;
cacheAccessibleErrorMessageHidden = undefined;
cacheIsHidden = undefined; cacheIsHidden = undefined;
cachePseudoContentBefore = undefined; cachePseudoContentBefore = undefined;
cachePseudoContentAfter = undefined; cachePseudoContentAfter = undefined;