Skip to content

fix(material/sort): remove role from header when disabled #24477

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
merged 1 commit into from
Feb 24, 2022
Merged

fix(material/sort): remove role from header when disabled #24477

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 src/material/sort/sort-header.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
[class.mat-sort-header-sorted]="_isSorted()"
[class.mat-sort-header-position-before]="arrowPosition === 'before'"
[attr.tabindex]="_isDisabled() ? null : 0"
role="button">
[attr.role]="_isDisabled() ? null : 'button'">

<!--
TODO(crisbeto): this div isn't strictly necessary, but we have to keep it due to a large
Expand Down
2 changes: 1 addition & 1 deletion src/material/sort/sort-header.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ export class MatSortHeader

this._sort.register(this);

this._sortButton = this._elementRef.nativeElement.querySelector('[role="button"]')!;
this._sortButton = this._elementRef.nativeElement.querySelector('.mat-sort-header-container')!;
this._updateSortActionDescription(this._sortActionDescription);
}

Expand Down
10 changes: 7 additions & 3 deletions src/material/sort/sort.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,13 +237,15 @@ describe('MatSort', () => {
component.sort('defaultA');
expect(component.matSort.direction).toBe('asc');
expect(container.getAttribute('tabindex')).toBe('0');
expect(container.getAttribute('role')).toBe('button');

component.disabledColumnSort = true;
fixture.detectChanges();

component.sort('defaultA');
expect(component.matSort.direction).toBe('asc');
expect(container.getAttribute('tabindex')).toBeFalsy();
expect(container.hasAttribute('tabindex')).toBe(false);
expect(container.hasAttribute('role')).toBe(false);
});

it('should allow for the cycling the sort direction to be disabled for all columns', () => {
Expand Down Expand Up @@ -417,7 +419,7 @@ describe('MatSort', () => {
});

it('should add a default aria description to sort buttons', () => {
const sortButton = fixture.nativeElement.querySelector('[role="button"]');
const sortButton = fixture.nativeElement.querySelector('.mat-sort-header-container');
const descriptionId = sortButton.getAttribute('aria-describedby');
expect(descriptionId).toBeDefined();

Expand All @@ -426,7 +428,9 @@ describe('MatSort', () => {
});

it('should add a custom aria description to sort buttons', () => {
const sortButton = fixture.nativeElement.querySelector('#defaultB [role="button"]');
const sortButton = fixture.nativeElement.querySelector(
'#defaultB .mat-sort-header-container',
);
let descriptionId = sortButton.getAttribute('aria-describedby');
expect(descriptionId).toBeDefined();

Expand Down