fix: pagination page range

chakra-ui · Jan 3, 2025 · ee914e9 · ee914e9
1 parent 792939f
commit ee914e9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/.changeset/rich-hotels-cough.md b/.changeset/rich-hotels-cough.md
@@ -0,0 +1,5 @@
+---
+"@zag-js/pagination": patch
+---
+
+Fix issue where page range could return incorrect `end` value when `pageSize` is greater than `count`
diff --git a/packages/machines/pagination/src/pagination.machine.ts b/packages/machines/pagination/src/pagination.machine.ts
@@ -40,7 +40,7 @@ export function machine(userContext: UserDefinedContext) {
         nextPage: (ctx) => (ctx.page === ctx.totalPages ? null : ctx.page + 1),
         pageRange: (ctx) => {
           const start = (ctx.page - 1) * ctx.pageSize
-          const end = start + ctx.pageSize
+          const end = Math.min(start + ctx.pageSize, ctx.count)
           return { start, end }
         },
         isValidPage: (ctx) => ctx.page >= 1 && ctx.page <= ctx.totalPages,