@lavalogic/scoria 0.0.36 → 0.0.38

package/dist/Components/GridInput.svelte

@@ -10,6 +10,7 @@
 	import type { GridSingleSelectItemAsObject } from '../Types/Internal/GridSingleSelectItemAsObject.js';
 	import type { GridSingleSelectItemAsPrimitive } from '../Types/Internal/GridSingleSelectItemAsPrimitive.js';
 	import type { GridTextItem } from '../Types/Internal/GridTextItem.js';
+	import type { ValueProp } from '../Types/Internal/Misc.js';
 	import MultiSelect from './MultiSelect.svelte';
 	import SingleSelect from './SingleSelect.svelte';
 	import TextInput from './TextInput.svelte';
@@ -32,45 +33,41 @@
 
 	function isSelect(
 		item: GridItem<V, VP>
-	): item is V extends object
-		? VP extends string & keyof V
-			? GridSelectItem<V, VP>
-			: never
-		: never {
+	): item is V extends object ? (VP extends ValueProp<V> ? GridSelectItem<V, VP> : never) : never {
 		return item.type == 'select';
 	}
 
-	function isMultiSelect<A extends object, B extends keyof A & string>(
+	function isMultiSelect<A extends object, B extends ValueProp<A>>(
 		item: GridSelectItem<A, B>
 	): item is GridMultiSelectItem<A, B> {
 		return 'multi' in item && item.multi === true;
 	}
 
-	function isMultiSelectPrimitive<A extends object, B extends keyof A & string>(
+	function isMultiSelectPrimitive<A extends object, B extends ValueProp<A>>(
 		item: GridMultiSelectItem<A, B>
 	): item is GridMultiSelectItemAsPrimitive<A, B> {
 		return 'valueAsObject' in item && item.valueAsObject === false;
 	}
 
-	function isMultiSelectObject<A extends object, B extends keyof A & string>(
+	function isMultiSelectObject<A extends object, B extends ValueProp<A>>(
 		item: GridMultiSelectItem<A, B>
 	): item is GridMultiSelectItemAsObject<A, B> {
 		return 'valueAsObject' in item && item.valueAsObject === true;
 	}
 
-	function isSingleSelect<A extends object, B extends keyof A & string>(
+	function isSingleSelect<A extends object, B extends ValueProp<A>>(
 		item: GridSelectItem<A, B>
 	): item is GridSingleSelectItem<A, B> {
 		return !('multi' in item) || item.multi === false;
 	}
 
-	function isSingleSelectPrimitive<A extends object, B extends keyof A & string>(
+	function isSingleSelectPrimitive<A extends object, B extends ValueProp<A>>(
 		item: GridSingleSelectItem<A, B>
 	): item is GridSingleSelectItemAsPrimitive<A, B> {
 		return 'valueAsObject' in item && item.valueAsObject === false;
 	}
 
-	function isSingleSelectObject<A extends object, B extends keyof A & string>(
+	function isSingleSelectObject<A extends object, B extends ValueProp<A>>(
 		item: GridSingleSelectItem<A, B>
 	): item is GridSingleSelectItemAsObject<A, B> {
 		return 'valueAsObject' in item && item.valueAsObject === true;
@@ -129,7 +126,7 @@
 					<SingleSelect
 						{options}
 						name={item.name}
-						valueAsObject={item.valueAsObject}
+						valueAsObject={true}
 						labelProp={item.labelProp}
 						valueProp={item.valueProp}
 						value={item.value}
@@ -145,7 +142,7 @@
 					<SingleSelect
 						{options}
 						name={item.name}
-						valueAsObject={item.valueAsObject}
+						valueAsObject={false}
 						labelProp={item.labelProp}
 						valueProp={item.valueProp}
 						value={item.value}

package/dist/Components/Table/Body/QuickSearchCell.svelte

@@ -96,7 +96,7 @@
 	let valueMax: number | null = $state(null);
 
 	let selectedOptions: Array<SelectOption<string | number>> = $state([]);
-	let lastQueryOptions: Array<SelectOption<unknown>> = $state([]);
+	let lastQueryOptions: Array<SelectOption<string | number>> = $state([]);
 
 	const inputId = $derived(`${tableContext.tableName}-cell-quicksearch-${column.id}`);
 
@@ -290,7 +290,7 @@
 							name={customFilter?.objectName ?? 'Item'}
 							valueProp="value"
 							labelProp="label"
-							selectedValue={value}
+							{value}
 							query={customFilter!.query!}
 							bind:options={lastQueryOptions}
 							onchange={(newValue) => {

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

@@ -18,7 +18,9 @@
 <script lang="ts" generics="T extends object,">
 	const { cell }: TableQuerySelectProps<T> = $props();
 
-	const value = $derived((cell.getValue() ?? null) as SelectOption<unknown> | null);
+	const value = $derived(
+		(cell.getValue() ?? null) as SelectOption<unknown> | Promise<SelectOption<unknown>> | null
+	);
 
 	let tdref = $state<HTMLTableCellElement | undefined>();
 
@@ -210,8 +212,8 @@
 				name={cell.column.columnDef.id}
 				valueProp="value"
 				labelProp="label"
-				valueAsObject={columnDef.valueAsObject as true}
-				selectedValue={value}
+				valueAsObject={columnDef.valueAsObject}
+				{value}
 				query={(v) => columnDef.query(v, cell.row.original, cell.row.originalIndex)}
 				bind:options={lastOptions}
 				onfocus={addKeydownEvent}

package/dist/Components/Table/Misc/FilterInput.svelte

@@ -364,7 +364,7 @@
 								name={customFilter?.objectName ?? 'Item'}
 								valueProp="value"
 								labelProp="label"
-								selectedValue={value}
+								{value}
 								query={customFilter!.query!}
 								bind:options={lastQueryOptions}
 								onchange={(newValue) => {

package/dist/Components/Table/Types/Columns/Definitions/Expand/ExpandDef.svelte.d.ts

@@ -8,7 +8,7 @@ export interface ExpandDefProps<T extends object, R extends object> extends Colu
     headerIcon: IconProps['name'];
     innerTableName: string;
     innerTableOptions: TableInitOptions<R>;
-    accessorFn: (item: T, index: number) => R;
+    accessorFn: (item: T, index: number) => R[] | Promise<R[]>;
 }
 export declare class ExpandDef<T extends object, R extends object = object> extends ColumnDef<T> {
     readonly columnType: "Expand";

package/dist/Types/Internal/GridItem.d.ts

@@ -1,4 +1,5 @@
 import type { GridNumberItem } from './GridNumberItem.js';
 import type { GridSelectItem } from './GridSelectItem.js';
 import type { GridTextItem } from './GridTextItem.js';
-export type GridItem<V = unknown, VP = unknown> = GridTextItem | GridNumberItem | (V extends object ? (VP extends string & keyof V ? GridSelectItem<V, VP> : never) : never);
+import type { ValueProp } from './Misc.js';
+export type GridItem<V = unknown, VP = unknown> = GridTextItem | GridNumberItem | (V extends object ? VP extends ValueProp<V> ? VP extends string & keyof V ? GridSelectItem<V, VP> : never : never : never);

package/package.json

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