elk label height

terrastruct · Dec 12, 2023 · 43626a9 · 43626a9
1 parent da3fa94
commit 43626a9
Show file tree

Hide file tree

Showing 3 changed files with 308 additions and 301 deletions.
diff --git a/d2layouts/d2elklayout/layout.go b/d2layouts/d2elklayout/layout.go
@@ -374,11 +374,18 @@ func Layout(ctx context.Context, g *d2graph.Graph, opts *ConfigurableOpts) (err
 		if hasTop || hasBottom {
 			padding := parsePadding(elkNodes[obj].LayoutOptions.Padding)
 			if hasTop {
-				// TODO I think this fails to account for a potential inner label of container
-				padding.top = go2.Max(padding.top, d2target.MAX_ICON_SIZE+2*label.PADDING)
+				ownLabelHeight := 0
+				if obj.LabelPosition != nil && strings.HasPrefix(*obj.LabelPosition, "INSIDE_TOP") {
+					ownLabelHeight = obj.LabelDimensions.Height + label.PADDING
+				}
+				padding.top = go2.Max(padding.top, d2target.MAX_ICON_SIZE+2*label.PADDING+ownLabelHeight)
 			}
 			if hasBottom {
-				padding.bottom = go2.Max(padding.bottom, d2target.MAX_ICON_SIZE+2*label.PADDING)
+				ownLabelHeight := 0
+				if obj.LabelPosition != nil && strings.HasPrefix(*obj.LabelPosition, "INSIDE_BOTTOM") {
+					ownLabelHeight = obj.LabelDimensions.Height + label.PADDING
+				}
+				padding.bottom = go2.Max(padding.bottom, d2target.MAX_ICON_SIZE+2*label.PADDING+ownLabelHeight)
 			}
 			elkNodes[obj].LayoutOptions.Padding = padding.String()
 		}

diff --git a/e2etests/testdata/txtar/sql-icon/elk/board.exp.json b/e2etests/testdata/txtar/sql-icon/elk/board.exp.json