Merge pull request #2183 from alixander/circle-fit

circle fit
terrastruct · Oct 31, 2024 · 2cef20b · 2cef20b
2 parents 3d39254 + 62cf930
commit 2cef20b
Show file tree

Hide file tree

Showing 99 changed files with 9,034 additions and 9,031 deletions.
diff --git a/ci/release/changelogs/next.md b/ci/release/changelogs/next.md
@@ -8,6 +8,8 @@
 - CLI: attempts writing to path atomically, falling back to non-atomic if failed [#2141](https://github.com/terrastruct/d2/pull/2141)
 - Export: pptx has "created at" metadata removed, so successive runs yield the same result [#2169](https://github.com/terrastruct/d2/pull/2160)
 - Formatter: empty board keywords (e.g. `layers`) are removed [#2178](https://github.com/terrastruct/d2/pull/2178)
+- Render: circle containers are tighter fitting [#2183](https://github.com/terrastruct/d2/pull/2183)
+- Render: a tooltip or link by itself will not expand width of shape [#2183](https://github.com/terrastruct/d2/pull/2183)
 
 #### Bugfixes ⛑️
 

diff --git a/d2graph/d2graph.go b/d2graph/d2graph.go
@@ -1544,11 +1544,8 @@ func (g *Graph) SetDimensions(mtexts []*d2target.MText, ruler *textmeasure.Ruler
 			switch shapeType {
 			case shape.TABLE_TYPE, shape.CLASS_TYPE, shape.CODE_TYPE:
 			default:
-				if obj.Link != nil {
-					paddingX += 32
-				}
-				if obj.Tooltip != nil {
-					paddingX += 32
+				if obj.Link != nil && obj.Tooltip != nil {
+					paddingX += 64
 				}
 			}
 		}

diff --git a/d2renderers/d2sketch/testdata/all_shapes/sketch.exp.svg b/d2renderers/d2sketch/testdata/all_shapes/sketch.exp.svg
diff --git a/d2renderers/d2sketch/testdata/all_shapes_dark/sketch.exp.svg b/d2renderers/d2sketch/testdata/all_shapes_dark/sketch.exp.svg
diff --git a/d2renderers/d2sketch/testdata/dots-all/sketch.exp.svg b/d2renderers/d2sketch/testdata/dots-all/sketch.exp.svg
diff --git a/d2renderers/d2sketch/testdata/dots-multiple/sketch.exp.svg b/d2renderers/d2sketch/testdata/dots-multiple/sketch.exp.svg
diff --git a/d2renderers/d2svg/appendix/testdata/diagram_wider_than_tooltip/sketch.exp.svg b/d2renderers/d2svg/appendix/testdata/diagram_wider_than_tooltip/sketch.exp.svg
diff --git a/d2renderers/d2svg/appendix/testdata/internal-links/sketch.exp.svg b/d2renderers/d2svg/appendix/testdata/internal-links/sketch.exp.svg
diff --git a/d2renderers/d2svg/appendix/testdata/links/sketch.exp.svg b/d2renderers/d2svg/appendix/testdata/links/sketch.exp.svg
diff --git a/d2renderers/d2svg/appendix/testdata/links_dark/sketch.exp.svg b/d2renderers/d2svg/appendix/testdata/links_dark/sketch.exp.svg
diff --git a/d2renderers/d2svg/appendix/testdata/tooltip_fill/sketch.exp.svg b/d2renderers/d2svg/appendix/testdata/tooltip_fill/sketch.exp.svg
diff --git a/d2renderers/d2svg/appendix/testdata/tooltip_wider_than_diagram/sketch.exp.svg b/d2renderers/d2svg/appendix/testdata/tooltip_wider_than_diagram/sketch.exp.svg
diff --git a/d2renderers/d2svg/dark_theme/testdata/all_shapes/dark_theme.exp.svg b/d2renderers/d2svg/dark_theme/testdata/all_shapes/dark_theme.exp.svg
diff --git a/e2etests-cli/testdata/TestCLI_E2E/board_import/hello-world-x.exp.svg b/e2etests-cli/testdata/TestCLI_E2E/board_import/hello-world-x.exp.svg
diff --git a/e2etests-cli/testdata/TestCLI_E2E/board_import/hello-world.exp.svg b/e2etests-cli/testdata/TestCLI_E2E/board_import/hello-world.exp.svg
diff --git a/e2etests-cli/testdata/TestCLI_E2E/import.exp.svg b/e2etests-cli/testdata/TestCLI_E2E/import.exp.svg
diff --git a/e2etests-cli/testdata/TestCLI_E2E/layer-link/index.exp.svg b/e2etests-cli/testdata/TestCLI_E2E/layer-link/index.exp.svg
diff --git a/e2etests-cli/testdata/TestCLI_E2E/layer-link/test2.exp.svg b/e2etests-cli/testdata/TestCLI_E2E/layer-link/test2.exp.svg
diff --git a/e2etests/testdata/patterns/all_shapes/dagre/board.exp.json b/e2etests/testdata/patterns/all_shapes/dagre/board.exp.json
diff --git a/e2etests/testdata/patterns/all_shapes/dagre/sketch.exp.svg b/e2etests/testdata/patterns/all_shapes/dagre/sketch.exp.svg
diff --git a/e2etests/testdata/patterns/multiple/dagre/board.exp.json b/e2etests/testdata/patterns/multiple/dagre/board.exp.json
diff --git a/e2etests/testdata/patterns/multiple/dagre/sketch.exp.svg b/e2etests/testdata/patterns/multiple/dagre/sketch.exp.svg
diff --git a/e2etests/testdata/patterns/paper/dagre/board.exp.json b/e2etests/testdata/patterns/paper/dagre/board.exp.json
diff --git a/e2etests/testdata/patterns/paper/dagre/sketch.exp.svg b/e2etests/testdata/patterns/paper/dagre/sketch.exp.svg
diff --git a/e2etests/testdata/regression/ampersand-escape/dagre/board.exp.json b/e2etests/testdata/regression/ampersand-escape/dagre/board.exp.json
diff --git a/e2etests/testdata/regression/ampersand-escape/dagre/sketch.exp.svg b/e2etests/testdata/regression/ampersand-escape/dagre/sketch.exp.svg
diff --git a/e2etests/testdata/regression/ampersand-escape/elk/board.exp.json b/e2etests/testdata/regression/ampersand-escape/elk/board.exp.json
diff --git a/e2etests/testdata/regression/ampersand-escape/elk/sketch.exp.svg b/e2etests/testdata/regression/ampersand-escape/elk/sketch.exp.svg
diff --git a/e2etests/testdata/regression/icons_on_top/dagre/board.exp.json b/e2etests/testdata/regression/icons_on_top/dagre/board.exp.json
diff --git a/e2etests/testdata/regression/icons_on_top/dagre/sketch.exp.svg b/e2etests/testdata/regression/icons_on_top/dagre/sketch.exp.svg
diff --git a/e2etests/testdata/regression/icons_on_top/elk/board.exp.json b/e2etests/testdata/regression/icons_on_top/elk/board.exp.json
diff --git a/e2etests/testdata/regression/icons_on_top/elk/sketch.exp.svg b/e2etests/testdata/regression/icons_on_top/elk/sketch.exp.svg
diff --git a/e2etests/testdata/regression/link_with_ampersand/dagre/board.exp.json b/e2etests/testdata/regression/link_with_ampersand/dagre/board.exp.json
diff --git a/e2etests/testdata/regression/link_with_ampersand/dagre/sketch.exp.svg b/e2etests/testdata/regression/link_with_ampersand/dagre/sketch.exp.svg
diff --git a/e2etests/testdata/regression/link_with_ampersand/elk/board.exp.json b/e2etests/testdata/regression/link_with_ampersand/elk/board.exp.json
diff --git a/e2etests/testdata/regression/link_with_ampersand/elk/sketch.exp.svg b/e2etests/testdata/regression/link_with_ampersand/elk/sketch.exp.svg