Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<label class="igx-page-size__label">{{ paginator.resourceStrings.igx_paginator_label }}</label>
<label [id]="id" class="igx-page-size__label">{{ paginator.resourceStrings.igx_paginator_label }}</label>
<div class="igx-page-size__select">
<igx-select [overlaySettings]="paginator.overlaySettings" [(ngModel)]="paginator.perPage" type="border">
<igx-select [labelledBy]="id" [overlaySettings]="paginator.overlaySettings" [(ngModel)]="paginator.perPage" type="border">
@for (val of paginator.selectOptions; track val) {
<igx-select-item [value]="val">
{{ val }}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<button
[title]="paginator.resourceStrings.igx_paginator_first_page_button_text"
[attr.aria-label]="paginator.resourceStrings.igx_paginator_first_page_button_text"
[disabled]="paginator.isFirstPage"
[attr.aria-disabled]="paginator.isFirstPage"
(click)="paginator.paginate(0)"
Expand All @@ -12,6 +13,7 @@
</button>
<button
[title]="paginator.resourceStrings.igx_paginator_previous_page_button_text"
[attr.aria-label]="paginator.resourceStrings.igx_paginator_previous_page_button_text"
[disabled]="paginator.isFirstPage"
[attr.aria-disabled]="paginator.isFirstPage"
(click)="paginator.previousPage()"
Expand All @@ -33,6 +35,7 @@
</div>
<button
[title]="paginator.resourceStrings.igx_paginator_next_page_button_text"
[attr.aria-label]="paginator.resourceStrings.igx_paginator_next_page_button_text"
[disabled]="paginator.isLastPage"
[attr.aria-disabled]="paginator.isLastPage"
(click)="paginator.nextPage()"
Expand All @@ -45,6 +48,7 @@
</button>
<button
[title]="paginator.resourceStrings.igx_paginator_last_page_button_text"
[attr.aria-label]="paginator.resourceStrings.igx_paginator_last_page_button_text"
[disabled]="paginator.isLastPage"
[attr.aria-disabled]="paginator.isLastPage"
(click)="paginator.paginate(paginator.totalPages - 1)"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -277,6 +277,26 @@ describe('IgxPaginator with custom settings', () => {
expect(paginator.resourceStrings.igx_paginator_label).toEqual('Per page');
});

it('should have correct accessibility attributes', () => {
const fix = TestBed.createComponent(DefaultPaginatorComponent);
fix.detectChanges();
const paginator = fix.componentInstance.paginator;
const dom = fix.nativeElement;

const label = dom.querySelector('.igx-page-size__label');
const select = dom.querySelector('igx-select');
const input = select.querySelector('input[role="combobox"]');

expect(label.id).toBeTruthy();
expect(label.id).toContain('igx-paginator-');
expect(input.getAttribute('aria-labelledby')).toBe(label.id);

const buttons = dom.querySelectorAll('igx-page-nav button');
expect(buttons[0].getAttribute('aria-label')).toBe(paginator.resourceStrings.igx_paginator_first_page_button_text);
expect(buttons[1].getAttribute('aria-label')).toBe(paginator.resourceStrings.igx_paginator_previous_page_button_text);
expect(buttons[2].getAttribute('aria-label')).toBe(paginator.resourceStrings.igx_paginator_next_page_button_text);
expect(buttons[3].getAttribute('aria-label')).toBe(paginator.resourceStrings.igx_paginator_last_page_button_text);
});
});
@Component({
template: `
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -362,6 +362,7 @@ export class IgxPaginatorComponent implements IgxPaginatorToken {
}
}

let NEXT_ID = 0;

@Component({
selector: 'igx-page-size',
Expand All @@ -377,6 +378,10 @@ export class IgxPageSizeSelectorComponent {
*/
@HostBinding('class.igx-page-size')
public cssClass = 'igx-page-size';

@HostBinding('attr.id')
@Input()
public id = `igx-paginator-${NEXT_ID++}`;
}


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
[value]="this.selectionValue"
role="combobox"
aria-haspopup="listbox"
[attr.aria-labelledby]="this.label?.id"
[attr.aria-labelledby]="labelledBy || label?.id"
[attr.aria-expanded]="!this.collapsed"
[attr.aria-owns]="this.listId"
[attr.aria-activedescendant]="!this.collapsed ? this.focusedItem?.id : null"
Expand Down
8 changes: 4 additions & 4 deletions src/app/pagination/pagination.template.html
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,16 @@
<igx-paginator-content>
<igx-page-size></igx-page-size>
<span style="margin: 0 20px 0 20px;">{{ (pag.page * pag.perPage) + 1}}-{{(pag.page * pag.perPage) + pag.perPage}} of {{ pag.totalRecords}}</span>
<button [disabled]="pag.isFirstPage" (click)="pag.paginate(0)" igxIconButton="flat">
<button [disabled]="pag.isFirstPage" (click)="pag.paginate(0)" igxIconButton="flat" aria-label="First Page">
<igx-icon>first_page</igx-icon>
</button>
<button [disabled]="pag.isFirstPage" (click)="pag.previousPage()" igxIconButton="flat">
<button [disabled]="pag.isFirstPage" (click)="pag.previousPage()" igxIconButton="flat" aria-label="Previous Page">
<igx-icon>chevron_left</igx-icon>
</button>
<button [disabled]="pag.isLastPage" (click)="pag.nextPage()" igxIconButton="flat">
<button [disabled]="pag.isLastPage" (click)="pag.nextPage()" igxIconButton="flat" aria-label="Next Page">
<igx-icon>chevron_right</igx-icon>
</button>
<button [disabled]="paginator.isLastPage" (click)="paginator.paginate(paginator.totalPages - 1)" igxIconButton="flat">
<button [disabled]="paginator.isLastPage" (click)="paginator.paginate(paginator.totalPages - 1)" igxIconButton="flat" aria-label="Last Page">
<igx-icon>last_page</igx-icon>
</button>
</igx-paginator-content>
Expand Down
Loading