Skip to content

Revert "fix(unity-react-core): updating the page numbers and ellipses used in…" #1496

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 19, 2025
Merged

Revert "fix(unity-react-core): updating the page numbers and ellipses used in…" #1496

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 4 additions & 25 deletions packages/unity-react-core/src/components/Pagination/Pagination.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,16 +62,15 @@ export const Pagination = ({

const renderPages = () => {
// Set the ranges to be shown in the pagination
const displayMinimumPages = 2;
const lowerRangeLimit = iff(
selectedPage === totalPages - 1,
1,
selectedPage === totalPages ? 2 : 1
2,
selectedPage === totalPages ? 3 : 1
);
const upperRangeLimit = iff(
selectedPage === 1,
2,
selectedPage === 2 ? 1 : 1
3,
selectedPage === 2 ? 2 : 1
);
const lowerRange = createRange(
selectedPage - lowerRangeLimit,
Expand All @@ -97,16 +96,6 @@ export const Pagination = ({
1
</PageItem>
)}
{selectedPage > (totalPages - displayMinimumPages ) && (
<PageItem
isClickeable
ariaLabel={`Page 2 of ${totalPages}`}
selectedPage={selectedPage === 2}
onClick={e => handleChangePage(e, 2)}
>
2
</PageItem>
)}
{renderedPages[0] > 2 && <PageItem ellipses>...</PageItem>}
{renderedPages.map(page => (
<PageItem
Expand All @@ -122,16 +111,6 @@ export const Pagination = ({
{renderedPages[renderedPages.length - 1] < totalPages - 1 && (
<PageItem ellipses>...</PageItem>
)}
{selectedPage < displayMinimumPages + 1 && (
<PageItem
isClickeable
ariaLabel={`Page ${totalPages-1} of ${totalPages}`}
selectedPage={selectedPage === totalPages - 1}
onClick={e => handleChangePage(e, totalPages - 1)}
>
{totalPages - 1}
</PageItem>
)}
{renderedPages[renderedPages.length - 1] !== totalPages && (
<PageItem
isClickeable
Expand Down