@vc-shell/framework 1.0.273 → 1.0.274

package/CHANGELOG.md

@@ -1,3 +1,12 @@
+## [1.0.274](https://github.com/VirtoCommerce/vc-shell/compare/v1.0.273...v1.0.274) (2024-08-19)
+
+
+### Bug Fixes
+
+* **ui:** vc-pagination pagesToShow  logic refactor ([92153d8](https://github.com/VirtoCommerce/vc-shell/commit/92153d8a91990274682fca1490cdc5a9cc9e784a))
+
+
+
 ## [1.0.273](https://github.com/VirtoCommerce/vc-shell/compare/v1.0.272...v1.0.273) (2024-08-16)
 
 

package/dist/framework.js

@@ -26761,15 +26761,16 @@ const Cae = ["onClick"], Iae = ["disabled", "placeholder"], MI = /* @__PURE__ */
       (!/^\d$/.test(u.key) && !d.includes(u.key) || a.value >= n.pages && u.key !== "Backspace" && u.key !== "Delete") && u.preventDefault();
     }
     const c = re(() => {
-      const u = [];
+      const u = [], f = n.pages, h = i.value;
       if (n.pages <= 5)
-        for (let f = 1; f <= n.pages; f++)
-          u.push(f);
+        for (let m = 1; m <= n.pages; m++)
+          u.push(m);
       else {
-        i.value >= 1 && u.push(1), i.value > 3 && u.push("...");
-        for (let f = Math.max(2, i.value - 2); f <= Math.min(n.pages - 1, i.value + 2); f++)
-          u.push(f);
-        i.value < n.pages - 2 && u.push("..."), i.value <= n.pages && u.push(n.pages);
+        const m = (p, g) => {
+          for (let v = p; v <= g; v++)
+            u.push(v);
+        };
+        u.push(1), h <= 4 ? (m(2, 5), u.push("...")) : h >= f - 3 ? (u.push("..."), m(f - 4, f - 1)) : (u.push("..."), m(h - 1, h + 1), u.push("...")), u.push(n.pages);
       }
       return u;
     });

package/dist/ui/components/molecules/vc-pagination/vc-pagination.vue.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"vc-pagination.vue.d.ts","sourceRoot":"","sources":["../../../../../ui/components/molecules/vc-pagination/vc-pagination.vue.ts"],"names":[],"mappings":"AAKA,MAAM,WAAW,KAAK;IACpB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,SAAS,GAAG,SAAS,CAAC;CACjC;AAED,MAAM,WAAW,KAAK;IACpB,CAAC,KAAK,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;CAC3C;;;;;;;;;;;;;;;;;;AAiSD,wBAOG;AACH,KAAK,sBAAsB,CAAC,CAAC,IAAI,CAAC,SAAS,SAAS,GAAG,KAAK,GAAG,CAAC,CAAC;AACjE,KAAK,6BAA6B,CAAC,CAAC,IAAI;KAAG,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,GAAG,EAAE,SAAS,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG;QAAE,IAAI,EAAE,OAAO,KAAK,EAAE,QAAQ,CAAC,sBAAsB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;KAAE,GAAG;QAAE,IAAI,EAAE,OAAO,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAAC,QAAQ,EAAE,IAAI,CAAA;KAAE;CAAE,CAAC;AAC9M,KAAK,kBAAkB,CAAC,CAAC,EAAE,CAAC,IAAI;KAE1B,CAAC,IAAI,MAAM,IAAI,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,GAAG,CAAC,SAAS,MAAM,CAAC,GAAG,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG;QACxE,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC,CAAA;KACb,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;CACT,CAAC;AACN,KAAK,cAAc,CAAC,CAAC,IAAI;KAAG,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;CAAG,GAAG,EAAE,CAAC"}
+{"version":3,"file":"vc-pagination.vue.d.ts","sourceRoot":"","sources":["../../../../../ui/components/molecules/vc-pagination/vc-pagination.vue.ts"],"names":[],"mappings":"AAKA,MAAM,WAAW,KAAK;IACpB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,SAAS,GAAG,SAAS,CAAC;CACjC;AAED,MAAM,WAAW,KAAK;IACpB,CAAC,KAAK,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;CAC3C;;;;;;;;;;;;;;;;;;AA2SD,wBAOG;AACH,KAAK,sBAAsB,CAAC,CAAC,IAAI,CAAC,SAAS,SAAS,GAAG,KAAK,GAAG,CAAC,CAAC;AACjE,KAAK,6BAA6B,CAAC,CAAC,IAAI;KAAG,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,GAAG,EAAE,SAAS,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG;QAAE,IAAI,EAAE,OAAO,KAAK,EAAE,QAAQ,CAAC,sBAAsB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;KAAE,GAAG;QAAE,IAAI,EAAE,OAAO,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAAC,QAAQ,EAAE,IAAI,CAAA;KAAE;CAAE,CAAC;AAC9M,KAAK,kBAAkB,CAAC,CAAC,EAAE,CAAC,IAAI;KAE1B,CAAC,IAAI,MAAM,IAAI,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,GAAG,CAAC,SAAS,MAAM,CAAC,GAAG,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG;QACxE,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC,CAAA;KACb,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;CACT,CAAC;AACN,KAAK,cAAc,CAAC,CAAC,IAAI;KAAG,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;CAAG,GAAG,EAAE,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vc-shell/framework",
-  "version": "1.0.273",
+  "version": "1.0.274",
   "type": "module",
   "main": "./dist/framework.js",
   "types": "./dist/index.d.ts",
@@ -61,9 +61,9 @@
   "devDependencies": {
     "@types/dompurify": "^3.0.5",
     "@types/quill": "^2.0.14",
-    "@vc-shell/api-client-generator": "^1.0.273",
-    "@vc-shell/config-generator": "^1.0.273",
-    "@vc-shell/ts-config": "^1.0.273",
+    "@vc-shell/api-client-generator": "^1.0.274",
+    "@vc-shell/config-generator": "^1.0.274",
+    "@vc-shell/ts-config": "^1.0.274",
     "@vitejs/plugin-vue": "^5.0.3",
     "cypress-signalr-mock": "^1.5.0",
     "sass": "^1.69.6",

package/ui/components/molecules/vc-pagination/vc-pagination.vue

@@ -125,26 +125,36 @@ function onKeyDown(e: KeyboardEvent) {
 
 const pagesToShow = computed(() => {
   const pages = [];
-  const range = 2;
+  const range = 1;
+  const totalPages = props.pages;
+  const current = currentPage.value;
 
   if (props.pages <= 5) {
     for (let i = 1; i <= props.pages; i++) {
       pages.push(i);
     }
   } else {
-    if (currentPage.value >= 1) pages.push(1);
-    if (currentPage.value > 3) pages.push("...");
-
-    for (
-      let i = Math.max(2, currentPage.value - range);
-      i <= Math.min(props.pages - 1, currentPage.value + range);
-      i++
-    ) {
-      pages.push(i);
+    const addRange = (start: number, end: number) => {
+      for (let i = start; i <= end; i++) {
+        pages.push(i);
+      }
+    };
+
+    pages.push(1);
+
+    if (current <= 4) {
+      addRange(2, 5);
+      pages.push("...");
+    } else if (current >= totalPages - 3) {
+      pages.push("...");
+      addRange(totalPages - 4, totalPages - 1);
+    } else {
+      pages.push("...");
+      addRange(current - range, current + range);
+      pages.push("...");
     }
 
-    if (currentPage.value < props.pages - 2) pages.push("...");
-    if (currentPage.value <= props.pages) pages.push(props.pages);
+    pages.push(props.pages);
   }
 
   return pages;