From ea877052506a3679c4057be75b813519c9776201 Mon Sep 17 00:00:00 2001
From: OleksandrNechai <oleksandr.nechai@toptal.com>
Date: Tue, 26 Dec 2023 15:28:44 +0100
Subject: [PATCH 1/4] Add ariaCurrent to the active button in Pagination

---
 .../src/Pagination/__snapshots__/test.tsx.snap        |  2 ++
 .../picasso/src/PaginationButton/PaginationButton.tsx | 11 ++++-------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/packages/picasso/src/Pagination/__snapshots__/test.tsx.snap b/packages/picasso/src/Pagination/__snapshots__/test.tsx.snap
index f9af29c7ed..5d1715139a 100644
--- a/packages/picasso/src/Pagination/__snapshots__/test.tsx.snap
+++ b/packages/picasso/src/Pagination/__snapshots__/test.tsx.snap
@@ -66,6 +66,7 @@ exports[`Pagination renders 1`] = `
         </span>
       </button>
       <button
+        aria-current="true"
         class="MuiButtonBase-root PicassoButton-active PicassoButton-small PicassoButton-secondary PicassoButton-root PicassoPaginationButton-root PicassoPaginationButton-active PicassoPagination-button"
         data-component-type="button"
         tabindex="0"
@@ -209,6 +210,7 @@ exports[`Pagination renders disabled 1`] = `
         </span>
       </button>
       <button
+        aria-current="true"
         class="MuiButtonBase-root PicassoButton-active PicassoButton-disabled PicassoButton-small PicassoButton-secondary PicassoButton-root PicassoPaginationButton-root PicassoPaginationButton-active PicassoPagination-button Mui-disabled"
         data-component-type="button"
         disabled=""
