diff --git a/e2etests/regression_test.go b/e2etests/regression_test.go index a2d16828f..e0453a15e 100644 --- a/e2etests/regression_test.go +++ b/e2etests/regression_test.go @@ -946,6 +946,7 @@ a -> b -> c }, loadFromFile(t, "slow_grid"), loadFromFile(t, "grid_oom"), + loadFromFile(t, "cylinder_grid_label"), } runa(t, tcs) diff --git a/e2etests/testdata/files/cylinder_grid_label.d2 b/e2etests/testdata/files/cylinder_grid_label.d2 new file mode 100644 index 000000000..a5048b659 --- /dev/null +++ b/e2etests/testdata/files/cylinder_grid_label.d2 @@ -0,0 +1,6 @@ +container title is hidden: { + shape: cylinder + grid-columns: 1 + first + second +} diff --git a/e2etests/testdata/regression/cylinder_grid_label/dagre/board.exp.json b/e2etests/testdata/regression/cylinder_grid_label/dagre/board.exp.json new file mode 100644 index 000000000..e105f9f8a --- /dev/null +++ b/e2etests/testdata/regression/cylinder_grid_label/dagre/board.exp.json @@ -0,0 +1,171 @@ +{ + "name": "", + "isFolderOnly": false, + "fontFamily": "SourceSansPro", + "shapes": [ + { + "id": "container title is hidden", + "type": "cylinder", + "pos": { + "x": 0, + "y": 0 + }, + "width": 286, + "height": 292, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "AA4", + "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": "container title is hidden", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 276, + "labelHeight": 36, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "container title is hidden.first", + "type": "rectangle", + "pos": { + "x": 95, + "y": 60 + }, + "width": 95, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "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": "first", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 30, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "container title is hidden.second", + "type": "rectangle", + "pos": { + "x": 95, + "y": 166 + }, + "width": 95, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "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": "second", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 50, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + } + ], + "connections": [], + "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/cylinder_grid_label/dagre/sketch.exp.svg b/e2etests/testdata/regression/cylinder_grid_label/dagre/sketch.exp.svg new file mode 100644 index 000000000..e9b80636d --- /dev/null +++ b/e2etests/testdata/regression/cylinder_grid_label/dagre/sketch.exp.svg @@ -0,0 +1,102 @@ +container title is hiddenfirstsecond + + + \ No newline at end of file diff --git a/e2etests/testdata/regression/cylinder_grid_label/elk/board.exp.json b/e2etests/testdata/regression/cylinder_grid_label/elk/board.exp.json new file mode 100644 index 000000000..19a1594e6 --- /dev/null +++ b/e2etests/testdata/regression/cylinder_grid_label/elk/board.exp.json @@ -0,0 +1,171 @@ +{ + "name": "", + "isFolderOnly": false, + "fontFamily": "SourceSansPro", + "shapes": [ + { + "id": "container title is hidden", + "type": "cylinder", + "pos": { + "x": 12, + "y": 12 + }, + "width": 286, + "height": 292, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "AA4", + "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": "container title is hidden", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 276, + "labelHeight": 36, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "container title is hidden.first", + "type": "rectangle", + "pos": { + "x": 107, + "y": 72 + }, + "width": 95, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "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": "first", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 30, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "container title is hidden.second", + "type": "rectangle", + "pos": { + "x": 107, + "y": 178 + }, + "width": 95, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "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": "second", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 50, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + } + ], + "connections": [], + "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/cylinder_grid_label/elk/sketch.exp.svg b/e2etests/testdata/regression/cylinder_grid_label/elk/sketch.exp.svg new file mode 100644 index 000000000..7e6989bd0 --- /dev/null +++ b/e2etests/testdata/regression/cylinder_grid_label/elk/sketch.exp.svg @@ -0,0 +1,102 @@ +container title is hiddenfirstsecond + + + \ No newline at end of file