Merge branch 'svelte-flow-default-edge-option' into svelte-flow-fit-view-options

This commit is contained in:
Peter
2023-09-26 11:03:17 +02:00
3 changed files with 6 additions and 7 deletions
@@ -169,9 +169,6 @@
}} }}
autoPanOnConnect autoPanOnConnect
autoPanOnNodeDrag autoPanOnNodeDrag
defaultEdgeOptions={{
hidden: false
}}
> >
<Controls /> <Controls />
<Background variant={BackgroundVariant.Dots} /> <Background variant={BackgroundVariant.Dots} />
@@ -1,10 +1,11 @@
<script lang="ts"> <script lang="ts">
import { onMount } from 'svelte';
import { EdgeWrapper } from '$lib/components/EdgeWrapper'; import { EdgeWrapper } from '$lib/components/EdgeWrapper';
import { MarkerDefinition } from '$lib/container/EdgeRenderer/MarkerDefinition'; import { MarkerDefinition } from '$lib/container/EdgeRenderer/MarkerDefinition';
import { useStore } from '$lib/store'; import { useStore } from '$lib/store';
import type { DefaultEdgeOptions } from '$lib/types'; import type { DefaultEdgeOptions } from '$lib/types';
export let defaultOptions: DefaultEdgeOptions | undefined; export let defaultEdgeOptions: DefaultEdgeOptions | undefined;
const { const {
width, width,
@@ -14,7 +15,9 @@
edges: { setDefaultOptions } edges: { setDefaultOptions }
} = useStore(); } = useStore();
$: if (defaultOptions) setDefaultOptions(defaultOptions); onMount(() => {
if (defaultEdgeOptions) setDefaultOptions(defaultEdgeOptions);
});
</script> </script>
{#each $edgeTree as group (group.level)} {#each $edgeTree as group (group.level)}
@@ -27,7 +30,6 @@
edge.selectable || edge.selectable ||
($elementsSelectable && typeof edge.selectable === 'undefined') ($elementsSelectable && typeof edge.selectable === 'undefined')
)} )}
<EdgeWrapper {...edge} type={edgeType} {selectable} on:edgeclick /> <EdgeWrapper {...edge} type={edgeType} {selectable} on:edgeclick />
{/each} {/each}
</g> </g>
@@ -155,7 +155,7 @@
> >
<Pane on:paneclick panOnDrag={panOnDrag === undefined ? true : panOnDrag}> <Pane on:paneclick panOnDrag={panOnDrag === undefined ? true : panOnDrag}>
<ViewportComponent> <ViewportComponent>
<EdgeRenderer on:edgeclick defaultOptions={defaultEdgeOptions} /> <EdgeRenderer on:edgeclick {defaultEdgeOptions} />
<ConnectionLine /> <ConnectionLine />
<div class="svelte-flow__edgelabel-renderer" /> <div class="svelte-flow__edgelabel-renderer" />
<NodeRenderer <NodeRenderer