From 994b40308918477681286079074243ff45a77aeb Mon Sep 17 00:00:00 2001 From: bcakmakoglu <78412429+bcakmakoglu@users.noreply.github.com> Date: Tue, 8 Mar 2022 17:11:54 +0100 Subject: [PATCH] feat(edges): allow markers to have unique id * fix overwriting by spreading marker def Signed-off-by: bcakmakoglu <78412429+bcakmakoglu@users.noreply.github.com> --- src/container/EdgeRenderer/MarkerDefinitions.vue | 2 +- src/types/edge.ts | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/container/EdgeRenderer/MarkerDefinitions.vue b/src/container/EdgeRenderer/MarkerDefinitions.vue index 33d234ea..7e6aaa00 100644 --- a/src/container/EdgeRenderer/MarkerDefinitions.vue +++ b/src/container/EdgeRenderer/MarkerDefinitions.vue @@ -22,7 +22,7 @@ const markers = computed(() => { if (marker) { const markerId = getMarkerId(marker) if (!ids.includes(markerId)) { - if (typeof marker === 'object') markers.push({ id: markerId, color: marker.color || props.defaultColor, ...marker }) + if (typeof marker === 'object') markers.push({ ...marker, id: markerId, color: marker.color || props.defaultColor }) else markers.push({ id: markerId, color: props.defaultColor, type: marker as MarkerType }) ids.push(markerId) } diff --git a/src/types/edge.ts b/src/types/edge.ts index f1a7ae26..9a51450a 100644 --- a/src/types/edge.ts +++ b/src/types/edge.ts @@ -8,6 +8,7 @@ export enum MarkerType { } export interface EdgeMarker { + id?: string type: MarkerType color?: string width?: number