svelte-common 6.14.0 → 6.15.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "svelte-common",
-  "version": "6.14.0",
+  "version": "6.15.1",
   "publishConfig": {
     "access": "public",
     "provenance": true
@@ -55,7 +55,7 @@
   "devDependencies": {
     "@semantic-release/commit-analyzer": "^13.0.0",
     "@semantic-release/exec": "^6.0.3",
-    "@semantic-release/github": "^10.1.5",
+    "@semantic-release/github": "^10.1.6",
     "@semantic-release/release-notes-generator": "^14.0.1",
     "@sveltejs/vite-plugin-svelte": "^3.1.1",
     "ava": "^6.1.3",
@@ -63,13 +63,13 @@
     "documentation": "^14.0.3",
     "mf-styling": "^3.1.8",
     "npm-pkgbuild": "^15.3.29",
-    "semantic-release": "^24.0.0",
-    "stylelint": "^16.8.1",
+    "semantic-release": "^24.1.0",
+    "stylelint": "^16.8.2",
     "stylelint-config-standard": "^36.0.1",
-    "svelte": "^5.0.0-next.222",
+    "svelte": "^5.0.0-next.225",
     "testcafe": "^3.6.2",
     "typescript": "^5.5.4",
-    "vite": "^5.4.0",
+    "vite": "^5.4.1",
     "vite-plugin-compression2": "^1.2.0"
   },
   "peerDependencies": {

package/src/pagination.mjs

@@ -6,7 +6,7 @@ import { readable } from "svelte/store";
  * @param {Map|Set|Array|readable} data
  * @param {Object} options
  * @param {number} [options.itemsPerPage]
- * @param {number} [options.page]
+ * @param {number} [options.page] current page
  * @param {Function} [options.sorter]
  * @param {Function} [options.filter]
  */
@@ -17,6 +17,7 @@ export class Pagination {
   #filter;
   #unsubscribeFilter;
   #sorter;
+  #unsubscribeSorter;
   #itemsPerPage = 20;
   #page = 1;
 
@@ -54,8 +55,21 @@ export class Pagination {
   }
 
   set sorter(sorter) {
-    this.#sorter = sorter;
-    this.fireSubscriptions();
+    if (this.#unsubscribeSorter) {
+      this.#unsubscribeSorter();
+      this.#unsubscribeSorter = undefined;
+    }
+
+    const applySorter = sorter => {
+      this.#sorter = sorter;
+      this.fireSubscriptions();
+      };
+
+    if (sorter?.subscribe) {
+      this.#unsubscribeFilter = sorter.subscribe(applySorter);
+    } else {
+      applySorter(sorter);
+    }
   }
 
   get sorter() {
@@ -167,13 +181,20 @@ export class Pagination {
     return this.#itemsPerPage;
   }
 
-  *[Symbol.iterator]() {
-    let data = Array.isArray(this.data) ? this.#data : [...this.#data.values()];
+  get filteredItems()
+  {
+    let items = Array.isArray(this.#data) ? this.#data : [...this.#data.values()];
 
     if (this.filter) {
-      data = data.filter(this.filter);
+      return items.filter(this.filter);
     }
 
+    return items;
+  }
+
+  *[Symbol.iterator]() {
+    let data = this.filteredItems;
+
     if (this.sorter) {
       data = data.sort(this.sorter);
     }

package/types/pagination.d.mts

@@ -13,7 +13,7 @@ export function navigationItems(numberOfPages: number, currentPage: number, numb
  * @param {Map|Set|Array|readable} data
  * @param {Object} options
  * @param {number} [options.itemsPerPage]
- * @param {number} [options.page]
+ * @param {number} [options.page] current page
  * @param {Function} [options.sorter]
  * @param {Function} [options.filter]
  */
@@ -56,11 +56,12 @@ export class Pagination {
      * @return {number}
      */
     get length(): number;
+    get filteredItems(): any[];
     /**
      * @see https://getbootstrap.com/docs/4.0/components/pagination
      * @see https://a11y-style-guide.com/style-guide/section-navigation.html#kssref-navigation-pagination
      */
     get pageNavigationElement(): HTMLElement;
-    [Symbol.iterator](): Generator<any, void, any>;
+    [Symbol.iterator](): Generator<any, void, undefined>;
     #private;
 }