Skip to content

[pull] main from microsoft:main #874

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 1 commit into from
Jul 31, 2026
Merged

[pull] main from microsoft:main #874

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/injected/src/injectedScript.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1620,7 +1620,7 @@ export class InjectedScript {
} else if (expression === 'to.have.accessible.name') {
received = getElementAccessibleNameText(element, false /* includeHidden */);
} else if (expression === 'to.have.accessible.description') {
received = getElementAccessibleDescription(element, false /* includeHidden */);
received = getElementAccessibleDescription(element, false /* includeHidden */).text;
} else if (expression === 'to.have.accessible.error.message') {
received = getElementAccessibleErrorMessage(element);
} else if (expression === 'to.have.role') {
Expand Down
11 changes: 7 additions & 4 deletions packages/injected/src/recorder/recorder.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ class InspectTool implements RecorderTool {

let model: HighlightModel | null = null;
if (this._hoveredElement) {
const generated = this._recorder.injectedScript.generateSelector(this._hoveredElement, { testIdAttributeName: this._recorder.state.testIdAttributeName, multiple: false });
const generated = this._recorder.injectedScript.generateSelector(this._hoveredElement, { testIdAttributeName: this._recorder.state.testIdAttributeName });
model = {
selector: generated.selector,
elements: generated.elements,
Expand Down Expand Up @@ -403,9 +403,12 @@ class RecordActionTool implements RecorderTool {
return;
}

// By the time the input event arrives, the contenteditable already contains the new text.
// Generate a selector that does not depend on that text, so that it works before the fill.
const selector = target.isContentEditable ? this._selectorForElement(target, { noText: true }) : this._activeSelectorForEvent(event);
this._recordAction({
name: 'fill',
selector: this._activeSelectorForEvent(event),
selector,
text: target.isContentEditable ? target.innerText : (target as HTMLInputElement).value,
});
}
Expand Down Expand Up @@ -561,8 +564,8 @@ class RecordActionTool implements RecorderTool {
consumeEvent(event);
}

private _selectorForElement(element: HTMLElement): string {
return this._recorder.injectedScript.generateSelector(element, { testIdAttributeName: this._recorder.state.testIdAttributeName }).selector;
private _selectorForElement(element: HTMLElement, options?: { noText?: boolean }): string {
return this._recorder.injectedScript.generateSelector(element, { ...options, testIdAttributeName: this._recorder.state.testIdAttributeName }).selector;
}

private _modelForElement(element: HTMLElement): HighlightModelWithSelector | null {
Expand Down
2 changes: 1 addition & 1 deletion packages/injected/src/roleSelectorEngine.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ function queryRole(scope: SelectorRoot, options: RoleEngineOptions, internal: bo
}
if (options.description !== undefined) {
// Always normalize whitespace in the accessible description.
const accessibleDescription = normalizeWhiteSpace(getElementAccessibleDescription(element, !!options.includeHidden));
const accessibleDescription = normalizeWhiteSpace(getElementAccessibleDescription(element, !!options.includeHidden).text);
if (typeof options.description === 'string')
options.description = normalizeWhiteSpace(options.description);
// internal:role assumes that [description="foo"i] also means substring.
Expand Down
52 changes: 38 additions & 14 deletions packages/injected/src/roleUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -510,26 +510,32 @@ function allowsNameFromContent(role: string, targetDescendant: boolean) {
return alwaysAllowsNameFromContent || descendantAllowsNameFromContent;
}

function computeAccessibleNameComposite(element: Element, includeHidden: boolean, collectElements: boolean): CompositeString {
export type AccessibleName = CompositeString & {
derivedFromContent: boolean,
};

function computeAccessibleNameComposite(element: Element, includeHidden: boolean, collectElements: boolean): AccessibleName {
// https://w3c.github.io/accname/#computation-steps

// step 1.
// https://w3c.github.io/aria/#namefromprohibited
const elementProhibitsNaming = ['caption', 'code', 'definition', 'deletion', 'emphasis', 'generic', 'insertion', 'mark', 'paragraph', 'presentation', 'strong', 'subscript', 'suggestion', 'superscript', 'term', 'time'].includes(getAriaRole(element) || '');
if (elementProhibitsNaming)
return emptyCompositeString();
return { ...emptyCompositeString(), derivedFromContent: false };

// step 2.
const outDerivedFromContent = { value: false };
const result = getTextAlternativeInternal(element, {
includeHidden,
collectElements,
outDerivedFromContent,
visitedElements: new Set(),
embeddedInTargetElement: 'self',
});
return { text: asFlatString(result.text), elements: result.elements };
return { text: asFlatString(result.text), elements: result.elements, derivedFromContent: outDerivedFromContent.value };
}

export function getElementAccessibleName(element: Element, includeHidden: boolean): CompositeString {
export function getElementAccessibleName(element: Element, includeHidden: boolean): AccessibleName {
const cache = (includeHidden ? cacheAccessibleNameHidden : cacheAccessibleName);
let accessibleName = cache?.get(element);
if (accessibleName === undefined) {
Expand All @@ -553,31 +559,37 @@ export function getElementAccessibleNameText(element: Element, includeHidden: bo
return text;
}

export function getElementAccessibleDescription(element: Element, includeHidden: boolean): string {
export type AccessibleDescription = {
text: string,
derivedFromContent: boolean,
};

export function getElementAccessibleDescription(element: Element, includeHidden: boolean): AccessibleDescription {
const cache = (includeHidden ? cacheAccessibleDescriptionHidden : cacheAccessibleDescription);
let accessibleDescription = cache?.get(element);

if (accessibleDescription === undefined) {
// https://w3c.github.io/accname/#mapping_additional_nd_description
// https://www.w3.org/TR/html-aam-1.0/#accdesc-computation
accessibleDescription = '';
accessibleDescription = { text: '', derivedFromContent: false };

if (element.hasAttribute('aria-describedby')) {
// precedence 1
const describedBy = getIdRefs(element, element.getAttribute('aria-describedby'));
accessibleDescription = asFlatString(describedBy.map(ref => getTextAlternativeInternal(ref, {
accessibleDescription.text = asFlatString(describedBy.map(ref => getTextAlternativeInternal(ref, {
includeHidden,
visitedElements: new Set(),
embeddedInDescribedBy: { element: ref, hidden: isElementHiddenForAria(ref) },
}).text).join(' '));
accessibleDescription.derivedFromContent = describedBy.some(ref => ref === element || element.contains(ref));
} else if (element.hasAttribute('aria-description')) {
// precedence 2
accessibleDescription = asFlatString(element.getAttribute('aria-description') || '');
accessibleDescription.text = asFlatString(element.getAttribute('aria-description') || '');
} else {
// TODO: handle precedence 3 - html-aam-specific cases like table>caption.
// https://www.w3.org/TR/html-aam-1.0/#accdesc-computation
// precedence 4
accessibleDescription = asFlatString(element.getAttribute('title') || '');
accessibleDescription.text = asFlatString(element.getAttribute('title') || '');
}

cache?.set(element, accessibleDescription);
Expand Down Expand Up @@ -658,13 +670,20 @@ type AccessibleNameOptions = {
visitedElements: Set<Element>,
collectElements?: boolean,
includeHidden?: boolean,
// Set to true during the computation when the name is derived from the content of the target
// element, e.g. inner text or aria-labelledby pointing inside the element.
outDerivedFromContent?: { value: boolean },
embeddedInDescribedBy?: { element: Element, hidden: boolean },
embeddedInLabelledBy?: { element: Element, hidden: boolean },
embeddedInLabel?: { element: Element, hidden: boolean },
embeddedInNativeTextAlternative?: { element: Element, hidden: boolean },
embeddedInTargetElement?: 'self' | 'descendant',
};

function insideTargetElement(options: AccessibleNameOptions) {
return options.embeddedInTargetElement === 'self' || options.embeddedInTargetElement === 'descendant';
}

function getTextAlternativeInternal(element: Element, options: AccessibleNameOptions): CompositeString {
if (options.visitedElements.has(element))
return emptyCompositeString();
Expand Down Expand Up @@ -705,8 +724,11 @@ function getTextAlternativeInternal(element: Element, options: AccessibleNameOpt
embeddedInLabel: undefined,
embeddedInNativeTextAlternative: undefined,
})), ' ', options.collectElements);
if (accessibleName.text)
if (accessibleName.text) {
if (options.outDerivedFromContent && insideTargetElement(options) && (labelledBy || []).some(ref => ref === element || element.contains(ref)))
options.outDerivedFromContent.value = true;
return accessibleName;
}
}

const role = getAriaRole(element) || '';
Expand Down Expand Up @@ -972,6 +994,8 @@ function getTextAlternativeInternal(element: Element, options: AccessibleNameOpt
// So we follow the spec everywhere except for the target element itself. This can probably be improved.
const maybeTrimmedAccessibleName = options.embeddedInTargetElement === 'self' ? trimFlatString(accessibleName.text) : accessibleName.text;
if (maybeTrimmedAccessibleName) {
if (options.outDerivedFromContent && insideTargetElement(options) && trimFlatString(accessibleName.text))
options.outDerivedFromContent.value = true;
// This element owns the accumulated content - record it alongside the descendants it was computed from.
accessibleName.elements?.add(element);
return accessibleName;
Expand Down Expand Up @@ -1242,12 +1266,12 @@ export function receivesPointerEvents(element: Element): boolean {
return result;
}

let cacheAccessibleName: Map<Element, CompositeString> | undefined;
let cacheAccessibleNameHidden: Map<Element, CompositeString> | undefined;
let cacheAccessibleName: Map<Element, AccessibleName> | undefined;
let cacheAccessibleNameHidden: Map<Element, AccessibleName> | undefined;
let cacheAccessibleNameText: Map<Element, string> | undefined;
let cacheAccessibleNameTextHidden: Map<Element, string> | undefined;
let cacheAccessibleDescription: Map<Element, string> | undefined;
let cacheAccessibleDescriptionHidden: Map<Element, string> | undefined;
let cacheAccessibleDescription: Map<Element, AccessibleDescription> | undefined;
let cacheAccessibleDescriptionHidden: Map<Element, AccessibleDescription> | undefined;
let cacheAccessibleErrorMessage: Map<Element, string> | undefined;
let cacheIsHidden: Map<Element, boolean> | undefined;
let cachePseudoContent: Map<Element, string | undefined> | undefined;
Expand Down
Loading
Loading