tests and changelog

terrastruct · Mar 7, 2023 · d1d64c7 · d1d64c7
1 parent 29cd98d
commit d1d64c7
Show file tree

Hide file tree

Showing 47 changed files with 2,086 additions and 2,115 deletions.
diff --git a/ci/release/changelogs/next.md b/ci/release/changelogs/next.md
@@ -2,6 +2,8 @@
 
 #### Improvements 🧹
 
+- ELK nodes with > 1 connection grow to ensure padding around ports [#981](https://github.com/terrastruct/d2/pull/981)
+
 #### Bugfixes ⛑️
 
 - Accept absolute paths again on the CLI. [#979](https://github.com/terrastruct/d2/pull/979)

diff --git a/d2layouts/d2elklayout/layout.go b/d2layouts/d2elklayout/layout.go
@@ -94,6 +94,8 @@ var DefaultOpts = ConfigurableOpts{
 	SelfLoopSpacing: 50.0,
 }
 
+var port_spacing = 40.
+
 type elkOpts struct {
 	Thoroughness                 int    `json:"elk.layered.thoroughness,omitempty"`
 	EdgeEdgeBetweenLayersSpacing int    `json:"elk.layered.spacing.edgeEdgeBetweenLayers,omitempty"`
@@ -186,7 +188,14 @@ func Layout(ctx context.Context, g *d2graph.Graph, opts *ConfigurableOpts) (err
 				incoming++
 			}
 		}
-		obj.Width = math.Max(obj.Width, math.Max(incoming, outgoing)*80)
+		if incoming >= 2 || outgoing >= 2 {
+			switch g.Root.Attributes.Direction.Value {
+			case "right", "left":
+				obj.Height = math.Max(obj.Height, math.Max(incoming, outgoing)*port_spacing)
+			default:
+				obj.Width = math.Max(obj.Width, math.Max(incoming, outgoing)*port_spacing)
+			}
+		}
 
 		height := obj.Height
 		width := obj.Width

diff --git a/e2etests-cli/testdata/TestCLI_E2E/internal_linked_pdf.exp.pdf b/e2etests-cli/testdata/TestCLI_E2E/internal_linked_pdf.exp.pdf
diff --git a/e2etests/testdata/regression/dagre_special_ids/elk/board.exp.json b/e2etests/testdata/regression/dagre_special_ids/elk/board.exp.json
diff --git a/e2etests/testdata/regression/dagre_special_ids/elk/sketch.exp.svg b/e2etests/testdata/regression/dagre_special_ids/elk/sketch.exp.svg