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

Jump to bottom

fix(pagination): disallow tab focus on disabled pagination #3468

Merged
merged 1 commit into from Nov 15, 2019
Merged

fix(pagination): disallow tab focus on disabled pagination #3468

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
28 changes: 19 additions & 9 deletions src/pagination/pagination.spec.ts
View file
Open in desktop
Expand Up @@ -630,17 +630,27 @@ describe('ngb-pagination', () => {
expect(fixture.componentInstance.onPageChange).not.toHaveBeenCalled();
}));

it('should set classes correctly for disabled state', fakeAsync(() => {
const html = `<ngb-pagination [collectionSize]="collectionSize" [pageSize]="pageSize" [maxSize]="maxSize"
it('should set classes correctly for disabled state', () => {
const html = `<ngb-pagination [collectionSize]="collectionSize" [pageSize]="pageSize" [maxSize]="maxSize"
[disabled]=true></ngb-pagination>`;
const fixture = createTestComponent(html);
tick();
const fixture = createTestComponent(html);

const buttons = fixture.nativeElement.querySelectorAll('li');
for (let i = 0; i < buttons.length; i++) {
expect(buttons[i]).toHaveCssClass('disabled');
}
}));
const buttons = fixture.nativeElement.querySelectorAll('li');
for (let i = 0; i < buttons.length; i++) {
expect(buttons[i]).toHaveCssClass('disabled');
}
});

it('should set tabindex for links correctly for disabled state', () => {
const html = `<ngb-pagination [collectionSize]="collectionSize" [pageSize]="pageSize" [maxSize]="maxSize"
[disabled]=true></ngb-pagination>`;
const fixture = createTestComponent(html);

const buttonLinks = fixture.nativeElement.querySelectorAll('li a');
for (let i = 0; i < buttonLinks.length; i++) {
expect(buttonLinks[i].getAttribute('tabindex')).toEqual('-1');
}
});
});

describe('Customization', () => {
Expand Down
12 changes: 6 additions & 6 deletions src/pagination/pagination.ts
View file
Open in desktop
Expand Up @@ -132,7 +132,7 @@ export class NgbPaginationPrevious {
<li *ngIf="boundaryLinks" class="page-item"
[class.disabled]="previousDisabled()">
<a aria-label="First" i18n-aria-label="@@ngb.pagination.first-aria" class="page-link" href
(click)="selectPage(1); $event.preventDefault()" [attr.tabindex]="(hasPrevious() ? null : '-1')">
(click)="selectPage(1); $event.preventDefault()" [attr.tabindex]="(hasPrevious() && !disabled ? null : '-1')">
<ng-template [ngTemplateOutlet]="tplFirst?.templateRef || first"
[ngTemplateOutletContext]="{disabled: previousDisabled(), currentPage: page}"></ng-template>
</a>
Expand All @@ -141,33 +141,33 @@ export class NgbPaginationPrevious {
<li *ngIf="directionLinks" class="page-item"
[class.disabled]="previousDisabled()">
<a aria-label="Previous" i18n-aria-label="@@ngb.pagination.previous-aria" class="page-link" href
(click)="selectPage(page-1); $event.preventDefault()" [attr.tabindex]="(hasPrevious() ? null : '-1')">
(click)="selectPage(page-1); $event.preventDefault()" [attr.tabindex]="(hasPrevious() && !disabled ? null : '-1')">
<ng-template [ngTemplateOutlet]="tplPrevious?.templateRef || previous"
[ngTemplateOutletContext]="{disabled: previousDisabled()}"></ng-template>
</a>
</li>
<li *ngFor="let pageNumber of pages" class="page-item" [class.active]="pageNumber === page"
[class.disabled]="isEllipsis(pageNumber) || disabled">
<a *ngIf="isEllipsis(pageNumber)" class="page-link">
<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>
</a>
<a *ngIf="!isEllipsis(pageNumber)" class="page-link" href (click)="selectPage(pageNumber); $event.preventDefault()">
<a *ngIf="!isEllipsis(pageNumber)" class="page-link" href (click)="selectPage(pageNumber); $event.preventDefault()" [attr.tabindex]="(disabled ? '-1' : null)">
<ng-template [ngTemplateOutlet]="tplNumber?.templateRef || defaultNumber"
[ngTemplateOutletContext]="{disabled: disabled, $implicit: pageNumber, currentPage: page}"></ng-template>
</a>
</li>
<li *ngIf="directionLinks" class="page-item" [class.disabled]="nextDisabled()">
<a aria-label="Next" i18n-aria-label="@@ngb.pagination.next-aria" class="page-link" href
(click)="selectPage(page+1); $event.preventDefault()" [attr.tabindex]="(hasNext() ? null : '-1')">
(click)="selectPage(page+1); $event.preventDefault()" [attr.tabindex]="(hasNext() && !disabled ? null : '-1')">
<ng-template [ngTemplateOutlet]="tplNext?.templateRef || next"
[ngTemplateOutletContext]="{disabled: nextDisabled(), currentPage: page}"></ng-template>
</a>
</li>

<li *ngIf="boundaryLinks" class="page-item" [class.disabled]="nextDisabled()">
<a aria-label="Last" i18n-aria-label="@@ngb.pagination.last-aria" class="page-link" href
(click)="selectPage(pageCount); $event.preventDefault()" [attr.tabindex]="(hasNext() ? null : '-1')">
(click)="selectPage(pageCount); $event.preventDefault()" [attr.tabindex]="(hasNext() && !disabled ? null : '-1')">
<ng-template [ngTemplateOutlet]="tplLast?.templateRef || last"
[ngTemplateOutletContext]="{disabled: nextDisabled(), currentPage: page}"></ng-template>
</a>
Expand Down