Merging dev into main #49

Merged
8464960 merged 260 commits from dev into main 2026-01-28 10:48:52 +00:00
2 changed files with 21 additions and 17 deletions
Showing only changes of commit 757435e9f8 - Show all commits

View File

@@ -25,14 +25,16 @@ import { UndoRedo } from "./EditorUndoRedo.ts";
*/ */
function createNode(id: string, type: string, position: XYPosition, data: Record<string, unknown>, deletable?: boolean) { function createNode(id: string, type: string, position: XYPosition, data: Record<string, unknown>, deletable?: boolean) {
const defaultData = NodeDefaults[type as keyof typeof NodeDefaults] const defaultData = NodeDefaults[type as keyof typeof NodeDefaults]
const newData = { return {
id: id, id,
type: type, type,
position: position, position,
data: data, deletable,
deletable: deletable, data: {
...defaultData,
...data,
},
} }
return {...defaultData, ...newData}
} }
//* Initial nodes, created by using createNode. */ //* Initial nodes, created by using createNode. */

View File

@@ -15,14 +15,16 @@ describe('NormNode', () => {
function createNode(id: string, type: string, position: XYPosition, data: Record<string, unknown>, deletable?: boolean) { function createNode(id: string, type: string, position: XYPosition, data: Record<string, unknown>, deletable?: boolean) {
const defaultData = NodeDefaults[type as keyof typeof NodeDefaults] const defaultData = NodeDefaults[type as keyof typeof NodeDefaults]
const newData = { return {
id: id, id,
type: type, type,
position: position, position,
data: data, deletable,
deletable: deletable, data: {
...defaultData,
...data,
},
} }
return {...defaultData, ...newData}
} }