@lavalogic/scoria 0.11.2 → 0.11.4

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

@@ -141,7 +141,6 @@ export declare class TableContext<T extends object> {
     private set hasInvalidSelectedItems(value);
     private columnDefsById;
     private readonly getSortingFn;
-    readonly originalRowIndices: Map<T, number>;
     private _filterTimer;
     private get filterTimer();
     private set filterTimer(value);
@@ -152,8 +151,10 @@ export declare class TableContext<T extends object> {
     readonly sortedData: T[];
     readonly sortedRowModel: RowModel<T>;
     _currentPageData: T[];
-    readonly paginationRowModel: RowModel<T>;
     get currentPageData(): T[];
+    private _originalRowIndices;
+    get originalRowIndices(): Map<T, number>;
+    readonly paginationRowModel: RowModel<T>;
     readonly selectionContains: (item: T) => boolean;
     readonly addInvalidValue: (item: T) => void;
     readonly removeInvalidValue: (item: T) => void;

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

@@ -66,6 +66,17 @@ export class TableContext {
         }
         this._dataRepo = $state(dataRepo);
         // this.dataRepo.forceRefresh = this.forceVisibilityUpdate;
+        const [_currentPageData, _originalRowIndices] = $derived.by(() => {
+            const x = dataRepo.paginationType == PaginationType.Local
+                ? this.sortedData.slice(dataRepo.pageStartIndex, dataRepo.pageEndIndexExclusive)
+                : (this.sortedData ?? []);
+            const y = new Map((dataRepo.data ?? []).map((item, index) => [item, index]));
+            return [x, y];
+        });
+        $effect(() => {
+            this._currentPageData = _currentPageData;
+            this._originalRowIndices = _originalRowIndices;
+        });
         if (defaultColumnDefs.remoteFilters) {
             this.remoteFilters = defaultColumnDefs.remoteFilters;
         }
@@ -600,9 +611,6 @@ export class TableContext {
         // }
         return comparableSortingFn(id, desc);
     };
-    // FIXME this is most likely the cuplrit for add pod not working on receipt. It may be one tick behind the other values
-    // eslint-disable-next-line svelte/prefer-svelte-reactivity
-    originalRowIndices = $derived(new Map((this.dataRepo?.data ?? []).map((item, index) => [item, index])));
     // private _filterTimer: ReturnType<typeof setTimeout> | undefined;
     _filterTimer = 1;
     get filterTimer() {
@@ -660,11 +668,11 @@ export class TableContext {
     });
     sortedRowModel = $derived.by(() => {
         const rows = this.sortedData.map((item, index) => {
-            const originalIndex = this.originalRowIndices.get(item);
+            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));
+                console.log($state.snapshot(this._originalRowIndices));
                 throw new Error(`Sorted Data not found in Original Row Indices: original index ${originalIndex}, index ${index}`);
             }
             return this.createRow(item, index, unsortedIndex);
@@ -675,16 +683,23 @@ export class TableContext {
             rowsById: new Map(rows.map((it, index) => [index.toString(), it])) //FIXME should this be by sorted id or by original id?
         };
     });
-    _currentPageData = $derived(this.dataRepo?.paginationType == PaginationType.Local
-        ? this.sortedData.slice(this.dataRepo.pageStartIndex, this.dataRepo.pageEndIndexExclusive)
-        : (this.sortedData ?? []));
+    _currentPageData = $state([]);
+    get currentPageData() {
+        return this._currentPageData;
+    }
+    // FIXME this is most likely the cuplrit for add pod not working on receipt. It may be one tick behind the other values
+    // eslint-disable-next-line svelte/prefer-svelte-reactivity
+    _originalRowIndices = $state(new Map());
+    get originalRowIndices() {
+        return this._originalRowIndices;
+    }
     paginationRowModel = $derived.by(() => {
         const sortedData = this._currentPageData;
         const rows = sortedData.map((item, index) => {
-            const unsortedIndex = this.originalRowIndices.get(item) ?? index;
+            const unsortedIndex = this._originalRowIndices.get(item) ?? index;
             if (!item) {
                 console.log($state.snapshot(sortedData));
-                console.log($state.snapshot(this.originalRowIndices));
+                console.log($state.snapshot(this._originalRowIndices));
                 throw new Error(`No Item was found at index ${index}`);
             }
             const row = {
@@ -755,9 +770,6 @@ export class TableContext {
             rowsById: new Map(rows.map((it, index) => [index.toString(), it])) //FIXME should this be by sorted id or by original id?
         };
     });
-    get currentPageData() {
-        return this._currentPageData;
-    }
     // #endregion
     // #region public methods
     selectionContains = (item) => {
@@ -1685,7 +1697,7 @@ export class TableContext {
     // #region private methods
     createRow(item, index, unsortedIndex) {
         if (!item) {
-            console.log($state.snapshot(this.originalRowIndices));
+            console.log($state.snapshot(this._originalRowIndices));
             throw new Error(`No Item was found at index ${index} (unsorted index ${unsortedIndex})`);
         }
         const row = {

package/package.json

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