Fix of back and next page values (#537)

solidjs-community · Nov 3, 2023 · 0ec56b0 · 0ec56b0
2 parents 4e82785 + 0b589d4
commit 0ec56b0
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 2 deletions.
diff --git a/.changeset/plenty-teachers-drum.md b/.changeset/plenty-teachers-drum.md
@@ -0,0 +1,5 @@
+---
+"@solid-primitives/pagination": patch
+---
+
+Fix of back and next page values
diff --git a/packages/pagination/src/index.ts b/packages/pagination/src/index.ts
@@ -174,7 +174,7 @@ export const createPagination = (
     {
       disabled: { get: () => page() <= 1, set: noop, enumerable: true },
       children: { get: () => opts().prevContent, set: noop, enumerable: true },
-      page: { get: () => Math.min(1, page() - 1), enumerable: false },
+      page: { get: () => Math.max(1, page() - 1), enumerable: false },
     },
   );
   const next = Object.defineProperties(
@@ -187,7 +187,7 @@ export const createPagination = (
     {
       disabled: { get: () => page() >= opts().pages, set: noop, enumerable: true },
       children: { get: () => opts().nextContent, set: noop, enumerable: true },
-      page: { get: () => Math.max(opts().pages, page() + 1), enumerable: false },
+      page: { get: () => Math.min(opts().pages, page() + 1), enumerable: false },
     },
   );
   const last = Object.defineProperties(

diff --git a/packages/pagination/test/index.test.ts b/packages/pagination/test/index.test.ts
@@ -80,6 +80,19 @@ describe("createPagination", () => {
       expect(updatedPages.every((page, index) => Object.is(page, initialPages[index]))).toBe(true);
       dispose();
     }));
+
+    test("createPagination next back", () => {
+      createRoot(dispose => {
+        const [paginationProps, page, setPage] = createPagination({ pages: 100, maxPages: 1, showFirst: false, initialPage: 3 });
+        var back = paginationProps()[0]
+        var next = paginationProps()[2]
+
+        expect(back?.page, "back page should be 2").toStrictEqual(2)
+        expect(next?.page, "next page should be 4").toStrictEqual(4)
+
+        dispose();
+      });
+    });
 });
 
 //@ts-ignore