Skip to content

Fix pagination ellipsis item count shift #695

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
zombieJ merged 1 commit into from
Jun 9, 2026
+156 −314
Merged

Fix pagination ellipsis item count shift #695

Show file tree
Hide file tree
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
18 changes: 16 additions & 2 deletions src/Pagination.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -486,13 +486,27 @@ const Pagination: React.FC<PaginationProps> = (props) => {
left = allPages - pageBufferSize * 2;
}

const hasJumpPrev =
!!jumpPrev && current - 1 >= pageBufferSize * 2 && current !== 1 + 2;
const hasJumpNext =
!!jumpNext &&
allPages - current >= pageBufferSize * 2 &&
current !== allPages - 2;

if (!showLessItems && hasJumpPrev && right !== allPages) {
left += 1;
}
if (!showLessItems && hasJumpNext && left !== 1) {
right -= 1;
}

for (let i = left; i <= right; i += 1) {
pagerList.push(
<Pager {...pagerProps} key={i} page={i} active={current === i} />,
);
}

if (current - 1 >= pageBufferSize * 2 && current !== 1 + 2) {
if (hasJumpPrev) {
pagerList[0] = React.cloneElement<PagerProps>(pagerList[0], {
className: clsx(
`${prefixCls}-item-after-jump-prev`,
Expand All @@ -503,7 +517,7 @@ const Pagination: React.FC<PaginationProps> = (props) => {
pagerList.unshift(jumpPrev);
}

if (allPages - current >= pageBufferSize * 2 && current !== allPages - 2) {
if (hasJumpNext) {
const lastOne = pagerList[pagerList.length - 1];
pagerList[pagerList.length - 1] = React.cloneElement(lastOne, {
className: clsx(
Expand Down
104 changes: 8 additions & 96 deletions tests/__snapshots__/demo.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1550,18 +1550,7 @@ exports[`Example jumper 1`] = `
/>
</li>
<li
class="rc-pagination-item rc-pagination-item-3 rc-pagination-item-after-jump-prev"
tabindex="0"
title="3"
>
<a
rel="nofollow"
>
3
</a>
</li>
<li
class="rc-pagination-item rc-pagination-item-4"
class="rc-pagination-item rc-pagination-item-4 rc-pagination-item-after-jump-prev"
tabindex="0"
title="4"
>
Expand All @@ -1583,7 +1572,7 @@ exports[`Example jumper 1`] = `
</a>
</li>
<li
class="rc-pagination-item rc-pagination-item-6"
class="rc-pagination-item rc-pagination-item-6 rc-pagination-item-before-jump-next"
tabindex="0"
title="6"
>
Expand All @@ -1593,17 +1582,6 @@ exports[`Example jumper 1`] = `
6
</a>
</li>
<li
class="rc-pagination-item rc-pagination-item-7 rc-pagination-item-before-jump-next"
tabindex="0"
title="7"
>
<a
rel="nofollow"
>
7
</a>
</li>
<li
class="rc-pagination-jump-next"
tabindex="0"
Expand Down Expand Up @@ -1735,18 +1713,7 @@ exports[`Example jumper 1`] = `
/>
</li>
<li
class="rc-pagination-item rc-pagination-item-3 rc-pagination-item-after-jump-prev"
tabindex="0"
title="3"
>
<a
rel="nofollow"
>
3
</a>
</li>
<li
class="rc-pagination-item rc-pagination-item-4"
class="rc-pagination-item rc-pagination-item-4 rc-pagination-item-after-jump-prev"
tabindex="0"
title="4"
>
Expand All @@ -1768,7 +1735,7 @@ exports[`Example jumper 1`] = `
</a>
</li>
<li
class="rc-pagination-item rc-pagination-item-6"
class="rc-pagination-item rc-pagination-item-6 rc-pagination-item-before-jump-next"
tabindex="0"
title="6"
>
Expand All @@ -1778,17 +1745,6 @@ exports[`Example jumper 1`] = `
6
</a>
</li>
<li
class="rc-pagination-item rc-pagination-item-7 rc-pagination-item-before-jump-next"
tabindex="0"
title="7"
>
<a
rel="nofollow"
>
7
</a>
</li>
<li
class="rc-pagination-jump-next"
tabindex="0"
Expand Down Expand Up @@ -2097,18 +2053,7 @@ exports[`Example jumperWithGoButton 1`] = `
/>
</li>
<li
class="rc-pagination-item rc-pagination-item-3 rc-pagination-item-after-jump-prev"
tabindex="0"
title="3"
>
<a
rel="nofollow"
>
3
</a>
</li>
<li
class="rc-pagination-item rc-pagination-item-4"
class="rc-pagination-item rc-pagination-item-4 rc-pagination-item-after-jump-prev"
tabindex="0"
title="4"
>
Expand All @@ -2130,7 +2075,7 @@ exports[`Example jumperWithGoButton 1`] = `
</a>
</li>
<li
class="rc-pagination-item rc-pagination-item-6"
class="rc-pagination-item rc-pagination-item-6 rc-pagination-item-before-jump-next"
tabindex="0"
title="6"
>
Expand All @@ -2140,17 +2085,6 @@ exports[`Example jumperWithGoButton 1`] = `
6
</a>
</li>
<li
class="rc-pagination-item rc-pagination-item-7 rc-pagination-item-before-jump-next"
tabindex="0"
title="7"
>
<a
rel="nofollow"
>
7
</a>
</li>
<li
class="rc-pagination-jump-next"
tabindex="0"
Expand Down Expand Up @@ -2639,18 +2573,7 @@ exports[`Example locale 1`] = `
/>
</li>
<li
class="rc-pagination-item rc-pagination-item-3 rc-pagination-item-after-jump-prev"
tabindex="0"
title="3"
>
<a
rel="nofollow"
>
3
</a>
</li>
<li
class="rc-pagination-item rc-pagination-item-4"
class="rc-pagination-item rc-pagination-item-4 rc-pagination-item-after-jump-prev"
tabindex="0"
title="4"
>
Expand All @@ -2672,7 +2595,7 @@ exports[`Example locale 1`] = `
</a>
</li>
<li
class="rc-pagination-item rc-pagination-item-6"
class="rc-pagination-item rc-pagination-item-6 rc-pagination-item-before-jump-next"
tabindex="0"
title="6"
>
Expand All @@ -2682,17 +2605,6 @@ exports[`Example locale 1`] = `
6
</a>
</li>
<li
class="rc-pagination-item rc-pagination-item-7 rc-pagination-item-before-jump-next"
tabindex="0"
title="7"
>
<a
rel="nofollow"
>
7
</a>
</li>
<li
class="rc-pagination-jump-next"
tabindex="0"
Expand Down
Loading
Loading