From 0d76bcf2fd3038b2df2ad2556d7aa478023130c5 Mon Sep 17 00:00:00 2001 From: peterkogo Date: Wed, 3 Apr 2024 10:11:45 +0200 Subject: [PATCH 1/3] make possible to change edge types --- .../src/lib/components/EdgeWrapper/EdgeWrapper.svelte | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/svelte/src/lib/components/EdgeWrapper/EdgeWrapper.svelte b/packages/svelte/src/lib/components/EdgeWrapper/EdgeWrapper.svelte index 0a229099..33bb51ec 100644 --- a/packages/svelte/src/lib/components/EdgeWrapper/EdgeWrapper.svelte +++ b/packages/svelte/src/lib/components/EdgeWrapper/EdgeWrapper.svelte @@ -51,7 +51,7 @@ edgecontextmenu: { edge: Edge; event: MouseEvent }; }>(); - const edgeType = type || 'default'; + $: edgeType = type || 'default'; $: edgeComponent = $edgeTypes[edgeType] || BezierEdgeInternal; $: markerStartUrl = markerStart ? `url(#${getMarkerId(markerStart, $flowId)})` : undefined; $: markerEndUrl = markerEnd ? `url(#${getMarkerId(markerEnd, $flowId)})` : undefined; @@ -92,8 +92,8 @@ aria-label={ariaLabel === null ? undefined : ariaLabel - ? ariaLabel - : `Edge from ${source} to ${target}`} + ? ariaLabel + : `Edge from ${source} to ${target}`} role="img" > Date: Wed, 3 Apr 2024 16:43:27 +0200 Subject: [PATCH 2/3] make node types also dynamic --- .../components/NodeWrapper/NodeWrapper.svelte | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/packages/svelte/src/lib/components/NodeWrapper/NodeWrapper.svelte b/packages/svelte/src/lib/components/NodeWrapper/NodeWrapper.svelte index eff6c733..defe14b2 100644 --- a/packages/svelte/src/lib/components/NodeWrapper/NodeWrapper.svelte +++ b/packages/svelte/src/lib/components/NodeWrapper/NodeWrapper.svelte @@ -55,24 +55,25 @@ handleNodeSelection, updateNodeDimensions } = store; - const nodeType = type || 'default'; let nodeRef: HTMLDivElement; let prevNodeRef: HTMLDivElement; - - const nodeTypeValid = !!$nodeTypes[nodeType]; - - if (!nodeTypeValid) { - console.warn('003', errorMessages['error003'](type!)); - } - - const nodeComponent = $nodeTypes[nodeType] || DefaultNode; const dispatchNodeEvent = createNodeEventDispatcher(); const connectableStore = writable(connectable); let prevType: string | undefined = undefined; let prevSourcePosition: Position | undefined = undefined; let prevTargetPosition: Position | undefined = undefined; + $: nodeType = type || 'default'; + $: nodeTypeValid = !!$nodeTypes[nodeType]; + $: nodeComponent = $nodeTypes[nodeType] || DefaultNode; + + $: { + if (!nodeTypeValid) { + console.warn('003', errorMessages['error003'](type!)); + } + } + $: inlineStyleDimensions = getNodeInlineStyleDimensions({ width, height, From 5043e77effdf8cc32505ee0ea3d22d8b4c07984f Mon Sep 17 00:00:00 2001 From: Moritz Klack Date: Wed, 3 Apr 2024 16:59:50 +0200 Subject: [PATCH 3/3] fix(svelte): merge conflict --- .../src/lib/components/NodeWrapper/NodeWrapper.svelte | 7 ------- 1 file changed, 7 deletions(-) diff --git a/packages/svelte/src/lib/components/NodeWrapper/NodeWrapper.svelte b/packages/svelte/src/lib/components/NodeWrapper/NodeWrapper.svelte index 5fdff03e..e502cd50 100644 --- a/packages/svelte/src/lib/components/NodeWrapper/NodeWrapper.svelte +++ b/packages/svelte/src/lib/components/NodeWrapper/NodeWrapper.svelte @@ -58,13 +58,6 @@ let nodeRef: HTMLDivElement; let prevNodeRef: HTMLDivElement | null = null; - const nodeTypeValid = !!$nodeTypes[nodeType]; - - if (!nodeTypeValid) { - console.warn('003', errorMessages['error003'](type!)); - } - - const nodeComponent = $nodeTypes[nodeType] || DefaultNode; const dispatchNodeEvent = createNodeEventDispatcher(); const connectableStore = writable(connectable); let prevType: string | undefined = undefined;