Skip to content

feat: fix a11y issues in paginator component #668

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

Open
fateeand wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feat: fix a11y issues in paginator component #668

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 playwright/cps-accessibility.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ const components: ComponentEntry[] = [
}
}
},
// { route: '/paginator', name: 'Paginator', selector: 'cps-paginator' },
{ route: '/paginator', name: 'Paginator', selector: 'cps-paginator' },
// {
// route: '/progress-circular',
// name: 'Progress circular',
Expand Down
8 changes: 8 additions & 0 deletions projects/composition/src/app/api-data/cps-paginator.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,14 @@
"type": "boolean",
"default": "false",
"description": "Determines whether to reset page index when the number of rows per page changes."
},
{
"name": "ariaLabel",
"optional": false,
"readonly": false,
"type": "string",
"default": "Pagination",
"description": "Accessible label for the paginator component.\nFalls back to \"Pagination\" when empty value is provided."
}
]
},
Expand Down
11 changes: 7 additions & 4 deletions projects/cps-ui-kit/src/lib/components/cps-paginator/cps-paginator.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,27 @@
#paginator
(onPageChange)="onPageChange($event)"
[first]="first"
[rows]="rows"
[style]="{ background: backgroundColor }"
[rows]="currentRows"
[style.background]="cvtBackgroundColor"
[totalRecords]="totalRecords"
[showFirstLastIcon]="true"
[showCurrentPageReport]="true"
[alwaysShow]="alwaysShow"
[templateLeft]="itemsPerPageTemplate"
[pt]="paginatorPt"
currentPageReportTemplate="{first} - {last} of {totalRecords}">
</p-paginator>

<ng-template #itemsPerPageTemplate>
<div class="cps-paginator-itms-per-page">
<span class="cps-paginator-items-per-page-title">Items per page: </span>
<span class="cps-paginator-items-per-page-title" aria-hidden="true"
>Items per page:
</span>
<cps-select
ariaLabel="Set items per page"
[options]="rowOptions"
[hideDetails]="true"
[(ngModel)]="rows"
[(ngModel)]="currentRows"
(valueChanged)="onRowsPerPageChange($event)"
[returnObject]="false"
optionsClass="cps-paginator-page-options"></cps-select>
Expand Down
113 changes: 79 additions & 34 deletions projects/cps-ui-kit/src/lib/components/cps-paginator/cps-paginator.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@use '../../../../styles/mixins' as *;

$color-calm: var(--cps-color-calm);
$text-color: var(--cps-color-text-dark);
$border-color: var(--cps-color-text-dark);
Expand All @@ -22,21 +24,22 @@ $elem-active-background: var(--cps-color-highlight-active);
align-items: center;
.cps-paginator-items-per-page-title {
font-family: 'Source Sans Pro', sans-serif;
font-size: 14px;
margin-right: 12px;
font-size: 0.875rem;
margin-right: 0.75rem;
cursor: default;
}

.cps-select-box {
min-height: 32px !important;
min-height: 2rem !important;
background: transparent !important;
.cps-select-box-items {
font-size: 14px !important;
font-size: 0.875rem !important;
}
.cps-select-box-chevron {
padding: 0.3125rem !important;
.cps-icon {
width: 14px;
height: 14px;
width: 0.875rem;
height: 0.875rem;
}
}
}
Expand All @@ -51,7 +54,7 @@ $elem-active-background: var(--cps-color-highlight-active);
margin: 0.143rem;
padding: 0 0.5rem;
font-family: 'Source Sans Pro', sans-serif;
font-size: 14px;
font-size: 0.875rem;
height: unset;
}

Expand All @@ -76,17 +79,29 @@ $elem-active-background: var(--cps-color-highlight-active);
cursor: default;
}

