@lavalogic/scoria 0.11.11 → 0.11.13

package/dist/Components/Table/Types/Context/TableContext.svelte.d.ts

@@ -167,6 +167,7 @@ export declare class TableContext<T extends object> {
     setSelectionMap: (set: SvelteMap<unknown, T>) => void;
     readonly updateSelectedItems: () => Promise<void>;
     readonly resetSelectedItems: () => void;
+    private lastIncrement;
     readonly recalculateAllSelectedInCurrentPage: () => void;
     readonly selectAllInCurrentPage: () => Promise<void>;
     readonly onHighlightAll: () => void;

package/dist/Components/Table/Types/Context/TableContext.svelte.js

@@ -121,11 +121,13 @@ export class TableContext {
         });
         $effect(() => {
             if (this._currentPageData) {
+                void this.selectedItems;
                 untrack(() => {
                     if (this.paginationRepo?.paginationState.pageIndex != undefined &&
                         this.paginationRepo?.paginationState.pageSize != undefined) {
                         this.updateSelectedItems();
                         this.resetHighlightedRows();
+                        this.recalculateAllSelectedInCurrentPage();
                     }
                 });
             }
@@ -796,22 +798,6 @@ export class TableContext {
         }
         return this.selectedItems.has(this.selectionExtractor(item));
     };
-    // public readonly HACK__reselectItem = (item: T) => {
-    // 	if (!this.selectionExtractor) {
-    // 		throw new Error('No selection extractor was supplied');
-    // 	}
-    // 	if (!this.isSelectable) {
-    // 		return true;
-    // 	}
-    // 	const key = this.selectionExtractor(item);
-    // 	if (this.selectedItems.has(key)) {
-    // 		this.selectedItems.delete(key);
-    // 		this.selectedItems.set(key, item);
-    // 	} else {
-    // 		this.selectedItems.set(key, item);
-    // 		this.selectedItems.delete(key);
-    // 	}
-    // };
     addInvalidValue = (item) => {
         this.invalidValues.set(this.selectionExtractor(item), item);
     };
@@ -830,13 +816,6 @@ export class TableContext {
             this.highlightedItems.set(key, item);
         }
     };
-    // public readonly toggleHighlightedRow = (rowIndex: number) => {
-    // 	if (this.highlightedRowIndexIds.has(rowIndex)) {
-    // 		this.highlightedRowIndexIds.delete(rowIndex);
-    // 	} else {
-    // 		this.highlightedRowIndexIds.add(rowIndex);
-    // 	}
-    // };
     resetHighlightedRows = () => {
         this.highlightedItems.clear();
     };
@@ -848,7 +827,6 @@ export class TableContext {
         else {
             this.selectedItems.delete(key);
         }
-        this.recalculateAllSelectedInCurrentPage();
     };
     setSelectionMap = (set) => {
         this.selectedItems = set;
@@ -893,7 +871,6 @@ export class TableContext {
                 updateSelectedItem(item);
             }
         }
-        this.recalculateAllSelectedInCurrentPage();
     };
     resetSelectedItems = () => {
         for (const key of this.selectedItems.keys()) {
@@ -901,16 +878,23 @@ export class TableContext {
         }
         this.recalculateAllSelectedInCurrentPage();
     };
+    lastIncrement = Number.MIN_SAFE_INTEGER;
     recalculateAllSelectedInCurrentPage = () => {
-        tick()
-            .then(() => {
-            this.allSelectedInCurrentPage
-                ?.then(() => {
-                this.hasInvalidSelectedItems = [...this.selectedItems.keys()].some((key) => this._invalidValues.has(key));
-            })
-                .catch((e) => {
-                console.log(e);
-            });
+        const invalidValues = this._invalidValues;
+        const allSelectedInCurrentPage = [...this.selectedItems.keys()];
+        const currentIncrement = ++this.lastIncrement;
+        this.allSelectedInCurrentPage
+            ?.then(() => {
+            if (this.lastIncrement == currentIncrement) {
+                this.hasInvalidSelectedItems = allSelectedInCurrentPage.some((key) => {
+                    return invalidValues.has(key);
+                });
+            }
+            else {
+                if (dev) {
+                    console.log('skipping recalculation due to stale data');
+                }
+            }
         })
             .catch((e) => {
             console.log(e);
@@ -954,7 +938,6 @@ export class TableContext {
                 }
             }
         }
-        this.recalculateAllSelectedInCurrentPage();
     };
     onHighlightAll = () => {
         if (!this.dataRepo) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@lavalogic/scoria",
   "description": "Svelte components used for the FloWMS Web Frontend",
-  "version": "0.11.11",
+  "version": "0.11.13",
   "publishConfig": {
     "access": "restricted"
   },