diff --git a/packages/picasso/src/PaginationButton/PaginationButton.tsx b/packages/picasso/src/PaginationButton/PaginationButton.tsx
index 815adbb5de..bf6619e715 100644
--- a/packages/picasso/src/PaginationButton/PaginationButton.tsx
+++ b/packages/picasso/src/PaginationButton/PaginationButton.tsx
@@ -20,17 +20,14 @@ export interface Props extends StandardProps {
 
 const PaginationButton = (props: Props) => {
   const { page, activePage, disabled, onClick, className } = props
-
   const classes = useStyles()
+  const isActive = page === activePage
 
   return (
     <Button
-      className={cx(
-        classes.root,
-        { [classes.active]: page === activePage },
-        className
-      )}
-      active={activePage === page}
+      className={cx(classes.root, { [classes.active]: isActive }, className)}
+      aria-current={isActive ? true : undefined}
+      active={isActive}
       disabled={disabled}
       onClick={() => onClick(page)}
       variant='secondary'

From a37464e8de74571d0aee9c31b48e3a1d8bccc633 Mon Sep 17 00:00:00 2001
From: OleksandrNechai <oleksandr.nechai@toptal.com>
Date: Wed, 27 Dec 2023 10:18:36 +0100
Subject: [PATCH 2/4] Add aria-current false

---
 .../src/Pagination/__snapshots__/test.tsx.snap       | 12 ++++++++++++
 .../src/PaginationButton/PaginationButton.tsx        |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/packages/picasso/src/Pagination/__snapshots__/test.tsx.snap b/packages/picasso/src/Pagination/__snapshots__/test.tsx.snap
index 5d1715139a..efaf58dc4e 100644
--- a/packages/picasso/src/Pagination/__snapshots__/test.tsx.snap
+++ b/packages/picasso/src/Pagination/__snapshots__/test.tsx.snap
@@ -21,6 +21,7 @@ exports[`Pagination renders 1`] = `
         </span>
       </button>
       <button
+        aria-current="false"
         class="MuiButtonBase-root PicassoButton-small PicassoButton-secondary PicassoButton-root PicassoPaginationButton-root PicassoPagination-button"
         data-component-type="button"
         tabindex="0"
@@ -42,6 +43,7 @@ exports[`Pagination renders 1`] = `
         </p>
       </div>
       <button
+        aria-current="false"
         class="MuiButtonBase-root PicassoButton-small PicassoButton-secondary PicassoButton-root PicassoPaginationButton-root PicassoPagination-button"
         data-component-type="button"
         tabindex="0"
@@ -54,6 +56,7 @@ exports[`Pagination renders 1`] = `
         </span>
       </button>
       <button
+        aria-current="false"
         class="MuiButtonBase-root PicassoButton-small PicassoButton-secondary PicassoButton-root PicassoPaginationButton-root PicassoPagination-button"
         data-component-type="button"
         tabindex="0"
@@ -79,6 +82,7 @@ exports[`Pagination renders 1`] = `
         </span>
       </button>
       <button
+        aria-current="false"
         class="MuiButtonBase-root PicassoButton-small PicassoButton-secondary PicassoButton-root PicassoPaginationButton-root PicassoPagination-button"
         data-component-type="button"
         tabindex="0"
@@ -91,6 +95,7 @@ exports[`Pagination renders 1`] = `
         </span>
       </button>
       <button
+        aria-current="false"
         class="MuiButtonBase-root PicassoButton-small PicassoButton-secondary PicassoButton-root PicassoPaginationButton-root PicassoPagination-button"
         data-component-type="button"
         tabindex="0"
@@ -112,6 +117,7 @@ exports[`Pagination renders 1`] = `
         </p>
       </div>
       <button
+        aria-current="false"
         class="MuiButtonBase-root PicassoButton-small PicassoButton-secondary PicassoButton-root PicassoPaginationButton-root PicassoPagination-button"
         data-component-type="button"
         tabindex="0"
@@ -162,6 +168,7 @@ exports[`Pagination renders disabled 1`] = `
         </span>
       </button>
       <button
+        aria-current="false"
         class="MuiButtonBase-root PicassoButton-disabled PicassoButton-small PicassoButton-secondary PicassoButton-root PicassoPaginationButton-root PicassoPagination-button Mui-disabled"
         data-component-type="button"
         disabled=""
@@ -184,6 +191,7 @@ exports[`Pagination renders disabled 1`] = `
         </p>
       </div>
       <button
+        aria-current="false"
         class="MuiButtonBase-root PicassoButton-disabled PicassoButton-small PicassoButton-secondary PicassoButton-root PicassoPaginationButton-root PicassoPagination-button Mui-disabled"
         data-component-type="button"
         disabled=""
@@ -197,6 +205,7 @@ exports[`Pagination renders disabled 1`] = `
         </span>
       </button>
       <button
+        aria-current="false"
         class="MuiButtonBase-root PicassoButton-disabled PicassoButton-small PicassoButton-secondary PicassoButton-root PicassoPaginationButton-root PicassoPagination-button Mui-disabled"
         data-component-type="button"
         disabled=""
@@ -224,6 +233,7 @@ exports[`Pagination renders disabled 1`] = `
         </span>
       </button>
       <button
+        aria-current="false"
         class="MuiButtonBase-root PicassoButton-disabled PicassoButton-small PicassoButton-secondary PicassoButton-root PicassoPaginationButton-root PicassoPagination-button Mui-disabled"
         data-component-type="button"
         disabled=""
@@ -237,6 +247,7 @@ exports[`Pagination renders disabled 1`] = `
         </span>
       </button>
       <button
+        aria-current="false"
         class="MuiButtonBase-root PicassoButton-disabled PicassoButton-small PicassoButton-secondary PicassoButton-root PicassoPaginationButton-root PicassoPagination-button Mui-disabled"
         data-component-type="button"
         disabled=""
@@ -259,6 +270,7 @@ exports[`Pagination renders disabled 1`] = `
         </p>
       </div>
       <button
+        aria-current="false"
         class="MuiButtonBase-root PicassoButton-disabled PicassoButton-small PicassoButton-secondary PicassoButton-root PicassoPaginationButton-root PicassoPagination-button Mui-disabled"
         data-component-type="button"
         disabled=""
diff --git a/packages/picasso/src/PaginationButton/PaginationButton.tsx b/packages/picasso/src/PaginationButton/PaginationButton.tsx
index bf6619e715..0a6d576257 100644
--- a/packages/picasso/src/PaginationButton/PaginationButton.tsx
+++ b/packages/picasso/src/PaginationButton/PaginationButton.tsx
@@ -26,7 +26,7 @@ const PaginationButton = (props: Props) => {
   return (
     <Button
       className={cx(classes.root, { [classes.active]: isActive }, className)}
-      aria-current={isActive ? true : undefined}
+      aria-current={isActive}
       active={isActive}
       disabled={disabled}
       onClick={() => onClick(page)}

From ab75e2d101b3bacab6262bf00a6e2ef7a4e278d3 Mon Sep 17 00:00:00 2001
From: OleksandrNechai <oleksandr.nechai@toptal.com>
Date: Wed, 27 Dec 2023 10:21:17 +0100
Subject: [PATCH 3/4] Add changeset

---
 .changeset/lemon-chairs-compare.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .changeset/lemon-chairs-compare.md

diff --git a/.changeset/lemon-chairs-compare.md b/.changeset/lemon-chairs-compare.md
new file mode 100644
index 0000000000..69dfb13f68
--- /dev/null
+++ b/.changeset/lemon-chairs-compare.md
@@ -0,0 +1,5 @@
+---
+'@toptal/picasso': patch
+---
+
+- add aria-current to Pagination buttons

From aefaf785770b77a93f8994a5209a204b4a6a4358 Mon Sep 17 00:00:00 2001
From: OleksandrNechai <oleksandr.nechai@toptal.com>
Date: Wed, 27 Dec 2023 15:23:57 +0100
Subject: [PATCH 4/4] Fix changeset

---
 .changeset/lemon-chairs-compare.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.changeset/lemon-chairs-compare.md b/.changeset/lemon-chairs-compare.md
index 69dfb13f68..4605d41125 100644
--- a/.changeset/lemon-chairs-compare.md
+++ b/.changeset/lemon-chairs-compare.md
@@ -2,4 +2,6 @@
 '@toptal/picasso': patch
 ---
 
-- add aria-current to Pagination buttons
+### Pagination
+
+- add aria-current to buttons