Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
feat(pagination): add 'aria-current' attribute (#3470)
  • Loading branch information
peterblazejewicz authored and maxokorokov committed Nov 15, 2019
1 parent fd7aea5 commit c502341
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
3 changes: 3 additions & 0 deletions src/pagination/pagination.spec.ts
Expand Up @@ -22,17 +22,20 @@ function expectPages(nativeEl: HTMLElement, pagesDef: string[], ellipsis = '...'
if (classIndicator === '+') {
expect(pages[i]).toHaveCssClass('active');
expect(pages[i]).not.toHaveCssClass('disabled');
expect(pages[i].getAttribute('aria-current')).toBe('page');
expect(normalizeText(pages[i].textContent)).toEqual(pageDef.substr(1) + ' (current)');
} else if (classIndicator === '-') {
expect(pages[i]).not.toHaveCssClass('active');
expect(pages[i]).toHaveCssClass('disabled');
expect(pages[i].getAttribute('aria-current')).toBeNull();
expect(normalizeText(pages[i].textContent)).toEqual(pageDef.substr(1));
if (normalizeText(pages[i].textContent) !== ellipsis) {
expect(pages[i].querySelector('a').getAttribute('tabindex')).toEqual('-1');
}
} else {
expect(pages[i]).not.toHaveCssClass('active');
expect(pages[i]).not.toHaveCssClass('disabled');
expect(pages[i].getAttribute('aria-current')).toBeNull();
expect(normalizeText(pages[i].textContent)).toEqual(pageDef);
if (normalizeText(pages[i].textContent) !== ellipsis) {
expect(pages[i].querySelector('a').hasAttribute('tabindex')).toBeFalsy();
Expand Down
2 changes: 1 addition & 1 deletion src/pagination/pagination.ts
Expand Up @@ -147,7 +147,7 @@ export class NgbPaginationPrevious {
</a>
</li>
<li *ngFor="let pageNumber of pages" class="page-item" [class.active]="pageNumber === page"
[class.disabled]="isEllipsis(pageNumber) || disabled">
[class.disabled]="isEllipsis(pageNumber) || disabled" [attr.aria-current]="(pageNumber === page ? 'page' : null)">
<a *ngIf="isEllipsis(pageNumber)" class="page-link" [attr.tabindex]="(disabled ? '-1' : null)">
<ng-template [ngTemplateOutlet]="tplEllipsis?.templateRef || ellipsis"
[ngTemplateOutletContext]="{disabled: true, currentPage: page}"></ng-template>
Expand Down

0 comments on commit c502341

Please sign in to comment.