Merge pull request #973 from gavin-ts/dagre-direction-right-padding

dagre: direction right padding

ci/release/changelogs/next.md

@@ -15,3 +15,4 @@
 - Fixes a regression where PNG backgrounds could be cut off in the appendix. [#941](https://github.com/terrastruct/d2/pull/941)
 - Fixes zooming not working in watch mode. [#944](https://github.com/terrastruct/d2/pull/944)
 - [API] Fixes `DeleteIDDeltas` giving duplicate deltas in rare cases. [#957](https://github.com/terrastruct/d2/pull/957)
+- Fixes insufficient vertical padding in dagre with direction: right/left. [#973](https://github.com/terrastruct/d2/pull/973)

d2layouts/d2dagrelayout/layout.go

@@ -109,6 +109,7 @@ func Layout(ctx context.Context, g *d2graph.Graph, opts *ConfigurableOpts) (err
 
 	maxContainerLabelHeight := 0
 	for _, obj := range g.Objects {
+		// TODO count root level container label sizes for ranksep
 		if len(obj.ChildrenArray) == 0 || obj.Parent == g.Root {
 			continue
 		}
@@ -126,15 +127,25 @@ func Layout(ctx context.Context, g *d2graph.Graph, opts *ConfigurableOpts) (err
 		}
 	}
 
-	maxLabelSize := 0
+	maxLabelWidth := 0
+	maxLabelHeight := 0
 	for _, edge := range g.Edges {
-		size := edge.LabelDimensions.Width
-		if !isHorizontal {
-			size = edge.LabelDimensions.Height
-		}
-		maxLabelSize = go2.Max(maxLabelSize, size)
+		width := edge.LabelDimensions.Width
+		height := edge.LabelDimensions.Height
+		maxLabelWidth = go2.Max(maxLabelWidth, width)
+		maxLabelHeight = go2.Max(maxLabelHeight, height)
+	}
+
+	if !isHorizontal {
+		rootAttrs.ranksep = go2.Max(go2.Max(100, maxLabelHeight+40), maxContainerLabelHeight)
+	} else {
+		rootAttrs.ranksep = go2.Max(100, maxLabelWidth+40)
+		// use existing config
+		rootAttrs.NodeSep = rootAttrs.EdgeSep
+		// configure vertical padding
+		rootAttrs.EdgeSep = go2.Max(maxLabelHeight+40, maxContainerLabelHeight)
+		// Note: non-containers have both of these as padding (rootAttrs.NodeSep + rootAttrs.EdgeSep)
 	}
-	rootAttrs.ranksep = go2.Max(go2.Max(100, maxLabelSize+40), maxContainerLabelHeight)
 
 	configJS := setGraphAttrs(rootAttrs)
 	if _, err := vm.RunString(configJS); err != nil {
@@ -286,7 +297,7 @@ func Layout(ctx context.Context, g *d2graph.Graph, opts *ConfigurableOpts) (err
 	}
 
 	for _, obj := range g.Objects {
-		if obj.LabelHeight == nil || len(obj.ChildrenArray) <= 0 {
+		if obj.LabelHeight == nil || len(obj.ChildrenArray) == 0 {
 			continue
 		}
 

e2etests/stable_test.go

@@ -669,6 +669,28 @@ x -> hey -> y
 		{
 			name: "font_sizes_containers_large",
 			script: `
+ninety nine: {
+	style.font-size: 99
+	sixty four: {
+		style.font-size: 64
+		thirty two:{
+			style.font-size: 32
+			sixteen: {
+				style.font-size: 16
+				eight: {
+					style.font-size: 8
+				}
+			}
+		}
+	}
+}
+`,
+		},
+		{
+			name: "font_sizes_containers_large_right",
+			script: `
+direction: right
+
 ninety nine: {
 	style.font-size: 99
 	sixty four: {