Merge pull request #1494 from alixander/label-pad

fix icon pad

d2target/d2target.go

@@ -215,11 +215,11 @@ func (diagram Diagram) BoundingBox() (topLeft, bottomRight Point) {
 			if strings.HasPrefix(targetShape.IconPosition, "OUTSIDE_TOP") {
 				y1 = go2.Min(y1, targetShape.Pos.Y-label.PADDING-size)
 			} else if strings.HasPrefix(targetShape.IconPosition, "OUTSIDE_BOTTOM") {
-				y2 = go2.Max(y2, targetShape.Pos.Y+label.PADDING+size)
+				y2 = go2.Max(y2, targetShape.Pos.Y+targetShape.Height+label.PADDING+size)
 			} else if strings.HasPrefix(targetShape.IconPosition, "OUTSIDE_LEFT") {
 				x1 = go2.Min(x1, targetShape.Pos.X-label.PADDING-size)
 			} else if strings.HasPrefix(targetShape.IconPosition, "OUTSIDE_RIGHT") {
-				x2 = go2.Max(x2, targetShape.Pos.X+label.PADDING+size)
+				x2 = go2.Max(x2, targetShape.Pos.X+targetShape.Width+label.PADDING+size)
 			}
 		}
 

e2etests/stable_test.go

@@ -2766,6 +2766,25 @@ scenarios: {
     thunder
   }
 }`,
+		},
+		{
+			name: "label-near",
+			script: `
+direction: right
+x -> y
+
+x: worker {
+  label.near: top-center
+  icon: https://icons.terrastruct.com/essentials%2F005-programmer.svg
+  icon.near: outside-top-right
+}
+
+y: profits {
+  label.near: bottom-right
+  icon: https://icons.terrastruct.com/essentials%2Fprofits.svg
+  icon.near: outside-bottom-center
+}
+`,
 		},
 		loadFromFile(t, "arrowhead_scaling"),
 		loadFromFile(t, "teleport_grid"),