From 61faa5ba7e4cf801685ba8e65c03824a312a3ed6 Mon Sep 17 00:00:00 2001 From: Gavin Nishizawa Date: Tue, 18 Apr 2023 11:29:55 -0700 Subject: [PATCH 1/5] add empty_md_measurement test --- e2etests/regression_test.go | 13 + .../empty_md_measurement/dagre/board.exp.json | 297 ++++++ .../empty_md_measurement/dagre/sketch.exp.svg | 842 ++++++++++++++++++ .../empty_md_measurement/elk/board.exp.json | 288 ++++++ .../empty_md_measurement/elk/sketch.exp.svg | 842 ++++++++++++++++++ 5 files changed, 2282 insertions(+) create mode 100644 e2etests/testdata/regression/empty_md_measurement/dagre/board.exp.json create mode 100644 e2etests/testdata/regression/empty_md_measurement/dagre/sketch.exp.svg create mode 100644 e2etests/testdata/regression/empty_md_measurement/elk/board.exp.json create mode 100644 e2etests/testdata/regression/empty_md_measurement/elk/sketch.exp.svg diff --git a/e2etests/regression_test.go b/e2etests/regression_test.go index 3c1a8c3ae..24026fd35 100644 --- a/e2etests/regression_test.go +++ b/e2etests/regression_test.go @@ -917,6 +917,19 @@ cf many required: { style.stroke-width: 8 } } +`, + }, + { + name: "empty_md_measurement", + script: ` +a +b: |md + + +| +c +d +a -> b -> c `, }, } diff --git a/e2etests/testdata/regression/empty_md_measurement/dagre/board.exp.json b/e2etests/testdata/regression/empty_md_measurement/dagre/board.exp.json new file mode 100644 index 000000000..8dfca5dae --- /dev/null +++ b/e2etests/testdata/regression/empty_md_measurement/dagre/board.exp.json @@ -0,0 +1,297 @@ +{ + "name": "", + "isFolderOnly": false, + "fontFamily": "SourceSansPro", + "shapes": [ + { + "id": "a", + "type": "rectangle", + "pos": { + "x": 0, + "y": 0 + }, + "width": 53, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "a", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "b", + "type": "text", + "pos": { + "x": 27, + "y": 166 + }, + "width": 0, + "height": 0, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "transparent", + "stroke": "N1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "\n", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "markdown", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "zIndex": 0, + "level": 1 + }, + { + "id": "c", + "type": "rectangle", + "pos": { + "x": 0, + "y": 266 + }, + "width": 53, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "c", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "d", + "type": "rectangle", + "pos": { + "x": 113, + "y": 0 + }, + "width": 54, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "d", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 9, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + } + ], + "connections": [ + { + "id": "(a -> b)[0]", + "src": "a", + "srcArrow": "none", + "dst": "b", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "route": [ + { + "x": 26.5, + "y": 0 + }, + { + "x": 26.5, + "y": 0 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(b -> c)[0]", + "src": "b", + "srcArrow": "none", + "dst": "c", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "route": [ + { + "x": 26.5, + "y": 0 + }, + { + "x": 26.5, + "y": 172.8 + }, + { + "x": 26.5, + "y": 226 + }, + { + "x": 26.5, + "y": 266 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + } + ], + "root": { + "id": "", + "type": "", + "pos": { + "x": 0, + "y": 0 + }, + "width": 0, + "height": 0, + "opacity": 0, + "strokeDash": 0, + "strokeWidth": 0, + "borderRadius": 0, + "fill": "N7", + "stroke": "", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "zIndex": 0, + "level": 0 + } +} diff --git a/e2etests/testdata/regression/empty_md_measurement/dagre/sketch.exp.svg b/e2etests/testdata/regression/empty_md_measurement/dagre/sketch.exp.svg new file mode 100644 index 000000000..d3b38e39e --- /dev/null +++ b/e2etests/testdata/regression/empty_md_measurement/dagre/sketch.exp.svg @@ -0,0 +1,842 @@ +a
cd + + + \ No newline at end of file diff --git a/e2etests/testdata/regression/empty_md_measurement/elk/board.exp.json b/e2etests/testdata/regression/empty_md_measurement/elk/board.exp.json new file mode 100644 index 000000000..d55a0867a --- /dev/null +++ b/e2etests/testdata/regression/empty_md_measurement/elk/board.exp.json @@ -0,0 +1,288 @@ +{ + "name": "", + "isFolderOnly": false, + "fontFamily": "SourceSansPro", + "shapes": [ + { + "id": "a", + "type": "rectangle", + "pos": { + "x": 12, + "y": 12 + }, + "width": 53, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "a", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "b", + "type": "text", + "pos": { + "x": 38, + "y": 148 + }, + "width": 0, + "height": 0, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "transparent", + "stroke": "N1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "\n", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "markdown", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "zIndex": 0, + "level": 1 + }, + { + "id": "c", + "type": "rectangle", + "pos": { + "x": 12, + "y": 218 + }, + "width": 53, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "c", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "d", + "type": "rectangle", + "pos": { + "x": 85, + "y": 12 + }, + "width": 54, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "d", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 9, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + } + ], + "connections": [ + { + "id": "(a -> b)[0]", + "src": "a", + "srcArrow": "none", + "dst": "b", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "route": [ + { + "x": 38.5, + "y": 78 + }, + { + "x": 38.5, + "y": 148 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(b -> c)[0]", + "src": "b", + "srcArrow": "none", + "dst": "c", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "route": [ + { + "x": 38.5, + "y": 148 + }, + { + "x": 38.5, + "y": 218 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + } + ], + "root": { + "id": "", + "type": "", + "pos": { + "x": 0, + "y": 0 + }, + "width": 0, + "height": 0, + "opacity": 0, + "strokeDash": 0, + "strokeWidth": 0, + "borderRadius": 0, + "fill": "N7", + "stroke": "", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "zIndex": 0, + "level": 0 + } +} diff --git a/e2etests/testdata/regression/empty_md_measurement/elk/sketch.exp.svg b/e2etests/testdata/regression/empty_md_measurement/elk/sketch.exp.svg new file mode 100644 index 000000000..d004ee873 --- /dev/null +++ b/e2etests/testdata/regression/empty_md_measurement/elk/sketch.exp.svg @@ -0,0 +1,842 @@ +a
cd + + + \ No newline at end of file From 71d880c3e107f5e3308fc65c51002023eee1e9ce Mon Sep 17 00:00:00 2001 From: Gavin Nishizawa Date: Tue, 18 Apr 2023 11:29:34 -0700 Subject: [PATCH 2/5] enforce min size for text shapes --- d2graph/d2graph.go | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/d2graph/d2graph.go b/d2graph/d2graph.go index f26f2fdc7..36d92cfb4 100644 --- a/d2graph/d2graph.go +++ b/d2graph/d2graph.go @@ -931,6 +931,17 @@ func (obj *Object) GetDefaultSize(mtexts []*d2target.MText, ruler *textmeasure.R default: return d2target.NewTextDimensions(labelDims.Width, labelDims.Height), nil + case d2target.ShapeText: + w := labelDims.Width + if w < MIN_SHAPE_SIZE { + w = MIN_SHAPE_SIZE + } + h := labelDims.Height + if h < MIN_SHAPE_SIZE { + h = MIN_SHAPE_SIZE + } + return d2target.NewTextDimensions(w, h), nil + case d2target.ShapeImage: return d2target.NewTextDimensions(128, 128), nil From 62819ce70c1918efebf84f3a2347053d6ae3e655 Mon Sep 17 00:00:00 2001 From: Gavin Nishizawa Date: Tue, 18 Apr 2023 13:02:20 -0700 Subject: [PATCH 3/5] update test --- .../empty_md_measurement/dagre/board.exp.json | 29 +- .../empty_md_measurement/dagre/sketch.exp.svg | 556 +++++++++--------- .../empty_md_measurement/elk/board.exp.json | 12 +- .../empty_md_measurement/elk/sketch.exp.svg | 556 +++++++++--------- 4 files changed, 581 insertions(+), 572 deletions(-) diff --git a/e2etests/testdata/regression/empty_md_measurement/dagre/board.exp.json b/e2etests/testdata/regression/empty_md_measurement/dagre/board.exp.json index 8dfca5dae..020d02ab6 100644 --- a/e2etests/testdata/regression/empty_md_measurement/dagre/board.exp.json +++ b/e2etests/testdata/regression/empty_md_measurement/dagre/board.exp.json @@ -48,11 +48,11 @@ "id": "b", "type": "text", "pos": { - "x": 27, + "x": 24, "y": 166 }, - "width": 0, - "height": 0, + "width": 5, + "height": 5, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -89,7 +89,7 @@ "type": "rectangle", "pos": { "x": 0, - "y": 266 + "y": 271 }, "width": 53, "height": 66, @@ -194,13 +194,22 @@ "route": [ { "x": 26.5, - "y": 0 + "y": 66 }, { "x": 26.5, - "y": 0 + "y": 106 + }, + { + "x": 26.5, + "y": 126 + }, + { + "x": 26.5, + "y": 166 } ], + "isCurve": true, "animated": false, "tooltip": "", "icon": null, @@ -232,19 +241,19 @@ "route": [ { "x": 26.5, - "y": 0 + "y": 171 }, { "x": 26.5, - "y": 172.8 + "y": 211 }, { "x": 26.5, - "y": 226 + "y": 231 }, { "x": 26.5, - "y": 266 + "y": 271 } ], "isCurve": true, diff --git a/e2etests/testdata/regression/empty_md_measurement/dagre/sketch.exp.svg b/e2etests/testdata/regression/empty_md_measurement/dagre/sketch.exp.svg index d3b38e39e..c17af7b88 100644 --- a/e2etests/testdata/regression/empty_md_measurement/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/empty_md_measurement/dagre/sketch.exp.svg @@ -1,20 +1,20 @@ -a
cd - +a
cd + \ No newline at end of file diff --git a/e2etests/testdata/regression/empty_md_measurement/elk/board.exp.json b/e2etests/testdata/regression/empty_md_measurement/elk/board.exp.json index d55a0867a..e71a73bee 100644 --- a/e2etests/testdata/regression/empty_md_measurement/elk/board.exp.json +++ b/e2etests/testdata/regression/empty_md_measurement/elk/board.exp.json @@ -48,11 +48,11 @@ "id": "b", "type": "text", "pos": { - "x": 38, + "x": 36, "y": 148 }, - "width": 0, - "height": 0, + "width": 5, + "height": 5, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -89,7 +89,7 @@ "type": "rectangle", "pos": { "x": 12, - "y": 218 + "y": 223 }, "width": 53, "height": 66, @@ -232,11 +232,11 @@ "route": [ { "x": 38.5, - "y": 148 + "y": 153 }, { "x": 38.5, - "y": 218 + "y": 223 } ], "animated": false, diff --git a/e2etests/testdata/regression/empty_md_measurement/elk/sketch.exp.svg b/e2etests/testdata/regression/empty_md_measurement/elk/sketch.exp.svg index d004ee873..ea2edd703 100644 --- a/e2etests/testdata/regression/empty_md_measurement/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/empty_md_measurement/elk/sketch.exp.svg @@ -1,20 +1,20 @@ -a
cd - +a
cd + \ No newline at end of file From 96e2293f6d1c4b1d9187ce88123212641207aac3 Mon Sep 17 00:00:00 2001 From: Gavin Nishizawa Date: Tue, 18 Apr 2023 13:05:34 -0700 Subject: [PATCH 4/5] update tests --- .../empty-markdown/dagre/board.exp.json | 4 +- .../empty-markdown/dagre/sketch.exp.svg | 550 +++++++++--------- 2 files changed, 277 insertions(+), 277 deletions(-) diff --git a/e2etests/testdata/measured/empty-markdown/dagre/board.exp.json b/e2etests/testdata/measured/empty-markdown/dagre/board.exp.json index 8067707ce..b3853a650 100644 --- a/e2etests/testdata/measured/empty-markdown/dagre/board.exp.json +++ b/e2etests/testdata/measured/empty-markdown/dagre/board.exp.json @@ -10,8 +10,8 @@ "x": 0, "y": 0 }, - "width": 1, - "height": 1, + "width": 5, + "height": 5, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, diff --git a/e2etests/testdata/measured/empty-markdown/dagre/sketch.exp.svg b/e2etests/testdata/measured/empty-markdown/dagre/sketch.exp.svg index 8071797e2..77e2bff3a 100644 --- a/e2etests/testdata/measured/empty-markdown/dagre/sketch.exp.svg +++ b/e2etests/testdata/measured/empty-markdown/dagre/sketch.exp.svg @@ -1,13 +1,13 @@ -
- +
+ \ No newline at end of file From 8e1017934a964979673e772c679bc67d06919ecd Mon Sep 17 00:00:00 2001 From: Gavin Nishizawa Date: Tue, 18 Apr 2023 13:14:01 -0700 Subject: [PATCH 5/5] changelog --- ci/release/changelogs/next.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ci/release/changelogs/next.md b/ci/release/changelogs/next.md index f3c0d2a77..4a1a80dd2 100644 --- a/ci/release/changelogs/next.md +++ b/ci/release/changelogs/next.md @@ -3,3 +3,5 @@ #### Improvements 🧹 #### Bugfixes ⛑️ + +- Fixes an issue with markdown labels that are empty when rendered [#1223](https://github.com/terrastruct/d2/issues/1223)