@lavalogic/scoria 0.11.3 → 0.11.5

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

@@ -151,10 +151,10 @@ export declare class TableContext<T extends object> {
     readonly sortedData: T[];
     readonly sortedRowModel: RowModel<T>;
     _currentPageData: T[];
+    get currentPageData(): T[];
     private _originalRowIndices;
     get originalRowIndices(): Map<T, number>;
     readonly paginationRowModel: RowModel<T>;
-    get currentPageData(): 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,13 +66,17 @@ export class TableContext {
         }
         this._dataRepo = $state(dataRepo);
         // this.dataRepo.forceRefresh = this.forceVisibilityUpdate;
-        [this._currentPageData, this._originalRowIndices] = $derived.by(() => {
-            const x = this.dataRepo?.paginationType == PaginationType.Local
-                ? this.sortedData.slice(this.dataRepo.pageStartIndex, this.dataRepo.pageEndIndexExclusive)
+        const [_currentPageData, _originalRowIndices] = $derived.by(() => {
+            const x = dataRepo.paginationType == PaginationType.Local
+                ? this.sortedData.slice(dataRepo.pageStartIndex, dataRepo.pageEndIndexExclusive)
                 : (this.sortedData ?? []);
-            const y = new Map((this.dataRepo?.data ?? []).map((item, index) => [item, index]));
+            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;
         }
@@ -679,10 +683,13 @@ 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;
+    _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;
+    _originalRowIndices = $state(new Map());
     get originalRowIndices() {
         return this._originalRowIndices;
     }
@@ -763,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) => {
@@ -843,26 +847,35 @@ export class TableContext {
             ? Math.min(this.paginationRepo.pageEndIndexExclusive, this.sortedData.length)
             : this.sortedData.length;
         const selectableMethod = this.columnDefs.find((it) => it instanceof RowSelectionDef)?.isSelectable;
+        const updateSelectedItem = (item) => {
+            const key = this.selectionExtractor(item);
+            if (this.selectedItems.has(key)) {
+                //replace selected item with newer version of the same identity
+                this.selectedItems.set(key, item);
+            }
+        };
         if (selectableMethod) {
             for (let index = pageStartIndex; index < pageEndIndexExclusive; index++) {
                 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 (exlusive) ${pageEndIndexExclusive}`, $state.snapshot(this.sortedData));
+                    return;
+                }
                 if (await selectableMethod(item, index)) {
-                    const key = this.selectionExtractor(item);
-                    if (this.selectedItems.has(key)) {
-                        //replace selected item with newer version of the same identity
-                        this.selectedItems.set(key, item);
-                    }
+                    updateSelectedItem(item);
                 }
             }
         }
         else {
             for (let index = pageStartIndex; index < pageEndIndexExclusive; index++) {
                 const item = this.sortedData[index];
-                const key = this.selectionExtractor(item);
-                if (this.selectedItems.has(key)) {
-                    //replace selected item with newer version of the same identity
-                    this.selectedItems.set(key, item);
+                // 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 (exlusive) ${pageEndIndexExclusive}`, $state.snapshot(this.sortedData));
+                    return;
                 }
+                updateSelectedItem(item);
             }
         }
         this.recalculateAllSelectedInCurrentPage();

package/package.json

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