Merge pull request #1928 from alixander/small-width-label

fix custom label positions for nodes with constrained widths

ci/release/changelogs/next.md

@@ -5,3 +5,4 @@
 #### Bugfixes ⛑️
 
 - Local relative icons are relative to the d2 file instead of CLI invoke path [#1924](https://github.com/terrastruct/d2/pull/1924)
+- Custom label positions weren't being read when the width was smaller than the label [#1928](https://github.com/terrastruct/d2/pull/1928)

d2layouts/d2dagrelayout/layout.go

@@ -570,13 +570,12 @@ func positionLabelsIcons(obj *d2graph.Object) {
 		} else {
 			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())
+		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())
+			}
 		}
 	}
 }

d2layouts/d2elklayout/layout.go

@@ -1148,13 +1148,12 @@ func positionLabelsIcons(obj *d2graph.Object) {
 		} else {
 			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())
+		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())
+			}
 		}
 	}
 }

d2target/d2target.go

@@ -313,9 +313,6 @@ func (diagram Diagram) BoundingBox() (topLeft, bottomRight Point) {
 
 		if targetShape.Label != "" {
 			labelPosition := label.FromString(targetShape.LabelPosition)
-			if !labelPosition.IsOutside() {
-				continue
-			}
 
 			shapeType := DSL_SHAPE_TO_SHAPE_TYPE[targetShape.Type]
 			s := shape.NewShape(shapeType,