From 22c5821597de2fac15fc297b19dfdcff1478fee4 Mon Sep 17 00:00:00 2001 From: Brenley Dueck Date: Wed, 16 Apr 2025 12:19:03 -0500 Subject: [PATCH 1/2] PLN-263: Fix C4 labels being off --- .../custom/edges/RelationshipEdge.tsx | 20 +++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/packages/diagram/src/likec4diagram/custom/edges/RelationshipEdge.tsx b/packages/diagram/src/likec4diagram/custom/edges/RelationshipEdge.tsx index 2cfed5c802..ebf3975212 100644 --- a/packages/diagram/src/likec4diagram/custom/edges/RelationshipEdge.tsx +++ b/packages/diagram/src/likec4diagram/custom/edges/RelationshipEdge.tsx @@ -60,10 +60,24 @@ export const RelationshipEdge = customEdge((props) = const sourceNode = nonNullable(useXYInternalNode(source)!, `source node ${source} not found`) const targetNode = nonNullable(useXYInternalNode(target)!, `target node ${target} not found`) + console.log('Source Node Positions:', { + absolute: sourceNode.internals.positionAbsolute, + data: sourceNode.data.position, + isSame: isSamePoint(sourceNode.internals.positionAbsolute, sourceNode.data.position), + }) + console.log('Target Node Positions:', { + absolute: targetNode.internals.positionAbsolute, + data: targetNode.data.position, + isSame: isSamePoint(targetNode.internals.positionAbsolute, targetNode.data.position), + }) + console.log('Control Points:', data.controlPoints) + const isModified = isTruthy(data.controlPoints) || !isSamePoint(sourceNode.internals.positionAbsolute, sourceNode.data.position) || !isSamePoint(targetNode.internals.positionAbsolute, targetNode.data.position) + console.log('isModified:', isModified) + let controlPoints = data.controlPoints ?? bezierControlPoints(props.data) let edgePath: string @@ -132,10 +146,8 @@ export const RelationshipEdge = customEdge((props) = 300, ) - if (isModified || isControlPointDragging) { - labelX = labelPos.x - labelY = labelPos.y - } + labelX = labelPos.x + labelY = labelPos.y const onLmbControlPointerDown = (index: number, e: ReactPointerEvent, domNode: HTMLDivElement) => { const { addSelectedEdges } = xyflowStore.getState() From 600addd099ddb0361aabd7296aa43b0bf844f71d Mon Sep 17 00:00:00 2001 From: Brenley Dueck Date: Wed, 16 Apr 2025 12:20:14 -0500 Subject: [PATCH 2/2] PLN-263: Remove unneeded comments --- .../custom/edges/RelationshipEdge.tsx | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/packages/diagram/src/likec4diagram/custom/edges/RelationshipEdge.tsx b/packages/diagram/src/likec4diagram/custom/edges/RelationshipEdge.tsx index ebf3975212..52b36025fb 100644 --- a/packages/diagram/src/likec4diagram/custom/edges/RelationshipEdge.tsx +++ b/packages/diagram/src/likec4diagram/custom/edges/RelationshipEdge.tsx @@ -60,24 +60,10 @@ export const RelationshipEdge = customEdge((props) = const sourceNode = nonNullable(useXYInternalNode(source)!, `source node ${source} not found`) const targetNode = nonNullable(useXYInternalNode(target)!, `target node ${target} not found`) - console.log('Source Node Positions:', { - absolute: sourceNode.internals.positionAbsolute, - data: sourceNode.data.position, - isSame: isSamePoint(sourceNode.internals.positionAbsolute, sourceNode.data.position), - }) - console.log('Target Node Positions:', { - absolute: targetNode.internals.positionAbsolute, - data: targetNode.data.position, - isSame: isSamePoint(targetNode.internals.positionAbsolute, targetNode.data.position), - }) - console.log('Control Points:', data.controlPoints) - const isModified = isTruthy(data.controlPoints) || !isSamePoint(sourceNode.internals.positionAbsolute, sourceNode.data.position) || !isSamePoint(targetNode.internals.positionAbsolute, targetNode.data.position) - console.log('isModified:', isModified) - let controlPoints = data.controlPoints ?? bezierControlPoints(props.data) let edgePath: string