@lavalogic/scoria 0.11.6 → 0.11.8

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

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

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

@@ -66,19 +66,56 @@ export class TableContext {
         }
         this._dataRepo = $state(dataRepo);
         // this.dataRepo.forceRefresh = this.forceVisibilityUpdate;
-        const [_currentPageData, _originalRowIndices] = $derived.by(() => {
-            const cpd = dataRepo.paginationType == PaginationType.Local
-                ? this.sortedData.slice(dataRepo.pageStartIndex, dataRepo.pageEndIndexExclusive)
-                : (this.sortedData ?? []);
-            const ori = new Map((dataRepo.data ?? []).map((item, index) => [item, index]));
-            return [cpd, ori];
-        });
         $effect(() => {
-            this._currentPageData = _currentPageData;
-            this._originalRowIndices = _originalRowIndices;
+            const sd = (() => {
+                if (this.paginationRepo?.paginationType == PaginationType.Local) {
+                    const state = this.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();
+                    sortedData.sort((a, b) => {
+                        const end = state.length;
+                        for (let i = 0; i < end; i++) {
+                            const { id, desc } = state[i];
+                            const sortingFn = this.getSortingFn(id, desc);
+                            if (sortingFn) {
+                                const result = sortingFn(a, b);
+                                if (result != 0) {
+                                    return result;
+                                }
+                            }
+                            else {
+                                console.warn('no sorting fn found for ' + id);
+                            }
+                        }
+                        return 0;
+                    });
+                    return sortedData;
+                }
+                return this.filteredData ?? [];
+            })();
+            const cpd = (() => {
+                if (dataRepo.paginationType != PaginationType.Local) {
+                    return sd ?? [];
+                }
+                if (dataRepo.pageEndIndexExclusive > sd.length - 1) {
+                    console.error(`Data Repository reports more items than what exists: End index: ${dataRepo.pageEndIndexExclusive} sorted data:`, $state.snapshot(sd));
+                    return null;
+                }
+                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 {
+            }
         });
         $effect(() => {
-            if (_currentPageData) {
+            if (this._currentPageData) {
                 untrack(() => {
                     if (this.paginationRepo?.paginationState.pageIndex != undefined &&
                         this.paginationRepo?.paginationState.pageSize != undefined) {
@@ -326,12 +363,7 @@ export class TableContext {
         return this._columnDefs;
     }
     set columnDefs(v) {
-        // if (this._columnDefs.length > 0 && v != this._columnDefs) {
-        // 	debugger;
-        // }
         this._columnDefs = v;
-        // this causes an error...?
-        // this.table = createTable(this.tableOptions);
     }
     _columnPresets = $state([]);
     get columnPresets() {
@@ -649,41 +681,17 @@ export class TableContext {
         }
         return this.showSelectedOnly ? [...this.selectedItems.values()] : (this.dataRepo?.data ?? []);
     });
-    sortedData = $derived.by(() => {
-        if (this.paginationRepo?.paginationType == PaginationType.Local) {
-            const state = this.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();
-            sortedData.sort((a, b) => {
-                const end = state.length;
-                for (let i = 0; i < end; i++) {
-                    const { id, desc } = state[i];
-                    const sortingFn = this.getSortingFn(id, desc);
-                    if (sortingFn) {
-                        const result = sortingFn(a, b);
-                        if (result != 0) {
-                            return result;
-                        }
-                    }
-                    else {
-                        console.warn('no sorting fn found for ' + id);
-                    }
-                }
-                return 0;
-            });
-            return sortedData;
-        }
-        return this.filteredData ?? [];
-    });
+    _sortedData = $state([]);
+    get sortedData() {
+        return this._sortedData;
+    }
     sortedRowModel = $derived.by(() => {
         const rows = this.sortedData.map((item, index) => {
             const originalIndex = this._originalRowIndices.get(item);
             const unsortedIndex = originalIndex ?? index;
             if (originalIndex == null) {
-                console.log($state.snapshot(this.sortedData));
-                console.log($state.snapshot(this._originalRowIndices));
+                $inspect(this.sortedData);
+                $inspect(this._originalRowIndices);
                 throw new Error(`Sorted Data not found in Original Row Indices: original index ${originalIndex}, index ${index}`);
             }
             return this.createRow(item, index, unsortedIndex);
@@ -962,7 +970,6 @@ export class TableContext {
     onEditCell = async (item, coords, value) => {
         const oldKey = this.selectionExtractor?.(item);
         const wasSelected = oldKey != null && this.selectedItems.has(oldKey);
-        // debugger;
         if (wasSelected) {
             this.selectedItems.delete(oldKey);
         }
@@ -1881,8 +1888,8 @@ export class TableContext {
         for (const item of selectedRows) {
             const rowIndex = this.sortedData.indexOf(item);
             if (rowIndex == -1) {
-                // eslint-disable-next-line no-debugger
-                debugger;
+                console.warn(`row index for highlighted row data not found`);
+                continue;
             }
             indices.set(item, rowIndex);
         }

package/package.json

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