@lavalogic/scoria 0.11.12 → 0.11.14

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

@@ -82,11 +82,8 @@ export class TableContext {
             const sd = (() => {
                 if (this.paginationRepo?.paginationType == PaginationType.Local) {
                     const state = dataRepo.sorting ?? [];
-                    const sortedData = this.showSelectedOnly
-                        ? // FIXME this will show the selected items by order of insertion to the selectedItems map.
-                            [...this.selectedItems.values()]
-                        : fd.concat();
-                    sortedData.sort((a, b) => {
+                    const dataToSort = fd.concat();
+                    dataToSort.sort((a, b) => {
                         const end = state.length;
                         for (let i = 0; i < end; i++) {
                             const { id, desc } = state[i];
@@ -97,13 +94,13 @@ export class TableContext {
                                     return result;
                                 }
                             }
-                            else {
+                            else if (dev) {
                                 console.warn('no sorting fn found for ' + id);
                             }
                         }
                         return 0;
                     });
-                    return sortedData;
+                    return dataToSort;
                 }
                 return fd ?? [];
             })();
@@ -111,7 +108,11 @@ export class TableContext {
                 if (dataRepo.paginationType != PaginationType.Local) {
                     return sd ?? [];
                 }
-                return sd.slice(dataRepo.pageStartIndex, dataRepo.pageEndIndexExclusive);
+                const x = sd.slice(dataRepo.pageStartIndex, dataRepo.pageEndIndexExclusive);
+                if (dev) {
+                    console.log(x);
+                }
+                return x;
             })();
             const ori = new Map((dataRepo.data ?? []).map((item, index) => [item, index]));
             this._filteredData = fd;
@@ -713,8 +714,8 @@ export class TableContext {
         return this._originalRowIndices;
     }
     paginationRowModel = $derived.by(() => {
-        const sortedData = this._currentPageData;
-        const rows = sortedData.map((item, index) => {
+        const currentPageData = this._currentPageData;
+        const rows = currentPageData.map((item, index) => {
             const unsortedIndex = this._originalRowIndices.get(item) ?? index;
             if (!item) {
                 throw new Error(`No Item was found at index ${index}`);
@@ -798,22 +799,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);
     };
@@ -832,13 +817,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();
     };
@@ -901,16 +879,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);

package/package.json

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