Merge pull request #189 from alixander/shape-stroke-dash

render: Support stroke-dash on shapes
terrastruct · Nov 24, 2022 · d084b8d · d084b8d
2 parents 1f2baff + bbf005c
commit d084b8d
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 4 deletions.
diff --git a/ci/release/changelogs/next.md b/ci/release/changelogs/next.md
@@ -1,6 +1,7 @@
 #### Features 🚀
 
 - Arrowhead labels are now supported. [#182](https://github.com/terrastruct/d2/pull/182)
+- `stroke-dash` on shapes is now supported. [#188](https://github.com/terrastruct/d2/issues/188)
 
 #### Improvements 🔧
 

diff --git a/d2renderers/d2svg/d2svg.go b/d2renderers/d2svg/d2svg.go
@@ -755,6 +755,10 @@ func shapeStyle(shape d2target.Shape) string {
 	out += fmt.Sprintf(`stroke:%s;`, shape.Stroke)
 	out += fmt.Sprintf(`opacity:%f;`, shape.Opacity)
 	out += fmt.Sprintf(`stroke-width:%d;`, shape.StrokeWidth)
+	if shape.StrokeDash != 0 {
+		dashSize, gapSize := getStrokeDashAttributes(float64(shape.StrokeWidth), shape.StrokeDash)
+		out += fmt.Sprintf(`stroke-dasharray:%f,%f;`, dashSize, gapSize)
+	}
 
 	return out
 }

diff --git a/e2etests/stable_test.go b/e2etests/stable_test.go
@@ -909,6 +909,7 @@ x: {
 
 y: {
   style: {
+    stroke-dash: 5
     opacity: 0.6
     fill: red
     3d: true

diff --git a/e2etests/testdata/stable/stylish/dagre/board.exp.json b/e2etests/testdata/stable/stylish/dagre/board.exp.json
@@ -50,7 +50,7 @@
       "height": 126,
       "level": 1,
       "opacity": 0.6,
-      "strokeDash": 0,
+      "strokeDash": 5,
       "strokeWidth": 2,
       "borderRadius": 0,
       "fill": "red",

diff --git a/e2etests/testdata/stable/stylish/dagre/sketch.exp.svg b/e2etests/testdata/stable/stylish/dagre/sketch.exp.svg
diff --git a/e2etests/testdata/stable/stylish/elk/board.exp.json b/e2etests/testdata/stable/stylish/elk/board.exp.json
@@ -50,7 +50,7 @@
       "height": 126,
       "level": 1,
       "opacity": 0.6,
-      "strokeDash": 0,
+      "strokeDash": 5,
       "strokeWidth": 2,
       "borderRadius": 0,
       "fill": "red",

diff --git a/e2etests/testdata/stable/stylish/elk/sketch.exp.svg b/e2etests/testdata/stable/stylish/elk/sketch.exp.svg