@lavalogic/scoria 0.0.44 → 0.0.46

package/dist/Components/Table/Types/Columns/Definitions/JSONColumnDefSet.d.ts

@@ -0,0 +1,11 @@
+import type { SortingState } from '../../DataRepository/SortingState.js';
+import type { JSONColumnPinningState } from '../JSONColumnPinningState.js';
+import type { VisibilityState } from '../VisibilityState.js';
+import type { ColumnDef } from './ColumnDef.svelte.js';
+export interface JSONColumnDefSet<T extends object> {
+    name: string;
+    sortingState: SortingState;
+    visibilityState: VisibilityState;
+    columnPinningState: JSONColumnPinningState;
+    columnDefs: Array<ColumnDef<T>>;
+}

package/dist/Components/Table/Types/Columns/JSONColumnPinningState.d.ts

@@ -0,0 +1,4 @@
+export interface JSONColumnPinningState {
+    left?: Array<[string, number]>;
+    right?: Array<[string, number]>;
+}

package/dist/Components/Table/Types/Columns/JSONColumnPinningState.js

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

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

@@ -14,8 +14,6 @@ import { DateInputDef } from '../Columns/Definitions/Accessors/DateInputDef.svel
 import { ProgressBarDef } from '../Columns/Definitions/Display/ProgressBarDef.svelte.js';
 import { DisplayDef } from '../Columns/Definitions/Display/DisplayDef.svelte.js';
 import { browser } from '$app/environment';
