allow minimum dimensions to be less than label dimensions

terrastruct · Apr 10, 2024 · 5abda40 · 5abda40
1 parent 63932d0
commit 5abda40
Show file tree

Hide file tree

Showing 21 changed files with 1,092 additions and 689 deletions.
diff --git a/ci/release/changelogs/next.md b/ci/release/changelogs/next.md
@@ -5,6 +5,7 @@
 
 #### Improvements 🧹
 
+- Dimensions can be set less than label dimensions [#1901](https://github.com/terrastruct/d2/pull/1901)
 - Boards no longer inherit `label` fields from parents [#1838](https://github.com/terrastruct/d2/pull/1838)
 - Prevents `near` targeting a child of a special object like grid cells, which wasn't doing anything [#1851](https://github.com/terrastruct/d2/pull/1851)
 

diff --git a/d2graph/d2graph.go b/d2graph/d2graph.go
@@ -1048,15 +1048,6 @@ func (obj *Object) GetDefaultSize(mtexts []*d2target.MText, ruler *textmeasure.R
 // resizes the object to fit content of the given width and height in its inner box with the given padding.
 // this accounts for the shape of the object, and if there is a desired width or height set for the object
 func (obj *Object) SizeToContent(contentWidth, contentHeight, paddingX, paddingY float64) {
-	var desiredWidth int
-	var desiredHeight int
-	if obj.WidthAttr != nil {
-		desiredWidth, _ = strconv.Atoi(obj.WidthAttr.Value)
-	}
-	if obj.HeightAttr != nil {
-		desiredHeight, _ = strconv.Atoi(obj.HeightAttr.Value)
-	}
-
 	dslShape := strings.ToLower(obj.Shape.Value)
 	shapeType := d2target.DSL_SHAPE_TO_SHAPE_TYPE[dslShape]
 	s := shape.NewShape(shapeType, geo.NewBox(geo.NewPoint(0, 0), contentWidth, contentHeight))
@@ -1068,8 +1059,28 @@ func (obj *Object) SizeToContent(contentWidth, contentHeight, paddingX, paddingY
 	} else {
 		fitWidth, fitHeight = s.GetDimensionsToFit(contentWidth, contentHeight, paddingX, paddingY)
 	}
-	obj.Width = math.Max(float64(desiredWidth), fitWidth)
-	obj.Height = math.Max(float64(desiredHeight), fitHeight)
+
+	var desiredWidth int
+	if obj.WidthAttr != nil {
+		desiredWidth, _ = strconv.Atoi(obj.WidthAttr.Value)
+		obj.Width = float64(desiredWidth)
+	} else {
+		obj.Width = fitWidth
+	}
+
+	var desiredHeight int
+	if obj.HeightAttr != nil {
+		desiredHeight, _ = strconv.Atoi(obj.HeightAttr.Value)
+		obj.Height = float64(desiredHeight)
+	} else {
+		obj.Height = fitHeight
+	}
+
+	if obj.SQLTable != nil || obj.Class != nil || obj.Language != "" {
+		obj.Width = math.Max(float64(desiredWidth), fitWidth)
+		obj.Height = math.Max(float64(desiredHeight), fitHeight)
+	}
+
 	if s.AspectRatio1() {
 		sideLength := math.Max(obj.Width, obj.Height)
 		obj.Width = sideLength

diff --git a/d2layouts/d2dagrelayout/layout.go b/d2layouts/d2dagrelayout/layout.go
@@ -571,6 +571,14 @@ func positionLabelsIcons(obj *d2graph.Object) {
 			obj.LabelPosition = go2.Pointer(label.InsideMiddleCenter.String())
 		}
 	}
+
+	if float64(obj.LabelDimensions.Width) > obj.Width || float64(obj.LabelDimensions.Height) > obj.Height {
+		if len(obj.ChildrenArray) > 0 {
+			obj.LabelPosition = go2.Pointer(label.OutsideTopCenter.String())
+		} else {
+			obj.LabelPosition = go2.Pointer(label.OutsideBottomCenter.String())
+		}
+	}
 }
 
 func getRanks(g *d2graph.Graph, isHorizontal bool) (ranks [][]*d2graph.Object, objectRanks, startingParentRanks, endingParentRanks map[*d2graph.Object]int) {

diff --git a/d2layouts/d2elklayout/layout.go b/d2layouts/d2elklayout/layout.go
@@ -1149,4 +1149,12 @@ func positionLabelsIcons(obj *d2graph.Object) {
 			obj.LabelPosition = go2.Pointer(label.InsideMiddleCenter.String())
 		}
 	}
+
+	if float64(obj.LabelDimensions.Width) > obj.Width || float64(obj.LabelDimensions.Height) > obj.Height {
+		if len(obj.ChildrenArray) > 0 {
+			obj.LabelPosition = go2.Pointer(label.OutsideTopCenter.String())
+		} else {
+			obj.LabelPosition = go2.Pointer(label.OutsideBottomCenter.String())
+		}
+	}
 }