Merge pull request #16 from titanve/testingbranch

fix: improved paging
titanve · Feb 27, 2018 · 0451fe8 · 0451fe8
2 parents 276267d + 8af3dcb
commit 0451fe8
Show file tree

Hide file tree

Showing 2 changed files with 51 additions and 12 deletions.
diff --git a/src/index.test.js b/src/index.test.js
@@ -210,4 +210,24 @@ describe("getIniPageofArray", () => {
 
     expect(actual).toBe(4);
   });
+
+  it("should return 2 given page 5 nopages < pagesspan", () => {
+    let nopages = 5;
+    let pagesspan = 4;
+    let page = 5;
+    let inipagearray = 1;
+    let actual = getIniPageofArray(nopages, pagesspan, page, inipagearray);
+
+    expect(actual).toBe(2);
+  });
+
+  it("should return 2 given page 4 nopages < pagesspan", () => {
+    let nopages = 5;
+    let pagesspan = 4;
+    let page = 4;
+    let inipagearray = 1;
+    let actual = getIniPageofArray(nopages, pagesspan, page, inipagearray);
+
+    expect(actual).toBe(2);
+  });
 });
diff --git a/src/react-next-paging.js b/src/react-next-paging.js
@@ -31,28 +31,47 @@ export const getIniPageofArray = (nopages, pagesspan, page, inipagearray) => {
     if (page <= nopages) {
       // let pagesforarray = pagesspan;
       let halfspan = getHalfPagesArray(pagesspan);
-      if (page > halfspan + inipagearray) {
+      if (page >= halfspan + inipagearray) {
         // if (isNoEven(page)) {
         // return page - 4; ///  1 2 3 4 5 6 7 8 9 10
-        return page - halfspan > 0 ? page - halfspan : 1;
+        // return page - halfspan > 0 ? page - halfspan : 1;
+        // return Math.abs(page - halfspan);
+        let newini = page - halfspan > 0 ? page - halfspan : 1;
+        if (newini + pagesspan <= nopages) {
+          return newini;
+        } else {
+          // let diffspan = newini + pagesspan - nopages;
+          // return page - diffspan;
+          return nopages - pagesspan + 1;
+        }
         // } else {
         //   // return page - 5;
         //   return page - halfspan - 1 > 0 ? page - halfspan - 1 : 1;
         // }
       } else {
-        // if (isNoEven(page)) {
-        // return inipagearray - 4; ///  1 2 3 4 5 6 7 8 9 10
-        return inipagearray - halfspan > 0 ? inipagearray - halfspan : 1;
-        // } else {
-        //   // return inipagearray - 5;
-        //   return inipagearray - halfspan - 1 > 0
-        //     ? inipagearray - halfspan - 1
-        //     : 1;
-        // }
+        if (page > 0) {
+          return page - halfspan > 0 ? page - halfspan : 1;
+        } else {
+          // return inipagearray;
+          return 1;
+        }
       }
+      // else {
+      // if (isNoEven(page)) {
+      // return inipagearray - 4; ///  1 2 3 4 5 6 7 8 9 10
+      // return inipagearray - halfspan > 0 ? inipagearray - halfspan : 1;
+      // return Math.abs(page - halfspan);
+      // return page - halfspan > 0 ? page - halfspan : 1;
+      // } else {
+      //   // return inipagearray - 5;
+      //   return inipagearray - halfspan - 1 > 0
+      //     ? inipagearray - halfspan - 1
+      //     : 1;
+      // }
+      // }
     }
   }
-  return 1;
+  return inipagearray;
 };
 
 class ReactNextPaging extends React.Component {