-import { NumberDateFilterMode } from '../Filtering/NumberDateFilterMode.js';
-import { FilterValueType } from '../Filtering/FilterValueType.js';
 const SORTING_ICON_WIDTH = 24;
 const InternalSymbol = Symbol();
 export class TableContext {
@@ -100,7 +98,7 @@ export class TableContext {
                     if (savedPresets) {
                         const presets = JSON.parse(savedPresets);
                         if (presets[0] && areDefsEquivalent(defs, presets[0].columnDefs)) {
-                            return this.reassignDefsToPresets(presets).then(() => presets);
+                            return this.reassignDefsToPresets(presets).then((p) => p);
                         }
                     }
                 }
@@ -638,10 +636,6 @@ export class TableContext {
             const rightVisibleCells = $derived([...(this.columnPinning.right?.keys() ?? [])].map(makeCellFromId) ?? []);
             const centerVisibleCells = $derived(this.columnDefs
                 .filter((it) => {
-                if (this.columnPinning.left && typeof this.columnPinning.left.has == 'function') {
-                    // eslint-disable-next-line no-debugger
-                    debugger;
-                }
                 return !(this.columnPinning.left?.has(it.id) || this.columnPinning.right?.has(it.id));
             })
                 .map(makeRow));
@@ -1617,10 +1611,6 @@ export class TableContext {
         const rightVisibleCells = $derived([...(this.columnPinning.right?.keys() ?? [])].map(makeCellFromId) ?? []);
         const centerVisibleCells = $derived(this.columnDefs
             .filter((it) => {
-            if (this.columnPinning.left && typeof this.columnPinning.left.has == 'function') {
-                // eslint-disable-next-line no-debugger
-                debugger;
-            }
             return !(this.columnPinning.left?.has(it.id) || this.columnPinning.right?.has(it.id));
         })
             .map(makeRow));
@@ -1846,10 +1836,6 @@ export class TableContext {
         const midDefs = [];
         const rightDefs = [];
         this.columnDefs.forEach((def) => {
-            if (this.columnPinning.left && typeof this.columnPinning.left.has == 'function') {
-                // eslint-disable-next-line no-debugger
-                debugger;
-            }
             if (this.columnPinning.left?.has(def.id)) {
                 leftDefs.push(def);
             }
@@ -1981,10 +1967,6 @@ export class TableContext {
             left: new Map(this.columnPinning.left &&
                 this.columnDefs
                     .filter((col) => {
-                    if (this.columnPinning.left && typeof this.columnPinning.left.has == 'function') {
-                        // eslint-disable-next-line no-debugger
-                        debugger;
-                    }
                     this.columnPinning.left?.has(col.id);
                 })
                     .map((col, index) => [col.id, index])),
@@ -2021,16 +2003,20 @@ export class TableContext {
         const adjustedDefs = this.columnDefs;
         const asMap = columnDefsToMap(adjustedDefs);
         console.log('reassigning presets');
-        presets.forEach((preset) => {
-            preset.columnDefs.forEach((def, index) => {
-                const realDef = def.columnType == ColumnType.RowSelect || def.columnType == ColumnType.Actions
-                    ? adjustedDefs.find((it) => it.columnType === def.columnType)
-                    : asMap.get(def.id);
-                if (!realDef) {
-                    throw new Error('Could not find equivalent column def:', { cause: def });
-                }
-                preset.columnDefs[index] = realDef;
-            });
+        return presets.map((preset) => {
+            return {
+                ...preset,
+                columnPinningState: adaptJSONPinningState(preset.columnPinningState),
+                columnDefs: preset.columnDefs.map((def, index) => {
+                    const realDef = def.columnType == ColumnType.RowSelect || def.columnType == ColumnType.Actions
+                        ? adjustedDefs.find((it) => it.columnType === def.columnType)
+                        : asMap.get(def.id);
+                    if (!realDef) {
+                        throw new Error('Could not find equivalent column def:', { cause: def });
+                    }
+                    return (preset.columnDefs[index] = realDef);
+                })
+            };
         });
     }
 }
@@ -2143,11 +2129,6 @@ function generateTableOptions(contextObj) {
             if (!isVisible) {
                 return false;
             }
-            if (contextObj.columnPinning.left &&
-                typeof contextObj.columnPinning.left.has != 'function') {
-                // eslint-disable-next-line no-debugger
-                debugger;
-            }
             return contextObj.columnPinning.left?.has(it.id);
         })
             .map(makeHeader);
@@ -2174,11 +2155,6 @@ function generateTableOptions(contextObj) {
     const centerHeaderGroups = $derived.by(() => {
         const headers = contextObj.columnDefs
             .filter((it) => {
-            if (contextObj.columnPinning.left &&
-                typeof contextObj.columnPinning.left.has == 'function') {
-                // eslint-disable-next-line no-debugger
-                debugger;
-            }
             return (contextObj.columnVisibility[it.id] != false &&
                 !(contextObj.columnPinning.left?.has(it.id) || contextObj.columnPinning.right?.has(it.id)));
         })
@@ -2354,4 +2330,10 @@ function progressSortingFn(id, desc) {
             return 0;
         };
 }
+function adaptJSONPinningState(state) {
+    return {
+        left: new Map(state.left),
+        right: new Map(state.right)
+    };
+}
 // #endregion

package/dist/index.d.ts

@@ -21,7 +21,6 @@ export { type AccessorFn } from './Components/Table/Types/Columns/Definitions/Ac
 export { type ColumnDefProps, ColumnDef } from './Components/Table/Types/Columns/Definitions/ColumnDef.svelte.js';
 export { type ColumnDefSet } from './Components/Table/Types/Columns/Definitions/ColumnDefSet.js';
 export { type ValidationFn } from './Components/Table/Types/Columns/Definitions/ValidationFn.js';
-export { type ColumnDefPreset } from './Components/Table/Types/Columns/ColumnDefPreset.js';
 export { type ColumnPinningState } from './Components/Table/Types/Columns/ColumnPinningState.js';
 export { type ColumnSizingState } from './Components/Table/Types/Columns/ColumnSizingState.js';
 export { ColumnType } from './Components/Table/Types/Columns/ColumnType.js';

package/dist/index.js

@@ -26,7 +26,6 @@ export { ColumnDef } from './Components/Table/Types/Columns/Definitions/ColumnDe
 export {} from './Components/Table/Types/Columns/Definitions/ColumnDefSet.js';
 export {} from './Components/Table/Types/Columns/Definitions/ValidationFn.js';
 // Column is not exported
-export {} from './Components/Table/Types/Columns/ColumnDefPreset.js';
 export {} from './Components/Table/Types/Columns/ColumnPinningState.js';
 export {} from './Components/Table/Types/Columns/ColumnSizingState.js';
 export { ColumnType } from './Components/Table/Types/Columns/ColumnType.js';

package/package.json

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

package/dist/Components/Table/Types/Columns/ColumnDefPreset.d.ts

@@ -1,11 +0,0 @@
-import type { SortingState } from '../DataRepository/SortingState.js';
-import type { ColumnPinningState } from './ColumnPinningState.js';
-import type { ColumnDef } from './Definitions/ColumnDef.svelte.js';
-import type { VisibilityState } from './VisibilityState.js';
-export interface ColumnDefPreset<T extends object> {
-    name: string;
-    sortingState: SortingState;
-    visibilityState: VisibilityState;
-    columnPinningState: ColumnPinningState;
-    columnDefs: Array<ColumnDef<T>>;
-}