@lavalogic/scoria 0.0.25 → 0.0.26

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

@@ -7,10 +7,17 @@
 	import type { ActionsDef } from '../../../Types/Columns/Definitions/Actions/ActionsDef.svelte.js';
 	import type { TableActionButton } from '../../../Types/Columns/TableActionButton.js';
 	import type { TableCell } from '../../../Types/Columns/TableCell.js';
+	import type { Column } from '../../../Types/Columns/Column.js';
 
+	export interface ActionsColumn<T extends object> extends Column<T> {
+		columnDef: ActionsDef<T>;
+	}
+	export interface ActionsTableCell<T extends object> extends TableCell<T> {
+		column: ActionsColumn<T>;
+	}
 	export interface TableActionProps<T extends object> {
 		action: TableActionButton<T>;
-		cell: TableCell<T>;
+		cell: ActionsTableCell<T>;
 	}
 </script>
 
@@ -18,17 +25,18 @@
 	const { action, cell }: TableActionProps<T> = $props();
 
 	const isEnabledPromise: boolean | Promise<boolean> = $derived.by(() => {
-		if (action.isDisabled) {
-			return action.isDisabled(cell.row.original, cell.row.index);
-		} else if ((cell.column.columnDef as ActionsDef<T>).isEnabled) {
-			return (cell.column.columnDef as ActionsDef<T>).isEnabled!(
+		const disabled = action.isDisabled?.(cell.row.original, cell.row.index);
+
+		if (disabled != null) {
+			return !disabled;
+		}
+		return (
+			(cell.column.columnDef as ActionsDef<T>).isEnabled?.(
 				cell.row.original,
 				cell.row.index,
 				action
-			);
-		}
-
-		return Promise.resolve(true);
+			) ?? true
+		);
 	});
 
 	const labelPromise: Promise<string> = $derived.by(() => {
@@ -42,20 +50,25 @@
 	});
 </script>
 
-{#await Promise.all([labelPromise, isEnabledPromise]) then [label, enabled]}
-	<Button
-		fullWidth
-		size={Size.Medium}
-		colourSet={(cell.column.columnDef as ActionsDef<T>).getColourSet?.(
-			cell.row.original,
-			cell.row.index,
-			action
-		) ?? ColourSet.Secondary}
-		disabled={!enabled}
-		onclick={() => {
-			action.callback(cell.row.original, cell.row.index);
-		}}>{label}</Button
-	>
+{#await labelPromise then label}
+	{#await isEnabledPromise then isEnabled}
+		<Button
+			fullWidth
+			size={Size.Medium}
+			colourSet={(cell.column.columnDef as ActionsDef<T>).getColourSet?.(
+				cell.row.original,
+				cell.row.index,
+				action
+			) ?? ColourSet.Secondary}
+			disabled={!isEnabled}
+			onclick={() => {
+				action.callback(cell.row.original, cell.row.index);
+			}}>{label}</Button
+		>
+	{:catch e}
+		{@debug e}
+		Error Loading Button
+	{/await}
 {:catch e}
 	{@debug e}
 	Error Loading Button

package/dist/Components/Table/Body/Rows/Columns/TableAction.svelte.d.ts

@@ -1,8 +1,16 @@
+import type { ActionsDef } from '../../../Types/Columns/Definitions/Actions/ActionsDef.svelte.js';
 import type { TableActionButton } from '../../../Types/Columns/TableActionButton.js';
 import type { TableCell } from '../../../Types/Columns/TableCell.js';
+import type { Column } from '../../../Types/Columns/Column.js';
+export interface ActionsColumn<T extends object> extends Column<T> {
+    columnDef: ActionsDef<T>;
+}
+export interface ActionsTableCell<T extends object> extends TableCell<T> {
+    column: ActionsColumn<T>;
+}
 export interface TableActionProps<T extends object> {
     action: TableActionButton<T>;
-    cell: TableCell<T>;
+    cell: ActionsTableCell<T>;
 }
 declare function $$render<T extends object>(): {
     props: TableActionProps<T>;

package/package.json

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