From 6c5311c9db3cedd0db3f51e51f40df084da19699 Mon Sep 17 00:00:00 2001
From: Enrique Moreno <enrique.moreno@dxc.com>
Date: Fri, 30 May 2025 14:50:14 +0200
Subject: [PATCH] Added fix to address problem with itemsPerPageOptions not
 affecting paginator

---
 packages/lib/src/data-grid/DataGrid.tsx       | 25 +++++++++++--------
 .../src/resultset-table/ResultsetTable.tsx    | 25 ++++++++++---------
 2 files changed, 27 insertions(+), 23 deletions(-)

diff --git a/packages/lib/src/data-grid/DataGrid.tsx b/packages/lib/src/data-grid/DataGrid.tsx
index a21c4ffa7..7a3b208fb 100644
--- a/packages/lib/src/data-grid/DataGrid.tsx
+++ b/packages/lib/src/data-grid/DataGrid.tsx
@@ -414,17 +414,20 @@ const DxcDataGrid = ({
         summaryRowHeight={colHeight}
         className="fill-grid"
       />
-      {showPaginator && (totalItems ?? rows.length) > itemsPerPage && (
-        <DxcPaginator
-          totalItems={totalItems ?? rows.length}
-          itemsPerPage={itemsPerPage}
-          itemsPerPageOptions={itemsPerPageOptions}
-          itemsPerPageFunction={itemsPerPageFunction}
-          currentPage={page}
-          showGoToPage={showGoToPage}
-          onPageChange={goToPage}
-        />
-      )}
+
+      {showPaginator &&
+        (itemsPerPageOptions?.some((itemsPerPage) => (totalItems ?? rows.length) > itemsPerPage) ||
+          (totalItems ?? rows.length) > itemsPerPage) && (
+          <DxcPaginator
+            totalItems={totalItems ?? rows.length}
+            itemsPerPage={itemsPerPage}
+            itemsPerPageOptions={itemsPerPageOptions}
+            itemsPerPageFunction={itemsPerPageFunction}
+            currentPage={page}
+            showGoToPage={showGoToPage}
+            onPageChange={goToPage}
+          />
+        )}
     </DataGridContainer>
   );
 };
diff --git a/packages/lib/src/resultset-table/ResultsetTable.tsx b/packages/lib/src/resultset-table/ResultsetTable.tsx
index 7055d3709..f32ef1921 100644
--- a/packages/lib/src/resultset-table/ResultsetTable.tsx
+++ b/packages/lib/src/resultset-table/ResultsetTable.tsx
@@ -150,18 +150,19 @@ const DxcResultsetTable = ({
           ))}
         </tbody>
       </DxcTable>
-      {!hidePaginator && rows.length > itemsPerPage && (
-        <DxcPaginator
-          currentPage={page}
-          itemsPerPage={itemsPerPage}
-          itemsPerPageFunction={itemsPerPageFunction}
-          itemsPerPageOptions={itemsPerPageOptions}
-          onPageChange={goToPage}
-          showGoToPage={showGoToPage}
-          tabIndex={tabIndex}
-          totalItems={rows.length}
-        />
-      )}
+      {!hidePaginator &&
+        (itemsPerPageOptions?.some((itemsPerPage) => rows.length > itemsPerPage) || rows.length > itemsPerPage) && (
+          <DxcPaginator
+            currentPage={page}
+            itemsPerPage={itemsPerPage}
+            itemsPerPageFunction={itemsPerPageFunction}
+            itemsPerPageOptions={itemsPerPageOptions}
+            onPageChange={goToPage}
+            showGoToPage={showGoToPage}
+            tabIndex={tabIndex}
+            totalItems={rows.length}
+          />
+        )}
     </ResultsetTableContainer>
   );
 };