Skip to content
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.

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

fix: pagination ellipsis #99

Merged
merged 1 commit into from
May 14, 2024
Merged
Changes from all commits
Commits
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
14 changes: 7 additions & 7 deletions lib/styled/Pagination.js
Original file line number Diff line number Diff line change
Expand Up @@ -116,11 +116,7 @@ export default function Pagination({
{itemRender(targetPage, "page", <span>{targetPage}</span>)}
</Item>
);
const makeEllipsisItem = (targetPage, keyName) => {
return (
Math.abs(page - targetPage) > 1 && <Ellipsis key={keyName}>...</Ellipsis>
);
};

const items = useMemo(() => {
// always display items
const firstPageItem = makePageItem(1);
Expand All @@ -133,8 +129,12 @@ export default function Pagination({

const currentPageItem = page > 1 && page < totalPages && makePageItem(page);

const prevEllipsisItem = makeEllipsisItem(1, "prev-ellipsis");
const nextEllipsisItem = makeEllipsisItem(totalPages, "next-ellipsis");
const prevEllipsisItem = prev - 1 > 1 && (
<Ellipsis key="prev-ellipsis">...</Ellipsis>
);
const nextEllipsisItem = totalPages - next > 1 && (
<Ellipsis key="next-ellipsis">...</Ellipsis>
);

return [
firstPageItem,
Expand Down