From 1bc512997e859c95990f6ff6ca64bb848643750a Mon Sep 17 00:00:00 2001
From: 1Copenut <trevor.pierce@elastic.co>
Date: Mon, 11 Sep 2023 10:01:01 -0500
Subject: [PATCH 1/8] Added checks for aria-current to table pagination button
 and context menu.

---
 src/components/pagination/pagination_button.tsx            | 1 +
 src/components/table/table_pagination/table_pagination.tsx | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/src/components/pagination/pagination_button.tsx b/src/components/pagination/pagination_button.tsx
index a11d9a3456d..cec5804c09a 100644
--- a/src/components/pagination/pagination_button.tsx
+++ b/src/components/pagination/pagination_button.tsx
@@ -77,6 +77,7 @@ export const EuiPaginationButton: FunctionComponent<Props> = ({
           {(shortPageString: string) => (
             <EuiButtonEmpty
               aria-label={totalPages ? longPageString : shortPageString}
+              aria-current={isActive ? 'true' : undefined}
               {...(props as EuiButtonEmptyProps)}
             >
               {pageNumber}
diff --git a/src/components/table/table_pagination/table_pagination.tsx b/src/components/table/table_pagination/table_pagination.tsx
index 9d80976a178..612c1393e97 100644
--- a/src/components/table/table_pagination/table_pagination.tsx
+++ b/src/components/table/table_pagination/table_pagination.tsx
@@ -121,6 +121,9 @@ export const EuiTablePagination: FunctionComponent<EuiTablePaginationProps> = (
             onChangeItemsPerPage?.(itemsPerPageOption);
           }}
           data-test-subj={`tablePagination-${itemsPerPageOption}-rows`}
+          aria-current={
+            itemsPerPageOption === itemsPerPage ? 'true' : undefined
+          }
         >
           {itemsPerPageOption === 0 ? (
             <EuiI18n

From f8b416fa7c65a558d867a9668124c6673eebdd25 Mon Sep 17 00:00:00 2001
From: 1Copenut <trevor.pierce@elastic.co>
Date: Wed, 13 Sep 2023 16:16:11 -0500
Subject: [PATCH 2/8] Refactoring current item checks into a single function.

---
 .../table/table_pagination/table_pagination.tsx       | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/components/table/table_pagination/table_pagination.tsx b/src/components/table/table_pagination/table_pagination.tsx
index 612c1393e97..a1f2a413fe4 100644
--- a/src/components/table/table_pagination/table_pagination.tsx
+++ b/src/components/table/table_pagination/table_pagination.tsx
@@ -84,6 +84,12 @@ export const EuiTablePagination: FunctionComponent<EuiTablePaginationProps> = (
     setIsPopoverOpen(false);
   }, []);
 
+  const setActiveProps = (itemsPerPageOption: number) => {
+    return itemsPerPageOption === itemsPerPage
+      ? { icon: 'check', 'aria-current': 'true' as const }
+      : { icon: 'empty', 'aria-current': undefined };
+  };
+
   const button = (
     <EuiButtonEmpty
       size="xs"
@@ -114,16 +120,13 @@ export const EuiTablePagination: FunctionComponent<EuiTablePaginationProps> = (
     () =>
       itemsPerPageOptions.map((itemsPerPageOption) => (
         <EuiContextMenuItem
+          {...setActiveProps(itemsPerPageOption)}
           key={itemsPerPageOption}
-          icon={itemsPerPageOption === itemsPerPage ? 'check' : 'empty'}
           onClick={() => {
             closePopover();
             onChangeItemsPerPage?.(itemsPerPageOption);
           }}
           data-test-subj={`tablePagination-${itemsPerPageOption}-rows`}
-          aria-current={
-            itemsPerPageOption === itemsPerPage ? 'true' : undefined
-          }
         >
           {itemsPerPageOption === 0 ? (
             <EuiI18n

From 52a9c4219ac7acbeff06b12c95321b6dbb7656ea Mon Sep 17 00:00:00 2001
From: 1Copenut <trevor.pierce@elastic.co>
Date: Wed, 13 Sep 2023 16:31:45 -0500
Subject: [PATCH 3/8] Updating snapshot and adding CHANGELOG.

---
 .../__snapshots__/table_pagination.test.tsx.snap                 | 1 +
 upcoming_changelogs/7186.md                                      | 1 +
 2 files changed, 2 insertions(+)
 create mode 100644 upcoming_changelogs/7186.md

diff --git a/src/components/table/table_pagination/__snapshots__/table_pagination.test.tsx.snap b/src/components/table/table_pagination/__snapshots__/table_pagination.test.tsx.snap
index 9e5da8681c2..b67bbbea4ce 100644
--- a/src/components/table/table_pagination/__snapshots__/table_pagination.test.tsx.snap
+++ b/src/components/table/table_pagination/__snapshots__/table_pagination.test.tsx.snap
@@ -235,6 +235,7 @@ exports[`EuiTablePagination renders 1`] = `
           >
             <div>
               <button
+                aria-current="true"
                 class="euiContextMenuItem"
                 data-test-subj="tablePagination-10-rows"
                 type="button"
diff --git a/upcoming_changelogs/7186.md b/upcoming_changelogs/7186.md
new file mode 100644
index 00000000000..2cca20e7c26
--- /dev/null
+++ b/upcoming_changelogs/7186.md
@@ -0,0 +1 @@
+- Added `aria-current` attribute to `EuiTable` pagination

From fdf70d9fd79191044cb4d639bb0e96a2a108487d Mon Sep 17 00:00:00 2001
From: 1Copenut <trevor.pierce@elastic.co>
Date: Wed, 13 Sep 2023 16:32:08 -0500
Subject: [PATCH 4/8] Adding setActiveProps to useMemo dep array.

---
 .../table/table_pagination/table_pagination.tsx           | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/components/table/table_pagination/table_pagination.tsx b/src/components/table/table_pagination/table_pagination.tsx
index a1f2a413fe4..0ee71ab5d3e 100644
--- a/src/components/table/table_pagination/table_pagination.tsx
+++ b/src/components/table/table_pagination/table_pagination.tsx
@@ -142,7 +142,13 @@ export const EuiTablePagination: FunctionComponent<EuiTablePaginationProps> = (
           )}
         </EuiContextMenuItem>
       )),
-    [itemsPerPageOptions, itemsPerPage, onChangeItemsPerPage, closePopover]
+    [
+      itemsPerPageOptions,
+      itemsPerPage,
+      onChangeItemsPerPage,
+      closePopover,
+      setActiveProps,
+    ]
   );
 
   const itemsPerPagePopover = (

From 5afd8d57d5c1a9f618be7cddf2e31292c541b549 Mon Sep 17 00:00:00 2001
From: 1Copenut <trevor.pierce@elastic.co>
Date: Wed, 13 Sep 2023 16:47:13 -0500
Subject: [PATCH 5/8] Removing itemsPerPage from useMemo dep array.

---
 .../table/table_pagination/table_pagination.tsx           | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/components/table/table_pagination/table_pagination.tsx b/src/components/table/table_pagination/table_pagination.tsx
index 0ee71ab5d3e..3343a3974d5 100644
--- a/src/components/table/table_pagination/table_pagination.tsx
+++ b/src/components/table/table_pagination/table_pagination.tsx
@@ -142,13 +142,7 @@ export const EuiTablePagination: FunctionComponent<EuiTablePaginationProps> = (
           )}
         </EuiContextMenuItem>
       )),
-    [
-      itemsPerPageOptions,
-      itemsPerPage,
-      onChangeItemsPerPage,
-      closePopover,
-      setActiveProps,
-    ]
+    [itemsPerPageOptions, onChangeItemsPerPage, closePopover, setActiveProps]
   );
 
   const itemsPerPagePopover = (

From 42226b039f6e1c6e30c701e4a37265ca77df633e Mon Sep 17 00:00:00 2001
From: Trevor Pierce <1Copenut@users.noreply.github.com>
Date: Thu, 14 Sep 2023 08:06:01 -0500
Subject: [PATCH 6/8] Update upcoming_changelogs/7186.md

Co-authored-by: Cee Chen <549407+cee-chen@users.noreply.github.com>
---
 upcoming_changelogs/7186.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/upcoming_changelogs/7186.md b/upcoming_changelogs/7186.md
index 2cca20e7c26..2be98f209c7 100644
--- a/upcoming_changelogs/7186.md
+++ b/upcoming_changelogs/7186.md
@@ -1 +1,3 @@
-- Added `aria-current` attribute to `EuiTable` pagination
+**Accessibility**
+
+- Added `aria-current` attribute to `EuiTablePagination`

From d9620547b6bbb0e4eb425caa95d4efdb9f8889e0 Mon Sep 17 00:00:00 2001
From: 1Copenut <trevor.pierce@elastic.co>
Date: Thu, 14 Sep 2023 08:20:29 -0500
Subject: [PATCH 7/8] Refactoring aria-current and icon to simpler ternary from
 util func.

---
 src/components/pagination/pagination_button.tsx     |  1 -
 .../table/table_pagination/table_pagination.tsx     | 13 +++++--------
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/components/pagination/pagination_button.tsx b/src/components/pagination/pagination_button.tsx
index cec5804c09a..a11d9a3456d 100644
--- a/src/components/pagination/pagination_button.tsx
+++ b/src/components/pagination/pagination_button.tsx
@@ -77,7 +77,6 @@ export const EuiPaginationButton: FunctionComponent<Props> = ({
           {(shortPageString: string) => (
             <EuiButtonEmpty
               aria-label={totalPages ? longPageString : shortPageString}
-              aria-current={isActive ? 'true' : undefined}
               {...(props as EuiButtonEmptyProps)}
             >
               {pageNumber}
diff --git a/src/components/table/table_pagination/table_pagination.tsx b/src/components/table/table_pagination/table_pagination.tsx
index 3343a3974d5..9557e913f41 100644
--- a/src/components/table/table_pagination/table_pagination.tsx
+++ b/src/components/table/table_pagination/table_pagination.tsx
@@ -84,12 +84,6 @@ export const EuiTablePagination: FunctionComponent<EuiTablePaginationProps> = (
     setIsPopoverOpen(false);
   }, []);
 
-  const setActiveProps = (itemsPerPageOption: number) => {
-    return itemsPerPageOption === itemsPerPage
-      ? { icon: 'check', 'aria-current': 'true' as const }
-      : { icon: 'empty', 'aria-current': undefined };
-  };
-
   const button = (
     <EuiButtonEmpty
       size="xs"
@@ -120,7 +114,10 @@ export const EuiTablePagination: FunctionComponent<EuiTablePaginationProps> = (
     () =>
       itemsPerPageOptions.map((itemsPerPageOption) => (
         <EuiContextMenuItem
-          {...setActiveProps(itemsPerPageOption)}
+          icon={itemsPerPageOption === itemsPerPage ? 'check' : 'empty'}
+          aria-current={
+            itemsPerPageOption === itemsPerPage ? 'true' : undefined
+          }
           key={itemsPerPageOption}
           onClick={() => {
             closePopover();
@@ -142,7 +139,7 @@ export const EuiTablePagination: FunctionComponent<EuiTablePaginationProps> = (
           )}
         </EuiContextMenuItem>
       )),
-    [itemsPerPageOptions, onChangeItemsPerPage, closePopover, setActiveProps]
+    [itemsPerPageOptions, itemsPerPage, onChangeItemsPerPage, closePopover]
   );
 
   const itemsPerPagePopover = (

From 0a1e8c6b22c763fa57045a311c04935d4d19ee4b Mon Sep 17 00:00:00 2001
From: 1Copenut <trevor.pierce@elastic.co>
Date: Thu, 14 Sep 2023 11:51:23 -0500
Subject: [PATCH 8/8] Moving key to first prop declaration for clarity.

---
 src/components/table/table_pagination/table_pagination.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/table/table_pagination/table_pagination.tsx b/src/components/table/table_pagination/table_pagination.tsx
index 9557e913f41..40b9a80814f 100644
--- a/src/components/table/table_pagination/table_pagination.tsx
+++ b/src/components/table/table_pagination/table_pagination.tsx
@@ -114,11 +114,11 @@ export const EuiTablePagination: FunctionComponent<EuiTablePaginationProps> = (
     () =>
       itemsPerPageOptions.map((itemsPerPageOption) => (
         <EuiContextMenuItem
+          key={itemsPerPageOption}
           icon={itemsPerPageOption === itemsPerPage ? 'check' : 'empty'}
           aria-current={
             itemsPerPageOption === itemsPerPage ? 'true' : undefined
           }
-          key={itemsPerPageOption}
           onClick={() => {
             closePopover();
             onChangeItemsPerPage?.(itemsPerPageOption);