Skip to content
Merged
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ exports[`Slide loads and displays Carousel component 1`] = `
<button
aria-current="true"
aria-disabled="false"
aria-label="page 1"
aria-label="page 1 of 3"
class="pagination-button active button button-neutral button-medium"
>
<span
Expand All @@ -53,7 +53,7 @@ exports[`Slide loads and displays Carousel component 1`] = `
<button
aria-current="false"
aria-disabled="false"
aria-label="page 2"
aria-label="page 2 of 3"
class="pagination-button button button-neutral button-medium"
>
<span
Expand All @@ -67,7 +67,7 @@ exports[`Slide loads and displays Carousel component 1`] = `
<button
aria-current="false"
aria-disabled="false"
aria-label="page 3"
aria-label="page 3 of 3"
class="pagination-button button button-neutral button-medium"
>
<span
Expand Down
24 changes: 21 additions & 3 deletions src/components/Pagination/Pager.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,13 @@ export const Pager: FC<PagerProps> = React.forwardRef(
themeContainerId={themeContainerId}
variant={ButtonVariant.Neutral}
ariaLabel={
locale.lang.pageSizeText + ' ' + '1'.toLocaleString()
locale.lang.pageSizeText +
' ' +
'1'.toLocaleString() +
' ' +
locale.lang.pagerText +
' ' +
pageCount.toLocaleString()
}
/>
) : (
Expand Down Expand Up @@ -245,7 +251,13 @@ export const Pager: FC<PagerProps> = React.forwardRef(
themeContainerId={themeContainerId}
variant={ButtonVariant.Neutral}
ariaLabel={
locale.lang.pageSizeText + ' ' + pager.toLocaleString()
locale.lang.pageSizeText +
' ' +
pager.toLocaleString() +
' ' +
locale.lang.pagerText +
' ' +
pageCount.toLocaleString()
}
/>
</li>
Expand Down Expand Up @@ -304,7 +316,13 @@ export const Pager: FC<PagerProps> = React.forwardRef(
themeContainerId={themeContainerId}
variant={ButtonVariant.Neutral}
ariaLabel={
locale.lang.pageSizeText + ' ' + pageCount.toLocaleString()
locale.lang.pageSizeText +
' ' +
pageCount.toLocaleString() +
' ' +
locale.lang.pagerText +
' ' +
pageCount.toLocaleString()
}
/>
</li>
Expand Down
48 changes: 24 additions & 24 deletions src/components/Pagination/__snapshots__/Pagination.test.tsx.snap
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ exports[`Pagination Pagination should render as dots 1`] = `
<button
aria-current="true"
aria-disabled="false"
aria-label="page 1"
aria-label="page 1 of 5"
class="pagination-button active button button-neutral button-medium"
>
<span
Expand All @@ -51,7 +51,7 @@ exports[`Pagination Pagination should render as dots 1`] = `
<button
aria-current="false"
aria-disabled="false"
aria-label="page 2"
aria-label="page 2 of 5"
class="pagination-button button button-neutral button-medium"
>
<span
Expand All @@ -65,7 +65,7 @@ exports[`Pagination Pagination should render as dots 1`] = `
<button
aria-current="false"
aria-disabled="false"
aria-label="page 3"
aria-label="page 3 of 5"
class="pagination-button button button-neutral button-medium"
>
<span
Expand All @@ -79,7 +79,7 @@ exports[`Pagination Pagination should render as dots 1`] = `
<button
aria-current="false"
aria-disabled="false"
aria-label="page 4"
aria-label="page 4 of 5"
class="pagination-button button button-neutral button-medium"
>
<span
Expand All @@ -93,7 +93,7 @@ exports[`Pagination Pagination should render as dots 1`] = `
<button
aria-current="false"
aria-disabled="false"
aria-label="page 5"
aria-label="page 5 of 5"
class="pagination-button button button-neutral button-medium"
>
<span
Expand Down Expand Up @@ -240,7 +240,7 @@ exports[`Pagination Pagination should render normally 1`] = `
<button
aria-current="true"
aria-disabled="false"
aria-label="page 1"
aria-label="page 1 of 5"
class="pagination-button active button button-neutral button-medium"
>
<span
Expand All @@ -254,7 +254,7 @@ exports[`Pagination Pagination should render normally 1`] = `
<button
aria-current="false"
aria-disabled="false"
aria-label="page 2"
aria-label="page 2 of 5"
class="pagination-button button button-neutral button-medium"
>
<span
Expand All @@ -268,7 +268,7 @@ exports[`Pagination Pagination should render normally 1`] = `
<button
aria-current="false"
aria-disabled="false"
aria-label="page 3"
aria-label="page 3 of 5"
class="pagination-button button button-neutral button-medium"
>
<span
Expand All @@ -282,7 +282,7 @@ exports[`Pagination Pagination should render normally 1`] = `
<button
aria-current="false"
aria-disabled="false"
aria-label="page 4"
aria-label="page 4 of 5"
class="pagination-button button button-neutral button-medium"
>
<span
Expand All @@ -296,7 +296,7 @@ exports[`Pagination Pagination should render normally 1`] = `
<button
aria-current="false"
aria-disabled="false"
aria-label="page 5"
aria-label="page 5 of 5"
class="pagination-button button button-neutral button-medium"
>
<span
Expand Down Expand Up @@ -416,7 +416,7 @@ exports[`Pagination Pagination should render with all elements 1`] = `
<button
aria-current="false"
aria-disabled="false"
aria-label="page 1"
aria-label="page 1 of 4"
class="pagination-button button button-neutral button-medium"
>
<span
Expand All @@ -430,7 +430,7 @@ exports[`Pagination Pagination should render with all elements 1`] = `
<button
aria-current="false"
aria-disabled="false"
aria-label="page 2"
aria-label="page 2 of 4"
class="pagination-button button button-neutral button-medium"
>
<span
Expand All @@ -444,7 +444,7 @@ exports[`Pagination Pagination should render with all elements 1`] = `
<button
aria-current="false"
aria-disabled="false"
aria-label="page 3"
aria-label="page 3 of 4"
class="pagination-button button button-neutral button-medium"
>
<span
Expand All @@ -458,7 +458,7 @@ exports[`Pagination Pagination should render with all elements 1`] = `
<button
aria-current="true"
aria-disabled="false"
aria-label="page 4"
aria-label="page 4 of 4"
class="pagination-button active button button-neutral button-medium"
>
<span
Expand Down Expand Up @@ -568,7 +568,7 @@ exports[`Pagination Pagination should render with some elements 1`] = `
<button
aria-current="false"
aria-disabled="false"
aria-label="page 1"
aria-label="page 1 of 10"
class="pagination-button button button-neutral button-medium"
>
<span
Expand All @@ -582,7 +582,7 @@ exports[`Pagination Pagination should render with some elements 1`] = `
<button
aria-current="false"
aria-disabled="false"
aria-label="page 2"
aria-label="page 2 of 10"
class="pagination-button button button-neutral button-medium"
>
<span
Expand All @@ -596,7 +596,7 @@ exports[`Pagination Pagination should render with some elements 1`] = `
<button
aria-current="false"
aria-disabled="false"
aria-label="page 3"
aria-label="page 3 of 10"
class="pagination-button button button-neutral button-medium"
>
<span
Expand All @@ -610,7 +610,7 @@ exports[`Pagination Pagination should render with some elements 1`] = `
<button
aria-current="false"
aria-disabled="false"
aria-label="page 4"
aria-label="page 4 of 10"
class="pagination-button button button-neutral button-medium"
>
<span
Expand All @@ -624,7 +624,7 @@ exports[`Pagination Pagination should render with some elements 1`] = `
<button
aria-current="true"
aria-disabled="false"
aria-label="page 5"
aria-label="page 5 of 10"
class="pagination-button active button button-neutral button-medium"
>
<span
Expand All @@ -638,7 +638,7 @@ exports[`Pagination Pagination should render with some elements 1`] = `
<button
aria-current="false"
aria-disabled="false"
aria-label="page 6"
aria-label="page 6 of 10"
class="pagination-button button button-neutral button-medium"
>
<span
Expand All @@ -652,7 +652,7 @@ exports[`Pagination Pagination should render with some elements 1`] = `
<button
aria-current="false"
aria-disabled="false"
aria-label="page 7"
aria-label="page 7 of 10"
class="pagination-button button button-neutral button-medium"
>
<span
Expand All @@ -666,7 +666,7 @@ exports[`Pagination Pagination should render with some elements 1`] = `
<button
aria-current="false"
aria-disabled="false"
aria-label="page 8"
aria-label="page 8 of 10"
class="pagination-button button button-neutral button-medium"
>
<span
Expand All @@ -680,7 +680,7 @@ exports[`Pagination Pagination should render with some elements 1`] = `
<button
aria-current="false"
aria-disabled="false"
aria-label="page 9"
aria-label="page 9 of 10"
class="pagination-button button button-neutral button-medium"
>
<span
Expand All @@ -694,7 +694,7 @@ exports[`Pagination Pagination should render with some elements 1`] = `
<button
aria-current="false"
aria-disabled="false"
aria-label="page 10"
aria-label="page 10 of 10"
class="pagination-button button button-neutral button-medium"
>
<span
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ exports[`PersistentBar PersistentBar is topBarPagination 1`] = `
<button
aria-current="true"
aria-disabled="false"
aria-label="page 1"
aria-label="page 1 of 1"
class="pagination-button active button button-neutral button-medium"
>
<span
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3698,7 +3698,7 @@ LoadedCheerio {
"attribs": Object {
"aria-current": "true",
"aria-disabled": "false",
"aria-label": "page 1",
"aria-label": "page 1 of 1",
"class": "pagination-button active button button-neutral button-medium",
},
"children": Array [
Expand Down Expand Up @@ -3790,7 +3790,7 @@ LoadedCheerio {
"attribs": Object {
"aria-current": "true",
"aria-disabled": "false",
"aria-label": "page 1",
"aria-label": "page 1 of 1",
"class": "pagination-button active button button-neutral button-medium",
},
"children": Array [
Expand Down Expand Up @@ -3924,7 +3924,7 @@ LoadedCheerio {
"attribs": Object {
"aria-current": "true",
"aria-disabled": "false",
"aria-label": "page 1",
"aria-label": "page 1 of 1",
"class": "pagination-button active button button-neutral button-medium",
},
"children": Array [
Expand Down Expand Up @@ -4016,7 +4016,7 @@ LoadedCheerio {
"attribs": Object {
"aria-current": "true",
"aria-disabled": "false",
"aria-label": "page 1",
"aria-label": "page 1 of 1",
"class": "pagination-button active button button-neutral button-medium",
},
"children": Array [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -926,7 +926,7 @@ LoadedCheerio {
"attribs": Object {
"aria-current": "true",
"aria-disabled": "false",
"aria-label": "page 1",
"aria-label": "page 1 of 1",
"class": "pagination-button active button button-neutral button-medium",
},
"children": Array [
Expand Down Expand Up @@ -1018,7 +1018,7 @@ LoadedCheerio {
"attribs": Object {
"aria-current": "true",
"aria-disabled": "false",
"aria-label": "page 1",
"aria-label": "page 1 of 1",
"class": "pagination-button active button button-neutral button-medium",
},
"children": Array [
Expand Down Expand Up @@ -1152,7 +1152,7 @@ LoadedCheerio {
"attribs": Object {
"aria-current": "true",
"aria-disabled": "false",
"aria-label": "page 1",
"aria-label": "page 1 of 1",
"class": "pagination-button active button button-neutral button-medium",
},
"children": Array [
Expand Down Expand Up @@ -1244,7 +1244,7 @@ LoadedCheerio {
"attribs": Object {
"aria-current": "true",
"aria-disabled": "false",
"aria-label": "page 1",
"aria-label": "page 1 of 1",
"class": "pagination-button active button button-neutral button-medium",
},
"children": Array [
Expand Down
Loading