svelte-common 6.6.0 → 6.6.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "svelte-common",
-  "version": "6.6.0",
+  "version": "6.6.2",
   "publishConfig": {
     "access": "public"
   },
@@ -58,13 +58,13 @@
     "stylelint": "^15.10.2",
     "stylelint-config-standard": "^34.0.0",
     "svelte": "^4.2.0",
-    "testcafe": "^3.1.0",
+    "testcafe": "^3.2.0",
     "vite": "^4.4.9",
     "vite-plugin-compression2": "^0.10.3"
   },
   "optionalDependencies": {
     "mf-hosting-cloudflare": "^1.0.5",
-    "mf-hosting-frontend": "^2.0.1"
+    "mf-hosting-frontend": "^2.0.2"
   },
   "repository": {
     "type": "git",

package/src/pagination.mjs

@@ -53,9 +53,15 @@ export class Pagination {
     if (data?.subscribe) {
       this.#unsubscribeData = data.subscribe(newData => {
         this.#data = newData;
+        if (this.page > this.numberOfPages) {
+          this.page = this.numberOfPages;
+        }
       });
     } else {
       this.#data = data;
+      if (this.page > this.numberOfPages) {
+        this.page = this.numberOfPages;
+      }
     }
 
     this.fireSubscriptions();
@@ -153,7 +159,7 @@ export class Pagination {
     nav.setAttribute("aria-label", "pagination");
 
     nav.onkeyup = event => {
-      const step = (event.altKey ? 10 : 1);
+      const step = event.altKey ? 10 : 1;
 
       switch (event.key) {
         case "ArrowLeft":
@@ -231,33 +237,22 @@ export function* navigationItems(
   currentPage,
   numberOfItems = 7
 ) {
-  const pageJumps = [
-    { maxPages: 10, side: 1, edge: 2 },
-    { maxPages: 100, side: 1, edge: 2, step: 10 },
-    { maxPages: 1000, side: 1, edge: 2, step: 100 },
-    { maxPages: 10000, side: 1, edge: 2, step: 1000 },
-    { maxPages: 100000, side: 1, edge: 2, step: 10000 },
-    { maxPages: 1000000, side: 1, edge: 2, step: 100000 },
-    { maxPages: 10000000, side: 1, edge: 2, step: 1000000 }
-  ];
-
-  for (const j of pageJumps) {
-    if (numberOfPages <= j.maxPages) {
-      for (let n = 1; n <= numberOfPages; n++) {
-        if (
-          n <= j.edge ||
-          n > numberOfPages - j.edge ||
-          n % j.step === 0 ||
-          (n < currentPage + j.side && n > currentPage - j.side)
-        ) {
-          yield n;
-        }
-      }
-      break;
+  const edge = 2;
+  const side = 1;
+  const step = numberOfPages >= 100 ? Math.floor(numberOfPages / 10) : undefined;
+
+  for (let n = 1; n <= numberOfPages; n++) {
+    if (
+      n <= edge ||
+      n > numberOfPages - edge ||
+      n % step === 0 ||
+      (n < currentPage + side && n > currentPage - side)
+    ) {
+      yield n;
     }
   }
-  
-/*
+
+  /*  
   const pageJumps = [
     { maxPages: 10, stepping: [1] },
     { maxPages: 100, stepping: [1, 10] },