Merge pull request #2236 from dxc-technology/fix_paginator_display

 Fix to `itemsPerPageOptions` not affecting `DxcPaginator` display condition

Author: Jialecl

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>
   );
 };

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>
   );
 };