diff --git a/packages/unity-react-core/src/components/Pagination/Pagination.jsx b/packages/unity-react-core/src/components/Pagination/Pagination.jsx index ee2e3f3184..c272b110b4 100644 --- a/packages/unity-react-core/src/components/Pagination/Pagination.jsx +++ b/packages/unity-react-core/src/components/Pagination/Pagination.jsx @@ -62,15 +62,16 @@ export const Pagination = ({ const renderPages = () => { // Set the ranges to be shown in the pagination + const displayMinimumPages = 2; const lowerRangeLimit = iff( selectedPage === totalPages - 1, - 2, - selectedPage === totalPages ? 3 : 1 + 1, + selectedPage === totalPages ? 2 : 1 ); const upperRangeLimit = iff( selectedPage === 1, - 3, - selectedPage === 2 ? 2 : 1 + 2, + selectedPage === 2 ? 1 : 1 ); const lowerRange = createRange( selectedPage - lowerRangeLimit, @@ -96,6 +97,16 @@ export const Pagination = ({ 1 )} + {selectedPage > (totalPages - displayMinimumPages ) && ( + handleChangePage(e, 2)} + > + 2 + + )} {renderedPages[0] > 2 && ...} {renderedPages.map(page => ( ... )} + {selectedPage < displayMinimumPages + 1 && ( + handleChangePage(e, totalPages - 1)} + > + {totalPages - 1} + + )} {renderedPages[renderedPages.length - 1] !== totalPages && (