From c673b044227a6702c695691be6f94f4331812dec Mon Sep 17 00:00:00 2001 From: braks <78412429+bcakmakoglu@users.noreply.github.com> Date: Tue, 6 Dec 2022 15:57:34 +0100 Subject: [PATCH] fix(edges): type marker prop in `EdgeProps` Signed-off-by: braks <78412429+bcakmakoglu@users.noreply.github.com> --- .changeset/thin-fishes-move.md | 5 +++++ packages/core/src/components/Edges/EdgeWrapper.ts | 1 + packages/core/src/types/edge.ts | 11 +++++------ packages/pathfinding-edge/src/types.ts | 8 ++++---- 4 files changed, 15 insertions(+), 10 deletions(-) create mode 100644 .changeset/thin-fishes-move.md diff --git a/.changeset/thin-fishes-move.md b/.changeset/thin-fishes-move.md new file mode 100644 index 00000000..8f834247 --- /dev/null +++ b/.changeset/thin-fishes-move.md @@ -0,0 +1,5 @@ +--- +'@vue-flow/core': patch +--- + +Type `markerEnd` and `markerStart` in `EdgeProps` diff --git a/packages/core/src/components/Edges/EdgeWrapper.ts b/packages/core/src/components/Edges/EdgeWrapper.ts index 7a986dca..79a0143f 100644 --- a/packages/core/src/components/Edges/EdgeWrapper.ts +++ b/packages/core/src/components/Edges/EdgeWrapper.ts @@ -168,6 +168,7 @@ const EdgeWrapper = defineComponent({ targetNode: props.targetNode, source: edge.source, target: edge.target, + type: edge.type, updatable: props.updatable, selected: edge.selected, animated: edge.animated, diff --git a/packages/core/src/types/edge.ts b/packages/core/src/types/edge.ts index f71f013d..c9025e97 100644 --- a/packages/core/src/types/edge.ts +++ b/packages/core/src/types/edge.ts @@ -123,8 +123,8 @@ export interface EdgeProps { id: string sourceNode: GraphNode targetNode: GraphNode + type?: keyof DefaultEdgeTypes | string label?: string | VNode | Component | Object - type?: string style?: CSSProperties sourceX: number sourceY: number @@ -144,8 +144,8 @@ export interface EdgeProps { labelBgBorderRadius?: number animated?: boolean updatable?: boolean - markerStart?: string - markerEnd?: string + markerStart: string + markerEnd: string curvature?: number interactionWidth?: number data: Data @@ -159,7 +159,6 @@ export interface SmoothStepEdgeProps exte sourceNode: GraphNode targetNode: GraphNode label?: string | VNode | Component | Object - type?: string style?: CSSProperties sourceX: number sourceY: number @@ -179,8 +178,8 @@ export interface SmoothStepEdgeProps exte labelBgBorderRadius?: number animated?: boolean updatable?: boolean - markerStart?: string - markerEnd?: string + markerStart: string + markerEnd: string borderRadius?: number offset?: number interactionWidth?: number diff --git a/packages/pathfinding-edge/src/types.ts b/packages/pathfinding-edge/src/types.ts index 6bf22785..62cd61f7 100644 --- a/packages/pathfinding-edge/src/types.ts +++ b/packages/pathfinding-edge/src/types.ts @@ -21,8 +21,8 @@ export interface PathFindingEdgeProps extends EdgeProps { labelBgPadding?: [number, number] labelBgBorderRadius?: number style?: CSSProperties - markerEnd?: string - markerStart?: string + markerEnd: string + markerStart: string sourceHandleId?: string targetHandleId?: string } @@ -46,8 +46,8 @@ export interface PerfectArrowProps { labelBgPadding?: [number, number] labelBgBorderRadius?: number style?: CSSProperties - markerEnd?: string - markerStart?: string + markerEnd: string + markerStart: string sourceHandleId?: string targetHandleId?: string options?: ArrowOptions