@lavalogic/scoria 0.22.3 → 0.22.5

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

@@ -1,6 +1,7 @@
 import type { Pixels } from '../../../../../Types/Internal/Misc.js';
 import type { SelectOption } from '../../../../../Types/Internal/SelectOption.js';
 import type { Snippet } from 'svelte';
+import type { MemoryColumnIndex } from '../../Coordinates/ColumnIndices.js';
 import type { FilterFn } from '../../Filtering/FilterFn.js';
 import type { FilterValueType } from '../../Filtering/FilterValueType.js';
 import { ColumnType } from '../ColumnType.js';
@@ -10,7 +11,7 @@ export interface ColumnDefProps<T extends object, in FilterFnType, out OptionsTy
     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/Columns/Definitions/ColumnDef.svelte.js

@@ -66,7 +66,7 @@ export class ColumnDef {
             console.warn(`Column ${this.id} is not sortable`);
             return;
         }
-        this._isResizing = v;
+        this._visible = v;
     }
     _filterValueType;
     get filterValueType() {

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

@@ -1163,7 +1163,7 @@ export class TableContext {
         }
     };
     resetSelectedItems = () => {
-        this._selectedItems = new SvelteMap();
+        this._selectedItems.clear();
     };
     selectAllInCurrentPage = async () => {
         void this.paginationRepo?.pageStartIndex;
@@ -1173,18 +1173,20 @@ export class TableContext {
             ? Math.min(this.paginationRepo.pageEndIndexExclusive, sortedData.length)
             : sortedData.length;
         // Will be doing one full reassignment to this.selectedItems to avoid svelteMap redraws
-        const cloned = new SvelteMap(this.selectedItems);
+        // const cloned = new SvelteMap(this.selectedItems);
+        const sel = this.selectedItems; // HACK: keep the same svelteMap going so that we can support setSelectionMap()
+        // if this is deemed problematic, we'll need to find another way to ask for a new map from the context consumer
         const pending = [];
         if (this.allSelectedInCurrentPage) {
             for (let i = pageStartIndex; i < pageEndIndexExclusive; i++) {
                 const raw = this._cachedKey(sortedData[i]);
                 if (raw instanceof Promise) {
                     pending.push(raw.then((key) => {
-                        cloned.delete(key);
+                        sel.delete(key);
                     }));
                 }
                 else {
-                    cloned.delete(raw);
+                    sel.delete(raw);
                 }
             }
         }
@@ -1202,10 +1204,10 @@ export class TableContext {
                         const raw = this._cachedKey(item);
                         if (raw instanceof Promise) {
                             return raw.then((key) => {
-                                cloned.set(key, item);
+                                sel.set(key, item);
                             });
                         }
-                        cloned.set(raw, item);
+                        sel.set(raw, item);
                     };
                     const r = s instanceof Promise ? s.then(doSet) : doSet(s);
                     if (r instanceof Promise) {
@@ -1219,11 +1221,11 @@ export class TableContext {
                     const raw = this._cachedKey(item);
                     if (raw instanceof Promise) {
                         pending.push(raw.then((key) => {
-                            cloned.set(key, item);
+                            sel.set(key, item);
                         }));
                     }
                     else {
-                        cloned.set(raw, item);
+                        sel.set(raw, item);
                     }
                 }
             }
@@ -1231,7 +1233,8 @@ export class TableContext {
         if (pending.length > 0) {
             await Promise.all(pending);
         }
-        this._selectedItems = cloned;
+        // HACK
+        // this._selectedItems = cloned;
     };
     onHighlightAll = () => {
         if (this.allHighlighted) {
@@ -1572,8 +1575,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/dist/Helpers/Helpers.svelte.js

@@ -75,10 +75,12 @@ export function SQLFriendly(date) {
 }
 export function SQLFriendlyWithLocalTime(date, timeDate) {
     if (typeof date === 'string') {
-        date = new SvelteDate(date);
+        // eslint-disable-next-line svelte/prefer-svelte-reactivity
+        date = new Date(date);
     }
     if (typeof timeDate === 'string') {
-        timeDate = new SvelteDate(date);
+        // eslint-disable-next-line svelte/prefer-svelte-reactivity
+        timeDate = new Date(timeDate);
     }
     return `${date.getFullYear()}-${(date.getMonth() + 1).toString().padStart(2, '0')}-${date
         .getDate()

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.5",
   "publishConfig": {
     "access": "restricted"
   },