From 67a28645f4b6f54bb2364cb0d7a31525bee46e9b Mon Sep 17 00:00:00 2001 From: Gavin Nishizawa Date: Wed, 15 Nov 2023 14:11:03 -0800 Subject: [PATCH 01/13] add shaped_grid_positioning test --- e2etests/regression_test.go | 1 + .../testdata/files/shaped_grid_positioning.d2 | 39 + .../dagre/board.exp.json | 1278 +++++++++++++++++ .../dagre/sketch.exp.svg | 131 ++ .../elk/board.exp.json | 1278 +++++++++++++++++ .../elk/sketch.exp.svg | 131 ++ 6 files changed, 2858 insertions(+) create mode 100644 e2etests/testdata/files/shaped_grid_positioning.d2 create mode 100644 e2etests/testdata/regression/shaped_grid_positioning/dagre/board.exp.json create mode 100644 e2etests/testdata/regression/shaped_grid_positioning/dagre/sketch.exp.svg create mode 100644 e2etests/testdata/regression/shaped_grid_positioning/elk/board.exp.json create mode 100644 e2etests/testdata/regression/shaped_grid_positioning/elk/sketch.exp.svg diff --git a/e2etests/regression_test.go b/e2etests/regression_test.go index 211272caf5..257c49b9cc 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, "shaped_grid_positioning"), } runa(t, tcs) diff --git a/e2etests/testdata/files/shaped_grid_positioning.d2 b/e2etests/testdata/files/shaped_grid_positioning.d2 new file mode 100644 index 0000000000..10178aa557 --- /dev/null +++ b/e2etests/testdata/files/shaped_grid_positioning.d2 @@ -0,0 +1,39 @@ +vars: { + grid-container: { + label: aaaaaaaaaaaaaaa aaaaaaaaaaaaaaa + grid-rows: 2 + grid-columns: 2 + a + b + c + d + } +} +circle: { + shape: circle + ...${grid-container} +} + +oval: { + shape: oval + ...${grid-container} +} + +diamond: { + shape: diamond + ...${grid-container} +} + +square: { + shape: square + ...${grid-container} +} + +rect: { + ...${grid-container} +} + +cloud: { + shape: cloud + ...${grid-container} +} diff --git a/e2etests/testdata/regression/shaped_grid_positioning/dagre/board.exp.json b/e2etests/testdata/regression/shaped_grid_positioning/dagre/board.exp.json new file mode 100644 index 0000000000..8e3cfc3f88 --- /dev/null +++ b/e2etests/testdata/regression/shaped_grid_positioning/dagre/board.exp.json @@ -0,0 +1,1278 @@ +{ + "name": "", + "isFolderOnly": false, + "fontFamily": "SourceSansPro", + "shapes": [ + { + "id": "oval.a", + "type": "rectangle", + "pos": { + "x": 819, + "y": 238 + }, + "width": 53, + "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": "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": 2 + }, + { + "id": "circle.a", + "type": "rectangle", + "pos": { + "x": 145, + "y": 89 + }, + "width": 53, + "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": "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": 2 + }, + { + "id": "cloud.a", + "type": "rectangle", + "pos": { + "x": 3407, + "y": 265 + }, + "width": 53, + "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": "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": 2 + }, + { + "id": "rect.a", + "type": "rectangle", + "pos": { + "x": 2820, + "y": 206 + }, + "width": 53, + "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": "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": 2 + }, + { + "id": "square.a", + "type": "rectangle", + "pos": { + "x": 2323, + "y": 134 + }, + "width": 53, + "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": "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": 2 + }, + { + "id": "diamond.a", + "type": "rectangle", + "pos": { + "x": 1607, + "y": 206 + }, + "width": 53, + "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": "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": 2 + }, + { + "id": "oval.b", + "type": "rectangle", + "pos": { + "x": 912, + "y": 238 + }, + "width": 54, + "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": "b", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "square.b", + "type": "rectangle", + "pos": { + "x": 2416, + "y": 134 + }, + "width": 54, + "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": "b", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "cloud.b", + "type": "rectangle", + "pos": { + "x": 3500, + "y": 265 + }, + "width": 54, + "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": "b", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "circle.b", + "type": "rectangle", + "pos": { + "x": 238, + "y": 89 + }, + "width": 54, + "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": "b", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "rect.b", + "type": "rectangle", + "pos": { + "x": 2913, + "y": 206 + }, + "width": 54, + "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": "b", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "diamond.b", + "type": "rectangle", + "pos": { + "x": 1700, + "y": 206 + }, + "width": 54, + "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": "b", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "square.c", + "type": "rectangle", + "pos": { + "x": 2323, + "y": 240 + }, + "width": 53, + "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": "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": 2 + }, + { + "id": "diamond.c", + "type": "rectangle", + "pos": { + "x": 1607, + "y": 312 + }, + "width": 53, + "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": "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": 2 + }, + { + "id": "cloud.c", + "type": "rectangle", + "pos": { + "x": 3407, + "y": 371 + }, + "width": 53, + "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": "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": 2 + }, + { + "id": "oval.c", + "type": "rectangle", + "pos": { + "x": 819, + "y": 344 + }, + "width": 53, + "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": "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": 2 + }, + { + "id": "rect.c", + "type": "rectangle", + "pos": { + "x": 2820, + "y": 312 + }, + "width": 53, + "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": "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": 2 + }, + { + "id": "circle.c", + "type": "rectangle", + "pos": { + "x": 145, + "y": 195 + }, + "width": 53, + "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": "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": 2 + }, + { + "id": "rect.d", + "type": "rectangle", + "pos": { + "x": 2913, + "y": 312 + }, + "width": 54, + "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": "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": 2 + }, + { + "id": "square.d", + "type": "rectangle", + "pos": { + "x": 2416, + "y": 240 + }, + "width": 54, + "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": "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": 2 + }, + { + "id": "circle.d", + "type": "rectangle", + "pos": { + "x": 238, + "y": 195 + }, + "width": 54, + "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": "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": 2 + }, + { + "id": "oval.d", + "type": "rectangle", + "pos": { + "x": 912, + "y": 344 + }, + "width": 54, + "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": "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": 2 + }, + { + "id": "diamond.d", + "type": "rectangle", + "pos": { + "x": 1700, + "y": 312 + }, + "width": 54, + "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": "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": 2 + }, + { + "id": "cloud.d", + "type": "rectangle", + "pos": { + "x": 3500, + "y": 371 + }, + "width": 54, + "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": "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": 2 + }, + { + "id": "circle", + "type": "oval", + "pos": { + "x": 0, + "y": 29 + }, + "width": 526, + "height": 526, + "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": "aaaaaaaaaaaaaaa aaaaaaaaaaaaaaa", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 427, + "labelHeight": 36, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "oval", + "type": "oval", + "pos": { + "x": 586, + "y": 130 + }, + "width": 598, + "height": 325, + "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": "aaaaaaaaaaaaaaa aaaaaaaaaaaaaaa", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 427, + "labelHeight": 36, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "diamond", + "type": "diamond", + "pos": { + "x": 1244, + "y": 0 + }, + "width": 874, + "height": 584, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "N4", + "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": "aaaaaaaaaaaaaaa aaaaaaaaaaaaaaa", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 427, + "labelHeight": 36, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "square", + "type": "rectangle", + "pos": { + "x": 2178, + "y": 74 + }, + "width": 437, + "height": 437, + "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": "aaaaaaaaaaaaaaa aaaaaaaaaaaaaaa", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 427, + "labelHeight": 36, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "rect", + "type": "rectangle", + "pos": { + "x": 2675, + "y": 146 + }, + "width": 437, + "height": 292, + "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": "aaaaaaaaaaaaaaa aaaaaaaaaaaaaaa", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 427, + "labelHeight": 36, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "cloud", + "type": "cloud", + "pos": { + "x": 3172, + "y": 26 + }, + "width": 534, + "height": 533, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "N7", + "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": "aaaaaaaaaaaaaaa aaaaaaaaaaaaaaa", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 427, + "labelHeight": 36, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + } + ], + "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/shaped_grid_positioning/dagre/sketch.exp.svg b/e2etests/testdata/regression/shaped_grid_positioning/dagre/sketch.exp.svg new file mode 100644 index 0000000000..686a911ba8 --- /dev/null +++ b/e2etests/testdata/regression/shaped_grid_positioning/dagre/sketch.exp.svg @@ -0,0 +1,131 @@ +aaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaabbbbbbccccccdddddd + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/regression/shaped_grid_positioning/elk/board.exp.json b/e2etests/testdata/regression/shaped_grid_positioning/elk/board.exp.json new file mode 100644 index 0000000000..97d3badbaf --- /dev/null +++ b/e2etests/testdata/regression/shaped_grid_positioning/elk/board.exp.json @@ -0,0 +1,1278 @@ +{ + "name": "", + "isFolderOnly": false, + "fontFamily": "SourceSansPro", + "shapes": [ + { + "id": "oval.a", + "type": "rectangle", + "pos": { + "x": 791, + "y": 249 + }, + "width": 53, + "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": "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": 2 + }, + { + "id": "circle.a", + "type": "rectangle", + "pos": { + "x": 157, + "y": 101 + }, + "width": 53, + "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": "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": 2 + }, + { + "id": "cloud.a", + "type": "rectangle", + "pos": { + "x": 3219, + "y": 276 + }, + "width": 53, + "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": "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": 2 + }, + { + "id": "rect.a", + "type": "rectangle", + "pos": { + "x": 2672, + "y": 218 + }, + "width": 53, + "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": "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": 2 + }, + { + "id": "square.a", + "type": "rectangle", + "pos": { + "x": 2215, + "y": 145 + }, + "width": 53, + "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": "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": 2 + }, + { + "id": "diamond.a", + "type": "rectangle", + "pos": { + "x": 1539, + "y": 218 + }, + "width": 53, + "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": "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": 2 + }, + { + "id": "oval.b", + "type": "rectangle", + "pos": { + "x": 884, + "y": 249 + }, + "width": 54, + "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": "b", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "square.b", + "type": "rectangle", + "pos": { + "x": 2308, + "y": 145 + }, + "width": 54, + "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": "b", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "cloud.b", + "type": "rectangle", + "pos": { + "x": 3312, + "y": 276 + }, + "width": 54, + "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": "b", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "circle.b", + "type": "rectangle", + "pos": { + "x": 250, + "y": 101 + }, + "width": 54, + "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": "b", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "rect.b", + "type": "rectangle", + "pos": { + "x": 2765, + "y": 218 + }, + "width": 54, + "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": "b", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "diamond.b", + "type": "rectangle", + "pos": { + "x": 1632, + "y": 218 + }, + "width": 54, + "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": "b", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "square.c", + "type": "rectangle", + "pos": { + "x": 2215, + "y": 251 + }, + "width": 53, + "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": "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": 2 + }, + { + "id": "diamond.c", + "type": "rectangle", + "pos": { + "x": 1539, + "y": 324 + }, + "width": 53, + "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": "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": 2 + }, + { + "id": "cloud.c", + "type": "rectangle", + "pos": { + "x": 3219, + "y": 382 + }, + "width": 53, + "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": "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": 2 + }, + { + "id": "oval.c", + "type": "rectangle", + "pos": { + "x": 791, + "y": 355 + }, + "width": 53, + "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": "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": 2 + }, + { + "id": "rect.c", + "type": "rectangle", + "pos": { + "x": 2672, + "y": 324 + }, + "width": 53, + "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": "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": 2 + }, + { + "id": "circle.c", + "type": "rectangle", + "pos": { + "x": 157, + "y": 207 + }, + "width": 53, + "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": "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": 2 + }, + { + "id": "rect.d", + "type": "rectangle", + "pos": { + "x": 2765, + "y": 324 + }, + "width": 54, + "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": "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": 2 + }, + { + "id": "square.d", + "type": "rectangle", + "pos": { + "x": 2308, + "y": 251 + }, + "width": 54, + "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": "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": 2 + }, + { + "id": "circle.d", + "type": "rectangle", + "pos": { + "x": 250, + "y": 207 + }, + "width": 54, + "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": "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": 2 + }, + { + "id": "oval.d", + "type": "rectangle", + "pos": { + "x": 884, + "y": 355 + }, + "width": 54, + "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": "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": 2 + }, + { + "id": "diamond.d", + "type": "rectangle", + "pos": { + "x": 1632, + "y": 324 + }, + "width": 54, + "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": "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": 2 + }, + { + "id": "cloud.d", + "type": "rectangle", + "pos": { + "x": 3312, + "y": 382 + }, + "width": 54, + "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": "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": 2 + }, + { + "id": "circle", + "type": "oval", + "pos": { + "x": 12, + "y": 41 + }, + "width": 526, + "height": 526, + "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": "aaaaaaaaaaaaaaa aaaaaaaaaaaaaaa", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 427, + "labelHeight": 36, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "oval", + "type": "oval", + "pos": { + "x": 558, + "y": 141 + }, + "width": 598, + "height": 325, + "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": "aaaaaaaaaaaaaaa aaaaaaaaaaaaaaa", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 427, + "labelHeight": 36, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "diamond", + "type": "diamond", + "pos": { + "x": 1176, + "y": 12 + }, + "width": 874, + "height": 584, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "N4", + "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": "aaaaaaaaaaaaaaa aaaaaaaaaaaaaaa", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 427, + "labelHeight": 36, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "square", + "type": "rectangle", + "pos": { + "x": 2070, + "y": 85 + }, + "width": 437, + "height": 437, + "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": "aaaaaaaaaaaaaaa aaaaaaaaaaaaaaa", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 427, + "labelHeight": 36, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "rect", + "type": "rectangle", + "pos": { + "x": 2527, + "y": 158 + }, + "width": 437, + "height": 292, + "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": "aaaaaaaaaaaaaaa aaaaaaaaaaaaaaa", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 427, + "labelHeight": 36, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "cloud", + "type": "cloud", + "pos": { + "x": 2984, + "y": 37 + }, + "width": 534, + "height": 533, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "N7", + "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": "aaaaaaaaaaaaaaa aaaaaaaaaaaaaaa", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 427, + "labelHeight": 36, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + } + ], + "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/shaped_grid_positioning/elk/sketch.exp.svg b/e2etests/testdata/regression/shaped_grid_positioning/elk/sketch.exp.svg new file mode 100644 index 0000000000..bec267afa9 --- /dev/null +++ b/e2etests/testdata/regression/shaped_grid_positioning/elk/sketch.exp.svg @@ -0,0 +1,131 @@ +aaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaabbbbbbccccccdddddd + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From ff55ca932f6d951be75bd5cf68b7faf3bf9ab22c Mon Sep 17 00:00:00 2001 From: Gavin Nishizawa Date: Wed, 15 Nov 2023 16:46:42 -0800 Subject: [PATCH 02/13] code to display shape's innerBox --- d2renderers/d2svg/d2svg.go | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/d2renderers/d2svg/d2svg.go b/d2renderers/d2svg/d2svg.go index 67db074c99..493617db30 100644 --- a/d2renderers/d2svg/d2svg.go +++ b/d2renderers/d2svg/d2svg.go @@ -1192,10 +1192,15 @@ func drawShape(writer, appendixWriter io.Writer, diagramHash string, targetShape } } - // to examine GetInsidePlacement - // padX, padY := s.GetDefaultPadding() - // innerTL := s.GetInsidePlacement(s.GetInnerBox().Width, s.GetInnerBox().Height, padX, padY) - // fmt.Fprint(writer, renderOval(&innerTL, 5, 5, "fill:red;")) + // to examine shape's innerBox + innerBox := s.GetInnerBox() + el := d2themes.NewThemableElement("rect") + el.X = float64(innerBox.TopLeft.X) + el.Y = float64(innerBox.TopLeft.Y) + el.Width = float64(innerBox.Width) + el.Height = float64(innerBox.Height) + el.Style = "fill:rgba(255,0,0,0.5);" + fmt.Fprint(writer, el.Render()) // Closes the class=shape fmt.Fprint(writer, ``) From ac273cd206d08846905b2b4a35e8573a7e34df61 Mon Sep 17 00:00:00 2001 From: Gavin Nishizawa Date: Wed, 15 Nov 2023 20:23:51 -0800 Subject: [PATCH 03/13] test rendered with innerBox --- .../regression/shaped_grid_positioning/dagre/sketch.exp.svg | 2 +- .../regression/shaped_grid_positioning/elk/sketch.exp.svg | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/e2etests/testdata/regression/shaped_grid_positioning/dagre/sketch.exp.svg b/e2etests/testdata/regression/shaped_grid_positioning/dagre/sketch.exp.svg index 686a911ba8..6d98e72f69 100644 --- a/e2etests/testdata/regression/shaped_grid_positioning/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/shaped_grid_positioning/dagre/sketch.exp.svg @@ -96,7 +96,7 @@ .d2-3417826507 .color-AA4{color:#EDF0FD;} .d2-3417826507 .color-AA5{color:#F7F8FE;} .d2-3417826507 .color-AB4{color:#EDF0FD;} - .d2-3417826507 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>aaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaabbbbbbccccccdddddd + .d2-3417826507 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>aaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaabbbbbbccccccdddddd diff --git a/e2etests/testdata/regression/shaped_grid_positioning/elk/sketch.exp.svg b/e2etests/testdata/regression/shaped_grid_positioning/elk/sketch.exp.svg index bec267afa9..4c52088744 100644 --- a/e2etests/testdata/regression/shaped_grid_positioning/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/shaped_grid_positioning/elk/sketch.exp.svg @@ -96,7 +96,7 @@ .d2-1807609496 .color-AA4{color:#EDF0FD;} .d2-1807609496 .color-AA5{color:#F7F8FE;} .d2-1807609496 .color-AB4{color:#EDF0FD;} - .d2-1807609496 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>aaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaabbbbbbccccccdddddd + .d2-1807609496 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>aaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaabbbbbbccccccdddddd From f119d582e02b9365876bd2cfd9508fb7a3189a44 Mon Sep 17 00:00:00 2001 From: Gavin Nishizawa Date: Wed, 15 Nov 2023 18:07:28 -0800 Subject: [PATCH 04/13] fix shape circle functions --- lib/shape/shape_circle.go | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/lib/shape/shape_circle.go b/lib/shape/shape_circle.go index 72526eecbf..f009b0fc88 100644 --- a/lib/shape/shape_circle.go +++ b/lib/shape/shape_circle.go @@ -37,12 +37,19 @@ func (s shapeCircle) AspectRatio1() bool { } func (s shapeCircle) GetDimensionsToFit(width, height, paddingX, paddingY float64) (float64, float64) { - diameter := math.Ceil(math.Sqrt(math.Pow(width+paddingX, 2) + math.Pow(height+paddingY, 2))) + length := math.Max(width+paddingX, height+paddingY) + diameter := math.Ceil(math.Sqrt2 * length) return diameter, diameter } func (s shapeCircle) GetInsidePlacement(width, height, paddingX, paddingY float64) geo.Point { - return *geo.NewPoint(s.Box.TopLeft.X+math.Ceil(s.Box.Width/2-width/2), s.Box.TopLeft.Y+math.Ceil(s.Box.Height/2-height/2)) + project45 := 1 / math.Sqrt2 + r := s.Box.Width / 2 + // we want to offset r-padding/2 away from the center + return geo.Point{ + X: s.Box.TopLeft.X + math.Ceil(r-project45*(r-paddingX/2)), + Y: s.Box.TopLeft.Y + math.Ceil(r-project45*(r-paddingY/2)), + } } func (s shapeCircle) Perimeter() []geo.Intersectable { From f5a4e4f059cf9e1670b9d1c7f5ad7f89461dfd7b Mon Sep 17 00:00:00 2001 From: Gavin Nishizawa Date: Wed, 15 Nov 2023 18:25:18 -0800 Subject: [PATCH 05/13] save --- d2layouts/d2grid/layout.go | 126 +++++++++++++++++++------------------ 1 file changed, 65 insertions(+), 61 deletions(-) diff --git a/d2layouts/d2grid/layout.go b/d2layouts/d2grid/layout.go index fc9b4a91ea..3add3eaf5d 100644 --- a/d2layouts/d2grid/layout.go +++ b/d2layouts/d2grid/layout.go @@ -5,12 +5,13 @@ import ( "context" "fmt" "math" - "strconv" + "cdr.dev/slog" "oss.terrastruct.com/d2/d2graph" "oss.terrastruct.com/d2/d2target" "oss.terrastruct.com/d2/lib/geo" "oss.terrastruct.com/d2/lib/label" + "oss.terrastruct.com/d2/lib/log" "oss.terrastruct.com/util-go/go2" ) @@ -69,7 +70,6 @@ func Layout(ctx context.Context, g *d2graph.Graph) error { labelHeight = float64(obj.LabelDimensions.Height) + 2*label.PADDING } - var dx, dy float64 if labelWidth > 0 { switch labelPosition { case label.OutsideTopLeft, label.OutsideTopCenter, label.OutsideTopRight, @@ -112,67 +112,71 @@ func Layout(ctx context.Context, g *d2graph.Graph) error { } } - overflowTop := padding.Top - float64(verticalPadding) - if overflowTop > 0 { - contentHeight += overflowTop - dy += overflowTop - } - overflowBottom := padding.Bottom - float64(verticalPadding) - if overflowBottom > 0 { - contentHeight += overflowBottom - } - overflowLeft := padding.Left - float64(horizontalPadding) - if overflowLeft > 0 { - contentWidth += overflowLeft - dx += overflowLeft - } - overflowRight := padding.Right - float64(horizontalPadding) - if overflowRight > 0 { - contentWidth += overflowRight - } - - // manually handle desiredWidth/Height so we can center the grid - var desiredWidth, desiredHeight int - var originalWidthAttr, originalHeightAttr *d2graph.Scalar - if obj.WidthAttr != nil { - desiredWidth, _ = strconv.Atoi(obj.WidthAttr.Value) - // SizeToContent without desired width - originalWidthAttr = obj.WidthAttr - obj.WidthAttr = nil - } - if obj.HeightAttr != nil { - desiredHeight, _ = strconv.Atoi(obj.HeightAttr.Value) - originalHeightAttr = obj.HeightAttr - obj.HeightAttr = nil - } - // size shape according to grid - obj.SizeToContent(contentWidth, contentHeight, float64(2*horizontalPadding), float64(2*verticalPadding)) - if originalWidthAttr != nil { - obj.WidthAttr = originalWidthAttr - } - if originalHeightAttr != nil { - obj.HeightAttr = originalHeightAttr - } - - if desiredWidth > 0 { - ddx := float64(desiredWidth) - obj.Width - if ddx > 0 { - dx += ddx / 2 - obj.Width = float64(desiredWidth) - } - } - if desiredHeight > 0 { - ddy := float64(desiredHeight) - obj.Height - if ddy > 0 { - dy += ddy / 2 - obj.Height = float64(desiredHeight) - } - } + padding.Top = math.Max(padding.Top, float64(verticalPadding)) + padding.Bottom = math.Max(padding.Bottom, float64(verticalPadding)) + padding.Left = math.Max(padding.Left, float64(horizontalPadding)) + padding.Right = math.Max(padding.Right, float64(horizontalPadding)) + + // TODO: rethink how this works with shapes and padding + // // manually handle desiredWidth/Height so we can center the grid + // var desiredWidth, desiredHeight int + // var originalWidthAttr, originalHeightAttr *d2graph.Scalar + // if obj.WidthAttr != nil { + // desiredWidth, _ = strconv.Atoi(obj.WidthAttr.Value) + // // SizeToContent without desired width + // originalWidthAttr = obj.WidthAttr + // obj.WidthAttr = nil + // } + // if obj.HeightAttr != nil { + // desiredHeight, _ = strconv.Atoi(obj.HeightAttr.Value) + // originalHeightAttr = obj.HeightAttr + // obj.HeightAttr = nil + // } + + totalWidth := padding.Left + contentWidth + padding.Right + totalHeight := padding.Top + contentHeight + padding.Bottom + obj.SizeToContent(totalWidth, totalHeight, 0, 0) + + // if originalWidthAttr != nil { + // obj.WidthAttr = originalWidthAttr + // } + // if originalHeightAttr != nil { + // obj.HeightAttr = originalHeightAttr + // } + + // var offsetX, offsetY float64 + // if desiredWidth > 0 { + // ddx := float64(desiredWidth) - obj.Width + // if ddx > 0 { + // offsetX = ddx / 2 + // obj.Width = float64(desiredWidth) + // } + // } + // if desiredHeight > 0 { + // ddy := float64(desiredHeight) - obj.Height + // if ddy > 0 { + // offsetY = ddy / 2 + // obj.Height = float64(desiredHeight) + // } + // } // compute where the grid should be placed inside shape - innerBox := obj.ToShape().GetInnerBox() - dx = innerBox.TopLeft.X + dx - dy = innerBox.TopLeft.Y + dy + s := obj.ToShape() + innerTL := s.GetInsidePlacement(totalWidth, totalHeight, 0, 0) + + log.Warn(ctx, obj.Shape.Value, + slog.F("box", obj.Box.ToString()), + slog.F("innerTL", innerTL.ToString()), + slog.F("contentWidth", contentWidth), + slog.F("contentHeight", contentHeight), + slog.F("labelWidth", labelWidth), + slog.F("labelHeight", labelHeight), + slog.F("padding", padding), + ) + + // move from horizontalPadding,verticalPadding to innerTL.X+padding.Left, innerTL.Y+padding.Top + dx := -float64(horizontalPadding) + innerTL.X + padding.Left + dy := -float64(verticalPadding) + innerTL.Y + padding.Top if dx != 0 || dy != 0 { gd.shift(dx, dy) } From 1786f57e66be4f281cdf8dd28bebfcf1cd3569b6 Mon Sep 17 00:00:00 2001 From: Gavin Nishizawa Date: Wed, 15 Nov 2023 19:58:29 -0800 Subject: [PATCH 06/13] account for shapes that need a larger innerBox --- d2layouts/d2grid/layout.go | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/d2layouts/d2grid/layout.go b/d2layouts/d2grid/layout.go index 3add3eaf5d..819f5d09b3 100644 --- a/d2layouts/d2grid/layout.go +++ b/d2layouts/d2grid/layout.go @@ -163,6 +163,17 @@ func Layout(ctx context.Context, g *d2graph.Graph) error { // compute where the grid should be placed inside shape s := obj.ToShape() innerTL := s.GetInsidePlacement(totalWidth, totalHeight, 0, 0) + // depending on the shape innerBox may be larger than totalWidth, totalHeight + // if this is the case, we want to center the cells within the larger innerBox + innerBox := s.GetInnerBox() + + var resizeDx, resizeDy float64 + if innerBox.Width > totalWidth { + resizeDx = (innerBox.Width - totalWidth) / 2 + } + if innerBox.Height > totalHeight { + resizeDy = (innerBox.Height - totalHeight) / 2 + } log.Warn(ctx, obj.Shape.Value, slog.F("box", obj.Box.ToString()), @@ -175,8 +186,8 @@ func Layout(ctx context.Context, g *d2graph.Graph) error { ) // move from horizontalPadding,verticalPadding to innerTL.X+padding.Left, innerTL.Y+padding.Top - dx := -float64(horizontalPadding) + innerTL.X + padding.Left - dy := -float64(verticalPadding) + innerTL.Y + padding.Top + dx := -float64(horizontalPadding) + innerTL.X + padding.Left + resizeDx + dy := -float64(verticalPadding) + innerTL.Y + padding.Top + resizeDy if dx != 0 || dy != 0 { gd.shift(dx, dy) } From 44dc28705b0157c0dd28113688755ee0d7c96fda Mon Sep 17 00:00:00 2001 From: Gavin Nishizawa Date: Wed, 15 Nov 2023 20:02:22 -0800 Subject: [PATCH 07/13] disable innerbox drawing --- d2renderers/d2svg/d2svg.go | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/d2renderers/d2svg/d2svg.go b/d2renderers/d2svg/d2svg.go index 493617db30..3f1ae7943c 100644 --- a/d2renderers/d2svg/d2svg.go +++ b/d2renderers/d2svg/d2svg.go @@ -1192,15 +1192,15 @@ func drawShape(writer, appendixWriter io.Writer, diagramHash string, targetShape } } - // to examine shape's innerBox - innerBox := s.GetInnerBox() - el := d2themes.NewThemableElement("rect") - el.X = float64(innerBox.TopLeft.X) - el.Y = float64(innerBox.TopLeft.Y) - el.Width = float64(innerBox.Width) - el.Height = float64(innerBox.Height) - el.Style = "fill:rgba(255,0,0,0.5);" - fmt.Fprint(writer, el.Render()) + // // to examine shape's innerBox + // innerBox := s.GetInnerBox() + // el := d2themes.NewThemableElement("rect") + // el.X = float64(innerBox.TopLeft.X) + // el.Y = float64(innerBox.TopLeft.Y) + // el.Width = float64(innerBox.Width) + // el.Height = float64(innerBox.Height) + // el.Style = "fill:rgba(255,0,0,0.5);" + // fmt.Fprint(writer, el.Render()) // Closes the class=shape fmt.Fprint(writer, ``) From d5f1b1e384853678a8f5e21ca665e78d4b4434c5 Mon Sep 17 00:00:00 2001 From: Gavin Nishizawa Date: Wed, 15 Nov 2023 20:28:35 -0800 Subject: [PATCH 08/13] update test --- .../dagre/board.exp.json | 126 +++++----- .../dagre/sketch.exp.svg | 220 +++++++++--------- .../elk/board.exp.json | 126 +++++----- .../elk/sketch.exp.svg | 220 +++++++++--------- 4 files changed, 346 insertions(+), 346 deletions(-) diff --git a/e2etests/testdata/regression/shaped_grid_positioning/dagre/board.exp.json b/e2etests/testdata/regression/shaped_grid_positioning/dagre/board.exp.json index 8e3cfc3f88..25474b2f0c 100644 --- a/e2etests/testdata/regression/shaped_grid_positioning/dagre/board.exp.json +++ b/e2etests/testdata/regression/shaped_grid_positioning/dagre/board.exp.json @@ -7,8 +7,8 @@ "id": "oval.a", "type": "rectangle", "pos": { - "x": 819, - "y": 238 + "x": 915, + "y": 224 }, "width": 53, "height": 66, @@ -48,8 +48,8 @@ "id": "circle.a", "type": "rectangle", "pos": { - "x": 145, - "y": 89 + "x": 236, + "y": 223 }, "width": 53, "height": 66, @@ -89,8 +89,8 @@ "id": "cloud.a", "type": "rectangle", "pos": { - "x": 3407, - "y": 265 + "x": 3477, + "y": 351 }, "width": 53, "height": 66, @@ -130,8 +130,8 @@ "id": "rect.a", "type": "rectangle", "pos": { - "x": 2820, - "y": 206 + "x": 2934, + "y": 224 }, "width": 53, "height": 66, @@ -171,8 +171,8 @@ "id": "square.a", "type": "rectangle", "pos": { - "x": 2323, - "y": 134 + "x": 2437, + "y": 223 }, "width": 53, "height": 66, @@ -212,8 +212,8 @@ "id": "diamond.a", "type": "rectangle", "pos": { - "x": 1607, - "y": 206 + "x": 1721, + "y": 224 }, "width": 53, "height": 66, @@ -253,8 +253,8 @@ "id": "oval.b", "type": "rectangle", "pos": { - "x": 912, - "y": 238 + "x": 1008, + "y": 224 }, "width": 54, "height": 66, @@ -294,8 +294,8 @@ "id": "square.b", "type": "rectangle", "pos": { - "x": 2416, - "y": 134 + "x": 2530, + "y": 223 }, "width": 54, "height": 66, @@ -335,8 +335,8 @@ "id": "cloud.b", "type": "rectangle", "pos": { - "x": 3500, - "y": 265 + "x": 3570, + "y": 351 }, "width": 54, "height": 66, @@ -376,8 +376,8 @@ "id": "circle.b", "type": "rectangle", "pos": { - "x": 238, - "y": 89 + "x": 329, + "y": 223 }, "width": 54, "height": 66, @@ -417,8 +417,8 @@ "id": "rect.b", "type": "rectangle", "pos": { - "x": 2913, - "y": 206 + "x": 3027, + "y": 224 }, "width": 54, "height": 66, @@ -458,8 +458,8 @@ "id": "diamond.b", "type": "rectangle", "pos": { - "x": 1700, - "y": 206 + "x": 1814, + "y": 224 }, "width": 54, "height": 66, @@ -499,8 +499,8 @@ "id": "square.c", "type": "rectangle", "pos": { - "x": 2323, - "y": 240 + "x": 2437, + "y": 329 }, "width": 53, "height": 66, @@ -540,8 +540,8 @@ "id": "diamond.c", "type": "rectangle", "pos": { - "x": 1607, - "y": 312 + "x": 1721, + "y": 330 }, "width": 53, "height": 66, @@ -581,8 +581,8 @@ "id": "cloud.c", "type": "rectangle", "pos": { - "x": 3407, - "y": 371 + "x": 3477, + "y": 457 }, "width": 53, "height": 66, @@ -622,8 +622,8 @@ "id": "oval.c", "type": "rectangle", "pos": { - "x": 819, - "y": 344 + "x": 915, + "y": 330 }, "width": 53, "height": 66, @@ -663,8 +663,8 @@ "id": "rect.c", "type": "rectangle", "pos": { - "x": 2820, - "y": 312 + "x": 2934, + "y": 330 }, "width": 53, "height": 66, @@ -704,8 +704,8 @@ "id": "circle.c", "type": "rectangle", "pos": { - "x": 145, - "y": 195 + "x": 236, + "y": 329 }, "width": 53, "height": 66, @@ -745,8 +745,8 @@ "id": "rect.d", "type": "rectangle", "pos": { - "x": 2913, - "y": 312 + "x": 3027, + "y": 330 }, "width": 54, "height": 66, @@ -786,8 +786,8 @@ "id": "square.d", "type": "rectangle", "pos": { - "x": 2416, - "y": 240 + "x": 2530, + "y": 329 }, "width": 54, "height": 66, @@ -827,8 +827,8 @@ "id": "circle.d", "type": "rectangle", "pos": { - "x": 238, - "y": 195 + "x": 329, + "y": 329 }, "width": 54, "height": 66, @@ -868,8 +868,8 @@ "id": "oval.d", "type": "rectangle", "pos": { - "x": 912, - "y": 344 + "x": 1008, + "y": 330 }, "width": 54, "height": 66, @@ -909,8 +909,8 @@ "id": "diamond.d", "type": "rectangle", "pos": { - "x": 1700, - "y": 312 + "x": 1814, + "y": 330 }, "width": 54, "height": 66, @@ -950,8 +950,8 @@ "id": "cloud.d", "type": "rectangle", "pos": { - "x": 3500, - "y": 371 + "x": 3570, + "y": 457 }, "width": 54, "height": 66, @@ -992,10 +992,10 @@ "type": "oval", "pos": { "x": 0, - "y": 29 + "y": 0 }, - "width": 526, - "height": 526, + "width": 619, + "height": 619, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1032,11 +1032,11 @@ "id": "oval", "type": "oval", "pos": { - "x": 586, - "y": 130 + "x": 679, + "y": 103 }, - "width": 598, - "height": 325, + "width": 619, + "height": 413, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1073,8 +1073,8 @@ "id": "diamond", "type": "diamond", "pos": { - "x": 1244, - "y": 0 + "x": 1358, + "y": 18 }, "width": 874, "height": 584, @@ -1114,8 +1114,8 @@ "id": "square", "type": "rectangle", "pos": { - "x": 2178, - "y": 74 + "x": 2292, + "y": 91 }, "width": 437, "height": 437, @@ -1155,8 +1155,8 @@ "id": "rect", "type": "rectangle", "pos": { - "x": 2675, - "y": 146 + "x": 2789, + "y": 164 }, "width": 437, "height": 292, @@ -1196,8 +1196,8 @@ "id": "cloud", "type": "cloud", "pos": { - "x": 3172, - "y": 26 + "x": 3286, + "y": 43 }, "width": 534, "height": 533, diff --git a/e2etests/testdata/regression/shaped_grid_positioning/dagre/sketch.exp.svg b/e2etests/testdata/regression/shaped_grid_positioning/dagre/sketch.exp.svg index 6d98e72f69..25b6d7dea8 100644 --- a/e2etests/testdata/regression/shaped_grid_positioning/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/shaped_grid_positioning/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -aaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaabbbbbbccccccdddddd - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + .d2-329080461 .fill-N1{fill:#0A0F25;} + .d2-329080461 .fill-N2{fill:#676C7E;} + .d2-329080461 .fill-N3{fill:#9499AB;} + .d2-329080461 .fill-N4{fill:#CFD2DD;} + .d2-329080461 .fill-N5{fill:#DEE1EB;} + .d2-329080461 .fill-N6{fill:#EEF1F8;} + .d2-329080461 .fill-N7{fill:#FFFFFF;} + .d2-329080461 .fill-B1{fill:#0D32B2;} + .d2-329080461 .fill-B2{fill:#0D32B2;} + .d2-329080461 .fill-B3{fill:#E3E9FD;} + .d2-329080461 .fill-B4{fill:#E3E9FD;} + .d2-329080461 .fill-B5{fill:#EDF0FD;} + .d2-329080461 .fill-B6{fill:#F7F8FE;} + .d2-329080461 .fill-AA2{fill:#4A6FF3;} + .d2-329080461 .fill-AA4{fill:#EDF0FD;} + .d2-329080461 .fill-AA5{fill:#F7F8FE;} + .d2-329080461 .fill-AB4{fill:#EDF0FD;} + .d2-329080461 .fill-AB5{fill:#F7F8FE;} + .d2-329080461 .stroke-N1{stroke:#0A0F25;} + .d2-329080461 .stroke-N2{stroke:#676C7E;} + .d2-329080461 .stroke-N3{stroke:#9499AB;} + .d2-329080461 .stroke-N4{stroke:#CFD2DD;} + .d2-329080461 .stroke-N5{stroke:#DEE1EB;} + .d2-329080461 .stroke-N6{stroke:#EEF1F8;} + .d2-329080461 .stroke-N7{stroke:#FFFFFF;} + .d2-329080461 .stroke-B1{stroke:#0D32B2;} + .d2-329080461 .stroke-B2{stroke:#0D32B2;} + .d2-329080461 .stroke-B3{stroke:#E3E9FD;} + .d2-329080461 .stroke-B4{stroke:#E3E9FD;} + .d2-329080461 .stroke-B5{stroke:#EDF0FD;} + .d2-329080461 .stroke-B6{stroke:#F7F8FE;} + .d2-329080461 .stroke-AA2{stroke:#4A6FF3;} + .d2-329080461 .stroke-AA4{stroke:#EDF0FD;} + .d2-329080461 .stroke-AA5{stroke:#F7F8FE;} + .d2-329080461 .stroke-AB4{stroke:#EDF0FD;} + .d2-329080461 .stroke-AB5{stroke:#F7F8FE;} + .d2-329080461 .background-color-N1{background-color:#0A0F25;} + .d2-329080461 .background-color-N2{background-color:#676C7E;} + .d2-329080461 .background-color-N3{background-color:#9499AB;} + .d2-329080461 .background-color-N4{background-color:#CFD2DD;} + .d2-329080461 .background-color-N5{background-color:#DEE1EB;} + .d2-329080461 .background-color-N6{background-color:#EEF1F8;} + .d2-329080461 .background-color-N7{background-color:#FFFFFF;} + .d2-329080461 .background-color-B1{background-color:#0D32B2;} + .d2-329080461 .background-color-B2{background-color:#0D32B2;} + .d2-329080461 .background-color-B3{background-color:#E3E9FD;} + .d2-329080461 .background-color-B4{background-color:#E3E9FD;} + .d2-329080461 .background-color-B5{background-color:#EDF0FD;} + .d2-329080461 .background-color-B6{background-color:#F7F8FE;} + .d2-329080461 .background-color-AA2{background-color:#4A6FF3;} + .d2-329080461 .background-color-AA4{background-color:#EDF0FD;} + .d2-329080461 .background-color-AA5{background-color:#F7F8FE;} + .d2-329080461 .background-color-AB4{background-color:#EDF0FD;} + .d2-329080461 .background-color-AB5{background-color:#F7F8FE;} + .d2-329080461 .color-N1{color:#0A0F25;} + .d2-329080461 .color-N2{color:#676C7E;} + .d2-329080461 .color-N3{color:#9499AB;} + .d2-329080461 .color-N4{color:#CFD2DD;} + .d2-329080461 .color-N5{color:#DEE1EB;} + .d2-329080461 .color-N6{color:#EEF1F8;} + .d2-329080461 .color-N7{color:#FFFFFF;} + .d2-329080461 .color-B1{color:#0D32B2;} + .d2-329080461 .color-B2{color:#0D32B2;} + .d2-329080461 .color-B3{color:#E3E9FD;} + .d2-329080461 .color-B4{color:#E3E9FD;} + .d2-329080461 .color-B5{color:#EDF0FD;} + .d2-329080461 .color-B6{color:#F7F8FE;} + .d2-329080461 .color-AA2{color:#4A6FF3;} + .d2-329080461 .color-AA4{color:#EDF0FD;} + .d2-329080461 .color-AA5{color:#F7F8FE;} + .d2-329080461 .color-AB4{color:#EDF0FD;} + .d2-329080461 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>aaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaabbbbbbccccccdddddd + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/regression/shaped_grid_positioning/elk/board.exp.json b/e2etests/testdata/regression/shaped_grid_positioning/elk/board.exp.json index 97d3badbaf..b9c4c2ac8d 100644 --- a/e2etests/testdata/regression/shaped_grid_positioning/elk/board.exp.json +++ b/e2etests/testdata/regression/shaped_grid_positioning/elk/board.exp.json @@ -7,8 +7,8 @@ "id": "oval.a", "type": "rectangle", "pos": { - "x": 791, - "y": 249 + "x": 887, + "y": 236 }, "width": 53, "height": 66, @@ -48,8 +48,8 @@ "id": "circle.a", "type": "rectangle", "pos": { - "x": 157, - "y": 101 + "x": 248, + "y": 235 }, "width": 53, "height": 66, @@ -89,8 +89,8 @@ "id": "cloud.a", "type": "rectangle", "pos": { - "x": 3219, - "y": 276 + "x": 3289, + "y": 363 }, "width": 53, "height": 66, @@ -130,8 +130,8 @@ "id": "rect.a", "type": "rectangle", "pos": { - "x": 2672, - "y": 218 + "x": 2786, + "y": 235 }, "width": 53, "height": 66, @@ -171,8 +171,8 @@ "id": "square.a", "type": "rectangle", "pos": { - "x": 2215, - "y": 145 + "x": 2329, + "y": 235 }, "width": 53, "height": 66, @@ -212,8 +212,8 @@ "id": "diamond.a", "type": "rectangle", "pos": { - "x": 1539, - "y": 218 + "x": 1653, + "y": 235 }, "width": 53, "height": 66, @@ -253,8 +253,8 @@ "id": "oval.b", "type": "rectangle", "pos": { - "x": 884, - "y": 249 + "x": 980, + "y": 236 }, "width": 54, "height": 66, @@ -294,8 +294,8 @@ "id": "square.b", "type": "rectangle", "pos": { - "x": 2308, - "y": 145 + "x": 2422, + "y": 235 }, "width": 54, "height": 66, @@ -335,8 +335,8 @@ "id": "cloud.b", "type": "rectangle", "pos": { - "x": 3312, - "y": 276 + "x": 3382, + "y": 363 }, "width": 54, "height": 66, @@ -376,8 +376,8 @@ "id": "circle.b", "type": "rectangle", "pos": { - "x": 250, - "y": 101 + "x": 341, + "y": 235 }, "width": 54, "height": 66, @@ -417,8 +417,8 @@ "id": "rect.b", "type": "rectangle", "pos": { - "x": 2765, - "y": 218 + "x": 2879, + "y": 235 }, "width": 54, "height": 66, @@ -458,8 +458,8 @@ "id": "diamond.b", "type": "rectangle", "pos": { - "x": 1632, - "y": 218 + "x": 1746, + "y": 235 }, "width": 54, "height": 66, @@ -499,8 +499,8 @@ "id": "square.c", "type": "rectangle", "pos": { - "x": 2215, - "y": 251 + "x": 2329, + "y": 341 }, "width": 53, "height": 66, @@ -540,8 +540,8 @@ "id": "diamond.c", "type": "rectangle", "pos": { - "x": 1539, - "y": 324 + "x": 1653, + "y": 341 }, "width": 53, "height": 66, @@ -581,8 +581,8 @@ "id": "cloud.c", "type": "rectangle", "pos": { - "x": 3219, - "y": 382 + "x": 3289, + "y": 469 }, "width": 53, "height": 66, @@ -622,8 +622,8 @@ "id": "oval.c", "type": "rectangle", "pos": { - "x": 791, - "y": 355 + "x": 887, + "y": 342 }, "width": 53, "height": 66, @@ -663,8 +663,8 @@ "id": "rect.c", "type": "rectangle", "pos": { - "x": 2672, - "y": 324 + "x": 2786, + "y": 341 }, "width": 53, "height": 66, @@ -704,8 +704,8 @@ "id": "circle.c", "type": "rectangle", "pos": { - "x": 157, - "y": 207 + "x": 248, + "y": 341 }, "width": 53, "height": 66, @@ -745,8 +745,8 @@ "id": "rect.d", "type": "rectangle", "pos": { - "x": 2765, - "y": 324 + "x": 2879, + "y": 341 }, "width": 54, "height": 66, @@ -786,8 +786,8 @@ "id": "square.d", "type": "rectangle", "pos": { - "x": 2308, - "y": 251 + "x": 2422, + "y": 341 }, "width": 54, "height": 66, @@ -827,8 +827,8 @@ "id": "circle.d", "type": "rectangle", "pos": { - "x": 250, - "y": 207 + "x": 341, + "y": 341 }, "width": 54, "height": 66, @@ -868,8 +868,8 @@ "id": "oval.d", "type": "rectangle", "pos": { - "x": 884, - "y": 355 + "x": 980, + "y": 342 }, "width": 54, "height": 66, @@ -909,8 +909,8 @@ "id": "diamond.d", "type": "rectangle", "pos": { - "x": 1632, - "y": 324 + "x": 1746, + "y": 341 }, "width": 54, "height": 66, @@ -950,8 +950,8 @@ "id": "cloud.d", "type": "rectangle", "pos": { - "x": 3312, - "y": 382 + "x": 3382, + "y": 469 }, "width": 54, "height": 66, @@ -992,10 +992,10 @@ "type": "oval", "pos": { "x": 12, - "y": 41 + "y": 12 }, - "width": 526, - "height": 526, + "width": 619, + "height": 619, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1032,11 +1032,11 @@ "id": "oval", "type": "oval", "pos": { - "x": 558, - "y": 141 + "x": 651, + "y": 115 }, - "width": 598, - "height": 325, + "width": 619, + "height": 413, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1073,8 +1073,8 @@ "id": "diamond", "type": "diamond", "pos": { - "x": 1176, - "y": 12 + "x": 1290, + "y": 29 }, "width": 874, "height": 584, @@ -1114,8 +1114,8 @@ "id": "square", "type": "rectangle", "pos": { - "x": 2070, - "y": 85 + "x": 2184, + "y": 103 }, "width": 437, "height": 437, @@ -1155,8 +1155,8 @@ "id": "rect", "type": "rectangle", "pos": { - "x": 2527, - "y": 158 + "x": 2641, + "y": 175 }, "width": 437, "height": 292, @@ -1196,8 +1196,8 @@ "id": "cloud", "type": "cloud", "pos": { - "x": 2984, - "y": 37 + "x": 3098, + "y": 55 }, "width": 534, "height": 533, diff --git a/e2etests/testdata/regression/shaped_grid_positioning/elk/sketch.exp.svg b/e2etests/testdata/regression/shaped_grid_positioning/elk/sketch.exp.svg index 4c52088744..017b74544d 100644 --- a/e2etests/testdata/regression/shaped_grid_positioning/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/shaped_grid_positioning/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -aaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaabbbbbbccccccdddddd - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + .d2-3906327456 .fill-N1{fill:#0A0F25;} + .d2-3906327456 .fill-N2{fill:#676C7E;} + .d2-3906327456 .fill-N3{fill:#9499AB;} + .d2-3906327456 .fill-N4{fill:#CFD2DD;} + .d2-3906327456 .fill-N5{fill:#DEE1EB;} + .d2-3906327456 .fill-N6{fill:#EEF1F8;} + .d2-3906327456 .fill-N7{fill:#FFFFFF;} + .d2-3906327456 .fill-B1{fill:#0D32B2;} + .d2-3906327456 .fill-B2{fill:#0D32B2;} + .d2-3906327456 .fill-B3{fill:#E3E9FD;} + .d2-3906327456 .fill-B4{fill:#E3E9FD;} + .d2-3906327456 .fill-B5{fill:#EDF0FD;} + .d2-3906327456 .fill-B6{fill:#F7F8FE;} + .d2-3906327456 .fill-AA2{fill:#4A6FF3;} + .d2-3906327456 .fill-AA4{fill:#EDF0FD;} + .d2-3906327456 .fill-AA5{fill:#F7F8FE;} + .d2-3906327456 .fill-AB4{fill:#EDF0FD;} + .d2-3906327456 .fill-AB5{fill:#F7F8FE;} + .d2-3906327456 .stroke-N1{stroke:#0A0F25;} + .d2-3906327456 .stroke-N2{stroke:#676C7E;} + .d2-3906327456 .stroke-N3{stroke:#9499AB;} + .d2-3906327456 .stroke-N4{stroke:#CFD2DD;} + .d2-3906327456 .stroke-N5{stroke:#DEE1EB;} + .d2-3906327456 .stroke-N6{stroke:#EEF1F8;} + .d2-3906327456 .stroke-N7{stroke:#FFFFFF;} + .d2-3906327456 .stroke-B1{stroke:#0D32B2;} + .d2-3906327456 .stroke-B2{stroke:#0D32B2;} + .d2-3906327456 .stroke-B3{stroke:#E3E9FD;} + .d2-3906327456 .stroke-B4{stroke:#E3E9FD;} + .d2-3906327456 .stroke-B5{stroke:#EDF0FD;} + .d2-3906327456 .stroke-B6{stroke:#F7F8FE;} + .d2-3906327456 .stroke-AA2{stroke:#4A6FF3;} + .d2-3906327456 .stroke-AA4{stroke:#EDF0FD;} + .d2-3906327456 .stroke-AA5{stroke:#F7F8FE;} + .d2-3906327456 .stroke-AB4{stroke:#EDF0FD;} + .d2-3906327456 .stroke-AB5{stroke:#F7F8FE;} + .d2-3906327456 .background-color-N1{background-color:#0A0F25;} + .d2-3906327456 .background-color-N2{background-color:#676C7E;} + .d2-3906327456 .background-color-N3{background-color:#9499AB;} + .d2-3906327456 .background-color-N4{background-color:#CFD2DD;} + .d2-3906327456 .background-color-N5{background-color:#DEE1EB;} + .d2-3906327456 .background-color-N6{background-color:#EEF1F8;} + .d2-3906327456 .background-color-N7{background-color:#FFFFFF;} + .d2-3906327456 .background-color-B1{background-color:#0D32B2;} + .d2-3906327456 .background-color-B2{background-color:#0D32B2;} + .d2-3906327456 .background-color-B3{background-color:#E3E9FD;} + .d2-3906327456 .background-color-B4{background-color:#E3E9FD;} + .d2-3906327456 .background-color-B5{background-color:#EDF0FD;} + .d2-3906327456 .background-color-B6{background-color:#F7F8FE;} + .d2-3906327456 .background-color-AA2{background-color:#4A6FF3;} + .d2-3906327456 .background-color-AA4{background-color:#EDF0FD;} + .d2-3906327456 .background-color-AA5{background-color:#F7F8FE;} + .d2-3906327456 .background-color-AB4{background-color:#EDF0FD;} + .d2-3906327456 .background-color-AB5{background-color:#F7F8FE;} + .d2-3906327456 .color-N1{color:#0A0F25;} + .d2-3906327456 .color-N2{color:#676C7E;} + .d2-3906327456 .color-N3{color:#9499AB;} + .d2-3906327456 .color-N4{color:#CFD2DD;} + .d2-3906327456 .color-N5{color:#DEE1EB;} + .d2-3906327456 .color-N6{color:#EEF1F8;} + .d2-3906327456 .color-N7{color:#FFFFFF;} + .d2-3906327456 .color-B1{color:#0D32B2;} + .d2-3906327456 .color-B2{color:#0D32B2;} + .d2-3906327456 .color-B3{color:#E3E9FD;} + .d2-3906327456 .color-B4{color:#E3E9FD;} + .d2-3906327456 .color-B5{color:#EDF0FD;} + .d2-3906327456 .color-B6{color:#F7F8FE;} + .d2-3906327456 .color-AA2{color:#4A6FF3;} + .d2-3906327456 .color-AA4{color:#EDF0FD;} + .d2-3906327456 .color-AA5{color:#F7F8FE;} + .d2-3906327456 .color-AB4{color:#EDF0FD;} + .d2-3906327456 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>aaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaabbbbbbccccccdddddd + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From f132b3aed667f83f4294ed9f552d6b37f3d730f0 Mon Sep 17 00:00:00 2001 From: Gavin Nishizawa Date: Wed, 15 Nov 2023 20:53:21 -0800 Subject: [PATCH 09/13] cleanup --- d2layouts/d2grid/layout.go | 52 +------------------------------------- lib/shape/shape_cloud.go | 1 + 2 files changed, 2 insertions(+), 51 deletions(-) diff --git a/d2layouts/d2grid/layout.go b/d2layouts/d2grid/layout.go index 819f5d09b3..7e106eb0a1 100644 --- a/d2layouts/d2grid/layout.go +++ b/d2layouts/d2grid/layout.go @@ -6,12 +6,10 @@ import ( "fmt" "math" - "cdr.dev/slog" "oss.terrastruct.com/d2/d2graph" "oss.terrastruct.com/d2/d2target" "oss.terrastruct.com/d2/lib/geo" "oss.terrastruct.com/d2/lib/label" - "oss.terrastruct.com/d2/lib/log" "oss.terrastruct.com/util-go/go2" ) @@ -117,49 +115,10 @@ func Layout(ctx context.Context, g *d2graph.Graph) error { padding.Left = math.Max(padding.Left, float64(horizontalPadding)) padding.Right = math.Max(padding.Right, float64(horizontalPadding)) - // TODO: rethink how this works with shapes and padding - // // manually handle desiredWidth/Height so we can center the grid - // var desiredWidth, desiredHeight int - // var originalWidthAttr, originalHeightAttr *d2graph.Scalar - // if obj.WidthAttr != nil { - // desiredWidth, _ = strconv.Atoi(obj.WidthAttr.Value) - // // SizeToContent without desired width - // originalWidthAttr = obj.WidthAttr - // obj.WidthAttr = nil - // } - // if obj.HeightAttr != nil { - // desiredHeight, _ = strconv.Atoi(obj.HeightAttr.Value) - // originalHeightAttr = obj.HeightAttr - // obj.HeightAttr = nil - // } - totalWidth := padding.Left + contentWidth + padding.Right totalHeight := padding.Top + contentHeight + padding.Bottom obj.SizeToContent(totalWidth, totalHeight, 0, 0) - // if originalWidthAttr != nil { - // obj.WidthAttr = originalWidthAttr - // } - // if originalHeightAttr != nil { - // obj.HeightAttr = originalHeightAttr - // } - - // var offsetX, offsetY float64 - // if desiredWidth > 0 { - // ddx := float64(desiredWidth) - obj.Width - // if ddx > 0 { - // offsetX = ddx / 2 - // obj.Width = float64(desiredWidth) - // } - // } - // if desiredHeight > 0 { - // ddy := float64(desiredHeight) - obj.Height - // if ddy > 0 { - // offsetY = ddy / 2 - // obj.Height = float64(desiredHeight) - // } - // } - // compute where the grid should be placed inside shape s := obj.ToShape() innerTL := s.GetInsidePlacement(totalWidth, totalHeight, 0, 0) @@ -175,17 +134,8 @@ func Layout(ctx context.Context, g *d2graph.Graph) error { resizeDy = (innerBox.Height - totalHeight) / 2 } - log.Warn(ctx, obj.Shape.Value, - slog.F("box", obj.Box.ToString()), - slog.F("innerTL", innerTL.ToString()), - slog.F("contentWidth", contentWidth), - slog.F("contentHeight", contentHeight), - slog.F("labelWidth", labelWidth), - slog.F("labelHeight", labelHeight), - slog.F("padding", padding), - ) - // move from horizontalPadding,verticalPadding to innerTL.X+padding.Left, innerTL.Y+padding.Top + // and if innerBox is larger than content dimensions, adjust to center within innerBox dx := -float64(horizontalPadding) + innerTL.X + padding.Left + resizeDx dy := -float64(verticalPadding) + innerTL.Y + padding.Top + resizeDy if dx != 0 || dy != 0 { diff --git a/lib/shape/shape_cloud.go b/lib/shape/shape_cloud.go index 6560033682..9753a383f9 100644 --- a/lib/shape/shape_cloud.go +++ b/lib/shape/shape_cloud.go @@ -43,6 +43,7 @@ func NewCloud(box *geo.Box) Shape { return shape } +// TODO this isn't always accurate since the content aspect ratio might be different from the final shape's func (s shapeCloud) GetInnerBox() *geo.Box { width := s.Box.Width height := s.Box.Height From 9a21d6956d19876dce0c89844372330d14a091d5 Mon Sep 17 00:00:00 2001 From: Gavin Nishizawa Date: Wed, 15 Nov 2023 21:08:04 -0800 Subject: [PATCH 10/13] update tests --- .../testdata/all_shapes/sketch.exp.svg | 154 +-- .../testdata/all_shapes_dark/sketch.exp.svg | 154 +-- .../d2sketch/testdata/dots-all/sketch.exp.svg | 154 +-- .../testdata/dots-multiple/sketch.exp.svg | 154 +-- .../testdata/all_shapes/dark_theme.exp.svg | 152 +-- .../testdata/TestCLI_E2E/import.exp.svg | 158 +-- .../patterns/all_shapes/dagre/board.exp.json | 12 +- .../patterns/all_shapes/dagre/sketch.exp.svg | 154 +-- .../patterns/multiple/dagre/board.exp.json | 12 +- .../patterns/multiple/dagre/sketch.exp.svg | 154 +-- .../patterns/paper/dagre/board.exp.json | 12 +- .../patterns/paper/dagre/sketch.exp.svg | 154 +-- .../glob_dimensions/dagre/board.exp.json | 140 +-- .../glob_dimensions/dagre/sketch.exp.svg | 198 ++-- .../glob_dimensions/elk/board.exp.json | 92 +- .../glob_dimensions/elk/sketch.exp.svg | 198 ++-- .../stable/all_shapes/dagre/board.exp.json | 12 +- .../stable/all_shapes/dagre/sketch.exp.svg | 152 +-- .../stable/all_shapes/elk/board.exp.json | 6 +- .../stable/all_shapes/elk/sketch.exp.svg | 154 +-- .../all_shapes_link/dagre/board.exp.json | 318 +++--- .../all_shapes_link/dagre/sketch.exp.svg | 360 +++---- .../stable/all_shapes_link/elk/board.exp.json | 192 ++-- .../stable/all_shapes_link/elk/sketch.exp.svg | 340 +++---- .../all_shapes_multiple/dagre/board.exp.json | 12 +- .../all_shapes_multiple/dagre/sketch.exp.svg | 152 +-- .../all_shapes_multiple/elk/board.exp.json | 6 +- .../all_shapes_multiple/elk/sketch.exp.svg | 154 +-- .../all_shapes_shadow/dagre/board.exp.json | 12 +- .../all_shapes_shadow/dagre/sketch.exp.svg | 154 +-- .../all_shapes_shadow/elk/board.exp.json | 6 +- .../all_shapes_shadow/elk/sketch.exp.svg | 156 +-- .../stable/chaos2/dagre/board.exp.json | 26 +- .../stable/chaos2/dagre/sketch.exp.svg | 578 +++++------ .../testdata/stable/chaos2/elk/board.exp.json | 8 +- .../testdata/stable/chaos2/elk/sketch.exp.svg | 568 +++++------ .../stable/classes/dagre/board.exp.json | 38 +- .../stable/classes/dagre/sketch.exp.svg | 168 ++-- .../stable/classes/elk/board.exp.json | 26 +- .../stable/classes/elk/sketch.exp.svg | 168 ++-- .../dagre/board.exp.json | 34 +- .../dagre/sketch.exp.svg | 158 +-- .../stable/investigate/dagre/board.exp.json | 930 +++++++++--------- .../stable/investigate/dagre/sketch.exp.svg | 240 ++--- .../stable/investigate/elk/board.exp.json | 170 ++-- .../stable/investigate/elk/sketch.exp.svg | 200 ++-- .../nested_shape_labels/dagre/board.exp.json | 6 +- .../nested_shape_labels/dagre/sketch.exp.svg | 164 +-- .../nested_shape_labels/elk/board.exp.json | 14 +- .../nested_shape_labels/elk/sketch.exp.svg | 168 ++-- .../stable/nesting_power/dagre/board.exp.json | 822 ++++++++-------- .../stable/nesting_power/dagre/sketch.exp.svg | 388 ++++---- .../stable/nesting_power/elk/board.exp.json | 486 ++++----- .../stable/nesting_power/elk/sketch.exp.svg | 324 +++--- .../dagre/board.exp.json | 186 ++-- .../dagre/sketch.exp.svg | 212 ++-- .../elk/board.exp.json | 186 ++-- .../elk/sketch.exp.svg | 212 ++-- .../sequence_diagrams/dagre/board.exp.json | 418 ++++---- .../sequence_diagrams/dagre/sketch.exp.svg | 264 ++--- .../sequence_diagrams/elk/board.exp.json | 376 +++---- .../sequence_diagrams/elk/sketch.exp.svg | 264 ++--- .../stable/teleport_grid/dagre/board.exp.json | 112 +-- .../stable/teleport_grid/dagre/sketch.exp.svg | 624 ++++++------ .../stable/teleport_grid/elk/board.exp.json | 102 +- .../stable/teleport_grid/elk/sketch.exp.svg | 624 ++++++------ .../shape_set_width_height/elk/board.exp.json | 64 +- .../shape_set_width_height/elk/sketch.exp.svg | 616 ++++++------ 68 files changed, 7091 insertions(+), 7091 deletions(-) diff --git a/d2renderers/d2sketch/testdata/all_shapes/sketch.exp.svg b/d2renderers/d2sketch/testdata/all_shapes/sketch.exp.svg index f50b1cab3d..966f246bb1 100644 --- a/d2renderers/d2sketch/testdata/all_shapes/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/all_shapes/sketch.exp.svg @@ -1,9 +1,9 @@ - + .d2-3932740504 .fill-N1{fill:#0A0F25;} + .d2-3932740504 .fill-N2{fill:#676C7E;} + .d2-3932740504 .fill-N3{fill:#9499AB;} + .d2-3932740504 .fill-N4{fill:#CFD2DD;} + .d2-3932740504 .fill-N5{fill:#DEE1EB;} + .d2-3932740504 .fill-N6{fill:#EEF1F8;} + .d2-3932740504 .fill-N7{fill:#FFFFFF;} + .d2-3932740504 .fill-B1{fill:#0D32B2;} + .d2-3932740504 .fill-B2{fill:#0D32B2;} + .d2-3932740504 .fill-B3{fill:#E3E9FD;} + .d2-3932740504 .fill-B4{fill:#E3E9FD;} + .d2-3932740504 .fill-B5{fill:#EDF0FD;} + .d2-3932740504 .fill-B6{fill:#F7F8FE;} + .d2-3932740504 .fill-AA2{fill:#4A6FF3;} + .d2-3932740504 .fill-AA4{fill:#EDF0FD;} + .d2-3932740504 .fill-AA5{fill:#F7F8FE;} + .d2-3932740504 .fill-AB4{fill:#EDF0FD;} + .d2-3932740504 .fill-AB5{fill:#F7F8FE;} + .d2-3932740504 .stroke-N1{stroke:#0A0F25;} + .d2-3932740504 .stroke-N2{stroke:#676C7E;} + .d2-3932740504 .stroke-N3{stroke:#9499AB;} + .d2-3932740504 .stroke-N4{stroke:#CFD2DD;} + .d2-3932740504 .stroke-N5{stroke:#DEE1EB;} + .d2-3932740504 .stroke-N6{stroke:#EEF1F8;} + .d2-3932740504 .stroke-N7{stroke:#FFFFFF;} + .d2-3932740504 .stroke-B1{stroke:#0D32B2;} + .d2-3932740504 .stroke-B2{stroke:#0D32B2;} + .d2-3932740504 .stroke-B3{stroke:#E3E9FD;} + .d2-3932740504 .stroke-B4{stroke:#E3E9FD;} + .d2-3932740504 .stroke-B5{stroke:#EDF0FD;} + .d2-3932740504 .stroke-B6{stroke:#F7F8FE;} + .d2-3932740504 .stroke-AA2{stroke:#4A6FF3;} + .d2-3932740504 .stroke-AA4{stroke:#EDF0FD;} + .d2-3932740504 .stroke-AA5{stroke:#F7F8FE;} + .d2-3932740504 .stroke-AB4{stroke:#EDF0FD;} + .d2-3932740504 .stroke-AB5{stroke:#F7F8FE;} + .d2-3932740504 .background-color-N1{background-color:#0A0F25;} + .d2-3932740504 .background-color-N2{background-color:#676C7E;} + .d2-3932740504 .background-color-N3{background-color:#9499AB;} + .d2-3932740504 .background-color-N4{background-color:#CFD2DD;} + .d2-3932740504 .background-color-N5{background-color:#DEE1EB;} + .d2-3932740504 .background-color-N6{background-color:#EEF1F8;} + .d2-3932740504 .background-color-N7{background-color:#FFFFFF;} + .d2-3932740504 .background-color-B1{background-color:#0D32B2;} + .d2-3932740504 .background-color-B2{background-color:#0D32B2;} + .d2-3932740504 .background-color-B3{background-color:#E3E9FD;} + .d2-3932740504 .background-color-B4{background-color:#E3E9FD;} + .d2-3932740504 .background-color-B5{background-color:#EDF0FD;} + .d2-3932740504 .background-color-B6{background-color:#F7F8FE;} + .d2-3932740504 .background-color-AA2{background-color:#4A6FF3;} + .d2-3932740504 .background-color-AA4{background-color:#EDF0FD;} + .d2-3932740504 .background-color-AA5{background-color:#F7F8FE;} + .d2-3932740504 .background-color-AB4{background-color:#EDF0FD;} + .d2-3932740504 .background-color-AB5{background-color:#F7F8FE;} + .d2-3932740504 .color-N1{color:#0A0F25;} + .d2-3932740504 .color-N2{color:#676C7E;} + .d2-3932740504 .color-N3{color:#9499AB;} + .d2-3932740504 .color-N4{color:#CFD2DD;} + .d2-3932740504 .color-N5{color:#DEE1EB;} + .d2-3932740504 .color-N6{color:#EEF1F8;} + .d2-3932740504 .color-N7{color:#FFFFFF;} + .d2-3932740504 .color-B1{color:#0D32B2;} + .d2-3932740504 .color-B2{color:#0D32B2;} + .d2-3932740504 .color-B3{color:#E3E9FD;} + .d2-3932740504 .color-B4{color:#E3E9FD;} + .d2-3932740504 .color-B5{color:#EDF0FD;} + .d2-3932740504 .color-B6{color:#F7F8FE;} + .d2-3932740504 .color-AA2{color:#4A6FF3;} + .d2-3932740504 .color-AA4{color:#EDF0FD;} + .d2-3932740504 .color-AA5{color:#F7F8FE;} + .d2-3932740504 .color-AB4{color:#EDF0FD;} + .d2-3932740504 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]> @@ -97,7 +97,7 @@ -rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud +rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud diff --git a/d2renderers/d2sketch/testdata/all_shapes_dark/sketch.exp.svg b/d2renderers/d2sketch/testdata/all_shapes_dark/sketch.exp.svg index 0b52ba26ad..6c856f0996 100644 --- a/d2renderers/d2sketch/testdata/all_shapes_dark/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/all_shapes_dark/sketch.exp.svg @@ -1,9 +1,9 @@ - + .d2-3932740504 .fill-N1{fill:#CDD6F4;} + .d2-3932740504 .fill-N2{fill:#BAC2DE;} + .d2-3932740504 .fill-N3{fill:#A6ADC8;} + .d2-3932740504 .fill-N4{fill:#585B70;} + .d2-3932740504 .fill-N5{fill:#45475A;} + .d2-3932740504 .fill-N6{fill:#313244;} + .d2-3932740504 .fill-N7{fill:#1E1E2E;} + .d2-3932740504 .fill-B1{fill:#CBA6f7;} + .d2-3932740504 .fill-B2{fill:#CBA6f7;} + .d2-3932740504 .fill-B3{fill:#6C7086;} + .d2-3932740504 .fill-B4{fill:#585B70;} + .d2-3932740504 .fill-B5{fill:#45475A;} + .d2-3932740504 .fill-B6{fill:#313244;} + .d2-3932740504 .fill-AA2{fill:#f38BA8;} + .d2-3932740504 .fill-AA4{fill:#45475A;} + .d2-3932740504 .fill-AA5{fill:#313244;} + .d2-3932740504 .fill-AB4{fill:#45475A;} + .d2-3932740504 .fill-AB5{fill:#313244;} + .d2-3932740504 .stroke-N1{stroke:#CDD6F4;} + .d2-3932740504 .stroke-N2{stroke:#BAC2DE;} + .d2-3932740504 .stroke-N3{stroke:#A6ADC8;} + .d2-3932740504 .stroke-N4{stroke:#585B70;} + .d2-3932740504 .stroke-N5{stroke:#45475A;} + .d2-3932740504 .stroke-N6{stroke:#313244;} + .d2-3932740504 .stroke-N7{stroke:#1E1E2E;} + .d2-3932740504 .stroke-B1{stroke:#CBA6f7;} + .d2-3932740504 .stroke-B2{stroke:#CBA6f7;} + .d2-3932740504 .stroke-B3{stroke:#6C7086;} + .d2-3932740504 .stroke-B4{stroke:#585B70;} + .d2-3932740504 .stroke-B5{stroke:#45475A;} + .d2-3932740504 .stroke-B6{stroke:#313244;} + .d2-3932740504 .stroke-AA2{stroke:#f38BA8;} + .d2-3932740504 .stroke-AA4{stroke:#45475A;} + .d2-3932740504 .stroke-AA5{stroke:#313244;} + .d2-3932740504 .stroke-AB4{stroke:#45475A;} + .d2-3932740504 .stroke-AB5{stroke:#313244;} + .d2-3932740504 .background-color-N1{background-color:#CDD6F4;} + .d2-3932740504 .background-color-N2{background-color:#BAC2DE;} + .d2-3932740504 .background-color-N3{background-color:#A6ADC8;} + .d2-3932740504 .background-color-N4{background-color:#585B70;} + .d2-3932740504 .background-color-N5{background-color:#45475A;} + .d2-3932740504 .background-color-N6{background-color:#313244;} + .d2-3932740504 .background-color-N7{background-color:#1E1E2E;} + .d2-3932740504 .background-color-B1{background-color:#CBA6f7;} + .d2-3932740504 .background-color-B2{background-color:#CBA6f7;} + .d2-3932740504 .background-color-B3{background-color:#6C7086;} + .d2-3932740504 .background-color-B4{background-color:#585B70;} + .d2-3932740504 .background-color-B5{background-color:#45475A;} + .d2-3932740504 .background-color-B6{background-color:#313244;} + .d2-3932740504 .background-color-AA2{background-color:#f38BA8;} + .d2-3932740504 .background-color-AA4{background-color:#45475A;} + .d2-3932740504 .background-color-AA5{background-color:#313244;} + .d2-3932740504 .background-color-AB4{background-color:#45475A;} + .d2-3932740504 .background-color-AB5{background-color:#313244;} + .d2-3932740504 .color-N1{color:#CDD6F4;} + .d2-3932740504 .color-N2{color:#BAC2DE;} + .d2-3932740504 .color-N3{color:#A6ADC8;} + .d2-3932740504 .color-N4{color:#585B70;} + .d2-3932740504 .color-N5{color:#45475A;} + .d2-3932740504 .color-N6{color:#313244;} + .d2-3932740504 .color-N7{color:#1E1E2E;} + .d2-3932740504 .color-B1{color:#CBA6f7;} + .d2-3932740504 .color-B2{color:#CBA6f7;} + .d2-3932740504 .color-B3{color:#6C7086;} + .d2-3932740504 .color-B4{color:#585B70;} + .d2-3932740504 .color-B5{color:#45475A;} + .d2-3932740504 .color-B6{color:#313244;} + .d2-3932740504 .color-AA2{color:#f38BA8;} + .d2-3932740504 .color-AA4{color:#45475A;} + .d2-3932740504 .color-AA5{color:#313244;} + .d2-3932740504 .color-AB4{color:#45475A;} + .d2-3932740504 .color-AB5{color:#313244;}.appendix text.text{fill:#CDD6F4}.md{--color-fg-default:#CDD6F4;--color-fg-muted:#BAC2DE;--color-fg-subtle:#A6ADC8;--color-canvas-default:#1E1E2E;--color-canvas-subtle:#313244;--color-border-default:#CBA6f7;--color-border-muted:#CBA6f7;--color-neutral-muted:#313244;--color-accent-fg:#CBA6f7;--color-accent-emphasis:#CBA6f7;--color-attention-subtle:#BAC2DE;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B3{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-B4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-B5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B6{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AA2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-AA4{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AA5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AB4{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AB5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N1{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N6{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N7{fill:url(#streaks-darker);mix-blend-mode:lighten}.light-code{display: none}.dark-code{display: block}]]> -rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud +rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud diff --git a/d2renderers/d2sketch/testdata/dots-all/sketch.exp.svg b/d2renderers/d2sketch/testdata/dots-all/sketch.exp.svg index babfae10b5..1529e27c16 100644 --- a/d2renderers/d2sketch/testdata/dots-all/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/dots-all/sketch.exp.svg @@ -1,9 +1,9 @@ - + .d2-279884413 .fill-N1{fill:#0A0F25;} + .d2-279884413 .fill-N2{fill:#676C7E;} + .d2-279884413 .fill-N3{fill:#9499AB;} + .d2-279884413 .fill-N4{fill:#CFD2DD;} + .d2-279884413 .fill-N5{fill:#DEE1EB;} + .d2-279884413 .fill-N6{fill:#EEF1F8;} + .d2-279884413 .fill-N7{fill:#FFFFFF;} + .d2-279884413 .fill-B1{fill:#0D32B2;} + .d2-279884413 .fill-B2{fill:#0D32B2;} + .d2-279884413 .fill-B3{fill:#E3E9FD;} + .d2-279884413 .fill-B4{fill:#E3E9FD;} + .d2-279884413 .fill-B5{fill:#EDF0FD;} + .d2-279884413 .fill-B6{fill:#F7F8FE;} + .d2-279884413 .fill-AA2{fill:#4A6FF3;} + .d2-279884413 .fill-AA4{fill:#EDF0FD;} + .d2-279884413 .fill-AA5{fill:#F7F8FE;} + .d2-279884413 .fill-AB4{fill:#EDF0FD;} + .d2-279884413 .fill-AB5{fill:#F7F8FE;} + .d2-279884413 .stroke-N1{stroke:#0A0F25;} + .d2-279884413 .stroke-N2{stroke:#676C7E;} + .d2-279884413 .stroke-N3{stroke:#9499AB;} + .d2-279884413 .stroke-N4{stroke:#CFD2DD;} + .d2-279884413 .stroke-N5{stroke:#DEE1EB;} + .d2-279884413 .stroke-N6{stroke:#EEF1F8;} + .d2-279884413 .stroke-N7{stroke:#FFFFFF;} + .d2-279884413 .stroke-B1{stroke:#0D32B2;} + .d2-279884413 .stroke-B2{stroke:#0D32B2;} + .d2-279884413 .stroke-B3{stroke:#E3E9FD;} + .d2-279884413 .stroke-B4{stroke:#E3E9FD;} + .d2-279884413 .stroke-B5{stroke:#EDF0FD;} + .d2-279884413 .stroke-B6{stroke:#F7F8FE;} + .d2-279884413 .stroke-AA2{stroke:#4A6FF3;} + .d2-279884413 .stroke-AA4{stroke:#EDF0FD;} + .d2-279884413 .stroke-AA5{stroke:#F7F8FE;} + .d2-279884413 .stroke-AB4{stroke:#EDF0FD;} + .d2-279884413 .stroke-AB5{stroke:#F7F8FE;} + .d2-279884413 .background-color-N1{background-color:#0A0F25;} + .d2-279884413 .background-color-N2{background-color:#676C7E;} + .d2-279884413 .background-color-N3{background-color:#9499AB;} + .d2-279884413 .background-color-N4{background-color:#CFD2DD;} + .d2-279884413 .background-color-N5{background-color:#DEE1EB;} + .d2-279884413 .background-color-N6{background-color:#EEF1F8;} + .d2-279884413 .background-color-N7{background-color:#FFFFFF;} + .d2-279884413 .background-color-B1{background-color:#0D32B2;} + .d2-279884413 .background-color-B2{background-color:#0D32B2;} + .d2-279884413 .background-color-B3{background-color:#E3E9FD;} + .d2-279884413 .background-color-B4{background-color:#E3E9FD;} + .d2-279884413 .background-color-B5{background-color:#EDF0FD;} + .d2-279884413 .background-color-B6{background-color:#F7F8FE;} + .d2-279884413 .background-color-AA2{background-color:#4A6FF3;} + .d2-279884413 .background-color-AA4{background-color:#EDF0FD;} + .d2-279884413 .background-color-AA5{background-color:#F7F8FE;} + .d2-279884413 .background-color-AB4{background-color:#EDF0FD;} + .d2-279884413 .background-color-AB5{background-color:#F7F8FE;} + .d2-279884413 .color-N1{color:#0A0F25;} + .d2-279884413 .color-N2{color:#676C7E;} + .d2-279884413 .color-N3{color:#9499AB;} + .d2-279884413 .color-N4{color:#CFD2DD;} + .d2-279884413 .color-N5{color:#DEE1EB;} + .d2-279884413 .color-N6{color:#EEF1F8;} + .d2-279884413 .color-N7{color:#FFFFFF;} + .d2-279884413 .color-B1{color:#0D32B2;} + .d2-279884413 .color-B2{color:#0D32B2;} + .d2-279884413 .color-B3{color:#E3E9FD;} + .d2-279884413 .color-B4{color:#E3E9FD;} + .d2-279884413 .color-B5{color:#EDF0FD;} + .d2-279884413 .color-B6{color:#F7F8FE;} + .d2-279884413 .color-AA2{color:#4A6FF3;} + .d2-279884413 .color-AA4{color:#EDF0FD;} + .d2-279884413 .color-AA5{color:#F7F8FE;} + .d2-279884413 .color-AB4{color:#EDF0FD;} + .d2-279884413 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]> @@ -130,7 +130,7 @@ -rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud +rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud diff --git a/d2renderers/d2sketch/testdata/dots-multiple/sketch.exp.svg b/d2renderers/d2sketch/testdata/dots-multiple/sketch.exp.svg index e8705b776f..4c106ea7d4 100644 --- a/d2renderers/d2sketch/testdata/dots-multiple/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/dots-multiple/sketch.exp.svg @@ -1,9 +1,9 @@ - + .d2-1235287500 .fill-N1{fill:#0A0F25;} + .d2-1235287500 .fill-N2{fill:#676C7E;} + .d2-1235287500 .fill-N3{fill:#9499AB;} + .d2-1235287500 .fill-N4{fill:#CFD2DD;} + .d2-1235287500 .fill-N5{fill:#DEE1EB;} + .d2-1235287500 .fill-N6{fill:#EEF1F8;} + .d2-1235287500 .fill-N7{fill:#FFFFFF;} + .d2-1235287500 .fill-B1{fill:#0D32B2;} + .d2-1235287500 .fill-B2{fill:#0D32B2;} + .d2-1235287500 .fill-B3{fill:#E3E9FD;} + .d2-1235287500 .fill-B4{fill:#E3E9FD;} + .d2-1235287500 .fill-B5{fill:#EDF0FD;} + .d2-1235287500 .fill-B6{fill:#F7F8FE;} + .d2-1235287500 .fill-AA2{fill:#4A6FF3;} + .d2-1235287500 .fill-AA4{fill:#EDF0FD;} + .d2-1235287500 .fill-AA5{fill:#F7F8FE;} + .d2-1235287500 .fill-AB4{fill:#EDF0FD;} + .d2-1235287500 .fill-AB5{fill:#F7F8FE;} + .d2-1235287500 .stroke-N1{stroke:#0A0F25;} + .d2-1235287500 .stroke-N2{stroke:#676C7E;} + .d2-1235287500 .stroke-N3{stroke:#9499AB;} + .d2-1235287500 .stroke-N4{stroke:#CFD2DD;} + .d2-1235287500 .stroke-N5{stroke:#DEE1EB;} + .d2-1235287500 .stroke-N6{stroke:#EEF1F8;} + .d2-1235287500 .stroke-N7{stroke:#FFFFFF;} + .d2-1235287500 .stroke-B1{stroke:#0D32B2;} + .d2-1235287500 .stroke-B2{stroke:#0D32B2;} + .d2-1235287500 .stroke-B3{stroke:#E3E9FD;} + .d2-1235287500 .stroke-B4{stroke:#E3E9FD;} + .d2-1235287500 .stroke-B5{stroke:#EDF0FD;} + .d2-1235287500 .stroke-B6{stroke:#F7F8FE;} + .d2-1235287500 .stroke-AA2{stroke:#4A6FF3;} + .d2-1235287500 .stroke-AA4{stroke:#EDF0FD;} + .d2-1235287500 .stroke-AA5{stroke:#F7F8FE;} + .d2-1235287500 .stroke-AB4{stroke:#EDF0FD;} + .d2-1235287500 .stroke-AB5{stroke:#F7F8FE;} + .d2-1235287500 .background-color-N1{background-color:#0A0F25;} + .d2-1235287500 .background-color-N2{background-color:#676C7E;} + .d2-1235287500 .background-color-N3{background-color:#9499AB;} + .d2-1235287500 .background-color-N4{background-color:#CFD2DD;} + .d2-1235287500 .background-color-N5{background-color:#DEE1EB;} + .d2-1235287500 .background-color-N6{background-color:#EEF1F8;} + .d2-1235287500 .background-color-N7{background-color:#FFFFFF;} + .d2-1235287500 .background-color-B1{background-color:#0D32B2;} + .d2-1235287500 .background-color-B2{background-color:#0D32B2;} + .d2-1235287500 .background-color-B3{background-color:#E3E9FD;} + .d2-1235287500 .background-color-B4{background-color:#E3E9FD;} + .d2-1235287500 .background-color-B5{background-color:#EDF0FD;} + .d2-1235287500 .background-color-B6{background-color:#F7F8FE;} + .d2-1235287500 .background-color-AA2{background-color:#4A6FF3;} + .d2-1235287500 .background-color-AA4{background-color:#EDF0FD;} + .d2-1235287500 .background-color-AA5{background-color:#F7F8FE;} + .d2-1235287500 .background-color-AB4{background-color:#EDF0FD;} + .d2-1235287500 .background-color-AB5{background-color:#F7F8FE;} + .d2-1235287500 .color-N1{color:#0A0F25;} + .d2-1235287500 .color-N2{color:#676C7E;} + .d2-1235287500 .color-N3{color:#9499AB;} + .d2-1235287500 .color-N4{color:#CFD2DD;} + .d2-1235287500 .color-N5{color:#DEE1EB;} + .d2-1235287500 .color-N6{color:#EEF1F8;} + .d2-1235287500 .color-N7{color:#FFFFFF;} + .d2-1235287500 .color-B1{color:#0D32B2;} + .d2-1235287500 .color-B2{color:#0D32B2;} + .d2-1235287500 .color-B3{color:#E3E9FD;} + .d2-1235287500 .color-B4{color:#E3E9FD;} + .d2-1235287500 .color-B5{color:#EDF0FD;} + .d2-1235287500 .color-B6{color:#F7F8FE;} + .d2-1235287500 .color-AA2{color:#4A6FF3;} + .d2-1235287500 .color-AA4{color:#EDF0FD;} + .d2-1235287500 .color-AA5{color:#F7F8FE;} + .d2-1235287500 .color-AB4{color:#EDF0FD;} + .d2-1235287500 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]> @@ -130,7 +130,7 @@ -rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud +rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud 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 index 60e330f5d6..ee24e61d0a 100644 --- a/d2renderers/d2svg/dark_theme/testdata/all_shapes/dark_theme.exp.svg +++ b/d2renderers/d2svg/dark_theme/testdata/all_shapes/dark_theme.exp.svg @@ -1,9 +1,9 @@ -rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud + .d2-3932740504 .fill-N1{fill:#CDD6F4;} + .d2-3932740504 .fill-N2{fill:#BAC2DE;} + .d2-3932740504 .fill-N3{fill:#A6ADC8;} + .d2-3932740504 .fill-N4{fill:#585B70;} + .d2-3932740504 .fill-N5{fill:#45475A;} + .d2-3932740504 .fill-N6{fill:#313244;} + .d2-3932740504 .fill-N7{fill:#1E1E2E;} + .d2-3932740504 .fill-B1{fill:#CBA6f7;} + .d2-3932740504 .fill-B2{fill:#CBA6f7;} + .d2-3932740504 .fill-B3{fill:#6C7086;} + .d2-3932740504 .fill-B4{fill:#585B70;} + .d2-3932740504 .fill-B5{fill:#45475A;} + .d2-3932740504 .fill-B6{fill:#313244;} + .d2-3932740504 .fill-AA2{fill:#f38BA8;} + .d2-3932740504 .fill-AA4{fill:#45475A;} + .d2-3932740504 .fill-AA5{fill:#313244;} + .d2-3932740504 .fill-AB4{fill:#45475A;} + .d2-3932740504 .fill-AB5{fill:#313244;} + .d2-3932740504 .stroke-N1{stroke:#CDD6F4;} + .d2-3932740504 .stroke-N2{stroke:#BAC2DE;} + .d2-3932740504 .stroke-N3{stroke:#A6ADC8;} + .d2-3932740504 .stroke-N4{stroke:#585B70;} + .d2-3932740504 .stroke-N5{stroke:#45475A;} + .d2-3932740504 .stroke-N6{stroke:#313244;} + .d2-3932740504 .stroke-N7{stroke:#1E1E2E;} + .d2-3932740504 .stroke-B1{stroke:#CBA6f7;} + .d2-3932740504 .stroke-B2{stroke:#CBA6f7;} + .d2-3932740504 .stroke-B3{stroke:#6C7086;} + .d2-3932740504 .stroke-B4{stroke:#585B70;} + .d2-3932740504 .stroke-B5{stroke:#45475A;} + .d2-3932740504 .stroke-B6{stroke:#313244;} + .d2-3932740504 .stroke-AA2{stroke:#f38BA8;} + .d2-3932740504 .stroke-AA4{stroke:#45475A;} + .d2-3932740504 .stroke-AA5{stroke:#313244;} + .d2-3932740504 .stroke-AB4{stroke:#45475A;} + .d2-3932740504 .stroke-AB5{stroke:#313244;} + .d2-3932740504 .background-color-N1{background-color:#CDD6F4;} + .d2-3932740504 .background-color-N2{background-color:#BAC2DE;} + .d2-3932740504 .background-color-N3{background-color:#A6ADC8;} + .d2-3932740504 .background-color-N4{background-color:#585B70;} + .d2-3932740504 .background-color-N5{background-color:#45475A;} + .d2-3932740504 .background-color-N6{background-color:#313244;} + .d2-3932740504 .background-color-N7{background-color:#1E1E2E;} + .d2-3932740504 .background-color-B1{background-color:#CBA6f7;} + .d2-3932740504 .background-color-B2{background-color:#CBA6f7;} + .d2-3932740504 .background-color-B3{background-color:#6C7086;} + .d2-3932740504 .background-color-B4{background-color:#585B70;} + .d2-3932740504 .background-color-B5{background-color:#45475A;} + .d2-3932740504 .background-color-B6{background-color:#313244;} + .d2-3932740504 .background-color-AA2{background-color:#f38BA8;} + .d2-3932740504 .background-color-AA4{background-color:#45475A;} + .d2-3932740504 .background-color-AA5{background-color:#313244;} + .d2-3932740504 .background-color-AB4{background-color:#45475A;} + .d2-3932740504 .background-color-AB5{background-color:#313244;} + .d2-3932740504 .color-N1{color:#CDD6F4;} + .d2-3932740504 .color-N2{color:#BAC2DE;} + .d2-3932740504 .color-N3{color:#A6ADC8;} + .d2-3932740504 .color-N4{color:#585B70;} + .d2-3932740504 .color-N5{color:#45475A;} + .d2-3932740504 .color-N6{color:#313244;} + .d2-3932740504 .color-N7{color:#1E1E2E;} + .d2-3932740504 .color-B1{color:#CBA6f7;} + .d2-3932740504 .color-B2{color:#CBA6f7;} + .d2-3932740504 .color-B3{color:#6C7086;} + .d2-3932740504 .color-B4{color:#585B70;} + .d2-3932740504 .color-B5{color:#45475A;} + .d2-3932740504 .color-B6{color:#313244;} + .d2-3932740504 .color-AA2{color:#f38BA8;} + .d2-3932740504 .color-AA4{color:#45475A;} + .d2-3932740504 .color-AA5{color:#313244;} + .d2-3932740504 .color-AB4{color:#45475A;} + .d2-3932740504 .color-AB5{color:#313244;}.appendix text.text{fill:#CDD6F4}.md{--color-fg-default:#CDD6F4;--color-fg-muted:#BAC2DE;--color-fg-subtle:#A6ADC8;--color-canvas-default:#1E1E2E;--color-canvas-subtle:#313244;--color-border-default:#CBA6f7;--color-border-muted:#CBA6f7;--color-neutral-muted:#313244;--color-accent-fg:#CBA6f7;--color-accent-emphasis:#CBA6f7;--color-attention-subtle:#BAC2DE;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B3{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-B4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-B5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B6{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AA2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-AA4{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AA5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AB4{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AB5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N1{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N6{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N7{fill:url(#streaks-darker);mix-blend-mode:lighten}.light-code{display: none}.dark-code{display: block}]]>rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud diff --git a/e2etests-cli/testdata/TestCLI_E2E/import.exp.svg b/e2etests-cli/testdata/TestCLI_E2E/import.exp.svg index 7e1c3a35a1..619b6c00fe 100644 --- a/e2etests-cli/testdata/TestCLI_E2E/import.exp.svg +++ b/e2etests-cli/testdata/TestCLI_E2E/import.exp.svg @@ -1,9 +1,9 @@ -xy - - - + .d2-3562348775 .fill-N1{fill:#0A0F25;} + .d2-3562348775 .fill-N2{fill:#676C7E;} + .d2-3562348775 .fill-N3{fill:#9499AB;} + .d2-3562348775 .fill-N4{fill:#CFD2DD;} + .d2-3562348775 .fill-N5{fill:#DEE1EB;} + .d2-3562348775 .fill-N6{fill:#EEF1F8;} + .d2-3562348775 .fill-N7{fill:#FFFFFF;} + .d2-3562348775 .fill-B1{fill:#0D32B2;} + .d2-3562348775 .fill-B2{fill:#0D32B2;} + .d2-3562348775 .fill-B3{fill:#E3E9FD;} + .d2-3562348775 .fill-B4{fill:#E3E9FD;} + .d2-3562348775 .fill-B5{fill:#EDF0FD;} + .d2-3562348775 .fill-B6{fill:#F7F8FE;} + .d2-3562348775 .fill-AA2{fill:#4A6FF3;} + .d2-3562348775 .fill-AA4{fill:#EDF0FD;} + .d2-3562348775 .fill-AA5{fill:#F7F8FE;} + .d2-3562348775 .fill-AB4{fill:#EDF0FD;} + .d2-3562348775 .fill-AB5{fill:#F7F8FE;} + .d2-3562348775 .stroke-N1{stroke:#0A0F25;} + .d2-3562348775 .stroke-N2{stroke:#676C7E;} + .d2-3562348775 .stroke-N3{stroke:#9499AB;} + .d2-3562348775 .stroke-N4{stroke:#CFD2DD;} + .d2-3562348775 .stroke-N5{stroke:#DEE1EB;} + .d2-3562348775 .stroke-N6{stroke:#EEF1F8;} + .d2-3562348775 .stroke-N7{stroke:#FFFFFF;} + .d2-3562348775 .stroke-B1{stroke:#0D32B2;} + .d2-3562348775 .stroke-B2{stroke:#0D32B2;} + .d2-3562348775 .stroke-B3{stroke:#E3E9FD;} + .d2-3562348775 .stroke-B4{stroke:#E3E9FD;} + .d2-3562348775 .stroke-B5{stroke:#EDF0FD;} + .d2-3562348775 .stroke-B6{stroke:#F7F8FE;} + .d2-3562348775 .stroke-AA2{stroke:#4A6FF3;} + .d2-3562348775 .stroke-AA4{stroke:#EDF0FD;} + .d2-3562348775 .stroke-AA5{stroke:#F7F8FE;} + .d2-3562348775 .stroke-AB4{stroke:#EDF0FD;} + .d2-3562348775 .stroke-AB5{stroke:#F7F8FE;} + .d2-3562348775 .background-color-N1{background-color:#0A0F25;} + .d2-3562348775 .background-color-N2{background-color:#676C7E;} + .d2-3562348775 .background-color-N3{background-color:#9499AB;} + .d2-3562348775 .background-color-N4{background-color:#CFD2DD;} + .d2-3562348775 .background-color-N5{background-color:#DEE1EB;} + .d2-3562348775 .background-color-N6{background-color:#EEF1F8;} + .d2-3562348775 .background-color-N7{background-color:#FFFFFF;} + .d2-3562348775 .background-color-B1{background-color:#0D32B2;} + .d2-3562348775 .background-color-B2{background-color:#0D32B2;} + .d2-3562348775 .background-color-B3{background-color:#E3E9FD;} + .d2-3562348775 .background-color-B4{background-color:#E3E9FD;} + .d2-3562348775 .background-color-B5{background-color:#EDF0FD;} + .d2-3562348775 .background-color-B6{background-color:#F7F8FE;} + .d2-3562348775 .background-color-AA2{background-color:#4A6FF3;} + .d2-3562348775 .background-color-AA4{background-color:#EDF0FD;} + .d2-3562348775 .background-color-AA5{background-color:#F7F8FE;} + .d2-3562348775 .background-color-AB4{background-color:#EDF0FD;} + .d2-3562348775 .background-color-AB5{background-color:#F7F8FE;} + .d2-3562348775 .color-N1{color:#0A0F25;} + .d2-3562348775 .color-N2{color:#676C7E;} + .d2-3562348775 .color-N3{color:#9499AB;} + .d2-3562348775 .color-N4{color:#CFD2DD;} + .d2-3562348775 .color-N5{color:#DEE1EB;} + .d2-3562348775 .color-N6{color:#EEF1F8;} + .d2-3562348775 .color-N7{color:#FFFFFF;} + .d2-3562348775 .color-B1{color:#0D32B2;} + .d2-3562348775 .color-B2{color:#0D32B2;} + .d2-3562348775 .color-B3{color:#E3E9FD;} + .d2-3562348775 .color-B4{color:#E3E9FD;} + .d2-3562348775 .color-B5{color:#EDF0FD;} + .d2-3562348775 .color-B6{color:#F7F8FE;} + .d2-3562348775 .color-AA2{color:#4A6FF3;} + .d2-3562348775 .color-AA4{color:#EDF0FD;} + .d2-3562348775 .color-AA5{color:#F7F8FE;} + .d2-3562348775 .color-AB4{color:#EDF0FD;} + .d2-3562348775 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>xy + + + diff --git a/e2etests/testdata/patterns/all_shapes/dagre/board.exp.json b/e2etests/testdata/patterns/all_shapes/dagre/board.exp.json index ff90497629..6de3c8f469 100644 --- a/e2etests/testdata/patterns/all_shapes/dagre/board.exp.json +++ b/e2etests/testdata/patterns/all_shapes/dagre/board.exp.json @@ -595,11 +595,11 @@ "id": "circle", "type": "oval", "pos": { - "x": 825, - "y": 400 + "x": 819, + "y": 394 }, - "width": 91, - "height": 91, + "width": 103, + "height": 103, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1176,11 +1176,11 @@ }, { "x": 870, - "y": 348.79998779296875 + "y": 347.6000061035156 }, { "x": 870, - "y": 400 + "y": 394 } ], "isCurve": true, diff --git a/e2etests/testdata/patterns/all_shapes/dagre/sketch.exp.svg b/e2etests/testdata/patterns/all_shapes/dagre/sketch.exp.svg index eeed92f05b..641bb6e8fe 100644 --- a/e2etests/testdata/patterns/all_shapes/dagre/sketch.exp.svg +++ b/e2etests/testdata/patterns/all_shapes/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -⬤Check PINSearch NetworkReadyOff⬤Enter PIN⬤ /check PIN[pin invalid][pin OK][pin OK]network foundpower offpower offpower off - - - - - - - - - - - - - - - - - + .d2-523731764 .fill-N1{fill:#0A0F25;} + .d2-523731764 .fill-N2{fill:#676C7E;} + .d2-523731764 .fill-N3{fill:#9499AB;} + .d2-523731764 .fill-N4{fill:#CFD2DD;} + .d2-523731764 .fill-N5{fill:#DEE1EB;} + .d2-523731764 .fill-N6{fill:#EEF1F8;} + .d2-523731764 .fill-N7{fill:#FFFFFF;} + .d2-523731764 .fill-B1{fill:#0D32B2;} + .d2-523731764 .fill-B2{fill:#0D32B2;} + .d2-523731764 .fill-B3{fill:#E3E9FD;} + .d2-523731764 .fill-B4{fill:#E3E9FD;} + .d2-523731764 .fill-B5{fill:#EDF0FD;} + .d2-523731764 .fill-B6{fill:#F7F8FE;} + .d2-523731764 .fill-AA2{fill:#4A6FF3;} + .d2-523731764 .fill-AA4{fill:#EDF0FD;} + .d2-523731764 .fill-AA5{fill:#F7F8FE;} + .d2-523731764 .fill-AB4{fill:#EDF0FD;} + .d2-523731764 .fill-AB5{fill:#F7F8FE;} + .d2-523731764 .stroke-N1{stroke:#0A0F25;} + .d2-523731764 .stroke-N2{stroke:#676C7E;} + .d2-523731764 .stroke-N3{stroke:#9499AB;} + .d2-523731764 .stroke-N4{stroke:#CFD2DD;} + .d2-523731764 .stroke-N5{stroke:#DEE1EB;} + .d2-523731764 .stroke-N6{stroke:#EEF1F8;} + .d2-523731764 .stroke-N7{stroke:#FFFFFF;} + .d2-523731764 .stroke-B1{stroke:#0D32B2;} + .d2-523731764 .stroke-B2{stroke:#0D32B2;} + .d2-523731764 .stroke-B3{stroke:#E3E9FD;} + .d2-523731764 .stroke-B4{stroke:#E3E9FD;} + .d2-523731764 .stroke-B5{stroke:#EDF0FD;} + .d2-523731764 .stroke-B6{stroke:#F7F8FE;} + .d2-523731764 .stroke-AA2{stroke:#4A6FF3;} + .d2-523731764 .stroke-AA4{stroke:#EDF0FD;} + .d2-523731764 .stroke-AA5{stroke:#F7F8FE;} + .d2-523731764 .stroke-AB4{stroke:#EDF0FD;} + .d2-523731764 .stroke-AB5{stroke:#F7F8FE;} + .d2-523731764 .background-color-N1{background-color:#0A0F25;} + .d2-523731764 .background-color-N2{background-color:#676C7E;} + .d2-523731764 .background-color-N3{background-color:#9499AB;} + .d2-523731764 .background-color-N4{background-color:#CFD2DD;} + .d2-523731764 .background-color-N5{background-color:#DEE1EB;} + .d2-523731764 .background-color-N6{background-color:#EEF1F8;} + .d2-523731764 .background-color-N7{background-color:#FFFFFF;} + .d2-523731764 .background-color-B1{background-color:#0D32B2;} + .d2-523731764 .background-color-B2{background-color:#0D32B2;} + .d2-523731764 .background-color-B3{background-color:#E3E9FD;} + .d2-523731764 .background-color-B4{background-color:#E3E9FD;} + .d2-523731764 .background-color-B5{background-color:#EDF0FD;} + .d2-523731764 .background-color-B6{background-color:#F7F8FE;} + .d2-523731764 .background-color-AA2{background-color:#4A6FF3;} + .d2-523731764 .background-color-AA4{background-color:#EDF0FD;} + .d2-523731764 .background-color-AA5{background-color:#F7F8FE;} + .d2-523731764 .background-color-AB4{background-color:#EDF0FD;} + .d2-523731764 .background-color-AB5{background-color:#F7F8FE;} + .d2-523731764 .color-N1{color:#0A0F25;} + .d2-523731764 .color-N2{color:#676C7E;} + .d2-523731764 .color-N3{color:#9499AB;} + .d2-523731764 .color-N4{color:#CFD2DD;} + .d2-523731764 .color-N5{color:#DEE1EB;} + .d2-523731764 .color-N6{color:#EEF1F8;} + .d2-523731764 .color-N7{color:#FFFFFF;} + .d2-523731764 .color-B1{color:#0D32B2;} + .d2-523731764 .color-B2{color:#0D32B2;} + .d2-523731764 .color-B3{color:#E3E9FD;} + .d2-523731764 .color-B4{color:#E3E9FD;} + .d2-523731764 .color-B5{color:#EDF0FD;} + .d2-523731764 .color-B6{color:#F7F8FE;} + .d2-523731764 .color-AA2{color:#4A6FF3;} + .d2-523731764 .color-AA4{color:#EDF0FD;} + .d2-523731764 .color-AA5{color:#F7F8FE;} + .d2-523731764 .color-AB4{color:#EDF0FD;} + .d2-523731764 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>⬤Check PINSearch NetworkReadyOff⬤Enter PIN⬤ /check PIN[pin invalid][pin OK][pin OK]network foundpower offpower offpower off + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/regression/glob_dimensions/elk/board.exp.json b/e2etests/testdata/regression/glob_dimensions/elk/board.exp.json index 883b70d652..aec42cecca 100644 --- a/e2etests/testdata/regression/glob_dimensions/elk/board.exp.json +++ b/e2etests/testdata/regression/glob_dimensions/elk/board.exp.json @@ -7,11 +7,11 @@ "id": "start", "type": "oval", "pos": { - "x": 157, + "x": 153, "y": 12 }, - "width": 23, - "height": 23, + "width": 30, + "height": 30, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -49,10 +49,10 @@ "type": "rectangle", "pos": { "x": 37, - "y": 105 + "y": 112 }, "width": 262, - "height": 644, + "height": 658, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -89,11 +89,11 @@ "id": "Check PIN.start", "type": "oval", "pos": { - "x": 155, - "y": 155 + "x": 151, + "y": 162 }, - "width": 23, - "height": 23, + "width": 30, + "height": 30, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -131,7 +131,7 @@ "type": "rectangle", "pos": { "x": 111, - "y": 248 + "y": 262 }, "width": 111, "height": 66, @@ -172,7 +172,7 @@ "type": "diamond", "pos": { "x": 156, - "y": 495 + "y": 509 }, "width": 20, "height": 20, @@ -211,11 +211,11 @@ "id": "Check PIN.end", "type": "oval", "pos": { - "x": 155, - "y": 676 + "x": 151, + "y": 690 }, - "width": 23, - "height": 23, + "width": 30, + "height": 30, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -253,7 +253,7 @@ "type": "rectangle", "pos": { "x": 29, - "y": 920 + "y": 941 }, "width": 159, "height": 66, @@ -294,7 +294,7 @@ "type": "rectangle", "pos": { "x": 15, - "y": 1157 + "y": 1178 }, "width": 89, "height": 66, @@ -335,7 +335,7 @@ "type": "rectangle", "pos": { "x": 95, - "y": 1394 + "y": 1415 }, "width": 120, "height": 66, @@ -399,11 +399,11 @@ "route": [ { "x": 169, - "y": 35 + "y": 42 }, { "x": 168, - "y": 105 + "y": 112 } ], "animated": false, @@ -437,11 +437,11 @@ "route": [ { "x": 167, - "y": 178 + "y": 192 }, { "x": 166, - "y": 248 + "y": 262 } ], "animated": false, @@ -475,19 +475,19 @@ "route": [ { "x": 123.5, - "y": 314 + "y": 328 }, { "x": 123.5, - "y": 455 + "y": 469 }, { "x": 163.16600036621094, - "y": 455 + "y": 469 }, { "x": 163, - "y": 498 + "y": 512 } ], "animated": false, @@ -521,19 +521,19 @@ "route": [ { "x": 170, - "y": 499 + "y": 513 }, { "x": 169.83299255371094, - "y": 455 + "y": 469 }, { "x": 209.5, - "y": 455 + "y": 469 }, { "x": 209.5, - "y": 314 + "y": 328 } ], "animated": false, @@ -567,11 +567,11 @@ "route": [ { "x": 166, - "y": 514 + "y": 528 }, { "x": 167, - "y": 676 + "y": 690 } ], "animated": false, @@ -605,11 +605,11 @@ "route": [ { "x": 108.75, - "y": 749 + "y": 770 }, { "x": 108.75, - "y": 920 + "y": 941 } ], "animated": false, @@ -643,11 +643,11 @@ "route": [ { "x": 60, - "y": 986 + "y": 1007 }, { "x": 60, - "y": 1157 + "y": 1178 } ], "animated": false, @@ -681,19 +681,19 @@ "route": [ { "x": 240.99899291992188, - "y": 749 + "y": 770 }, { "x": 240.99899291992188, - "y": 1354 + "y": 1375 }, { "x": 185.25, - "y": 1354 + "y": 1375 }, { "x": 185.25, - "y": 1394 + "y": 1415 } ], "animated": false, @@ -727,11 +727,11 @@ "route": [ { "x": 157.5, - "y": 986 + "y": 1007 }, { "x": 157.5, - "y": 1394 + "y": 1415 } ], "animated": false, @@ -765,19 +765,19 @@ "route": [ { "x": 60, - "y": 1223 + "y": 1244 }, { "x": 60, - "y": 1354 + "y": 1375 }, { "x": 125.25, - "y": 1354 + "y": 1375 }, { "x": 125.25, - "y": 1394 + "y": 1415 } ], "animated": false, diff --git a/e2etests/testdata/regression/glob_dimensions/elk/sketch.exp.svg b/e2etests/testdata/regression/glob_dimensions/elk/sketch.exp.svg index d1618374ea..b1539f08a1 100644 --- a/e2etests/testdata/regression/glob_dimensions/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/glob_dimensions/elk/sketch.exp.svg @@ -1,23 +1,23 @@ -⬤Check PINSearch NetworkReadyOff⬤Enter PIN⬤ /check PIN[pin invalid][pin OK][pin OK]network foundpower offpower offpower off - - - - - - - - - - - - - - - - - + .d2-2073773677 .fill-N1{fill:#0A0F25;} + .d2-2073773677 .fill-N2{fill:#676C7E;} + .d2-2073773677 .fill-N3{fill:#9499AB;} + .d2-2073773677 .fill-N4{fill:#CFD2DD;} + .d2-2073773677 .fill-N5{fill:#DEE1EB;} + .d2-2073773677 .fill-N6{fill:#EEF1F8;} + .d2-2073773677 .fill-N7{fill:#FFFFFF;} + .d2-2073773677 .fill-B1{fill:#0D32B2;} + .d2-2073773677 .fill-B2{fill:#0D32B2;} + .d2-2073773677 .fill-B3{fill:#E3E9FD;} + .d2-2073773677 .fill-B4{fill:#E3E9FD;} + .d2-2073773677 .fill-B5{fill:#EDF0FD;} + .d2-2073773677 .fill-B6{fill:#F7F8FE;} + .d2-2073773677 .fill-AA2{fill:#4A6FF3;} + .d2-2073773677 .fill-AA4{fill:#EDF0FD;} + .d2-2073773677 .fill-AA5{fill:#F7F8FE;} + .d2-2073773677 .fill-AB4{fill:#EDF0FD;} + .d2-2073773677 .fill-AB5{fill:#F7F8FE;} + .d2-2073773677 .stroke-N1{stroke:#0A0F25;} + .d2-2073773677 .stroke-N2{stroke:#676C7E;} + .d2-2073773677 .stroke-N3{stroke:#9499AB;} + .d2-2073773677 .stroke-N4{stroke:#CFD2DD;} + .d2-2073773677 .stroke-N5{stroke:#DEE1EB;} + .d2-2073773677 .stroke-N6{stroke:#EEF1F8;} + .d2-2073773677 .stroke-N7{stroke:#FFFFFF;} + .d2-2073773677 .stroke-B1{stroke:#0D32B2;} + .d2-2073773677 .stroke-B2{stroke:#0D32B2;} + .d2-2073773677 .stroke-B3{stroke:#E3E9FD;} + .d2-2073773677 .stroke-B4{stroke:#E3E9FD;} + .d2-2073773677 .stroke-B5{stroke:#EDF0FD;} + .d2-2073773677 .stroke-B6{stroke:#F7F8FE;} + .d2-2073773677 .stroke-AA2{stroke:#4A6FF3;} + .d2-2073773677 .stroke-AA4{stroke:#EDF0FD;} + .d2-2073773677 .stroke-AA5{stroke:#F7F8FE;} + .d2-2073773677 .stroke-AB4{stroke:#EDF0FD;} + .d2-2073773677 .stroke-AB5{stroke:#F7F8FE;} + .d2-2073773677 .background-color-N1{background-color:#0A0F25;} + .d2-2073773677 .background-color-N2{background-color:#676C7E;} + .d2-2073773677 .background-color-N3{background-color:#9499AB;} + .d2-2073773677 .background-color-N4{background-color:#CFD2DD;} + .d2-2073773677 .background-color-N5{background-color:#DEE1EB;} + .d2-2073773677 .background-color-N6{background-color:#EEF1F8;} + .d2-2073773677 .background-color-N7{background-color:#FFFFFF;} + .d2-2073773677 .background-color-B1{background-color:#0D32B2;} + .d2-2073773677 .background-color-B2{background-color:#0D32B2;} + .d2-2073773677 .background-color-B3{background-color:#E3E9FD;} + .d2-2073773677 .background-color-B4{background-color:#E3E9FD;} + .d2-2073773677 .background-color-B5{background-color:#EDF0FD;} + .d2-2073773677 .background-color-B6{background-color:#F7F8FE;} + .d2-2073773677 .background-color-AA2{background-color:#4A6FF3;} + .d2-2073773677 .background-color-AA4{background-color:#EDF0FD;} + .d2-2073773677 .background-color-AA5{background-color:#F7F8FE;} + .d2-2073773677 .background-color-AB4{background-color:#EDF0FD;} + .d2-2073773677 .background-color-AB5{background-color:#F7F8FE;} + .d2-2073773677 .color-N1{color:#0A0F25;} + .d2-2073773677 .color-N2{color:#676C7E;} + .d2-2073773677 .color-N3{color:#9499AB;} + .d2-2073773677 .color-N4{color:#CFD2DD;} + .d2-2073773677 .color-N5{color:#DEE1EB;} + .d2-2073773677 .color-N6{color:#EEF1F8;} + .d2-2073773677 .color-N7{color:#FFFFFF;} + .d2-2073773677 .color-B1{color:#0D32B2;} + .d2-2073773677 .color-B2{color:#0D32B2;} + .d2-2073773677 .color-B3{color:#E3E9FD;} + .d2-2073773677 .color-B4{color:#E3E9FD;} + .d2-2073773677 .color-B5{color:#EDF0FD;} + .d2-2073773677 .color-B6{color:#F7F8FE;} + .d2-2073773677 .color-AA2{color:#4A6FF3;} + .d2-2073773677 .color-AA4{color:#EDF0FD;} + .d2-2073773677 .color-AA5{color:#F7F8FE;} + .d2-2073773677 .color-AB4{color:#EDF0FD;} + .d2-2073773677 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>⬤Check PINSearch NetworkReadyOff⬤Enter PIN⬤ /check PIN[pin invalid][pin OK][pin OK]network foundpower offpower offpower off + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/all_shapes/dagre/board.exp.json b/e2etests/testdata/stable/all_shapes/dagre/board.exp.json index 9166a58a32..076fa97a42 100644 --- a/e2etests/testdata/stable/all_shapes/dagre/board.exp.json +++ b/e2etests/testdata/stable/all_shapes/dagre/board.exp.json @@ -581,11 +581,11 @@ "id": "circle", "type": "oval", "pos": { - "x": 825, - "y": 400 + "x": 819, + "y": 394 }, - "width": 91, - "height": 91, + "width": 103, + "height": 103, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1159,11 +1159,11 @@ }, { "x": 870, - "y": 348.79998779296875 + "y": 347.6000061035156 }, { "x": 870, - "y": 400 + "y": 394 } ], "isCurve": true, diff --git a/e2etests/testdata/stable/all_shapes/dagre/sketch.exp.svg b/e2etests/testdata/stable/all_shapes/dagre/sketch.exp.svg index 4fa5957a89..e98c7d8781 100644 --- a/e2etests/testdata/stable/all_shapes/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/all_shapes/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud + .d2-1206847702 .fill-N1{fill:#0A0F25;} + .d2-1206847702 .fill-N2{fill:#676C7E;} + .d2-1206847702 .fill-N3{fill:#9499AB;} + .d2-1206847702 .fill-N4{fill:#CFD2DD;} + .d2-1206847702 .fill-N5{fill:#DEE1EB;} + .d2-1206847702 .fill-N6{fill:#EEF1F8;} + .d2-1206847702 .fill-N7{fill:#FFFFFF;} + .d2-1206847702 .fill-B1{fill:#0D32B2;} + .d2-1206847702 .fill-B2{fill:#0D32B2;} + .d2-1206847702 .fill-B3{fill:#E3E9FD;} + .d2-1206847702 .fill-B4{fill:#E3E9FD;} + .d2-1206847702 .fill-B5{fill:#EDF0FD;} + .d2-1206847702 .fill-B6{fill:#F7F8FE;} + .d2-1206847702 .fill-AA2{fill:#4A6FF3;} + .d2-1206847702 .fill-AA4{fill:#EDF0FD;} + .d2-1206847702 .fill-AA5{fill:#F7F8FE;} + .d2-1206847702 .fill-AB4{fill:#EDF0FD;} + .d2-1206847702 .fill-AB5{fill:#F7F8FE;} + .d2-1206847702 .stroke-N1{stroke:#0A0F25;} + .d2-1206847702 .stroke-N2{stroke:#676C7E;} + .d2-1206847702 .stroke-N3{stroke:#9499AB;} + .d2-1206847702 .stroke-N4{stroke:#CFD2DD;} + .d2-1206847702 .stroke-N5{stroke:#DEE1EB;} + .d2-1206847702 .stroke-N6{stroke:#EEF1F8;} + .d2-1206847702 .stroke-N7{stroke:#FFFFFF;} + .d2-1206847702 .stroke-B1{stroke:#0D32B2;} + .d2-1206847702 .stroke-B2{stroke:#0D32B2;} + .d2-1206847702 .stroke-B3{stroke:#E3E9FD;} + .d2-1206847702 .stroke-B4{stroke:#E3E9FD;} + .d2-1206847702 .stroke-B5{stroke:#EDF0FD;} + .d2-1206847702 .stroke-B6{stroke:#F7F8FE;} + .d2-1206847702 .stroke-AA2{stroke:#4A6FF3;} + .d2-1206847702 .stroke-AA4{stroke:#EDF0FD;} + .d2-1206847702 .stroke-AA5{stroke:#F7F8FE;} + .d2-1206847702 .stroke-AB4{stroke:#EDF0FD;} + .d2-1206847702 .stroke-AB5{stroke:#F7F8FE;} + .d2-1206847702 .background-color-N1{background-color:#0A0F25;} + .d2-1206847702 .background-color-N2{background-color:#676C7E;} + .d2-1206847702 .background-color-N3{background-color:#9499AB;} + .d2-1206847702 .background-color-N4{background-color:#CFD2DD;} + .d2-1206847702 .background-color-N5{background-color:#DEE1EB;} + .d2-1206847702 .background-color-N6{background-color:#EEF1F8;} + .d2-1206847702 .background-color-N7{background-color:#FFFFFF;} + .d2-1206847702 .background-color-B1{background-color:#0D32B2;} + .d2-1206847702 .background-color-B2{background-color:#0D32B2;} + .d2-1206847702 .background-color-B3{background-color:#E3E9FD;} + .d2-1206847702 .background-color-B4{background-color:#E3E9FD;} + .d2-1206847702 .background-color-B5{background-color:#EDF0FD;} + .d2-1206847702 .background-color-B6{background-color:#F7F8FE;} + .d2-1206847702 .background-color-AA2{background-color:#4A6FF3;} + .d2-1206847702 .background-color-AA4{background-color:#EDF0FD;} + .d2-1206847702 .background-color-AA5{background-color:#F7F8FE;} + .d2-1206847702 .background-color-AB4{background-color:#EDF0FD;} + .d2-1206847702 .background-color-AB5{background-color:#F7F8FE;} + .d2-1206847702 .color-N1{color:#0A0F25;} + .d2-1206847702 .color-N2{color:#676C7E;} + .d2-1206847702 .color-N3{color:#9499AB;} + .d2-1206847702 .color-N4{color:#CFD2DD;} + .d2-1206847702 .color-N5{color:#DEE1EB;} + .d2-1206847702 .color-N6{color:#EEF1F8;} + .d2-1206847702 .color-N7{color:#FFFFFF;} + .d2-1206847702 .color-B1{color:#0D32B2;} + .d2-1206847702 .color-B2{color:#0D32B2;} + .d2-1206847702 .color-B3{color:#E3E9FD;} + .d2-1206847702 .color-B4{color:#E3E9FD;} + .d2-1206847702 .color-B5{color:#EDF0FD;} + .d2-1206847702 .color-B6{color:#F7F8FE;} + .d2-1206847702 .color-AA2{color:#4A6FF3;} + .d2-1206847702 .color-AA4{color:#EDF0FD;} + .d2-1206847702 .color-AA5{color:#F7F8FE;} + .d2-1206847702 .color-AB4{color:#EDF0FD;} + .d2-1206847702 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud diff --git a/e2etests/testdata/stable/all_shapes/elk/board.exp.json b/e2etests/testdata/stable/all_shapes/elk/board.exp.json index af2fba9bdd..d976388f16 100644 --- a/e2etests/testdata/stable/all_shapes/elk/board.exp.json +++ b/e2etests/testdata/stable/all_shapes/elk/board.exp.json @@ -581,11 +581,11 @@ "id": "circle", "type": "oval", "pos": { - "x": 676, + "x": 670, "y": 338 }, - "width": 91, - "height": 91, + "width": 103, + "height": 103, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, diff --git a/e2etests/testdata/stable/all_shapes/elk/sketch.exp.svg b/e2etests/testdata/stable/all_shapes/elk/sketch.exp.svg index a72f53c480..9a9819f762 100644 --- a/e2etests/testdata/stable/all_shapes/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/all_shapes/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud + .d2-3083751152 .fill-N1{fill:#0A0F25;} + .d2-3083751152 .fill-N2{fill:#676C7E;} + .d2-3083751152 .fill-N3{fill:#9499AB;} + .d2-3083751152 .fill-N4{fill:#CFD2DD;} + .d2-3083751152 .fill-N5{fill:#DEE1EB;} + .d2-3083751152 .fill-N6{fill:#EEF1F8;} + .d2-3083751152 .fill-N7{fill:#FFFFFF;} + .d2-3083751152 .fill-B1{fill:#0D32B2;} + .d2-3083751152 .fill-B2{fill:#0D32B2;} + .d2-3083751152 .fill-B3{fill:#E3E9FD;} + .d2-3083751152 .fill-B4{fill:#E3E9FD;} + .d2-3083751152 .fill-B5{fill:#EDF0FD;} + .d2-3083751152 .fill-B6{fill:#F7F8FE;} + .d2-3083751152 .fill-AA2{fill:#4A6FF3;} + .d2-3083751152 .fill-AA4{fill:#EDF0FD;} + .d2-3083751152 .fill-AA5{fill:#F7F8FE;} + .d2-3083751152 .fill-AB4{fill:#EDF0FD;} + .d2-3083751152 .fill-AB5{fill:#F7F8FE;} + .d2-3083751152 .stroke-N1{stroke:#0A0F25;} + .d2-3083751152 .stroke-N2{stroke:#676C7E;} + .d2-3083751152 .stroke-N3{stroke:#9499AB;} + .d2-3083751152 .stroke-N4{stroke:#CFD2DD;} + .d2-3083751152 .stroke-N5{stroke:#DEE1EB;} + .d2-3083751152 .stroke-N6{stroke:#EEF1F8;} + .d2-3083751152 .stroke-N7{stroke:#FFFFFF;} + .d2-3083751152 .stroke-B1{stroke:#0D32B2;} + .d2-3083751152 .stroke-B2{stroke:#0D32B2;} + .d2-3083751152 .stroke-B3{stroke:#E3E9FD;} + .d2-3083751152 .stroke-B4{stroke:#E3E9FD;} + .d2-3083751152 .stroke-B5{stroke:#EDF0FD;} + .d2-3083751152 .stroke-B6{stroke:#F7F8FE;} + .d2-3083751152 .stroke-AA2{stroke:#4A6FF3;} + .d2-3083751152 .stroke-AA4{stroke:#EDF0FD;} + .d2-3083751152 .stroke-AA5{stroke:#F7F8FE;} + .d2-3083751152 .stroke-AB4{stroke:#EDF0FD;} + .d2-3083751152 .stroke-AB5{stroke:#F7F8FE;} + .d2-3083751152 .background-color-N1{background-color:#0A0F25;} + .d2-3083751152 .background-color-N2{background-color:#676C7E;} + .d2-3083751152 .background-color-N3{background-color:#9499AB;} + .d2-3083751152 .background-color-N4{background-color:#CFD2DD;} + .d2-3083751152 .background-color-N5{background-color:#DEE1EB;} + .d2-3083751152 .background-color-N6{background-color:#EEF1F8;} + .d2-3083751152 .background-color-N7{background-color:#FFFFFF;} + .d2-3083751152 .background-color-B1{background-color:#0D32B2;} + .d2-3083751152 .background-color-B2{background-color:#0D32B2;} + .d2-3083751152 .background-color-B3{background-color:#E3E9FD;} + .d2-3083751152 .background-color-B4{background-color:#E3E9FD;} + .d2-3083751152 .background-color-B5{background-color:#EDF0FD;} + .d2-3083751152 .background-color-B6{background-color:#F7F8FE;} + .d2-3083751152 .background-color-AA2{background-color:#4A6FF3;} + .d2-3083751152 .background-color-AA4{background-color:#EDF0FD;} + .d2-3083751152 .background-color-AA5{background-color:#F7F8FE;} + .d2-3083751152 .background-color-AB4{background-color:#EDF0FD;} + .d2-3083751152 .background-color-AB5{background-color:#F7F8FE;} + .d2-3083751152 .color-N1{color:#0A0F25;} + .d2-3083751152 .color-N2{color:#676C7E;} + .d2-3083751152 .color-N3{color:#9499AB;} + .d2-3083751152 .color-N4{color:#CFD2DD;} + .d2-3083751152 .color-N5{color:#DEE1EB;} + .d2-3083751152 .color-N6{color:#EEF1F8;} + .d2-3083751152 .color-N7{color:#FFFFFF;} + .d2-3083751152 .color-B1{color:#0D32B2;} + .d2-3083751152 .color-B2{color:#0D32B2;} + .d2-3083751152 .color-B3{color:#E3E9FD;} + .d2-3083751152 .color-B4{color:#E3E9FD;} + .d2-3083751152 .color-B5{color:#EDF0FD;} + .d2-3083751152 .color-B6{color:#F7F8FE;} + .d2-3083751152 .color-AA2{color:#4A6FF3;} + .d2-3083751152 .color-AA4{color:#EDF0FD;} + .d2-3083751152 .color-AA5{color:#F7F8FE;} + .d2-3083751152 .color-AB4{color:#EDF0FD;} + .d2-3083751152 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud @@ -105,7 +105,7 @@ - + \ No newline at end of file diff --git a/e2etests/testdata/stable/all_shapes_link/dagre/board.exp.json b/e2etests/testdata/stable/all_shapes_link/dagre/board.exp.json index 98d98d5d39..e324cab447 100644 --- a/e2etests/testdata/stable/all_shapes_link/dagre/board.exp.json +++ b/e2etests/testdata/stable/all_shapes_link/dagre/board.exp.json @@ -11,7 +11,7 @@ "y": 20 }, "width": 1393, - "height": 596, + "height": 626, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -140,7 +140,7 @@ ], "pos": { "x": 136, - "y": 484 + "y": 499 }, "width": 111, "height": 87, @@ -272,7 +272,7 @@ ], "pos": { "x": 369, - "y": 468 + "y": 483 }, "width": 136, "height": 118, @@ -404,7 +404,7 @@ ], "pos": { "x": 624, - "y": 477 + "y": 492 }, "width": 148, "height": 101, @@ -536,7 +536,7 @@ ], "pos": { "x": 869, - "y": 494 + "y": 509 }, "width": 95, "height": 66, @@ -667,11 +667,11 @@ "linked" ], "pos": { - "x": 1091, + "x": 1076, "y": 468 }, - "width": 118, - "height": 118, + "width": 148, + "height": 148, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -756,7 +756,7 @@ ], "pos": { "x": 1294, - "y": 485 + "y": 500 }, "width": 143, "height": 84, @@ -797,10 +797,10 @@ "type": "rectangle", "pos": { "x": 90, - "y": 756 + "y": 786 }, "width": 1393, - "height": 596, + "height": 626, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -841,7 +841,7 @@ ], "pos": { "x": 120, - "y": 799 + "y": 829 }, "width": 143, "height": 66, @@ -885,7 +885,7 @@ ], "pos": { "x": 129, - "y": 978 + "y": 1008 }, "width": 126, "height": 126, @@ -929,7 +929,7 @@ ], "pos": { "x": 136, - "y": 1220 + "y": 1265 }, "width": 111, "height": 87, @@ -973,7 +973,7 @@ ], "pos": { "x": 323, - "y": 799 + "y": 829 }, "width": 228, "height": 66, @@ -1017,7 +1017,7 @@ ], "pos": { "x": 363, - "y": 1003 + "y": 1033 }, "width": 149, "height": 76, @@ -1061,7 +1061,7 @@ ], "pos": { "x": 369, - "y": 1204 + "y": 1249 }, "width": 136, "height": 118, @@ -1105,7 +1105,7 @@ ], "pos": { "x": 611, - "y": 799 + "y": 829 }, "width": 173, "height": 66, @@ -1149,7 +1149,7 @@ ], "pos": { "x": 630, - "y": 1005 + "y": 1035 }, "width": 135, "height": 73, @@ -1193,7 +1193,7 @@ ], "pos": { "x": 624, - "y": 1213 + "y": 1258 }, "width": 148, "height": 101, @@ -1237,7 +1237,7 @@ ], "pos": { "x": 853, - "y": 787 + "y": 817 }, "width": 127, "height": 91, @@ -1281,7 +1281,7 @@ ], "pos": { "x": 825, - "y": 1008 + "y": 1038 }, "width": 183, "height": 66, @@ -1325,7 +1325,7 @@ ], "pos": { "x": 869, - "y": 1230 + "y": 1275 }, "width": 95, "height": 66, @@ -1369,7 +1369,7 @@ ], "pos": { "x": 1040, - "y": 786 + "y": 816 }, "width": 220, "height": 92, @@ -1413,7 +1413,7 @@ ], "pos": { "x": 1083, - "y": 1006 + "y": 1036 }, "width": 134, "height": 70, @@ -1456,11 +1456,11 @@ "tooltipped" ], "pos": { - "x": 1091, - "y": 1204 + "x": 1076, + "y": 1234 }, - "width": 118, - "height": 118, + "width": 148, + "height": 148, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1501,7 +1501,7 @@ ], "pos": { "x": 1277, - "y": 1007 + "y": 1037 }, "width": 176, "height": 69, @@ -1545,7 +1545,7 @@ ], "pos": { "x": 1294, - "y": 1221 + "y": 1266 }, "width": 143, "height": 84, @@ -1586,10 +1586,10 @@ "type": "rectangle", "pos": { "x": 10, - "y": 1492 + "y": 1552 }, "width": 1620, - "height": 657, + "height": 703, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1631,7 +1631,7 @@ ], "pos": { "x": 40, - "y": 1535 + "y": 1595 }, "width": 175, "height": 66, @@ -1676,7 +1676,7 @@ ], "pos": { "x": 49, - "y": 1714 + "y": 1774 }, "width": 158, "height": 158, @@ -1721,7 +1721,7 @@ ], "pos": { "x": 56, - "y": 2002 + "y": 2085 }, "width": 143, "height": 87, @@ -1766,7 +1766,7 @@ ], "pos": { "x": 275, - "y": 1535 + "y": 1595 }, "width": 260, "height": 66, @@ -1811,7 +1811,7 @@ ], "pos": { "x": 315, - "y": 1755 + "y": 1815 }, "width": 181, "height": 76, @@ -1856,7 +1856,7 @@ ], "pos": { "x": 321, - "y": 1987 + "y": 2070 }, "width": 168, "height": 118, @@ -1901,7 +1901,7 @@ ], "pos": { "x": 595, - "y": 1535 + "y": 1595 }, "width": 205, "height": 66, @@ -1946,7 +1946,7 @@ ], "pos": { "x": 614, - "y": 1757 + "y": 1817 }, "width": 167, "height": 73, @@ -1991,7 +1991,7 @@ ], "pos": { "x": 608, - "y": 1995 + "y": 2078 }, "width": 180, "height": 101, @@ -2036,7 +2036,7 @@ ], "pos": { "x": 869, - "y": 1523 + "y": 1583 }, "width": 159, "height": 91, @@ -2081,7 +2081,7 @@ ], "pos": { "x": 841, - "y": 1760 + "y": 1820 }, "width": 215, "height": 66, @@ -2126,7 +2126,7 @@ ], "pos": { "x": 885, - "y": 2003 + "y": 2086 }, "width": 127, "height": 85, @@ -2171,7 +2171,7 @@ ], "pos": { "x": 1088, - "y": 1522 + "y": 1582 }, "width": 284, "height": 92, @@ -2216,7 +2216,7 @@ ], "pos": { "x": 1145, - "y": 1758 + "y": 1818 }, "width": 171, "height": 70, @@ -2260,11 +2260,11 @@ "tooltipped" ], "pos": { - "x": 1157, - "y": 1972 + "x": 1134, + "y": 2032 }, - "width": 147, - "height": 147, + "width": 193, + "height": 193, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -2306,7 +2306,7 @@ ], "pos": { "x": 1376, - "y": 1759 + "y": 1819 }, "width": 224, "height": 69, @@ -2351,7 +2351,7 @@ ], "pos": { "x": 1397, - "y": 2004 + "y": 2087 }, "width": 182, "height": 84, @@ -2470,11 +2470,11 @@ }, { "x": 191.60000610351562, - "y": 431.20001220703125 + "y": 434.20001220703125 }, { "x": 192, - "y": 484 + "y": 499 } ], "isCurve": true, @@ -2564,11 +2564,11 @@ }, { "x": 437, - "y": 428 + "y": 431 }, { "x": 437, - "y": 468 + "y": 483 } ], "isCurve": true, @@ -2658,11 +2658,11 @@ }, { "x": 697.5999755859375, - "y": 429.79998779296875 + "y": 432.79998779296875 }, { "x": 698, - "y": 477 + "y": 492 } ], "isCurve": true, @@ -2752,11 +2752,11 @@ }, { "x": 916.5999755859375, - "y": 433.20001220703125 + "y": 436.20001220703125 }, { "x": 917, - "y": 494 + "y": 509 } ], "isCurve": true, @@ -2893,11 +2893,11 @@ }, { "x": 1365, - "y": 431.6000061035156 + "y": 434.6000061035156 }, { "x": 1365, - "y": 486 + "y": 501 } ], "isCurve": true, @@ -2932,19 +2932,19 @@ "route": [ { "x": 191.5, - "y": 865 + "y": 895 }, { "x": 191.5, - "y": 915.4000244140625 + "y": 945.4000244140625 }, { "x": 191.5, - "y": 938 + "y": 968 }, { "x": 191.5, - "y": 978 + "y": 1008 } ], "isCurve": true, @@ -2979,19 +2979,19 @@ "route": [ { "x": 191.5, - "y": 1104 + "y": 1134 }, { "x": 191.5, - "y": 1144 + "y": 1174 }, { "x": 191.60000610351562, - "y": 1167.199951171875 + "y": 1200.199951171875 }, { "x": 192, - "y": 1220 + "y": 1265 } ], "isCurve": true, @@ -3026,19 +3026,19 @@ "route": [ { "x": 437, - "y": 865 + "y": 895 }, { "x": 437, - "y": 915.4000244140625 + "y": 945.4000244140625 }, { "x": 437, - "y": 943 + "y": 973 }, { "x": 437, - "y": 1003 + "y": 1033 } ], "isCurve": true, @@ -3073,19 +3073,19 @@ "route": [ { "x": 437, - "y": 1069 + "y": 1099 }, { "x": 437, - "y": 1137 + "y": 1167 }, { "x": 437, - "y": 1164 + "y": 1197 }, { "x": 437, - "y": 1204 + "y": 1249 } ], "isCurve": true, @@ -3120,19 +3120,19 @@ "route": [ { "x": 697, - "y": 865 + "y": 895 }, { "x": 697.4000244140625, - "y": 915.4000244140625 + "y": 945.4000244140625 }, { "x": 697.5999755859375, - "y": 943.4000244140625 + "y": 973.4000244140625 }, { "x": 698, - "y": 1005 + "y": 1035 } ], "isCurve": true, @@ -3167,19 +3167,19 @@ "route": [ { "x": 697, - "y": 1078 + "y": 1108 }, { "x": 697.4000244140625, - "y": 1138.800048828125 + "y": 1168.800048828125 }, { "x": 697.5999755859375, - "y": 1165.800048828125 + "y": 1198.800048828125 }, { "x": 698, - "y": 1213 + "y": 1258 } ], "isCurve": true, @@ -3214,19 +3214,19 @@ "route": [ { "x": 917, - "y": 833 + "y": 863 }, { "x": 916.5999755859375, - "y": 909 + "y": 939 }, { "x": 916.5999755859375, - "y": 944 + "y": 974 }, { "x": 917, - "y": 1008 + "y": 1038 } ], "isCurve": true, @@ -3261,19 +3261,19 @@ "route": [ { "x": 917, - "y": 1074 + "y": 1104 }, { "x": 916.5999755859375, - "y": 1138 + "y": 1168 }, { "x": 916.5999755859375, - "y": 1169.199951171875 + "y": 1202.199951171875 }, { "x": 917, - "y": 1230 + "y": 1275 } ], "isCurve": true, @@ -3308,19 +3308,19 @@ "route": [ { "x": 1150, - "y": 878 + "y": 908 }, { "x": 1150, - "y": 918 + "y": 948 }, { "x": 1150, - "y": 943.5999755859375 + "y": 973.5999755859375 }, { "x": 1150, - "y": 1006 + "y": 1036 } ], "isCurve": true, @@ -3355,19 +3355,19 @@ "route": [ { "x": 1150, - "y": 1076 + "y": 1106 }, { "x": 1150, - "y": 1138.4000244140625 + "y": 1168.4000244140625 }, { "x": 1150, - "y": 1164 + "y": 1194 }, { "x": 1150, - "y": 1204 + "y": 1234 } ], "isCurve": true, @@ -3402,19 +3402,19 @@ "route": [ { "x": 1365, - "y": 1076 + "y": 1106 }, { "x": 1365, - "y": 1138.4000244140625 + "y": 1168.4000244140625 }, { "x": 1365, - "y": 1167.5999755859375 + "y": 1200.5999755859375 }, { "x": 1365, - "y": 1222 + "y": 1267 } ], "isCurve": true, @@ -3449,19 +3449,19 @@ "route": [ { "x": 127.5, - "y": 1601 + "y": 1661 }, { "x": 127.5, - "y": 1651.4000244140625 + "y": 1711.4000244140625 }, { "x": 127.5, - "y": 1674 + "y": 1734 }, { "x": 127.5, - "y": 1714 + "y": 1774 } ], "isCurve": true, @@ -3496,19 +3496,19 @@ "route": [ { "x": 127.5, - "y": 1872 + "y": 1932 }, { "x": 127.5, - "y": 1912 + "y": 1972 }, { "x": 127.5999984741211, - "y": 1938 + "y": 2002.5999755859375 }, { "x": 128, - "y": 2002 + "y": 2085 } ], "isCurve": true, @@ -3543,19 +3543,19 @@ "route": [ { "x": 405, - "y": 1601 + "y": 1661 }, { "x": 405, - "y": 1651.4000244140625 + "y": 1711.4000244140625 }, { "x": 405, - "y": 1682.199951171875 + "y": 1742.199951171875 }, { "x": 405, - "y": 1755 + "y": 1815 } ], "isCurve": true, @@ -3590,19 +3590,19 @@ "route": [ { "x": 405, - "y": 1820 + "y": 1880 }, { "x": 405, - "y": 1901.5999755859375 + "y": 1961.5999755859375 }, { "x": 405, - "y": 1935 + "y": 1999.5999755859375 }, { "x": 405, - "y": 1987 + "y": 2070 } ], "isCurve": true, @@ -3637,19 +3637,19 @@ "route": [ { "x": 697, - "y": 1601 + "y": 1661 }, { "x": 697.4000244140625, - "y": 1651.4000244140625 + "y": 1711.4000244140625 }, { "x": 697.5999755859375, - "y": 1682.5999755859375 + "y": 1742.5999755859375 }, { "x": 698, - "y": 1757 + "y": 1817 } ], "isCurve": true, @@ -3684,19 +3684,19 @@ "route": [ { "x": 697, - "y": 1830 + "y": 1890 }, { "x": 697.4000244140625, - "y": 1903.5999755859375 + "y": 1963.5999755859375 }, { "x": 697.5999755859375, - "y": 1936.5999755859375 + "y": 2001.199951171875 }, { "x": 698, - "y": 1995 + "y": 2078 } ], "isCurve": true, @@ -3731,19 +3731,19 @@ "route": [ { "x": 949, - "y": 1569 + "y": 1629 }, { "x": 948.5999755859375, - "y": 1645 + "y": 1705 }, { "x": 948.5999755859375, - "y": 1683.199951171875 + "y": 1743.199951171875 }, { "x": 949, - "y": 1760 + "y": 1820 } ], "isCurve": true, @@ -3778,19 +3778,19 @@ "route": [ { "x": 948, - "y": 1826 + "y": 1886 }, { "x": 948.4000244140625, - "y": 1902.800048828125 + "y": 1962.800048828125 }, { "x": 948.5999755859375, - "y": 1938.199951171875 + "y": 2002.800048828125 }, { "x": 949, - "y": 2003 + "y": 2086 } ], "isCurve": true, @@ -3825,19 +3825,19 @@ "route": [ { "x": 1230, - "y": 1614 + "y": 1674 }, { "x": 1230, - "y": 1654 + "y": 1714 }, { "x": 1230, - "y": 1682.800048828125 + "y": 1742.800048828125 }, { "x": 1230, - "y": 1758 + "y": 1818 } ], "isCurve": true, @@ -3872,19 +3872,19 @@ "route": [ { "x": 1230, - "y": 1828 + "y": 1888 }, { "x": 1230, - "y": 1903.199951171875 + "y": 1963.199951171875 }, { "x": 1230, - "y": 1932 + "y": 1992 }, { "x": 1230, - "y": 1972 + "y": 2032 } ], "isCurve": true, @@ -3919,19 +3919,19 @@ "route": [ { "x": 1488, - "y": 1828 + "y": 1888 }, { "x": 1487.5999755859375, - "y": 1903.199951171875 + "y": 1963.199951171875 }, { "x": 1487.5999755859375, - "y": 1938.800048828125 + "y": 2003.4000244140625 }, { "x": 1488, - "y": 2006 + "y": 2089 } ], "isCurve": true, @@ -3966,19 +3966,19 @@ "route": [ { "x": 697.5, - "y": 616 + "y": 646 }, { "x": 697.5, - "y": 672 + "y": 702 }, { "x": 697.5, - "y": 700 + "y": 730 }, { "x": 697.5, - "y": 756 + "y": 786 } ], "isCurve": true, @@ -4013,19 +4013,19 @@ "route": [ { "x": 697.5, - "y": 1352 + "y": 1412 }, { "x": 697.5, - "y": 1408 + "y": 1468 }, { "x": 697.5, - "y": 1436 + "y": 1496 }, { "x": 697.5, - "y": 1492 + "y": 1552 } ], "isCurve": true, diff --git a/e2etests/testdata/stable/all_shapes_link/dagre/sketch.exp.svg b/e2etests/testdata/stable/all_shapes_link/dagre/sketch.exp.svg index 7b60ec365d..719f3205d0 100644 --- a/e2etests/testdata/stable/all_shapes_link/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/all_shapes_link/dagre/sketch.exp.svg @@ -1,19 +1,19 @@ -linkedtooltippedbothrectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloudrectangleexamplesquareexamplepageexampleparallelogramexampledocumentexamplecylinderexamplequeueexamplepackageexamplestepexamplecalloutexamplestored_dataexamplepersonexamplediamondexampleovalexamplecircleexamplehexagonexamplecloudexamplerectangleexamplesquareexamplepageexampleparallelogramexampledocumentexamplecylinderexamplequeueexamplepackageexamplestepexamplecalloutexamplestored_dataexamplepersonexamplediamondexampleovalexamplecircleexamplehexagonexamplecloudexample + .d2-1907194502 .fill-N1{fill:#0A0F25;} + .d2-1907194502 .fill-N2{fill:#676C7E;} + .d2-1907194502 .fill-N3{fill:#9499AB;} + .d2-1907194502 .fill-N4{fill:#CFD2DD;} + .d2-1907194502 .fill-N5{fill:#DEE1EB;} + .d2-1907194502 .fill-N6{fill:#EEF1F8;} + .d2-1907194502 .fill-N7{fill:#FFFFFF;} + .d2-1907194502 .fill-B1{fill:#0D32B2;} + .d2-1907194502 .fill-B2{fill:#0D32B2;} + .d2-1907194502 .fill-B3{fill:#E3E9FD;} + .d2-1907194502 .fill-B4{fill:#E3E9FD;} + .d2-1907194502 .fill-B5{fill:#EDF0FD;} + .d2-1907194502 .fill-B6{fill:#F7F8FE;} + .d2-1907194502 .fill-AA2{fill:#4A6FF3;} + .d2-1907194502 .fill-AA4{fill:#EDF0FD;} + .d2-1907194502 .fill-AA5{fill:#F7F8FE;} + .d2-1907194502 .fill-AB4{fill:#EDF0FD;} + .d2-1907194502 .fill-AB5{fill:#F7F8FE;} + .d2-1907194502 .stroke-N1{stroke:#0A0F25;} + .d2-1907194502 .stroke-N2{stroke:#676C7E;} + .d2-1907194502 .stroke-N3{stroke:#9499AB;} + .d2-1907194502 .stroke-N4{stroke:#CFD2DD;} + .d2-1907194502 .stroke-N5{stroke:#DEE1EB;} + .d2-1907194502 .stroke-N6{stroke:#EEF1F8;} + .d2-1907194502 .stroke-N7{stroke:#FFFFFF;} + .d2-1907194502 .stroke-B1{stroke:#0D32B2;} + .d2-1907194502 .stroke-B2{stroke:#0D32B2;} + .d2-1907194502 .stroke-B3{stroke:#E3E9FD;} + .d2-1907194502 .stroke-B4{stroke:#E3E9FD;} + .d2-1907194502 .stroke-B5{stroke:#EDF0FD;} + .d2-1907194502 .stroke-B6{stroke:#F7F8FE;} + .d2-1907194502 .stroke-AA2{stroke:#4A6FF3;} + .d2-1907194502 .stroke-AA4{stroke:#EDF0FD;} + .d2-1907194502 .stroke-AA5{stroke:#F7F8FE;} + .d2-1907194502 .stroke-AB4{stroke:#EDF0FD;} + .d2-1907194502 .stroke-AB5{stroke:#F7F8FE;} + .d2-1907194502 .background-color-N1{background-color:#0A0F25;} + .d2-1907194502 .background-color-N2{background-color:#676C7E;} + .d2-1907194502 .background-color-N3{background-color:#9499AB;} + .d2-1907194502 .background-color-N4{background-color:#CFD2DD;} + .d2-1907194502 .background-color-N5{background-color:#DEE1EB;} + .d2-1907194502 .background-color-N6{background-color:#EEF1F8;} + .d2-1907194502 .background-color-N7{background-color:#FFFFFF;} + .d2-1907194502 .background-color-B1{background-color:#0D32B2;} + .d2-1907194502 .background-color-B2{background-color:#0D32B2;} + .d2-1907194502 .background-color-B3{background-color:#E3E9FD;} + .d2-1907194502 .background-color-B4{background-color:#E3E9FD;} + .d2-1907194502 .background-color-B5{background-color:#EDF0FD;} + .d2-1907194502 .background-color-B6{background-color:#F7F8FE;} + .d2-1907194502 .background-color-AA2{background-color:#4A6FF3;} + .d2-1907194502 .background-color-AA4{background-color:#EDF0FD;} + .d2-1907194502 .background-color-AA5{background-color:#F7F8FE;} + .d2-1907194502 .background-color-AB4{background-color:#EDF0FD;} + .d2-1907194502 .background-color-AB5{background-color:#F7F8FE;} + .d2-1907194502 .color-N1{color:#0A0F25;} + .d2-1907194502 .color-N2{color:#676C7E;} + .d2-1907194502 .color-N3{color:#9499AB;} + .d2-1907194502 .color-N4{color:#CFD2DD;} + .d2-1907194502 .color-N5{color:#DEE1EB;} + .d2-1907194502 .color-N6{color:#EEF1F8;} + .d2-1907194502 .color-N7{color:#FFFFFF;} + .d2-1907194502 .color-B1{color:#0D32B2;} + .d2-1907194502 .color-B2{color:#0D32B2;} + .d2-1907194502 .color-B3{color:#E3E9FD;} + .d2-1907194502 .color-B4{color:#E3E9FD;} + .d2-1907194502 .color-B5{color:#EDF0FD;} + .d2-1907194502 .color-B6{color:#F7F8FE;} + .d2-1907194502 .color-AA2{color:#4A6FF3;} + .d2-1907194502 .color-AA4{color:#EDF0FD;} + .d2-1907194502 .color-AA5{color:#F7F8FE;} + .d2-1907194502 .color-AB4{color:#EDF0FD;} + .d2-1907194502 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>linkedtooltippedbothrectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloudrectangleexamplesquareexamplepageexampleparallelogramexampledocumentexamplecylinderexamplequeueexamplepackageexamplestepexamplecalloutexamplestored_dataexamplepersonexamplediamondexampleovalexamplecircleexamplehexagonexamplecloudexamplerectangleexamplesquareexamplepageexampleparallelogramexampledocumentexamplecylinderexamplequeueexamplepackageexamplestepexamplecalloutexamplestored_dataexamplepersonexamplediamondexampleovalexamplecircleexamplehexagonexamplecloudexample @@ -123,7 +123,7 @@ - + @@ -159,7 +159,7 @@ - + @@ -195,7 +195,7 @@ - + @@ -231,7 +231,7 @@ - + @@ -267,7 +267,7 @@ - + @@ -291,7 +291,7 @@ - + @@ -303,7 +303,7 @@ -example +example @@ -316,7 +316,7 @@ -example +example @@ -329,7 +329,7 @@ -example +example @@ -342,7 +342,7 @@ -example +example @@ -355,7 +355,7 @@ -example +example @@ -368,7 +368,7 @@ -example +example @@ -381,7 +381,7 @@ -example +example @@ -394,7 +394,7 @@ -example +example @@ -407,7 +407,7 @@ -example +example @@ -420,7 +420,7 @@ -example +example @@ -433,7 +433,7 @@ -example +example @@ -446,7 +446,7 @@ -example +example @@ -459,7 +459,7 @@ -example +example @@ -472,7 +472,7 @@ -example +example @@ -485,7 +485,7 @@ -example +example @@ -498,7 +498,7 @@ -example +example @@ -511,7 +511,7 @@ -example +example @@ -524,7 +524,7 @@ -example +example @@ -537,7 +537,7 @@ - + @@ -549,7 +549,7 @@ -example +example @@ -562,7 +562,7 @@ - + @@ -574,7 +574,7 @@ -example +example @@ -587,7 +587,7 @@ - + @@ -599,7 +599,7 @@ -example +example @@ -612,7 +612,7 @@ - + @@ -624,7 +624,7 @@ -example +example @@ -637,7 +637,7 @@ - + @@ -649,7 +649,7 @@ -example +example @@ -662,7 +662,7 @@ - + @@ -674,7 +674,7 @@ -example +example @@ -687,7 +687,7 @@ - + @@ -699,7 +699,7 @@ -example +example @@ -712,7 +712,7 @@ - + @@ -724,7 +724,7 @@ -example +example @@ -737,7 +737,7 @@ - + @@ -749,7 +749,7 @@ -example +example @@ -762,7 +762,7 @@ - + @@ -774,7 +774,7 @@ -example +example @@ -787,7 +787,7 @@ - + @@ -799,7 +799,7 @@ -example +example @@ -812,7 +812,7 @@ - + @@ -824,7 +824,7 @@ -example +example @@ -837,7 +837,7 @@ - + @@ -849,7 +849,7 @@ -example +example @@ -862,7 +862,7 @@ - + @@ -874,7 +874,7 @@ -example +example @@ -887,7 +887,7 @@ - + @@ -899,7 +899,7 @@ -example +example @@ -912,7 +912,7 @@ - + @@ -924,7 +924,7 @@ -example +example @@ -937,7 +937,7 @@ - + @@ -949,60 +949,60 @@ - - + + - - + + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/all_shapes_link/elk/board.exp.json b/e2etests/testdata/stable/all_shapes_link/elk/board.exp.json index 1085c73a99..3811ff4d9b 100644 --- a/e2etests/testdata/stable/all_shapes_link/elk/board.exp.json +++ b/e2etests/testdata/stable/all_shapes_link/elk/board.exp.json @@ -11,7 +11,7 @@ "y": 12 }, "width": 1276, - "height": 576, + "height": 606, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -667,11 +667,11 @@ "linked" ], "pos": { - "x": 993, + "x": 978, "y": 420 }, - "width": 118, - "height": 118, + "width": 148, + "height": 148, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -797,10 +797,10 @@ "type": "rectangle", "pos": { "x": 132, - "y": 658 + "y": 688 }, "width": 1276, - "height": 576, + "height": 606, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -841,7 +841,7 @@ ], "pos": { "x": 182, - "y": 734 + "y": 764 }, "width": 143, "height": 66, @@ -885,7 +885,7 @@ ], "pos": { "x": 190, - "y": 870 + "y": 900 }, "width": 126, "height": 126, @@ -929,7 +929,7 @@ ], "pos": { "x": 198, - "y": 1066 + "y": 1096 }, "width": 111, "height": 87, @@ -973,7 +973,7 @@ ], "pos": { "x": 345, - "y": 734 + "y": 764 }, "width": 228, "height": 66, @@ -1017,7 +1017,7 @@ ], "pos": { "x": 384, - "y": 895 + "y": 925 }, "width": 149, "height": 76, @@ -1061,7 +1061,7 @@ ], "pos": { "x": 391, - "y": 1066 + "y": 1096 }, "width": 136, "height": 118, @@ -1105,7 +1105,7 @@ ], "pos": { "x": 593, - "y": 734 + "y": 764 }, "width": 173, "height": 66, @@ -1149,7 +1149,7 @@ ], "pos": { "x": 612, - "y": 896 + "y": 926 }, "width": 135, "height": 73, @@ -1193,7 +1193,7 @@ ], "pos": { "x": 605, - "y": 1066 + "y": 1096 }, "width": 148, "height": 101, @@ -1237,7 +1237,7 @@ ], "pos": { "x": 795, - "y": 709 + "y": 739 }, "width": 127, "height": 91, @@ -1281,7 +1281,7 @@ ], "pos": { "x": 767, - "y": 900 + "y": 930 }, "width": 183, "height": 66, @@ -1325,7 +1325,7 @@ ], "pos": { "x": 811, - "y": 1066 + "y": 1096 }, "width": 95, "height": 66, @@ -1369,7 +1369,7 @@ ], "pos": { "x": 942, - "y": 708 + "y": 738 }, "width": 220, "height": 92, @@ -1413,7 +1413,7 @@ ], "pos": { "x": 985, - "y": 898 + "y": 928 }, "width": 134, "height": 70, @@ -1456,11 +1456,11 @@ "tooltipped" ], "pos": { - "x": 993, - "y": 1066 + "x": 978, + "y": 1096 }, - "width": 118, - "height": 118, + "width": 148, + "height": 148, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1501,7 +1501,7 @@ ], "pos": { "x": 1182, - "y": 731 + "y": 761 }, "width": 176, "height": 69, @@ -1545,7 +1545,7 @@ ], "pos": { "x": 1198, - "y": 870 + "y": 900 }, "width": 143, "height": 84, @@ -1586,10 +1586,10 @@ "type": "rectangle", "pos": { "x": 12, - "y": 1304 + "y": 1364 }, "width": 1516, - "height": 637, + "height": 683, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1631,7 +1631,7 @@ ], "pos": { "x": 62, - "y": 1380 + "y": 1440 }, "width": 175, "height": 66, @@ -1676,7 +1676,7 @@ ], "pos": { "x": 70, - "y": 1516 + "y": 1576 }, "width": 158, "height": 158, @@ -1721,7 +1721,7 @@ ], "pos": { "x": 78, - "y": 1744 + "y": 1804 }, "width": 143, "height": 87, @@ -1766,7 +1766,7 @@ ], "pos": { "x": 257, - "y": 1380 + "y": 1440 }, "width": 260, "height": 66, @@ -1811,7 +1811,7 @@ ], "pos": { "x": 296, - "y": 1557 + "y": 1617 }, "width": 181, "height": 76, @@ -1856,7 +1856,7 @@ ], "pos": { "x": 303, - "y": 1744 + "y": 1804 }, "width": 168, "height": 118, @@ -1901,7 +1901,7 @@ ], "pos": { "x": 537, - "y": 1380 + "y": 1440 }, "width": 205, "height": 66, @@ -1946,7 +1946,7 @@ ], "pos": { "x": 556, - "y": 1558 + "y": 1618 }, "width": 167, "height": 73, @@ -1991,7 +1991,7 @@ ], "pos": { "x": 549, - "y": 1744 + "y": 1804 }, "width": 180, "height": 101, @@ -2036,7 +2036,7 @@ ], "pos": { "x": 771, - "y": 1355 + "y": 1415 }, "width": 159, "height": 91, @@ -2081,7 +2081,7 @@ ], "pos": { "x": 743, - "y": 1562 + "y": 1622 }, "width": 215, "height": 66, @@ -2126,7 +2126,7 @@ ], "pos": { "x": 787, - "y": 1744 + "y": 1804 }, "width": 127, "height": 85, @@ -2171,7 +2171,7 @@ ], "pos": { "x": 950, - "y": 1354 + "y": 1414 }, "width": 284, "height": 92, @@ -2216,7 +2216,7 @@ ], "pos": { "x": 1006, - "y": 1560 + "y": 1620 }, "width": 171, "height": 70, @@ -2260,11 +2260,11 @@ "tooltipped" ], "pos": { - "x": 1018, - "y": 1744 + "x": 995, + "y": 1804 }, - "width": 147, - "height": 147, + "width": 193, + "height": 193, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -2306,7 +2306,7 @@ ], "pos": { "x": 1254, - "y": 1377 + "y": 1437 }, "width": 224, "height": 69, @@ -2351,7 +2351,7 @@ ], "pos": { "x": 1275, - "y": 1516 + "y": 1576 }, "width": 182, "height": 84, @@ -2833,11 +2833,11 @@ "route": [ { "x": 253.5, - "y": 800 + "y": 830 }, { "x": 253.5, - "y": 870 + "y": 900 } ], "animated": false, @@ -2871,11 +2871,11 @@ "route": [ { "x": 253.5, - "y": 996 + "y": 1026 }, { "x": 254, - "y": 1066 + "y": 1096 } ], "animated": false, @@ -2909,11 +2909,11 @@ "route": [ { "x": 459, - "y": 800 + "y": 830 }, { "x": 459, - "y": 895 + "y": 925 } ], "animated": false, @@ -2947,11 +2947,11 @@ "route": [ { "x": 459, - "y": 960 + "y": 990 }, { "x": 459, - "y": 1066 + "y": 1096 } ], "animated": false, @@ -2985,11 +2985,11 @@ "route": [ { "x": 679, - "y": 800 + "y": 830 }, { "x": 680, - "y": 911 + "y": 941 } ], "animated": false, @@ -3023,11 +3023,11 @@ "route": [ { "x": 679, - "y": 970 + "y": 1000 }, { "x": 680, - "y": 1066 + "y": 1096 } ], "animated": false, @@ -3061,11 +3061,11 @@ "route": [ { "x": 859, - "y": 755 + "y": 785 }, { "x": 858, - "y": 900 + "y": 930 } ], "animated": false, @@ -3099,11 +3099,11 @@ "route": [ { "x": 859, - "y": 966 + "y": 996 }, { "x": 858, - "y": 1066 + "y": 1096 } ], "animated": false, @@ -3137,11 +3137,11 @@ "route": [ { "x": 1052, - "y": 800 + "y": 830 }, { "x": 1052, - "y": 898 + "y": 928 } ], "animated": false, @@ -3175,11 +3175,11 @@ "route": [ { "x": 1052, - "y": 968 + "y": 998 }, { "x": 1052, - "y": 1066 + "y": 1096 } ], "animated": false, @@ -3213,11 +3213,11 @@ "route": [ { "x": 1270, - "y": 800 + "y": 830 }, { "x": 1270, - "y": 871 + "y": 901 } ], "animated": false, @@ -3251,11 +3251,11 @@ "route": [ { "x": 149.5, - "y": 1446 + "y": 1506 }, { "x": 149.5, - "y": 1516 + "y": 1576 } ], "animated": false, @@ -3289,11 +3289,11 @@ "route": [ { "x": 149.5, - "y": 1674 + "y": 1734 }, { "x": 150, - "y": 1744 + "y": 1804 } ], "animated": false, @@ -3327,11 +3327,11 @@ "route": [ { "x": 387, - "y": 1446 + "y": 1506 }, { "x": 387, - "y": 1557 + "y": 1617 } ], "animated": false, @@ -3365,11 +3365,11 @@ "route": [ { "x": 387, - "y": 1622 + "y": 1682 }, { "x": 387, - "y": 1744 + "y": 1804 } ], "animated": false, @@ -3403,11 +3403,11 @@ "route": [ { "x": 639, - "y": 1446 + "y": 1506 }, { "x": 640, - "y": 1573 + "y": 1633 } ], "animated": false, @@ -3441,11 +3441,11 @@ "route": [ { "x": 639, - "y": 1632 + "y": 1692 }, { "x": 640, - "y": 1744 + "y": 1804 } ], "animated": false, @@ -3479,11 +3479,11 @@ "route": [ { "x": 851, - "y": 1401 + "y": 1461 }, { "x": 850, - "y": 1562 + "y": 1622 } ], "animated": false, @@ -3517,11 +3517,11 @@ "route": [ { "x": 850, - "y": 1628 + "y": 1688 }, { "x": 851, - "y": 1744 + "y": 1804 } ], "animated": false, @@ -3555,11 +3555,11 @@ "route": [ { "x": 1092, - "y": 1446 + "y": 1506 }, { "x": 1092, - "y": 1560 + "y": 1620 } ], "animated": false, @@ -3593,11 +3593,11 @@ "route": [ { "x": 1092, - "y": 1630 + "y": 1690 }, { "x": 1092, - "y": 1744 + "y": 1804 } ], "animated": false, @@ -3631,11 +3631,11 @@ "route": [ { "x": 1366, - "y": 1446 + "y": 1506 }, { "x": 1366, - "y": 1517 + "y": 1577 } ], "animated": false, @@ -3669,11 +3669,11 @@ "route": [ { "x": 770, - "y": 588 + "y": 618 }, { "x": 770, - "y": 658 + "y": 688 } ], "animated": false, @@ -3707,11 +3707,11 @@ "route": [ { "x": 770, - "y": 1234 + "y": 1294 }, { "x": 770, - "y": 1304 + "y": 1364 } ], "animated": false, diff --git a/e2etests/testdata/stable/all_shapes_link/elk/sketch.exp.svg b/e2etests/testdata/stable/all_shapes_link/elk/sketch.exp.svg index 070a856bbb..e644083050 100644 --- a/e2etests/testdata/stable/all_shapes_link/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/all_shapes_link/elk/sketch.exp.svg @@ -1,19 +1,19 @@ -linkedtooltippedbothrectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloudrectangleexamplesquareexamplepageexampleparallelogramexampledocumentexamplecylinderexamplequeueexamplepackageexamplestepexamplecalloutexamplestored_dataexamplepersonexamplediamondexampleovalexamplecircleexamplehexagonexamplecloudexamplerectangleexamplesquareexamplepageexampleparallelogramexampledocumentexamplecylinderexamplequeueexamplepackageexamplestepexamplecalloutexamplestored_dataexamplepersonexamplediamondexampleovalexamplecircleexamplehexagonexamplecloudexample + .d2-1157458919 .fill-N1{fill:#0A0F25;} + .d2-1157458919 .fill-N2{fill:#676C7E;} + .d2-1157458919 .fill-N3{fill:#9499AB;} + .d2-1157458919 .fill-N4{fill:#CFD2DD;} + .d2-1157458919 .fill-N5{fill:#DEE1EB;} + .d2-1157458919 .fill-N6{fill:#EEF1F8;} + .d2-1157458919 .fill-N7{fill:#FFFFFF;} + .d2-1157458919 .fill-B1{fill:#0D32B2;} + .d2-1157458919 .fill-B2{fill:#0D32B2;} + .d2-1157458919 .fill-B3{fill:#E3E9FD;} + .d2-1157458919 .fill-B4{fill:#E3E9FD;} + .d2-1157458919 .fill-B5{fill:#EDF0FD;} + .d2-1157458919 .fill-B6{fill:#F7F8FE;} + .d2-1157458919 .fill-AA2{fill:#4A6FF3;} + .d2-1157458919 .fill-AA4{fill:#EDF0FD;} + .d2-1157458919 .fill-AA5{fill:#F7F8FE;} + .d2-1157458919 .fill-AB4{fill:#EDF0FD;} + .d2-1157458919 .fill-AB5{fill:#F7F8FE;} + .d2-1157458919 .stroke-N1{stroke:#0A0F25;} + .d2-1157458919 .stroke-N2{stroke:#676C7E;} + .d2-1157458919 .stroke-N3{stroke:#9499AB;} + .d2-1157458919 .stroke-N4{stroke:#CFD2DD;} + .d2-1157458919 .stroke-N5{stroke:#DEE1EB;} + .d2-1157458919 .stroke-N6{stroke:#EEF1F8;} + .d2-1157458919 .stroke-N7{stroke:#FFFFFF;} + .d2-1157458919 .stroke-B1{stroke:#0D32B2;} + .d2-1157458919 .stroke-B2{stroke:#0D32B2;} + .d2-1157458919 .stroke-B3{stroke:#E3E9FD;} + .d2-1157458919 .stroke-B4{stroke:#E3E9FD;} + .d2-1157458919 .stroke-B5{stroke:#EDF0FD;} + .d2-1157458919 .stroke-B6{stroke:#F7F8FE;} + .d2-1157458919 .stroke-AA2{stroke:#4A6FF3;} + .d2-1157458919 .stroke-AA4{stroke:#EDF0FD;} + .d2-1157458919 .stroke-AA5{stroke:#F7F8FE;} + .d2-1157458919 .stroke-AB4{stroke:#EDF0FD;} + .d2-1157458919 .stroke-AB5{stroke:#F7F8FE;} + .d2-1157458919 .background-color-N1{background-color:#0A0F25;} + .d2-1157458919 .background-color-N2{background-color:#676C7E;} + .d2-1157458919 .background-color-N3{background-color:#9499AB;} + .d2-1157458919 .background-color-N4{background-color:#CFD2DD;} + .d2-1157458919 .background-color-N5{background-color:#DEE1EB;} + .d2-1157458919 .background-color-N6{background-color:#EEF1F8;} + .d2-1157458919 .background-color-N7{background-color:#FFFFFF;} + .d2-1157458919 .background-color-B1{background-color:#0D32B2;} + .d2-1157458919 .background-color-B2{background-color:#0D32B2;} + .d2-1157458919 .background-color-B3{background-color:#E3E9FD;} + .d2-1157458919 .background-color-B4{background-color:#E3E9FD;} + .d2-1157458919 .background-color-B5{background-color:#EDF0FD;} + .d2-1157458919 .background-color-B6{background-color:#F7F8FE;} + .d2-1157458919 .background-color-AA2{background-color:#4A6FF3;} + .d2-1157458919 .background-color-AA4{background-color:#EDF0FD;} + .d2-1157458919 .background-color-AA5{background-color:#F7F8FE;} + .d2-1157458919 .background-color-AB4{background-color:#EDF0FD;} + .d2-1157458919 .background-color-AB5{background-color:#F7F8FE;} + .d2-1157458919 .color-N1{color:#0A0F25;} + .d2-1157458919 .color-N2{color:#676C7E;} + .d2-1157458919 .color-N3{color:#9499AB;} + .d2-1157458919 .color-N4{color:#CFD2DD;} + .d2-1157458919 .color-N5{color:#DEE1EB;} + .d2-1157458919 .color-N6{color:#EEF1F8;} + .d2-1157458919 .color-N7{color:#FFFFFF;} + .d2-1157458919 .color-B1{color:#0D32B2;} + .d2-1157458919 .color-B2{color:#0D32B2;} + .d2-1157458919 .color-B3{color:#E3E9FD;} + .d2-1157458919 .color-B4{color:#E3E9FD;} + .d2-1157458919 .color-B5{color:#EDF0FD;} + .d2-1157458919 .color-B6{color:#F7F8FE;} + .d2-1157458919 .color-AA2{color:#4A6FF3;} + .d2-1157458919 .color-AA4{color:#EDF0FD;} + .d2-1157458919 .color-AA5{color:#F7F8FE;} + .d2-1157458919 .color-AB4{color:#EDF0FD;} + .d2-1157458919 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>linkedtooltippedbothrectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloudrectangleexamplesquareexamplepageexampleparallelogramexampledocumentexamplecylinderexamplequeueexamplepackageexamplestepexamplecalloutexamplestored_dataexamplepersonexamplediamondexampleovalexamplecircleexamplehexagonexamplecloudexamplerectangleexamplesquareexamplepageexampleparallelogramexampledocumentexamplecylinderexamplequeueexamplepackageexamplestepexamplecalloutexamplestored_dataexamplepersonexamplediamondexampleovalexamplecircleexamplehexagonexamplecloudexample @@ -267,7 +267,7 @@ - + @@ -303,7 +303,7 @@ -example +example @@ -316,7 +316,7 @@ -example +example @@ -329,7 +329,7 @@ -example +example @@ -342,7 +342,7 @@ -example +example @@ -355,7 +355,7 @@ -example +example @@ -368,7 +368,7 @@ -example +example @@ -381,7 +381,7 @@ -example +example @@ -394,7 +394,7 @@ -example +example @@ -407,7 +407,7 @@ -example +example @@ -420,7 +420,7 @@ -example +example @@ -433,7 +433,7 @@ -example +example @@ -446,7 +446,7 @@ -example +example @@ -459,7 +459,7 @@ -example +example @@ -472,7 +472,7 @@ -example +example @@ -485,7 +485,7 @@ -example +example @@ -498,7 +498,7 @@ -example +example @@ -511,7 +511,7 @@ -example +example @@ -524,7 +524,7 @@ -example +example @@ -537,7 +537,7 @@ - + @@ -549,7 +549,7 @@ -example +example @@ -562,7 +562,7 @@ - + @@ -574,7 +574,7 @@ -example +example @@ -587,7 +587,7 @@ - + @@ -599,7 +599,7 @@ -example +example @@ -612,7 +612,7 @@ - + @@ -624,7 +624,7 @@ -example +example @@ -637,7 +637,7 @@ - + @@ -649,7 +649,7 @@ -example +example @@ -662,7 +662,7 @@ - + @@ -674,7 +674,7 @@ -example +example @@ -687,7 +687,7 @@ - + @@ -699,7 +699,7 @@ -example +example @@ -712,7 +712,7 @@ - + @@ -724,7 +724,7 @@ -example +example @@ -737,7 +737,7 @@ - + @@ -749,7 +749,7 @@ -example +example @@ -762,7 +762,7 @@ - + @@ -774,7 +774,7 @@ -example +example @@ -787,7 +787,7 @@ - + @@ -799,7 +799,7 @@ -example +example @@ -812,7 +812,7 @@ - + @@ -824,7 +824,7 @@ -example +example @@ -837,7 +837,7 @@ - + @@ -849,7 +849,7 @@ -example +example @@ -862,7 +862,7 @@ - + @@ -874,7 +874,7 @@ -example +example @@ -887,7 +887,7 @@ - + @@ -899,7 +899,7 @@ -example +example @@ -912,7 +912,7 @@ - + @@ -924,7 +924,7 @@ -example +example @@ -937,7 +937,7 @@ - + @@ -949,11 +949,11 @@ - - + + - - + + @@ -968,41 +968,41 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/all_shapes_multiple/dagre/board.exp.json b/e2etests/testdata/stable/all_shapes_multiple/dagre/board.exp.json index d36e36dcbb..a72669e541 100644 --- a/e2etests/testdata/stable/all_shapes_multiple/dagre/board.exp.json +++ b/e2etests/testdata/stable/all_shapes_multiple/dagre/board.exp.json @@ -581,11 +581,11 @@ "id": "circle", "type": "oval", "pos": { - "x": 845, - "y": 400 + "x": 839, + "y": 394 }, - "width": 91, - "height": 91, + "width": 103, + "height": 103, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1159,11 +1159,11 @@ }, { "x": 890, - "y": 347 + "y": 345.79998779296875 }, { "x": 890, - "y": 391 + "y": 385 } ], "isCurve": true, diff --git a/e2etests/testdata/stable/all_shapes_multiple/dagre/sketch.exp.svg b/e2etests/testdata/stable/all_shapes_multiple/dagre/sketch.exp.svg index 94523fb11c..14f70b1252 100644 --- a/e2etests/testdata/stable/all_shapes_multiple/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/all_shapes_multiple/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud + .d2-1828723469 .fill-N1{fill:#0A0F25;} + .d2-1828723469 .fill-N2{fill:#676C7E;} + .d2-1828723469 .fill-N3{fill:#9499AB;} + .d2-1828723469 .fill-N4{fill:#CFD2DD;} + .d2-1828723469 .fill-N5{fill:#DEE1EB;} + .d2-1828723469 .fill-N6{fill:#EEF1F8;} + .d2-1828723469 .fill-N7{fill:#FFFFFF;} + .d2-1828723469 .fill-B1{fill:#0D32B2;} + .d2-1828723469 .fill-B2{fill:#0D32B2;} + .d2-1828723469 .fill-B3{fill:#E3E9FD;} + .d2-1828723469 .fill-B4{fill:#E3E9FD;} + .d2-1828723469 .fill-B5{fill:#EDF0FD;} + .d2-1828723469 .fill-B6{fill:#F7F8FE;} + .d2-1828723469 .fill-AA2{fill:#4A6FF3;} + .d2-1828723469 .fill-AA4{fill:#EDF0FD;} + .d2-1828723469 .fill-AA5{fill:#F7F8FE;} + .d2-1828723469 .fill-AB4{fill:#EDF0FD;} + .d2-1828723469 .fill-AB5{fill:#F7F8FE;} + .d2-1828723469 .stroke-N1{stroke:#0A0F25;} + .d2-1828723469 .stroke-N2{stroke:#676C7E;} + .d2-1828723469 .stroke-N3{stroke:#9499AB;} + .d2-1828723469 .stroke-N4{stroke:#CFD2DD;} + .d2-1828723469 .stroke-N5{stroke:#DEE1EB;} + .d2-1828723469 .stroke-N6{stroke:#EEF1F8;} + .d2-1828723469 .stroke-N7{stroke:#FFFFFF;} + .d2-1828723469 .stroke-B1{stroke:#0D32B2;} + .d2-1828723469 .stroke-B2{stroke:#0D32B2;} + .d2-1828723469 .stroke-B3{stroke:#E3E9FD;} + .d2-1828723469 .stroke-B4{stroke:#E3E9FD;} + .d2-1828723469 .stroke-B5{stroke:#EDF0FD;} + .d2-1828723469 .stroke-B6{stroke:#F7F8FE;} + .d2-1828723469 .stroke-AA2{stroke:#4A6FF3;} + .d2-1828723469 .stroke-AA4{stroke:#EDF0FD;} + .d2-1828723469 .stroke-AA5{stroke:#F7F8FE;} + .d2-1828723469 .stroke-AB4{stroke:#EDF0FD;} + .d2-1828723469 .stroke-AB5{stroke:#F7F8FE;} + .d2-1828723469 .background-color-N1{background-color:#0A0F25;} + .d2-1828723469 .background-color-N2{background-color:#676C7E;} + .d2-1828723469 .background-color-N3{background-color:#9499AB;} + .d2-1828723469 .background-color-N4{background-color:#CFD2DD;} + .d2-1828723469 .background-color-N5{background-color:#DEE1EB;} + .d2-1828723469 .background-color-N6{background-color:#EEF1F8;} + .d2-1828723469 .background-color-N7{background-color:#FFFFFF;} + .d2-1828723469 .background-color-B1{background-color:#0D32B2;} + .d2-1828723469 .background-color-B2{background-color:#0D32B2;} + .d2-1828723469 .background-color-B3{background-color:#E3E9FD;} + .d2-1828723469 .background-color-B4{background-color:#E3E9FD;} + .d2-1828723469 .background-color-B5{background-color:#EDF0FD;} + .d2-1828723469 .background-color-B6{background-color:#F7F8FE;} + .d2-1828723469 .background-color-AA2{background-color:#4A6FF3;} + .d2-1828723469 .background-color-AA4{background-color:#EDF0FD;} + .d2-1828723469 .background-color-AA5{background-color:#F7F8FE;} + .d2-1828723469 .background-color-AB4{background-color:#EDF0FD;} + .d2-1828723469 .background-color-AB5{background-color:#F7F8FE;} + .d2-1828723469 .color-N1{color:#0A0F25;} + .d2-1828723469 .color-N2{color:#676C7E;} + .d2-1828723469 .color-N3{color:#9499AB;} + .d2-1828723469 .color-N4{color:#CFD2DD;} + .d2-1828723469 .color-N5{color:#DEE1EB;} + .d2-1828723469 .color-N6{color:#EEF1F8;} + .d2-1828723469 .color-N7{color:#FFFFFF;} + .d2-1828723469 .color-B1{color:#0D32B2;} + .d2-1828723469 .color-B2{color:#0D32B2;} + .d2-1828723469 .color-B3{color:#E3E9FD;} + .d2-1828723469 .color-B4{color:#E3E9FD;} + .d2-1828723469 .color-B5{color:#EDF0FD;} + .d2-1828723469 .color-B6{color:#F7F8FE;} + .d2-1828723469 .color-AA2{color:#4A6FF3;} + .d2-1828723469 .color-AA4{color:#EDF0FD;} + .d2-1828723469 .color-AA5{color:#F7F8FE;} + .d2-1828723469 .color-AB4{color:#EDF0FD;} + .d2-1828723469 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud diff --git a/e2etests/testdata/stable/all_shapes_multiple/elk/board.exp.json b/e2etests/testdata/stable/all_shapes_multiple/elk/board.exp.json index da3e013e0e..00e23b0c75 100644 --- a/e2etests/testdata/stable/all_shapes_multiple/elk/board.exp.json +++ b/e2etests/testdata/stable/all_shapes_multiple/elk/board.exp.json @@ -581,11 +581,11 @@ "id": "circle", "type": "oval", "pos": { - "x": 716, + "x": 710, "y": 368 }, - "width": 91, - "height": 91, + "width": 103, + "height": 103, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, diff --git a/e2etests/testdata/stable/all_shapes_multiple/elk/sketch.exp.svg b/e2etests/testdata/stable/all_shapes_multiple/elk/sketch.exp.svg index 1260408d67..a471046eaf 100644 --- a/e2etests/testdata/stable/all_shapes_multiple/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/all_shapes_multiple/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud + .d2-1496442247 .fill-N1{fill:#0A0F25;} + .d2-1496442247 .fill-N2{fill:#676C7E;} + .d2-1496442247 .fill-N3{fill:#9499AB;} + .d2-1496442247 .fill-N4{fill:#CFD2DD;} + .d2-1496442247 .fill-N5{fill:#DEE1EB;} + .d2-1496442247 .fill-N6{fill:#EEF1F8;} + .d2-1496442247 .fill-N7{fill:#FFFFFF;} + .d2-1496442247 .fill-B1{fill:#0D32B2;} + .d2-1496442247 .fill-B2{fill:#0D32B2;} + .d2-1496442247 .fill-B3{fill:#E3E9FD;} + .d2-1496442247 .fill-B4{fill:#E3E9FD;} + .d2-1496442247 .fill-B5{fill:#EDF0FD;} + .d2-1496442247 .fill-B6{fill:#F7F8FE;} + .d2-1496442247 .fill-AA2{fill:#4A6FF3;} + .d2-1496442247 .fill-AA4{fill:#EDF0FD;} + .d2-1496442247 .fill-AA5{fill:#F7F8FE;} + .d2-1496442247 .fill-AB4{fill:#EDF0FD;} + .d2-1496442247 .fill-AB5{fill:#F7F8FE;} + .d2-1496442247 .stroke-N1{stroke:#0A0F25;} + .d2-1496442247 .stroke-N2{stroke:#676C7E;} + .d2-1496442247 .stroke-N3{stroke:#9499AB;} + .d2-1496442247 .stroke-N4{stroke:#CFD2DD;} + .d2-1496442247 .stroke-N5{stroke:#DEE1EB;} + .d2-1496442247 .stroke-N6{stroke:#EEF1F8;} + .d2-1496442247 .stroke-N7{stroke:#FFFFFF;} + .d2-1496442247 .stroke-B1{stroke:#0D32B2;} + .d2-1496442247 .stroke-B2{stroke:#0D32B2;} + .d2-1496442247 .stroke-B3{stroke:#E3E9FD;} + .d2-1496442247 .stroke-B4{stroke:#E3E9FD;} + .d2-1496442247 .stroke-B5{stroke:#EDF0FD;} + .d2-1496442247 .stroke-B6{stroke:#F7F8FE;} + .d2-1496442247 .stroke-AA2{stroke:#4A6FF3;} + .d2-1496442247 .stroke-AA4{stroke:#EDF0FD;} + .d2-1496442247 .stroke-AA5{stroke:#F7F8FE;} + .d2-1496442247 .stroke-AB4{stroke:#EDF0FD;} + .d2-1496442247 .stroke-AB5{stroke:#F7F8FE;} + .d2-1496442247 .background-color-N1{background-color:#0A0F25;} + .d2-1496442247 .background-color-N2{background-color:#676C7E;} + .d2-1496442247 .background-color-N3{background-color:#9499AB;} + .d2-1496442247 .background-color-N4{background-color:#CFD2DD;} + .d2-1496442247 .background-color-N5{background-color:#DEE1EB;} + .d2-1496442247 .background-color-N6{background-color:#EEF1F8;} + .d2-1496442247 .background-color-N7{background-color:#FFFFFF;} + .d2-1496442247 .background-color-B1{background-color:#0D32B2;} + .d2-1496442247 .background-color-B2{background-color:#0D32B2;} + .d2-1496442247 .background-color-B3{background-color:#E3E9FD;} + .d2-1496442247 .background-color-B4{background-color:#E3E9FD;} + .d2-1496442247 .background-color-B5{background-color:#EDF0FD;} + .d2-1496442247 .background-color-B6{background-color:#F7F8FE;} + .d2-1496442247 .background-color-AA2{background-color:#4A6FF3;} + .d2-1496442247 .background-color-AA4{background-color:#EDF0FD;} + .d2-1496442247 .background-color-AA5{background-color:#F7F8FE;} + .d2-1496442247 .background-color-AB4{background-color:#EDF0FD;} + .d2-1496442247 .background-color-AB5{background-color:#F7F8FE;} + .d2-1496442247 .color-N1{color:#0A0F25;} + .d2-1496442247 .color-N2{color:#676C7E;} + .d2-1496442247 .color-N3{color:#9499AB;} + .d2-1496442247 .color-N4{color:#CFD2DD;} + .d2-1496442247 .color-N5{color:#DEE1EB;} + .d2-1496442247 .color-N6{color:#EEF1F8;} + .d2-1496442247 .color-N7{color:#FFFFFF;} + .d2-1496442247 .color-B1{color:#0D32B2;} + .d2-1496442247 .color-B2{color:#0D32B2;} + .d2-1496442247 .color-B3{color:#E3E9FD;} + .d2-1496442247 .color-B4{color:#E3E9FD;} + .d2-1496442247 .color-B5{color:#EDF0FD;} + .d2-1496442247 .color-B6{color:#F7F8FE;} + .d2-1496442247 .color-AA2{color:#4A6FF3;} + .d2-1496442247 .color-AA4{color:#EDF0FD;} + .d2-1496442247 .color-AA5{color:#F7F8FE;} + .d2-1496442247 .color-AB4{color:#EDF0FD;} + .d2-1496442247 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud @@ -105,7 +105,7 @@ - + \ No newline at end of file diff --git a/e2etests/testdata/stable/all_shapes_shadow/dagre/board.exp.json b/e2etests/testdata/stable/all_shapes_shadow/dagre/board.exp.json index df40e65bd4..05aed55eac 100644 --- a/e2etests/testdata/stable/all_shapes_shadow/dagre/board.exp.json +++ b/e2etests/testdata/stable/all_shapes_shadow/dagre/board.exp.json @@ -581,11 +581,11 @@ "id": "circle", "type": "oval", "pos": { - "x": 825, - "y": 400 + "x": 819, + "y": 394 }, - "width": 91, - "height": 91, + "width": 103, + "height": 103, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1159,11 +1159,11 @@ }, { "x": 870, - "y": 348.79998779296875 + "y": 347.6000061035156 }, { "x": 870, - "y": 400 + "y": 394 } ], "isCurve": true, diff --git a/e2etests/testdata/stable/all_shapes_shadow/dagre/sketch.exp.svg b/e2etests/testdata/stable/all_shapes_shadow/dagre/sketch.exp.svg index 02c689e2b2..1bdb08b982 100644 --- a/e2etests/testdata/stable/all_shapes_shadow/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/all_shapes_shadow/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ - + .d2-2623675089 .fill-N1{fill:#0A0F25;} + .d2-2623675089 .fill-N2{fill:#676C7E;} + .d2-2623675089 .fill-N3{fill:#9499AB;} + .d2-2623675089 .fill-N4{fill:#CFD2DD;} + .d2-2623675089 .fill-N5{fill:#DEE1EB;} + .d2-2623675089 .fill-N6{fill:#EEF1F8;} + .d2-2623675089 .fill-N7{fill:#FFFFFF;} + .d2-2623675089 .fill-B1{fill:#0D32B2;} + .d2-2623675089 .fill-B2{fill:#0D32B2;} + .d2-2623675089 .fill-B3{fill:#E3E9FD;} + .d2-2623675089 .fill-B4{fill:#E3E9FD;} + .d2-2623675089 .fill-B5{fill:#EDF0FD;} + .d2-2623675089 .fill-B6{fill:#F7F8FE;} + .d2-2623675089 .fill-AA2{fill:#4A6FF3;} + .d2-2623675089 .fill-AA4{fill:#EDF0FD;} + .d2-2623675089 .fill-AA5{fill:#F7F8FE;} + .d2-2623675089 .fill-AB4{fill:#EDF0FD;} + .d2-2623675089 .fill-AB5{fill:#F7F8FE;} + .d2-2623675089 .stroke-N1{stroke:#0A0F25;} + .d2-2623675089 .stroke-N2{stroke:#676C7E;} + .d2-2623675089 .stroke-N3{stroke:#9499AB;} + .d2-2623675089 .stroke-N4{stroke:#CFD2DD;} + .d2-2623675089 .stroke-N5{stroke:#DEE1EB;} + .d2-2623675089 .stroke-N6{stroke:#EEF1F8;} + .d2-2623675089 .stroke-N7{stroke:#FFFFFF;} + .d2-2623675089 .stroke-B1{stroke:#0D32B2;} + .d2-2623675089 .stroke-B2{stroke:#0D32B2;} + .d2-2623675089 .stroke-B3{stroke:#E3E9FD;} + .d2-2623675089 .stroke-B4{stroke:#E3E9FD;} + .d2-2623675089 .stroke-B5{stroke:#EDF0FD;} + .d2-2623675089 .stroke-B6{stroke:#F7F8FE;} + .d2-2623675089 .stroke-AA2{stroke:#4A6FF3;} + .d2-2623675089 .stroke-AA4{stroke:#EDF0FD;} + .d2-2623675089 .stroke-AA5{stroke:#F7F8FE;} + .d2-2623675089 .stroke-AB4{stroke:#EDF0FD;} + .d2-2623675089 .stroke-AB5{stroke:#F7F8FE;} + .d2-2623675089 .background-color-N1{background-color:#0A0F25;} + .d2-2623675089 .background-color-N2{background-color:#676C7E;} + .d2-2623675089 .background-color-N3{background-color:#9499AB;} + .d2-2623675089 .background-color-N4{background-color:#CFD2DD;} + .d2-2623675089 .background-color-N5{background-color:#DEE1EB;} + .d2-2623675089 .background-color-N6{background-color:#EEF1F8;} + .d2-2623675089 .background-color-N7{background-color:#FFFFFF;} + .d2-2623675089 .background-color-B1{background-color:#0D32B2;} + .d2-2623675089 .background-color-B2{background-color:#0D32B2;} + .d2-2623675089 .background-color-B3{background-color:#E3E9FD;} + .d2-2623675089 .background-color-B4{background-color:#E3E9FD;} + .d2-2623675089 .background-color-B5{background-color:#EDF0FD;} + .d2-2623675089 .background-color-B6{background-color:#F7F8FE;} + .d2-2623675089 .background-color-AA2{background-color:#4A6FF3;} + .d2-2623675089 .background-color-AA4{background-color:#EDF0FD;} + .d2-2623675089 .background-color-AA5{background-color:#F7F8FE;} + .d2-2623675089 .background-color-AB4{background-color:#EDF0FD;} + .d2-2623675089 .background-color-AB5{background-color:#F7F8FE;} + .d2-2623675089 .color-N1{color:#0A0F25;} + .d2-2623675089 .color-N2{color:#676C7E;} + .d2-2623675089 .color-N3{color:#9499AB;} + .d2-2623675089 .color-N4{color:#CFD2DD;} + .d2-2623675089 .color-N5{color:#DEE1EB;} + .d2-2623675089 .color-N6{color:#EEF1F8;} + .d2-2623675089 .color-N7{color:#FFFFFF;} + .d2-2623675089 .color-B1{color:#0D32B2;} + .d2-2623675089 .color-B2{color:#0D32B2;} + .d2-2623675089 .color-B3{color:#E3E9FD;} + .d2-2623675089 .color-B4{color:#E3E9FD;} + .d2-2623675089 .color-B5{color:#EDF0FD;} + .d2-2623675089 .color-B6{color:#F7F8FE;} + .d2-2623675089 .color-AA2{color:#4A6FF3;} + .d2-2623675089 .color-AA4{color:#EDF0FD;} + .d2-2623675089 .color-AA5{color:#F7F8FE;} + .d2-2623675089 .color-AB4{color:#EDF0FD;} + .d2-2623675089 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]> @@ -97,7 +97,7 @@ -rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud +rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud diff --git a/e2etests/testdata/stable/all_shapes_shadow/elk/board.exp.json b/e2etests/testdata/stable/all_shapes_shadow/elk/board.exp.json index b1404b8027..1141238984 100644 --- a/e2etests/testdata/stable/all_shapes_shadow/elk/board.exp.json +++ b/e2etests/testdata/stable/all_shapes_shadow/elk/board.exp.json @@ -581,11 +581,11 @@ "id": "circle", "type": "oval", "pos": { - "x": 676, + "x": 670, "y": 338 }, - "width": 91, - "height": 91, + "width": 103, + "height": 103, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, diff --git a/e2etests/testdata/stable/all_shapes_shadow/elk/sketch.exp.svg b/e2etests/testdata/stable/all_shapes_shadow/elk/sketch.exp.svg index 85280ac83b..76d136e019 100644 --- a/e2etests/testdata/stable/all_shapes_shadow/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/all_shapes_shadow/elk/sketch.exp.svg @@ -1,9 +1,9 @@ - + .d2-576273369 .fill-N1{fill:#0A0F25;} + .d2-576273369 .fill-N2{fill:#676C7E;} + .d2-576273369 .fill-N3{fill:#9499AB;} + .d2-576273369 .fill-N4{fill:#CFD2DD;} + .d2-576273369 .fill-N5{fill:#DEE1EB;} + .d2-576273369 .fill-N6{fill:#EEF1F8;} + .d2-576273369 .fill-N7{fill:#FFFFFF;} + .d2-576273369 .fill-B1{fill:#0D32B2;} + .d2-576273369 .fill-B2{fill:#0D32B2;} + .d2-576273369 .fill-B3{fill:#E3E9FD;} + .d2-576273369 .fill-B4{fill:#E3E9FD;} + .d2-576273369 .fill-B5{fill:#EDF0FD;} + .d2-576273369 .fill-B6{fill:#F7F8FE;} + .d2-576273369 .fill-AA2{fill:#4A6FF3;} + .d2-576273369 .fill-AA4{fill:#EDF0FD;} + .d2-576273369 .fill-AA5{fill:#F7F8FE;} + .d2-576273369 .fill-AB4{fill:#EDF0FD;} + .d2-576273369 .fill-AB5{fill:#F7F8FE;} + .d2-576273369 .stroke-N1{stroke:#0A0F25;} + .d2-576273369 .stroke-N2{stroke:#676C7E;} + .d2-576273369 .stroke-N3{stroke:#9499AB;} + .d2-576273369 .stroke-N4{stroke:#CFD2DD;} + .d2-576273369 .stroke-N5{stroke:#DEE1EB;} + .d2-576273369 .stroke-N6{stroke:#EEF1F8;} + .d2-576273369 .stroke-N7{stroke:#FFFFFF;} + .d2-576273369 .stroke-B1{stroke:#0D32B2;} + .d2-576273369 .stroke-B2{stroke:#0D32B2;} + .d2-576273369 .stroke-B3{stroke:#E3E9FD;} + .d2-576273369 .stroke-B4{stroke:#E3E9FD;} + .d2-576273369 .stroke-B5{stroke:#EDF0FD;} + .d2-576273369 .stroke-B6{stroke:#F7F8FE;} + .d2-576273369 .stroke-AA2{stroke:#4A6FF3;} + .d2-576273369 .stroke-AA4{stroke:#EDF0FD;} + .d2-576273369 .stroke-AA5{stroke:#F7F8FE;} + .d2-576273369 .stroke-AB4{stroke:#EDF0FD;} + .d2-576273369 .stroke-AB5{stroke:#F7F8FE;} + .d2-576273369 .background-color-N1{background-color:#0A0F25;} + .d2-576273369 .background-color-N2{background-color:#676C7E;} + .d2-576273369 .background-color-N3{background-color:#9499AB;} + .d2-576273369 .background-color-N4{background-color:#CFD2DD;} + .d2-576273369 .background-color-N5{background-color:#DEE1EB;} + .d2-576273369 .background-color-N6{background-color:#EEF1F8;} + .d2-576273369 .background-color-N7{background-color:#FFFFFF;} + .d2-576273369 .background-color-B1{background-color:#0D32B2;} + .d2-576273369 .background-color-B2{background-color:#0D32B2;} + .d2-576273369 .background-color-B3{background-color:#E3E9FD;} + .d2-576273369 .background-color-B4{background-color:#E3E9FD;} + .d2-576273369 .background-color-B5{background-color:#EDF0FD;} + .d2-576273369 .background-color-B6{background-color:#F7F8FE;} + .d2-576273369 .background-color-AA2{background-color:#4A6FF3;} + .d2-576273369 .background-color-AA4{background-color:#EDF0FD;} + .d2-576273369 .background-color-AA5{background-color:#F7F8FE;} + .d2-576273369 .background-color-AB4{background-color:#EDF0FD;} + .d2-576273369 .background-color-AB5{background-color:#F7F8FE;} + .d2-576273369 .color-N1{color:#0A0F25;} + .d2-576273369 .color-N2{color:#676C7E;} + .d2-576273369 .color-N3{color:#9499AB;} + .d2-576273369 .color-N4{color:#CFD2DD;} + .d2-576273369 .color-N5{color:#DEE1EB;} + .d2-576273369 .color-N6{color:#EEF1F8;} + .d2-576273369 .color-N7{color:#FFFFFF;} + .d2-576273369 .color-B1{color:#0D32B2;} + .d2-576273369 .color-B2{color:#0D32B2;} + .d2-576273369 .color-B3{color:#E3E9FD;} + .d2-576273369 .color-B4{color:#E3E9FD;} + .d2-576273369 .color-B5{color:#EDF0FD;} + .d2-576273369 .color-B6{color:#F7F8FE;} + .d2-576273369 .color-AA2{color:#4A6FF3;} + .d2-576273369 .color-AA4{color:#EDF0FD;} + .d2-576273369 .color-AA5{color:#F7F8FE;} + .d2-576273369 .color-AB4{color:#EDF0FD;} + .d2-576273369 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]> @@ -97,7 +97,7 @@ -rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud +rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud @@ -113,7 +113,7 @@ - + \ No newline at end of file diff --git a/e2etests/testdata/stable/chaos2/dagre/board.exp.json b/e2etests/testdata/stable/chaos2/dagre/board.exp.json index 6c41fddc7e..6ebf9adfcd 100644 --- a/e2etests/testdata/stable/chaos2/dagre/board.exp.json +++ b/e2etests/testdata/stable/chaos2/dagre/board.exp.json @@ -11,7 +11,7 @@ "y": 23 }, "width": 802, - "height": 1268, + "height": 1270, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -52,7 +52,7 @@ "y": 64 }, "width": 574, - "height": 1197, + "height": 1199, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -93,7 +93,7 @@ "y": 691 }, "width": 253, - "height": 540, + "height": 542, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -293,7 +293,7 @@ "type": "rectangle", "pos": { "x": 177, - "y": 1135 + "y": 1137 }, "width": 63, "height": 66, @@ -415,11 +415,11 @@ "id": "aa.bb.kk", "type": "oval", "pos": { - "x": 451, + "x": 450, "y": 1131 }, - "width": 74, - "height": 74, + "width": 77, + "height": 77, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -539,7 +539,7 @@ "type": "text", "pos": { "x": 633, - "y": 1158 + "y": 1159 }, "width": 16, "height": 21, @@ -579,7 +579,7 @@ "type": "rectangle", "pos": { "x": 709, - "y": 1135 + "y": 1137 }, "width": 63, "height": 66, @@ -697,12 +697,12 @@ "y": 1058.300048828125 }, { - "x": 183.5500030517578, - "y": 1083.5 + "x": 183.51600646972656, + "y": 1083.699951171875 }, { - "x": 198.75, - "y": 1135.5 + "x": 198.58299255371094, + "y": 1136.5 } ], "isCurve": true, diff --git a/e2etests/testdata/stable/chaos2/dagre/sketch.exp.svg b/e2etests/testdata/stable/chaos2/dagre/sketch.exp.svg index cf96409cea..4d92e89a14 100644 --- a/e2etests/testdata/stable/chaos2/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/chaos2/dagre/sketch.exp.svg @@ -1,23 +1,23 @@ -aabbllmmnnoocciikkddgghhjjeeff1122 334455667788 - +aabbllmmnnoocciikkddgghhjjeeff1122 334455667788 + - - + + - + - + - + diff --git a/e2etests/testdata/stable/chaos2/elk/board.exp.json b/e2etests/testdata/stable/chaos2/elk/board.exp.json index fe2d77e901..41bc1c8b24 100644 --- a/e2etests/testdata/stable/chaos2/elk/board.exp.json +++ b/e2etests/testdata/stable/chaos2/elk/board.exp.json @@ -415,11 +415,11 @@ "id": "aa.bb.kk", "type": "oval", "pos": { - "x": 323, - "y": 589 + "x": 322, + "y": 587 }, - "width": 74, - "height": 74, + "width": 77, + "height": 77, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, diff --git a/e2etests/testdata/stable/chaos2/elk/sketch.exp.svg b/e2etests/testdata/stable/chaos2/elk/sketch.exp.svg index 744d164231..8604fc3672 100644 --- a/e2etests/testdata/stable/chaos2/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/chaos2/elk/sketch.exp.svg @@ -1,23 +1,23 @@ -aabbllmmnnoocciikkddgghhjjeeff1122 334455667788 +aabbllmmnnoocciikkddgghhjjeeff1122 334455667788 @@ -849,7 +849,7 @@ - + diff --git a/e2etests/testdata/stable/classes/dagre/board.exp.json b/e2etests/testdata/stable/classes/dagre/board.exp.json index a775b89911..49f6bf8e6a 100644 --- a/e2etests/testdata/stable/classes/dagre/board.exp.json +++ b/e2etests/testdata/stable/classes/dagre/board.exp.json @@ -10,7 +10,7 @@ "dragon_ball" ], "pos": { - "x": 1, + "x": 10, "y": 0 }, "width": 50, @@ -53,11 +53,11 @@ "dragon_ball" ], "pos": { - "x": 1, + "x": 0, "y": 171 }, - "width": 50, - "height": 50, + "width": 70, + "height": 70, "opacity": 1, "strokeDash": 0, "strokeWidth": 0, @@ -98,10 +98,10 @@ ], "pos": { "x": 0, - "y": 342 + "y": 362 }, - "width": 52, - "height": 52, + "width": 70, + "height": 70, "opacity": 1, "strokeDash": 0, "strokeWidth": 0, @@ -164,19 +164,19 @@ "labelPercentage": 0, "route": [ { - "x": 26, + "x": 35, "y": 50 }, { - "x": 26, + "x": 35, "y": 98.4000015258789 }, { - "x": 26, + "x": 35, "y": 122.5999984741211 }, { - "x": 26, + "x": 35, "y": 171 } ], @@ -214,20 +214,20 @@ "labelPercentage": 0, "route": [ { - "x": 26, - "y": 221 + "x": 35, + "y": 241 }, { - "x": 26, - "y": 269.3999938964844 + "x": 35, + "y": 289.3999938964844 }, { - "x": 26, - "y": 293.6000061035156 + "x": 35, + "y": 313.6000061035156 }, { - "x": 26, - "y": 342 + "x": 35, + "y": 362 } ], "isCurve": true, diff --git a/e2etests/testdata/stable/classes/dagre/sketch.exp.svg b/e2etests/testdata/stable/classes/dagre/sketch.exp.svg index 72d61f3dce..69066516a1 100644 --- a/e2etests/testdata/stable/classes/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/classes/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -*** thenthen - - - - - + .d2-107579682 .fill-N1{fill:#0A0F25;} + .d2-107579682 .fill-N2{fill:#676C7E;} + .d2-107579682 .fill-N3{fill:#9499AB;} + .d2-107579682 .fill-N4{fill:#CFD2DD;} + .d2-107579682 .fill-N5{fill:#DEE1EB;} + .d2-107579682 .fill-N6{fill:#EEF1F8;} + .d2-107579682 .fill-N7{fill:#FFFFFF;} + .d2-107579682 .fill-B1{fill:#0D32B2;} + .d2-107579682 .fill-B2{fill:#0D32B2;} + .d2-107579682 .fill-B3{fill:#E3E9FD;} + .d2-107579682 .fill-B4{fill:#E3E9FD;} + .d2-107579682 .fill-B5{fill:#EDF0FD;} + .d2-107579682 .fill-B6{fill:#F7F8FE;} + .d2-107579682 .fill-AA2{fill:#4A6FF3;} + .d2-107579682 .fill-AA4{fill:#EDF0FD;} + .d2-107579682 .fill-AA5{fill:#F7F8FE;} + .d2-107579682 .fill-AB4{fill:#EDF0FD;} + .d2-107579682 .fill-AB5{fill:#F7F8FE;} + .d2-107579682 .stroke-N1{stroke:#0A0F25;} + .d2-107579682 .stroke-N2{stroke:#676C7E;} + .d2-107579682 .stroke-N3{stroke:#9499AB;} + .d2-107579682 .stroke-N4{stroke:#CFD2DD;} + .d2-107579682 .stroke-N5{stroke:#DEE1EB;} + .d2-107579682 .stroke-N6{stroke:#EEF1F8;} + .d2-107579682 .stroke-N7{stroke:#FFFFFF;} + .d2-107579682 .stroke-B1{stroke:#0D32B2;} + .d2-107579682 .stroke-B2{stroke:#0D32B2;} + .d2-107579682 .stroke-B3{stroke:#E3E9FD;} + .d2-107579682 .stroke-B4{stroke:#E3E9FD;} + .d2-107579682 .stroke-B5{stroke:#EDF0FD;} + .d2-107579682 .stroke-B6{stroke:#F7F8FE;} + .d2-107579682 .stroke-AA2{stroke:#4A6FF3;} + .d2-107579682 .stroke-AA4{stroke:#EDF0FD;} + .d2-107579682 .stroke-AA5{stroke:#F7F8FE;} + .d2-107579682 .stroke-AB4{stroke:#EDF0FD;} + .d2-107579682 .stroke-AB5{stroke:#F7F8FE;} + .d2-107579682 .background-color-N1{background-color:#0A0F25;} + .d2-107579682 .background-color-N2{background-color:#676C7E;} + .d2-107579682 .background-color-N3{background-color:#9499AB;} + .d2-107579682 .background-color-N4{background-color:#CFD2DD;} + .d2-107579682 .background-color-N5{background-color:#DEE1EB;} + .d2-107579682 .background-color-N6{background-color:#EEF1F8;} + .d2-107579682 .background-color-N7{background-color:#FFFFFF;} + .d2-107579682 .background-color-B1{background-color:#0D32B2;} + .d2-107579682 .background-color-B2{background-color:#0D32B2;} + .d2-107579682 .background-color-B3{background-color:#E3E9FD;} + .d2-107579682 .background-color-B4{background-color:#E3E9FD;} + .d2-107579682 .background-color-B5{background-color:#EDF0FD;} + .d2-107579682 .background-color-B6{background-color:#F7F8FE;} + .d2-107579682 .background-color-AA2{background-color:#4A6FF3;} + .d2-107579682 .background-color-AA4{background-color:#EDF0FD;} + .d2-107579682 .background-color-AA5{background-color:#F7F8FE;} + .d2-107579682 .background-color-AB4{background-color:#EDF0FD;} + .d2-107579682 .background-color-AB5{background-color:#F7F8FE;} + .d2-107579682 .color-N1{color:#0A0F25;} + .d2-107579682 .color-N2{color:#676C7E;} + .d2-107579682 .color-N3{color:#9499AB;} + .d2-107579682 .color-N4{color:#CFD2DD;} + .d2-107579682 .color-N5{color:#DEE1EB;} + .d2-107579682 .color-N6{color:#EEF1F8;} + .d2-107579682 .color-N7{color:#FFFFFF;} + .d2-107579682 .color-B1{color:#0D32B2;} + .d2-107579682 .color-B2{color:#0D32B2;} + .d2-107579682 .color-B3{color:#E3E9FD;} + .d2-107579682 .color-B4{color:#E3E9FD;} + .d2-107579682 .color-B5{color:#EDF0FD;} + .d2-107579682 .color-B6{color:#F7F8FE;} + .d2-107579682 .color-AA2{color:#4A6FF3;} + .d2-107579682 .color-AA4{color:#EDF0FD;} + .d2-107579682 .color-AA5{color:#F7F8FE;} + .d2-107579682 .color-AB4{color:#EDF0FD;} + .d2-107579682 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>*** thenthen + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/classes/elk/board.exp.json b/e2etests/testdata/stable/classes/elk/board.exp.json index ce9979ffa4..d496941ec2 100644 --- a/e2etests/testdata/stable/classes/elk/board.exp.json +++ b/e2etests/testdata/stable/classes/elk/board.exp.json @@ -10,7 +10,7 @@ "dragon_ball" ], "pos": { - "x": 13, + "x": 22, "y": 12 }, "width": 50, @@ -53,11 +53,11 @@ "dragon_ball" ], "pos": { - "x": 13, + "x": 12, "y": 223 }, - "width": 50, - "height": 50, + "width": 70, + "height": 70, "opacity": 1, "strokeDash": 0, "strokeWidth": 0, @@ -98,10 +98,10 @@ ], "pos": { "x": 12, - "y": 434 + "y": 454 }, - "width": 52, - "height": 52, + "width": 70, + "height": 70, "opacity": 1, "strokeDash": 0, "strokeWidth": 0, @@ -164,11 +164,11 @@ "labelPercentage": 0, "route": [ { - "x": 38, + "x": 47, "y": 62 }, { - "x": 38, + "x": 47, "y": 223 } ], @@ -205,12 +205,12 @@ "labelPercentage": 0, "route": [ { - "x": 38, - "y": 273 + "x": 47, + "y": 293 }, { - "x": 38, - "y": 434 + "x": 47, + "y": 454 } ], "animated": false, diff --git a/e2etests/testdata/stable/classes/elk/sketch.exp.svg b/e2etests/testdata/stable/classes/elk/sketch.exp.svg index d64a1f5986..e3513713a4 100644 --- a/e2etests/testdata/stable/classes/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/classes/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -*** thenthen - - - - - + .d2-3768899376 .fill-N1{fill:#0A0F25;} + .d2-3768899376 .fill-N2{fill:#676C7E;} + .d2-3768899376 .fill-N3{fill:#9499AB;} + .d2-3768899376 .fill-N4{fill:#CFD2DD;} + .d2-3768899376 .fill-N5{fill:#DEE1EB;} + .d2-3768899376 .fill-N6{fill:#EEF1F8;} + .d2-3768899376 .fill-N7{fill:#FFFFFF;} + .d2-3768899376 .fill-B1{fill:#0D32B2;} + .d2-3768899376 .fill-B2{fill:#0D32B2;} + .d2-3768899376 .fill-B3{fill:#E3E9FD;} + .d2-3768899376 .fill-B4{fill:#E3E9FD;} + .d2-3768899376 .fill-B5{fill:#EDF0FD;} + .d2-3768899376 .fill-B6{fill:#F7F8FE;} + .d2-3768899376 .fill-AA2{fill:#4A6FF3;} + .d2-3768899376 .fill-AA4{fill:#EDF0FD;} + .d2-3768899376 .fill-AA5{fill:#F7F8FE;} + .d2-3768899376 .fill-AB4{fill:#EDF0FD;} + .d2-3768899376 .fill-AB5{fill:#F7F8FE;} + .d2-3768899376 .stroke-N1{stroke:#0A0F25;} + .d2-3768899376 .stroke-N2{stroke:#676C7E;} + .d2-3768899376 .stroke-N3{stroke:#9499AB;} + .d2-3768899376 .stroke-N4{stroke:#CFD2DD;} + .d2-3768899376 .stroke-N5{stroke:#DEE1EB;} + .d2-3768899376 .stroke-N6{stroke:#EEF1F8;} + .d2-3768899376 .stroke-N7{stroke:#FFFFFF;} + .d2-3768899376 .stroke-B1{stroke:#0D32B2;} + .d2-3768899376 .stroke-B2{stroke:#0D32B2;} + .d2-3768899376 .stroke-B3{stroke:#E3E9FD;} + .d2-3768899376 .stroke-B4{stroke:#E3E9FD;} + .d2-3768899376 .stroke-B5{stroke:#EDF0FD;} + .d2-3768899376 .stroke-B6{stroke:#F7F8FE;} + .d2-3768899376 .stroke-AA2{stroke:#4A6FF3;} + .d2-3768899376 .stroke-AA4{stroke:#EDF0FD;} + .d2-3768899376 .stroke-AA5{stroke:#F7F8FE;} + .d2-3768899376 .stroke-AB4{stroke:#EDF0FD;} + .d2-3768899376 .stroke-AB5{stroke:#F7F8FE;} + .d2-3768899376 .background-color-N1{background-color:#0A0F25;} + .d2-3768899376 .background-color-N2{background-color:#676C7E;} + .d2-3768899376 .background-color-N3{background-color:#9499AB;} + .d2-3768899376 .background-color-N4{background-color:#CFD2DD;} + .d2-3768899376 .background-color-N5{background-color:#DEE1EB;} + .d2-3768899376 .background-color-N6{background-color:#EEF1F8;} + .d2-3768899376 .background-color-N7{background-color:#FFFFFF;} + .d2-3768899376 .background-color-B1{background-color:#0D32B2;} + .d2-3768899376 .background-color-B2{background-color:#0D32B2;} + .d2-3768899376 .background-color-B3{background-color:#E3E9FD;} + .d2-3768899376 .background-color-B4{background-color:#E3E9FD;} + .d2-3768899376 .background-color-B5{background-color:#EDF0FD;} + .d2-3768899376 .background-color-B6{background-color:#F7F8FE;} + .d2-3768899376 .background-color-AA2{background-color:#4A6FF3;} + .d2-3768899376 .background-color-AA4{background-color:#EDF0FD;} + .d2-3768899376 .background-color-AA5{background-color:#F7F8FE;} + .d2-3768899376 .background-color-AB4{background-color:#EDF0FD;} + .d2-3768899376 .background-color-AB5{background-color:#F7F8FE;} + .d2-3768899376 .color-N1{color:#0A0F25;} + .d2-3768899376 .color-N2{color:#676C7E;} + .d2-3768899376 .color-N3{color:#9499AB;} + .d2-3768899376 .color-N4{color:#CFD2DD;} + .d2-3768899376 .color-N5{color:#DEE1EB;} + .d2-3768899376 .color-N6{color:#EEF1F8;} + .d2-3768899376 .color-N7{color:#FFFFFF;} + .d2-3768899376 .color-B1{color:#0D32B2;} + .d2-3768899376 .color-B2{color:#0D32B2;} + .d2-3768899376 .color-B3{color:#E3E9FD;} + .d2-3768899376 .color-B4{color:#E3E9FD;} + .d2-3768899376 .color-B5{color:#EDF0FD;} + .d2-3768899376 .color-B6{color:#F7F8FE;} + .d2-3768899376 .color-AA2{color:#4A6FF3;} + .d2-3768899376 .color-AA4{color:#EDF0FD;} + .d2-3768899376 .color-AA5{color:#F7F8FE;} + .d2-3768899376 .color-AB4{color:#EDF0FD;} + .d2-3768899376 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>*** thenthen + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/grid_edge_across_cell/dagre/board.exp.json b/e2etests/testdata/stable/grid_edge_across_cell/dagre/board.exp.json index 3b915476a4..d2cd110232 100644 --- a/e2etests/testdata/stable/grid_edge_across_cell/dagre/board.exp.json +++ b/e2etests/testdata/stable/grid_edge_across_cell/dagre/board.exp.json @@ -484,11 +484,11 @@ "labelPercentage": 0, "route": [ { - "x": 66.5, + "x": 66.875, "y": 178 }, { - "x": 66.5, + "x": 66.875, "y": 364 } ], @@ -525,11 +525,11 @@ "labelPercentage": 0, "route": [ { - "x": 93.25, + "x": 93.625, "y": 367 }, { - "x": 233.25, + "x": 233.625, "y": 211 } ], @@ -563,19 +563,19 @@ "labelPercentage": 0, "route": [ { - "x": 193, + "x": 193.375, "y": 244 }, { - "x": 193, + "x": 193.375, "y": 300 }, { - "x": 193, + "x": 193.375, "y": 374 }, { - "x": 193, + "x": 193.375, "y": 414 } ], @@ -610,31 +610,31 @@ "labelPercentage": 0, "route": [ { - "x": 286.5, + "x": 286.875, "y": 214 }, { - "x": 318.5, + "x": 318.875, "y": 254 }, { - "x": 326.5, + "x": 326.875, "y": 274 }, { - "x": 326.5, + "x": 326.875, "y": 289 }, { - "x": 326.5, + "x": 326.875, "y": 304 }, { - "x": 326.5, + "x": 326.875, "y": 374 }, { - "x": 326.5, + "x": 326.875, "y": 414 } ], @@ -672,11 +672,11 @@ "labelPercentage": 0, "route": [ { - "x": 299.5, + "x": 299.875, "y": 416 }, { - "x": 92.5, + "x": 92.875, "y": 176 } ], diff --git a/e2etests/testdata/stable/grid_edge_across_cell/dagre/sketch.exp.svg b/e2etests/testdata/stable/grid_edge_across_cell/dagre/sketch.exp.svg index 4791b970c9..0bc68a91d1 100644 --- a/e2etests/testdata/stable/grid_edge_across_cell/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/grid_edge_across_cell/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -gridcell 1cell 2cell 3abcefdg + .d2-658062648 .fill-N1{fill:#0A0F25;} + .d2-658062648 .fill-N2{fill:#676C7E;} + .d2-658062648 .fill-N3{fill:#9499AB;} + .d2-658062648 .fill-N4{fill:#CFD2DD;} + .d2-658062648 .fill-N5{fill:#DEE1EB;} + .d2-658062648 .fill-N6{fill:#EEF1F8;} + .d2-658062648 .fill-N7{fill:#FFFFFF;} + .d2-658062648 .fill-B1{fill:#0D32B2;} + .d2-658062648 .fill-B2{fill:#0D32B2;} + .d2-658062648 .fill-B3{fill:#E3E9FD;} + .d2-658062648 .fill-B4{fill:#E3E9FD;} + .d2-658062648 .fill-B5{fill:#EDF0FD;} + .d2-658062648 .fill-B6{fill:#F7F8FE;} + .d2-658062648 .fill-AA2{fill:#4A6FF3;} + .d2-658062648 .fill-AA4{fill:#EDF0FD;} + .d2-658062648 .fill-AA5{fill:#F7F8FE;} + .d2-658062648 .fill-AB4{fill:#EDF0FD;} + .d2-658062648 .fill-AB5{fill:#F7F8FE;} + .d2-658062648 .stroke-N1{stroke:#0A0F25;} + .d2-658062648 .stroke-N2{stroke:#676C7E;} + .d2-658062648 .stroke-N3{stroke:#9499AB;} + .d2-658062648 .stroke-N4{stroke:#CFD2DD;} + .d2-658062648 .stroke-N5{stroke:#DEE1EB;} + .d2-658062648 .stroke-N6{stroke:#EEF1F8;} + .d2-658062648 .stroke-N7{stroke:#FFFFFF;} + .d2-658062648 .stroke-B1{stroke:#0D32B2;} + .d2-658062648 .stroke-B2{stroke:#0D32B2;} + .d2-658062648 .stroke-B3{stroke:#E3E9FD;} + .d2-658062648 .stroke-B4{stroke:#E3E9FD;} + .d2-658062648 .stroke-B5{stroke:#EDF0FD;} + .d2-658062648 .stroke-B6{stroke:#F7F8FE;} + .d2-658062648 .stroke-AA2{stroke:#4A6FF3;} + .d2-658062648 .stroke-AA4{stroke:#EDF0FD;} + .d2-658062648 .stroke-AA5{stroke:#F7F8FE;} + .d2-658062648 .stroke-AB4{stroke:#EDF0FD;} + .d2-658062648 .stroke-AB5{stroke:#F7F8FE;} + .d2-658062648 .background-color-N1{background-color:#0A0F25;} + .d2-658062648 .background-color-N2{background-color:#676C7E;} + .d2-658062648 .background-color-N3{background-color:#9499AB;} + .d2-658062648 .background-color-N4{background-color:#CFD2DD;} + .d2-658062648 .background-color-N5{background-color:#DEE1EB;} + .d2-658062648 .background-color-N6{background-color:#EEF1F8;} + .d2-658062648 .background-color-N7{background-color:#FFFFFF;} + .d2-658062648 .background-color-B1{background-color:#0D32B2;} + .d2-658062648 .background-color-B2{background-color:#0D32B2;} + .d2-658062648 .background-color-B3{background-color:#E3E9FD;} + .d2-658062648 .background-color-B4{background-color:#E3E9FD;} + .d2-658062648 .background-color-B5{background-color:#EDF0FD;} + .d2-658062648 .background-color-B6{background-color:#F7F8FE;} + .d2-658062648 .background-color-AA2{background-color:#4A6FF3;} + .d2-658062648 .background-color-AA4{background-color:#EDF0FD;} + .d2-658062648 .background-color-AA5{background-color:#F7F8FE;} + .d2-658062648 .background-color-AB4{background-color:#EDF0FD;} + .d2-658062648 .background-color-AB5{background-color:#F7F8FE;} + .d2-658062648 .color-N1{color:#0A0F25;} + .d2-658062648 .color-N2{color:#676C7E;} + .d2-658062648 .color-N3{color:#9499AB;} + .d2-658062648 .color-N4{color:#CFD2DD;} + .d2-658062648 .color-N5{color:#DEE1EB;} + .d2-658062648 .color-N6{color:#EEF1F8;} + .d2-658062648 .color-N7{color:#FFFFFF;} + .d2-658062648 .color-B1{color:#0D32B2;} + .d2-658062648 .color-B2{color:#0D32B2;} + .d2-658062648 .color-B3{color:#E3E9FD;} + .d2-658062648 .color-B4{color:#E3E9FD;} + .d2-658062648 .color-B5{color:#EDF0FD;} + .d2-658062648 .color-B6{color:#F7F8FE;} + .d2-658062648 .color-AA2{color:#4A6FF3;} + .d2-658062648 .color-AA4{color:#EDF0FD;} + .d2-658062648 .color-AA5{color:#F7F8FE;} + .d2-658062648 .color-AB4{color:#EDF0FD;} + .d2-658062648 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>gridcell 1cell 2cell 3abcefdg diff --git a/e2etests/testdata/stable/investigate/dagre/board.exp.json b/e2etests/testdata/stable/investigate/dagre/board.exp.json index 7633395626..00f4bf257e 100644 --- a/e2etests/testdata/stable/investigate/dagre/board.exp.json +++ b/e2etests/testdata/stable/investigate/dagre/board.exp.json @@ -7,7 +7,7 @@ "id": "aa", "type": "step", "pos": { - "x": 72, + "x": 74, "y": 0 }, "width": 102, @@ -48,7 +48,7 @@ "id": "bb", "type": "step", "pos": { - "x": 301, + "x": 303, "y": 201 }, "width": 103, @@ -89,7 +89,7 @@ "id": "cc", "type": "step", "pos": { - "x": 256, + "x": 257, "y": 423 }, "width": 101, @@ -130,10 +130,10 @@ "id": "dd", "type": "rectangle", "pos": { - "x": 19, + "x": 20, "y": 665 }, - "width": 350, + "width": 351, "height": 152, "opacity": 1, "strokeDash": 0, @@ -171,7 +171,7 @@ "id": "dd.ee", "type": "diamond", "pos": { - "x": 49, + "x": 50, "y": 695 }, "width": 64, @@ -215,8 +215,8 @@ "x": 10, "y": 1889 }, - "width": 334, - "height": 333, + "width": 335, + "height": 336, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -253,7 +253,7 @@ "id": "ff.gg", "type": "diamond", "pos": { - "x": 248, + "x": 249, "y": 1919 }, "width": 66, @@ -294,7 +294,7 @@ "id": "dd.hh", "type": "diamond", "pos": { - "x": 273, + "x": 275, "y": 695 }, "width": 66, @@ -335,7 +335,7 @@ "id": "ii", "type": "rectangle", "pos": { - "x": 54, + "x": 55, "y": 937 }, "width": 54, @@ -376,7 +376,7 @@ "id": "jj", "type": "rectangle", "pos": { - "x": 53, + "x": 55, "y": 1174 }, "width": 55, @@ -417,7 +417,7 @@ "id": "kk", "type": "rectangle", "pos": { - "x": 50, + "x": 51, "y": 1440 }, "width": 62, @@ -459,10 +459,10 @@ "type": "rectangle", "pos": { "x": 10, - "y": 2362 + "y": 2365 }, - "width": 333, - "height": 307, + "width": 334, + "height": 310, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -500,10 +500,10 @@ "type": "oval", "pos": { "x": 40, - "y": 2558 + "y": 2561 }, - "width": 81, - "height": 81, + "width": 84, + "height": 84, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -543,8 +543,8 @@ "x": 40, "y": 2111 }, - "width": 81, - "height": 81, + "width": 84, + "height": 84, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -581,8 +581,8 @@ "id": "nn", "type": "cylinder", "pos": { - "x": 9, - "y": 3268 + "x": 11, + "y": 3274 }, "width": 469, "height": 166, @@ -622,8 +622,8 @@ "id": "nn.oo", "type": "rectangle", "pos": { - "x": 49, - "y": 3318 + "x": 51, + "y": 3324 }, "width": 63, "height": 66, @@ -663,8 +663,8 @@ "id": "ff.pp", "type": "rectangle", "pos": { - "x": 249, - "y": 2119 + "x": 251, + "y": 2120 }, "width": 63, "height": 66, @@ -704,8 +704,8 @@ "id": "ll.qq", "type": "rectangle", "pos": { - "x": 249, - "y": 2392 + "x": 250, + "y": 2395 }, "width": 64, "height": 66, @@ -745,8 +745,8 @@ "id": "ll.rr", "type": "rectangle", "pos": { - "x": 252, - "y": 2566 + "x": 253, + "y": 2570 }, "width": 58, "height": 66, @@ -786,7 +786,7 @@ "id": "ss", "type": "rectangle", "pos": { - "x": 397, + "x": 398, "y": 1144 }, "width": 118, @@ -827,7 +827,7 @@ "id": "ss.tt", "type": "rectangle", "pos": { - "x": 427, + "x": 428, "y": 1174 }, "width": 58, @@ -868,7 +868,7 @@ "id": "uu", "type": "rectangle", "pos": { - "x": 394, + "x": 396, "y": 1410 }, "width": 123, @@ -909,7 +909,7 @@ "id": "uu.vv", "type": "rectangle", "pos": { - "x": 424, + "x": 426, "y": 1440 }, "width": 63, @@ -950,7 +950,7 @@ "id": "ww", "type": "queue", "pos": { - "x": 336, + "x": 337, "y": 1656 }, "width": 149, @@ -1003,8 +1003,8 @@ "id": "rm", "type": "rectangle", "pos": { - "x": 398, - "y": 2566 + "x": 400, + "y": 2570 }, "width": 64, "height": 66, @@ -1044,8 +1044,8 @@ "id": "nn.xx", "type": "rectangle", "pos": { - "x": 210, - "y": 3318 + "x": 211, + "y": 3324 }, "width": 62, "height": 66, @@ -1085,8 +1085,8 @@ "id": "yy", "type": "rectangle", "pos": { - "x": 308, - "y": 2809 + "x": 310, + "y": 2815 }, "width": 198, "height": 339, @@ -1126,8 +1126,8 @@ "id": "yy.zz", "type": "queue", "pos": { - "x": 338, - "y": 2839 + "x": 340, + "y": 2845 }, "width": 138, "height": 92, @@ -1179,8 +1179,8 @@ "id": "yy.ab", "type": "rectangle", "pos": { - "x": 376, - "y": 3052 + "x": 377, + "y": 3058 }, "width": 63, "height": 66, @@ -1220,8 +1220,8 @@ "id": "nn.ac", "type": "rectangle", "pos": { - "x": 376, - "y": 3318 + "x": 378, + "y": 3324 }, "width": 62, "height": 66, @@ -1261,8 +1261,8 @@ "id": "ad", "type": "parallelogram", "pos": { - "x": 350, - "y": 3534 + "x": 351, + "y": 3540 }, "width": 115, "height": 66, @@ -1325,19 +1325,19 @@ "labelPercentage": 0, "route": [ { - "x": 162, + "x": 164, "y": 68 }, { - "x": 314.6000061035156, + "x": 316.20001220703125, "y": 134.39999389648438 }, { - "x": 352.79998779296875, + "x": 354.20001220703125, "y": 161 }, { - "x": 353, + "x": 354, "y": 201 } ], @@ -1372,19 +1372,19 @@ "labelPercentage": 0, "route": [ { - "x": 331, + "x": 333, "y": 302 }, { - "x": 311.20001220703125, + "x": 312.79998779296875, "y": 350.3999938964844 }, { - "x": 306.20001220703125, + "x": 307.79998779296875, "y": 374.6000061035156 }, { - "x": 306, + "x": 308, "y": 423 } ], @@ -1419,67 +1419,67 @@ "labelPercentage": 0, "route": [ { - "x": 101, + "x": 103, "y": 101 }, { - "x": 84.5999984741211, + "x": 86.19999694824219, "y": 141 }, { - "x": 80.5, + "x": 82, "y": 171.10000610351562 }, { - "x": 80.5, + "x": 82, "y": 201.25 }, { - "x": 80.5, + "x": 82, "y": 231.39999389648438 }, { - "x": 80.5, + "x": 82, "y": 273.70001220703125 }, { - "x": 80.5, + "x": 82, "y": 307 }, { - "x": 80.5, + "x": 82, "y": 340.29998779296875 }, { - "x": 80.5, + "x": 82, "y": 384.70001220703125 }, { - "x": 80.5, + "x": 82, "y": 418 }, { - "x": 80.5, + "x": 82, "y": 451.29998779296875 }, { - "x": 80.5, + "x": 82, "y": 495.70001220703125 }, { - "x": 80.5, + "x": 82, "y": 529 }, { - "x": 80.5, + "x": 82, "y": 562.2999877929688 }, { - "x": 80.5999984741211, + "x": 82, "y": 655 }, { - "x": 81, + "x": 82, "y": 695 } ], @@ -1514,236 +1514,236 @@ "labelPercentage": 0, "route": [ { - "x": 372, - "y": 297 + "x": 374, + "y": 298 }, { - "x": 393.79998779296875, - "y": 349.3999938964844 + "x": 395.3999938964844, + "y": 349.6000061035156 }, { - "x": 399.25, + "x": 400.75, "y": 384.70001220703125 }, { - "x": 399.25, + "x": 400.75, "y": 418 }, { - "x": 399.25, + "x": 400.75, "y": 451.29998779296875 }, { - "x": 399.25, + "x": 400.75, "y": 495.70001220703125 }, { - "x": 399.25, + "x": 400.75, "y": 529 }, { - "x": 399.25, + "x": 400.75, "y": 562.2999877929688 }, { - "x": 399.25, + "x": 400.75, "y": 596.5999755859375 }, { - "x": 399.25, + "x": 400.75, "y": 614.75 }, { - "x": 399.25, + "x": 400.75, "y": 632.9000244140625 }, { - "x": 399.25, + "x": 400.75, "y": 664.2000122070312 }, { - "x": 399.25, + "x": 400.75, "y": 693 }, { - "x": 399.25, + "x": 400.75, "y": 721.7999877929688 }, { - "x": 399.25, + "x": 400.75, "y": 760.2000122070312 }, { - "x": 399.25, + "x": 400.75, "y": 789 }, { - "x": 399.25, + "x": 400.75, "y": 817.7999877929688 }, { - "x": 365.8500061035156, + "x": 367.3500061035156, "y": 847 }, { - "x": 315.75, + "x": 317.25, "y": 862 }, { - "x": 265.6499938964844, + "x": 267.1499938964844, "y": 877 }, { - "x": 232.25, + "x": 233.75, "y": 903.5999755859375 }, { - "x": 232.25, + "x": 233.75, "y": 928.5 }, { - "x": 232.25, + "x": 233.75, "y": 953.4000244140625 }, { - "x": 232.25, + "x": 233.75, "y": 988.7000122070312 }, { - "x": 232.25, + "x": 233.75, "y": 1016.75 }, { - "x": 232.25, + "x": 233.75, "y": 1044.800048828125 }, { - "x": 232.25, + "x": 233.75, "y": 1075.5999755859375 }, { - "x": 232.25, + "x": 233.75, "y": 1093.75 }, { - "x": 232.25, + "x": 233.75, "y": 1111.9000244140625 }, { - "x": 232.25, + "x": 233.75, "y": 1140.5999755859375 }, { - "x": 232.25, + "x": 233.75, "y": 1165.5 }, { - "x": 232.25, + "x": 233.75, "y": 1190.4000244140625 }, { - "x": 232.25, + "x": 233.75, "y": 1223.5999755859375 }, { - "x": 232.25, + "x": 233.75, "y": 1248.5 }, { - "x": 232.25, + "x": 233.75, "y": 1273.4000244140625 }, { - "x": 232.25, + "x": 233.75, "y": 1300 }, { - "x": 232.25, + "x": 233.75, "y": 1315 }, { - "x": 232.25, + "x": 233.75, "y": 1330 }, { - "x": 232.25, + "x": 233.75, "y": 1350 }, { - "x": 232.25, + "x": 233.75, "y": 1365 }, { - "x": 232.25, + "x": 233.75, "y": 1380 }, { - "x": 232.25, + "x": 233.75, "y": 1406.5999755859375 }, { - "x": 232.25, + "x": 233.75, "y": 1431.5 }, { - "x": 232.25, + "x": 233.75, "y": 1456.4000244140625 }, { - "x": 232.25, + "x": 233.75, "y": 1489.5999755859375 }, { - "x": 232.25, + "x": 233.75, "y": 1514.5 }, { - "x": 232.25, + "x": 233.75, "y": 1539.4000244140625 }, { - "x": 232.25, + "x": 233.75, "y": 1566 }, { - "x": 232.25, + "x": 233.75, "y": 1581 }, { - "x": 232.25, + "x": 233.75, "y": 1596 }, { - "x": 232.25, + "x": 233.75, "y": 1625.199951171875 }, { - "x": 232.25, + "x": 233.75, "y": 1654 }, { - "x": 232.25, + "x": 233.75, "y": 1682.800048828125 }, { - "x": 232.25, + "x": 233.75, "y": 1723.300048828125 }, { - "x": 232.25, + "x": 233.75, "y": 1755.25 }, { - "x": 232.25, + "x": 233.75, "y": 1787.199951171875 }, { - "x": 239.1999969482422, - "y": 1882.800048828125 + "x": 240.60000610351562, + "y": 1882.5999755859375 }, { - "x": 267, - "y": 1938 + "x": 268, + "y": 1937 } ], "isCurve": true, @@ -1777,19 +1777,19 @@ "labelPercentage": 0, "route": [ { - "x": 306, + "x": 308, "y": 524 }, { - "x": 306.20001220703125, + "x": 307.79998779296875, "y": 572.4000244140625 }, { - "x": 306.20001220703125, + "x": 307.79998779296875, "y": 655 }, { - "x": 306, + "x": 308, "y": 695 } ], @@ -1824,19 +1824,19 @@ "labelPercentage": 0, "route": [ { - "x": 81, + "x": 82, "y": 787 }, { - "x": 80.5999984741211, + "x": 82, "y": 827 }, { - "x": 80.5, + "x": 82, "y": 897 }, { - "x": 80.5, + "x": 82, "y": 937 } ], @@ -1871,19 +1871,19 @@ "labelPercentage": 0, "route": [ { - "x": 80.5, + "x": 82, "y": 1002.5 }, { - "x": 80.5, + "x": 82, "y": 1051.300048828125 }, { - "x": 80.5, + "x": 82, "y": 1134 }, { - "x": 80.5, + "x": 82, "y": 1174 } ], @@ -1918,31 +1918,31 @@ "labelPercentage": 0, "route": [ { - "x": 80.5, + "x": 82, "y": 1240 }, { - "x": 80.5, + "x": 82, "y": 1280 }, { - "x": 80.5, + "x": 82, "y": 1300 }, { - "x": 80.5, + "x": 82, "y": 1315 }, { - "x": 80.5, + "x": 82, "y": 1330 }, { - "x": 80.5, + "x": 82, "y": 1400 }, { - "x": 80.5, + "x": 82, "y": 1440 } ], @@ -1977,79 +1977,79 @@ "labelPercentage": 0, "route": [ { - "x": 80.5, + "x": 82, "y": 1506 }, { - "x": 80.5, + "x": 82, "y": 1546 }, { - "x": 80.5, + "x": 82, "y": 1566 }, { - "x": 80.5, + "x": 82, "y": 1581 }, { - "x": 80.5, + "x": 82, "y": 1596 }, { - "x": 80.5, + "x": 82, "y": 1625.199951171875 }, { - "x": 80.5, + "x": 82, "y": 1654 }, { - "x": 80.5, + "x": 82, "y": 1682.800048828125 }, { - "x": 80.5, + "x": 82, "y": 1723.300048828125 }, { - "x": 80.5, + "x": 82, "y": 1755.25 }, { - "x": 80.5, + "x": 82, "y": 1787.199951171875 }, { - "x": 80.5, + "x": 82, "y": 1820.5999755859375 }, { - "x": 80.5, + "x": 82, "y": 1838.75 }, { - "x": 80.5, + "x": 82, "y": 1856.9000244140625 }, { - "x": 80.5, + "x": 82, "y": 1888.199951171875 }, { - "x": 80.5, + "x": 82, "y": 1917 }, { - "x": 80.5, + "x": 82, "y": 1945.800048828125 }, { - "x": 80.5999984741211, + "x": 82, "y": 2071 }, { - "x": 81, + "x": 82, "y": 2111 } ], @@ -2084,56 +2084,56 @@ "labelPercentage": 0, "route": [ { - "x": 81, - "y": 2192 + "x": 82, + "y": 2195 }, { - "x": 80.5999984741211, - "y": 2232 + "x": 82, + "y": 2235 }, { - "x": 80.5, - "y": 2252 + "x": 82, + "y": 2255 }, { - "x": 80.5, - "y": 2267 + "x": 82, + "y": 2270 }, { - "x": 80.5, - "y": 2282 + "x": 82, + "y": 2285 }, { - "x": 80.5, - "y": 2302 + "x": 82, + "y": 2305 }, { - "x": 80.5, - "y": 2317 + "x": 82, + "y": 2320 }, { - "x": 80.5, - "y": 2332 + "x": 82, + "y": 2335 }, { - "x": 80.5, - "y": 2358.60009765625 + "x": 82, + "y": 2361.60009765625 }, { - "x": 80.5, - "y": 2383.5 + "x": 82, + "y": 2386.5 }, { - "x": 80.5, - "y": 2408.39990234375 + "x": 82, + "y": 2411.39990234375 }, { - "x": 80.5999984741211, - "y": 2518 + "x": 82, + "y": 2521 }, { - "x": 81, - "y": 2558 + "x": 82, + "y": 2561 } ], "isCurve": true, @@ -2167,104 +2167,104 @@ "labelPercentage": 0, "route": [ { - "x": 81, - "y": 2639 + "x": 82, + "y": 2645 }, { - "x": 80.5999984741211, - "y": 2679 + "x": 82, + "y": 2685 }, { - "x": 80.5, - "y": 2699 + "x": 82, + "y": 2705 }, { - "x": 80.5, - "y": 2714 + "x": 82, + "y": 2720 }, { - "x": 80.5, - "y": 2729 + "x": 82, + "y": 2735 }, { - "x": 80.5, - "y": 2749 + "x": 82, + "y": 2755 }, { - "x": 80.5, - "y": 2764 + "x": 82, + "y": 2770 }, { - "x": 80.5, - "y": 2779 + "x": 82, + "y": 2785 }, { - "x": 80.5, - "y": 2808.199951171875 + "x": 82, + "y": 2814.199951171875 }, { - "x": 80.5, - "y": 2837 + "x": 82, + "y": 2843 }, { - "x": 80.5, - "y": 2865.800048828125 + "x": 82, + "y": 2871.800048828125 }, { - "x": 80.5, - "y": 2906.300048828125 + "x": 82, + "y": 2912.300048828125 }, { - "x": 80.5, - "y": 2938.25 + "x": 82, + "y": 2944.25 }, { - "x": 80.5, - "y": 2970.199951171875 + "x": 82, + "y": 2976.199951171875 }, { - "x": 80.5, - "y": 3010.199951171875 + "x": 82, + "y": 3016.199951171875 }, { - "x": 80.5, - "y": 3038.25 + "x": 82, + "y": 3044.25 }, { - "x": 80.5, - "y": 3066.300048828125 + "x": 82, + "y": 3072.300048828125 }, { - "x": 80.5, - "y": 3101.60009765625 + "x": 82, + "y": 3107.60009765625 }, { - "x": 80.5, - "y": 3126.5 + "x": 82, + "y": 3132.5 }, { - "x": 80.5, - "y": 3151.39990234375 + "x": 82, + "y": 3157.39990234375 }, { - "x": 80.5, - "y": 3178 + "x": 82, + "y": 3184 }, { - "x": 80.5, - "y": 3193 + "x": 82, + "y": 3199 }, { - "x": 80.5, - "y": 3208 + "x": 82, + "y": 3214 }, { - "x": 80.5, - "y": 3278 + "x": 82, + "y": 3284 }, { - "x": 80.5, - "y": 3318 + "x": 82, + "y": 3324 } ], "isCurve": true, @@ -2298,20 +2298,20 @@ "labelPercentage": 0, "route": [ { - "x": 281, + "x": 282, "y": 2011 }, { - "x": 280.79998779296875, + "x": 282.20001220703125, "y": 2051 }, { - "x": 280.75, - "y": 2072.5 + "x": 282.25, + "y": 2072.800048828125 }, { - "x": 280.75, - "y": 2118.5 + "x": 282.25, + "y": 2120 } ], "isCurve": true, @@ -2345,32 +2345,32 @@ "labelPercentage": 0, "route": [ { - "x": 280.75, - "y": 2185.5 + "x": 282.25, + "y": 2186 }, { - "x": 280.75, - "y": 2230.699951171875 + "x": 282.25, + "y": 2233.199951171875 }, { - "x": 280.75, - "y": 2252 + "x": 282.25, + "y": 2255 }, { - "x": 280.75, - "y": 2267 + "x": 282.25, + "y": 2270 }, { - "x": 280.75, - "y": 2282 + "x": 282.25, + "y": 2285 }, { - "x": 280.75, - "y": 2352 + "x": 282.25, + "y": 2355 }, { - "x": 280.75, - "y": 2392 + "x": 282.25, + "y": 2395 } ], "isCurve": true, @@ -2404,20 +2404,20 @@ "labelPercentage": 0, "route": [ { - "x": 280.75, - "y": 2458 + "x": 282.25, + "y": 2461 }, { - "x": 280.75, - "y": 2498 + "x": 282.25, + "y": 2501 }, { - "x": 280.75, - "y": 2519.5 + "x": 282.25, + "y": 2522.800048828125 }, { - "x": 280.75, - "y": 2565.5 + "x": 282.25, + "y": 2570 } ], "isCurve": true, @@ -2451,55 +2451,55 @@ "labelPercentage": 0, "route": [ { - "x": 306, + "x": 308, "y": 787 }, { - "x": 306.20001220703125, + "x": 307.79998779296875, "y": 827 }, { - "x": 336.1499938964844, + "x": 337.6499938964844, "y": 847 }, { - "x": 381, + "x": 382.5, "y": 862 }, { - "x": 425.8500061035156, + "x": 427.3500061035156, "y": 877 }, { - "x": 455.75, + "x": 457.25, "y": 903.5999755859375 }, { - "x": 455.75, + "x": 457.25, "y": 928.5 }, { - "x": 455.75, + "x": 457.25, "y": 953.4000244140625 }, { - "x": 455.75, + "x": 457.25, "y": 988.7000122070312 }, { - "x": 455.75, + "x": 457.25, "y": 1016.75 }, { - "x": 455.75, + "x": 457.25, "y": 1044.800048828125 }, { - "x": 455.75, + "x": 457.25, "y": 1134 }, { - "x": 455.75, + "x": 457.25, "y": 1174 } ], @@ -2534,31 +2534,31 @@ "labelPercentage": 0, "route": [ { - "x": 455.75, + "x": 457.25, "y": 1240 }, { - "x": 455.75, + "x": 457.25, "y": 1280 }, { - "x": 455.75, + "x": 457.25, "y": 1300 }, { - "x": 455.75, + "x": 457.25, "y": 1315 }, { - "x": 455.75, + "x": 457.25, "y": 1330 }, { - "x": 455.75, + "x": 457.25, "y": 1400 }, { - "x": 455.75, + "x": 457.25, "y": 1440 } ], @@ -2593,19 +2593,19 @@ "labelPercentage": 0, "route": [ { - "x": 112.5, - "y": 1484.748046875 + "x": 113, + "y": 1485 }, { - "x": 262.1000061035156, - "y": 1541.7490234375 + "x": 263.3999938964844, + "y": 1541.800048828125 }, { - "x": 311.20001220703125, + "x": 312.6000061035156, "y": 1616 }, { - "x": 358, + "x": 359, "y": 1656 } ], @@ -2640,19 +2640,19 @@ "labelPercentage": 0, "route": [ { - "x": 455.75, + "x": 457.25, "y": 1506 }, { - "x": 455.75, + "x": 457.25, "y": 1546 }, { - "x": 451, + "x": 452.3999938964844, "y": 1616 }, { - "x": 432, + "x": 433, "y": 1656 } ], @@ -2687,116 +2687,116 @@ "labelPercentage": 0, "route": [ { - "x": 419, + "x": 421, "y": 1748 }, { - "x": 427.79998779296875, + "x": 429.3999938964844, "y": 1796.4000244140625 }, { - "x": 430, + "x": 431.5, "y": 1820.5999755859375 }, { - "x": 430, + "x": 431.5, "y": 1838.75 }, { - "x": 430, + "x": 431.5, "y": 1856.9000244140625 }, { - "x": 430, + "x": 431.5, "y": 1888.199951171875 }, { - "x": 430, + "x": 431.5, "y": 1917 }, { - "x": 430, + "x": 431.5, "y": 1945.800048828125 }, { - "x": 430, + "x": 431.5, "y": 1984.199951171875 }, { - "x": 430, + "x": 431.5, "y": 2013 }, { - "x": 430, + "x": 431.5, "y": 2041.800048828125 }, { - "x": 430, - "y": 2079.10009765625 + "x": 431.5, + "y": 2079.39990234375 }, { - "x": 430, - "y": 2106.25 + "x": 431.5, + "y": 2107 }, { - "x": 430, - "y": 2133.39990234375 + "x": 431.5, + "y": 2134.60009765625 }, { - "x": 430, - "y": 2169.60009765625 + "x": 431.5, + "y": 2171.39990234375 }, { - "x": 430, - "y": 2196.75 + "x": 431.5, + "y": 2199 }, { - "x": 430, - "y": 2223.89990234375 + "x": 431.5, + "y": 2226.60009765625 }, { - "x": 430, - "y": 2252 + "x": 431.5, + "y": 2255 }, { - "x": 430, - "y": 2267 + "x": 431.5, + "y": 2270 }, { - "x": 430, - "y": 2282 + "x": 431.5, + "y": 2285 }, { - "x": 430, - "y": 2302 + "x": 431.5, + "y": 2305 }, { - "x": 430, - "y": 2317 + "x": 431.5, + "y": 2320 }, { - "x": 430, - "y": 2332 + "x": 431.5, + "y": 2335 }, { - "x": 430, - "y": 2358.60009765625 + "x": 431.5, + "y": 2361.60009765625 }, { - "x": 430, - "y": 2383.5 + "x": 431.5, + "y": 2386.5 }, { - "x": 430, - "y": 2408.39990234375 + "x": 431.5, + "y": 2411.39990234375 }, { - "x": 430, - "y": 2519.5 + "x": 431.5, + "y": 2522.800048828125 }, { - "x": 430, - "y": 2565.5 + "x": 431.5, + "y": 2570 } ], "isCurve": true, @@ -2830,104 +2830,104 @@ "labelPercentage": 0, "route": [ { - "x": 420.5190124511719, - "y": 2632.5 + "x": 422.5, + "y": 2636 }, { - "x": 407.3030090332031, - "y": 2677.699951171875 + "x": 408.8999938964844, + "y": 2683.199951171875 }, { - "x": 371.29998779296875, - "y": 2699 + "x": 372.79998779296875, + "y": 2705 }, { - "x": 322.25, - "y": 2714 + "x": 323.75, + "y": 2720 }, { - "x": 273.20001220703125, - "y": 2729 + "x": 274.70001220703125, + "y": 2735 }, { - "x": 240.5, - "y": 2749 + "x": 242, + "y": 2755 }, { - "x": 240.5, - "y": 2764 + "x": 242, + "y": 2770 }, { - "x": 240.5, - "y": 2779 + "x": 242, + "y": 2785 }, { - "x": 240.5, - "y": 2808.199951171875 + "x": 242, + "y": 2814.199951171875 }, { - "x": 240.5, - "y": 2837 + "x": 242, + "y": 2843 }, { - "x": 240.5, - "y": 2865.800048828125 + "x": 242, + "y": 2871.800048828125 }, { - "x": 240.5, - "y": 2906.300048828125 + "x": 242, + "y": 2912.300048828125 }, { - "x": 240.5, - "y": 2938.25 + "x": 242, + "y": 2944.25 }, { - "x": 240.5, - "y": 2970.199951171875 + "x": 242, + "y": 2976.199951171875 }, { - "x": 240.5, - "y": 3010.199951171875 + "x": 242, + "y": 3016.199951171875 }, { - "x": 240.5, - "y": 3038.25 + "x": 242, + "y": 3044.25 }, { - "x": 240.5, - "y": 3066.300048828125 + "x": 242, + "y": 3072.300048828125 }, { - "x": 240.5, - "y": 3101.60009765625 + "x": 242, + "y": 3107.60009765625 }, { - "x": 240.5, - "y": 3126.5 + "x": 242, + "y": 3132.5 }, { - "x": 240.5, - "y": 3151.39990234375 + "x": 242, + "y": 3157.39990234375 }, { - "x": 240.5, - "y": 3178 + "x": 242, + "y": 3184 }, { - "x": 240.5, - "y": 3193 + "x": 242, + "y": 3199 }, { - "x": 240.5, - "y": 3208 + "x": 242, + "y": 3214 }, { - "x": 240.5, - "y": 3278 + "x": 242, + "y": 3284 }, { - "x": 240.5, - "y": 3318 + "x": 242, + "y": 3324 } ], "isCurve": true, @@ -2961,32 +2961,32 @@ "labelPercentage": 0, "route": [ { - "x": 280.75, - "y": 2632.5 + "x": 282.25, + "y": 2636 }, { - "x": 280.75, - "y": 2677.699951171875 + "x": 282.25, + "y": 2683.199951171875 }, { - "x": 291.6000061035156, - "y": 2699 + "x": 293.1000061035156, + "y": 2705 }, { - "x": 307.875, - "y": 2714 + "x": 309.375, + "y": 2720 }, { - "x": 324.1499938964844, - "y": 2729 + "x": 325.6499938964844, + "y": 2735 }, { - "x": 342.6000061035156, - "y": 2799 + "x": 344.20001220703125, + "y": 2805 }, { - "x": 373, - "y": 2839 + "x": 375, + "y": 2845 } ], "isCurve": true, @@ -3020,32 +3020,32 @@ "labelPercentage": 0, "route": [ { - "x": 439.7539978027344, - "y": 2632.5 + "x": 441.25, + "y": 2636 }, { - "x": 453.3500061035156, - "y": 2677.699951171875 + "x": 454.8500061035156, + "y": 2683.199951171875 }, { - "x": 456.75, - "y": 2699 + "x": 458.25, + "y": 2705 }, { - "x": 456.75, - "y": 2714 + "x": 458.25, + "y": 2720 }, { - "x": 456.75, - "y": 2729 + "x": 458.25, + "y": 2735 }, { - "x": 451.6000061035156, - "y": 2799 + "x": 453, + "y": 2805 }, { - "x": 431, - "y": 2839 + "x": 432, + "y": 2845 } ], "isCurve": true, @@ -3079,20 +3079,20 @@ "labelPercentage": 0, "route": [ { - "x": 407, - "y": 2931 + "x": 408, + "y": 2937 }, { - "x": 407, - "y": 2979.39990234375 + "x": 408.3999938964844, + "y": 2985.39990234375 }, { - "x": 407, - "y": 3003.699951171875 + "x": 408.5, + "y": 3009.699951171875 }, { - "x": 407, - "y": 3052.5 + "x": 408.5, + "y": 3058.5 } ], "isCurve": true, @@ -3126,32 +3126,32 @@ "labelPercentage": 0, "route": [ { - "x": 407, - "y": 3118 + "x": 408.5, + "y": 3124 }, { - "x": 407, - "y": 3158 + "x": 408.5, + "y": 3164 }, { - "x": 407, - "y": 3178 + "x": 408.5, + "y": 3184 }, { - "x": 407, - "y": 3193 + "x": 408.5, + "y": 3199 }, { - "x": 407, - "y": 3208 + "x": 408.5, + "y": 3214 }, { - "x": 407, - "y": 3278 + "x": 408.5, + "y": 3284 }, { - "x": 407, - "y": 3318 + "x": 408.5, + "y": 3324 } ], "isCurve": true, @@ -3185,20 +3185,20 @@ "labelPercentage": 0, "route": [ { - "x": 407, - "y": 3384 + "x": 408.5, + "y": 3390 }, { - "x": 407, - "y": 3424 + "x": 408.5, + "y": 3430 }, { - "x": 407, - "y": 3494 + "x": 408.3999938964844, + "y": 3500 }, { - "x": 407, - "y": 3534 + "x": 408, + "y": 3540 } ], "isCurve": true, @@ -3232,19 +3232,19 @@ "labelPercentage": 0, "route": [ { - "x": 379, + "x": 380, "y": 1748 }, { - "x": 346.20001220703125, + "x": 347.6000061035156, "y": 1796.4000244140625 }, { - "x": 329.6000061035156, + "x": 331, "y": 1883.199951171875 }, { - "x": 296, + "x": 297, "y": 1940 } ], diff --git a/e2etests/testdata/stable/investigate/dagre/sketch.exp.svg b/e2etests/testdata/stable/investigate/dagre/sketch.exp.svg index 3806ec92f4..3734106756 100644 --- a/e2etests/testdata/stable/investigate/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/investigate/dagre/sketch.exp.svg @@ -1,23 +1,23 @@ -aabbccddffiijjkkllnnssuuwwrmyyeegghhmmmmooppqqrrttvvxxzzabac 123456 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + .d2-2604789973 .fill-N1{fill:#0A0F25;} + .d2-2604789973 .fill-N2{fill:#676C7E;} + .d2-2604789973 .fill-N3{fill:#9499AB;} + .d2-2604789973 .fill-N4{fill:#CFD2DD;} + .d2-2604789973 .fill-N5{fill:#DEE1EB;} + .d2-2604789973 .fill-N6{fill:#EEF1F8;} + .d2-2604789973 .fill-N7{fill:#FFFFFF;} + .d2-2604789973 .fill-B1{fill:#0D32B2;} + .d2-2604789973 .fill-B2{fill:#0D32B2;} + .d2-2604789973 .fill-B3{fill:#E3E9FD;} + .d2-2604789973 .fill-B4{fill:#E3E9FD;} + .d2-2604789973 .fill-B5{fill:#EDF0FD;} + .d2-2604789973 .fill-B6{fill:#F7F8FE;} + .d2-2604789973 .fill-AA2{fill:#4A6FF3;} + .d2-2604789973 .fill-AA4{fill:#EDF0FD;} + .d2-2604789973 .fill-AA5{fill:#F7F8FE;} + .d2-2604789973 .fill-AB4{fill:#EDF0FD;} + .d2-2604789973 .fill-AB5{fill:#F7F8FE;} + .d2-2604789973 .stroke-N1{stroke:#0A0F25;} + .d2-2604789973 .stroke-N2{stroke:#676C7E;} + .d2-2604789973 .stroke-N3{stroke:#9499AB;} + .d2-2604789973 .stroke-N4{stroke:#CFD2DD;} + .d2-2604789973 .stroke-N5{stroke:#DEE1EB;} + .d2-2604789973 .stroke-N6{stroke:#EEF1F8;} + .d2-2604789973 .stroke-N7{stroke:#FFFFFF;} + .d2-2604789973 .stroke-B1{stroke:#0D32B2;} + .d2-2604789973 .stroke-B2{stroke:#0D32B2;} + .d2-2604789973 .stroke-B3{stroke:#E3E9FD;} + .d2-2604789973 .stroke-B4{stroke:#E3E9FD;} + .d2-2604789973 .stroke-B5{stroke:#EDF0FD;} + .d2-2604789973 .stroke-B6{stroke:#F7F8FE;} + .d2-2604789973 .stroke-AA2{stroke:#4A6FF3;} + .d2-2604789973 .stroke-AA4{stroke:#EDF0FD;} + .d2-2604789973 .stroke-AA5{stroke:#F7F8FE;} + .d2-2604789973 .stroke-AB4{stroke:#EDF0FD;} + .d2-2604789973 .stroke-AB5{stroke:#F7F8FE;} + .d2-2604789973 .background-color-N1{background-color:#0A0F25;} + .d2-2604789973 .background-color-N2{background-color:#676C7E;} + .d2-2604789973 .background-color-N3{background-color:#9499AB;} + .d2-2604789973 .background-color-N4{background-color:#CFD2DD;} + .d2-2604789973 .background-color-N5{background-color:#DEE1EB;} + .d2-2604789973 .background-color-N6{background-color:#EEF1F8;} + .d2-2604789973 .background-color-N7{background-color:#FFFFFF;} + .d2-2604789973 .background-color-B1{background-color:#0D32B2;} + .d2-2604789973 .background-color-B2{background-color:#0D32B2;} + .d2-2604789973 .background-color-B3{background-color:#E3E9FD;} + .d2-2604789973 .background-color-B4{background-color:#E3E9FD;} + .d2-2604789973 .background-color-B5{background-color:#EDF0FD;} + .d2-2604789973 .background-color-B6{background-color:#F7F8FE;} + .d2-2604789973 .background-color-AA2{background-color:#4A6FF3;} + .d2-2604789973 .background-color-AA4{background-color:#EDF0FD;} + .d2-2604789973 .background-color-AA5{background-color:#F7F8FE;} + .d2-2604789973 .background-color-AB4{background-color:#EDF0FD;} + .d2-2604789973 .background-color-AB5{background-color:#F7F8FE;} + .d2-2604789973 .color-N1{color:#0A0F25;} + .d2-2604789973 .color-N2{color:#676C7E;} + .d2-2604789973 .color-N3{color:#9499AB;} + .d2-2604789973 .color-N4{color:#CFD2DD;} + .d2-2604789973 .color-N5{color:#DEE1EB;} + .d2-2604789973 .color-N6{color:#EEF1F8;} + .d2-2604789973 .color-N7{color:#FFFFFF;} + .d2-2604789973 .color-B1{color:#0D32B2;} + .d2-2604789973 .color-B2{color:#0D32B2;} + .d2-2604789973 .color-B3{color:#E3E9FD;} + .d2-2604789973 .color-B4{color:#E3E9FD;} + .d2-2604789973 .color-B5{color:#EDF0FD;} + .d2-2604789973 .color-B6{color:#F7F8FE;} + .d2-2604789973 .color-AA2{color:#4A6FF3;} + .d2-2604789973 .color-AA4{color:#EDF0FD;} + .d2-2604789973 .color-AA5{color:#F7F8FE;} + .d2-2604789973 .color-AB4{color:#EDF0FD;} + .d2-2604789973 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>aabbccddffiijjkkllnnssuuwwrmyyeegghhmmmmooppqqrrttvvxxzzabac 123456 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/investigate/elk/board.exp.json b/e2etests/testdata/stable/investigate/elk/board.exp.json index a8b89a72af..35304cfc62 100644 --- a/e2etests/testdata/stable/investigate/elk/board.exp.json +++ b/e2etests/testdata/stable/investigate/elk/board.exp.json @@ -215,7 +215,7 @@ "x": 273, "y": 1889 }, - "width": 281, + "width": 284, "height": 388, "opacity": 1, "strokeDash": 0, @@ -458,11 +458,11 @@ "id": "ll", "type": "rectangle", "pos": { - "x": 251, + "x": 249, "y": 2468 }, - "width": 265, - "height": 317, + "width": 268, + "height": 320, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -499,11 +499,11 @@ "id": "ll.mm", "type": "oval", "pos": { - "x": 301, + "x": 299, "y": 2518 }, - "width": 81, - "height": 81, + "width": 84, + "height": 84, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -541,10 +541,10 @@ "type": "oval", "pos": { "x": 423, - "y": 1944 + "y": 1943 }, - "width": 81, - "height": 81, + "width": 84, + "height": 84, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -582,7 +582,7 @@ "type": "cylinder", "pos": { "x": 79, - "y": 3469 + "y": 3472 }, "width": 327, "height": 210, @@ -623,7 +623,7 @@ "type": "rectangle", "pos": { "x": 129, - "y": 3563 + "y": 3566 }, "width": 63, "height": 66, @@ -663,7 +663,7 @@ "id": "ff.pp", "type": "rectangle", "pos": { - "x": 402, + "x": 404, "y": 2161 }, "width": 63, @@ -704,8 +704,8 @@ "id": "ll.qq", "type": "rectangle", "pos": { - "x": 402, - "y": 2525 + "x": 403, + "y": 2527 }, "width": 64, "height": 66, @@ -745,8 +745,8 @@ "id": "ll.rr", "type": "rectangle", "pos": { - "x": 405, - "y": 2669 + "x": 406, + "y": 2672 }, "width": 58, "height": 66, @@ -1004,7 +1004,7 @@ "type": "rectangle", "pos": { "x": 113, - "y": 2635 + "y": 2637 }, "width": 80, "height": 66, @@ -1045,7 +1045,7 @@ "type": "rectangle", "pos": { "x": 212, - "y": 3563 + "y": 3566 }, "width": 62, "height": 66, @@ -1085,8 +1085,8 @@ "id": "yy", "type": "rectangle", "pos": { - "x": 309, - "y": 2975 + "x": 312, + "y": 2978 }, "width": 238, "height": 354, @@ -1126,8 +1126,8 @@ "id": "yy.zz", "type": "queue", "pos": { - "x": 359, - "y": 3025 + "x": 362, + "y": 3028 }, "width": 138, "height": 118, @@ -1179,8 +1179,8 @@ "id": "yy.ab", "type": "rectangle", "pos": { - "x": 397, - "y": 3213 + "x": 399, + "y": 3216 }, "width": 63, "height": 66, @@ -1221,7 +1221,7 @@ "type": "rectangle", "pos": { "x": 294, - "y": 3563 + "y": 3566 }, "width": 62, "height": 66, @@ -1261,8 +1261,8 @@ "id": "ad", "type": "parallelogram", "pos": { - "x": 267, - "y": 3754 + "x": 268, + "y": 3757 }, "width": 115, "height": 66, @@ -1669,12 +1669,12 @@ "y": 1646 }, { - "x": 442.5830078125, + "x": 443.3330078125, "y": 1646 }, { "x": 443, - "y": 1950 + "y": 1949 } ], "animated": false, @@ -1707,15 +1707,15 @@ "labelPercentage": 0, "route": [ { - "x": 464, - "y": 2026 + "x": 465, + "y": 2027 }, { - "x": 463.6659851074219, + "x": 465.1659851074219, "y": 2121 }, { - "x": 351.6659851074219, + "x": 352.4159851074219, "y": 2121 }, { @@ -1754,27 +1754,27 @@ "route": [ { "x": 342, - "y": 2599 + "y": 2602 }, { "x": 341.6659851074219, - "y": 2880 + "y": 2883 }, { "x": 94.66600036621094, - "y": 2880 + "y": 2883 }, { "x": 94.66600036621094, - "y": 3424 + "y": 3427 }, { - "x": 160.58299255371094, - "y": 3424 + "x": 161.33299255371094, + "y": 3427 }, { - "x": 160.58299255371094, - "y": 3563 + "x": 161.33299255371094, + "y": 3566 } ], "animated": false, @@ -1815,11 +1815,11 @@ "y": 2071 }, { - "x": 434.1659851074219, + "x": 435.6659851074219, "y": 2071 }, { - "x": 434.1659851074219, + "x": 435.6659851074219, "y": 2161 } ], @@ -1853,12 +1853,12 @@ "labelPercentage": 0, "route": [ { - "x": 434.1659851074219, - "y": 2226.5 + "x": 435.6659851074219, + "y": 2227 }, { - "x": 434.1659851074219, - "y": 2525.5 + "x": 435.6659851074219, + "y": 2527 } ], "animated": false, @@ -1891,12 +1891,12 @@ "labelPercentage": 0, "route": [ { - "x": 434.1659851074219, - "y": 2591 + "x": 435.6659851074219, + "y": 2593 }, { - "x": 434.1659851074219, - "y": 2669 + "x": 435.6659851074219, + "y": 2672 } ], "animated": false, @@ -2102,7 +2102,7 @@ }, { "x": 153, - "y": 2635 + "y": 2637 } ], "animated": false, @@ -2136,19 +2136,19 @@ "route": [ { "x": 139.66600036621094, - "y": 2701 + "y": 2703 }, { "x": 139.66600036621094, - "y": 3374 + "y": 3377 }, { - "x": 243.08299255371094, - "y": 3374 + "x": 243.83299255371094, + "y": 3377 }, { - "x": 243.08299255371094, - "y": 3563 + "x": 243.83299255371094, + "y": 3566 } ], "animated": false, @@ -2181,12 +2181,12 @@ "labelPercentage": 0, "route": [ { - "x": 451.8330078125, - "y": 2735 + "x": 454.0830078125, + "y": 2738 }, { - "x": 452, - "y": 3025 + "x": 454, + "y": 3028 } ], "animated": false, @@ -2220,19 +2220,19 @@ "route": [ { "x": 166.33299255371094, - "y": 2701 + "y": 2703 }, { "x": 166.33299255371094, - "y": 2830 + "y": 2833 }, { - "x": 405.8330078125, - "y": 2830 + "x": 408.0830078125, + "y": 2833 }, { - "x": 406, - "y": 3025 + "x": 408, + "y": 3028 } ], "animated": false, @@ -2265,12 +2265,12 @@ "labelPercentage": 0, "route": [ { - "x": 429, - "y": 3143 + "x": 431, + "y": 3146 }, { - "x": 429, - "y": 3213 + "x": 431, + "y": 3216 } ], "animated": false, @@ -2303,20 +2303,20 @@ "labelPercentage": 0, "route": [ { - "x": 428.8330078125, - "y": 3279 + "x": 431.0830078125, + "y": 3282 }, { - "x": 428.8330078125, - "y": 3374 + "x": 431.0830078125, + "y": 3377 }, { - "x": 325.0830078125, - "y": 3374 + "x": 325.8330078125, + "y": 3377 }, { - "x": 325.0830078125, - "y": 3563 + "x": 325.8330078125, + "y": 3566 } ], "animated": false, @@ -2349,12 +2349,12 @@ "labelPercentage": 0, "route": [ { - "x": 325.0830078125, - "y": 3629 + "x": 325.8330078125, + "y": 3632 }, { - "x": 325, - "y": 3754 + "x": 326, + "y": 3757 } ], "animated": false, diff --git a/e2etests/testdata/stable/investigate/elk/sketch.exp.svg b/e2etests/testdata/stable/investigate/elk/sketch.exp.svg index fa9b374b83..30692835f1 100644 --- a/e2etests/testdata/stable/investigate/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/investigate/elk/sketch.exp.svg @@ -1,23 +1,23 @@ -aabbccddffiijjkkllnnssuuwwrmyyeegghhmmmmooppqqrrttvvxxzzabac 123456 - + .d2-2930989287 .fill-N1{fill:#0A0F25;} + .d2-2930989287 .fill-N2{fill:#676C7E;} + .d2-2930989287 .fill-N3{fill:#9499AB;} + .d2-2930989287 .fill-N4{fill:#CFD2DD;} + .d2-2930989287 .fill-N5{fill:#DEE1EB;} + .d2-2930989287 .fill-N6{fill:#EEF1F8;} + .d2-2930989287 .fill-N7{fill:#FFFFFF;} + .d2-2930989287 .fill-B1{fill:#0D32B2;} + .d2-2930989287 .fill-B2{fill:#0D32B2;} + .d2-2930989287 .fill-B3{fill:#E3E9FD;} + .d2-2930989287 .fill-B4{fill:#E3E9FD;} + .d2-2930989287 .fill-B5{fill:#EDF0FD;} + .d2-2930989287 .fill-B6{fill:#F7F8FE;} + .d2-2930989287 .fill-AA2{fill:#4A6FF3;} + .d2-2930989287 .fill-AA4{fill:#EDF0FD;} + .d2-2930989287 .fill-AA5{fill:#F7F8FE;} + .d2-2930989287 .fill-AB4{fill:#EDF0FD;} + .d2-2930989287 .fill-AB5{fill:#F7F8FE;} + .d2-2930989287 .stroke-N1{stroke:#0A0F25;} + .d2-2930989287 .stroke-N2{stroke:#676C7E;} + .d2-2930989287 .stroke-N3{stroke:#9499AB;} + .d2-2930989287 .stroke-N4{stroke:#CFD2DD;} + .d2-2930989287 .stroke-N5{stroke:#DEE1EB;} + .d2-2930989287 .stroke-N6{stroke:#EEF1F8;} + .d2-2930989287 .stroke-N7{stroke:#FFFFFF;} + .d2-2930989287 .stroke-B1{stroke:#0D32B2;} + .d2-2930989287 .stroke-B2{stroke:#0D32B2;} + .d2-2930989287 .stroke-B3{stroke:#E3E9FD;} + .d2-2930989287 .stroke-B4{stroke:#E3E9FD;} + .d2-2930989287 .stroke-B5{stroke:#EDF0FD;} + .d2-2930989287 .stroke-B6{stroke:#F7F8FE;} + .d2-2930989287 .stroke-AA2{stroke:#4A6FF3;} + .d2-2930989287 .stroke-AA4{stroke:#EDF0FD;} + .d2-2930989287 .stroke-AA5{stroke:#F7F8FE;} + .d2-2930989287 .stroke-AB4{stroke:#EDF0FD;} + .d2-2930989287 .stroke-AB5{stroke:#F7F8FE;} + .d2-2930989287 .background-color-N1{background-color:#0A0F25;} + .d2-2930989287 .background-color-N2{background-color:#676C7E;} + .d2-2930989287 .background-color-N3{background-color:#9499AB;} + .d2-2930989287 .background-color-N4{background-color:#CFD2DD;} + .d2-2930989287 .background-color-N5{background-color:#DEE1EB;} + .d2-2930989287 .background-color-N6{background-color:#EEF1F8;} + .d2-2930989287 .background-color-N7{background-color:#FFFFFF;} + .d2-2930989287 .background-color-B1{background-color:#0D32B2;} + .d2-2930989287 .background-color-B2{background-color:#0D32B2;} + .d2-2930989287 .background-color-B3{background-color:#E3E9FD;} + .d2-2930989287 .background-color-B4{background-color:#E3E9FD;} + .d2-2930989287 .background-color-B5{background-color:#EDF0FD;} + .d2-2930989287 .background-color-B6{background-color:#F7F8FE;} + .d2-2930989287 .background-color-AA2{background-color:#4A6FF3;} + .d2-2930989287 .background-color-AA4{background-color:#EDF0FD;} + .d2-2930989287 .background-color-AA5{background-color:#F7F8FE;} + .d2-2930989287 .background-color-AB4{background-color:#EDF0FD;} + .d2-2930989287 .background-color-AB5{background-color:#F7F8FE;} + .d2-2930989287 .color-N1{color:#0A0F25;} + .d2-2930989287 .color-N2{color:#676C7E;} + .d2-2930989287 .color-N3{color:#9499AB;} + .d2-2930989287 .color-N4{color:#CFD2DD;} + .d2-2930989287 .color-N5{color:#DEE1EB;} + .d2-2930989287 .color-N6{color:#EEF1F8;} + .d2-2930989287 .color-N7{color:#FFFFFF;} + .d2-2930989287 .color-B1{color:#0D32B2;} + .d2-2930989287 .color-B2{color:#0D32B2;} + .d2-2930989287 .color-B3{color:#E3E9FD;} + .d2-2930989287 .color-B4{color:#E3E9FD;} + .d2-2930989287 .color-B5{color:#EDF0FD;} + .d2-2930989287 .color-B6{color:#F7F8FE;} + .d2-2930989287 .color-AA2{color:#4A6FF3;} + .d2-2930989287 .color-AA4{color:#EDF0FD;} + .d2-2930989287 .color-AA5{color:#F7F8FE;} + .d2-2930989287 .color-AB4{color:#EDF0FD;} + .d2-2930989287 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>aabbccddffiijjkkllnnssuuwwrmyyeegghhmmmmooppqqrrttvvxxzzabac 123456 + - + - - + + - - - + + + - - - - - - + + + + + + - - - - + + + + - + \ No newline at end of file diff --git a/e2etests/testdata/stable/nested_shape_labels/dagre/board.exp.json b/e2etests/testdata/stable/nested_shape_labels/dagre/board.exp.json index 80fede376a..2217f38301 100644 --- a/e2etests/testdata/stable/nested_shape_labels/dagre/board.exp.json +++ b/e2etests/testdata/stable/nested_shape_labels/dagre/board.exp.json @@ -92,7 +92,7 @@ "x": 166, "y": 0 }, - "width": 156, + "width": 157, "height": 192, "opacity": 1, "strokeDash": 0, @@ -133,8 +133,8 @@ "x": 206, "y": 58 }, - "width": 76, - "height": 76, + "width": 77, + "height": 77, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, diff --git a/e2etests/testdata/stable/nested_shape_labels/dagre/sketch.exp.svg b/e2etests/testdata/stable/nested_shape_labels/dagre/sketch.exp.svg index 3d966c1739..d939e4d552 100644 --- a/e2etests/testdata/stable/nested_shape_labels/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/nested_shape_labels/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -aaccbbdd - + .d2-2175518901 .fill-N1{fill:#0A0F25;} + .d2-2175518901 .fill-N2{fill:#676C7E;} + .d2-2175518901 .fill-N3{fill:#9499AB;} + .d2-2175518901 .fill-N4{fill:#CFD2DD;} + .d2-2175518901 .fill-N5{fill:#DEE1EB;} + .d2-2175518901 .fill-N6{fill:#EEF1F8;} + .d2-2175518901 .fill-N7{fill:#FFFFFF;} + .d2-2175518901 .fill-B1{fill:#0D32B2;} + .d2-2175518901 .fill-B2{fill:#0D32B2;} + .d2-2175518901 .fill-B3{fill:#E3E9FD;} + .d2-2175518901 .fill-B4{fill:#E3E9FD;} + .d2-2175518901 .fill-B5{fill:#EDF0FD;} + .d2-2175518901 .fill-B6{fill:#F7F8FE;} + .d2-2175518901 .fill-AA2{fill:#4A6FF3;} + .d2-2175518901 .fill-AA4{fill:#EDF0FD;} + .d2-2175518901 .fill-AA5{fill:#F7F8FE;} + .d2-2175518901 .fill-AB4{fill:#EDF0FD;} + .d2-2175518901 .fill-AB5{fill:#F7F8FE;} + .d2-2175518901 .stroke-N1{stroke:#0A0F25;} + .d2-2175518901 .stroke-N2{stroke:#676C7E;} + .d2-2175518901 .stroke-N3{stroke:#9499AB;} + .d2-2175518901 .stroke-N4{stroke:#CFD2DD;} + .d2-2175518901 .stroke-N5{stroke:#DEE1EB;} + .d2-2175518901 .stroke-N6{stroke:#EEF1F8;} + .d2-2175518901 .stroke-N7{stroke:#FFFFFF;} + .d2-2175518901 .stroke-B1{stroke:#0D32B2;} + .d2-2175518901 .stroke-B2{stroke:#0D32B2;} + .d2-2175518901 .stroke-B3{stroke:#E3E9FD;} + .d2-2175518901 .stroke-B4{stroke:#E3E9FD;} + .d2-2175518901 .stroke-B5{stroke:#EDF0FD;} + .d2-2175518901 .stroke-B6{stroke:#F7F8FE;} + .d2-2175518901 .stroke-AA2{stroke:#4A6FF3;} + .d2-2175518901 .stroke-AA4{stroke:#EDF0FD;} + .d2-2175518901 .stroke-AA5{stroke:#F7F8FE;} + .d2-2175518901 .stroke-AB4{stroke:#EDF0FD;} + .d2-2175518901 .stroke-AB5{stroke:#F7F8FE;} + .d2-2175518901 .background-color-N1{background-color:#0A0F25;} + .d2-2175518901 .background-color-N2{background-color:#676C7E;} + .d2-2175518901 .background-color-N3{background-color:#9499AB;} + .d2-2175518901 .background-color-N4{background-color:#CFD2DD;} + .d2-2175518901 .background-color-N5{background-color:#DEE1EB;} + .d2-2175518901 .background-color-N6{background-color:#EEF1F8;} + .d2-2175518901 .background-color-N7{background-color:#FFFFFF;} + .d2-2175518901 .background-color-B1{background-color:#0D32B2;} + .d2-2175518901 .background-color-B2{background-color:#0D32B2;} + .d2-2175518901 .background-color-B3{background-color:#E3E9FD;} + .d2-2175518901 .background-color-B4{background-color:#E3E9FD;} + .d2-2175518901 .background-color-B5{background-color:#EDF0FD;} + .d2-2175518901 .background-color-B6{background-color:#F7F8FE;} + .d2-2175518901 .background-color-AA2{background-color:#4A6FF3;} + .d2-2175518901 .background-color-AA4{background-color:#EDF0FD;} + .d2-2175518901 .background-color-AA5{background-color:#F7F8FE;} + .d2-2175518901 .background-color-AB4{background-color:#EDF0FD;} + .d2-2175518901 .background-color-AB5{background-color:#F7F8FE;} + .d2-2175518901 .color-N1{color:#0A0F25;} + .d2-2175518901 .color-N2{color:#676C7E;} + .d2-2175518901 .color-N3{color:#9499AB;} + .d2-2175518901 .color-N4{color:#CFD2DD;} + .d2-2175518901 .color-N5{color:#DEE1EB;} + .d2-2175518901 .color-N6{color:#EEF1F8;} + .d2-2175518901 .color-N7{color:#FFFFFF;} + .d2-2175518901 .color-B1{color:#0D32B2;} + .d2-2175518901 .color-B2{color:#0D32B2;} + .d2-2175518901 .color-B3{color:#E3E9FD;} + .d2-2175518901 .color-B4{color:#E3E9FD;} + .d2-2175518901 .color-B5{color:#EDF0FD;} + .d2-2175518901 .color-B6{color:#F7F8FE;} + .d2-2175518901 .color-AA2{color:#4A6FF3;} + .d2-2175518901 .color-AA4{color:#EDF0FD;} + .d2-2175518901 .color-AA5{color:#F7F8FE;} + .d2-2175518901 .color-AB4{color:#EDF0FD;} + .d2-2175518901 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>aaccbbdd + - + - + \ No newline at end of file diff --git a/e2etests/testdata/stable/nested_shape_labels/elk/board.exp.json b/e2etests/testdata/stable/nested_shape_labels/elk/board.exp.json index 89fb2b14c9..f9ebb73f3c 100644 --- a/e2etests/testdata/stable/nested_shape_labels/elk/board.exp.json +++ b/e2etests/testdata/stable/nested_shape_labels/elk/board.exp.json @@ -8,7 +8,7 @@ "type": "package", "pos": { "x": 12, - "y": 17 + "y": 18 }, "width": 166, "height": 234, @@ -49,7 +49,7 @@ "type": "diamond", "pos": { "x": 62, - "y": 109 + "y": 110 }, "width": 66, "height": 92, @@ -92,8 +92,8 @@ "x": 198, "y": 12 }, - "width": 176, - "height": 244, + "width": 177, + "height": 247, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -131,10 +131,10 @@ "type": "oval", "pos": { "x": 248, - "y": 119 + "y": 120 }, - "width": 76, - "height": 76, + "width": 77, + "height": 77, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, diff --git a/e2etests/testdata/stable/nested_shape_labels/elk/sketch.exp.svg b/e2etests/testdata/stable/nested_shape_labels/elk/sketch.exp.svg index ce3ce80445..fd0e11a156 100644 --- a/e2etests/testdata/stable/nested_shape_labels/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/nested_shape_labels/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -aaccbbdd - - - - - + .d2-1759373644 .fill-N1{fill:#0A0F25;} + .d2-1759373644 .fill-N2{fill:#676C7E;} + .d2-1759373644 .fill-N3{fill:#9499AB;} + .d2-1759373644 .fill-N4{fill:#CFD2DD;} + .d2-1759373644 .fill-N5{fill:#DEE1EB;} + .d2-1759373644 .fill-N6{fill:#EEF1F8;} + .d2-1759373644 .fill-N7{fill:#FFFFFF;} + .d2-1759373644 .fill-B1{fill:#0D32B2;} + .d2-1759373644 .fill-B2{fill:#0D32B2;} + .d2-1759373644 .fill-B3{fill:#E3E9FD;} + .d2-1759373644 .fill-B4{fill:#E3E9FD;} + .d2-1759373644 .fill-B5{fill:#EDF0FD;} + .d2-1759373644 .fill-B6{fill:#F7F8FE;} + .d2-1759373644 .fill-AA2{fill:#4A6FF3;} + .d2-1759373644 .fill-AA4{fill:#EDF0FD;} + .d2-1759373644 .fill-AA5{fill:#F7F8FE;} + .d2-1759373644 .fill-AB4{fill:#EDF0FD;} + .d2-1759373644 .fill-AB5{fill:#F7F8FE;} + .d2-1759373644 .stroke-N1{stroke:#0A0F25;} + .d2-1759373644 .stroke-N2{stroke:#676C7E;} + .d2-1759373644 .stroke-N3{stroke:#9499AB;} + .d2-1759373644 .stroke-N4{stroke:#CFD2DD;} + .d2-1759373644 .stroke-N5{stroke:#DEE1EB;} + .d2-1759373644 .stroke-N6{stroke:#EEF1F8;} + .d2-1759373644 .stroke-N7{stroke:#FFFFFF;} + .d2-1759373644 .stroke-B1{stroke:#0D32B2;} + .d2-1759373644 .stroke-B2{stroke:#0D32B2;} + .d2-1759373644 .stroke-B3{stroke:#E3E9FD;} + .d2-1759373644 .stroke-B4{stroke:#E3E9FD;} + .d2-1759373644 .stroke-B5{stroke:#EDF0FD;} + .d2-1759373644 .stroke-B6{stroke:#F7F8FE;} + .d2-1759373644 .stroke-AA2{stroke:#4A6FF3;} + .d2-1759373644 .stroke-AA4{stroke:#EDF0FD;} + .d2-1759373644 .stroke-AA5{stroke:#F7F8FE;} + .d2-1759373644 .stroke-AB4{stroke:#EDF0FD;} + .d2-1759373644 .stroke-AB5{stroke:#F7F8FE;} + .d2-1759373644 .background-color-N1{background-color:#0A0F25;} + .d2-1759373644 .background-color-N2{background-color:#676C7E;} + .d2-1759373644 .background-color-N3{background-color:#9499AB;} + .d2-1759373644 .background-color-N4{background-color:#CFD2DD;} + .d2-1759373644 .background-color-N5{background-color:#DEE1EB;} + .d2-1759373644 .background-color-N6{background-color:#EEF1F8;} + .d2-1759373644 .background-color-N7{background-color:#FFFFFF;} + .d2-1759373644 .background-color-B1{background-color:#0D32B2;} + .d2-1759373644 .background-color-B2{background-color:#0D32B2;} + .d2-1759373644 .background-color-B3{background-color:#E3E9FD;} + .d2-1759373644 .background-color-B4{background-color:#E3E9FD;} + .d2-1759373644 .background-color-B5{background-color:#EDF0FD;} + .d2-1759373644 .background-color-B6{background-color:#F7F8FE;} + .d2-1759373644 .background-color-AA2{background-color:#4A6FF3;} + .d2-1759373644 .background-color-AA4{background-color:#EDF0FD;} + .d2-1759373644 .background-color-AA5{background-color:#F7F8FE;} + .d2-1759373644 .background-color-AB4{background-color:#EDF0FD;} + .d2-1759373644 .background-color-AB5{background-color:#F7F8FE;} + .d2-1759373644 .color-N1{color:#0A0F25;} + .d2-1759373644 .color-N2{color:#676C7E;} + .d2-1759373644 .color-N3{color:#9499AB;} + .d2-1759373644 .color-N4{color:#CFD2DD;} + .d2-1759373644 .color-N5{color:#DEE1EB;} + .d2-1759373644 .color-N6{color:#EEF1F8;} + .d2-1759373644 .color-N7{color:#FFFFFF;} + .d2-1759373644 .color-B1{color:#0D32B2;} + .d2-1759373644 .color-B2{color:#0D32B2;} + .d2-1759373644 .color-B3{color:#E3E9FD;} + .d2-1759373644 .color-B4{color:#E3E9FD;} + .d2-1759373644 .color-B5{color:#EDF0FD;} + .d2-1759373644 .color-B6{color:#F7F8FE;} + .d2-1759373644 .color-AA2{color:#4A6FF3;} + .d2-1759373644 .color-AA4{color:#EDF0FD;} + .d2-1759373644 .color-AA5{color:#F7F8FE;} + .d2-1759373644 .color-AB4{color:#EDF0FD;} + .d2-1759373644 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>aaccbbdd + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/nesting_power/dagre/board.exp.json b/e2etests/testdata/stable/nesting_power/dagre/board.exp.json index c657f6a96a..5d9d282675 100644 --- a/e2etests/testdata/stable/nesting_power/dagre/board.exp.json +++ b/e2etests/testdata/stable/nesting_power/dagre/board.exp.json @@ -8,7 +8,7 @@ "type": "rectangle", "pos": { "x": -2526, - "y": 736 + "y": 748 }, "width": 2508, "height": 938, @@ -49,7 +49,7 @@ "type": "rectangle", "pos": { "x": -2496, - "y": 1120 + "y": 1132 }, "width": 559, "height": 189, @@ -90,7 +90,7 @@ "type": "rectangle", "pos": { "x": -1760, - "y": 1213 + "y": 1225 }, "width": 90, "height": 66, @@ -131,7 +131,7 @@ "type": "rectangle", "pos": { "x": -1570, - "y": 766 + "y": 778 }, "width": 1522, "height": 878, @@ -172,7 +172,7 @@ "type": "rectangle", "pos": { "x": -2466, - "y": 1213 + "y": 1225 }, "width": 86, "height": 66, @@ -213,7 +213,7 @@ "type": "rectangle", "pos": { "x": -2264, - "y": 1192 + "y": 1204 }, "width": 67, "height": 66, @@ -254,7 +254,7 @@ "type": "rectangle", "pos": { "x": -2040, - "y": 1150 + "y": 1162 }, "width": 73, "height": 66, @@ -295,7 +295,7 @@ "type": "rectangle", "pos": { "x": -1510, - "y": 826 + "y": 838 }, "width": 204, "height": 758, @@ -336,7 +336,7 @@ "type": "rectangle", "pos": { "x": -1266, - "y": 857 + "y": 869 }, "width": 242, "height": 727, @@ -377,7 +377,7 @@ "type": "rectangle", "pos": { "x": -1450, - "y": 886 + "y": 898 }, "width": 84, "height": 66, @@ -418,7 +418,7 @@ "type": "rectangle", "pos": { "x": -1450, - "y": 992 + "y": 1004 }, "width": 84, "height": 66, @@ -459,7 +459,7 @@ "type": "rectangle", "pos": { "x": -1450, - "y": 1098 + "y": 1110 }, "width": 84, "height": 66, @@ -500,7 +500,7 @@ "type": "rectangle", "pos": { "x": -1450, - "y": 1204 + "y": 1216 }, "width": 84, "height": 66, @@ -541,7 +541,7 @@ "type": "rectangle", "pos": { "x": -1450, - "y": 1310 + "y": 1322 }, "width": 84, "height": 66, @@ -582,7 +582,7 @@ "type": "sequence_diagram", "pos": { "x": -984, - "y": 826 + "y": 838 }, "width": 876, "height": 758, @@ -623,7 +623,7 @@ "type": "rectangle", "pos": { "x": -972, - "y": 1226 + "y": 1238 }, "width": 100, "height": 66, @@ -664,7 +664,7 @@ "type": "rectangle", "pos": { "x": -822, - "y": 1226 + "y": 1238 }, "width": 100, "height": 66, @@ -705,7 +705,7 @@ "type": "rectangle", "pos": { "x": -682, - "y": 1226 + "y": 1238 }, "width": 168, "height": 66, @@ -746,7 +746,7 @@ "type": "rectangle", "pos": { "x": -604, - "y": 1422 + "y": 1434 }, "width": 12, "height": 90, @@ -786,7 +786,7 @@ "type": "rectangle", "pos": { "x": -474, - "y": 904 + "y": 916 }, "width": 354, "height": 388, @@ -827,7 +827,7 @@ "type": "rectangle", "pos": { "x": -474, - "y": 935 + "y": 947 }, "width": 77, "height": 66, @@ -868,7 +868,7 @@ "type": "rectangle", "pos": { "x": -397, - "y": 935 + "y": 947 }, "width": 277, "height": 66, @@ -909,7 +909,7 @@ "type": "rectangle", "pos": { "x": -474, - "y": 1001 + "y": 1013 }, "width": 77, "height": 291, @@ -950,7 +950,7 @@ "type": "rectangle", "pos": { "x": -464, - "y": 1032 + "y": 1044 }, "width": 53, "height": 66, @@ -991,7 +991,7 @@ "type": "rectangle", "pos": { "x": -464, - "y": 1118 + "y": 1130 }, "width": 53, "height": 66, @@ -1032,7 +1032,7 @@ "type": "rectangle", "pos": { "x": -464, - "y": 1204 + "y": 1216 }, "width": 53, "height": 66, @@ -1073,7 +1073,7 @@ "type": "sequence_diagram", "pos": { "x": -397, - "y": 1001 + "y": 1013 }, "width": 277, "height": 291, @@ -1114,7 +1114,7 @@ "type": "rectangle", "pos": { "x": -385, - "y": 1074 + "y": 1086 }, "width": 105, "height": 66, @@ -1155,7 +1155,7 @@ "type": "rectangle", "pos": { "x": -232, - "y": 1074 + "y": 1086 }, "width": 100, "height": 66, @@ -1196,7 +1196,7 @@ "type": "rectangle", "pos": { "x": -1236, - "y": 888 + "y": 900 }, "width": 182, "height": 126, @@ -1237,7 +1237,7 @@ "type": "rectangle", "pos": { "x": -1206, - "y": 918 + "y": 930 }, "width": 122, "height": 66, @@ -1319,7 +1319,7 @@ "type": "rectangle", "pos": { "x": 2, - "y": 951 + "y": 963 }, "width": 574, "height": 1265, @@ -1933,11 +1933,11 @@ "id": "center.circle", "type": "oval", "pos": { - "x": 2331, - "y": 450 + "x": 2325, + "y": 444 }, - "width": 91, - "height": 91, + "width": 103, + "height": 103, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -2057,7 +2057,7 @@ "type": "rectangle", "pos": { "x": 62, - "y": 1047 + "y": 1059 }, "width": 454, "height": 252, @@ -2098,7 +2098,7 @@ "type": "rectangle", "pos": { "x": 92, - "y": 1140 + "y": 1152 }, "width": 52, "height": 66, @@ -2139,7 +2139,7 @@ "type": "rectangle", "pos": { "x": 244, - "y": 1140 + "y": 1152 }, "width": 53, "height": 66, @@ -2180,7 +2180,7 @@ "type": "rectangle", "pos": { "x": 398, - "y": 1077 + "y": 1089 }, "width": 53, "height": 66, @@ -2221,7 +2221,7 @@ "type": "rectangle", "pos": { "x": 397, - "y": 1203 + "y": 1215 }, "width": 54, "height": 66, @@ -2262,7 +2262,7 @@ "type": "rectangle", "pos": { "x": 62, - "y": 1375 + "y": 1387 }, "width": 454, "height": 252, @@ -2303,7 +2303,7 @@ "type": "rectangle", "pos": { "x": 399, - "y": 1468 + "y": 1480 }, "width": 52, "height": 66, @@ -2344,7 +2344,7 @@ "type": "rectangle", "pos": { "x": 246, - "y": 1468 + "y": 1480 }, "width": 53, "height": 66, @@ -2385,7 +2385,7 @@ "type": "rectangle", "pos": { "x": 93, - "y": 1405 + "y": 1417 }, "width": 53, "height": 66, @@ -2426,7 +2426,7 @@ "type": "rectangle", "pos": { "x": 92, - "y": 1531 + "y": 1543 }, "width": 54, "height": 66, @@ -2467,7 +2467,7 @@ "type": "rectangle", "pos": { "x": 62, - "y": 1667 + "y": 1679 }, "width": 454, "height": 489, @@ -2507,7 +2507,7 @@ "type": "rectangle", "pos": { "x": 62, - "y": 1698 + "y": 1710 }, "width": 227, "height": 458, @@ -2548,7 +2548,7 @@ "type": "rectangle", "pos": { "x": 149, - "y": 2060 + "y": 2072 }, "width": 52, "height": 66, @@ -2589,7 +2589,7 @@ "type": "rectangle", "pos": { "x": 149, - "y": 1894 + "y": 1906 }, "width": 53, "height": 66, @@ -2630,7 +2630,7 @@ "type": "rectangle", "pos": { "x": 92, - "y": 1728 + "y": 1740 }, "width": 53, "height": 66, @@ -2671,7 +2671,7 @@ "type": "rectangle", "pos": { "x": 205, - "y": 1728 + "y": 1740 }, "width": 54, "height": 66, @@ -2712,7 +2712,7 @@ "type": "rectangle", "pos": { "x": 289, - "y": 1698 + "y": 1710 }, "width": 227, "height": 458, @@ -2753,7 +2753,7 @@ "type": "rectangle", "pos": { "x": 376, - "y": 1728 + "y": 1740 }, "width": 52, "height": 66, @@ -2794,7 +2794,7 @@ "type": "rectangle", "pos": { "x": 376, - "y": 1894 + "y": 1906 }, "width": 53, "height": 66, @@ -2835,7 +2835,7 @@ "type": "rectangle", "pos": { "x": 319, - "y": 2060 + "y": 2072 }, "width": 53, "height": 66, @@ -2876,7 +2876,7 @@ "type": "rectangle", "pos": { "x": 432, - "y": 2060 + "y": 2072 }, "width": 54, "height": 66, @@ -2917,7 +2917,7 @@ "type": "rectangle", "pos": { "x": 3634, - "y": 1064 + "y": 1076 }, "width": 733, "height": 282, @@ -2958,7 +2958,7 @@ "type": "rectangle", "pos": { "x": 3694, - "y": 1124 + "y": 1136 }, "width": 57, "height": 162, @@ -2999,7 +2999,7 @@ "type": "rectangle", "pos": { "x": 3791, - "y": 1160 + "y": 1172 }, "width": 137, "height": 126, @@ -3040,7 +3040,7 @@ "type": "rectangle", "pos": { "x": 3821, - "y": 1190 + "y": 1202 }, "width": 77, "height": 66, @@ -3081,7 +3081,7 @@ "type": "rectangle", "pos": { "x": 3968, - "y": 1124 + "y": 1136 }, "width": 72, "height": 162, @@ -3122,7 +3122,7 @@ "type": "rectangle", "pos": { "x": 4080, - "y": 1160 + "y": 1172 }, "width": 113, "height": 126, @@ -3163,7 +3163,7 @@ "type": "rectangle", "pos": { "x": 4110, - "y": 1190 + "y": 1202 }, "width": 53, "height": 66, @@ -3204,7 +3204,7 @@ "type": "rectangle", "pos": { "x": 4233, - "y": 1124 + "y": 1136 }, "width": 74, "height": 162, @@ -3245,7 +3245,7 @@ "type": "sequence_diagram", "pos": { "x": 636, - "y": 1151 + "y": 1162 }, "width": 917, "height": 866, @@ -3286,7 +3286,7 @@ "type": "rectangle", "pos": { "x": 648, - "y": 1239 + "y": 1250 }, "width": 100, "height": 66, @@ -3327,7 +3327,7 @@ "type": "rectangle", "pos": { "x": 692, - "y": 1785 + "y": 1796 }, "width": 12, "height": 30, @@ -3367,7 +3367,7 @@ "type": "rectangle", "pos": { "x": 788, - "y": 1239 + "y": 1250 }, "width": 140, "height": 66, @@ -3408,7 +3408,7 @@ "type": "rectangle", "pos": { "x": 852, - "y": 1365 + "y": 1376 }, "width": 12, "height": 90, @@ -3448,7 +3448,7 @@ "type": "rectangle", "pos": { "x": 958, - "y": 1239 + "y": 1250 }, "width": 100, "height": 66, @@ -3489,7 +3489,7 @@ "type": "rectangle", "pos": { "x": 1002, - "y": 1425 + "y": 1436 }, "width": 12, "height": 380, @@ -3529,7 +3529,7 @@ "type": "rectangle", "pos": { "x": 998, - "y": 1435 + "y": 1446 }, "width": 20, "height": 90, @@ -3569,7 +3569,7 @@ "type": "rectangle", "pos": { "x": 1098, - "y": 1239 + "y": 1250 }, "width": 126, "height": 66, @@ -3610,7 +3610,7 @@ "type": "rectangle", "pos": { "x": 1155, - "y": 1485 + "y": 1496 }, "width": 12, "height": 190, @@ -3650,7 +3650,7 @@ "type": "rectangle", "pos": { "x": 1151, - "y": 1495 + "y": 1506 }, "width": 20, "height": 170, @@ -3690,7 +3690,7 @@ "type": "rectangle", "pos": { "x": 1147, - "y": 1505 + "y": 1516 }, "width": 28, "height": 90, @@ -3730,7 +3730,7 @@ "type": "rectangle", "pos": { "x": 1264, - "y": 1239 + "y": 1250 }, "width": 100, "height": 66, @@ -3771,7 +3771,7 @@ "type": "rectangle", "pos": { "x": 1308, - "y": 1545 + "y": 1556 }, "width": 12, "height": 220, @@ -3811,7 +3811,7 @@ "type": "rectangle", "pos": { "x": 1304, - "y": 1555 + "y": 1566 }, "width": 20, "height": 200, @@ -3851,7 +3851,7 @@ "type": "rectangle", "pos": { "x": 1300, - "y": 1565 + "y": 1576 }, "width": 28, "height": 180, @@ -3891,7 +3891,7 @@ "type": "rectangle", "pos": { "x": 1296, - "y": 1575 + "y": 1586 }, "width": 36, "height": 160, @@ -3931,7 +3931,7 @@ "type": "rectangle", "pos": { "x": 1404, - "y": 1239 + "y": 1250 }, "width": 137, "height": 66, @@ -3972,7 +3972,7 @@ "type": "rectangle", "pos": { "x": 1466, - "y": 1675 + "y": 1686 }, "width": 12, "height": 240, @@ -4012,7 +4012,7 @@ "type": "rectangle", "pos": { "x": 1462, - "y": 1685 + "y": 1696 }, "width": 20, "height": 220, @@ -4052,7 +4052,7 @@ "type": "rectangle", "pos": { "x": 1458, - "y": 1695 + "y": 1706 }, "width": 28, "height": 200, @@ -4092,7 +4092,7 @@ "type": "rectangle", "pos": { "x": 1454, - "y": 1705 + "y": 1716 }, "width": 36, "height": 180, @@ -4132,7 +4132,7 @@ "type": "rectangle", "pos": { "x": 1450, - "y": 1715 + "y": 1726 }, "width": 44, "height": 160, @@ -4172,7 +4172,7 @@ "type": "rectangle", "pos": { "x": 852, - "y": 1925 + "y": 1936 }, "width": 12, "height": 30, @@ -4215,7 +4215,7 @@ "y": 725 }, "width": 2001, - "height": 1717, + "height": 1740, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -4379,7 +4379,7 @@ "y": 1062 }, "width": 1881, - "height": 1320, + "height": 1343, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -4417,7 +4417,7 @@ "type": "sequence_diagram", "pos": { "x": 1703, - "y": 1350 + "y": 1373 }, "width": 777, "height": 786, @@ -4457,11 +4457,11 @@ "id": "more.container.a_shape", "type": "oval", "pos": { - "x": 2505, + "x": 2494, "y": 1092 }, - "width": 108, - "height": 108, + "width": 131, + "height": 131, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -4499,7 +4499,7 @@ "type": "rectangle", "pos": { "x": 1715, - "y": 1428 + "y": 1451 }, "width": 100, "height": 66, @@ -4540,7 +4540,7 @@ "type": "rectangle", "pos": { "x": 1759, - "y": 1554 + "y": 1577 }, "width": 12, "height": 300, @@ -4580,7 +4580,7 @@ "type": "rectangle", "pos": { "x": 1855, - "y": 1428 + "y": 1451 }, "width": 140, "height": 66, @@ -4621,7 +4621,7 @@ "type": "rectangle", "pos": { "x": 1919, - "y": 1554 + "y": 1577 }, "width": 12, "height": 90, @@ -4661,7 +4661,7 @@ "type": "rectangle", "pos": { "x": 2025, - "y": 1428 + "y": 1451 }, "width": 100, "height": 66, @@ -4702,7 +4702,7 @@ "type": "rectangle", "pos": { "x": 2069, - "y": 1694 + "y": 1717 }, "width": 12, "height": 90, @@ -4742,7 +4742,7 @@ "type": "rectangle", "pos": { "x": 2165, - "y": 1428 + "y": 1451 }, "width": 126, "height": 66, @@ -4783,7 +4783,7 @@ "type": "rectangle", "pos": { "x": 2222, - "y": 1834 + "y": 1857 }, "width": 12, "height": 230, @@ -4823,7 +4823,7 @@ "type": "rectangle", "pos": { "x": 2218, - "y": 1904 + "y": 1927 }, "width": 20, "height": 90, @@ -4863,7 +4863,7 @@ "type": "rectangle", "pos": { "x": 2368, - "y": 1428 + "y": 1451 }, "width": 100, "height": 66, @@ -4904,7 +4904,7 @@ "type": "rectangle", "pos": { "x": 2412, - "y": 1974 + "y": 1997 }, "width": 12, "height": 30, @@ -4944,7 +4944,7 @@ "type": "rectangle", "pos": { "x": 2503, - "y": 2286 + "y": 2309 }, "width": 112, "height": 66, @@ -4985,7 +4985,7 @@ "type": "queue", "pos": { "x": 2520, - "y": 1300 + "y": 1323 }, "width": 1014, "height": 886, @@ -5026,7 +5026,7 @@ "type": "sequence_diagram", "pos": { "x": 2560, - "y": 1353 + "y": 1376 }, "width": 934, "height": 781, @@ -5067,7 +5067,7 @@ "type": "rectangle", "pos": { "x": 2572, - "y": 1426 + "y": 1449 }, "width": 100, "height": 66, @@ -5108,7 +5108,7 @@ "type": "rectangle", "pos": { "x": 2722, - "y": 1426 + "y": 1449 }, "width": 100, "height": 66, @@ -5149,7 +5149,7 @@ "type": "rectangle", "pos": { "x": 2862, - "y": 1426 + "y": 1449 }, "width": 126, "height": 66, @@ -5190,7 +5190,7 @@ "type": "rectangle", "pos": { "x": 3025, - "y": 1426 + "y": 1449 }, "width": 100, "height": 66, @@ -5231,7 +5231,7 @@ "type": "rectangle", "pos": { "x": 3165, - "y": 1426 + "y": 1449 }, "width": 137, "height": 66, @@ -5272,7 +5272,7 @@ "type": "rectangle", "pos": { "x": 3342, - "y": 1426 + "y": 1449 }, "width": 140, "height": 66, @@ -5313,7 +5313,7 @@ "type": "rectangle", "pos": { "x": 3406, - "y": 1552 + "y": 1575 }, "width": 12, "height": 30, @@ -5353,7 +5353,7 @@ "type": "rectangle", "pos": { "x": 3069, - "y": 1542 + "y": 1565 }, "width": 12, "height": 380, @@ -5393,7 +5393,7 @@ "type": "rectangle", "pos": { "x": 3065, - "y": 1552 + "y": 1575 }, "width": 20, "height": 90, @@ -5433,7 +5433,7 @@ "type": "rectangle", "pos": { "x": 2919, - "y": 1602 + "y": 1625 }, "width": 12, "height": 190, @@ -5473,7 +5473,7 @@ "type": "rectangle", "pos": { "x": 2915, - "y": 1612 + "y": 1635 }, "width": 20, "height": 170, @@ -5513,7 +5513,7 @@ "type": "rectangle", "pos": { "x": 2911, - "y": 1622 + "y": 1645 }, "width": 28, "height": 90, @@ -5553,7 +5553,7 @@ "type": "rectangle", "pos": { "x": 2766, - "y": 1662 + "y": 1685 }, "width": 12, "height": 220, @@ -5593,7 +5593,7 @@ "type": "rectangle", "pos": { "x": 2762, - "y": 1672 + "y": 1695 }, "width": 20, "height": 200, @@ -5633,7 +5633,7 @@ "type": "rectangle", "pos": { "x": 2758, - "y": 1682 + "y": 1705 }, "width": 28, "height": 180, @@ -5673,7 +5673,7 @@ "type": "rectangle", "pos": { "x": 2754, - "y": 1692 + "y": 1715 }, "width": 36, "height": 160, @@ -5713,7 +5713,7 @@ "type": "rectangle", "pos": { "x": 3227, - "y": 1792 + "y": 1815 }, "width": 12, "height": 240, @@ -5753,7 +5753,7 @@ "type": "rectangle", "pos": { "x": 3223, - "y": 1802 + "y": 1825 }, "width": 20, "height": 220, @@ -5793,7 +5793,7 @@ "type": "rectangle", "pos": { "x": 3219, - "y": 1812 + "y": 1835 }, "width": 28, "height": 200, @@ -5833,7 +5833,7 @@ "type": "rectangle", "pos": { "x": 3215, - "y": 1822 + "y": 1845 }, "width": 36, "height": 180, @@ -5873,7 +5873,7 @@ "type": "rectangle", "pos": { "x": 3211, - "y": 1832 + "y": 1855 }, "width": 44, "height": 160, @@ -5913,7 +5913,7 @@ "type": "rectangle", "pos": { "x": 2616, - "y": 1902 + "y": 1925 }, "width": 12, "height": 30, @@ -5953,7 +5953,7 @@ "type": "rectangle", "pos": { "x": 3406, - "y": 2042 + "y": 2065 }, "width": 12, "height": 30, @@ -5993,7 +5993,7 @@ "type": "rectangle", "pos": { "x": -389, - "y": 2498 + "y": 2521 }, "width": 371, "height": 263, @@ -6034,7 +6034,7 @@ "type": "rectangle", "pos": { "x": -369, - "y": 2539 + "y": 2562 }, "width": 331, "height": 192, @@ -6075,7 +6075,7 @@ "type": "rectangle", "pos": { "x": -339, - "y": 2575 + "y": 2598 }, "width": 271, "height": 126, @@ -6116,7 +6116,7 @@ "type": "rectangle", "pos": { "x": -309, - "y": 2605 + "y": 2628 }, "width": 211, "height": 66, @@ -6180,19 +6180,19 @@ "route": [ { "x": -1937.5, - "y": 1163 + "y": 1174.5 }, { "x": -1858.300048828125, - "y": 1163 + "y": 1174.5 }, { "x": -1822.699951171875, - "y": 1173.5999755859375 + "y": 1185.0999755859375 }, { "x": -1759.5, - "y": 1216 + "y": 1227.5 } ], "isCurve": true, @@ -6227,19 +6227,19 @@ "route": [ { "x": -1670, - "y": 1246.5 + "y": 1258 }, { "x": -1630, - "y": 1246.5 + "y": 1258 }, { "x": -1610, - "y": 1246.5 + "y": 1258 }, { "x": -1570, - "y": 1246.5 + "y": 1258 } ], "isCurve": true, @@ -6274,19 +6274,19 @@ "route": [ { "x": -2380, - "y": 1237 + "y": 1248.5 }, { "x": -2333.60009765625, - "y": 1227.4000244140625 + "y": 1238.9000244140625 }, { "x": -2310.39990234375, - "y": 1225 + "y": 1236.5 }, { "x": -2264, - "y": 1225 + "y": 1236.5 } ], "isCurve": true, @@ -6321,19 +6321,19 @@ "route": [ { "x": -2197.5, - "y": 1212.25 + "y": 1223.75 }, { "x": -2134.300048828125, - "y": 1189.050048828125 + "y": 1200.550048828125 }, { "x": -2102.699951171875, - "y": 1183.25 + "y": 1194.75 }, { "x": -2039.5, - "y": 1183.25 + "y": 1194.75 } ], "isCurve": true, @@ -6368,19 +6368,19 @@ "route": [ { "x": -1967, - "y": 1192.75 + "y": 1204.25 }, { "x": -1927, - "y": 1202.3499755859375 + "y": 1213.8499755859375 }, { "x": -1822.699951171875, - "y": 1210.1500244140625 + "y": 1221.6500244140625 }, { "x": -1759.5, - "y": 1231.75 + "y": 1243.25 } ], "isCurve": true, @@ -6415,67 +6415,67 @@ "route": [ { "x": -2380, - "y": 1277.5 + "y": 1289 }, { "x": -2333.60009765625, - "y": 1310.300048828125 + "y": 1321.800048828125 }, { "x": -2303.699951171875, - "y": 1318.5 + "y": 1330 }, { "x": -2276.25, - "y": 1318.5 + "y": 1330 }, { "x": -2248.800048828125, - "y": 1318.5 + "y": 1330 }, { "x": -2208.10009765625, - "y": 1318.5 + "y": 1330 }, { "x": -2174.5, - "y": 1318.5 + "y": 1330 }, { "x": -2140.89990234375, - "y": 1318.5 + "y": 1330 }, { "x": -2095.5, - "y": 1318.5 + "y": 1330 }, { "x": -2061, - "y": 1318.5 + "y": 1330 }, { "x": -2026.5, - "y": 1318.5 + "y": 1330 }, { "x": -1986.199951171875, - "y": 1318.5 + "y": 1330 }, { "x": -1960.25, - "y": 1318.5 + "y": 1330 }, { "x": -1934.300048828125, - "y": 1318.5 + "y": 1330 }, { "x": -1822.699951171875, - "y": 1309.300048828125 + "y": 1320.800048828125 }, { "x": -1759.5, - "y": 1272.5 + "y": 1284 } ], "isCurve": true, @@ -6510,43 +6510,43 @@ "route": [ { "x": -2197.5, - "y": 1237.75 + "y": 1249.25 }, { "x": -2134.300048828125, - "y": 1260.949951171875 + "y": 1272.449951171875 }, { "x": -2095.5, - "y": 1266.75 + "y": 1278.25 }, { "x": -2061, - "y": 1266.75 + "y": 1278.25 }, { "x": -2026.5, - "y": 1266.75 + "y": 1278.25 }, { "x": -1986.199951171875, - "y": 1266.75 + "y": 1278.25 }, { "x": -1960.25, - "y": 1266.75 + "y": 1278.25 }, { "x": -1934.300048828125, - "y": 1266.75 + "y": 1278.25 }, { "x": -1822.699951171875, - "y": 1264.1500244140625 + "y": 1275.6500244140625 }, { "x": -1759.5, - "y": 1253.75 + "y": 1265.25 } ], "isCurve": true, @@ -6581,11 +6581,11 @@ "route": [ { "x": -1306, - "y": 1212 + "y": 1223.5 }, { "x": -1266, - "y": 1214 + "y": 1225.5 } ], "animated": false, @@ -6619,11 +6619,11 @@ "route": [ { "x": -1408, - "y": 952.5 + "y": 964 }, { "x": -1408, - "y": 992.5 + "y": 1004 } ], "animated": false, @@ -6657,11 +6657,11 @@ "route": [ { "x": -1408, - "y": 1058.5 + "y": 1070 }, { "x": -1408, - "y": 1098.5 + "y": 1110 } ], "animated": false, @@ -6695,11 +6695,11 @@ "route": [ { "x": -1408, - "y": 1164.5 + "y": 1176 }, { "x": -1408, - "y": 1204.5 + "y": 1216 } ], "animated": false, @@ -6733,11 +6733,11 @@ "route": [ { "x": -1408, - "y": 1270.5 + "y": 1282 }, { "x": -1408, - "y": 1310.5 + "y": 1322 } ], "animated": false, @@ -6771,11 +6771,11 @@ "route": [ { "x": -1024, - "y": 1217.5 + "y": 1229 }, { "x": -984, - "y": 1216.5 + "y": 1228 } ], "animated": false, @@ -6809,11 +6809,11 @@ "route": [ { "x": -922, - "y": 1362.5 + "y": 1374 }, { "x": -772, - "y": 1362.5 + "y": 1374 } ], "animated": false, @@ -6847,11 +6847,11 @@ "route": [ { "x": -772, - "y": 1432.5 + "y": 1444 }, { "x": -604, - "y": 1432.5 + "y": 1444 } ], "animated": false, @@ -6885,11 +6885,11 @@ "route": [ { "x": -592, - "y": 1502.5 + "y": 1514 }, { "x": -297, - "y": 1502.5 + "y": 1514 } ], "animated": false, @@ -6923,11 +6923,11 @@ "route": [ { "x": -437.5, - "y": 1098.5 + "y": 1110 }, { "x": -437.5, - "y": 1118.5 + "y": 1130 } ], "animated": false, @@ -6961,11 +6961,11 @@ "route": [ { "x": -437.5, - "y": 1184.5 + "y": 1196 }, { "x": -437.5, - "y": 1204.5 + "y": 1216 } ], "animated": false, @@ -6999,11 +6999,11 @@ "route": [ { "x": -332.5, - "y": 1210.5 + "y": 1222 }, { "x": -182, - "y": 1210.5 + "y": 1222 } ], "animated": false, @@ -7040,11 +7040,11 @@ "route": [ { "x": -220, - "y": 1140.5 + "y": 1152 }, { "x": -592, - "y": 1462.5 + "y": 1474 } ], "animated": false, @@ -7081,11 +7081,11 @@ "route": [ { "x": -1366, - "y": 1013.5 + "y": 1025 }, { "x": -1206, - "y": 968.5 + "y": 980 } ], "animated": false, @@ -7122,11 +7122,11 @@ "route": [ { "x": -1450, - "y": 1339.5 + "y": 1351 }, { "x": -2380, - "y": 1250.5 + "y": 1262 } ], "animated": false, @@ -7163,11 +7163,11 @@ "route": [ { "x": -1449.5, - "y": 938.5 + "y": 950 }, { "x": -1967.5, - "y": 1167.5 + "y": 1179 } ], "animated": false, @@ -7209,11 +7209,11 @@ }, { "x": 288.75, - "y": 721.9000244140625 + "y": 724.0999755859375 }, { "x": 288.75, - "y": 951.5 + "y": 962.5 } ], "isCurve": true, @@ -7679,11 +7679,11 @@ }, { "x": 2376.800048828125, - "y": 397 + "y": 395.79998779296875 }, { "x": 2377, - "y": 441 + "y": 435 } ], "isCurve": true, @@ -7765,19 +7765,19 @@ "route": [ { "x": 144, - "y": 1173 + "y": 1185 }, { "x": 184, - "y": 1173 + "y": 1185 }, { "x": 204, - "y": 1173 + "y": 1185 }, { "x": 244, - "y": 1173 + "y": 1185 } ], "isCurve": true, @@ -7812,19 +7812,19 @@ "route": [ { "x": 297, - "y": 1151 + "y": 1163 }, { "x": 337, - "y": 1118.199951171875 + "y": 1130.199951171875 }, { "x": 357.1000061035156, - "y": 1110 + "y": 1122 }, { "x": 397.5, - "y": 1110 + "y": 1122 } ], "isCurve": true, @@ -7859,19 +7859,19 @@ "route": [ { "x": 297, - "y": 1195 + "y": 1207 }, { "x": 337, - "y": 1227.800048828125 + "y": 1239.800048828125 }, { "x": 357, - "y": 1236 + "y": 1248 }, { "x": 397, - "y": 1236 + "y": 1248 } ], "isCurve": true, @@ -7906,19 +7906,19 @@ "route": [ { "x": 399, - "y": 1501 + "y": 1513 }, { "x": 359, - "y": 1501 + "y": 1513 }, { "x": 339, - "y": 1501 + "y": 1513 }, { "x": 299, - "y": 1501 + "y": 1513 } ], "isCurve": true, @@ -7953,19 +7953,19 @@ "route": [ { "x": 246, - "y": 1479 + "y": 1491 }, { "x": 206, - "y": 1446.199951171875 + "y": 1458.199951171875 }, { "x": 186, - "y": 1438 + "y": 1450 }, { "x": 146, - "y": 1438 + "y": 1450 } ], "isCurve": true, @@ -8000,19 +8000,19 @@ "route": [ { "x": 246, - "y": 1523 + "y": 1535 }, { "x": 206, - "y": 1555.800048828125 + "y": 1567.800048828125 }, { "x": 186, - "y": 1564 + "y": 1576 }, { "x": 146, - "y": 1564 + "y": 1576 } ], "isCurve": true, @@ -8047,19 +8047,19 @@ "route": [ { "x": 175.25, - "y": 2060 + "y": 2072 }, { "x": 175.25, - "y": 2020 + "y": 2032 }, { "x": 175.25, - "y": 2000 + "y": 2012 }, { "x": 175.25, - "y": 1960 + "y": 1972 } ], "isCurve": true, @@ -8094,19 +8094,19 @@ "route": [ { "x": 152.5, - "y": 1894 + "y": 1906 }, { "x": 125.30000305175781, - "y": 1854 + "y": 1866 }, { "x": 118.5, - "y": 1834 + "y": 1846 }, { "x": 118.5, - "y": 1794 + "y": 1806 } ], "isCurve": true, @@ -8141,19 +8141,19 @@ "route": [ { "x": 198, - "y": 1894 + "y": 1906 }, { "x": 225.1999969482422, - "y": 1854 + "y": 1866 }, { "x": 232, - "y": 1834 + "y": 1846 }, { "x": 232, - "y": 1794 + "y": 1806 } ], "isCurve": true, @@ -8188,19 +8188,19 @@ "route": [ { "x": 402.25, - "y": 1794 + "y": 1806 }, { "x": 402.25, - "y": 1834 + "y": 1846 }, { "x": 402.25, - "y": 1854 + "y": 1866 }, { "x": 402.25, - "y": 1894 + "y": 1906 } ], "isCurve": true, @@ -8235,19 +8235,19 @@ "route": [ { "x": 379.5, - "y": 1960 + "y": 1972 }, { "x": 352.29998779296875, - "y": 2000 + "y": 2012 }, { "x": 345.5, - "y": 2020 + "y": 2032 }, { "x": 345.5, - "y": 2060 + "y": 2072 } ], "isCurve": true, @@ -8282,19 +8282,19 @@ "route": [ { "x": 425, - "y": 1960 + "y": 1972 }, { "x": 452.20001220703125, - "y": 2000 + "y": 2012 }, { "x": 459, - "y": 2020 + "y": 2032 }, { "x": 459, - "y": 2060 + "y": 2072 } ], "isCurve": true, @@ -8332,11 +8332,11 @@ "route": [ { "x": 3750.5, - "y": 1209.5 + "y": 1221 }, { "x": 3821.5, - "y": 1218.5 + "y": 1230 } ], "animated": false, @@ -8373,11 +8373,11 @@ "route": [ { "x": 3898, - "y": 1218.5 + "y": 1230 }, { "x": 3968, - "y": 1209.5 + "y": 1221 } ], "animated": false, @@ -8414,11 +8414,11 @@ "route": [ { "x": 4039.5, - "y": 1210.5 + "y": 1222 }, { "x": 4110.5, - "y": 1219.5 + "y": 1231 } ], "animated": false, @@ -8455,11 +8455,11 @@ "route": [ { "x": 4163, - "y": 1219.5 + "y": 1231 }, { "x": 4233, - "y": 1210.5 + "y": 1222 } ], "animated": false, @@ -8501,11 +8501,11 @@ }, { "x": 1094.25, - "y": 761.7000122070312 + "y": 764.0999755859375 }, { "x": 1094.25, - "y": 1150.5 + "y": 1162.5 } ], "isCurve": true, @@ -8540,11 +8540,11 @@ "route": [ { "x": 698, - "y": 1375 + "y": 1386 }, { "x": 852, - "y": 1375 + "y": 1386 } ], "animated": false, @@ -8578,11 +8578,11 @@ "route": [ { "x": 864, - "y": 1445 + "y": 1456 }, { "x": 998, - "y": 1445 + "y": 1456 } ], "animated": false, @@ -8616,11 +8616,11 @@ "route": [ { "x": 1018, - "y": 1515 + "y": 1526 }, { "x": 1147, - "y": 1515 + "y": 1526 } ], "animated": false, @@ -8654,11 +8654,11 @@ "route": [ { "x": 1175, - "y": 1585 + "y": 1596 }, { "x": 1296, - "y": 1585 + "y": 1596 } ], "animated": false, @@ -8692,11 +8692,11 @@ "route": [ { "x": 1014, - "y": 1655 + "y": 1666 }, { "x": 1151, - "y": 1655 + "y": 1666 } ], "animated": false, @@ -8730,11 +8730,11 @@ "route": [ { "x": 1332, - "y": 1725 + "y": 1736 }, { "x": 1450.5, - "y": 1725 + "y": 1736 } ], "animated": false, @@ -8768,11 +8768,11 @@ "route": [ { "x": 704, - "y": 1795 + "y": 1806 }, { "x": 1002, - "y": 1795 + "y": 1806 } ], "animated": false, @@ -8806,11 +8806,11 @@ "route": [ { "x": 1450.5, - "y": 1865 + "y": 1876 }, { "x": 698, - "y": 1865 + "y": 1876 } ], "animated": false, @@ -8844,11 +8844,11 @@ "route": [ { "x": 698, - "y": 1935 + "y": 1946 }, { "x": 852, - "y": 1935 + "y": 1946 } ], "animated": false, @@ -8974,8 +8974,8 @@ "y": 926 }, { - "x": 2027.5, - "y": 1350 + "x": 2029.5, + "y": 1373 } ], "animated": false, @@ -9009,11 +9009,11 @@ "route": [ { "x": 1771, - "y": 1564 + "y": 1587 }, { "x": 1919, - "y": 1564 + "y": 1587 } ], "animated": false, @@ -9047,11 +9047,11 @@ "route": [ { "x": 1771, - "y": 1634 + "y": 1657 }, { "x": 1919, - "y": 1634 + "y": 1657 } ], "animated": false, @@ -9085,11 +9085,11 @@ "route": [ { "x": 1771, - "y": 1704 + "y": 1727 }, { "x": 2069, - "y": 1704 + "y": 1727 } ], "animated": false, @@ -9123,11 +9123,11 @@ "route": [ { "x": 1771, - "y": 1774 + "y": 1797 }, { "x": 2069, - "y": 1774 + "y": 1797 } ], "animated": false, @@ -9161,11 +9161,11 @@ "route": [ { "x": 1771, - "y": 1844 + "y": 1867 }, { "x": 2222, - "y": 1844 + "y": 1867 } ], "animated": false, @@ -9199,11 +9199,11 @@ "route": [ { "x": 1925, - "y": 1914 + "y": 1937 }, { "x": 2218, - "y": 1914 + "y": 1937 } ], "animated": false, @@ -9237,11 +9237,11 @@ "route": [ { "x": 2238, - "y": 1984 + "y": 2007 }, { "x": 2412, - "y": 1984 + "y": 2007 } ], "animated": false, @@ -9275,11 +9275,11 @@ "route": [ { "x": 1765, - "y": 2054 + "y": 2077 }, { "x": 2222, - "y": 2054 + "y": 2077 } ], "animated": false, @@ -9312,20 +9312,20 @@ "labelPercentage": 0, "route": [ { - "x": 2506, - "y": 1158 + "x": 2496, + "y": 1173 }, { - "x": 2174.39990234375, - "y": 1231.5999755859375 + "x": 2172.39990234375, + "y": 1253 }, { "x": 2091.5, - "y": 1310 + "y": 1333 }, { "x": 2091.5, - "y": 1350 + "y": 1373 } ], "isCurve": true, @@ -9360,19 +9360,19 @@ "route": [ { "x": 2091.5, - "y": 2136 + "y": 2159 }, { "x": 2091.5, - "y": 2176 + "y": 2199 }, { "x": 2173.89990234375, - "y": 2250.60009765625 + "y": 2273.60009765625 }, { "x": 2503.5, - "y": 2309 + "y": 2332 } ], "isCurve": true, @@ -9406,20 +9406,20 @@ "labelPercentage": 0, "route": [ { - "x": 2612, - "y": 1158 + "x": 2623, + "y": 1174 }, { - "x": 2944, - "y": 1231.5999755859375 + "x": 2946.199951171875, + "y": 1253.199951171875 }, { "x": 3027, - "y": 1253.800048828125 + "y": 1276.800048828125 }, { "x": 3027, - "y": 1269 + "y": 1292 } ], "isCurve": true, @@ -9454,19 +9454,19 @@ "route": [ { "x": 3027, - "y": 2186 + "y": 2209 }, { "x": 3027, - "y": 2226 + "y": 2249 }, { "x": 2944.64990234375, - "y": 2250.612060546875 + "y": 2273.612060546875 }, { "x": 2615.25, - "y": 2309.06298828125 + "y": 2332.06298828125 } ], "isCurve": true, @@ -9501,11 +9501,11 @@ "route": [ { "x": 3406, - "y": 1562 + "y": 1585 }, { "x": 3085, - "y": 1562 + "y": 1585 } ], "animated": false, @@ -9539,11 +9539,11 @@ "route": [ { "x": 3065, - "y": 1632 + "y": 1655 }, { "x": 2939, - "y": 1632 + "y": 1655 } ], "animated": false, @@ -9577,11 +9577,11 @@ "route": [ { "x": 2911, - "y": 1702 + "y": 1725 }, { "x": 2790, - "y": 1702 + "y": 1725 } ], "animated": false, @@ -9615,11 +9615,11 @@ "route": [ { "x": 3069, - "y": 1772 + "y": 1795 }, { "x": 2935, - "y": 1772 + "y": 1795 } ], "animated": false, @@ -9653,11 +9653,11 @@ "route": [ { "x": 2790, - "y": 1842 + "y": 1865 }, { "x": 3211.5, - "y": 1842 + "y": 1865 } ], "animated": false, @@ -9691,11 +9691,11 @@ "route": [ { "x": 2628, - "y": 1912 + "y": 1935 }, { "x": 3069, - "y": 1912 + "y": 1935 } ], "animated": false, @@ -9729,11 +9729,11 @@ "route": [ { "x": 3211.5, - "y": 1982 + "y": 2005 }, { "x": 2622, - "y": 1982 + "y": 2005 } ], "animated": false, @@ -9767,11 +9767,11 @@ "route": [ { "x": 2622, - "y": 2052 + "y": 2075 }, { "x": 3406, - "y": 2052 + "y": 2075 } ], "animated": false, @@ -9808,11 +9808,11 @@ "route": [ { "x": 1703, - "y": 1826 + "y": 1847 }, { "x": 486, - "y": 2087 + "y": 2099 } ], "animated": false, @@ -9849,10 +9849,10 @@ "route": [ { "x": 299, - "y": 1470.5 + "y": 1482.5 }, { - "x": 1115, + "x": 1116, "y": 546 } ], @@ -9931,11 +9931,11 @@ "route": [ { "x": 451, - "y": 1500 + "y": 1512 }, { "x": 998, - "y": 1480 + "y": 1491 } ], "animated": false, @@ -9972,11 +9972,11 @@ "route": [ { "x": 451, - "y": 1496 + "y": 1507 }, { "x": 852, - "y": 1411 + "y": 1422 } ], "animated": false, @@ -10013,11 +10013,11 @@ "route": [ { "x": 429, - "y": 1916 + "y": 1928 }, { "x": 692, - "y": 1803 + "y": 1814 } ], "animated": false, @@ -10094,12 +10094,12 @@ "labelPercentage": 0, "route": [ { - "x": 2613, - "y": 1149 + "x": 2625, + "y": 1161 }, { "x": 3694, - "y": 1204 + "y": 1216 } ], "animated": false, @@ -10136,11 +10136,11 @@ "route": [ { "x": -1366, - "y": 1363 + "y": 1375 }, { "x": 149, - "y": 2081 + "y": 2093 } ], "animated": false, @@ -10177,11 +10177,11 @@ "route": [ { "x": -256, - "y": 2605.5 + "y": 2628 }, { "x": -2380, - "y": 1273.5 + "y": 1285 } ], "animated": false, @@ -10215,11 +10215,11 @@ "route": [ { "x": -922, - "y": 1292.5 + "y": 1304 }, { "x": -922, - "y": 1572.5 + "y": 1584 } ], "animated": false, @@ -10253,11 +10253,11 @@ "route": [ { "x": -772, - "y": 1292.5 + "y": 1304 }, { "x": -772, - "y": 1572.5 + "y": 1584 } ], "animated": false, @@ -10291,11 +10291,11 @@ "route": [ { "x": -598, - "y": 1292.5 + "y": 1304 }, { "x": -598, - "y": 1572.5 + "y": 1584 } ], "animated": false, @@ -10329,11 +10329,11 @@ "route": [ { "x": -297, - "y": 1292.5 + "y": 1304 }, { "x": -297, - "y": 1572.5 + "y": 1584 } ], "animated": false, @@ -10367,11 +10367,11 @@ "route": [ { "x": -332.5, - "y": 1140.5 + "y": 1152 }, { "x": -332.5, - "y": 1280.5 + "y": 1292 } ], "animated": false, @@ -10405,11 +10405,11 @@ "route": [ { "x": -182, - "y": 1140.5 + "y": 1152 }, { "x": -182, - "y": 1280.5 + "y": 1292 } ], "animated": false, @@ -10443,11 +10443,11 @@ "route": [ { "x": 698, - "y": 1305 + "y": 1316 }, { "x": 698, - "y": 2005 + "y": 2016 } ], "animated": false, @@ -10481,11 +10481,11 @@ "route": [ { "x": 858, - "y": 1305 + "y": 1316 }, { "x": 858, - "y": 2005 + "y": 2016 } ], "animated": false, @@ -10519,11 +10519,11 @@ "route": [ { "x": 1008, - "y": 1305 + "y": 1316 }, { "x": 1008, - "y": 2005 + "y": 2016 } ], "animated": false, @@ -10557,11 +10557,11 @@ "route": [ { "x": 1161, - "y": 1305 + "y": 1316 }, { "x": 1161, - "y": 2005 + "y": 2016 } ], "animated": false, @@ -10595,11 +10595,11 @@ "route": [ { "x": 1314, - "y": 1305 + "y": 1316 }, { "x": 1314, - "y": 2005 + "y": 2016 } ], "animated": false, @@ -10633,11 +10633,11 @@ "route": [ { "x": 1472.5, - "y": 1305 + "y": 1316 }, { "x": 1472.5, - "y": 2005 + "y": 2016 } ], "animated": false, @@ -10671,11 +10671,11 @@ "route": [ { "x": 1765, - "y": 1494 + "y": 1517 }, { "x": 1765, - "y": 2124 + "y": 2147 } ], "animated": false, @@ -10709,11 +10709,11 @@ "route": [ { "x": 1925, - "y": 1494 + "y": 1517 }, { "x": 1925, - "y": 2124 + "y": 2147 } ], "animated": false, @@ -10747,11 +10747,11 @@ "route": [ { "x": 2075, - "y": 1494 + "y": 1517 }, { "x": 2075, - "y": 2124 + "y": 2147 } ], "animated": false, @@ -10785,11 +10785,11 @@ "route": [ { "x": 2228, - "y": 1494 + "y": 1517 }, { "x": 2228, - "y": 2124 + "y": 2147 } ], "animated": false, @@ -10823,11 +10823,11 @@ "route": [ { "x": 2418, - "y": 1494 + "y": 1517 }, { "x": 2418, - "y": 2124 + "y": 2147 } ], "animated": false, @@ -10861,11 +10861,11 @@ "route": [ { "x": 2622, - "y": 1492 + "y": 1515 }, { "x": 2622, - "y": 2122 + "y": 2145 } ], "animated": false, @@ -10899,11 +10899,11 @@ "route": [ { "x": 2772, - "y": 1492 + "y": 1515 }, { "x": 2772, - "y": 2122 + "y": 2145 } ], "animated": false, @@ -10937,11 +10937,11 @@ "route": [ { "x": 2925, - "y": 1492 + "y": 1515 }, { "x": 2925, - "y": 2122 + "y": 2145 } ], "animated": false, @@ -10975,11 +10975,11 @@ "route": [ { "x": 3075, - "y": 1492 + "y": 1515 }, { "x": 3075, - "y": 2122 + "y": 2145 } ], "animated": false, @@ -11013,11 +11013,11 @@ "route": [ { "x": 3233.5, - "y": 1492 + "y": 1515 }, { "x": 3233.5, - "y": 2122 + "y": 2145 } ], "animated": false, @@ -11051,11 +11051,11 @@ "route": [ { "x": 3412, - "y": 1492 + "y": 1515 }, { "x": 3412, - "y": 2122 + "y": 2145 } ], "animated": false, diff --git a/e2etests/testdata/stable/nesting_power/dagre/sketch.exp.svg b/e2etests/testdata/stable/nesting_power/dagre/sketch.exp.svg index d032d39e5e..f6dc7b0c2b 100644 --- a/e2etests/testdata/stable/nesting_power/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/nesting_power/dagre/sketch.exp.svg @@ -1,23 +1,23 @@ - + .d2-2970140036 .fill-N1{fill:#0A0F25;} + .d2-2970140036 .fill-N2{fill:#676C7E;} + .d2-2970140036 .fill-N3{fill:#9499AB;} + .d2-2970140036 .fill-N4{fill:#CFD2DD;} + .d2-2970140036 .fill-N5{fill:#DEE1EB;} + .d2-2970140036 .fill-N6{fill:#EEF1F8;} + .d2-2970140036 .fill-N7{fill:#FFFFFF;} + .d2-2970140036 .fill-B1{fill:#0D32B2;} + .d2-2970140036 .fill-B2{fill:#0D32B2;} + .d2-2970140036 .fill-B3{fill:#E3E9FD;} + .d2-2970140036 .fill-B4{fill:#E3E9FD;} + .d2-2970140036 .fill-B5{fill:#EDF0FD;} + .d2-2970140036 .fill-B6{fill:#F7F8FE;} + .d2-2970140036 .fill-AA2{fill:#4A6FF3;} + .d2-2970140036 .fill-AA4{fill:#EDF0FD;} + .d2-2970140036 .fill-AA5{fill:#F7F8FE;} + .d2-2970140036 .fill-AB4{fill:#EDF0FD;} + .d2-2970140036 .fill-AB5{fill:#F7F8FE;} + .d2-2970140036 .stroke-N1{stroke:#0A0F25;} + .d2-2970140036 .stroke-N2{stroke:#676C7E;} + .d2-2970140036 .stroke-N3{stroke:#9499AB;} + .d2-2970140036 .stroke-N4{stroke:#CFD2DD;} + .d2-2970140036 .stroke-N5{stroke:#DEE1EB;} + .d2-2970140036 .stroke-N6{stroke:#EEF1F8;} + .d2-2970140036 .stroke-N7{stroke:#FFFFFF;} + .d2-2970140036 .stroke-B1{stroke:#0D32B2;} + .d2-2970140036 .stroke-B2{stroke:#0D32B2;} + .d2-2970140036 .stroke-B3{stroke:#E3E9FD;} + .d2-2970140036 .stroke-B4{stroke:#E3E9FD;} + .d2-2970140036 .stroke-B5{stroke:#EDF0FD;} + .d2-2970140036 .stroke-B6{stroke:#F7F8FE;} + .d2-2970140036 .stroke-AA2{stroke:#4A6FF3;} + .d2-2970140036 .stroke-AA4{stroke:#EDF0FD;} + .d2-2970140036 .stroke-AA5{stroke:#F7F8FE;} + .d2-2970140036 .stroke-AB4{stroke:#EDF0FD;} + .d2-2970140036 .stroke-AB5{stroke:#F7F8FE;} + .d2-2970140036 .background-color-N1{background-color:#0A0F25;} + .d2-2970140036 .background-color-N2{background-color:#676C7E;} + .d2-2970140036 .background-color-N3{background-color:#9499AB;} + .d2-2970140036 .background-color-N4{background-color:#CFD2DD;} + .d2-2970140036 .background-color-N5{background-color:#DEE1EB;} + .d2-2970140036 .background-color-N6{background-color:#EEF1F8;} + .d2-2970140036 .background-color-N7{background-color:#FFFFFF;} + .d2-2970140036 .background-color-B1{background-color:#0D32B2;} + .d2-2970140036 .background-color-B2{background-color:#0D32B2;} + .d2-2970140036 .background-color-B3{background-color:#E3E9FD;} + .d2-2970140036 .background-color-B4{background-color:#E3E9FD;} + .d2-2970140036 .background-color-B5{background-color:#EDF0FD;} + .d2-2970140036 .background-color-B6{background-color:#F7F8FE;} + .d2-2970140036 .background-color-AA2{background-color:#4A6FF3;} + .d2-2970140036 .background-color-AA4{background-color:#EDF0FD;} + .d2-2970140036 .background-color-AA5{background-color:#F7F8FE;} + .d2-2970140036 .background-color-AB4{background-color:#EDF0FD;} + .d2-2970140036 .background-color-AB5{background-color:#F7F8FE;} + .d2-2970140036 .color-N1{color:#0A0F25;} + .d2-2970140036 .color-N2{color:#676C7E;} + .d2-2970140036 .color-N3{color:#9499AB;} + .d2-2970140036 .color-N4{color:#CFD2DD;} + .d2-2970140036 .color-N5{color:#DEE1EB;} + .d2-2970140036 .color-N6{color:#EEF1F8;} + .d2-2970140036 .color-N7{color:#FFFFFF;} + .d2-2970140036 .color-B1{color:#0D32B2;} + .d2-2970140036 .color-B2{color:#0D32B2;} + .d2-2970140036 .color-B3{color:#E3E9FD;} + .d2-2970140036 .color-B4{color:#E3E9FD;} + .d2-2970140036 .color-B5{color:#EDF0FD;} + .d2-2970140036 .color-B6{color:#F7F8FE;} + .d2-2970140036 .color-AA2{color:#4A6FF3;} + .d2-2970140036 .color-AA4{color:#EDF0FD;} + .d2-2970140036 .color-AA5{color:#F7F8FE;} + .d2-2970140036 .color-AB4{color:#EDF0FD;} + .d2-2970140036 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]> @@ -111,20 +111,20 @@ -Left Constant NearcenterdirectionsRight Constant NearseqmoreBottom Left Constant Neardefaultlayouthererectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloudrightleftisconstantandalsogridscoreritemResponseitemessayRubricconceptitemOutcomestylishcontaineradagreelktalathisisgrid12341234updownnearax +Left Constant NearcenterdirectionsRight Constant NearseqmoreBottom Left Constant Neardefaultlayouthererectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloudrightleftisconstantandalsogridscoreritemResponseitemessayRubricconceptitemOutcomestylishcontaineradagreelktalathisisgrid12341234updownnearax -ya_sequencea_shapesequencefinallybrow 1row 2row 3row 4row 5withasequence diagramyou canchild of is12341234scoreritemResponseitemessayRubricconceptsequencefrom one constant nearhaveanothergridhere andgrandchildscorerconceptessayRubricitemitemOutcomeitemResponse123continuenesting ororruns thisruns thisruns thisA straight edge across straight edge across nested typesdefault layoutdefault layoutdefault layout in styleto inside sequence diagramto inside sequence diagramto inside sequence diagramto constant nearfrom within constant nearto another getItem() itemgetRubric()rubricapplyTo(essayResp)match(essayResponse)score - - +ya_sequencea_shapesequencefinallybrow 1row 2row 3row 4row 5withasequence diagramyou canchild of is12341234scoreritemResponseitemessayRubricconceptsequencefrom one constant nearhaveanothergridhere andgrandchildscorerconceptessayRubricitemitemOutcomeitemResponse123continuenesting ororruns thisruns thisruns thisA straight edge across straight edge across nested typesdefault layoutdefault layoutdefault layout in styleto inside sequence diagramto inside sequence diagramto inside sequence diagramto constant nearfrom within constant nearto another getItem() itemgetRubric()rubricapplyTo(essayResp)match(essayResponse)score + + - - - + + + - - - - + + + + @@ -142,111 +142,111 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/nesting_power/elk/board.exp.json b/e2etests/testdata/stable/nesting_power/elk/board.exp.json index a3b8b6696d..850f29b6cd 100644 --- a/e2etests/testdata/stable/nesting_power/elk/board.exp.json +++ b/e2etests/testdata/stable/nesting_power/elk/board.exp.json @@ -8,7 +8,7 @@ "type": "rectangle", "pos": { "x": -2800, - "y": 733 + "y": 745 }, "width": 2792, "height": 978, @@ -49,7 +49,7 @@ "type": "rectangle", "pos": { "x": -2750, - "y": 1112 + "y": 1124 }, "width": 658, "height": 251, @@ -90,7 +90,7 @@ "type": "rectangle", "pos": { "x": -1820, - "y": 1142 + "y": 1154 }, "width": 90, "height": 160, @@ -131,7 +131,7 @@ "type": "rectangle", "pos": { "x": -1660, - "y": 783 + "y": 795 }, "width": 1602, "height": 878, @@ -172,7 +172,7 @@ "type": "rectangle", "pos": { "x": -2700, - "y": 1163 + "y": 1174 }, "width": 86, "height": 80, @@ -213,7 +213,7 @@ "type": "rectangle", "pos": { "x": -2448, - "y": 1203 + "y": 1215 }, "width": 67, "height": 80, @@ -254,7 +254,7 @@ "type": "rectangle", "pos": { "x": -2215, - "y": 1247 + "y": 1259 }, "width": 73, "height": 66, @@ -295,7 +295,7 @@ "type": "rectangle", "pos": { "x": -1600, - "y": 843 + "y": 855 }, "width": 204, "height": 758, @@ -336,7 +336,7 @@ "type": "rectangle", "pos": { "x": -1356, - "y": 843 + "y": 855 }, "width": 322, "height": 758, @@ -377,7 +377,7 @@ "type": "rectangle", "pos": { "x": -1540, - "y": 903 + "y": 915 }, "width": 84, "height": 66, @@ -418,7 +418,7 @@ "type": "rectangle", "pos": { "x": -1540, - "y": 1009 + "y": 1021 }, "width": 84, "height": 66, @@ -459,7 +459,7 @@ "type": "rectangle", "pos": { "x": -1540, - "y": 1115 + "y": 1127 }, "width": 84, "height": 66, @@ -500,7 +500,7 @@ "type": "rectangle", "pos": { "x": -1540, - "y": 1221 + "y": 1233 }, "width": 84, "height": 66, @@ -541,7 +541,7 @@ "type": "rectangle", "pos": { "x": -1540, - "y": 1327 + "y": 1339 }, "width": 84, "height": 66, @@ -582,7 +582,7 @@ "type": "sequence_diagram", "pos": { "x": -994, - "y": 843 + "y": 855 }, "width": 876, "height": 758, @@ -623,7 +623,7 @@ "type": "rectangle", "pos": { "x": -982, - "y": 1243 + "y": 1255 }, "width": 100, "height": 66, @@ -664,7 +664,7 @@ "type": "rectangle", "pos": { "x": -832, - "y": 1243 + "y": 1255 }, "width": 100, "height": 66, @@ -705,7 +705,7 @@ "type": "rectangle", "pos": { "x": -692, - "y": 1243 + "y": 1255 }, "width": 168, "height": 66, @@ -746,7 +746,7 @@ "type": "rectangle", "pos": { "x": -614, - "y": 1439 + "y": 1451 }, "width": 12, "height": 90, @@ -786,7 +786,7 @@ "type": "rectangle", "pos": { "x": -484, - "y": 921 + "y": 933 }, "width": 354, "height": 388, @@ -827,7 +827,7 @@ "type": "rectangle", "pos": { "x": -484, - "y": 952 + "y": 964 }, "width": 77, "height": 66, @@ -868,7 +868,7 @@ "type": "rectangle", "pos": { "x": -407, - "y": 952 + "y": 964 }, "width": 277, "height": 66, @@ -909,7 +909,7 @@ "type": "rectangle", "pos": { "x": -484, - "y": 1018 + "y": 1030 }, "width": 77, "height": 291, @@ -950,7 +950,7 @@ "type": "rectangle", "pos": { "x": -474, - "y": 1049 + "y": 1061 }, "width": 53, "height": 66, @@ -991,7 +991,7 @@ "type": "rectangle", "pos": { "x": -474, - "y": 1135 + "y": 1147 }, "width": 53, "height": 66, @@ -1032,7 +1032,7 @@ "type": "rectangle", "pos": { "x": -474, - "y": 1221 + "y": 1233 }, "width": 53, "height": 66, @@ -1073,7 +1073,7 @@ "type": "sequence_diagram", "pos": { "x": -407, - "y": 1018 + "y": 1030 }, "width": 277, "height": 291, @@ -1114,7 +1114,7 @@ "type": "rectangle", "pos": { "x": -395, - "y": 1091 + "y": 1103 }, "width": 105, "height": 66, @@ -1155,7 +1155,7 @@ "type": "rectangle", "pos": { "x": -242, - "y": 1091 + "y": 1103 }, "width": 100, "height": 66, @@ -1196,7 +1196,7 @@ "type": "rectangle", "pos": { "x": -1306, - "y": 893 + "y": 905 }, "width": 222, "height": 166, @@ -1237,7 +1237,7 @@ "type": "rectangle", "pos": { "x": -1256, - "y": 943 + "y": 955 }, "width": 122, "height": 66, @@ -1933,11 +1933,11 @@ "id": "center.circle", "type": "oval", "pos": { - "x": 1271, + "x": 1265, "y": 418 }, - "width": 91, - "height": 91, + "width": 103, + "height": 103, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -2917,7 +2917,7 @@ "type": "rectangle", "pos": { "x": 3614, - "y": 1079 + "y": 1091 }, "width": 813, "height": 286, @@ -2958,7 +2958,7 @@ "type": "rectangle", "pos": { "x": 3674, - "y": 1139 + "y": 1151 }, "width": 57, "height": 166, @@ -2999,7 +2999,7 @@ "type": "rectangle", "pos": { "x": 3771, - "y": 1139 + "y": 1151 }, "width": 177, "height": 166, @@ -3040,7 +3040,7 @@ "type": "rectangle", "pos": { "x": 3821, - "y": 1189 + "y": 1201 }, "width": 77, "height": 66, @@ -3081,7 +3081,7 @@ "type": "rectangle", "pos": { "x": 3988, - "y": 1139 + "y": 1151 }, "width": 72, "height": 166, @@ -3122,7 +3122,7 @@ "type": "rectangle", "pos": { "x": 4100, - "y": 1139 + "y": 1151 }, "width": 153, "height": 166, @@ -3163,7 +3163,7 @@ "type": "rectangle", "pos": { "x": 4150, - "y": 1189 + "y": 1201 }, "width": 53, "height": 66, @@ -3204,7 +3204,7 @@ "type": "rectangle", "pos": { "x": 4293, - "y": 1139 + "y": 1151 }, "width": 74, "height": 166, @@ -4215,7 +4215,7 @@ "y": 757 }, "width": 2051, - "height": 1676, + "height": 1699, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -4379,7 +4379,7 @@ "y": 1058 }, "width": 1931, - "height": 1315, + "height": 1338, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -4417,7 +4417,7 @@ "type": "sequence_diagram", "pos": { "x": 1653, - "y": 1343 + "y": 1366 }, "width": 777, "height": 786, @@ -4457,11 +4457,11 @@ "id": "more.container.a_shape", "type": "oval", "pos": { - "x": 2450, + "x": 2438, "y": 1108 }, - "width": 108, - "height": 108, + "width": 131, + "height": 131, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -4499,7 +4499,7 @@ "type": "rectangle", "pos": { "x": 1665, - "y": 1421 + "y": 1444 }, "width": 100, "height": 66, @@ -4540,7 +4540,7 @@ "type": "rectangle", "pos": { "x": 1709, - "y": 1547 + "y": 1570 }, "width": 12, "height": 300, @@ -4580,7 +4580,7 @@ "type": "rectangle", "pos": { "x": 1805, - "y": 1421 + "y": 1444 }, "width": 140, "height": 66, @@ -4621,7 +4621,7 @@ "type": "rectangle", "pos": { "x": 1869, - "y": 1547 + "y": 1570 }, "width": 12, "height": 90, @@ -4661,7 +4661,7 @@ "type": "rectangle", "pos": { "x": 1975, - "y": 1421 + "y": 1444 }, "width": 100, "height": 66, @@ -4702,7 +4702,7 @@ "type": "rectangle", "pos": { "x": 2019, - "y": 1687 + "y": 1710 }, "width": 12, "height": 90, @@ -4742,7 +4742,7 @@ "type": "rectangle", "pos": { "x": 2115, - "y": 1421 + "y": 1444 }, "width": 126, "height": 66, @@ -4783,7 +4783,7 @@ "type": "rectangle", "pos": { "x": 2172, - "y": 1827 + "y": 1850 }, "width": 12, "height": 230, @@ -4823,7 +4823,7 @@ "type": "rectangle", "pos": { "x": 2168, - "y": 1897 + "y": 1920 }, "width": 20, "height": 90, @@ -4863,7 +4863,7 @@ "type": "rectangle", "pos": { "x": 2318, - "y": 1421 + "y": 1444 }, "width": 100, "height": 66, @@ -4904,7 +4904,7 @@ "type": "rectangle", "pos": { "x": 2362, - "y": 1967 + "y": 1990 }, "width": 12, "height": 30, @@ -4944,7 +4944,7 @@ "type": "rectangle", "pos": { "x": 2448, - "y": 2257 + "y": 2280 }, "width": 112, "height": 66, @@ -4985,7 +4985,7 @@ "type": "queue", "pos": { "x": 2450, - "y": 1296 + "y": 1319 }, "width": 1034, "height": 881, @@ -5026,7 +5026,7 @@ "type": "sequence_diagram", "pos": { "x": 2500, - "y": 1346 + "y": 1369 }, "width": 934, "height": 781, @@ -5067,7 +5067,7 @@ "type": "rectangle", "pos": { "x": 2512, - "y": 1419 + "y": 1442 }, "width": 100, "height": 66, @@ -5108,7 +5108,7 @@ "type": "rectangle", "pos": { "x": 2662, - "y": 1419 + "y": 1442 }, "width": 100, "height": 66, @@ -5149,7 +5149,7 @@ "type": "rectangle", "pos": { "x": 2802, - "y": 1419 + "y": 1442 }, "width": 126, "height": 66, @@ -5190,7 +5190,7 @@ "type": "rectangle", "pos": { "x": 2965, - "y": 1419 + "y": 1442 }, "width": 100, "height": 66, @@ -5231,7 +5231,7 @@ "type": "rectangle", "pos": { "x": 3105, - "y": 1419 + "y": 1442 }, "width": 137, "height": 66, @@ -5272,7 +5272,7 @@ "type": "rectangle", "pos": { "x": 3282, - "y": 1419 + "y": 1442 }, "width": 140, "height": 66, @@ -5313,7 +5313,7 @@ "type": "rectangle", "pos": { "x": 3346, - "y": 1545 + "y": 1568 }, "width": 12, "height": 30, @@ -5353,7 +5353,7 @@ "type": "rectangle", "pos": { "x": 3009, - "y": 1535 + "y": 1558 }, "width": 12, "height": 380, @@ -5393,7 +5393,7 @@ "type": "rectangle", "pos": { "x": 3005, - "y": 1545 + "y": 1568 }, "width": 20, "height": 90, @@ -5433,7 +5433,7 @@ "type": "rectangle", "pos": { "x": 2859, - "y": 1595 + "y": 1618 }, "width": 12, "height": 190, @@ -5473,7 +5473,7 @@ "type": "rectangle", "pos": { "x": 2855, - "y": 1605 + "y": 1628 }, "width": 20, "height": 170, @@ -5513,7 +5513,7 @@ "type": "rectangle", "pos": { "x": 2851, - "y": 1615 + "y": 1638 }, "width": 28, "height": 90, @@ -5553,7 +5553,7 @@ "type": "rectangle", "pos": { "x": 2706, - "y": 1655 + "y": 1678 }, "width": 12, "height": 220, @@ -5593,7 +5593,7 @@ "type": "rectangle", "pos": { "x": 2702, - "y": 1665 + "y": 1688 }, "width": 20, "height": 200, @@ -5633,7 +5633,7 @@ "type": "rectangle", "pos": { "x": 2698, - "y": 1675 + "y": 1698 }, "width": 28, "height": 180, @@ -5673,7 +5673,7 @@ "type": "rectangle", "pos": { "x": 2694, - "y": 1685 + "y": 1708 }, "width": 36, "height": 160, @@ -5713,7 +5713,7 @@ "type": "rectangle", "pos": { "x": 3167, - "y": 1785 + "y": 1808 }, "width": 12, "height": 240, @@ -5753,7 +5753,7 @@ "type": "rectangle", "pos": { "x": 3163, - "y": 1795 + "y": 1818 }, "width": 20, "height": 220, @@ -5793,7 +5793,7 @@ "type": "rectangle", "pos": { "x": 3159, - "y": 1805 + "y": 1828 }, "width": 28, "height": 200, @@ -5833,7 +5833,7 @@ "type": "rectangle", "pos": { "x": 3155, - "y": 1815 + "y": 1838 }, "width": 36, "height": 180, @@ -5873,7 +5873,7 @@ "type": "rectangle", "pos": { "x": 3151, - "y": 1825 + "y": 1848 }, "width": 44, "height": 160, @@ -5913,7 +5913,7 @@ "type": "rectangle", "pos": { "x": 2556, - "y": 1895 + "y": 1918 }, "width": 12, "height": 30, @@ -5953,7 +5953,7 @@ "type": "rectangle", "pos": { "x": 3346, - "y": 2035 + "y": 2058 }, "width": 12, "height": 30, @@ -5993,7 +5993,7 @@ "type": "rectangle", "pos": { "x": -519, - "y": 2453 + "y": 2476 }, "width": 511, "height": 366, @@ -6034,7 +6034,7 @@ "type": "rectangle", "pos": { "x": -469, - "y": 2503 + "y": 2526 }, "width": 411, "height": 266, @@ -6075,7 +6075,7 @@ "type": "rectangle", "pos": { "x": -419, - "y": 2553 + "y": 2576 }, "width": 311, "height": 166, @@ -6116,7 +6116,7 @@ "type": "rectangle", "pos": { "x": -369, - "y": 2603 + "y": 2626 }, "width": 211, "height": 66, @@ -6180,11 +6180,11 @@ "route": [ { "x": -2092, - "y": 1291.5 + "y": 1303 }, { "x": -1820, - "y": 1291.5 + "y": 1303 } ], "animated": false, @@ -6218,11 +6218,11 @@ "route": [ { "x": -1730, - "y": 1222.5 + "y": 1234 }, { "x": -1660, - "y": 1222.5 + "y": 1234 } ], "animated": false, @@ -6256,11 +6256,11 @@ "route": [ { "x": -2614, - "y": 1216.3330078125 + "y": 1227.8330078125 }, { "x": -2448, - "y": 1216.3330078125 + "y": 1227.8330078125 } ], "animated": false, @@ -6294,19 +6294,19 @@ "route": [ { "x": -2381, - "y": 1256.8330078125 + "y": 1268.3330078125 }, { "x": -2341, - "y": 1256.8330078125 + "y": 1268.3330078125 }, { "x": -2341, - "y": 1280.5 + "y": 1292 }, { "x": -2215, - "y": 1280.5 + "y": 1292 } ], "animated": false, @@ -6340,19 +6340,19 @@ "route": [ { "x": -2142, - "y": 1280.5 + "y": 1292 }, { "x": -2047, - "y": 1280.5 + "y": 1292 }, { "x": -2047, - "y": 1239.5 + "y": 1251 }, { "x": -1820, - "y": 1239.5 + "y": 1251 } ], "animated": false, @@ -6386,19 +6386,19 @@ "route": [ { "x": -2614, - "y": 1189.666015625 + "y": 1201.166015625 }, { "x": -2574, - "y": 1189.666015625 + "y": 1201.166015625 }, { "x": -2574, - "y": 1162.5 + "y": 1174 }, { "x": -1820, - "y": 1162.5 + "y": 1174 } ], "animated": false, @@ -6432,19 +6432,19 @@ "route": [ { "x": -2381, - "y": 1230.166015625 + "y": 1241.666015625 }, { "x": -2341, - "y": 1230.166015625 + "y": 1241.666015625 }, { "x": -2341, - "y": 1206 + "y": 1217.5 }, { "x": -1820, - "y": 1206 + "y": 1217.5 } ], "animated": false, @@ -6478,11 +6478,11 @@ "route": [ { "x": -1396, - "y": 1222.5 + "y": 1234 }, { "x": -1356, - "y": 1222.5 + "y": 1234 } ], "animated": false, @@ -6516,11 +6516,11 @@ "route": [ { "x": -1498, - "y": 969.5 + "y": 981 }, { "x": -1498, - "y": 1009.5 + "y": 1021 } ], "animated": false, @@ -6554,11 +6554,11 @@ "route": [ { "x": -1498, - "y": 1075.5 + "y": 1087 }, { "x": -1498, - "y": 1115.5 + "y": 1127 } ], "animated": false, @@ -6592,11 +6592,11 @@ "route": [ { "x": -1498, - "y": 1181.5 + "y": 1193 }, { "x": -1498, - "y": 1221.5 + "y": 1233 } ], "animated": false, @@ -6630,11 +6630,11 @@ "route": [ { "x": -1498, - "y": 1287.5 + "y": 1299 }, { "x": -1498, - "y": 1327.5 + "y": 1339 } ], "animated": false, @@ -6668,11 +6668,11 @@ "route": [ { "x": -1034, - "y": 1222.5 + "y": 1234 }, { "x": -994, - "y": 1222.5 + "y": 1234 } ], "animated": false, @@ -6706,11 +6706,11 @@ "route": [ { "x": -932, - "y": 1379.5 + "y": 1391 }, { "x": -782, - "y": 1379.5 + "y": 1391 } ], "animated": false, @@ -6744,11 +6744,11 @@ "route": [ { "x": -782, - "y": 1449.5 + "y": 1461 }, { "x": -614, - "y": 1449.5 + "y": 1461 } ], "animated": false, @@ -6782,11 +6782,11 @@ "route": [ { "x": -602, - "y": 1519.5 + "y": 1531 }, { "x": -307, - "y": 1519.5 + "y": 1531 } ], "animated": false, @@ -6820,11 +6820,11 @@ "route": [ { "x": -447.5, - "y": 1115.5 + "y": 1127 }, { "x": -447.5, - "y": 1135.5 + "y": 1147 } ], "animated": false, @@ -6858,11 +6858,11 @@ "route": [ { "x": -447.5, - "y": 1201.5 + "y": 1213 }, { "x": -447.5, - "y": 1221.5 + "y": 1233 } ], "animated": false, @@ -6896,11 +6896,11 @@ "route": [ { "x": -342.5, - "y": 1227.5 + "y": 1239 }, { "x": -192, - "y": 1227.5 + "y": 1239 } ], "animated": false, @@ -6937,11 +6937,11 @@ "route": [ { "x": -230, - "y": 1157.5 + "y": 1169 }, { "x": -602, - "y": 1479.5 + "y": 1491 } ], "animated": false, @@ -6978,11 +6978,11 @@ "route": [ { "x": -1456, - "y": 1033.5 + "y": 1045 }, { "x": -1256, - "y": 989.5 + "y": 1001 } ], "animated": false, @@ -7019,11 +7019,11 @@ "route": [ { "x": -1540, - "y": 1355 + "y": 1366.5 }, { "x": -2614, - "y": 1209 + "y": 1220.5 } ], "animated": false, @@ -7060,11 +7060,11 @@ "route": [ { "x": -1539.5, - "y": 957.5 + "y": 969 }, { "x": -2142.5, - "y": 1262.5 + "y": 1274 } ], "animated": false, @@ -8085,11 +8085,11 @@ "route": [ { "x": 3730.5, - "y": 1222.5 + "y": 1234 }, { "x": 3821.5, - "y": 1222.5 + "y": 1234 } ], "animated": false, @@ -8126,11 +8126,11 @@ "route": [ { "x": 3898, - "y": 1222.5 + "y": 1234 }, { "x": 3988, - "y": 1222.5 + "y": 1234 } ], "animated": false, @@ -8167,11 +8167,11 @@ "route": [ { "x": 4059.5, - "y": 1222.5 + "y": 1234 }, { "x": 4150.5, - "y": 1222.5 + "y": 1234 } ], "animated": false, @@ -8208,11 +8208,11 @@ "route": [ { "x": 4203, - "y": 1222.5 + "y": 1234 }, { "x": 4293, - "y": 1222.5 + "y": 1234 } ], "animated": false, @@ -8717,8 +8717,8 @@ "y": 957.5 }, { - "x": 1964.5, - "y": 1343.5 + "x": 1967.5, + "y": 1366.5 } ], "animated": false, @@ -8752,11 +8752,11 @@ "route": [ { "x": 1721, - "y": 1557.5 + "y": 1580.5 }, { "x": 1869, - "y": 1557.5 + "y": 1580.5 } ], "animated": false, @@ -8790,11 +8790,11 @@ "route": [ { "x": 1721, - "y": 1627.5 + "y": 1650.5 }, { "x": 1869, - "y": 1627.5 + "y": 1650.5 } ], "animated": false, @@ -8828,11 +8828,11 @@ "route": [ { "x": 1721, - "y": 1697.5 + "y": 1720.5 }, { "x": 2019, - "y": 1697.5 + "y": 1720.5 } ], "animated": false, @@ -8866,11 +8866,11 @@ "route": [ { "x": 1721, - "y": 1767.5 + "y": 1790.5 }, { "x": 2019, - "y": 1767.5 + "y": 1790.5 } ], "animated": false, @@ -8904,11 +8904,11 @@ "route": [ { "x": 1721, - "y": 1837.5 + "y": 1860.5 }, { "x": 2172, - "y": 1837.5 + "y": 1860.5 } ], "animated": false, @@ -8942,11 +8942,11 @@ "route": [ { "x": 1875, - "y": 1907.5 + "y": 1930.5 }, { "x": 2168, - "y": 1907.5 + "y": 1930.5 } ], "animated": false, @@ -8980,11 +8980,11 @@ "route": [ { "x": 2188, - "y": 1977.5 + "y": 2000.5 }, { "x": 2362, - "y": 1977.5 + "y": 2000.5 } ], "animated": false, @@ -9018,11 +9018,11 @@ "route": [ { "x": 1715, - "y": 2047.5 + "y": 2070.5 }, { "x": 2172, - "y": 2047.5 + "y": 2070.5 } ], "animated": false, @@ -9055,20 +9055,20 @@ "labelPercentage": 0, "route": [ { - "x": 2486, - "y": 1213 + "x": 2482, + "y": 1235 }, { - "x": 2486.25, - "y": 1256 + "x": 2482.416015625, + "y": 1279 }, { "x": 2041.5, - "y": 1256 + "y": 1279 }, { "x": 2041.5, - "y": 1344 + "y": 1367 } ], "animated": false, @@ -9102,19 +9102,19 @@ "route": [ { "x": 2041.5, - "y": 2129 + "y": 2152 }, { "x": 2041.5, - "y": 2217 + "y": 2240 }, { "x": 2485.5830078125, - "y": 2217 + "y": 2240 }, { "x": 2485.5830078125, - "y": 2257 + "y": 2280 } ], "animated": false, @@ -9147,12 +9147,12 @@ "labelPercentage": 0, "route": [ { - "x": 2522, - "y": 1213 + "x": 2526, + "y": 1235 }, { - "x": 2522, - "y": 1296 + "x": 2526, + "y": 1319 } ], "animated": false, @@ -9186,11 +9186,11 @@ "route": [ { "x": 2523, - "y": 2177 + "y": 2200 }, { "x": 2522.916015625, - "y": 2257 + "y": 2280 } ], "animated": false, @@ -9224,11 +9224,11 @@ "route": [ { "x": 3346, - "y": 1555 + "y": 1578 }, { "x": 3025, - "y": 1555 + "y": 1578 } ], "animated": false, @@ -9262,11 +9262,11 @@ "route": [ { "x": 3005, - "y": 1625 + "y": 1648 }, { "x": 2879, - "y": 1625 + "y": 1648 } ], "animated": false, @@ -9300,11 +9300,11 @@ "route": [ { "x": 2851, - "y": 1695 + "y": 1718 }, { "x": 2730, - "y": 1695 + "y": 1718 } ], "animated": false, @@ -9338,11 +9338,11 @@ "route": [ { "x": 3009, - "y": 1765 + "y": 1788 }, { "x": 2875, - "y": 1765 + "y": 1788 } ], "animated": false, @@ -9376,11 +9376,11 @@ "route": [ { "x": 2730, - "y": 1835 + "y": 1858 }, { "x": 3151.5, - "y": 1835 + "y": 1858 } ], "animated": false, @@ -9414,11 +9414,11 @@ "route": [ { "x": 2568, - "y": 1905 + "y": 1928 }, { "x": 3009, - "y": 1905 + "y": 1928 } ], "animated": false, @@ -9452,11 +9452,11 @@ "route": [ { "x": 3151.5, - "y": 1975 + "y": 1998 }, { "x": 2562, - "y": 1975 + "y": 1998 } ], "animated": false, @@ -9490,11 +9490,11 @@ "route": [ { "x": 2562, - "y": 2045 + "y": 2068 }, { "x": 3346, - "y": 2045 + "y": 2068 } ], "animated": false, @@ -9531,7 +9531,7 @@ "route": [ { "x": 1653, - "y": 1744 + "y": 1761 }, { "x": 476, @@ -9817,12 +9817,12 @@ "labelPercentage": 0, "route": [ { - "x": 2558, - "y": 1164 + "x": 2570, + "y": 1177 }, { "x": 3674, - "y": 1221 + "y": 1233 } ], "animated": false, @@ -9859,7 +9859,7 @@ "route": [ { "x": -1455.75, - "y": 1371 + "y": 1382 }, { "x": 159.25, @@ -9899,12 +9899,12 @@ "labelPercentage": 0, "route": [ { - "x": -319, - "y": 2603 + "x": -318, + "y": 2626.5 }, { "x": -2614, - "y": 1229 + "y": 1240.5 } ], "animated": false, @@ -9938,11 +9938,11 @@ "route": [ { "x": -932, - "y": 1309.5 + "y": 1321 }, { "x": -932, - "y": 1589.5 + "y": 1601 } ], "animated": false, @@ -9976,11 +9976,11 @@ "route": [ { "x": -782, - "y": 1309.5 + "y": 1321 }, { "x": -782, - "y": 1589.5 + "y": 1601 } ], "animated": false, @@ -10014,11 +10014,11 @@ "route": [ { "x": -608, - "y": 1309.5 + "y": 1321 }, { "x": -608, - "y": 1589.5 + "y": 1601 } ], "animated": false, @@ -10052,11 +10052,11 @@ "route": [ { "x": -307, - "y": 1309.5 + "y": 1321 }, { "x": -307, - "y": 1589.5 + "y": 1601 } ], "animated": false, @@ -10090,11 +10090,11 @@ "route": [ { "x": -342.5, - "y": 1157.5 + "y": 1169 }, { "x": -342.5, - "y": 1297.5 + "y": 1309 } ], "animated": false, @@ -10128,11 +10128,11 @@ "route": [ { "x": -192, - "y": 1157.5 + "y": 1169 }, { "x": -192, - "y": 1297.5 + "y": 1309 } ], "animated": false, @@ -10394,11 +10394,11 @@ "route": [ { "x": 1715, - "y": 1487.5 + "y": 1510.5 }, { "x": 1715, - "y": 2117.5 + "y": 2140.5 } ], "animated": false, @@ -10432,11 +10432,11 @@ "route": [ { "x": 1875, - "y": 1487.5 + "y": 1510.5 }, { "x": 1875, - "y": 2117.5 + "y": 2140.5 } ], "animated": false, @@ -10470,11 +10470,11 @@ "route": [ { "x": 2025, - "y": 1487.5 + "y": 1510.5 }, { "x": 2025, - "y": 2117.5 + "y": 2140.5 } ], "animated": false, @@ -10508,11 +10508,11 @@ "route": [ { "x": 2178, - "y": 1487.5 + "y": 1510.5 }, { "x": 2178, - "y": 2117.5 + "y": 2140.5 } ], "animated": false, @@ -10546,11 +10546,11 @@ "route": [ { "x": 2368, - "y": 1487.5 + "y": 1510.5 }, { "x": 2368, - "y": 2117.5 + "y": 2140.5 } ], "animated": false, @@ -10584,11 +10584,11 @@ "route": [ { "x": 2562, - "y": 1485 + "y": 1508 }, { "x": 2562, - "y": 2115 + "y": 2138 } ], "animated": false, @@ -10622,11 +10622,11 @@ "route": [ { "x": 2712, - "y": 1485 + "y": 1508 }, { "x": 2712, - "y": 2115 + "y": 2138 } ], "animated": false, @@ -10660,11 +10660,11 @@ "route": [ { "x": 2865, - "y": 1485 + "y": 1508 }, { "x": 2865, - "y": 2115 + "y": 2138 } ], "animated": false, @@ -10698,11 +10698,11 @@ "route": [ { "x": 3015, - "y": 1485 + "y": 1508 }, { "x": 3015, - "y": 2115 + "y": 2138 } ], "animated": false, @@ -10736,11 +10736,11 @@ "route": [ { "x": 3173.5, - "y": 1485 + "y": 1508 }, { "x": 3173.5, - "y": 2115 + "y": 2138 } ], "animated": false, @@ -10774,11 +10774,11 @@ "route": [ { "x": 3352, - "y": 1485 + "y": 1508 }, { "x": 3352, - "y": 2115 + "y": 2138 } ], "animated": false, diff --git a/e2etests/testdata/stable/nesting_power/elk/sketch.exp.svg b/e2etests/testdata/stable/nesting_power/elk/sketch.exp.svg index 7018f98702..662f438e77 100644 --- a/e2etests/testdata/stable/nesting_power/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/nesting_power/elk/sketch.exp.svg @@ -1,23 +1,23 @@ - + .d2-2299602506 .fill-N1{fill:#0A0F25;} + .d2-2299602506 .fill-N2{fill:#676C7E;} + .d2-2299602506 .fill-N3{fill:#9499AB;} + .d2-2299602506 .fill-N4{fill:#CFD2DD;} + .d2-2299602506 .fill-N5{fill:#DEE1EB;} + .d2-2299602506 .fill-N6{fill:#EEF1F8;} + .d2-2299602506 .fill-N7{fill:#FFFFFF;} + .d2-2299602506 .fill-B1{fill:#0D32B2;} + .d2-2299602506 .fill-B2{fill:#0D32B2;} + .d2-2299602506 .fill-B3{fill:#E3E9FD;} + .d2-2299602506 .fill-B4{fill:#E3E9FD;} + .d2-2299602506 .fill-B5{fill:#EDF0FD;} + .d2-2299602506 .fill-B6{fill:#F7F8FE;} + .d2-2299602506 .fill-AA2{fill:#4A6FF3;} + .d2-2299602506 .fill-AA4{fill:#EDF0FD;} + .d2-2299602506 .fill-AA5{fill:#F7F8FE;} + .d2-2299602506 .fill-AB4{fill:#EDF0FD;} + .d2-2299602506 .fill-AB5{fill:#F7F8FE;} + .d2-2299602506 .stroke-N1{stroke:#0A0F25;} + .d2-2299602506 .stroke-N2{stroke:#676C7E;} + .d2-2299602506 .stroke-N3{stroke:#9499AB;} + .d2-2299602506 .stroke-N4{stroke:#CFD2DD;} + .d2-2299602506 .stroke-N5{stroke:#DEE1EB;} + .d2-2299602506 .stroke-N6{stroke:#EEF1F8;} + .d2-2299602506 .stroke-N7{stroke:#FFFFFF;} + .d2-2299602506 .stroke-B1{stroke:#0D32B2;} + .d2-2299602506 .stroke-B2{stroke:#0D32B2;} + .d2-2299602506 .stroke-B3{stroke:#E3E9FD;} + .d2-2299602506 .stroke-B4{stroke:#E3E9FD;} + .d2-2299602506 .stroke-B5{stroke:#EDF0FD;} + .d2-2299602506 .stroke-B6{stroke:#F7F8FE;} + .d2-2299602506 .stroke-AA2{stroke:#4A6FF3;} + .d2-2299602506 .stroke-AA4{stroke:#EDF0FD;} + .d2-2299602506 .stroke-AA5{stroke:#F7F8FE;} + .d2-2299602506 .stroke-AB4{stroke:#EDF0FD;} + .d2-2299602506 .stroke-AB5{stroke:#F7F8FE;} + .d2-2299602506 .background-color-N1{background-color:#0A0F25;} + .d2-2299602506 .background-color-N2{background-color:#676C7E;} + .d2-2299602506 .background-color-N3{background-color:#9499AB;} + .d2-2299602506 .background-color-N4{background-color:#CFD2DD;} + .d2-2299602506 .background-color-N5{background-color:#DEE1EB;} + .d2-2299602506 .background-color-N6{background-color:#EEF1F8;} + .d2-2299602506 .background-color-N7{background-color:#FFFFFF;} + .d2-2299602506 .background-color-B1{background-color:#0D32B2;} + .d2-2299602506 .background-color-B2{background-color:#0D32B2;} + .d2-2299602506 .background-color-B3{background-color:#E3E9FD;} + .d2-2299602506 .background-color-B4{background-color:#E3E9FD;} + .d2-2299602506 .background-color-B5{background-color:#EDF0FD;} + .d2-2299602506 .background-color-B6{background-color:#F7F8FE;} + .d2-2299602506 .background-color-AA2{background-color:#4A6FF3;} + .d2-2299602506 .background-color-AA4{background-color:#EDF0FD;} + .d2-2299602506 .background-color-AA5{background-color:#F7F8FE;} + .d2-2299602506 .background-color-AB4{background-color:#EDF0FD;} + .d2-2299602506 .background-color-AB5{background-color:#F7F8FE;} + .d2-2299602506 .color-N1{color:#0A0F25;} + .d2-2299602506 .color-N2{color:#676C7E;} + .d2-2299602506 .color-N3{color:#9499AB;} + .d2-2299602506 .color-N4{color:#CFD2DD;} + .d2-2299602506 .color-N5{color:#DEE1EB;} + .d2-2299602506 .color-N6{color:#EEF1F8;} + .d2-2299602506 .color-N7{color:#FFFFFF;} + .d2-2299602506 .color-B1{color:#0D32B2;} + .d2-2299602506 .color-B2{color:#0D32B2;} + .d2-2299602506 .color-B3{color:#E3E9FD;} + .d2-2299602506 .color-B4{color:#E3E9FD;} + .d2-2299602506 .color-B5{color:#EDF0FD;} + .d2-2299602506 .color-B6{color:#F7F8FE;} + .d2-2299602506 .color-AA2{color:#4A6FF3;} + .d2-2299602506 .color-AA4{color:#EDF0FD;} + .d2-2299602506 .color-AA5{color:#F7F8FE;} + .d2-2299602506 .color-AB4{color:#EDF0FD;} + .d2-2299602506 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]> @@ -111,20 +111,20 @@ -Left Constant NearcenterdirectionsRight Constant NearseqmoreBottom Left Constant Neardefaultlayouthererectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloudrightleftisconstantandalsogridscoreritemResponseitemessayRubricconceptitemOutcomestylishcontaineradagreelktalathisisgrid12341234updownnearax +Left Constant NearcenterdirectionsRight Constant NearseqmoreBottom Left Constant Neardefaultlayouthererectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloudrightleftisconstantandalsogridscoreritemResponseitemessayRubricconceptitemOutcomestylishcontaineradagreelktalathisisgrid12341234updownnearax -ya_sequencea_shapesequencefinallybrow 1row 2row 3row 4row 5withasequence diagramyou canchild of is12341234scoreritemResponseitemessayRubricconceptsequencefrom one constant nearhaveanothergridhere andgrandchildscorerconceptessayRubricitemitemOutcomeitemResponse123continuenesting ororruns thisruns thisruns thisA straight edge across straight edge across nested typesdefault layoutdefault layoutdefault layout in styleto inside sequence diagramto inside sequence diagramto inside sequence diagramto constant nearfrom within constant nearto another getItem() itemgetRubric()rubricapplyTo(essayResp)match(essayResponse)score - - +ya_sequencea_shapesequencefinallybrow 1row 2row 3row 4row 5withasequence diagramyou canchild of is12341234scoreritemResponseitemessayRubricconceptsequencefrom one constant nearhaveanothergridhere andgrandchildscorerconceptessayRubricitemitemOutcomeitemResponse123continuenesting ororruns thisruns thisruns thisA straight edge across straight edge across nested typesdefault layoutdefault layoutdefault layout in styleto inside sequence diagramto inside sequence diagramto inside sequence diagramto constant nearfrom within constant nearto another getItem() itemgetRubric()rubricapplyTo(essayResp)match(essayResponse)score + + - + - - - - + + + + @@ -139,16 +139,16 @@ - + - - - - - + + + + + @@ -157,13 +157,13 @@ - - - - - - - + + + + + + + @@ -174,25 +174,25 @@ - - + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + @@ -201,37 +201,37 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -239,14 +239,14 @@ - - - - - - - - - - + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/sequence_diagram_all_shapes/dagre/board.exp.json b/e2etests/testdata/stable/sequence_diagram_all_shapes/dagre/board.exp.json index 52c1f0a9d5..8cf3485352 100644 --- a/e2etests/testdata/stable/sequence_diagram_all_shapes/dagre/board.exp.json +++ b/e2etests/testdata/stable/sequence_diagram_all_shapes/dagre/board.exp.json @@ -48,11 +48,11 @@ "id": "b", "type": "oval", "pos": { - "x": 259, - "y": 135 + "x": 258, + "y": 133 }, - "width": 101, - "height": 101, + "width": 103, + "height": 103, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -89,7 +89,7 @@ "id": "c", "type": "class", "pos": { - "x": 400, + "x": 401, "y": 52 }, "width": 302, @@ -144,7 +144,7 @@ "id": "d", "type": "cloud", "pos": { - "x": 742, + "x": 743, "y": 152 }, "width": 140, @@ -185,7 +185,7 @@ "id": "e", "type": "code", "pos": { - "x": 922, + "x": 923, "y": 158 }, "width": 199, @@ -226,7 +226,7 @@ "id": "f", "type": "cylinder", "pos": { - "x": 1143, + "x": 1144, "y": 118 }, "width": 100, @@ -267,7 +267,7 @@ "id": "g", "type": "diamond", "pos": { - "x": 1293, + "x": 1294, "y": 144 }, "width": 100, @@ -308,7 +308,7 @@ "id": "h", "type": "document", "pos": { - "x": 1443, + "x": 1444, "y": 160 }, "width": 100, @@ -349,7 +349,7 @@ "id": "i", "type": "hexagon", "pos": { - "x": 1583, + "x": 1584, "y": 167 }, "width": 146, @@ -390,7 +390,7 @@ "id": "j", "type": "image", "pos": { - "x": 1769, + "x": 1770, "y": 87 }, "width": 128, @@ -443,7 +443,7 @@ "id": "k", "type": "oval", "pos": { - "x": 1935, + "x": 1936, "y": 163 }, "width": 100, @@ -484,7 +484,7 @@ "id": "l", "type": "package", "pos": { - "x": 2085, + "x": 2086, "y": 163 }, "width": 100, @@ -525,7 +525,7 @@ "id": "m", "type": "page", "pos": { - "x": 2229, + "x": 2230, "y": 149 }, "width": 113, @@ -566,7 +566,7 @@ "id": "n", "type": "parallelogram", "pos": { - "x": 2382, + "x": 2383, "y": 154 }, "width": 169, @@ -607,7 +607,7 @@ "id": "o", "type": "person", "pos": { - "x": 2571, + "x": 2572, "y": 64 }, "width": 100, @@ -648,7 +648,7 @@ "id": "p", "type": "queue", "pos": { - "x": 2711, + "x": 2712, "y": 170 }, "width": 151, @@ -689,7 +689,7 @@ "id": "q", "type": "rectangle", "pos": { - "x": 2902, + "x": 2903, "y": 133 }, "width": 103, @@ -730,7 +730,7 @@ "id": "r", "type": "step", "pos": { - "x": 3045, + "x": 3046, "y": 135 }, "width": 187, @@ -771,7 +771,7 @@ "id": "s", "type": "stored_data", "pos": { - "x": 3270, + "x": 3271, "y": 170 }, "width": 100, @@ -812,7 +812,7 @@ "id": "t", "type": "sql_table", "pos": { - "x": 3410, + "x": 3411, "y": 128 }, "width": 161, @@ -1002,7 +1002,7 @@ "y": 376 }, { - "x": 551, + "x": 552, "y": 376 } ], @@ -1036,11 +1036,11 @@ "labelPercentage": 0, "route": [ { - "x": 551, + "x": 552, "y": 446 }, { - "x": 812, + "x": 813, "y": 446 } ], @@ -1074,11 +1074,11 @@ "labelPercentage": 0, "route": [ { - "x": 812, + "x": 813, "y": 516 }, { - "x": 1021.5, + "x": 1022.5, "y": 516 } ], @@ -1112,11 +1112,11 @@ "labelPercentage": 0, "route": [ { - "x": 1021.5, + "x": 1022.5, "y": 586 }, { - "x": 1193, + "x": 1194, "y": 586 } ], @@ -1150,11 +1150,11 @@ "labelPercentage": 0, "route": [ { - "x": 1193, + "x": 1194, "y": 656 }, { - "x": 1343, + "x": 1344, "y": 656 } ], @@ -1188,11 +1188,11 @@ "labelPercentage": 0, "route": [ { - "x": 1343, + "x": 1344, "y": 726 }, { - "x": 1493, + "x": 1494, "y": 726 } ], @@ -1226,11 +1226,11 @@ "labelPercentage": 0, "route": [ { - "x": 1493, + "x": 1494, "y": 796 }, { - "x": 1656, + "x": 1657, "y": 796 } ], @@ -1264,11 +1264,11 @@ "labelPercentage": 0, "route": [ { - "x": 1656, + "x": 1657, "y": 866 }, { - "x": 1833, + "x": 1834, "y": 866 } ], @@ -1302,11 +1302,11 @@ "labelPercentage": 0, "route": [ { - "x": 1833, + "x": 1834, "y": 936 }, { - "x": 1985, + "x": 1986, "y": 936 } ], @@ -1340,11 +1340,11 @@ "labelPercentage": 0, "route": [ { - "x": 1985, + "x": 1986, "y": 1006 }, { - "x": 2135, + "x": 2136, "y": 1006 } ], @@ -1378,11 +1378,11 @@ "labelPercentage": 0, "route": [ { - "x": 2135, + "x": 2136, "y": 1076 }, { - "x": 2285.5, + "x": 2286.5, "y": 1076 } ], @@ -1416,11 +1416,11 @@ "labelPercentage": 0, "route": [ { - "x": 2285.5, + "x": 2286.5, "y": 1146 }, { - "x": 2466.5, + "x": 2467.5, "y": 1146 } ], @@ -1454,11 +1454,11 @@ "labelPercentage": 0, "route": [ { - "x": 2466.5, + "x": 2467.5, "y": 1216 }, { - "x": 2621, + "x": 2622, "y": 1216 } ], @@ -1492,11 +1492,11 @@ "labelPercentage": 0, "route": [ { - "x": 2621, + "x": 2622, "y": 1286 }, { - "x": 2786.5, + "x": 2787.5, "y": 1286 } ], @@ -1530,11 +1530,11 @@ "labelPercentage": 0, "route": [ { - "x": 2786.5, + "x": 2787.5, "y": 1356 }, { - "x": 2953.5, + "x": 2954.5, "y": 1356 } ], @@ -1568,11 +1568,11 @@ "labelPercentage": 0, "route": [ { - "x": 2953.5, + "x": 2954.5, "y": 1426 }, { - "x": 3138.5, + "x": 3139.5, "y": 1426 } ], @@ -1606,11 +1606,11 @@ "labelPercentage": 0, "route": [ { - "x": 3138.5, + "x": 3139.5, "y": 1496 }, { - "x": 3320, + "x": 3321, "y": 1496 } ], @@ -1644,11 +1644,11 @@ "labelPercentage": 0, "route": [ { - "x": 3320, + "x": 3321, "y": 1566 }, { - "x": 3490.5, + "x": 3491.5, "y": 1566 } ], @@ -1758,11 +1758,11 @@ "labelPercentage": 0, "route": [ { - "x": 551, + "x": 552, "y": 236 }, { - "x": 551, + "x": 552, "y": 1636 } ], @@ -1796,11 +1796,11 @@ "labelPercentage": 0, "route": [ { - "x": 812, + "x": 813, "y": 236 }, { - "x": 812, + "x": 813, "y": 1636 } ], @@ -1834,11 +1834,11 @@ "labelPercentage": 0, "route": [ { - "x": 1021.5, + "x": 1022.5, "y": 236 }, { - "x": 1021.5, + "x": 1022.5, "y": 1636 } ], @@ -1872,11 +1872,11 @@ "labelPercentage": 0, "route": [ { - "x": 1193, + "x": 1194, "y": 236 }, { - "x": 1193, + "x": 1194, "y": 1636 } ], @@ -1910,11 +1910,11 @@ "labelPercentage": 0, "route": [ { - "x": 1343, + "x": 1344, "y": 236 }, { - "x": 1343, + "x": 1344, "y": 1636 } ], @@ -1948,11 +1948,11 @@ "labelPercentage": 0, "route": [ { - "x": 1493, + "x": 1494, "y": 236 }, { - "x": 1493, + "x": 1494, "y": 1636 } ], @@ -1986,11 +1986,11 @@ "labelPercentage": 0, "route": [ { - "x": 1656, + "x": 1657, "y": 236 }, { - "x": 1656, + "x": 1657, "y": 1636 } ], @@ -2024,11 +2024,11 @@ "labelPercentage": 0, "route": [ { - "x": 1833, + "x": 1834, "y": 241 }, { - "x": 1833, + "x": 1834, "y": 1636 } ], @@ -2062,11 +2062,11 @@ "labelPercentage": 0, "route": [ { - "x": 1985, + "x": 1986, "y": 236 }, { - "x": 1985, + "x": 1986, "y": 1636 } ], @@ -2100,11 +2100,11 @@ "labelPercentage": 0, "route": [ { - "x": 2135, + "x": 2136, "y": 236 }, { - "x": 2135, + "x": 2136, "y": 1636 } ], @@ -2138,11 +2138,11 @@ "labelPercentage": 0, "route": [ { - "x": 2285.5, + "x": 2286.5, "y": 236 }, { - "x": 2285.5, + "x": 2286.5, "y": 1636 } ], @@ -2176,11 +2176,11 @@ "labelPercentage": 0, "route": [ { - "x": 2466.5, + "x": 2467.5, "y": 236 }, { - "x": 2466.5, + "x": 2467.5, "y": 1636 } ], @@ -2214,11 +2214,11 @@ "labelPercentage": 0, "route": [ { - "x": 2621, + "x": 2622, "y": 241 }, { - "x": 2621, + "x": 2622, "y": 1636 } ], @@ -2252,11 +2252,11 @@ "labelPercentage": 0, "route": [ { - "x": 2786.5, + "x": 2787.5, "y": 236 }, { - "x": 2786.5, + "x": 2787.5, "y": 1636 } ], @@ -2290,11 +2290,11 @@ "labelPercentage": 0, "route": [ { - "x": 2953.5, + "x": 2954.5, "y": 236 }, { - "x": 2953.5, + "x": 2954.5, "y": 1636 } ], @@ -2328,11 +2328,11 @@ "labelPercentage": 0, "route": [ { - "x": 3138.5, + "x": 3139.5, "y": 236 }, { - "x": 3138.5, + "x": 3139.5, "y": 1636 } ], @@ -2366,11 +2366,11 @@ "labelPercentage": 0, "route": [ { - "x": 3320, + "x": 3321, "y": 236 }, { - "x": 3320, + "x": 3321, "y": 1636 } ], @@ -2404,11 +2404,11 @@ "labelPercentage": 0, "route": [ { - "x": 3490.5, + "x": 3491.5, "y": 236 }, { - "x": 3490.5, + "x": 3491.5, "y": 1636 } ], diff --git a/e2etests/testdata/stable/sequence_diagram_all_shapes/dagre/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_all_shapes/dagre/sketch.exp.svg index 2c55a7fbfc..5a568171e4 100644 --- a/e2etests/testdata/stable/sequence_diagram_all_shapes/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_all_shapes/dagre/sketch.exp.svg @@ -1,30 +1,30 @@ -a labelblabelsa class+public() boolvoid-private() intvoidcloudyyyya := 5 + .d2-3812705447 .fill-N1{fill:#0A0F25;} + .d2-3812705447 .fill-N2{fill:#676C7E;} + .d2-3812705447 .fill-N3{fill:#9499AB;} + .d2-3812705447 .fill-N4{fill:#CFD2DD;} + .d2-3812705447 .fill-N5{fill:#DEE1EB;} + .d2-3812705447 .fill-N6{fill:#EEF1F8;} + .d2-3812705447 .fill-N7{fill:#FFFFFF;} + .d2-3812705447 .fill-B1{fill:#0D32B2;} + .d2-3812705447 .fill-B2{fill:#0D32B2;} + .d2-3812705447 .fill-B3{fill:#E3E9FD;} + .d2-3812705447 .fill-B4{fill:#E3E9FD;} + .d2-3812705447 .fill-B5{fill:#EDF0FD;} + .d2-3812705447 .fill-B6{fill:#F7F8FE;} + .d2-3812705447 .fill-AA2{fill:#4A6FF3;} + .d2-3812705447 .fill-AA4{fill:#EDF0FD;} + .d2-3812705447 .fill-AA5{fill:#F7F8FE;} + .d2-3812705447 .fill-AB4{fill:#EDF0FD;} + .d2-3812705447 .fill-AB5{fill:#F7F8FE;} + .d2-3812705447 .stroke-N1{stroke:#0A0F25;} + .d2-3812705447 .stroke-N2{stroke:#676C7E;} + .d2-3812705447 .stroke-N3{stroke:#9499AB;} + .d2-3812705447 .stroke-N4{stroke:#CFD2DD;} + .d2-3812705447 .stroke-N5{stroke:#DEE1EB;} + .d2-3812705447 .stroke-N6{stroke:#EEF1F8;} + .d2-3812705447 .stroke-N7{stroke:#FFFFFF;} + .d2-3812705447 .stroke-B1{stroke:#0D32B2;} + .d2-3812705447 .stroke-B2{stroke:#0D32B2;} + .d2-3812705447 .stroke-B3{stroke:#E3E9FD;} + .d2-3812705447 .stroke-B4{stroke:#E3E9FD;} + .d2-3812705447 .stroke-B5{stroke:#EDF0FD;} + .d2-3812705447 .stroke-B6{stroke:#F7F8FE;} + .d2-3812705447 .stroke-AA2{stroke:#4A6FF3;} + .d2-3812705447 .stroke-AA4{stroke:#EDF0FD;} + .d2-3812705447 .stroke-AA5{stroke:#F7F8FE;} + .d2-3812705447 .stroke-AB4{stroke:#EDF0FD;} + .d2-3812705447 .stroke-AB5{stroke:#F7F8FE;} + .d2-3812705447 .background-color-N1{background-color:#0A0F25;} + .d2-3812705447 .background-color-N2{background-color:#676C7E;} + .d2-3812705447 .background-color-N3{background-color:#9499AB;} + .d2-3812705447 .background-color-N4{background-color:#CFD2DD;} + .d2-3812705447 .background-color-N5{background-color:#DEE1EB;} + .d2-3812705447 .background-color-N6{background-color:#EEF1F8;} + .d2-3812705447 .background-color-N7{background-color:#FFFFFF;} + .d2-3812705447 .background-color-B1{background-color:#0D32B2;} + .d2-3812705447 .background-color-B2{background-color:#0D32B2;} + .d2-3812705447 .background-color-B3{background-color:#E3E9FD;} + .d2-3812705447 .background-color-B4{background-color:#E3E9FD;} + .d2-3812705447 .background-color-B5{background-color:#EDF0FD;} + .d2-3812705447 .background-color-B6{background-color:#F7F8FE;} + .d2-3812705447 .background-color-AA2{background-color:#4A6FF3;} + .d2-3812705447 .background-color-AA4{background-color:#EDF0FD;} + .d2-3812705447 .background-color-AA5{background-color:#F7F8FE;} + .d2-3812705447 .background-color-AB4{background-color:#EDF0FD;} + .d2-3812705447 .background-color-AB5{background-color:#F7F8FE;} + .d2-3812705447 .color-N1{color:#0A0F25;} + .d2-3812705447 .color-N2{color:#676C7E;} + .d2-3812705447 .color-N3{color:#9499AB;} + .d2-3812705447 .color-N4{color:#CFD2DD;} + .d2-3812705447 .color-N5{color:#DEE1EB;} + .d2-3812705447 .color-N6{color:#EEF1F8;} + .d2-3812705447 .color-N7{color:#FFFFFF;} + .d2-3812705447 .color-B1{color:#0D32B2;} + .d2-3812705447 .color-B2{color:#0D32B2;} + .d2-3812705447 .color-B3{color:#E3E9FD;} + .d2-3812705447 .color-B4{color:#E3E9FD;} + .d2-3812705447 .color-B5{color:#EDF0FD;} + .d2-3812705447 .color-B6{color:#F7F8FE;} + .d2-3812705447 .color-AA2{color:#4A6FF3;} + .d2-3812705447 .color-AA4{color:#EDF0FD;} + .d2-3812705447 .color-AA5{color:#F7F8FE;} + .d2-3812705447 .color-AB4{color:#EDF0FD;} + .d2-3812705447 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>a labelblabelsa class+public() boolvoid-private() intvoidcloudyyyya := 5 b := a + 7 -fmt.Printf("%d", b)a := 5 +fmt.Printf("%d", b)a := 5 b := a + 7 -fmt.Printf("%d", b)cyldiadocssix cornersa random iconoverpackdocs pagetoohard o saysinglepersona queuea squarea step at a timedatausersidintnamevarchar result := callThisFunction(obj, 5) midthis sideother side - +fmt.Printf("%d", b)cyldiadocssix cornersa random iconoverpackdocs pagetoohard o saysinglepersona queuea squarea step at a timedatausersidintnamevarchar result := callThisFunction(obj, 5) midthis sideother side + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - + \ No newline at end of file diff --git a/e2etests/testdata/stable/sequence_diagram_all_shapes/elk/board.exp.json b/e2etests/testdata/stable/sequence_diagram_all_shapes/elk/board.exp.json index 52c1f0a9d5..8cf3485352 100644 --- a/e2etests/testdata/stable/sequence_diagram_all_shapes/elk/board.exp.json +++ b/e2etests/testdata/stable/sequence_diagram_all_shapes/elk/board.exp.json @@ -48,11 +48,11 @@ "id": "b", "type": "oval", "pos": { - "x": 259, - "y": 135 + "x": 258, + "y": 133 }, - "width": 101, - "height": 101, + "width": 103, + "height": 103, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -89,7 +89,7 @@ "id": "c", "type": "class", "pos": { - "x": 400, + "x": 401, "y": 52 }, "width": 302, @@ -144,7 +144,7 @@ "id": "d", "type": "cloud", "pos": { - "x": 742, + "x": 743, "y": 152 }, "width": 140, @@ -185,7 +185,7 @@ "id": "e", "type": "code", "pos": { - "x": 922, + "x": 923, "y": 158 }, "width": 199, @@ -226,7 +226,7 @@ "id": "f", "type": "cylinder", "pos": { - "x": 1143, + "x": 1144, "y": 118 }, "width": 100, @@ -267,7 +267,7 @@ "id": "g", "type": "diamond", "pos": { - "x": 1293, + "x": 1294, "y": 144 }, "width": 100, @@ -308,7 +308,7 @@ "id": "h", "type": "document", "pos": { - "x": 1443, + "x": 1444, "y": 160 }, "width": 100, @@ -349,7 +349,7 @@ "id": "i", "type": "hexagon", "pos": { - "x": 1583, + "x": 1584, "y": 167 }, "width": 146, @@ -390,7 +390,7 @@ "id": "j", "type": "image", "pos": { - "x": 1769, + "x": 1770, "y": 87 }, "width": 128, @@ -443,7 +443,7 @@ "id": "k", "type": "oval", "pos": { - "x": 1935, + "x": 1936, "y": 163 }, "width": 100, @@ -484,7 +484,7 @@ "id": "l", "type": "package", "pos": { - "x": 2085, + "x": 2086, "y": 163 }, "width": 100, @@ -525,7 +525,7 @@ "id": "m", "type": "page", "pos": { - "x": 2229, + "x": 2230, "y": 149 }, "width": 113, @@ -566,7 +566,7 @@ "id": "n", "type": "parallelogram", "pos": { - "x": 2382, + "x": 2383, "y": 154 }, "width": 169, @@ -607,7 +607,7 @@ "id": "o", "type": "person", "pos": { - "x": 2571, + "x": 2572, "y": 64 }, "width": 100, @@ -648,7 +648,7 @@ "id": "p", "type": "queue", "pos": { - "x": 2711, + "x": 2712, "y": 170 }, "width": 151, @@ -689,7 +689,7 @@ "id": "q", "type": "rectangle", "pos": { - "x": 2902, + "x": 2903, "y": 133 }, "width": 103, @@ -730,7 +730,7 @@ "id": "r", "type": "step", "pos": { - "x": 3045, + "x": 3046, "y": 135 }, "width": 187, @@ -771,7 +771,7 @@ "id": "s", "type": "stored_data", "pos": { - "x": 3270, + "x": 3271, "y": 170 }, "width": 100, @@ -812,7 +812,7 @@ "id": "t", "type": "sql_table", "pos": { - "x": 3410, + "x": 3411, "y": 128 }, "width": 161, @@ -1002,7 +1002,7 @@ "y": 376 }, { - "x": 551, + "x": 552, "y": 376 } ], @@ -1036,11 +1036,11 @@ "labelPercentage": 0, "route": [ { - "x": 551, + "x": 552, "y": 446 }, { - "x": 812, + "x": 813, "y": 446 } ], @@ -1074,11 +1074,11 @@ "labelPercentage": 0, "route": [ { - "x": 812, + "x": 813, "y": 516 }, { - "x": 1021.5, + "x": 1022.5, "y": 516 } ], @@ -1112,11 +1112,11 @@ "labelPercentage": 0, "route": [ { - "x": 1021.5, + "x": 1022.5, "y": 586 }, { - "x": 1193, + "x": 1194, "y": 586 } ], @@ -1150,11 +1150,11 @@ "labelPercentage": 0, "route": [ { - "x": 1193, + "x": 1194, "y": 656 }, { - "x": 1343, + "x": 1344, "y": 656 } ], @@ -1188,11 +1188,11 @@ "labelPercentage": 0, "route": [ { - "x": 1343, + "x": 1344, "y": 726 }, { - "x": 1493, + "x": 1494, "y": 726 } ], @@ -1226,11 +1226,11 @@ "labelPercentage": 0, "route": [ { - "x": 1493, + "x": 1494, "y": 796 }, { - "x": 1656, + "x": 1657, "y": 796 } ], @@ -1264,11 +1264,11 @@ "labelPercentage": 0, "route": [ { - "x": 1656, + "x": 1657, "y": 866 }, { - "x": 1833, + "x": 1834, "y": 866 } ], @@ -1302,11 +1302,11 @@ "labelPercentage": 0, "route": [ { - "x": 1833, + "x": 1834, "y": 936 }, { - "x": 1985, + "x": 1986, "y": 936 } ], @@ -1340,11 +1340,11 @@ "labelPercentage": 0, "route": [ { - "x": 1985, + "x": 1986, "y": 1006 }, { - "x": 2135, + "x": 2136, "y": 1006 } ], @@ -1378,11 +1378,11 @@ "labelPercentage": 0, "route": [ { - "x": 2135, + "x": 2136, "y": 1076 }, { - "x": 2285.5, + "x": 2286.5, "y": 1076 } ], @@ -1416,11 +1416,11 @@ "labelPercentage": 0, "route": [ { - "x": 2285.5, + "x": 2286.5, "y": 1146 }, { - "x": 2466.5, + "x": 2467.5, "y": 1146 } ], @@ -1454,11 +1454,11 @@ "labelPercentage": 0, "route": [ { - "x": 2466.5, + "x": 2467.5, "y": 1216 }, { - "x": 2621, + "x": 2622, "y": 1216 } ], @@ -1492,11 +1492,11 @@ "labelPercentage": 0, "route": [ { - "x": 2621, + "x": 2622, "y": 1286 }, { - "x": 2786.5, + "x": 2787.5, "y": 1286 } ], @@ -1530,11 +1530,11 @@ "labelPercentage": 0, "route": [ { - "x": 2786.5, + "x": 2787.5, "y": 1356 }, { - "x": 2953.5, + "x": 2954.5, "y": 1356 } ], @@ -1568,11 +1568,11 @@ "labelPercentage": 0, "route": [ { - "x": 2953.5, + "x": 2954.5, "y": 1426 }, { - "x": 3138.5, + "x": 3139.5, "y": 1426 } ], @@ -1606,11 +1606,11 @@ "labelPercentage": 0, "route": [ { - "x": 3138.5, + "x": 3139.5, "y": 1496 }, { - "x": 3320, + "x": 3321, "y": 1496 } ], @@ -1644,11 +1644,11 @@ "labelPercentage": 0, "route": [ { - "x": 3320, + "x": 3321, "y": 1566 }, { - "x": 3490.5, + "x": 3491.5, "y": 1566 } ], @@ -1758,11 +1758,11 @@ "labelPercentage": 0, "route": [ { - "x": 551, + "x": 552, "y": 236 }, { - "x": 551, + "x": 552, "y": 1636 } ], @@ -1796,11 +1796,11 @@ "labelPercentage": 0, "route": [ { - "x": 812, + "x": 813, "y": 236 }, { - "x": 812, + "x": 813, "y": 1636 } ], @@ -1834,11 +1834,11 @@ "labelPercentage": 0, "route": [ { - "x": 1021.5, + "x": 1022.5, "y": 236 }, { - "x": 1021.5, + "x": 1022.5, "y": 1636 } ], @@ -1872,11 +1872,11 @@ "labelPercentage": 0, "route": [ { - "x": 1193, + "x": 1194, "y": 236 }, { - "x": 1193, + "x": 1194, "y": 1636 } ], @@ -1910,11 +1910,11 @@ "labelPercentage": 0, "route": [ { - "x": 1343, + "x": 1344, "y": 236 }, { - "x": 1343, + "x": 1344, "y": 1636 } ], @@ -1948,11 +1948,11 @@ "labelPercentage": 0, "route": [ { - "x": 1493, + "x": 1494, "y": 236 }, { - "x": 1493, + "x": 1494, "y": 1636 } ], @@ -1986,11 +1986,11 @@ "labelPercentage": 0, "route": [ { - "x": 1656, + "x": 1657, "y": 236 }, { - "x": 1656, + "x": 1657, "y": 1636 } ], @@ -2024,11 +2024,11 @@ "labelPercentage": 0, "route": [ { - "x": 1833, + "x": 1834, "y": 241 }, { - "x": 1833, + "x": 1834, "y": 1636 } ], @@ -2062,11 +2062,11 @@ "labelPercentage": 0, "route": [ { - "x": 1985, + "x": 1986, "y": 236 }, { - "x": 1985, + "x": 1986, "y": 1636 } ], @@ -2100,11 +2100,11 @@ "labelPercentage": 0, "route": [ { - "x": 2135, + "x": 2136, "y": 236 }, { - "x": 2135, + "x": 2136, "y": 1636 } ], @@ -2138,11 +2138,11 @@ "labelPercentage": 0, "route": [ { - "x": 2285.5, + "x": 2286.5, "y": 236 }, { - "x": 2285.5, + "x": 2286.5, "y": 1636 } ], @@ -2176,11 +2176,11 @@ "labelPercentage": 0, "route": [ { - "x": 2466.5, + "x": 2467.5, "y": 236 }, { - "x": 2466.5, + "x": 2467.5, "y": 1636 } ], @@ -2214,11 +2214,11 @@ "labelPercentage": 0, "route": [ { - "x": 2621, + "x": 2622, "y": 241 }, { - "x": 2621, + "x": 2622, "y": 1636 } ], @@ -2252,11 +2252,11 @@ "labelPercentage": 0, "route": [ { - "x": 2786.5, + "x": 2787.5, "y": 236 }, { - "x": 2786.5, + "x": 2787.5, "y": 1636 } ], @@ -2290,11 +2290,11 @@ "labelPercentage": 0, "route": [ { - "x": 2953.5, + "x": 2954.5, "y": 236 }, { - "x": 2953.5, + "x": 2954.5, "y": 1636 } ], @@ -2328,11 +2328,11 @@ "labelPercentage": 0, "route": [ { - "x": 3138.5, + "x": 3139.5, "y": 236 }, { - "x": 3138.5, + "x": 3139.5, "y": 1636 } ], @@ -2366,11 +2366,11 @@ "labelPercentage": 0, "route": [ { - "x": 3320, + "x": 3321, "y": 236 }, { - "x": 3320, + "x": 3321, "y": 1636 } ], @@ -2404,11 +2404,11 @@ "labelPercentage": 0, "route": [ { - "x": 3490.5, + "x": 3491.5, "y": 236 }, { - "x": 3490.5, + "x": 3491.5, "y": 1636 } ], diff --git a/e2etests/testdata/stable/sequence_diagram_all_shapes/elk/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_all_shapes/elk/sketch.exp.svg index 2c55a7fbfc..5a568171e4 100644 --- a/e2etests/testdata/stable/sequence_diagram_all_shapes/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_all_shapes/elk/sketch.exp.svg @@ -1,30 +1,30 @@ -a labelblabelsa class+public() boolvoid-private() intvoidcloudyyyya := 5 + .d2-3812705447 .fill-N1{fill:#0A0F25;} + .d2-3812705447 .fill-N2{fill:#676C7E;} + .d2-3812705447 .fill-N3{fill:#9499AB;} + .d2-3812705447 .fill-N4{fill:#CFD2DD;} + .d2-3812705447 .fill-N5{fill:#DEE1EB;} + .d2-3812705447 .fill-N6{fill:#EEF1F8;} + .d2-3812705447 .fill-N7{fill:#FFFFFF;} + .d2-3812705447 .fill-B1{fill:#0D32B2;} + .d2-3812705447 .fill-B2{fill:#0D32B2;} + .d2-3812705447 .fill-B3{fill:#E3E9FD;} + .d2-3812705447 .fill-B4{fill:#E3E9FD;} + .d2-3812705447 .fill-B5{fill:#EDF0FD;} + .d2-3812705447 .fill-B6{fill:#F7F8FE;} + .d2-3812705447 .fill-AA2{fill:#4A6FF3;} + .d2-3812705447 .fill-AA4{fill:#EDF0FD;} + .d2-3812705447 .fill-AA5{fill:#F7F8FE;} + .d2-3812705447 .fill-AB4{fill:#EDF0FD;} + .d2-3812705447 .fill-AB5{fill:#F7F8FE;} + .d2-3812705447 .stroke-N1{stroke:#0A0F25;} + .d2-3812705447 .stroke-N2{stroke:#676C7E;} + .d2-3812705447 .stroke-N3{stroke:#9499AB;} + .d2-3812705447 .stroke-N4{stroke:#CFD2DD;} + .d2-3812705447 .stroke-N5{stroke:#DEE1EB;} + .d2-3812705447 .stroke-N6{stroke:#EEF1F8;} + .d2-3812705447 .stroke-N7{stroke:#FFFFFF;} + .d2-3812705447 .stroke-B1{stroke:#0D32B2;} + .d2-3812705447 .stroke-B2{stroke:#0D32B2;} + .d2-3812705447 .stroke-B3{stroke:#E3E9FD;} + .d2-3812705447 .stroke-B4{stroke:#E3E9FD;} + .d2-3812705447 .stroke-B5{stroke:#EDF0FD;} + .d2-3812705447 .stroke-B6{stroke:#F7F8FE;} + .d2-3812705447 .stroke-AA2{stroke:#4A6FF3;} + .d2-3812705447 .stroke-AA4{stroke:#EDF0FD;} + .d2-3812705447 .stroke-AA5{stroke:#F7F8FE;} + .d2-3812705447 .stroke-AB4{stroke:#EDF0FD;} + .d2-3812705447 .stroke-AB5{stroke:#F7F8FE;} + .d2-3812705447 .background-color-N1{background-color:#0A0F25;} + .d2-3812705447 .background-color-N2{background-color:#676C7E;} + .d2-3812705447 .background-color-N3{background-color:#9499AB;} + .d2-3812705447 .background-color-N4{background-color:#CFD2DD;} + .d2-3812705447 .background-color-N5{background-color:#DEE1EB;} + .d2-3812705447 .background-color-N6{background-color:#EEF1F8;} + .d2-3812705447 .background-color-N7{background-color:#FFFFFF;} + .d2-3812705447 .background-color-B1{background-color:#0D32B2;} + .d2-3812705447 .background-color-B2{background-color:#0D32B2;} + .d2-3812705447 .background-color-B3{background-color:#E3E9FD;} + .d2-3812705447 .background-color-B4{background-color:#E3E9FD;} + .d2-3812705447 .background-color-B5{background-color:#EDF0FD;} + .d2-3812705447 .background-color-B6{background-color:#F7F8FE;} + .d2-3812705447 .background-color-AA2{background-color:#4A6FF3;} + .d2-3812705447 .background-color-AA4{background-color:#EDF0FD;} + .d2-3812705447 .background-color-AA5{background-color:#F7F8FE;} + .d2-3812705447 .background-color-AB4{background-color:#EDF0FD;} + .d2-3812705447 .background-color-AB5{background-color:#F7F8FE;} + .d2-3812705447 .color-N1{color:#0A0F25;} + .d2-3812705447 .color-N2{color:#676C7E;} + .d2-3812705447 .color-N3{color:#9499AB;} + .d2-3812705447 .color-N4{color:#CFD2DD;} + .d2-3812705447 .color-N5{color:#DEE1EB;} + .d2-3812705447 .color-N6{color:#EEF1F8;} + .d2-3812705447 .color-N7{color:#FFFFFF;} + .d2-3812705447 .color-B1{color:#0D32B2;} + .d2-3812705447 .color-B2{color:#0D32B2;} + .d2-3812705447 .color-B3{color:#E3E9FD;} + .d2-3812705447 .color-B4{color:#E3E9FD;} + .d2-3812705447 .color-B5{color:#EDF0FD;} + .d2-3812705447 .color-B6{color:#F7F8FE;} + .d2-3812705447 .color-AA2{color:#4A6FF3;} + .d2-3812705447 .color-AA4{color:#EDF0FD;} + .d2-3812705447 .color-AA5{color:#F7F8FE;} + .d2-3812705447 .color-AB4{color:#EDF0FD;} + .d2-3812705447 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>a labelblabelsa class+public() boolvoid-private() intvoidcloudyyyya := 5 b := a + 7 -fmt.Printf("%d", b)a := 5 +fmt.Printf("%d", b)a := 5 b := a + 7 -fmt.Printf("%d", b)cyldiadocssix cornersa random iconoverpackdocs pagetoohard o saysinglepersona queuea squarea step at a timedatausersidintnamevarchar result := callThisFunction(obj, 5) midthis sideother side - +fmt.Printf("%d", b)cyldiadocssix cornersa random iconoverpackdocs pagetoohard o saysinglepersona queuea squarea step at a timedatausersidintnamevarchar result := callThisFunction(obj, 5) midthis sideother side + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - + \ No newline at end of file diff --git a/e2etests/testdata/stable/sequence_diagrams/dagre/board.exp.json b/e2etests/testdata/stable/sequence_diagrams/dagre/board.exp.json index baa755aa57..9f2d86b168 100644 --- a/e2etests/testdata/stable/sequence_diagrams/dagre/board.exp.json +++ b/e2etests/testdata/stable/sequence_diagrams/dagre/board.exp.json @@ -7,11 +7,11 @@ "id": "a_shape", "type": "oval", "pos": { - "x": 1457, + "x": 1446, "y": 0 }, - "width": 108, - "height": 108, + "width": 131, + "height": 131, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -49,7 +49,7 @@ "type": "sequence_diagram", "pos": { "x": 0, - "y": 258 + "y": 281 }, "width": 954, "height": 1146, @@ -90,7 +90,7 @@ "type": "rectangle", "pos": { "x": 12, - "y": 346 + "y": 369 }, "width": 100, "height": 66, @@ -131,7 +131,7 @@ "type": "rectangle", "pos": { "x": 56, - "y": 472 + "y": 495 }, "width": 12, "height": 860, @@ -171,7 +171,7 @@ "type": "rectangle", "pos": { "x": 152, - "y": 346 + "y": 369 }, "width": 140, "height": 66, @@ -212,7 +212,7 @@ "type": "rectangle", "pos": { "x": 216, - "y": 472 + "y": 495 }, "width": 12, "height": 90, @@ -252,7 +252,7 @@ "type": "rectangle", "pos": { "x": 322, - "y": 346 + "y": 369 }, "width": 100, "height": 66, @@ -293,7 +293,7 @@ "type": "rectangle", "pos": { "x": 366, - "y": 612 + "y": 635 }, "width": 12, "height": 90, @@ -333,7 +333,7 @@ "type": "rectangle", "pos": { "x": 462, - "y": 346 + "y": 369 }, "width": 126, "height": 66, @@ -374,7 +374,7 @@ "type": "rectangle", "pos": { "x": 519, - "y": 752 + "y": 775 }, "width": 12, "height": 230, @@ -414,7 +414,7 @@ "type": "rectangle", "pos": { "x": 515, - "y": 822 + "y": 845 }, "width": 20, "height": 90, @@ -454,7 +454,7 @@ "type": "rectangle", "pos": { "x": 665, - "y": 346 + "y": 369 }, "width": 100, "height": 66, @@ -495,7 +495,7 @@ "type": "rectangle", "pos": { "x": 709, - "y": 892 + "y": 915 }, "width": 12, "height": 30, @@ -535,7 +535,7 @@ "type": "rectangle", "pos": { "x": 805, - "y": 346 + "y": 369 }, "width": 137, "height": 66, @@ -576,7 +576,7 @@ "type": "rectangle", "pos": { "x": 867, - "y": 1032 + "y": 1055 }, "width": 12, "height": 30, @@ -616,7 +616,7 @@ "type": "rectangle", "pos": { "x": 366, - "y": 1102 + "y": 1125 }, "width": 12, "height": 30, @@ -656,7 +656,7 @@ "type": "rectangle", "pos": { "x": 366, - "y": 1172 + "y": 1195 }, "width": 12, "height": 30, @@ -696,7 +696,7 @@ "type": "rectangle", "pos": { "x": 867, - "y": 1242 + "y": 1265 }, "width": 12, "height": 30, @@ -736,7 +736,7 @@ "type": "rectangle", "pos": { "x": 867, - "y": 1312 + "y": 1335 }, "width": 12, "height": 30, @@ -776,7 +776,7 @@ "type": "rectangle", "pos": { "x": 1004, - "y": 231 + "y": 254 }, "width": 1014, "height": 1201, @@ -817,7 +817,7 @@ "type": "sequence_diagram", "pos": { "x": 1034, - "y": 261 + "y": 284 }, "width": 954, "height": 1141, @@ -858,7 +858,7 @@ "type": "rectangle", "pos": { "x": 1046, - "y": 344 + "y": 367 }, "width": 100, "height": 66, @@ -899,7 +899,7 @@ "type": "rectangle", "pos": { "x": 1090, - "y": 470 + "y": 493 }, "width": 12, "height": 860, @@ -939,7 +939,7 @@ "type": "rectangle", "pos": { "x": 1186, - "y": 344 + "y": 367 }, "width": 140, "height": 66, @@ -980,7 +980,7 @@ "type": "rectangle", "pos": { "x": 1250, - "y": 470 + "y": 493 }, "width": 12, "height": 90, @@ -1020,7 +1020,7 @@ "type": "rectangle", "pos": { "x": 1356, - "y": 344 + "y": 367 }, "width": 100, "height": 66, @@ -1061,7 +1061,7 @@ "type": "rectangle", "pos": { "x": 1400, - "y": 610 + "y": 633 }, "width": 12, "height": 90, @@ -1101,7 +1101,7 @@ "type": "rectangle", "pos": { "x": 1496, - "y": 344 + "y": 367 }, "width": 126, "height": 66, @@ -1142,7 +1142,7 @@ "type": "rectangle", "pos": { "x": 1553, - "y": 750 + "y": 773 }, "width": 12, "height": 230, @@ -1182,7 +1182,7 @@ "type": "rectangle", "pos": { "x": 1549, - "y": 820 + "y": 843 }, "width": 20, "height": 90, @@ -1222,7 +1222,7 @@ "type": "rectangle", "pos": { "x": 1699, - "y": 344 + "y": 367 }, "width": 100, "height": 66, @@ -1263,7 +1263,7 @@ "type": "rectangle", "pos": { "x": 1743, - "y": 890 + "y": 913 }, "width": 12, "height": 30, @@ -1303,7 +1303,7 @@ "type": "rectangle", "pos": { "x": 1839, - "y": 344 + "y": 367 }, "width": 137, "height": 66, @@ -1344,7 +1344,7 @@ "type": "rectangle", "pos": { "x": 1901, - "y": 1030 + "y": 1053 }, "width": 12, "height": 30, @@ -1384,7 +1384,7 @@ "type": "rectangle", "pos": { "x": 1400, - "y": 1100 + "y": 1123 }, "width": 12, "height": 30, @@ -1424,7 +1424,7 @@ "type": "rectangle", "pos": { "x": 1400, - "y": 1170 + "y": 1193 }, "width": 12, "height": 30, @@ -1464,7 +1464,7 @@ "type": "rectangle", "pos": { "x": 1901, - "y": 1240 + "y": 1263 }, "width": 12, "height": 30, @@ -1504,7 +1504,7 @@ "type": "rectangle", "pos": { "x": 1901, - "y": 1310 + "y": 1333 }, "width": 12, "height": 30, @@ -1544,7 +1544,7 @@ "type": "rectangle", "pos": { "x": 421, - "y": 1967 + "y": 1990 }, "width": 112, "height": 66, @@ -1585,7 +1585,7 @@ "type": "queue", "pos": { "x": 1238, - "y": 1554 + "y": 1577 }, "width": 1074, "height": 891, @@ -1626,7 +1626,7 @@ "type": "sequence_diagram", "pos": { "x": 1313, - "y": 1604 + "y": 1627 }, "width": 934, "height": 791, @@ -1667,7 +1667,7 @@ "type": "rectangle", "pos": { "x": 1325, - "y": 1687 + "y": 1710 }, "width": 100, "height": 66, @@ -1708,7 +1708,7 @@ "type": "rectangle", "pos": { "x": 1475, - "y": 1687 + "y": 1710 }, "width": 100, "height": 66, @@ -1749,7 +1749,7 @@ "type": "rectangle", "pos": { "x": 1615, - "y": 1687 + "y": 1710 }, "width": 126, "height": 66, @@ -1790,7 +1790,7 @@ "type": "rectangle", "pos": { "x": 1778, - "y": 1687 + "y": 1710 }, "width": 100, "height": 66, @@ -1831,7 +1831,7 @@ "type": "rectangle", "pos": { "x": 1918, - "y": 1687 + "y": 1710 }, "width": 137, "height": 66, @@ -1872,7 +1872,7 @@ "type": "rectangle", "pos": { "x": 2095, - "y": 1687 + "y": 1710 }, "width": 140, "height": 66, @@ -1913,7 +1913,7 @@ "type": "rectangle", "pos": { "x": 2159, - "y": 1813 + "y": 1836 }, "width": 12, "height": 30, @@ -1953,7 +1953,7 @@ "type": "rectangle", "pos": { "x": 1822, - "y": 1803 + "y": 1826 }, "width": 12, "height": 380, @@ -1993,7 +1993,7 @@ "type": "rectangle", "pos": { "x": 1818, - "y": 1813 + "y": 1836 }, "width": 20, "height": 90, @@ -2033,7 +2033,7 @@ "type": "rectangle", "pos": { "x": 1672, - "y": 1863 + "y": 1886 }, "width": 12, "height": 190, @@ -2073,7 +2073,7 @@ "type": "rectangle", "pos": { "x": 1668, - "y": 1873 + "y": 1896 }, "width": 20, "height": 170, @@ -2113,7 +2113,7 @@ "type": "rectangle", "pos": { "x": 1664, - "y": 1883 + "y": 1906 }, "width": 28, "height": 90, @@ -2153,7 +2153,7 @@ "type": "rectangle", "pos": { "x": 1519, - "y": 1923 + "y": 1946 }, "width": 12, "height": 220, @@ -2193,7 +2193,7 @@ "type": "rectangle", "pos": { "x": 1515, - "y": 1933 + "y": 1956 }, "width": 20, "height": 200, @@ -2233,7 +2233,7 @@ "type": "rectangle", "pos": { "x": 1511, - "y": 1943 + "y": 1966 }, "width": 28, "height": 180, @@ -2273,7 +2273,7 @@ "type": "rectangle", "pos": { "x": 1507, - "y": 1953 + "y": 1976 }, "width": 36, "height": 160, @@ -2313,7 +2313,7 @@ "type": "rectangle", "pos": { "x": 1980, - "y": 2053 + "y": 2076 }, "width": 12, "height": 240, @@ -2353,7 +2353,7 @@ "type": "rectangle", "pos": { "x": 1976, - "y": 2063 + "y": 2086 }, "width": 20, "height": 220, @@ -2393,7 +2393,7 @@ "type": "rectangle", "pos": { "x": 1972, - "y": 2073 + "y": 2096 }, "width": 28, "height": 200, @@ -2433,7 +2433,7 @@ "type": "rectangle", "pos": { "x": 1968, - "y": 2083 + "y": 2106 }, "width": 36, "height": 180, @@ -2473,7 +2473,7 @@ "type": "rectangle", "pos": { "x": 1964, - "y": 2093 + "y": 2116 }, "width": 44, "height": 160, @@ -2513,7 +2513,7 @@ "type": "rectangle", "pos": { "x": 1369, - "y": 2163 + "y": 2186 }, "width": 12, "height": 30, @@ -2553,7 +2553,7 @@ "type": "rectangle", "pos": { "x": 2159, - "y": 2303 + "y": 2326 }, "width": 12, "height": 30, @@ -2616,11 +2616,11 @@ "route": [ { "x": 68, - "y": 482 + "y": 505 }, { "x": 216, - "y": 482 + "y": 505 } ], "animated": false, @@ -2654,11 +2654,11 @@ "route": [ { "x": 68, - "y": 552 + "y": 575 }, { "x": 216, - "y": 552 + "y": 575 } ], "animated": false, @@ -2692,11 +2692,11 @@ "route": [ { "x": 68, - "y": 622 + "y": 645 }, { "x": 366, - "y": 622 + "y": 645 } ], "animated": false, @@ -2730,11 +2730,11 @@ "route": [ { "x": 68, - "y": 692 + "y": 715 }, { "x": 366, - "y": 692 + "y": 715 } ], "animated": false, @@ -2768,11 +2768,11 @@ "route": [ { "x": 68, - "y": 762 + "y": 785 }, { "x": 519, - "y": 762 + "y": 785 } ], "animated": false, @@ -2806,11 +2806,11 @@ "route": [ { "x": 222, - "y": 832 + "y": 855 }, { "x": 515, - "y": 832 + "y": 855 } ], "animated": false, @@ -2844,11 +2844,11 @@ "route": [ { "x": 535, - "y": 902 + "y": 925 }, { "x": 709, - "y": 902 + "y": 925 } ], "animated": false, @@ -2882,11 +2882,11 @@ "route": [ { "x": 62, - "y": 972 + "y": 995 }, { "x": 519, - "y": 972 + "y": 995 } ], "animated": false, @@ -2920,11 +2920,11 @@ "route": [ { "x": 68, - "y": 1042 + "y": 1065 }, { "x": 867.5, - "y": 1042 + "y": 1065 } ], "animated": false, @@ -2958,11 +2958,11 @@ "route": [ { "x": 68, - "y": 1112 + "y": 1135 }, { "x": 366, - "y": 1112 + "y": 1135 } ], "animated": false, @@ -2996,11 +2996,11 @@ "route": [ { "x": 68, - "y": 1182 + "y": 1205 }, { "x": 366, - "y": 1182 + "y": 1205 } ], "animated": false, @@ -3034,11 +3034,11 @@ "route": [ { "x": 68, - "y": 1252 + "y": 1275 }, { "x": 867.5, - "y": 1252 + "y": 1275 } ], "animated": false, @@ -3072,11 +3072,11 @@ "route": [ { "x": 68, - "y": 1322 + "y": 1345 }, { "x": 867.5, - "y": 1322 + "y": 1345 } ], "animated": false, @@ -3110,11 +3110,11 @@ "route": [ { "x": 1102, - "y": 480 + "y": 503 }, { "x": 1250, - "y": 480 + "y": 503 } ], "animated": false, @@ -3148,11 +3148,11 @@ "route": [ { "x": 1102, - "y": 550 + "y": 573 }, { "x": 1250, - "y": 550 + "y": 573 } ], "animated": false, @@ -3186,11 +3186,11 @@ "route": [ { "x": 1102, - "y": 620 + "y": 643 }, { "x": 1400, - "y": 620 + "y": 643 } ], "animated": false, @@ -3224,11 +3224,11 @@ "route": [ { "x": 1102, - "y": 690 + "y": 713 }, { "x": 1400, - "y": 690 + "y": 713 } ], "animated": false, @@ -3262,11 +3262,11 @@ "route": [ { "x": 1102, - "y": 760 + "y": 783 }, { "x": 1553, - "y": 760 + "y": 783 } ], "animated": false, @@ -3300,11 +3300,11 @@ "route": [ { "x": 1256, - "y": 830 + "y": 853 }, { "x": 1549, - "y": 830 + "y": 853 } ], "animated": false, @@ -3338,11 +3338,11 @@ "route": [ { "x": 1569, - "y": 900 + "y": 923 }, { "x": 1743, - "y": 900 + "y": 923 } ], "animated": false, @@ -3376,11 +3376,11 @@ "route": [ { "x": 1096, - "y": 970 + "y": 993 }, { "x": 1553, - "y": 970 + "y": 993 } ], "animated": false, @@ -3414,11 +3414,11 @@ "route": [ { "x": 1102, - "y": 1040 + "y": 1063 }, { "x": 1901.5, - "y": 1040 + "y": 1063 } ], "animated": false, @@ -3452,11 +3452,11 @@ "route": [ { "x": 1102, - "y": 1110 + "y": 1133 }, { "x": 1400, - "y": 1110 + "y": 1133 } ], "animated": false, @@ -3490,11 +3490,11 @@ "route": [ { "x": 1102, - "y": 1180 + "y": 1203 }, { "x": 1400, - "y": 1180 + "y": 1203 } ], "animated": false, @@ -3528,11 +3528,11 @@ "route": [ { "x": 1102, - "y": 1250 + "y": 1273 }, { "x": 1901.5, - "y": 1250 + "y": 1273 } ], "animated": false, @@ -3566,11 +3566,11 @@ "route": [ { "x": 1102, - "y": 1320 + "y": 1343 }, { "x": 1901.5, - "y": 1320 + "y": 1343 } ], "animated": false, @@ -3603,20 +3603,20 @@ "labelPercentage": 0, "route": [ { - "x": 1457, - "y": 59 + "x": 1446, + "y": 73 }, { - "x": 673, - "y": 138.1999969482422 + "x": 670.7999877929688, + "y": 159.39999389648438 }, { "x": 477, - "y": 218 + "y": 241 }, { "x": 477, - "y": 258 + "y": 281 } ], "isCurve": true, @@ -3651,19 +3651,19 @@ "route": [ { "x": 1511, - "y": 108 + "y": 131 }, { "x": 1511, - "y": 148 + "y": 171 }, { "x": 1511, - "y": 218.5 + "y": 241.5 }, { "x": 1511, - "y": 260.5 + "y": 283.5 } ], "isCurve": true, @@ -3698,31 +3698,31 @@ "route": [ { "x": 477, - "y": 1404 + "y": 1427 }, { "x": 477, - "y": 1444 + "y": 1467 }, { "x": 477, - "y": 1464 + "y": 1487 }, { "x": 477, - "y": 1479 + "y": 1502 }, { "x": 477, - "y": 1494 + "y": 1517 }, { "x": 477, - "y": 1636.5 + "y": 1659.5 }, { "x": 477, - "y": 1966.5 + "y": 1989.5 } ], "isCurve": true, @@ -3757,31 +3757,31 @@ "route": [ { "x": 1511, - "y": 1402.5 + "y": 1425.5 }, { "x": 1511, - "y": 1443.699951171875 + "y": 1466.699951171875 }, { "x": 1511, - "y": 1464 + "y": 1487 }, { "x": 1511, - "y": 1479 + "y": 1502 }, { "x": 1511, - "y": 1494 + "y": 1517 }, { "x": 1517, - "y": 1564 + "y": 1587 }, { "x": 1541, - "y": 1604 + "y": 1627 } ], "isCurve": true, @@ -3815,56 +3815,56 @@ "labelPercentage": 0, "route": [ { - "x": 1564, - "y": 64 + "x": 1576, + "y": 79 }, { - "x": 1951.199951171875, - "y": 139.1999969482422 + "x": 1953.5999755859375, + "y": 160.60000610351562 }, { "x": 2048, - "y": 168 + "y": 191 }, { "x": 2048, - "y": 183 + "y": 206 }, { "x": 2048, - "y": 198 + "y": 221 }, { "x": 2048, - "y": 332.6000061035156 + "y": 355.6000061035156 }, { "x": 2048, - "y": 519.5 + "y": 542.5 }, { "x": 2048, - "y": 706.4000244140625 + "y": 729.4000244140625 }, { "x": 2048, - "y": 955.5999755859375 + "y": 978.5999755859375 }, { "x": 2048, - "y": 1142.5 + "y": 1165.5 }, { "x": 2048, - "y": 1329.4000244140625 + "y": 1352.4000244140625 }, { "x": 2048, - "y": 1514 + "y": 1537 }, { "x": 2048, - "y": 1554 + "y": 1577 } ], "isCurve": true, @@ -3899,11 +3899,11 @@ "route": [ { "x": 2159, - "y": 1823 + "y": 1846 }, { "x": 1838, - "y": 1823 + "y": 1846 } ], "animated": false, @@ -3937,11 +3937,11 @@ "route": [ { "x": 1818, - "y": 1893 + "y": 1916 }, { "x": 1692, - "y": 1893 + "y": 1916 } ], "animated": false, @@ -3975,11 +3975,11 @@ "route": [ { "x": 1664, - "y": 1963 + "y": 1986 }, { "x": 1543, - "y": 1963 + "y": 1986 } ], "animated": false, @@ -4013,11 +4013,11 @@ "route": [ { "x": 1822, - "y": 2033 + "y": 2056 }, { "x": 1688, - "y": 2033 + "y": 2056 } ], "animated": false, @@ -4051,11 +4051,11 @@ "route": [ { "x": 1543, - "y": 2103 + "y": 2126 }, { "x": 1964.5, - "y": 2103 + "y": 2126 } ], "animated": false, @@ -4089,11 +4089,11 @@ "route": [ { "x": 1381, - "y": 2173 + "y": 2196 }, { "x": 1822, - "y": 2173 + "y": 2196 } ], "animated": false, @@ -4127,11 +4127,11 @@ "route": [ { "x": 1964.5, - "y": 2243 + "y": 2266 }, { "x": 1375, - "y": 2243 + "y": 2266 } ], "animated": false, @@ -4165,11 +4165,11 @@ "route": [ { "x": 1375, - "y": 2313 + "y": 2336 }, { "x": 2159, - "y": 2313 + "y": 2336 } ], "animated": false, @@ -4203,11 +4203,11 @@ "route": [ { "x": 62, - "y": 412 + "y": 435 }, { "x": 62, - "y": 1392 + "y": 1415 } ], "animated": false, @@ -4241,11 +4241,11 @@ "route": [ { "x": 222, - "y": 412 + "y": 435 }, { "x": 222, - "y": 1392 + "y": 1415 } ], "animated": false, @@ -4279,11 +4279,11 @@ "route": [ { "x": 372, - "y": 412 + "y": 435 }, { "x": 372, - "y": 1392 + "y": 1415 } ], "animated": false, @@ -4317,11 +4317,11 @@ "route": [ { "x": 525, - "y": 412 + "y": 435 }, { "x": 525, - "y": 1392 + "y": 1415 } ], "animated": false, @@ -4355,11 +4355,11 @@ "route": [ { "x": 715, - "y": 412 + "y": 435 }, { "x": 715, - "y": 1392 + "y": 1415 } ], "animated": false, @@ -4393,11 +4393,11 @@ "route": [ { "x": 873.5, - "y": 412 + "y": 435 }, { "x": 873.5, - "y": 1392 + "y": 1415 } ], "animated": false, @@ -4431,11 +4431,11 @@ "route": [ { "x": 1096, - "y": 410 + "y": 433 }, { "x": 1096, - "y": 1390 + "y": 1413 } ], "animated": false, @@ -4469,11 +4469,11 @@ "route": [ { "x": 1256, - "y": 410 + "y": 433 }, { "x": 1256, - "y": 1390 + "y": 1413 } ], "animated": false, @@ -4507,11 +4507,11 @@ "route": [ { "x": 1406, - "y": 410 + "y": 433 }, { "x": 1406, - "y": 1390 + "y": 1413 } ], "animated": false, @@ -4545,11 +4545,11 @@ "route": [ { "x": 1559, - "y": 410 + "y": 433 }, { "x": 1559, - "y": 1390 + "y": 1413 } ], "animated": false, @@ -4583,11 +4583,11 @@ "route": [ { "x": 1749, - "y": 410 + "y": 433 }, { "x": 1749, - "y": 1390 + "y": 1413 } ], "animated": false, @@ -4621,11 +4621,11 @@ "route": [ { "x": 1907.5, - "y": 410 + "y": 433 }, { "x": 1907.5, - "y": 1390 + "y": 1413 } ], "animated": false, @@ -4659,11 +4659,11 @@ "route": [ { "x": 1375, - "y": 1753 + "y": 1776 }, { "x": 1375, - "y": 2383 + "y": 2406 } ], "animated": false, @@ -4697,11 +4697,11 @@ "route": [ { "x": 1525, - "y": 1753 + "y": 1776 }, { "x": 1525, - "y": 2383 + "y": 2406 } ], "animated": false, @@ -4735,11 +4735,11 @@ "route": [ { "x": 1678, - "y": 1753 + "y": 1776 }, { "x": 1678, - "y": 2383 + "y": 2406 } ], "animated": false, @@ -4773,11 +4773,11 @@ "route": [ { "x": 1828, - "y": 1753 + "y": 1776 }, { "x": 1828, - "y": 2383 + "y": 2406 } ], "animated": false, @@ -4811,11 +4811,11 @@ "route": [ { "x": 1986.5, - "y": 1753 + "y": 1776 }, { "x": 1986.5, - "y": 2383 + "y": 2406 } ], "animated": false, @@ -4849,11 +4849,11 @@ "route": [ { "x": 2165, - "y": 1753 + "y": 1776 }, { "x": 2165, - "y": 2383 + "y": 2406 } ], "animated": false, diff --git a/e2etests/testdata/stable/sequence_diagrams/dagre/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagrams/dagre/sketch.exp.svg index 5a313d1406..ce7b11e2ba 100644 --- a/e2etests/testdata/stable/sequence_diagrams/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagrams/dagre/sketch.exp.svg @@ -1,23 +1,23 @@ -a_shapea_sequenceanothersequencefinallyscoreritemResponseitemessayRubricconceptitemOutcomesequencesequencescoreritemResponseitemessayRubricconceptitemOutcomescorerconceptessayRubricitemitemOutcomeitemResponse getItem()itemgetRubric()rubricapplyTo(essayResp)match(essayResponse)scorenewgetNormalMinimum()getNormalMaximum()setScore(score)setFeedback(missingConcepts)getItem()itemgetRubric()rubricapplyTo(essayResp)match(essayResponse)scorenewgetNormalMinimum()getNormalMaximum()setScore(score)setFeedback(missingConcepts) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + .d2-983501361 .fill-N1{fill:#0A0F25;} + .d2-983501361 .fill-N2{fill:#676C7E;} + .d2-983501361 .fill-N3{fill:#9499AB;} + .d2-983501361 .fill-N4{fill:#CFD2DD;} + .d2-983501361 .fill-N5{fill:#DEE1EB;} + .d2-983501361 .fill-N6{fill:#EEF1F8;} + .d2-983501361 .fill-N7{fill:#FFFFFF;} + .d2-983501361 .fill-B1{fill:#0D32B2;} + .d2-983501361 .fill-B2{fill:#0D32B2;} + .d2-983501361 .fill-B3{fill:#E3E9FD;} + .d2-983501361 .fill-B4{fill:#E3E9FD;} + .d2-983501361 .fill-B5{fill:#EDF0FD;} + .d2-983501361 .fill-B6{fill:#F7F8FE;} + .d2-983501361 .fill-AA2{fill:#4A6FF3;} + .d2-983501361 .fill-AA4{fill:#EDF0FD;} + .d2-983501361 .fill-AA5{fill:#F7F8FE;} + .d2-983501361 .fill-AB4{fill:#EDF0FD;} + .d2-983501361 .fill-AB5{fill:#F7F8FE;} + .d2-983501361 .stroke-N1{stroke:#0A0F25;} + .d2-983501361 .stroke-N2{stroke:#676C7E;} + .d2-983501361 .stroke-N3{stroke:#9499AB;} + .d2-983501361 .stroke-N4{stroke:#CFD2DD;} + .d2-983501361 .stroke-N5{stroke:#DEE1EB;} + .d2-983501361 .stroke-N6{stroke:#EEF1F8;} + .d2-983501361 .stroke-N7{stroke:#FFFFFF;} + .d2-983501361 .stroke-B1{stroke:#0D32B2;} + .d2-983501361 .stroke-B2{stroke:#0D32B2;} + .d2-983501361 .stroke-B3{stroke:#E3E9FD;} + .d2-983501361 .stroke-B4{stroke:#E3E9FD;} + .d2-983501361 .stroke-B5{stroke:#EDF0FD;} + .d2-983501361 .stroke-B6{stroke:#F7F8FE;} + .d2-983501361 .stroke-AA2{stroke:#4A6FF3;} + .d2-983501361 .stroke-AA4{stroke:#EDF0FD;} + .d2-983501361 .stroke-AA5{stroke:#F7F8FE;} + .d2-983501361 .stroke-AB4{stroke:#EDF0FD;} + .d2-983501361 .stroke-AB5{stroke:#F7F8FE;} + .d2-983501361 .background-color-N1{background-color:#0A0F25;} + .d2-983501361 .background-color-N2{background-color:#676C7E;} + .d2-983501361 .background-color-N3{background-color:#9499AB;} + .d2-983501361 .background-color-N4{background-color:#CFD2DD;} + .d2-983501361 .background-color-N5{background-color:#DEE1EB;} + .d2-983501361 .background-color-N6{background-color:#EEF1F8;} + .d2-983501361 .background-color-N7{background-color:#FFFFFF;} + .d2-983501361 .background-color-B1{background-color:#0D32B2;} + .d2-983501361 .background-color-B2{background-color:#0D32B2;} + .d2-983501361 .background-color-B3{background-color:#E3E9FD;} + .d2-983501361 .background-color-B4{background-color:#E3E9FD;} + .d2-983501361 .background-color-B5{background-color:#EDF0FD;} + .d2-983501361 .background-color-B6{background-color:#F7F8FE;} + .d2-983501361 .background-color-AA2{background-color:#4A6FF3;} + .d2-983501361 .background-color-AA4{background-color:#EDF0FD;} + .d2-983501361 .background-color-AA5{background-color:#F7F8FE;} + .d2-983501361 .background-color-AB4{background-color:#EDF0FD;} + .d2-983501361 .background-color-AB5{background-color:#F7F8FE;} + .d2-983501361 .color-N1{color:#0A0F25;} + .d2-983501361 .color-N2{color:#676C7E;} + .d2-983501361 .color-N3{color:#9499AB;} + .d2-983501361 .color-N4{color:#CFD2DD;} + .d2-983501361 .color-N5{color:#DEE1EB;} + .d2-983501361 .color-N6{color:#EEF1F8;} + .d2-983501361 .color-N7{color:#FFFFFF;} + .d2-983501361 .color-B1{color:#0D32B2;} + .d2-983501361 .color-B2{color:#0D32B2;} + .d2-983501361 .color-B3{color:#E3E9FD;} + .d2-983501361 .color-B4{color:#E3E9FD;} + .d2-983501361 .color-B5{color:#EDF0FD;} + .d2-983501361 .color-B6{color:#F7F8FE;} + .d2-983501361 .color-AA2{color:#4A6FF3;} + .d2-983501361 .color-AA4{color:#EDF0FD;} + .d2-983501361 .color-AA5{color:#F7F8FE;} + .d2-983501361 .color-AB4{color:#EDF0FD;} + .d2-983501361 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>a_shapea_sequenceanothersequencefinallyscoreritemResponseitemessayRubricconceptitemOutcomesequencesequencescoreritemResponseitemessayRubricconceptitemOutcomescorerconceptessayRubricitemitemOutcomeitemResponse getItem()itemgetRubric()rubricapplyTo(essayResp)match(essayResponse)scorenewgetNormalMinimum()getNormalMaximum()setScore(score)setFeedback(missingConcepts)getItem()itemgetRubric()rubricapplyTo(essayResp)match(essayResponse)scorenewgetNormalMinimum()getNormalMaximum()setScore(score)setFeedback(missingConcepts) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/sequence_diagrams/elk/board.exp.json b/e2etests/testdata/stable/sequence_diagrams/elk/board.exp.json index f9b1fbdbcb..48f99b30bd 100644 --- a/e2etests/testdata/stable/sequence_diagrams/elk/board.exp.json +++ b/e2etests/testdata/stable/sequence_diagrams/elk/board.exp.json @@ -7,11 +7,11 @@ "id": "a_shape", "type": "oval", "pos": { - "x": 1453, + "x": 1447, "y": 12 }, - "width": 120, - "height": 108, + "width": 131, + "height": 131, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -49,7 +49,7 @@ "type": "sequence_diagram", "pos": { "x": 12, - "y": 252 + "y": 275 }, "width": 954, "height": 1146, @@ -90,7 +90,7 @@ "type": "rectangle", "pos": { "x": 24, - "y": 340 + "y": 363 }, "width": 100, "height": 66, @@ -131,7 +131,7 @@ "type": "rectangle", "pos": { "x": 68, - "y": 466 + "y": 489 }, "width": 12, "height": 860, @@ -171,7 +171,7 @@ "type": "rectangle", "pos": { "x": 164, - "y": 340 + "y": 363 }, "width": 140, "height": 66, @@ -212,7 +212,7 @@ "type": "rectangle", "pos": { "x": 228, - "y": 466 + "y": 489 }, "width": 12, "height": 90, @@ -252,7 +252,7 @@ "type": "rectangle", "pos": { "x": 334, - "y": 340 + "y": 363 }, "width": 100, "height": 66, @@ -293,7 +293,7 @@ "type": "rectangle", "pos": { "x": 378, - "y": 606 + "y": 629 }, "width": 12, "height": 90, @@ -333,7 +333,7 @@ "type": "rectangle", "pos": { "x": 474, - "y": 340 + "y": 363 }, "width": 126, "height": 66, @@ -374,7 +374,7 @@ "type": "rectangle", "pos": { "x": 531, - "y": 746 + "y": 769 }, "width": 12, "height": 230, @@ -414,7 +414,7 @@ "type": "rectangle", "pos": { "x": 527, - "y": 816 + "y": 839 }, "width": 20, "height": 90, @@ -454,7 +454,7 @@ "type": "rectangle", "pos": { "x": 677, - "y": 340 + "y": 363 }, "width": 100, "height": 66, @@ -495,7 +495,7 @@ "type": "rectangle", "pos": { "x": 721, - "y": 886 + "y": 909 }, "width": 12, "height": 30, @@ -535,7 +535,7 @@ "type": "rectangle", "pos": { "x": 817, - "y": 340 + "y": 363 }, "width": 137, "height": 66, @@ -576,7 +576,7 @@ "type": "rectangle", "pos": { "x": 879, - "y": 1026 + "y": 1049 }, "width": 12, "height": 30, @@ -616,7 +616,7 @@ "type": "rectangle", "pos": { "x": 378, - "y": 1096 + "y": 1119 }, "width": 12, "height": 30, @@ -656,7 +656,7 @@ "type": "rectangle", "pos": { "x": 378, - "y": 1166 + "y": 1189 }, "width": 12, "height": 30, @@ -696,7 +696,7 @@ "type": "rectangle", "pos": { "x": 879, - "y": 1236 + "y": 1259 }, "width": 12, "height": 30, @@ -736,7 +736,7 @@ "type": "rectangle", "pos": { "x": 879, - "y": 1306 + "y": 1329 }, "width": 12, "height": 30, @@ -776,7 +776,7 @@ "type": "rectangle", "pos": { "x": 986, - "y": 205 + "y": 228 }, "width": 1054, "height": 1241, @@ -817,7 +817,7 @@ "type": "sequence_diagram", "pos": { "x": 1036, - "y": 255 + "y": 278 }, "width": 954, "height": 1141, @@ -858,7 +858,7 @@ "type": "rectangle", "pos": { "x": 1048, - "y": 338 + "y": 361 }, "width": 100, "height": 66, @@ -899,7 +899,7 @@ "type": "rectangle", "pos": { "x": 1092, - "y": 464 + "y": 487 }, "width": 12, "height": 860, @@ -939,7 +939,7 @@ "type": "rectangle", "pos": { "x": 1188, - "y": 338 + "y": 361 }, "width": 140, "height": 66, @@ -980,7 +980,7 @@ "type": "rectangle", "pos": { "x": 1252, - "y": 464 + "y": 487 }, "width": 12, "height": 90, @@ -1020,7 +1020,7 @@ "type": "rectangle", "pos": { "x": 1358, - "y": 338 + "y": 361 }, "width": 100, "height": 66, @@ -1061,7 +1061,7 @@ "type": "rectangle", "pos": { "x": 1402, - "y": 604 + "y": 627 }, "width": 12, "height": 90, @@ -1101,7 +1101,7 @@ "type": "rectangle", "pos": { "x": 1498, - "y": 338 + "y": 361 }, "width": 126, "height": 66, @@ -1142,7 +1142,7 @@ "type": "rectangle", "pos": { "x": 1555, - "y": 744 + "y": 767 }, "width": 12, "height": 230, @@ -1182,7 +1182,7 @@ "type": "rectangle", "pos": { "x": 1551, - "y": 814 + "y": 837 }, "width": 20, "height": 90, @@ -1222,7 +1222,7 @@ "type": "rectangle", "pos": { "x": 1701, - "y": 338 + "y": 361 }, "width": 100, "height": 66, @@ -1263,7 +1263,7 @@ "type": "rectangle", "pos": { "x": 1745, - "y": 884 + "y": 907 }, "width": 12, "height": 30, @@ -1303,7 +1303,7 @@ "type": "rectangle", "pos": { "x": 1841, - "y": 338 + "y": 361 }, "width": 137, "height": 66, @@ -1344,7 +1344,7 @@ "type": "rectangle", "pos": { "x": 1903, - "y": 1024 + "y": 1047 }, "width": 12, "height": 30, @@ -1384,7 +1384,7 @@ "type": "rectangle", "pos": { "x": 1402, - "y": 1094 + "y": 1117 }, "width": 12, "height": 30, @@ -1424,7 +1424,7 @@ "type": "rectangle", "pos": { "x": 1402, - "y": 1164 + "y": 1187 }, "width": 12, "height": 30, @@ -1464,7 +1464,7 @@ "type": "rectangle", "pos": { "x": 1903, - "y": 1234 + "y": 1257 }, "width": 12, "height": 30, @@ -1504,7 +1504,7 @@ "type": "rectangle", "pos": { "x": 1903, - "y": 1304 + "y": 1327 }, "width": 12, "height": 30, @@ -1544,7 +1544,7 @@ "type": "rectangle", "pos": { "x": 433, - "y": 1536 + "y": 1559 }, "width": 112, "height": 66, @@ -1585,7 +1585,7 @@ "type": "queue", "pos": { "x": 1274, - "y": 1536 + "y": 1559 }, "width": 1034, "height": 891, @@ -1626,7 +1626,7 @@ "type": "sequence_diagram", "pos": { "x": 1324, - "y": 1586 + "y": 1609 }, "width": 934, "height": 791, @@ -1667,7 +1667,7 @@ "type": "rectangle", "pos": { "x": 1336, - "y": 1669 + "y": 1692 }, "width": 100, "height": 66, @@ -1708,7 +1708,7 @@ "type": "rectangle", "pos": { "x": 1486, - "y": 1669 + "y": 1692 }, "width": 100, "height": 66, @@ -1749,7 +1749,7 @@ "type": "rectangle", "pos": { "x": 1626, - "y": 1669 + "y": 1692 }, "width": 126, "height": 66, @@ -1790,7 +1790,7 @@ "type": "rectangle", "pos": { "x": 1789, - "y": 1669 + "y": 1692 }, "width": 100, "height": 66, @@ -1831,7 +1831,7 @@ "type": "rectangle", "pos": { "x": 1929, - "y": 1669 + "y": 1692 }, "width": 137, "height": 66, @@ -1872,7 +1872,7 @@ "type": "rectangle", "pos": { "x": 2106, - "y": 1669 + "y": 1692 }, "width": 140, "height": 66, @@ -1913,7 +1913,7 @@ "type": "rectangle", "pos": { "x": 2170, - "y": 1795 + "y": 1818 }, "width": 12, "height": 30, @@ -1953,7 +1953,7 @@ "type": "rectangle", "pos": { "x": 1833, - "y": 1785 + "y": 1808 }, "width": 12, "height": 380, @@ -1993,7 +1993,7 @@ "type": "rectangle", "pos": { "x": 1829, - "y": 1795 + "y": 1818 }, "width": 20, "height": 90, @@ -2033,7 +2033,7 @@ "type": "rectangle", "pos": { "x": 1683, - "y": 1845 + "y": 1868 }, "width": 12, "height": 190, @@ -2073,7 +2073,7 @@ "type": "rectangle", "pos": { "x": 1679, - "y": 1855 + "y": 1878 }, "width": 20, "height": 170, @@ -2113,7 +2113,7 @@ "type": "rectangle", "pos": { "x": 1675, - "y": 1865 + "y": 1888 }, "width": 28, "height": 90, @@ -2153,7 +2153,7 @@ "type": "rectangle", "pos": { "x": 1530, - "y": 1905 + "y": 1928 }, "width": 12, "height": 220, @@ -2193,7 +2193,7 @@ "type": "rectangle", "pos": { "x": 1526, - "y": 1915 + "y": 1938 }, "width": 20, "height": 200, @@ -2233,7 +2233,7 @@ "type": "rectangle", "pos": { "x": 1522, - "y": 1925 + "y": 1948 }, "width": 28, "height": 180, @@ -2273,7 +2273,7 @@ "type": "rectangle", "pos": { "x": 1518, - "y": 1935 + "y": 1958 }, "width": 36, "height": 160, @@ -2313,7 +2313,7 @@ "type": "rectangle", "pos": { "x": 1992, - "y": 2035 + "y": 2058 }, "width": 12, "height": 240, @@ -2353,7 +2353,7 @@ "type": "rectangle", "pos": { "x": 1988, - "y": 2045 + "y": 2068 }, "width": 20, "height": 220, @@ -2393,7 +2393,7 @@ "type": "rectangle", "pos": { "x": 1984, - "y": 2055 + "y": 2078 }, "width": 28, "height": 200, @@ -2433,7 +2433,7 @@ "type": "rectangle", "pos": { "x": 1980, - "y": 2065 + "y": 2088 }, "width": 36, "height": 180, @@ -2473,7 +2473,7 @@ "type": "rectangle", "pos": { "x": 1976, - "y": 2075 + "y": 2098 }, "width": 44, "height": 160, @@ -2513,7 +2513,7 @@ "type": "rectangle", "pos": { "x": 1380, - "y": 2145 + "y": 2168 }, "width": 12, "height": 30, @@ -2553,7 +2553,7 @@ "type": "rectangle", "pos": { "x": 2170, - "y": 2285 + "y": 2308 }, "width": 12, "height": 30, @@ -2616,11 +2616,11 @@ "route": [ { "x": 80, - "y": 476.5 + "y": 499.5 }, { "x": 228, - "y": 476.5 + "y": 499.5 } ], "animated": false, @@ -2654,11 +2654,11 @@ "route": [ { "x": 80, - "y": 546.5 + "y": 569.5 }, { "x": 228, - "y": 546.5 + "y": 569.5 } ], "animated": false, @@ -2692,11 +2692,11 @@ "route": [ { "x": 80, - "y": 616.5 + "y": 639.5 }, { "x": 378, - "y": 616.5 + "y": 639.5 } ], "animated": false, @@ -2730,11 +2730,11 @@ "route": [ { "x": 80, - "y": 686.5 + "y": 709.5 }, { "x": 378, - "y": 686.5 + "y": 709.5 } ], "animated": false, @@ -2768,11 +2768,11 @@ "route": [ { "x": 80, - "y": 756.5 + "y": 779.5 }, { "x": 531, - "y": 756.5 + "y": 779.5 } ], "animated": false, @@ -2806,11 +2806,11 @@ "route": [ { "x": 234, - "y": 826.5 + "y": 849.5 }, { "x": 527, - "y": 826.5 + "y": 849.5 } ], "animated": false, @@ -2844,11 +2844,11 @@ "route": [ { "x": 547, - "y": 896.5 + "y": 919.5 }, { "x": 721, - "y": 896.5 + "y": 919.5 } ], "animated": false, @@ -2882,11 +2882,11 @@ "route": [ { "x": 74, - "y": 966.5 + "y": 989.5 }, { "x": 531, - "y": 966.5 + "y": 989.5 } ], "animated": false, @@ -2920,11 +2920,11 @@ "route": [ { "x": 80, - "y": 1036.5 + "y": 1059.5 }, { "x": 879.5, - "y": 1036.5 + "y": 1059.5 } ], "animated": false, @@ -2958,11 +2958,11 @@ "route": [ { "x": 80, - "y": 1106.5 + "y": 1129.5 }, { "x": 378, - "y": 1106.5 + "y": 1129.5 } ], "animated": false, @@ -2996,11 +2996,11 @@ "route": [ { "x": 80, - "y": 1176.5 + "y": 1199.5 }, { "x": 378, - "y": 1176.5 + "y": 1199.5 } ], "animated": false, @@ -3034,11 +3034,11 @@ "route": [ { "x": 80, - "y": 1246.5 + "y": 1269.5 }, { "x": 879.5, - "y": 1246.5 + "y": 1269.5 } ], "animated": false, @@ -3072,11 +3072,11 @@ "route": [ { "x": 80, - "y": 1316.5 + "y": 1339.5 }, { "x": 879.5, - "y": 1316.5 + "y": 1339.5 } ], "animated": false, @@ -3110,11 +3110,11 @@ "route": [ { "x": 1104, - "y": 474 + "y": 497 }, { "x": 1252, - "y": 474 + "y": 497 } ], "animated": false, @@ -3148,11 +3148,11 @@ "route": [ { "x": 1104, - "y": 544 + "y": 567 }, { "x": 1252, - "y": 544 + "y": 567 } ], "animated": false, @@ -3186,11 +3186,11 @@ "route": [ { "x": 1104, - "y": 614 + "y": 637 }, { "x": 1402, - "y": 614 + "y": 637 } ], "animated": false, @@ -3224,11 +3224,11 @@ "route": [ { "x": 1104, - "y": 684 + "y": 707 }, { "x": 1402, - "y": 684 + "y": 707 } ], "animated": false, @@ -3262,11 +3262,11 @@ "route": [ { "x": 1104, - "y": 754 + "y": 777 }, { "x": 1555, - "y": 754 + "y": 777 } ], "animated": false, @@ -3300,11 +3300,11 @@ "route": [ { "x": 1258, - "y": 824 + "y": 847 }, { "x": 1551, - "y": 824 + "y": 847 } ], "animated": false, @@ -3338,11 +3338,11 @@ "route": [ { "x": 1571, - "y": 894 + "y": 917 }, { "x": 1745, - "y": 894 + "y": 917 } ], "animated": false, @@ -3376,11 +3376,11 @@ "route": [ { "x": 1098, - "y": 964 + "y": 987 }, { "x": 1555, - "y": 964 + "y": 987 } ], "animated": false, @@ -3414,11 +3414,11 @@ "route": [ { "x": 1104, - "y": 1034 + "y": 1057 }, { "x": 1903.5, - "y": 1034 + "y": 1057 } ], "animated": false, @@ -3452,11 +3452,11 @@ "route": [ { "x": 1104, - "y": 1104 + "y": 1127 }, { "x": 1402, - "y": 1104 + "y": 1127 } ], "animated": false, @@ -3490,11 +3490,11 @@ "route": [ { "x": 1104, - "y": 1174 + "y": 1197 }, { "x": 1402, - "y": 1174 + "y": 1197 } ], "animated": false, @@ -3528,11 +3528,11 @@ "route": [ { "x": 1104, - "y": 1244 + "y": 1267 }, { "x": 1903.5, - "y": 1244 + "y": 1267 } ], "animated": false, @@ -3566,11 +3566,11 @@ "route": [ { "x": 1104, - "y": 1314 + "y": 1337 }, { "x": 1903.5, - "y": 1314 + "y": 1337 } ], "animated": false, @@ -3603,20 +3603,20 @@ "labelPercentage": 0, "route": [ { - "x": 1483, - "y": 113 + "x": 1480, + "y": 134 }, { - "x": 1483, - "y": 160 + "x": 1480.25, + "y": 183 }, { "x": 489, - "y": 160 + "y": 183 }, { "x": 489, - "y": 253 + "y": 276 } ], "animated": false, @@ -3650,11 +3650,11 @@ "route": [ { "x": 1513, - "y": 120 + "y": 143 }, { "x": 1513, - "y": 255 + "y": 278 } ], "animated": false, @@ -3688,11 +3688,11 @@ "route": [ { "x": 489, - "y": 1398 + "y": 1421 }, { "x": 489, - "y": 1536 + "y": 1559 } ], "animated": false, @@ -3726,11 +3726,11 @@ "route": [ { "x": 1791.5, - "y": 1396 + "y": 1419 }, { "x": 1791.5, - "y": 1586 + "y": 1609 } ], "animated": false, @@ -3763,20 +3763,20 @@ "labelPercentage": 0, "route": [ { - "x": 1543, - "y": 113 + "x": 1546, + "y": 134 }, { - "x": 1543, - "y": 160 + "x": 1545.75, + "y": 183 }, { "x": 2080, - "y": 160 + "y": 183 }, { "x": 2080, - "y": 1536 + "y": 1559 } ], "animated": false, @@ -3810,11 +3810,11 @@ "route": [ { "x": 2170.5, - "y": 1805 + "y": 1828 }, { "x": 1849.5, - "y": 1805 + "y": 1828 } ], "animated": false, @@ -3848,11 +3848,11 @@ "route": [ { "x": 1829.5, - "y": 1875 + "y": 1898 }, { "x": 1703.5, - "y": 1875 + "y": 1898 } ], "animated": false, @@ -3886,11 +3886,11 @@ "route": [ { "x": 1675.5, - "y": 1945 + "y": 1968 }, { "x": 1554.5, - "y": 1945 + "y": 1968 } ], "animated": false, @@ -3924,11 +3924,11 @@ "route": [ { "x": 1833.5, - "y": 2015 + "y": 2038 }, { "x": 1699.5, - "y": 2015 + "y": 2038 } ], "animated": false, @@ -3962,11 +3962,11 @@ "route": [ { "x": 1554.5, - "y": 2085 + "y": 2108 }, { "x": 1976, - "y": 2085 + "y": 2108 } ], "animated": false, @@ -4000,11 +4000,11 @@ "route": [ { "x": 1392.5, - "y": 2155 + "y": 2178 }, { "x": 1833.5, - "y": 2155 + "y": 2178 } ], "animated": false, @@ -4038,11 +4038,11 @@ "route": [ { "x": 1976, - "y": 2225 + "y": 2248 }, { "x": 1386.5, - "y": 2225 + "y": 2248 } ], "animated": false, @@ -4076,11 +4076,11 @@ "route": [ { "x": 1386.5, - "y": 2295 + "y": 2318 }, { "x": 2170.5, - "y": 2295 + "y": 2318 } ], "animated": false, @@ -4114,11 +4114,11 @@ "route": [ { "x": 74, - "y": 406.5 + "y": 429.5 }, { "x": 74, - "y": 1386.5 + "y": 1409.5 } ], "animated": false, @@ -4152,11 +4152,11 @@ "route": [ { "x": 234, - "y": 406.5 + "y": 429.5 }, { "x": 234, - "y": 1386.5 + "y": 1409.5 } ], "animated": false, @@ -4190,11 +4190,11 @@ "route": [ { "x": 384, - "y": 406.5 + "y": 429.5 }, { "x": 384, - "y": 1386.5 + "y": 1409.5 } ], "animated": false, @@ -4228,11 +4228,11 @@ "route": [ { "x": 537, - "y": 406.5 + "y": 429.5 }, { "x": 537, - "y": 1386.5 + "y": 1409.5 } ], "animated": false, @@ -4266,11 +4266,11 @@ "route": [ { "x": 727, - "y": 406.5 + "y": 429.5 }, { "x": 727, - "y": 1386.5 + "y": 1409.5 } ], "animated": false, @@ -4304,11 +4304,11 @@ "route": [ { "x": 885.5, - "y": 406.5 + "y": 429.5 }, { "x": 885.5, - "y": 1386.5 + "y": 1409.5 } ], "animated": false, @@ -4342,11 +4342,11 @@ "route": [ { "x": 1098, - "y": 404 + "y": 427 }, { "x": 1098, - "y": 1384 + "y": 1407 } ], "animated": false, @@ -4380,11 +4380,11 @@ "route": [ { "x": 1258, - "y": 404 + "y": 427 }, { "x": 1258, - "y": 1384 + "y": 1407 } ], "animated": false, @@ -4418,11 +4418,11 @@ "route": [ { "x": 1408, - "y": 404 + "y": 427 }, { "x": 1408, - "y": 1384 + "y": 1407 } ], "animated": false, @@ -4456,11 +4456,11 @@ "route": [ { "x": 1561, - "y": 404 + "y": 427 }, { "x": 1561, - "y": 1384 + "y": 1407 } ], "animated": false, @@ -4494,11 +4494,11 @@ "route": [ { "x": 1751, - "y": 404 + "y": 427 }, { "x": 1751, - "y": 1384 + "y": 1407 } ], "animated": false, @@ -4532,11 +4532,11 @@ "route": [ { "x": 1909.5, - "y": 404 + "y": 427 }, { "x": 1909.5, - "y": 1384 + "y": 1407 } ], "animated": false, @@ -4570,11 +4570,11 @@ "route": [ { "x": 1386.5, - "y": 1735 + "y": 1758 }, { "x": 1386.5, - "y": 2365 + "y": 2388 } ], "animated": false, @@ -4608,11 +4608,11 @@ "route": [ { "x": 1536.5, - "y": 1735 + "y": 1758 }, { "x": 1536.5, - "y": 2365 + "y": 2388 } ], "animated": false, @@ -4646,11 +4646,11 @@ "route": [ { "x": 1689.5, - "y": 1735 + "y": 1758 }, { "x": 1689.5, - "y": 2365 + "y": 2388 } ], "animated": false, @@ -4684,11 +4684,11 @@ "route": [ { "x": 1839.5, - "y": 1735 + "y": 1758 }, { "x": 1839.5, - "y": 2365 + "y": 2388 } ], "animated": false, @@ -4722,11 +4722,11 @@ "route": [ { "x": 1998, - "y": 1735 + "y": 1758 }, { "x": 1998, - "y": 2365 + "y": 2388 } ], "animated": false, @@ -4760,11 +4760,11 @@ "route": [ { "x": 2176.5, - "y": 1735 + "y": 1758 }, { "x": 2176.5, - "y": 2365 + "y": 2388 } ], "animated": false, diff --git a/e2etests/testdata/stable/sequence_diagrams/elk/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagrams/elk/sketch.exp.svg index e74dbc0b31..4c0de5fb5a 100644 --- a/e2etests/testdata/stable/sequence_diagrams/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagrams/elk/sketch.exp.svg @@ -1,23 +1,23 @@ -a_shapea_sequenceanothersequencefinallyscoreritemResponseitemessayRubricconceptitemOutcomesequencesequencescoreritemResponseitemessayRubricconceptitemOutcomescorerconceptessayRubricitemitemOutcomeitemResponse getItem()itemgetRubric()rubricapplyTo(essayResp)match(essayResponse)scorenewgetNormalMinimum()getNormalMaximum()setScore(score)setFeedback(missingConcepts)getItem()itemgetRubric()rubricapplyTo(essayResp)match(essayResponse)scorenewgetNormalMinimum()getNormalMaximum()setScore(score)setFeedback(missingConcepts) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + .d2-3574256128 .fill-N1{fill:#0A0F25;} + .d2-3574256128 .fill-N2{fill:#676C7E;} + .d2-3574256128 .fill-N3{fill:#9499AB;} + .d2-3574256128 .fill-N4{fill:#CFD2DD;} + .d2-3574256128 .fill-N5{fill:#DEE1EB;} + .d2-3574256128 .fill-N6{fill:#EEF1F8;} + .d2-3574256128 .fill-N7{fill:#FFFFFF;} + .d2-3574256128 .fill-B1{fill:#0D32B2;} + .d2-3574256128 .fill-B2{fill:#0D32B2;} + .d2-3574256128 .fill-B3{fill:#E3E9FD;} + .d2-3574256128 .fill-B4{fill:#E3E9FD;} + .d2-3574256128 .fill-B5{fill:#EDF0FD;} + .d2-3574256128 .fill-B6{fill:#F7F8FE;} + .d2-3574256128 .fill-AA2{fill:#4A6FF3;} + .d2-3574256128 .fill-AA4{fill:#EDF0FD;} + .d2-3574256128 .fill-AA5{fill:#F7F8FE;} + .d2-3574256128 .fill-AB4{fill:#EDF0FD;} + .d2-3574256128 .fill-AB5{fill:#F7F8FE;} + .d2-3574256128 .stroke-N1{stroke:#0A0F25;} + .d2-3574256128 .stroke-N2{stroke:#676C7E;} + .d2-3574256128 .stroke-N3{stroke:#9499AB;} + .d2-3574256128 .stroke-N4{stroke:#CFD2DD;} + .d2-3574256128 .stroke-N5{stroke:#DEE1EB;} + .d2-3574256128 .stroke-N6{stroke:#EEF1F8;} + .d2-3574256128 .stroke-N7{stroke:#FFFFFF;} + .d2-3574256128 .stroke-B1{stroke:#0D32B2;} + .d2-3574256128 .stroke-B2{stroke:#0D32B2;} + .d2-3574256128 .stroke-B3{stroke:#E3E9FD;} + .d2-3574256128 .stroke-B4{stroke:#E3E9FD;} + .d2-3574256128 .stroke-B5{stroke:#EDF0FD;} + .d2-3574256128 .stroke-B6{stroke:#F7F8FE;} + .d2-3574256128 .stroke-AA2{stroke:#4A6FF3;} + .d2-3574256128 .stroke-AA4{stroke:#EDF0FD;} + .d2-3574256128 .stroke-AA5{stroke:#F7F8FE;} + .d2-3574256128 .stroke-AB4{stroke:#EDF0FD;} + .d2-3574256128 .stroke-AB5{stroke:#F7F8FE;} + .d2-3574256128 .background-color-N1{background-color:#0A0F25;} + .d2-3574256128 .background-color-N2{background-color:#676C7E;} + .d2-3574256128 .background-color-N3{background-color:#9499AB;} + .d2-3574256128 .background-color-N4{background-color:#CFD2DD;} + .d2-3574256128 .background-color-N5{background-color:#DEE1EB;} + .d2-3574256128 .background-color-N6{background-color:#EEF1F8;} + .d2-3574256128 .background-color-N7{background-color:#FFFFFF;} + .d2-3574256128 .background-color-B1{background-color:#0D32B2;} + .d2-3574256128 .background-color-B2{background-color:#0D32B2;} + .d2-3574256128 .background-color-B3{background-color:#E3E9FD;} + .d2-3574256128 .background-color-B4{background-color:#E3E9FD;} + .d2-3574256128 .background-color-B5{background-color:#EDF0FD;} + .d2-3574256128 .background-color-B6{background-color:#F7F8FE;} + .d2-3574256128 .background-color-AA2{background-color:#4A6FF3;} + .d2-3574256128 .background-color-AA4{background-color:#EDF0FD;} + .d2-3574256128 .background-color-AA5{background-color:#F7F8FE;} + .d2-3574256128 .background-color-AB4{background-color:#EDF0FD;} + .d2-3574256128 .background-color-AB5{background-color:#F7F8FE;} + .d2-3574256128 .color-N1{color:#0A0F25;} + .d2-3574256128 .color-N2{color:#676C7E;} + .d2-3574256128 .color-N3{color:#9499AB;} + .d2-3574256128 .color-N4{color:#CFD2DD;} + .d2-3574256128 .color-N5{color:#DEE1EB;} + .d2-3574256128 .color-N6{color:#EEF1F8;} + .d2-3574256128 .color-N7{color:#FFFFFF;} + .d2-3574256128 .color-B1{color:#0D32B2;} + .d2-3574256128 .color-B2{color:#0D32B2;} + .d2-3574256128 .color-B3{color:#E3E9FD;} + .d2-3574256128 .color-B4{color:#E3E9FD;} + .d2-3574256128 .color-B5{color:#EDF0FD;} + .d2-3574256128 .color-B6{color:#F7F8FE;} + .d2-3574256128 .color-AA2{color:#4A6FF3;} + .d2-3574256128 .color-AA4{color:#EDF0FD;} + .d2-3574256128 .color-AA5{color:#F7F8FE;} + .d2-3574256128 .color-AB4{color:#EDF0FD;} + .d2-3574256128 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>a_shapea_sequenceanothersequencefinallyscoreritemResponseitemessayRubricconceptitemOutcomesequencesequencescoreritemResponseitemessayRubricconceptitemOutcomescorerconceptessayRubricitemitemOutcomeitemResponse getItem()itemgetRubric()rubricapplyTo(essayResp)match(essayResponse)scorenewgetNormalMinimum()getNormalMaximum()setScore(score)setFeedback(missingConcepts)getItem()itemgetRubric()rubricapplyTo(essayResp)match(essayResponse)scorenewgetNormalMinimum()getNormalMaximum()setScore(score)setFeedback(missingConcepts) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/teleport_grid/dagre/board.exp.json b/e2etests/testdata/stable/teleport_grid/dagre/board.exp.json index ab8dc1cfd4..eb7a994e1d 100644 --- a/e2etests/testdata/stable/teleport_grid/dagre/board.exp.json +++ b/e2etests/testdata/stable/teleport_grid/dagre/board.exp.json @@ -8,10 +8,10 @@ "type": "rectangle", "pos": { "x": 0, - "y": 224 + "y": 194 }, - "width": 272, - "height": 461, + "width": 302, + "height": 520, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -47,7 +47,7 @@ "id": "via", "type": "rectangle", "pos": { - "x": 543, + "x": 573, "y": 149 }, "width": 236, @@ -87,7 +87,7 @@ "id": "teleport", "type": "rectangle", "pos": { - "x": 1050, + "x": 1080, "y": 303 }, "width": 473, @@ -128,7 +128,7 @@ "id": "jita", "type": "rectangle", "pos": { - "x": 2025, + "x": 2055, "y": 0 }, "width": 820, @@ -169,7 +169,7 @@ "id": "infra", "type": "rectangle", "pos": { - "x": 2144, + "x": 2174, "y": 272 }, "width": 582, @@ -210,7 +210,7 @@ "id": "identity provider", "type": "rectangle", "pos": { - "x": 2335, + "x": 2365, "y": 676 }, "width": 201, @@ -264,10 +264,10 @@ "type": "oval", "pos": { "x": 60, - "y": 284 + "y": 254 }, - "width": 152, - "height": 152, + "width": 182, + "height": 182, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -319,8 +319,8 @@ "x": 60, "y": 476 }, - "width": 152, - "height": 149, + "width": 182, + "height": 178, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -369,7 +369,7 @@ "id": "via.https", "type": "rectangle", "pos": { - "x": 603, + "x": 633, "y": 209 }, "width": 116, @@ -410,7 +410,7 @@ "id": "via.kubectl", "type": "rectangle", "pos": { - "x": 603, + "x": 633, "y": 315 }, "width": 116, @@ -451,7 +451,7 @@ "id": "via.tsh", "type": "rectangle", "pos": { - "x": 603, + "x": 633, "y": 421 }, "width": 116, @@ -492,7 +492,7 @@ "id": "via.api", "type": "rectangle", "pos": { - "x": 603, + "x": 633, "y": 527 }, "width": 116, @@ -533,7 +533,7 @@ "id": "via.db clients", "type": "rectangle", "pos": { - "x": 603, + "x": 633, "y": 633 }, "width": 116, @@ -574,7 +574,7 @@ "id": "teleport.inp", "type": "text", "pos": { - "x": 1110, + "x": 1140, "y": 363 }, "width": 353, @@ -614,7 +614,7 @@ "id": "teleport.Audit Log", "type": "rectangle", "pos": { - "x": 1110, + "x": 1140, "y": 454 }, "width": 140, @@ -667,7 +667,7 @@ "id": "teleport.Cert Authority", "type": "rectangle", "pos": { - "x": 1290, + "x": 1320, "y": 454 }, "width": 173, @@ -720,7 +720,7 @@ "id": "jita.Slack", "type": "rectangle", "pos": { - "x": 2085, + "x": 2115, "y": 60 }, "width": 110, @@ -773,7 +773,7 @@ "id": "jita.Mattermost", "type": "rectangle", "pos": { - "x": 2235, + "x": 2265, "y": 60 }, "width": 128, @@ -814,7 +814,7 @@ "id": "jita.Jira", "type": "rectangle", "pos": { - "x": 2403, + "x": 2433, "y": 60 }, "width": 72, @@ -855,7 +855,7 @@ "id": "jita.Pagerduty", "type": "rectangle", "pos": { - "x": 2515, + "x": 2545, "y": 60 }, "width": 119, @@ -896,7 +896,7 @@ "id": "jita.Email", "type": "rectangle", "pos": { - "x": 2674, + "x": 2704, "y": 60 }, "width": 111, @@ -949,7 +949,7 @@ "id": "infra.ssh", "type": "rectangle", "pos": { - "x": 2204, + "x": 2234, "y": 332 }, "width": 103, @@ -1002,7 +1002,7 @@ "id": "infra.Kubernetes", "type": "rectangle", "pos": { - "x": 2347, + "x": 2377, "y": 332 }, "width": 152, @@ -1055,7 +1055,7 @@ "id": "infra.My SQL", "type": "rectangle", "pos": { - "x": 2539, + "x": 2569, "y": 332 }, "width": 126, @@ -1108,7 +1108,7 @@ "id": "infra.MongoDB", "type": "rectangle", "pos": { - "x": 2204, + "x": 2234, "y": 464 }, "width": 138, @@ -1161,7 +1161,7 @@ "id": "infra.PSQL", "type": "rectangle", "pos": { - "x": 2382, + "x": 2412, "y": 464 }, "width": 108, @@ -1214,7 +1214,7 @@ "id": "infra.Windows", "type": "rectangle", "pos": { - "x": 2530, + "x": 2560, "y": 464 }, "width": 136, @@ -1290,19 +1290,19 @@ "labelPercentage": 0, "route": [ { - "x": 271.5, + "x": 301.5, "y": 454 }, { - "x": 380.29998779296875, + "x": 410.29998779296875, "y": 454 }, { - "x": 434.70001220703125, + "x": 464.70001220703125, "y": 454 }, { - "x": 543.5, + "x": 573.5, "y": 454 } ], @@ -1337,19 +1337,19 @@ "labelPercentage": 0, "route": [ { - "x": 778.5, + "x": 808.5, "y": 454 }, { - "x": 887.2999877929688, + "x": 917.2999877929688, "y": 454 }, { - "x": 941.7000122070312, + "x": 971.7000122070312, "y": 454 }, { - "x": 1050.5, + "x": 1080.5, "y": 454 } ], @@ -1384,19 +1384,19 @@ "labelPercentage": 0, "route": [ { - "x": 1498.72998046875, + "x": 1528.72998046875, "y": 302.5 }, { - "x": 1718.946044921875, + "x": 1748.946044921875, "y": 145.2989959716797 }, { - "x": 1824.199951171875, + "x": 1854.199951171875, "y": 106 }, { - "x": 2025, + "x": 2055, "y": 106 } ], @@ -1431,19 +1431,19 @@ "labelPercentage": 0, "route": [ { - "x": 1523, + "x": 1553, "y": 449 }, { - "x": 1723.800048828125, + "x": 1753.800048828125, "y": 445 }, { - "x": 1848, + "x": 1878, "y": 444 }, { - "x": 2144, + "x": 2174, "y": 444 } ], @@ -1478,19 +1478,19 @@ "labelPercentage": 0, "route": [ { - "x": 1523, + "x": 1553, "y": 521 }, { - "x": 1723.800048828125, + "x": 1753.800048828125, "y": 578.5999755859375 }, { - "x": 1886.0999755859375, + "x": 1916.0999755859375, "y": 621.0770263671875 }, { - "x": 2334.5, + "x": 2364.5, "y": 733.385986328125 } ], @@ -1525,19 +1525,19 @@ "labelPercentage": 0, "route": [ { - "x": 1523, + "x": 1553, "y": 589 }, { - "x": 1723.800048828125, + "x": 1753.800048828125, "y": 728.2000122070312 }, { - "x": 1886.0999755859375, + "x": 1916.0999755859375, "y": 761.3040161132812 }, { - "x": 2334.5, + "x": 2364.5, "y": 754.52001953125 } ], diff --git a/e2etests/testdata/stable/teleport_grid/dagre/sketch.exp.svg b/e2etests/testdata/stable/teleport_grid/dagre/sketch.exp.svg index c5cbdfd341..fe6d54ce80 100644 --- a/e2etests/testdata/stable/teleport_grid/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/teleport_grid/dagre/sketch.exp.svg @@ -1,27 +1,27 @@ -TeleportJust-in-time Access viaInfrastructureIndentity ProviderEngineersMachinesHTTPS://> kubectl> tsh> apiDB Clients

Identity Native Proxy

-
Audit LogCert AuthoritySlackMattermostJiraPagerdutyEmailsshKubernetesMy SQLMongoDBPSQLWindows all connections audited and logged - - - - - - - - - - - - - - - - - - - - - - - - - - - +TeleportJust-in-time Access viaInfrastructureIndentity ProviderEngineersMachinesHTTPS://> kubectl> tsh> apiDB Clients

Identity Native Proxy

+
Audit LogCert AuthoritySlackMattermostJiraPagerdutyEmailsshKubernetesMy SQLMongoDBPSQLWindows all connections audited and logged + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/teleport_grid/elk/board.exp.json b/e2etests/testdata/stable/teleport_grid/elk/board.exp.json index fbbb19c96d..45520c5767 100644 --- a/e2etests/testdata/stable/teleport_grid/elk/board.exp.json +++ b/e2etests/testdata/stable/teleport_grid/elk/board.exp.json @@ -8,10 +8,10 @@ "type": "rectangle", "pos": { "x": 12, - "y": 196 + "y": 167 }, - "width": 272, - "height": 461, + "width": 302, + "height": 520, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -47,7 +47,7 @@ "id": "via", "type": "rectangle", "pos": { - "x": 354, + "x": 384, "y": 122 }, "width": 236, @@ -87,7 +87,7 @@ "id": "teleport", "type": "rectangle", "pos": { - "x": 660, + "x": 690, "y": 275 }, "width": 473, @@ -128,7 +128,7 @@ "id": "jita", "type": "rectangle", "pos": { - "x": 1915, + "x": 1945, "y": 12 }, "width": 820, @@ -169,7 +169,7 @@ "id": "infra", "type": "rectangle", "pos": { - "x": 1263, + "x": 1293, "y": 150 }, "width": 582, @@ -210,7 +210,7 @@ "id": "identity provider", "type": "rectangle", "pos": { - "x": 1263, + "x": 1293, "y": 514 }, "width": 201, @@ -264,10 +264,10 @@ "type": "oval", "pos": { "x": 72, - "y": 256 + "y": 227 }, - "width": 152, - "height": 152, + "width": 182, + "height": 182, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -317,10 +317,10 @@ "type": "oval", "pos": { "x": 72, - "y": 448 + "y": 449 }, - "width": 152, - "height": 149, + "width": 182, + "height": 178, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -369,7 +369,7 @@ "id": "via.https", "type": "rectangle", "pos": { - "x": 414, + "x": 444, "y": 182 }, "width": 116, @@ -410,7 +410,7 @@ "id": "via.kubectl", "type": "rectangle", "pos": { - "x": 414, + "x": 444, "y": 288 }, "width": 116, @@ -451,7 +451,7 @@ "id": "via.tsh", "type": "rectangle", "pos": { - "x": 414, + "x": 444, "y": 394 }, "width": 116, @@ -492,7 +492,7 @@ "id": "via.api", "type": "rectangle", "pos": { - "x": 414, + "x": 444, "y": 500 }, "width": 116, @@ -533,7 +533,7 @@ "id": "via.db clients", "type": "rectangle", "pos": { - "x": 414, + "x": 444, "y": 606 }, "width": 116, @@ -574,7 +574,7 @@ "id": "teleport.inp", "type": "text", "pos": { - "x": 720, + "x": 750, "y": 335 }, "width": 353, @@ -614,7 +614,7 @@ "id": "teleport.Audit Log", "type": "rectangle", "pos": { - "x": 720, + "x": 750, "y": 426 }, "width": 140, @@ -667,7 +667,7 @@ "id": "teleport.Cert Authority", "type": "rectangle", "pos": { - "x": 900, + "x": 930, "y": 426 }, "width": 173, @@ -720,7 +720,7 @@ "id": "jita.Slack", "type": "rectangle", "pos": { - "x": 1975, + "x": 2005, "y": 72 }, "width": 110, @@ -773,7 +773,7 @@ "id": "jita.Mattermost", "type": "rectangle", "pos": { - "x": 2125, + "x": 2155, "y": 72 }, "width": 128, @@ -814,7 +814,7 @@ "id": "jita.Jira", "type": "rectangle", "pos": { - "x": 2293, + "x": 2323, "y": 72 }, "width": 72, @@ -855,7 +855,7 @@ "id": "jita.Pagerduty", "type": "rectangle", "pos": { - "x": 2405, + "x": 2435, "y": 72 }, "width": 119, @@ -896,7 +896,7 @@ "id": "jita.Email", "type": "rectangle", "pos": { - "x": 2564, + "x": 2594, "y": 72 }, "width": 111, @@ -949,7 +949,7 @@ "id": "infra.ssh", "type": "rectangle", "pos": { - "x": 1323, + "x": 1353, "y": 210 }, "width": 103, @@ -1002,7 +1002,7 @@ "id": "infra.Kubernetes", "type": "rectangle", "pos": { - "x": 1466, + "x": 1496, "y": 210 }, "width": 152, @@ -1055,7 +1055,7 @@ "id": "infra.My SQL", "type": "rectangle", "pos": { - "x": 1658, + "x": 1688, "y": 210 }, "width": 126, @@ -1108,7 +1108,7 @@ "id": "infra.MongoDB", "type": "rectangle", "pos": { - "x": 1323, + "x": 1353, "y": 342 }, "width": 138, @@ -1161,7 +1161,7 @@ "id": "infra.PSQL", "type": "rectangle", "pos": { - "x": 1501, + "x": 1531, "y": 342 }, "width": 108, @@ -1214,7 +1214,7 @@ "id": "infra.Windows", "type": "rectangle", "pos": { - "x": 1649, + "x": 1679, "y": 342 }, "width": 136, @@ -1290,11 +1290,11 @@ "labelPercentage": 0, "route": [ { - "x": 284, + "x": 314, "y": 427.0329895019531 }, { - "x": 354, + "x": 384, "y": 427.0329895019531 } ], @@ -1328,11 +1328,11 @@ "labelPercentage": 0, "route": [ { - "x": 590, + "x": 620, "y": 427.0329895019531 }, { - "x": 660, + "x": 690, "y": 427.0329895019531 } ], @@ -1366,19 +1366,19 @@ "labelPercentage": 0, "route": [ { - "x": 1133, + "x": 1163, "y": 336.13299560546875 }, { - "x": 1173, + "x": 1203, "y": 336.13299560546875 }, { - "x": 1173, + "x": 1203, "y": 118 }, { - "x": 1915, + "x": 1945, "y": 118 } ], @@ -1412,11 +1412,11 @@ "labelPercentage": 0, "route": [ { - "x": 1133, + "x": 1163, "y": 396.7330017089844 }, { - "x": 1263, + "x": 1293, "y": 396.7330017089844 } ], @@ -1450,19 +1450,19 @@ "labelPercentage": 0, "route": [ { - "x": 1133, + "x": 1163, "y": 457.3330078125 }, { - "x": 1223, + "x": 1253, "y": 457.3330078125 }, { - "x": 1223, + "x": 1253, "y": 553.3330078125 }, { - "x": 1263, + "x": 1293, "y": 553.3330078125 } ], @@ -1496,19 +1496,19 @@ "labelPercentage": 0, "route": [ { - "x": 1133, + "x": 1163, "y": 517.9329833984375 }, { - "x": 1173, + "x": 1203, "y": 517.9329833984375 }, { - "x": 1173, + "x": 1203, "y": 592.666015625 }, { - "x": 1263, + "x": 1293, "y": 592.666015625 } ], diff --git a/e2etests/testdata/stable/teleport_grid/elk/sketch.exp.svg b/e2etests/testdata/stable/teleport_grid/elk/sketch.exp.svg index e1e4df027d..a53dc32095 100644 --- a/e2etests/testdata/stable/teleport_grid/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/teleport_grid/elk/sketch.exp.svg @@ -1,27 +1,27 @@ -TeleportJust-in-time Access viaInfrastructureIndentity ProviderEngineersMachinesHTTPS://> kubectl> tsh> apiDB Clients

Identity Native Proxy

-
Audit LogCert AuthoritySlackMattermostJiraPagerdutyEmailsshKubernetesMy SQLMongoDBPSQLWindows all connections audited and logged - - - - - - - - - - - - - - - - - - - - - - - - - - - +TeleportJust-in-time Access viaInfrastructureIndentity ProviderEngineersMachinesHTTPS://> kubectl> tsh> apiDB Clients

Identity Native Proxy

+
Audit LogCert AuthoritySlackMattermostJiraPagerdutyEmailsshKubernetesMy SQLMongoDBPSQLWindows all connections audited and logged + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/todo/shape_set_width_height/elk/board.exp.json b/e2etests/testdata/todo/shape_set_width_height/elk/board.exp.json index b60ca9bd97..82bc185d53 100644 --- a/e2etests/testdata/todo/shape_set_width_height/elk/board.exp.json +++ b/e2etests/testdata/todo/shape_set_width_height/elk/board.exp.json @@ -10,7 +10,7 @@ "x": 12, "y": 12 }, - "width": 1388, + "width": 1428, "height": 411, "opacity": 1, "strokeDash": 0, @@ -49,10 +49,10 @@ "type": "oval", "pos": { "x": 62, - "y": 117 + "y": 83 }, - "width": 228, - "height": 200, + "width": 268, + "height": 268, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -89,8 +89,8 @@ "id": "containers.circle container.diamond", "type": "diamond", "pos": { - "x": 112, - "y": 185 + "x": 132, + "y": 206 }, "width": 128, "height": 64, @@ -130,7 +130,7 @@ "id": "containers.diamond container", "type": "diamond", "pos": { - "x": 310, + "x": 350, "y": 62 }, "width": 414, @@ -171,7 +171,7 @@ "id": "containers.diamond container.circle", "type": "oval", "pos": { - "x": 453, + "x": 493, "y": 174 }, "width": 128, @@ -212,7 +212,7 @@ "id": "containers.oval container", "type": "oval", "pos": { - "x": 744, + "x": 784, "y": 125 }, "width": 266, @@ -253,7 +253,7 @@ "id": "containers.oval container.hexagon", "type": "hexagon", "pos": { - "x": 813, + "x": 853, "y": 195 }, "width": 128, @@ -294,7 +294,7 @@ "id": "containers.hexagon container", "type": "hexagon", "pos": { - "x": 1030, + "x": 1070, "y": 124 }, "width": 320, @@ -335,7 +335,7 @@ "id": "containers.hexagon container.oval", "type": "oval", "pos": { - "x": 1126, + "x": 1166, "y": 197 }, "width": 128, @@ -376,7 +376,7 @@ "id": "cloud", "type": "cloud", "pos": { - "x": 1420, + "x": 1460, "y": 167 }, "width": 512, @@ -417,7 +417,7 @@ "id": "tall cylinder", "type": "cylinder", "pos": { - "x": 1548, + "x": 1588, "y": 1363 }, "width": 256, @@ -458,7 +458,7 @@ "id": "class2", "type": "class", "pos": { - "x": 1276, + "x": 1316, "y": 693 }, "width": 800, @@ -533,7 +533,7 @@ "id": "users", "type": "sql_table", "pos": { - "x": 1276, + "x": 1316, "y": 1945 }, "width": 800, @@ -717,7 +717,7 @@ "id": "container", "type": "rectangle", "pos": { - "x": 2239, + "x": 2279, "y": 357 }, "width": 114, @@ -758,7 +758,7 @@ "id": "text", "type": "text", "pos": { - "x": 2096, + "x": 2136, "y": 493 }, "width": 400, @@ -798,7 +798,7 @@ "id": "code", "type": "code", "pos": { - "x": 2096, + "x": 2136, "y": 1469 }, "width": 400, @@ -838,7 +838,7 @@ "id": "small code", "type": "code", "pos": { - "x": 2196, + "x": 2236, "y": 1945 }, "width": 199, @@ -901,11 +901,11 @@ "labelPercentage": 0, "route": [ { - "x": 1676, + "x": 1716, "y": 422 }, { - "x": 1676, + "x": 1716, "y": 693 } ], @@ -939,11 +939,11 @@ "labelPercentage": 0, "route": [ { - "x": 1676, + "x": 1716, "y": 1093 }, { - "x": 1676, + "x": 1716, "y": 1363 } ], @@ -977,11 +977,11 @@ "labelPercentage": 0, "route": [ { - "x": 1676, + "x": 1716, "y": 1875 }, { - "x": 1676, + "x": 1716, "y": 1945 } ], @@ -1015,11 +1015,11 @@ "labelPercentage": 0, "route": [ { - "x": 2296, + "x": 2336, "y": 423 }, { - "x": 2296, + "x": 2336, "y": 493 } ], @@ -1053,11 +1053,11 @@ "labelPercentage": 0, "route": [ { - "x": 2296, + "x": 2336, "y": 1293 }, { - "x": 2296, + "x": 2336, "y": 1469 } ], @@ -1091,11 +1091,11 @@ "labelPercentage": 0, "route": [ { - "x": 2296, + "x": 2336, "y": 1769 }, { - "x": 2296, + "x": 2336, "y": 1945 } ], diff --git a/e2etests/testdata/todo/shape_set_width_height/elk/sketch.exp.svg b/e2etests/testdata/todo/shape_set_width_height/elk/sketch.exp.svg index d9487f7c9c..43e4a25499 100644 --- a/e2etests/testdata/todo/shape_set_width_height/elk/sketch.exp.svg +++ b/e2etests/testdata/todo/shape_set_width_height/elk/sketch.exp.svg @@ -1,34 +1,34 @@ -containerscloudtall cylinderclass2-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voidusersidintnamestringemailstringpasswordstringlast_logindatetimecontainer

markdown text expanded to 800x400

-
a := 5 +containerscloudtall cylinderclass2-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voidusersidintnamestringemailstringpasswordstringlast_logindatetimecontainer

markdown text expanded to 800x400

+
a := 5 b := a + 7 -fmt.Printf("%d", b)a := 5 +fmt.Printf("%d", b)a := 5 b := a + 7 -fmt.Printf("%d", b)a := 5 +fmt.Printf("%d", b)a := 5 b := a + 7 -fmt.Printf("%d", b)a := 5 +fmt.Printf("%d", b)a := 5 b := a + 7 -fmt.Printf("%d", b)circle containerdiamond containeroval containerhexagon containerdiamondcirclehexagonoval - - - - - - - - - - - - - - - - +fmt.Printf("%d", b)circle containerdiamond containeroval containerhexagon containerdiamondcirclehexagonoval + + + + + + + + + + + + + + + + \ No newline at end of file From 368d2886206d79508bf1f7321ced3595230be0d5 Mon Sep 17 00:00:00 2001 From: Gavin Nishizawa Date: Wed, 15 Nov 2023 21:20:35 -0800 Subject: [PATCH 11/13] changelog --- ci/release/changelogs/next.md | 1 + 1 file changed, 1 insertion(+) diff --git a/ci/release/changelogs/next.md b/ci/release/changelogs/next.md index c5c1be154b..5024990c38 100644 --- a/ci/release/changelogs/next.md +++ b/ci/release/changelogs/next.md @@ -28,3 +28,4 @@ - Fixes crash when using `--watch` and navigating to an invalid board path [#1693](https://github.com/terrastruct/d2/pull/1693) - Fixes edge case where nested edge globs were creating excess shapes [#1713](https://github.com/terrastruct/d2/pull/1713) - Fixes a panic with a connection to a grid cell that is a container in TALA [#1729](https://github.com/terrastruct/d2/pull/1729) +- Fixes positioning of grid cells when the grid is a shape with a custom innerBox and fixes the circle shape's content sometimes not fitting in its innerBox. [#1734](https://github.com/terrastruct/d2/pull/1734) From 88304c9f62e798b7975131018bb9f4442bd5ee6c Mon Sep 17 00:00:00 2001 From: Gavin Nishizawa Date: Wed, 15 Nov 2023 21:27:06 -0800 Subject: [PATCH 12/13] link --- lib/shape/shape_cloud.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/shape/shape_cloud.go b/lib/shape/shape_cloud.go index 9753a383f9..11a34e6bc3 100644 --- a/lib/shape/shape_cloud.go +++ b/lib/shape/shape_cloud.go @@ -43,7 +43,7 @@ func NewCloud(box *geo.Box) Shape { return shape } -// TODO this isn't always accurate since the content aspect ratio might be different from the final shape's +// TODO this isn't always accurate since the content aspect ratio might be different from the final shape's https://github.com/terrastruct/d2/issues/1735 func (s shapeCloud) GetInnerBox() *geo.Box { width := s.Box.Width height := s.Box.Height From fab027ff2d635f68cd1b939b307c53885767656d Mon Sep 17 00:00:00 2001 From: Gavin Nishizawa Date: Thu, 16 Nov 2023 10:53:33 -0800 Subject: [PATCH 13/13] cleanup changelog --- ci/release/changelogs/next.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/release/changelogs/next.md b/ci/release/changelogs/next.md index 5024990c38..bf9581445e 100644 --- a/ci/release/changelogs/next.md +++ b/ci/release/changelogs/next.md @@ -28,4 +28,4 @@ - Fixes crash when using `--watch` and navigating to an invalid board path [#1693](https://github.com/terrastruct/d2/pull/1693) - Fixes edge case where nested edge globs were creating excess shapes [#1713](https://github.com/terrastruct/d2/pull/1713) - Fixes a panic with a connection to a grid cell that is a container in TALA [#1729](https://github.com/terrastruct/d2/pull/1729) -- Fixes positioning of grid cells when the grid is a shape with a custom innerBox and fixes the circle shape's content sometimes not fitting in its innerBox. [#1734](https://github.com/terrastruct/d2/pull/1734) +- Fixes incorrect grid cell positioning when the grid has a shape set and fixes content sometimes escaping circle shapes. [#1734](https://github.com/terrastruct/d2/pull/1734)