@lavalogic/scoria 0.11.10 → 0.11.12

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

@@ -147,7 +147,8 @@ export declare class TableContext<T extends object> {
     private _filteredIndices;
     get filteredIndices(): number[];
     set filteredIndices(v: number[]);
-    readonly filteredData: T[];
+    private _filteredData;
+    get filteredData(): T[];
     private _sortedData;
     get sortedData(): T[];
     readonly sortedRowModel: RowModel<T>;

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

@@ -67,13 +67,25 @@ export class TableContext {
         this._dataRepo = $state(dataRepo);
         // this.dataRepo.forceRefresh = this.forceVisibilityUpdate;
         $effect(() => {
+            const fd = (() => {
+                if (this.paginationRepo?.paginationType == PaginationType.Local) {
+                    const data = this.showSelectedOnly
+                        ? // FIXME this will show the selected items by order of insertion to the selectedItems map.
+                            [...this.selectedItems.values()]
+                        : (this.filteredIndices.map((index) => {
+                            return dataRepo.data[index];
+                        }) ?? []);
+                    return data;
+                }
+                return this.showSelectedOnly ? [...this.selectedItems.values()] : (dataRepo?.data ?? []);
+            })();
             const sd = (() => {
                 if (this.paginationRepo?.paginationType == PaginationType.Local) {
-                    const state = this.dataRepo?.sorting ?? [];
+                    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()]
-                        : this.filteredData.concat();
+                        : fd.concat();
                     sortedData.sort((a, b) => {
                         const end = state.length;
                         for (let i = 0; i < end; i++) {
@@ -93,7 +105,7 @@ export class TableContext {
                     });
                     return sortedData;
                 }
-                return this.filteredData ?? [];
+                return fd ?? [];
             })();
             const cpd = (() => {
                 if (dataRepo.paginationType != PaginationType.Local) {
@@ -102,21 +114,20 @@ export class TableContext {
                 return sd.slice(dataRepo.pageStartIndex, dataRepo.pageEndIndexExclusive);
             })();
             const ori = new Map((dataRepo.data ?? []).map((item, index) => [item, index]));
-            if (cpd != null) {
-                this._sortedData = sd;
-                this._currentPageData = cpd;
-                this._originalRowIndices = ori;
-            }
-            else {
-            }
+            this._filteredData = fd;
+            this._sortedData = sd;
+            this._currentPageData = cpd;
+            this._originalRowIndices = ori;
         });
         $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();
                     }
                 });
             }
@@ -668,18 +679,10 @@ export class TableContext {
     set filteredIndices(v) {
         this._filteredIndices = v;
     }
-    filteredData = $derived.by(() => {
-        if (this.paginationRepo?.paginationType == PaginationType.Local) {
-            const data = this.showSelectedOnly
-                ? // FIXME this will show the selected items by order of insertion to the selectedItems map.
-                    [...this.selectedItems.values()]
-                : (this.filteredIndices.map((index) => {
-                    return this.dataRepo.data[index];
-                }) ?? []);
-            return data;
-        }
-        return this.showSelectedOnly ? [...this.selectedItems.values()] : (this.dataRepo?.data ?? []);
-    });
+    _filteredData = $state([]);
+    get filteredData() {
+        return this._filteredData;
+    }
     _sortedData = $state([]);
     get sortedData() {
         return this._sortedData;
@@ -714,8 +717,6 @@ export class TableContext {
         const rows = sortedData.map((item, index) => {
             const unsortedIndex = this._originalRowIndices.get(item) ?? index;
             if (!item) {
-                console.log($state.snapshot(sortedData));
-                console.log($state.snapshot(this._originalRowIndices));
                 throw new Error(`No Item was found at index ${index}`);
             }
             const row = {
@@ -849,7 +850,6 @@ export class TableContext {
         else {
             this.selectedItems.delete(key);
         }
-        this.recalculateAllSelectedInCurrentPage();
     };
     setSelectionMap = (set) => {
         this.selectedItems = set;
@@ -875,7 +875,7 @@ export class TableContext {
                 const item = this.sortedData[index];
                 // HACK: Please find why this is happening and fix it properly
                 if (!item) {
-                    console.warn(`skipping update because there is a data mismatch, page start index: ${pageStartIndex}, current index ${index}, page end index (exclusive) ${pageEndIndexExclusive}`, $state.snapshot(this.sortedData));
+                    console.warn(`skipping update because there is a data mismatch (with selectable method)`);
                     return;
                 }
                 if (await selectableMethod(item, index)) {
@@ -888,13 +888,12 @@ export class TableContext {
                 const item = this.sortedData[index];
                 // HACK: Please find why this is happening and fix it properly
                 if (!item) {
-                    console.warn(`skipping update because there is a data mismatch, page start index: ${pageStartIndex}, current index ${index}, page end index (exclusive) ${pageEndIndexExclusive}`, $state.snapshot(this.sortedData));
+                    console.warn(`skipping update because there is a data mismatch (no selectable method)`);
                     return;
                 }
                 updateSelectedItem(item);
             }
         }
-        this.recalculateAllSelectedInCurrentPage();
     };
     resetSelectedItems = () => {
         for (const key of this.selectedItems.keys()) {
@@ -903,10 +902,18 @@ export class TableContext {
         this.recalculateAllSelectedInCurrentPage();
     };
     recalculateAllSelectedInCurrentPage = () => {
-        tick().then(() => {
-            this.allSelectedInCurrentPage?.then(() => {
+        tick()
+            .then(() => {
+            this.allSelectedInCurrentPage
+                ?.then(() => {
                 this.hasInvalidSelectedItems = [...this.selectedItems.keys()].some((key) => this._invalidValues.has(key));
+            })
+                .catch((e) => {
+                console.log(e);
             });
+        })
+            .catch((e) => {
+            console.log(e);
         });
     };
     selectAllInCurrentPage = async () => {
@@ -947,7 +954,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.10",
+  "version": "0.11.12",
   "publishConfig": {
     "access": "restricted"
   },