Skip to content
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

fix(material/select): remove value from aria-labelledby #30374

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

fix(material/select): remove value from aria-labelledby #30374

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
848efe1
fix(material/select): remove value from aria-labelledby
andrewseguin Jan 22, 2025
58d2cac
fix(material/select): tests
andrewseguin Jan 22, 2025
8e1815e
fix(material/paginator): tests
andrewseguin Jan 22, 2025
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
8 changes: 3 additions & 5 deletions src/material/paginator/paginator.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,11 +107,9 @@ describe('MatPaginator', () => {
expect(getNextButton(fixture).getAttribute('aria-label')).toBe('Next page');

const select = fixture.nativeElement.querySelector('.mat-mdc-select');
const selectLabelIds = select.getAttribute('aria-labelledby')?.split(/\s/g) as string[];
const selectLabelTexts = selectLabelIds?.map(labelId => {
return fixture.nativeElement.querySelector(`#${labelId}`)?.textContent?.trim();
});
expect(selectLabelTexts).toContain('Items per page:');
const selectLabelId = select.getAttribute('aria-labelledby').trim();
const selectLabelText = fixture.nativeElement.querySelector(`#${selectLabelId}`)?.textContent;
expect(selectLabelText).toContain('Items per page:');
});

it('should re-render when the i18n labels change', () => {
Expand Down
31 changes: 3 additions & 28 deletions src/material/select/select.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,31 +183,17 @@ describe('MatSelect', () => {
fixture.detectChanges();

const labelId = fixture.nativeElement.querySelector('label').id;
const valueId = fixture.nativeElement.querySelector('.mat-mdc-select-value').id;

expect(select.getAttribute('aria-labelledby')).toBe(`${labelId} ${valueId} myLabelId`);
expect(select.getAttribute('aria-labelledby')).toBe(`${labelId} myLabelId`);
});

it('should set aria-labelledby to the value and label IDs', () => {
it('should set aria-labelledby to the label ID', () => {
fixture.detectChanges();

const labelId = fixture.nativeElement.querySelector('label').id;
const valueId = fixture.nativeElement.querySelector('.mat-mdc-select-value').id;
expect(select.getAttribute('aria-labelledby')).toBe(`${labelId} ${valueId}`);
expect(select.getAttribute('aria-labelledby')).toBe(labelId);
});

it('should trim the trigger aria-labelledby when there is no label', fakeAsync(() => {
fixture.componentInstance.hasLabel = false;
fixture.changeDetectorRef.markForCheck();
fixture.detectChanges();
flush();
fixture.detectChanges();

// Note that we assert that there are no spaces around the value.
const valueId = fixture.nativeElement.querySelector('.mat-mdc-select-value').id;
expect(select.getAttribute('aria-labelledby')).toBe(`${valueId}`);
}));

it('should set the tabindex of the select to 0 by default', () => {
expect(select.getAttribute('tabindex')).toEqual('0');
});
Expand Down Expand Up @@ -302,17 +288,6 @@ describe('MatSelect', () => {
expect(select.getAttribute('tabindex')).toEqual('0');
});

it('should set `aria-labelledby` to the value ID if there is no form field', () => {
fixture.destroy();

const labelFixture = TestBed.createComponent(SelectWithChangeEvent);
labelFixture.detectChanges();
select = labelFixture.debugElement.query(By.css('mat-select'))!.nativeElement;
const valueId = labelFixture.nativeElement.querySelector('.mat-mdc-select-value').id;

expect(select.getAttribute('aria-labelledby')?.trim()).toBe(valueId);
});

it('should select options via the UP/DOWN arrow keys on a closed select', fakeAsync(() => {
const formControl = fixture.componentInstance.control;
const options = fixture.componentInstance.options.toArray();
Expand Down
3 changes: 1 addition & 2 deletions src/material/select/select.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1390,8 +1390,7 @@ export class MatSelect
return null;
}

const labelId = this._parentFormField?.getLabelId();
let value = (labelId ? labelId + ' ' : '') + this._valueId;
let value = this._parentFormField?.getLabelId() || '';

if (this.ariaLabelledby) {
value += ' ' + this.ariaLabelledby;
Expand Down
Loading