From 7719f182415ee754ddbe9e4416a2bb3f0ca202ea Mon Sep 17 00:00:00 2001 From: braks <78412429+bcakmakoglu@users.noreply.github.com> Date: Mon, 19 Dec 2022 20:24:12 +0100 Subject: [PATCH] chore(core): cleanup Signed-off-by: braks <78412429+bcakmakoglu@users.noreply.github.com> --- packages/core/src/auto-imports.d.ts | 1 + .../core/src/container/EdgeRenderer/MarkerDefinitions.vue | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/core/src/auto-imports.d.ts b/packages/core/src/auto-imports.d.ts index 492db360..8030b370 100644 --- a/packages/core/src/auto-imports.d.ts +++ b/packages/core/src/auto-imports.d.ts @@ -9,6 +9,7 @@ declare global { const $shallowRef: typeof import('vue/macros')['$shallowRef'] const $toRef: typeof import('vue/macros')['$toRef'] const ARIA_EDGE_DESC_KEY: typeof import('./utils/a11y')['ARIA_EDGE_DESC_KEY'] + const ARIA_LIVE_MESSAGE: typeof import('./utils/a11y')['ARIA_LIVE_MESSAGE'] const ARIA_NODE_DESC_KEY: typeof import('./utils/a11y')['ARIA_NODE_DESC_KEY'] const EdgeId: typeof import('./context/index')['EdgeId'] const EdgeRef: typeof import('./context/index')['EdgeRef'] diff --git a/packages/core/src/container/EdgeRenderer/MarkerDefinitions.vue b/packages/core/src/container/EdgeRenderer/MarkerDefinitions.vue index 41542088..43b781f4 100644 --- a/packages/core/src/container/EdgeRenderer/MarkerDefinitions.vue +++ b/packages/core/src/container/EdgeRenderer/MarkerDefinitions.vue @@ -2,7 +2,7 @@ import type { EdgeMarkerType, MarkerProps, MarkerType } from '../../types/edge' import Marker from './Marker.vue' -const { edges, connectionLineOptions, defaultMarkerColor: defaultColor } = $(useVueFlow()) +const { id: vueFlowId, edges, connectionLineOptions, defaultMarkerColor: defaultColor } = $(useVueFlow()) const markers = computed(() => { const ids: string[] = [] @@ -10,7 +10,7 @@ const markers = computed(() => { const createMarkers = (marker?: EdgeMarkerType) => { if (marker) { - const markerId = getMarkerId(marker) + const markerId = getMarkerId(marker, vueFlowId) if (!ids.includes(markerId)) { if (typeof marker === 'object') markers.push({ ...marker, id: markerId, color: marker.color || defaultColor }) else markers.push({ id: markerId, color: defaultColor, type: marker as MarkerType })