diff --git a/e2etests/regression_test.go b/e2etests/regression_test.go index 211272caf..e3f45c15b 100644 --- a/e2etests/regression_test.go +++ b/e2etests/regression_test.go @@ -1050,6 +1050,7 @@ cf many required: { loadFromFile(t, "grid_rows_gap_bug"), loadFromFile(t, "grid_image_label_position"), loadFromFile(t, "glob_dimensions"), + loadFromFile(t, "grid_cell_container_edge"), } runa(t, tcs) diff --git a/e2etests/testdata/files/grid_cell_container_edge.d2 b/e2etests/testdata/files/grid_cell_container_edge.d2 new file mode 100644 index 000000000..fc6107312 --- /dev/null +++ b/e2etests/testdata/files/grid_cell_container_edge.d2 @@ -0,0 +1,9 @@ +grid-rows: 1 +grid-columns: 2 + +box1 + +box2: { + explanation +} +box1 -> box2 diff --git a/e2etests/testdata/regression/grid_cell_container_edge/dagre/board.exp.json b/e2etests/testdata/regression/grid_cell_container_edge/dagre/board.exp.json new file mode 100644 index 000000000..1364fd594 --- /dev/null +++ b/e2etests/testdata/regression/grid_cell_container_edge/dagre/board.exp.json @@ -0,0 +1,210 @@ +{ + "name": "", + "isFolderOnly": false, + "fontFamily": "SourceSansPro", + "shapes": [ + { + "id": "box1", + "type": "rectangle", + "pos": { + "x": 0, + "y": 0 + }, + "width": 79, + "height": 167, + "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": "box1", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 34, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "box2", + "type": "rectangle", + "pos": { + "x": 119, + "y": 41 + }, + "width": 190, + "height": 126, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B4", + "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": "box2", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 55, + "labelHeight": 36, + "labelPosition": "OUTSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "box2.explanation", + "type": "rectangle", + "pos": { + "x": 149, + "y": 71 + }, + "width": 130, + "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": "explanation", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 85, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + } + ], + "connections": [ + { + "id": "(box1 -> box2)[0]", + "src": "box1", + "srcArrow": "none", + "dst": "box2", + "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": 79, + "y": 88 + }, + { + "x": 119, + "y": 93 + } + ], + "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/grid_cell_container_edge/dagre/sketch.exp.svg b/e2etests/testdata/regression/grid_cell_container_edge/dagre/sketch.exp.svg new file mode 100644 index 000000000..da615a321 --- /dev/null +++ b/e2etests/testdata/regression/grid_cell_container_edge/dagre/sketch.exp.svg @@ -0,0 +1,104 @@ +box1box2explanation + + + + + \ No newline at end of file diff --git a/e2etests/testdata/regression/grid_cell_container_edge/elk/board.exp.json b/e2etests/testdata/regression/grid_cell_container_edge/elk/board.exp.json new file mode 100644 index 000000000..9791ab8db --- /dev/null +++ b/e2etests/testdata/regression/grid_cell_container_edge/elk/board.exp.json @@ -0,0 +1,210 @@ +{ + "name": "", + "isFolderOnly": false, + "fontFamily": "SourceSansPro", + "shapes": [ + { + "id": "box1", + "type": "rectangle", + "pos": { + "x": 0, + "y": 0 + }, + "width": 79, + "height": 166, + "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": "box1", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 34, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "box2", + "type": "rectangle", + "pos": { + "x": 119, + "y": 0 + }, + "width": 230, + "height": 166, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B4", + "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": "box2", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 55, + "labelHeight": 36, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "box2.explanation", + "type": "rectangle", + "pos": { + "x": 169, + "y": 50 + }, + "width": 130, + "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": "explanation", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 85, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + } + ], + "connections": [ + { + "id": "(box1 -> box2)[0]", + "src": "box1", + "srcArrow": "none", + "dst": "box2", + "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": 79, + "y": 83 + }, + { + "x": 119, + "y": 83 + } + ], + "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/grid_cell_container_edge/elk/sketch.exp.svg b/e2etests/testdata/regression/grid_cell_container_edge/elk/sketch.exp.svg new file mode 100644 index 000000000..e5a75b949 --- /dev/null +++ b/e2etests/testdata/regression/grid_cell_container_edge/elk/sketch.exp.svg @@ -0,0 +1,104 @@ +box1box2explanation + + + + + \ No newline at end of file