fix(core): get correct handle pos for connection line

This commit is contained in:
braks
2023-07-24 09:55:03 +02:00
committed by Braks
parent f28a4e03b9
commit 17755ddb9a
2 changed files with 12 additions and 10 deletions
@@ -1,8 +1,8 @@
import type { Component } from 'vue'
import type { DefineComponent } from 'vue'
import { defineComponent, h, inject } from 'vue'
import type { ConnectionLineProps } from '~/types'
import { ConnectionLineType, ConnectionMode, Position } from '~/types'
import { getMarkerId } from '~/utils'
import { getHandlePosition, getMarkerId } from '~/utils'
import { useVueFlow } from '~/composables'
import { Slots } from '~/context'
import { getBezierPath, getSimpleBezierPath, getSmoothStepPath } from '~/components/Edges/utils'
@@ -31,7 +31,7 @@ const ConnectionLine = defineComponent({
findNode,
} = useVueFlow()
const connectionLineComponent = inject(Slots)?.['connection-line'] as Component<ConnectionLineProps> | undefined
const connectionLineComponent = inject(Slots)?.['connection-line'] as DefineComponent<ConnectionLineProps> | undefined
return () => {
if (!connectionStartHandle.value) {
@@ -64,12 +64,14 @@ const ConnectionLine = defineComponent({
return null
}
const fromHandle = handleId ? handleBounds.find((d) => d.id === handleId) : handleBounds[0]
const fromHandleX = fromHandle ? fromHandle.x + fromHandle.width / 2 : (fromNode.dimensions.width ?? 0) / 2
const fromHandleY = fromHandle ? fromHandle.y + fromHandle.height / 2 : fromNode.dimensions.height ?? 0
const fromX = (fromNode.computedPosition?.x ?? 0) + fromHandleX
const fromY = (fromNode.computedPosition?.y ?? 0) + fromHandleY
const fromPosition = fromHandle?.position
const fromHandle = (handleId ? handleBounds.find((d) => d.id === handleId) : handleBounds[0]) ?? null
const fromPosition = fromHandle?.position || Position.Top
const { x: fromX, y: fromY } = getHandlePosition(
fromPosition,
{ ...fromNode.dimensions, ...fromNode.computedPosition },
fromHandle,
)
const toHandle =
(targetNode &&
connectionEndHandle.value?.handleId &&
+1 -1
View File
@@ -71,7 +71,7 @@ export interface ConnectionLineProps {
/** The source node of the connection line */
sourceNode: GraphNode
/** The source handle element (not the DOM element) of the connection line */
sourceHandle: HandleElement
sourceHandle: HandleElement | null
/** The target node of the connection line */
targetNode: GraphNode | null
/** The target handle element (not the DOM element) of the connection line */