Refactoring aria-current and icon to simpler ternary from util func.

elastic · Sep 14, 2023 · d962054 · d962054
1 parent 42226b0
commit d962054
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git 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
@@ -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 = (