@lavalogic/scoria 0.22.3 → 0.22.4

package/dist/Components/FileUpload.svelte

@@ -33,7 +33,7 @@
 
 		inputRef = $bindable(),
 		onblur,
-		onfocus
+		onfocus,
 	}: FileUploadProps = $props();
 
 	function onchange(e: Event & { currentTarget: EventTarget & HTMLInputElement }) {
@@ -90,7 +90,9 @@
 	<!-- HACK removed label for modals for now because I couldn't think of a decent style that doesn't interfere with scrolling -->
 	{#if labelTop && variant !== InputVariant.Modal}
 		<!-- <span class="top-label" class:invalid={isInvalid}>{labelTop}{#if optional}<i>&nbsp;- optional</i>{/if}</span> -->
-		<span class="top-label" class:for-default={variant === InputVariant.Default}
+		<span
+			class="top-label"
+			class:for-default={variant === InputVariant.Default}
 			>{labelTop}{#if optional}<i>&nbsp;- optional</i>{/if}</span
 		>
 		{#if variant === InputVariant.Default}
@@ -100,7 +102,10 @@
 		{/if}
 	{/if}
 	<!-- style="--background-colour: {leftIcon?.backgroundColour ?? rightIcon?.backgroundColour};" -->
-	<div class="icon-container" class:for-modal={variant == InputVariant.Modal}>
+	<div
+		class="icon-container"
+		class:for-modal={variant == InputVariant.Modal}
+	>
 		{#if leftIcon}
 			<Icon
 				name={leftIcon.name}
@@ -157,7 +162,7 @@
 				colourSet={ColourSet.Secondary}
 				backgroundColour="transparent"
 				icon={{ name: 'upload' }}
-				label="Delete"
+				label="Upload"
 				size={Size.Medium}
 				onclick={() => {
 					a();
@@ -180,7 +185,10 @@
 			/>
 		{/if}
 		{#if labelRight}
-			<span class="right-label" class:for-modal={variant == InputVariant.Modal}>{labelRight}</span>
+			<span
+				class="right-label"
+				class:for-modal={variant == InputVariant.Modal}>{labelRight}</span
+			>
 		{/if}
 	</div>
 </label>

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

@@ -6,11 +6,12 @@ import type { FilterValueType } from '../../Filtering/FilterValueType.js';
 import { ColumnType } from '../ColumnType.js';
 import type { AccessorFn } from './AccessorFn.js';
 import type { ValidationFn } from './ValidationFn.js';
+import type { MemoryColumnIndex } from '../../Coordinates/ColumnIndices.js';
 export interface ColumnDefProps<T extends object, in FilterFnType, out OptionsType> {
     id: string;
     header: string | Snippet;
     debug?: boolean;
-    index?: number;
+    index?: MemoryColumnIndex;
     allowFiltering?: boolean;
     allowSorting?: boolean;
     defaultHidden?: boolean;
@@ -30,8 +31,8 @@ export declare abstract class ColumnDef<T extends object, in FilterFnType = neve
     readonly id: string;
     debug: boolean;
     private _index;
-    get index(): number;
-    set index(v: number);
+    get index(): MemoryColumnIndex;
+    set index(v: MemoryColumnIndex);
     abstract readonly columnType: ColumnType;
     readonly defaultHidden: boolean;
     readonly allowSorting: boolean;

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

@@ -8,6 +8,7 @@ import type { DefsWrapper } from '../Columns/DefsWrapper.js';
 import type { VisibilityState } from '../Columns/VisibilityState.js';
 import type { CellCoordinates } from '../Coordinates/CellCoordinates.js';
 import type { CellCoordinatesWithoutColumn } from '../Coordinates/CellCoordinatesWithoutColumn.js';
+import type { VisualColumnIndex } from '../Coordinates/ColumnIndices.js';
 import type { IDataRepository } from '../DataRepository/IDataRepository.js';
 import type { ColumnFiltersState } from '../Filtering/ColumnFiltersState.js';
 import type { CustomRemoteFilters } from '../Filtering/CustomRemoteFilters.js';
@@ -231,9 +232,9 @@ export declare class TableContext<T extends object, RowIdType extends Primitive>
      */
     private get _visualColumns();
     /** Returns the visual index of the column with the given id, or -1 if not found. */
-    columnVisualIndex(id: string): number;
-    get focusStartVisualColumn(): number;
-    get focusEndVisualColumn(): number;
+    columnVisualIndex(id: string): VisualColumnIndex;
+    get focusStartVisualColumn(): VisualColumnIndex;
+    get focusEndVisualColumn(): VisualColumnIndex;
     private _moveFocusEndRow;
     private _moveFocusRow;
     private getHighlightedRowData;

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

@@ -1572,8 +1572,8 @@ export class TableContext {
             // 	newColumns[i].index += 1;
             // }
             if (originalIndex > dropTargetIndex && !targetIsLI(dropTarget)) {
-                newDefs[dropTargetIndex].index += 1;
-                this.dragTarget.index = newDefs[dropTargetIndex].index - 1;
+                newDefs[dropTargetIndex].index = (newDefs[dropTargetIndex].index + 1);
+                this.dragTarget.index = (newDefs[dropTargetIndex].index - 1);
                 newDefs.push(this.dragTarget);
             }
             else {

package/dist/Components/Table/Types/Coordinates/CellCoordinates.d.ts

@@ -1,5 +1,6 @@
+import type { MemoryColumnIndex } from './ColumnIndices.js';
 export interface CellCoordinates {
     row: number;
     id: string;
-    column: number;
+    column: MemoryColumnIndex;
 }

package/dist/Components/Table/Types/Coordinates/ColumnIndices.d.ts

@@ -0,0 +1,8 @@
+/** Position of a column in the `columnDefs` array (memory order). */
+export type MemoryColumnIndex = number & {
+    readonly __brand: 'MemoryColumnIndex';
+};
+/** Position of a column in the visual display order (pinned-left → center → pinned-right). */
+export type VisualColumnIndex = number & {
+    readonly __brand: 'VisualColumnIndex';
+};

package/dist/Components/Table/Types/Coordinates/ColumnIndices.js

@@ -0,0 +1 @@
+export {};

package/package.json

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