.p-paginator .p-paginator-first:not(.p-disabled):not(.p-paginator-page-selected):hover,
.p-paginator .p-paginator-prev:not(.p-disabled):not(.p-paginator-page-selected):hover,
.p-paginator .p-paginator-next:not(.p-disabled):not(.p-paginator-page-selected):hover,
.p-paginator .p-paginator-last:not(.p-disabled):not(.p-paginator-page-selected):hover {
.p-paginator
.p-paginator-first:not(.p-disabled):not(.p-paginator-page-selected):hover,
.p-paginator
.p-paginator-prev:not(.p-disabled):not(.p-paginator-page-selected):hover,
.p-paginator
.p-paginator-next:not(.p-disabled):not(.p-paginator-page-selected):hover,
.p-paginator
.p-paginator-last:not(.p-disabled):not(.p-paginator-page-selected):hover {
background: $elem-hover-background;
border-color: unset;
}
.p-paginator .p-paginator-first:not(.p-disabled):not(.p-paginator-page-selected):active,
.p-paginator .p-paginator-prev:not(.p-disabled):not(.p-paginator-page-selected):active,
.p-paginator .p-paginator-next:not(.p-disabled):not(.p-paginator-page-selected):active,
.p-paginator .p-paginator-last:not(.p-disabled):not(.p-paginator-page-selected):active {
.p-paginator
.p-paginator-first:not(.p-disabled):not(
.p-paginator-page-selected
):active,
.p-paginator
.p-paginator-prev:not(.p-disabled):not(.p-paginator-page-selected):active,
.p-paginator
.p-paginator-next:not(.p-disabled):not(.p-paginator-page-selected):active,
.p-paginator
.p-paginator-last:not(.p-disabled):not(
.p-paginator-page-selected
):active {
background: $elem-active-background;
}

Expand All @@ -95,11 +110,11 @@ $elem-active-background: var(--cps-color-highlight-active);
.p-paginator .p-paginator-next,
.p-paginator .p-paginator-last {
background-color: transparent;
border: 1px solid $border-color;
border-radius: 4px;
border: 0.0625rem solid $border-color;
border-radius: 0.25rem;
color: $text-color;
min-width: 32px;
height: 32px;
min-width: 2rem;
height: 2rem;
margin: 0.143rem;
transition: box-shadow 0.2s;
}
Expand All @@ -108,48 +123,78 @@ $elem-active-background: var(--cps-color-highlight-active);
display: inline-flex;
}

.p-paginator-first-icon,
.p-paginator-prev-icon,
.p-paginator-next-icon,
.p-paginator-last-icon {
width: 0.875rem;
height: 0.875rem;
}

.p-disabled,
.p-disabled * {
cursor: default !important;
pointer-events: none;
}

.p-paginator .p-paginator-pages .p-paginator-page.p-paginator-page-selected {
.p-paginator
.p-paginator-pages
.p-paginator-page.p-paginator-page-selected {
background: $color-calm;
border-color: $color-calm;
color: white;
}

.p-paginator .p-paginator-pages .p-paginator-page:not(.p-paginator-page-selected):hover {
.p-paginator
.p-paginator-pages
.p-paginator-page:not(.p-paginator-page-selected):hover {
background: $elem-hover-background;
border-color: unset;
}
.p-paginator .p-paginator-pages .p-paginator-page:not(.p-paginator-page-selected):active {
.p-paginator
.p-paginator-pages
.p-paginator-page:not(.p-paginator-page-selected):active {
background: $elem-active-background;
}

.p-paginator .p-paginator-pages .p-paginator-page {
background-color: transparent;
border: 1px solid $border-color;
border-radius: 4px;
border: 0.0625rem solid $border-color;
border-radius: 0.25rem;
color: $text-color;
min-width: 32px;
height: 32px;
min-width: 2rem;
height: 2rem;
margin: 0.143rem;
transition: box-shadow 0.2s;
}

.p-paginator-element:focus {
z-index: 1;
position: relative;
}

.p-paginator-first:focus,
.p-paginator-prev:focus,
.p-paginator-next:focus,
.p-paginator-last:focus,
.p-paginator-page:focus {
z-index: 1;
outline: 0 none;
outline-offset: 0;
box-shadow: unset;
}

.p-paginator-first:not(.p-disabled):focus-visible,
.p-paginator-prev:not(.p-disabled):focus-visible,
.p-paginator-next:not(.p-disabled):focus-visible,
.p-paginator-last:not(.p-disabled):focus-visible,
.p-paginator-page:focus-visible {
overflow: visible;
@include focus-ring(0.1875rem, 0.25rem, 0.25rem);
}

.p-paginator-first:not(.p-disabled):focus-visible,
.p-paginator-prev:not(.p-disabled):focus-visible,
.p-paginator-next:not(.p-disabled):focus-visible,
.p-paginator-last:not(.p-disabled):focus-visible,
.p-paginator-page:not(.p-paginator-page-selected):focus-visible {
background: $elem-hover-background;
}

.p-paginator-page {
text-align: left;
background-color: transparent;
Expand All @@ -159,7 +204,7 @@ $elem-active-background: var(--cps-color-highlight-active);
cursor: pointer;
-webkit-user-select: none;
user-select: none;
font-size: 14px;
font-size: 0.875rem;
font-family: 'Source Sans Pro', sans-serif;
}

Expand All @@ -172,6 +217,6 @@ $elem-active-background: var(--cps-color-highlight-active);

::ng-deep .cps-select-options-menu.cps-paginator-page-options {
.cps-select-options-option {
font-size: 14px;
font-size: 0.875rem;
}
}
Loading
Loading