@lavalogic/scoria 0.7.1 → 0.7.3

package/dist/Components/Table/Body/Rows/Columns/TableQuerySelect.svelte

@@ -55,26 +55,28 @@
 	let asyncCounter = 0;
 	$effect(() => {
 		void editableAsync;
-		const localCounter = (asyncCounter = asyncCounter + 1);
-		(async () => {
-			try {
-				const isEditable = await editableAsync;
-				if (asyncCounter === localCounter) {
-					editable = isEditable;
-				} else if (dev) {
-					console.log('skipping async editable because it is stale');
-				}
-			} catch (e) {
-				if (dev) {
-					console.error(e);
-				}
-				if (asyncCounter === localCounter) {
-					editable = false;
-				} else if (dev) {
-					console.log('skipping async editable because it is stale');
+		untrack(() => {
+			const localCounter = (asyncCounter = asyncCounter + 1);
+			(async () => {
+				try {
+					const isEditable = await editableAsync;
+					if (asyncCounter === localCounter) {
+						editable = isEditable;
+					} else if (dev) {
+						console.log('skipping async editable because it is stale');
+					}
+				} catch (e) {
+					if (dev) {
+						console.error(e);
+					}
+					if (asyncCounter === localCounter) {
+						editable = false;
+					} else if (dev) {
+						console.log('skipping async editable because it is stale');
+					}
 				}
-			}
-		})();
+			})();
+		});
 	});
 
 	const focusDetails: TableFocusDetails<T> = $derived(
@@ -266,7 +268,7 @@
 						tableContext.onEditCell(
 							cell.row.original,
 							focusDetails.coordinates,
-							newValue?.value ?? null
+							columnDef.valueAsObject ? (newValue ?? null) : (newValue?.value ?? null)
 						);
 					}
 

package/dist/Components/Table/ColumnDefinitions/ExampleItemColumnDef.svelte.js

@@ -11,6 +11,7 @@ import { DisplayDef } from '../Types/Columns/Definitions/Display/DisplayDef.svel
 import { ProgressBarDef } from '../Types/Columns/Definitions/Display/ProgressBarDef.svelte.js';
 import { ValidityDef } from '../Types/Columns/Definitions/Display/ValidityDef.svelte.js';
 import { asyncSleep } from '../../../Helpers/Helpers.svelte.js';
+import { QueryDef } from '../Types/Columns/Definitions/Accessors/QueryDef.svelte.js';
 export class ExampleItemColumnDef {
     static generateExampleItemColumnDefs(modal) {
         let defs = $state([
@@ -39,6 +40,32 @@ export class ExampleItemColumnDef {
                 id: 'id',
                 filterValueType: 'Number'
             }),
+            new QueryDef({
+                header: 'simulated query def',
+                valueAsObject: true,
+                getDisplayValue: async (item, index) => {
+                    if (item.someDate) {
+                        return item.someDate.getTime().toString();
+                    }
+                    return index.toString();
+                },
+                isEditable: () => true,
+                id: 'simulatedQuery',
+                query: async (v, item, index) => {
+                    if (!v) {
+                        return [];
+                    }
+                    asyncSleep(100);
+                    return item.someDate
+                        ? new Array(5).fill(0).map((it, index) => {
+                            return {
+                                label: (it + index).toString(),
+                                value: (it + index).toString()
+                            };
+                        })
+                        : [];
+                }
+            }),
             new TextInputDef({
                 header: 'Name',
                 id: 'name',

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

@@ -600,7 +600,13 @@ export class TableContext {
         const rows = sortedData.map((item, index) => {
             const unsortedIndex = this.originalRowIndices.get(item) ?? index;
             const row = {
-                getValue: (key) => this.columnDefsById.get(key).accessorFn?.(item, index) ?? item[key],
+                getValue: (key) => {
+                    const gotValue = this.columnDefsById.get(key).accessorFn?.(item, index);
+                    if (gotValue !== undefined) {
+                        return gotValue;
+                    }
+                    return item[key];
+                },
                 original: item,
                 visibleIndex: index,
                 originalIndex: unsortedIndex,
@@ -633,7 +639,13 @@ export class TableContext {
                     },
                     id: `${index}_${def.id}`,
                     row: row,
-                    getValue: () => def.accessorFn?.(item, index) ?? item[def.id] // TODO
+                    getValue: () => {
+                        const gotValue = def.accessorFn?.(item, index);
+                        if (gotValue !== undefined) {
+                            return gotValue;
+                        }
+                        return item[def.id];
+                    }
                 };
             };
             const makeCellFromId = (columnId) => {
@@ -1585,7 +1597,13 @@ export class TableContext {
     // #region private methods
     createRow(item, index, unsortedIndex) {
         const row = {
-            getValue: (key) => this.columnDefsById.get(key).accessorFn?.(item, unsortedIndex) ?? item[key],
+            getValue: (key) => {
+                const gotValue = this.columnDefsById.get(key).accessorFn?.(item, unsortedIndex);
+                if (gotValue !== undefined) {
+                    return gotValue;
+                }
+                return item[key];
+            },
             original: item,
             visibleIndex: index,
             originalIndex: unsortedIndex,
@@ -1618,7 +1636,13 @@ export class TableContext {
                 },
                 id: `${index}_${def.id}`,
                 row: row,
-                getValue: () => def.accessorFn?.(item, index) ?? item[def.id] // TODO
+                getValue: () => {
+                    const gotValue = def.accessorFn?.(item, index);
+                    if (gotValue !== undefined) {
+                        return gotValue;
+                    }
+                    return item[def.id];
+                }
             };
         };
         const makeCellFromId = (columnId) => {

package/dist/Types/Examples/ExampleItem.d.ts

@@ -1,4 +1,5 @@
 import type { SQLDate } from '../Internal/Misc.js';
+import type { SelectOption } from '../Internal/SelectOption.js';
 import type { ExampleSelectEnum } from './ExampleSelectEnum.js';
 export interface ExampleItem {
     id: number;
@@ -12,4 +13,5 @@ export interface ExampleItem {
     floDateWithTime: SQLDate | null;
     someSelect: ExampleSelectEnum | null;
     someBubbles: string[];
+    simulatedQuery: SelectOption<string> | null;
 }

package/package.json

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