From d61287dec5bd8a0157859705423d963b24def29b Mon Sep 17 00:00:00 2001
From: Adam <10365463+adamratson@users.noreply.github.com>
Date: Wed, 18 Dec 2024 17:40:01 +0000
Subject: [PATCH 1/3] Add box arrowheads
---
ci/release/changelogs/next.md | 1 +
d2renderers/d2sketch/sketch.go | 16 +
d2renderers/d2sketch/sketch_test.go | 14 +
.../testdata/arrowheads/sketch.exp.svg | 172 +-
d2renderers/d2svg/d2svg.go | 45 +
d2target/d2target.go | 13 +
.../TestCLI_E2E/internal_linked_pdf.exp.pdf | Bin 62090 -> 61984 bytes
.../testdata/TestCLI_E2E/no-nav-pdf.exp.pdf | Bin 91360 -> 91181 bytes
.../testdata/TestCLI_E2E/no-nav-pptx.exp.pptx | Bin 119049 -> 118418 bytes
.../TestCLI_E2E/pptx-theme-overrides.exp.pptx | Bin 35186 -> 35185 bytes
.../TestCLI_E2E/renamed-board.exp.pdf | Bin 107032 -> 106789 bytes
.../testdata/TestCLI_E2E/theme-pdf.exp.pdf | Bin 17223 -> 17223 bytes
e2etests/stable_test.go | 23 +
e2etests/testdata/files/arrowhead_scaling.d2 | 72 +
.../arrowhead_scaling/dagre/board.exp.json | 2068 +++++++++++++++--
.../arrowhead_scaling/dagre/sketch.exp.svg | 212 +-
.../arrowhead_scaling/elk/board.exp.json | 1668 ++++++++++++-
.../arrowhead_scaling/elk/sketch.exp.svg | 212 +-
.../stable/box_arrowhead/dagre/board.exp.json | 314 +++
.../stable/box_arrowhead/dagre/sketch.exp.svg | 107 +
.../stable/box_arrowhead/elk/board.exp.json | 296 +++
.../stable/box_arrowhead/elk/sketch.exp.svg | 107 +
22 files changed, 4792 insertions(+), 548 deletions(-)
create mode 100644 e2etests/testdata/stable/box_arrowhead/dagre/board.exp.json
create mode 100644 e2etests/testdata/stable/box_arrowhead/dagre/sketch.exp.svg
create mode 100644 e2etests/testdata/stable/box_arrowhead/elk/board.exp.json
create mode 100644 e2etests/testdata/stable/box_arrowhead/elk/sketch.exp.svg
diff --git a/ci/release/changelogs/next.md b/ci/release/changelogs/next.md
index 302685f37..91c1369b4 100644
--- a/ci/release/changelogs/next.md
+++ b/ci/release/changelogs/next.md
@@ -4,6 +4,7 @@
- Connections now support `link` [#1955](https://github.com/terrastruct/d2/pull/1955)
- Vars: vars in markdown blocks are substituted [#2218](https://github.com/terrastruct/d2/pull/2218)
- Markdown: Github-flavored tables work in `md` blocks [#2221](https://github.com/terrastruct/d2/pull/2221)
+- Adds box arrowheads [#2227](https://github.com/terrastruct/d2/issues/2227)
#### Improvements 🧹
diff --git a/d2renderers/d2sketch/sketch.go b/d2renderers/d2sketch/sketch.go
index f873eda78..40d6692f2 100644
--- a/d2renderers/d2sketch/sketch.go
+++ b/d2renderers/d2sketch/sketch.go
@@ -850,6 +850,22 @@ func ArrowheadJS(r *Runner, arrowhead d2target.Arrowhead, stroke string, strokeW
stroke,
BG_COLOR,
)
+ case d2target.BoxArrowhead:
+ arrowJS = fmt.Sprintf(
+ `node = rc.polygon(%s, { strokeWidth: %d, stroke: "%s", fill: "%s", fillStyle: "solid", seed: 1})`,
+ `[[0, -10], [0, 10], [-20, 10], [-20, -10]]`,
+ strokeWidth,
+ stroke,
+ BG_COLOR,
+ )
+ case d2target.FilledBoxArrowhead:
+ arrowJS = fmt.Sprintf(
+ `node = rc.polygon(%s, { strokeWidth: %d, stroke: "%s", fill: "%s", fillStyle: "solid", seed: 1})`,
+ `[[0, -10], [0, 10], [-20, 10], [-20, -10]]`,
+ strokeWidth,
+ stroke,
+ stroke,
+ )
}
return
}
diff --git a/d2renderers/d2sketch/sketch_test.go b/d2renderers/d2sketch/sketch_test.go
index e1cddd510..04b97e134 100644
--- a/d2renderers/d2sketch/sketch_test.go
+++ b/d2renderers/d2sketch/sketch_test.go
@@ -462,6 +462,20 @@ a.9 <-> b.9: cf-one-required {
source-arrowhead.shape: cf-one-required
target-arrowhead.shape: cf-one-required
}
+a.10 <-> b.10: box {
+ source-arrowhead.shape: box
+ target-arrowhead.shape: box
+}
+a.11 <-> b.11: box-filled {
+ source-arrowhead: {
+ shape: box
+ style.filled: true
+ }
+ target-arrowhead: {
+ shape: box
+ style.filled: true
+ }
+}
`,
},
{
diff --git a/d2renderers/d2sketch/testdata/arrowheads/sketch.exp.svg b/d2renderers/d2sketch/testdata/arrowheads/sketch.exp.svg
index bfc677a8f..a824d075e 100644
--- a/d2renderers/d2sketch/testdata/arrowheads/sketch.exp.svg
+++ b/d2renderers/d2sketch/testdata/arrowheads/sketch.exp.svg
@@ -1,17 +1,17 @@
-
\ No newline at end of file
diff --git a/d2renderers/d2svg/d2svg.go b/d2renderers/d2svg/d2svg.go
index cb14ff041..bd64e0c58 100644
--- a/d2renderers/d2svg/d2svg.go
+++ b/d2renderers/d2svg/d2svg.go
@@ -285,6 +285,51 @@ func arrowheadMarker(isTarget bool, id string, connection d2target.Connection, i
}
path = circleEl.Render()
+ case d2target.FilledBoxArrowhead:
+ polygonEl := d2themes.NewThemableElement("polygon", inlineTheme)
+ polygonEl.ClassName = "connection"
+ polygonEl.Fill = connection.Stroke
+ polygonEl.Attributes = fmt.Sprintf(`stroke-width="%d"`, connection.StrokeWidth)
+
+ if isTarget {
+ polygonEl.Points = fmt.Sprintf("%f,%f %f,%f %f,%f %f,%f",
+ 0., 0.,
+ 0., height,
+ width, height,
+ width, 0.,
+ )
+ } else {
+ polygonEl.Points = fmt.Sprintf("%f,%f %f,%f %f,%f %f,%f",
+ 0., 0.,
+ 0., height,
+ width, height,
+ width, 0.,
+ )
+ }
+ path = polygonEl.Render()
+ case d2target.BoxArrowhead:
+ polygonEl := d2themes.NewThemableElement("polygon", inlineTheme)
+ polygonEl.ClassName = "connection"
+ polygonEl.Fill = d2target.BG_COLOR
+ polygonEl.Stroke = connection.Stroke
+ polygonEl.Attributes = fmt.Sprintf(`stroke-width="%d"`, connection.StrokeWidth)
+
+ if isTarget {
+ polygonEl.Points = fmt.Sprintf("%f,%f %f,%f %f,%f %f,%f",
+ 0., 0.,
+ 0., height,
+ width, height,
+ width, 0.,
+ )
+ } else {
+ polygonEl.Points = fmt.Sprintf("%f,%f %f,%f %f,%f %f,%f",
+ 0., 0.,
+ 0., height,
+ width, height,
+ width, 0.,
+ )
+ }
+ path = polygonEl.Render()
case d2target.CfOne, d2target.CfMany, d2target.CfOneRequired, d2target.CfManyRequired:
offset := 3.0 + float64(connection.StrokeWidth)*1.8
diff --git a/d2target/d2target.go b/d2target/d2target.go
index 11da29688..9f75487ae 100644
--- a/d2target/d2target.go
+++ b/d2target/d2target.go
@@ -752,6 +752,8 @@ const (
FilledDiamondArrowhead Arrowhead = "filled-diamond"
CircleArrowhead Arrowhead = "circle"
FilledCircleArrowhead Arrowhead = "filled-circle"
+ BoxArrowhead Arrowhead = "box"
+ FilledBoxArrowhead Arrowhead = "filled-box"
// For fat arrows
LineArrowhead Arrowhead = "line"
@@ -772,6 +774,7 @@ var Arrowheads = map[string]struct{}{
string(TriangleArrowhead): {},
string(DiamondArrowhead): {},
string(CircleArrowhead): {},
+ string(BoxArrowhead): {},
string(CfOne): {},
string(CfMany): {},
string(CfOneRequired): {},
@@ -799,6 +802,11 @@ func ToArrowhead(arrowheadType string, filled *bool) Arrowhead {
return UnfilledTriangleArrowhead
}
return TriangleArrowhead
+ case string(BoxArrowhead):
+ if filled != nil && *filled {
+ return FilledBoxArrowhead
+ }
+ return BoxArrowhead
case string(CfOne):
return CfOne
case string(CfMany):
@@ -853,6 +861,11 @@ func (arrowhead Arrowhead) Dimensions(strokeWidth float64) (width, height float6
baseHeight = 8
widthMultiplier = 5
heightMultiplier = 5
+ case FilledBoxArrowhead, BoxArrowhead:
+ baseWidth = 6
+ baseHeight = 6
+ widthMultiplier = 5
+ heightMultiplier = 5
case CfOne, CfMany, CfOneRequired, CfManyRequired:
baseWidth = 9
baseHeight = 9
diff --git a/e2etests-cli/testdata/TestCLI_E2E/internal_linked_pdf.exp.pdf b/e2etests-cli/testdata/TestCLI_E2E/internal_linked_pdf.exp.pdf
index deb3744f2c748d55e1ec3bf32167389c55a7fe1e..3ed8051d49751f24026a82919cfa56be4dd6d552 100644
GIT binary patch
delta 31926
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