terrastruct · ShupingHe · Apr 13, 2023 · Apr 13, 2023 · Apr 20, 2023 · gavin-ts
diff --git a/ci/release/changelogs/next.md b/ci/release/changelogs/next.md
@@ -2,6 +2,7 @@
 
 - Export diagrams to `.pptx` (PowerPoint)[#1139](https://github.com/terrastruct/d2/pull/1139)
 - Customize gap size in grid diagrams with `grid-gap`, `vertical-gap`, or `horizontal-gap` [#1178](https://github.com/terrastruct/d2/issues/1178)
+- Exclude arrowheads when position connection label [#793](https://github.com/terrastruct/d2/pull/1192)
 
 #### Improvements 🧹
 

diff --git a/d2renderers/d2sketch/testdata/connection_label/sketch.exp.svg b/d2renderers/d2sketch/testdata/connection_label/sketch.exp.svg
diff --git a/d2renderers/d2sketch/testdata/connection_label_dark/sketch.exp.svg b/d2renderers/d2sketch/testdata/connection_label_dark/sketch.exp.svg
diff --git a/d2renderers/d2sketch/testdata/dots-real/sketch.exp.svg b/d2renderers/d2sketch/testdata/dots-real/sketch.exp.svg
diff --git a/d2renderers/d2sketch/testdata/opacity/sketch.exp.svg b/d2renderers/d2sketch/testdata/opacity/sketch.exp.svg
diff --git a/d2renderers/d2sketch/testdata/opacity_dark/sketch.exp.svg b/d2renderers/d2sketch/testdata/opacity_dark/sketch.exp.svg
diff --git a/d2renderers/d2sketch/testdata/paper-real/sketch.exp.svg b/d2renderers/d2sketch/testdata/paper-real/sketch.exp.svg
diff --git a/d2renderers/d2sketch/testdata/terminal/sketch.exp.svg b/d2renderers/d2sketch/testdata/terminal/sketch.exp.svg
diff --git a/d2renderers/d2sketch/testdata/twitter/sketch.exp.svg b/d2renderers/d2sketch/testdata/twitter/sketch.exp.svg
diff --git a/d2renderers/d2sketch/testdata/twitter_dark/sketch.exp.svg b/d2renderers/d2sketch/testdata/twitter_dark/sketch.exp.svg
diff --git a/d2renderers/d2svg/appendix/testdata/diagram_wider_than_tooltip/sketch.exp.svg b/d2renderers/d2svg/appendix/testdata/diagram_wider_than_tooltip/sketch.exp.svg
diff --git a/d2renderers/d2svg/d2svg.go b/d2renderers/d2svg/d2svg.go
@@ -549,9 +549,18 @@ func drawConnection(writer io.Writer, labelMaskID string, connection d2target.Co
 		markerEnd = fmt.Sprintf(`marker-end="url(#%s)" `, id)
 	}
 
+	srcAdj, dstAdj := getArrowheadAdjustments(connection, idToShape)
+	path := pathData(connection, srcAdj, dstAdj)
+	mask := fmt.Sprintf(`mask="url(#%s)"`, labelMaskID)
+
 	var labelTL *geo.Point
 	if connection.Label != "" {
-		labelTL = connection.GetLabelTopLeft()
+		srcArrowWidth, _ := arrowheadDimensions(connection.SrcArrow, float64(connection.StrokeWidth))
+		dstArrowWidth, _ := arrowheadDimensions(connection.DstArrow, float64(connection.StrokeWidth))
+
+		srcAdjDistance := geo.EuclideanDistance(srcAdj.X, srcAdj.Y, 0, 0) + srcArrowWidth
+		dstAdjDistance := geo.EuclideanDistance(dstAdj.X, dstAdj.Y, 0, 0) + dstArrowWidth
+		labelTL = connection.GetLabelTopLeft(srcAdjDistance, dstAdjDistance)
 path = append(path, fmt.Sprintf("M %f %f", 
 	route[0].X+srcAdj.X, 
 	route[0].Y+srcAdj.Y, 
 )) 
 v := geo.NewVector(end.X-start.X, end.Y-start.Y) 
 return v.Unit().Multiply(-distance).ToPoint() 
 path = append(path, fmt.Sprintf("M %f %f", 
 	route[0].X+srcAdj.X, 
 	route[0].Y+srcAdj.Y, 
 )) 
 v := geo.NewVector(end.X-start.X, end.Y-start.Y) 
 return v.Unit().Multiply(-distance).ToPoint() 
 		labelTL.X = math.Round(labelTL.X)
 		labelTL.Y = math.Round(labelTL.Y)
 
@@ -560,9 +569,6 @@ func drawConnection(writer io.Writer, labelMaskID string, connection d2target.Co
 		}
 	}
 
-	srcAdj, dstAdj := getArrowheadAdjustments(connection, idToShape)
-	path := pathData(connection, srcAdj, dstAdj)
-	mask := fmt.Sprintf(`mask="url(#%s)"`, labelMaskID)
 	if sketchRunner != nil {
 		out, err := d2sketch.Connection(sketchRunner, connection, path, mask)
 		if err != nil {
@@ -644,7 +650,7 @@ func drawConnection(writer io.Writer, labelMaskID string, connection d2target.Co
 }
 
 func renderArrowheadLabel(connection d2target.Connection, text string, position, width, height float64) string {
-	labelTL := label.UnlockedTop.GetPointOnRoute(connection.Route, float64(connection.StrokeWidth), position, width, height)
+	labelTL := label.UnlockedTop.GetPointOnRoute(connection.Route, float64(connection.StrokeWidth), position, width, height, 0, 0)
 
 	textEl := d2themes.NewThemableElement("text")
 	textEl.X = labelTL.X + width/2

diff --git a/d2renderers/d2svg/dark_theme/testdata/connection_label/dark_theme.exp.svg b/d2renderers/d2svg/dark_theme/testdata/connection_label/dark_theme.exp.svg
diff --git a/d2renderers/d2svg/dark_theme/testdata/opacity/dark_theme.exp.svg b/d2renderers/d2svg/dark_theme/testdata/opacity/dark_theme.exp.svg