From 2a13f21d66db3b38ff2f2f71610f8109cdac7c1e Mon Sep 17 00:00:00 2001 From: Gavin Nishizawa Date: Thu, 6 Jul 2023 12:17:55 -0700 Subject: [PATCH 01/31] add dagre_spacing test --- e2etests/stable_test.go | 1 + e2etests/testdata/files/dagre_spacing.d2 | 101 + .../stable/dagre_spacing/dagre/board.exp.json | 1798 +++++++++++++++++ .../stable/dagre_spacing/dagre/sketch.exp.svg | 135 ++ .../stable/dagre_spacing/elk/board.exp.json | 1526 ++++++++++++++ .../stable/dagre_spacing/elk/sketch.exp.svg | 135 ++ 6 files changed, 3696 insertions(+) create mode 100644 e2etests/testdata/files/dagre_spacing.d2 create mode 100644 e2etests/testdata/stable/dagre_spacing/dagre/board.exp.json create mode 100644 e2etests/testdata/stable/dagre_spacing/dagre/sketch.exp.svg create mode 100644 e2etests/testdata/stable/dagre_spacing/elk/board.exp.json create mode 100644 e2etests/testdata/stable/dagre_spacing/elk/sketch.exp.svg diff --git a/e2etests/stable_test.go b/e2etests/stable_test.go index d63203e18..9f3bcda09 100644 --- a/e2etests/stable_test.go +++ b/e2etests/stable_test.go @@ -2784,6 +2784,7 @@ scenarios: { loadFromFile(t, "icon_positions"), loadFromFile(t, "all_shapes_link"), loadFromFile(t, "nested_shape_labels"), + loadFromFile(t, "dagre_spacing"), } runa(t, tcs) diff --git a/e2etests/testdata/files/dagre_spacing.d2 b/e2etests/testdata/files/dagre_spacing.d2 new file mode 100644 index 000000000..faa644ae1 --- /dev/null +++ b/e2etests/testdata/files/dagre_spacing.d2 @@ -0,0 +1,101 @@ +a: { + k.t -> f.i + f.g -> _.s.n +} +k +k.s <-> u.o +h.m.s -> a.f.g + +a.f.j -> u.s.j +u: { + c -> _.s.z.c +} + +s: { + n: { + style.stroke: red + f + } +} + +s.n -> y.r: {style.stroke-width: 8; style.stroke: red} +y.r -> a.g.i: 1\n2\n3\n4 + +s.n.class: icon +a.f.i: { + label: i\nii + class: OutsideTopCenter +} +u.s.j.class: OutsideBottomCenter +u.s: { + label: s\ns\ns\ns + class: OutsideBottomCenter +} +a.f.j.class: [icon; IconOutsideLeftTop] +u.c: { + label: cccccccccccccccccccc + class: OutsideRightMiddle +} + +classes: { + icon: { + icon: https://icons.terrastruct.com/essentials/time.svg + } + + OutsideTopLeft.label.near: outside-top-left + OutsideTopCenter.label.near: outside-top-center + OutsideTopRight.label.near: outside-top-right + + OutsideLeftTop.label.near: outside-left-top + OutsideLeftMiddle.label.near: outside-left-center + OutsideLeftBottom.label.near: outside-left-bottom + + OutsideRightTop.label.near: outside-right-top + OutsideRightMiddle.label.near: outside-right-center + OutsideRightBottom.label.near: outside-right-bottom + + OutsideBottomLeft.label.near: outside-bottom-left + OutsideBottomCenter.label.near: outside-bottom-center + OutsideBottomRight.label.near: outside-bottom-right + + InsideTopLeft.label.near: top-left + InsideTopCenter.label.near: top-center + InsideTopRight.label.near: top-right + + InsideMiddleLeft.label.near: center-left + InsideMiddleCenter.label.near: center-center + InsideMiddleRight.label.near: center-right + + InsideBottomLeft.label.near: bottom-left + InsideBottomCenter.label.near: bottom-center + InsideBottomRight.label.near: bottom-right + + # Icon positions + IconOutsideTopLeft.icon.near: outside-top-left + IconOutsideTopCenter.icon.near: outside-top-center + IconOutsideTopRight.icon.near: outside-top-right + + IconOutsideLeftTop.icon.near: outside-left-top + IconOutsideLeftMiddle.icon.near: outside-left-center + IconOutsideLeftBottom.icon.near: outside-left-bottom + + IconOutsideRightTop.icon.near: outside-right-top + IconOutsideRightMiddle.icon.near: outside-right-center + IconOutsideRightBottom.icon.near: outside-right-bottom + + IconOutsideBottomLeft.icon.near: outside-bottom-left + IconOutsideBottomCenter.icon.near: outside-bottom-center + IconOutsideBottomRight.icon.near: outside-bottom-right + + IconInsideTopLeft.icon.near: top-left + IconInsideTopCenter.icon.near: top-center + IconInsideTopRight.icon.near: top-right + + IconInsideMiddleLeft.icon.near: center-left + IconInsideMiddleCenter.icon.near: center-center + IconInsideMiddleRight.icon.near: center-right + + IconInsideBottomLeft.icon.near: bottom-left + IconInsideBottomCenter.icon.near: bottom-center + IconInsideBottomRight.icon.near: bottom-right +} diff --git a/e2etests/testdata/stable/dagre_spacing/dagre/board.exp.json b/e2etests/testdata/stable/dagre_spacing/dagre/board.exp.json new file mode 100644 index 000000000..e541e6bfb --- /dev/null +++ b/e2etests/testdata/stable/dagre_spacing/dagre/board.exp.json @@ -0,0 +1,1798 @@ +{ + "name": "", + "isFolderOnly": false, + "fontFamily": "SourceSansPro", + "shapes": [ + { + "id": "a", + "type": "rectangle", + "pos": { + "x": 0, + "y": 41 + }, + "width": 424, + "height": 1922, + "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": "a", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 12, + "labelHeight": 36, + "labelPosition": "OUTSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "a.k", + "type": "rectangle", + "pos": { + "x": 22, + "y": 112 + }, + "width": 131, + "height": 142, + "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": "k", + "fontSize": 24, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 11, + "labelHeight": 31, + "labelPosition": "OUTSIDE_TOP_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "a.k.t", + "type": "rectangle", + "pos": { + "x": 62, + "y": 150 + }, + "width": 51, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "t", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 6, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 3 + }, + { + "id": "a.f", + "type": "rectangle", + "pos": { + "x": 20, + "y": 514 + }, + "width": 384, + "height": 194, + "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": "f", + "fontSize": 24, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 8, + "labelHeight": 31, + "labelPosition": "OUTSIDE_TOP_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "a.f.i", + "type": "rectangle", + "classes": [ + "OutsideTopCenter" + ], + "pos": { + "x": 60, + "y": 570 + }, + "width": 54, + "height": 82, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "i\nii", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 9, + "labelHeight": 37, + "labelPosition": "OUTSIDE_TOP_CENTER", + "zIndex": 0, + "level": 3 + }, + { + "id": "a.f.g", + "type": "rectangle", + "pos": { + "x": 174, + "y": 578 + }, + "width": 54, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "g", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 9, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 3 + }, + { + "id": "s", + "type": "rectangle", + "pos": { + "x": 595, + "y": 897 + }, + "width": 259, + "height": 651, + "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": "s", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 11, + "labelHeight": 36, + "labelPosition": "OUTSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "s.n", + "type": "rectangle", + "classes": [ + "icon" + ], + "pos": { + "x": 615, + "y": 968 + }, + "width": 131, + "height": 142, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "red", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": { + "Scheme": "https", + "Opaque": "", + "User": null, + "Host": "icons.terrastruct.com", + "Path": "/essentials/time.svg", + "RawPath": "", + "OmitHost": false, + "ForceQuery": false, + "RawQuery": "", + "Fragment": "", + "RawFragment": "" + }, + "iconPosition": "OUTSIDE_TOP_LEFT", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "n", + "fontSize": 24, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 11, + "labelHeight": 31, + "labelPosition": "OUTSIDE_TOP_RIGHT", + "zIndex": 0, + "level": 2 + }, + { + "id": "k", + "type": "rectangle", + "pos": { + "x": 1280, + "y": 443 + }, + "width": 132, + "height": 301, + "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": "k", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 12, + "labelHeight": 36, + "labelPosition": "OUTSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "k.s", + "type": "rectangle", + "pos": { + "x": 1320, + "y": 560 + }, + "width": 52, + "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": "s", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 7, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "u", + "type": "rectangle", + "pos": { + "x": 874, + "y": 897 + }, + "width": 539, + "height": 249, + "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": "u", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 11, + "labelHeight": 36, + "labelPosition": "OUTSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "u.o", + "type": "rectangle", + "pos": { + "x": 1319, + "y": 988 + }, + "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": "o", + "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": "h", + "type": "rectangle", + "pos": { + "x": 842, + "y": 41 + }, + "width": 172, + "height": 249, + "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": "h", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 12, + "labelHeight": 36, + "labelPosition": "OUTSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "h.m", + "type": "rectangle", + "pos": { + "x": 862, + "y": 112 + }, + "width": 132, + "height": 142, + "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": "m", + "fontSize": 24, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 18, + "labelHeight": 31, + "labelPosition": "OUTSIDE_TOP_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "h.m.s", + "type": "rectangle", + "pos": { + "x": 902, + "y": 150 + }, + "width": 52, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "s", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 7, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 3 + }, + { + "id": "a.f.j", + "type": "rectangle", + "classes": [ + "icon", + "IconOutsideLeftTop" + ], + "pos": { + "x": 288, + "y": 552 + }, + "width": 76, + "height": 118, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": { + "Scheme": "https", + "Opaque": "", + "User": null, + "Host": "icons.terrastruct.com", + "Path": "/essentials/time.svg", + "RawPath": "", + "OmitHost": false, + "ForceQuery": false, + "RawQuery": "", + "Fragment": "", + "RawFragment": "" + }, + "iconPosition": "OUTSIDE_LEFT_TOP", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "j", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 5, + "labelHeight": 21, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 3 + }, + { + "id": "u.s", + "type": "rectangle", + "classes": [ + "OutsideBottomCenter" + ], + "pos": { + "x": 894, + "y": 988 + }, + "width": 130, + "height": 122, + "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": "s\ns\ns\ns", + "fontSize": 24, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 10, + "labelHeight": 103, + "labelPosition": "OUTSIDE_BOTTOM_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "u.s.j", + "type": "rectangle", + "classes": [ + "OutsideBottomCenter" + ], + "pos": { + "x": 934, + "y": 1016 + }, + "width": 50, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "j", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 5, + "labelHeight": 21, + "labelPosition": "OUTSIDE_BOTTOM_CENTER", + "zIndex": 0, + "level": 3 + }, + { + "id": "u.c", + "type": "rectangle", + "classes": [ + "OutsideRightMiddle" + ], + "pos": { + "x": 1064, + "y": 988 + }, + "width": 195, + "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": "cccccccccccccccccccc", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 150, + "labelHeight": 21, + "labelPosition": "OUTSIDE_RIGHT_MIDDLE", + "zIndex": 0, + "level": 2 + }, + { + "id": "s.z", + "type": "rectangle", + "pos": { + "x": 701, + "y": 1370 + }, + "width": 133, + "height": 142, + "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": "z", + "fontSize": 24, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 10, + "labelHeight": 31, + "labelPosition": "OUTSIDE_TOP_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "s.z.c", + "type": "rectangle", + "pos": { + "x": 741, + "y": 1408 + }, + "width": 53, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "c", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 3 + }, + { + "id": "s.n.f", + "type": "rectangle", + "pos": { + "x": 655, + "y": 1006 + }, + "width": 51, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "f", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 6, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 3 + }, + { + "id": "y", + "type": "rectangle", + "pos": { + "x": 444, + "y": 1299 + }, + "width": 131, + "height": 249, + "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": "y", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 13, + "labelHeight": 36, + "labelPosition": "OUTSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "y.r", + "type": "rectangle", + "pos": { + "x": 484, + "y": 1390 + }, + "width": 51, + "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": "r", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 6, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "a.g", + "type": "rectangle", + "pos": { + "x": 148, + "y": 1785 + }, + "width": 129, + "height": 142, + "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": "g", + "fontSize": 24, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 11, + "labelHeight": 31, + "labelPosition": "OUTSIDE_TOP_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "a.g.i", + "type": "rectangle", + "pos": { + "x": 188, + "y": 1823 + }, + "width": 49, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "i", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 4, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 3 + } + ], + "connections": [ + { + "id": "a.(k.t -> f.i)[0]", + "src": "a.k.t", + "srcArrow": "none", + "dst": "a.f.i", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "route": [ + { + "x": 87, + "y": 216.5 + }, + { + "x": 87, + "y": 246.89999389648438 + }, + { + "x": 87, + "y": 265.70001220703125 + }, + { + "x": 87, + "y": 282.5 + }, + { + "x": 87, + "y": 299.29998779296875 + }, + { + "x": 87, + "y": 321.70001220703125 + }, + { + "x": 87, + "y": 338.5 + }, + { + "x": 87, + "y": 355.29998779296875 + }, + { + "x": 87, + "y": 377.70001220703125 + }, + { + "x": 87, + "y": 394.5 + }, + { + "x": 87, + "y": 411.29998779296875 + }, + { + "x": 87, + "y": 488.5 + }, + { + "x": 87, + "y": 528.5 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(a.f.g -> s.n)[0]", + "src": "a.f.g", + "srcArrow": "none", + "dst": "s.n", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "route": [ + { + "x": 201, + "y": 644.5 + }, + { + "x": 201, + "y": 679.2999877929688 + }, + { + "x": 201, + "y": 699.2000122070312 + }, + { + "x": 201, + "y": 716 + }, + { + "x": 201, + "y": 732.7999877929688 + }, + { + "x": 201, + "y": 755.2000122070312 + }, + { + "x": 201, + "y": 772 + }, + { + "x": 201, + "y": 788.7999877929688 + }, + { + "x": 201, + "y": 811.2000122070312 + }, + { + "x": 201, + "y": 828 + }, + { + "x": 201, + "y": 844.7999877929688 + }, + { + "x": 283.79998779296875, + "y": 938.7000122070312 + }, + { + "x": 615, + "y": 1045.5 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(k.s <-> u.o)[0]", + "src": "k.s", + "srcArrow": "triangle", + "dst": "u.o", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "route": [ + { + "x": 1345.5, + "y": 626.5 + }, + { + "x": 1345.5, + "y": 675.7000122070312 + }, + { + "x": 1345.5, + "y": 699.2000122070312 + }, + { + "x": 1345.5, + "y": 716 + }, + { + "x": 1345.5, + "y": 732.7999877929688 + }, + { + "x": 1345.5, + "y": 755.2000122070312 + }, + { + "x": 1345.5, + "y": 772 + }, + { + "x": 1345.5, + "y": 788.7999877929688 + }, + { + "x": 1345.5, + "y": 811.2000122070312 + }, + { + "x": 1345.5, + "y": 828 + }, + { + "x": 1345.5, + "y": 844.7999877929688 + }, + { + "x": 1345.5, + "y": 927.2999877929688 + }, + { + "x": 1345.5, + "y": 988.5 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(h.m.s -> a.f.g)[0]", + "src": "h.m.s", + "srcArrow": "none", + "dst": "a.f.g", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "route": [ + { + "x": 928.25, + "y": 216.5 + }, + { + "x": 928.25, + "y": 230.5 + }, + { + "x": 928.25, + "y": 245.1999969482422 + }, + { + "x": 928.25, + "y": 262 + }, + { + "x": 928.25, + "y": 278.79998779296875 + }, + { + "x": 782.7999877929688, + "y": 301.20001220703125 + }, + { + "x": 564.625, + "y": 318 + }, + { + "x": 346.4490051269531, + "y": 334.79998779296875 + }, + { + "x": 201, + "y": 357.20001220703125 + }, + { + "x": 201, + "y": 374 + }, + { + "x": 201, + "y": 390.79998779296875 + }, + { + "x": 201, + "y": 482.1000061035156 + }, + { + "x": 201, + "y": 578.5 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(a.f.j -> u.s.j)[0]", + "src": "a.f.j", + "srcArrow": "none", + "dst": "u.s.j", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "route": [ + { + "x": 326, + "y": 670.5 + }, + { + "x": 326, + "y": 684.5 + }, + { + "x": 326, + "y": 699.2000122070312 + }, + { + "x": 326, + "y": 716 + }, + { + "x": 326, + "y": 732.7999877929688 + }, + { + "x": 326, + "y": 755.2000122070312 + }, + { + "x": 326, + "y": 772 + }, + { + "x": 326, + "y": 788.7999877929688 + }, + { + "x": 326, + "y": 811.2000122070312 + }, + { + "x": 326, + "y": 828 + }, + { + "x": 326, + "y": 844.7999877929688 + }, + { + "x": 447.5, + "y": 938.7960205078125 + }, + { + "x": 933.5, + "y": 1045.9820556640625 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(u.c -> s.z.c)[0]", + "src": "u.c", + "srcArrow": "none", + "dst": "s.z.c", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "route": [ + { + "x": 1161, + "y": 1054.5 + }, + { + "x": 1161, + "y": 1082.9000244140625 + }, + { + "x": 1161, + "y": 1101.199951171875 + }, + { + "x": 1161, + "y": 1118 + }, + { + "x": 1161, + "y": 1134.800048828125 + }, + { + "x": 1082.199951171875, + "y": 1157.199951171875 + }, + { + "x": 964, + "y": 1174 + }, + { + "x": 845.7999877929688, + "y": 1190.800048828125 + }, + { + "x": 767, + "y": 1213.199951171875 + }, + { + "x": 767, + "y": 1230 + }, + { + "x": 767, + "y": 1246.800048828125 + }, + { + "x": 767, + "y": 1332.9000244140625 + }, + { + "x": 767, + "y": 1408.5 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(s.n -> y.r)[0]", + "src": "s.n", + "srcArrow": "none", + "dst": "y.r", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 8, + "stroke": "red", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "route": [ + { + "x": 680.5, + "y": 1110.5 + }, + { + "x": 680.5, + "y": 1138.9000244140625 + }, + { + "x": 680.5, + "y": 1157.199951171875 + }, + { + "x": 680.5, + "y": 1174 + }, + { + "x": 680.5, + "y": 1190.800048828125 + }, + { + "x": 680.5, + "y": 1213.199951171875 + }, + { + "x": 680.5, + "y": 1230 + }, + { + "x": 680.5, + "y": 1246.800048828125 + }, + { + "x": 651.2999877929688, + "y": 1333.300048828125 + }, + { + "x": 534.5, + "y": 1410.5 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(y.r -> a.g.i)[0]", + "src": "y.r", + "srcArrow": "none", + "dst": "a.g.i", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "1\n2\n3\n4", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 9, + "labelHeight": 69, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPercentage": 0, + "route": [ + { + "x": 509.5, + "y": 1456.5 + }, + { + "x": 509.5, + "y": 1484.9000244140625 + }, + { + "x": 509.5, + "y": 1503.199951171875 + }, + { + "x": 509.5, + "y": 1520 + }, + { + "x": 509.5, + "y": 1536.800048828125 + }, + { + "x": 450, + "y": 1566.0999755859375 + }, + { + "x": 360.75, + "y": 1593.25 + }, + { + "x": 271.5, + "y": 1620.4000244140625 + }, + { + "x": 212, + "y": 1747.9000244140625 + }, + { + "x": 212, + "y": 1823.5 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + } + ], + "root": { + "id": "", + "type": "", + "pos": { + "x": 0, + "y": 0 + }, + "width": 0, + "height": 0, + "opacity": 0, + "strokeDash": 0, + "strokeWidth": 0, + "borderRadius": 0, + "fill": "N7", + "stroke": "", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "zIndex": 0, + "level": 0 + } +} diff --git a/e2etests/testdata/stable/dagre_spacing/dagre/sketch.exp.svg b/e2etests/testdata/stable/dagre_spacing/dagre/sketch.exp.svg new file mode 100644 index 000000000..fa88a0678 --- /dev/null +++ b/e2etests/testdata/stable/dagre_spacing/dagre/sketch.exp.svg @@ -0,0 +1,135 @@ +askuhykfnsomsssscccccccccccccccccccczrgtiiigsjjcfi 1234 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/dagre_spacing/elk/board.exp.json b/e2etests/testdata/stable/dagre_spacing/elk/board.exp.json new file mode 100644 index 000000000..bf4ed86cf --- /dev/null +++ b/e2etests/testdata/stable/dagre_spacing/elk/board.exp.json @@ -0,0 +1,1526 @@ +{ + "name": "", + "isFolderOnly": false, + "fontFamily": "SourceSansPro", + "shapes": [ + { + "id": "a", + "type": "rectangle", + "pos": { + "x": 184, + "y": 373 + }, + "width": 513, + "height": 579, + "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": "a", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 12, + "labelHeight": 36, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "a.k", + "type": "rectangle", + "pos": { + "x": 234, + "y": 423 + }, + "width": 151, + "height": 166, + "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": "k", + "fontSize": 24, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 11, + "labelHeight": 31, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "a.k.t", + "type": "rectangle", + "pos": { + "x": 284, + "y": 473 + }, + "width": 51, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "t", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 6, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 3 + }, + { + "id": "a.f", + "type": "rectangle", + "pos": { + "x": 253, + "y": 679 + }, + "width": 393, + "height": 218, + "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": "f", + "fontSize": 24, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 8, + "labelHeight": 31, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "a.f.i", + "type": "rectangle", + "classes": [ + "OutsideTopCenter" + ], + "pos": { + "x": 303, + "y": 729 + }, + "width": 54, + "height": 82, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "i\nii", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 9, + "labelHeight": 37, + "labelPosition": "OUTSIDE_TOP_CENTER", + "zIndex": 0, + "level": 3 + }, + { + "id": "a.f.g", + "type": "rectangle", + "pos": { + "x": 377, + "y": 755 + }, + "width": 54, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "g", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 9, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 3 + }, + { + "id": "s", + "type": "rectangle", + "pos": { + "x": 387, + "y": 1453 + }, + "width": 424, + "height": 290, + "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": "s", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 11, + "labelHeight": 36, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "s.n", + "type": "rectangle", + "classes": [ + "icon" + ], + "pos": { + "x": 437, + "y": 1503 + }, + "width": 151, + "height": 190, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "red", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": { + "Scheme": "https", + "Opaque": "", + "User": null, + "Host": "icons.terrastruct.com", + "Path": "/essentials/time.svg", + "RawPath": "", + "OmitHost": false, + "ForceQuery": false, + "RawQuery": "", + "Fragment": "", + "RawFragment": "" + }, + "iconPosition": "INSIDE_TOP_LEFT", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "n", + "fontSize": 24, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 11, + "labelHeight": 31, + "labelPosition": "INSIDE_TOP_RIGHT", + "zIndex": 0, + "level": 2 + }, + { + "id": "k", + "type": "rectangle", + "pos": { + "x": 12, + "y": 786 + }, + "width": 152, + "height": 166, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B4", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "k", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 12, + "labelHeight": 36, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "k.s", + "type": "rectangle", + "pos": { + "x": 62, + "y": 836 + }, + "width": 52, + "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": "s", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 7, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "u", + "type": "rectangle", + "pos": { + "x": 255, + "y": 1092 + }, + "width": 694, + "height": 271, + "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": "u", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 11, + "labelHeight": 36, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "u.o", + "type": "rectangle", + "pos": { + "x": 305, + "y": 1147 + }, + "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": "o", + "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": "h", + "type": "rectangle", + "pos": { + "x": 299, + "y": 12 + }, + "width": 252, + "height": 271, + "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": "h", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 12, + "labelHeight": 36, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "h.m", + "type": "rectangle", + "pos": { + "x": 349, + "y": 62 + }, + "width": 152, + "height": 166, + "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": "m", + "fontSize": 24, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 18, + "labelHeight": 31, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "h.m.s", + "type": "rectangle", + "pos": { + "x": 399, + "y": 112 + }, + "width": 52, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "s", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 7, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 3 + }, + { + "id": "a.f.j", + "type": "rectangle", + "classes": [ + "icon", + "IconOutsideLeftTop" + ], + "pos": { + "x": 520, + "y": 729 + }, + "width": 76, + "height": 118, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": { + "Scheme": "https", + "Opaque": "", + "User": null, + "Host": "icons.terrastruct.com", + "Path": "/essentials/time.svg", + "RawPath": "", + "OmitHost": false, + "ForceQuery": false, + "RawQuery": "", + "Fragment": "", + "RawFragment": "" + }, + "iconPosition": "OUTSIDE_LEFT_TOP", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "j", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 5, + "labelHeight": 21, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 3 + }, + { + "id": "u.s", + "type": "rectangle", + "classes": [ + "OutsideBottomCenter" + ], + "pos": { + "x": 379, + "y": 1147 + }, + "width": 150, + "height": 166, + "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": "s\ns\ns\ns", + "fontSize": 24, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 10, + "labelHeight": 103, + "labelPosition": "OUTSIDE_BOTTOM_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "u.s.j", + "type": "rectangle", + "classes": [ + "OutsideBottomCenter" + ], + "pos": { + "x": 429, + "y": 1197 + }, + "width": 50, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "j", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 5, + "labelHeight": 21, + "labelPosition": "OUTSIDE_BOTTOM_CENTER", + "zIndex": 0, + "level": 3 + }, + { + "id": "u.c", + "type": "rectangle", + "classes": [ + "OutsideRightMiddle" + ], + "pos": { + "x": 549, + "y": 1247 + }, + "width": 195, + "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": "cccccccccccccccccccc", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 150, + "labelHeight": 21, + "labelPosition": "OUTSIDE_RIGHT_MIDDLE", + "zIndex": 0, + "level": 2 + }, + { + "id": "s.z", + "type": "rectangle", + "pos": { + "x": 608, + "y": 1508 + }, + "width": 153, + "height": 166, + "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": "z", + "fontSize": 24, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 10, + "labelHeight": 31, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "s.z.c", + "type": "rectangle", + "pos": { + "x": 658, + "y": 1558 + }, + "width": 53, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "c", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 3 + }, + { + "id": "s.n.f", + "type": "rectangle", + "pos": { + "x": 487, + "y": 1577 + }, + "width": 51, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "f", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 6, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 3 + }, + { + "id": "y", + "type": "rectangle", + "pos": { + "x": 437, + "y": 1823 + }, + "width": 151, + "height": 166, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B4", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "y", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 13, + "labelHeight": 36, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "y.r", + "type": "rectangle", + "pos": { + "x": 487, + "y": 1873 + }, + "width": 51, + "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": "r", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 6, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "a.g", + "type": "rectangle", + "pos": { + "x": 466, + "y": 428 + }, + "width": 149, + "height": 166, + "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": "g", + "fontSize": 24, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 11, + "labelHeight": 31, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "a.g.i", + "type": "rectangle", + "pos": { + "x": 516, + "y": 478 + }, + "width": 49, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "i", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 4, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 3 + } + ], + "connections": [ + { + "id": "a.(k.t -> f.i)[0]", + "src": "a.k.t", + "srcArrow": "none", + "dst": "a.f.i", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "route": [ + { + "x": 309.5, + "y": 539 + }, + { + "x": 309.5, + "y": 634 + }, + { + "x": 330.25, + "y": 634 + }, + { + "x": 330.25, + "y": 687 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(a.f.g -> s.n)[0]", + "src": "a.f.g", + "srcArrow": "none", + "dst": "s.n", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "route": [ + { + "x": 404.25, + "y": 821 + }, + { + "x": 404.25, + "y": 997 + }, + { + "x": 214, + "y": 997 + }, + { + "x": 214, + "y": 1408 + }, + { + "x": 513, + "y": 1408 + }, + { + "x": 513, + "y": 1503 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(k.s <-> u.o)[0]", + "src": "k.s", + "srcArrow": "triangle", + "dst": "u.o", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "route": [ + { + "x": 88, + "y": 902 + }, + { + "x": 88, + "y": 1047 + }, + { + "x": 332, + "y": 1047 + }, + { + "x": 332, + "y": 1147 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(h.m.s -> a.f.g)[0]", + "src": "h.m.s", + "srcArrow": "none", + "dst": "a.f.g", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "route": [ + { + "x": 425, + "y": 178 + }, + { + "x": 425, + "y": 634 + }, + { + "x": 404.25, + "y": 634 + }, + { + "x": 404.25, + "y": 755 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(a.f.j -> u.s.j)[0]", + "src": "a.f.j", + "srcArrow": "none", + "dst": "u.s.j", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "route": [ + { + "x": 523.75, + "y": 847 + }, + { + "x": 523.75, + "y": 997 + }, + { + "x": 454, + "y": 997 + }, + { + "x": 454, + "y": 1197 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(u.c -> s.z.c)[0]", + "src": "u.c", + "srcArrow": "none", + "dst": "s.z.c", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "route": [ + { + "x": 685, + "y": 1313 + }, + { + "x": 685, + "y": 1558 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(s.n -> y.r)[0]", + "src": "s.n", + "srcArrow": "none", + "dst": "y.r", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 8, + "stroke": "red", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "route": [ + { + "x": 513, + "y": 1693 + }, + { + "x": 513, + "y": 1873 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(y.r -> a.g.i)[0]", + "src": "y.r", + "srcArrow": "none", + "dst": "a.g.i", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "1\n2\n3\n4", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 9, + "labelHeight": 69, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPercentage": 0, + "route": [ + { + "x": 513, + "y": 1939 + }, + { + "x": 513, + "y": 2034 + }, + { + "x": 973.5, + "y": 2034 + }, + { + "x": 973.5, + "y": 328 + }, + { + "x": 540.5, + "y": 328 + }, + { + "x": 540.5, + "y": 478 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + } + ], + "root": { + "id": "", + "type": "", + "pos": { + "x": 0, + "y": 0 + }, + "width": 0, + "height": 0, + "opacity": 0, + "strokeDash": 0, + "strokeWidth": 0, + "borderRadius": 0, + "fill": "N7", + "stroke": "", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "zIndex": 0, + "level": 0 + } +} diff --git a/e2etests/testdata/stable/dagre_spacing/elk/sketch.exp.svg b/e2etests/testdata/stable/dagre_spacing/elk/sketch.exp.svg new file mode 100644 index 000000000..e135c66ea --- /dev/null +++ b/e2etests/testdata/stable/dagre_spacing/elk/sketch.exp.svg @@ -0,0 +1,135 @@ +askuhykfnsomsssscccccccccccccccccccczrgtiiigsjjcfi 1234 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From 8a8db1892ca9434be2d3c476d5df897668b74d78 Mon Sep 17 00:00:00 2001 From: Gavin Nishizawa Date: Fri, 7 Jul 2023 11:29:43 -0700 Subject: [PATCH 02/31] add dagre_spacing_right test --- e2etests/stable_test.go | 1 + .../testdata/files/dagre_spacing_right.d2 | 103 + .../dagre_spacing_right/dagre/board.exp.json | 1798 +++++++++++++++++ .../dagre_spacing_right/dagre/sketch.exp.svg | 135 ++ .../dagre_spacing_right/elk/board.exp.json | 1518 ++++++++++++++ .../dagre_spacing_right/elk/sketch.exp.svg | 135 ++ 6 files changed, 3690 insertions(+) create mode 100644 e2etests/testdata/files/dagre_spacing_right.d2 create mode 100644 e2etests/testdata/stable/dagre_spacing_right/dagre/board.exp.json create mode 100644 e2etests/testdata/stable/dagre_spacing_right/dagre/sketch.exp.svg create mode 100644 e2etests/testdata/stable/dagre_spacing_right/elk/board.exp.json create mode 100644 e2etests/testdata/stable/dagre_spacing_right/elk/sketch.exp.svg diff --git a/e2etests/stable_test.go b/e2etests/stable_test.go index 9f3bcda09..853a7b285 100644 --- a/e2etests/stable_test.go +++ b/e2etests/stable_test.go @@ -2785,6 +2785,7 @@ scenarios: { loadFromFile(t, "all_shapes_link"), loadFromFile(t, "nested_shape_labels"), loadFromFile(t, "dagre_spacing"), + loadFromFile(t, "dagre_spacing_right"), } runa(t, tcs) diff --git a/e2etests/testdata/files/dagre_spacing_right.d2 b/e2etests/testdata/files/dagre_spacing_right.d2 new file mode 100644 index 000000000..675be5ebd --- /dev/null +++ b/e2etests/testdata/files/dagre_spacing_right.d2 @@ -0,0 +1,103 @@ +direction: right + +a: { + k.t -> f.i + f.g -> _.s.n +} +k +k.s <-> u.o +h.m.s -> a.f.g + +a.f.j -> u.s.j +u: { + c -> _.s.z.c +} + +s: { + n: { + style.stroke: red + f + } +} + +s.n -> y.r: {style.stroke-width: 8; style.stroke: red} +y.r -> a.g.i: 1\n2\n3\n4 + +s.n.class: icon +a.f.i: { + label: i\nii + class: OutsideTopCenter +} +u.s.j.class: OutsideBottomCenter +u.s: { + label: s\ns\ns\ns + class: OutsideBottomCenter +} +a.f.j.class: [icon; IconOutsideLeftTop] +u.c: { + label: cccccccccccccccccccc + class: OutsideRightMiddle +} + +classes: { + icon: { + icon: https://icons.terrastruct.com/essentials/time.svg + } + + OutsideTopLeft.label.near: outside-top-left + OutsideTopCenter.label.near: outside-top-center + OutsideTopRight.label.near: outside-top-right + + OutsideLeftTop.label.near: outside-left-top + OutsideLeftMiddle.label.near: outside-left-center + OutsideLeftBottom.label.near: outside-left-bottom + + OutsideRightTop.label.near: outside-right-top + OutsideRightMiddle.label.near: outside-right-center + OutsideRightBottom.label.near: outside-right-bottom + + OutsideBottomLeft.label.near: outside-bottom-left + OutsideBottomCenter.label.near: outside-bottom-center + OutsideBottomRight.label.near: outside-bottom-right + + InsideTopLeft.label.near: top-left + InsideTopCenter.label.near: top-center + InsideTopRight.label.near: top-right + + InsideMiddleLeft.label.near: center-left + InsideMiddleCenter.label.near: center-center + InsideMiddleRight.label.near: center-right + + InsideBottomLeft.label.near: bottom-left + InsideBottomCenter.label.near: bottom-center + InsideBottomRight.label.near: bottom-right + + # Icon positions + IconOutsideTopLeft.icon.near: outside-top-left + IconOutsideTopCenter.icon.near: outside-top-center + IconOutsideTopRight.icon.near: outside-top-right + + IconOutsideLeftTop.icon.near: outside-left-top + IconOutsideLeftMiddle.icon.near: outside-left-center + IconOutsideLeftBottom.icon.near: outside-left-bottom + + IconOutsideRightTop.icon.near: outside-right-top + IconOutsideRightMiddle.icon.near: outside-right-center + IconOutsideRightBottom.icon.near: outside-right-bottom + + IconOutsideBottomLeft.icon.near: outside-bottom-left + IconOutsideBottomCenter.icon.near: outside-bottom-center + IconOutsideBottomRight.icon.near: outside-bottom-right + + IconInsideTopLeft.icon.near: top-left + IconInsideTopCenter.icon.near: top-center + IconInsideTopRight.icon.near: top-right + + IconInsideMiddleLeft.icon.near: center-left + IconInsideMiddleCenter.icon.near: center-center + IconInsideMiddleRight.icon.near: center-right + + IconInsideBottomLeft.icon.near: bottom-left + IconInsideBottomCenter.icon.near: bottom-center + IconInsideBottomRight.icon.near: bottom-right +} diff --git a/e2etests/testdata/stable/dagre_spacing_right/dagre/board.exp.json b/e2etests/testdata/stable/dagre_spacing_right/dagre/board.exp.json new file mode 100644 index 000000000..1429be57f --- /dev/null +++ b/e2etests/testdata/stable/dagre_spacing_right/dagre/board.exp.json @@ -0,0 +1,1798 @@ +{ + "name": "", + "isFolderOnly": false, + "fontFamily": "SourceSansPro", + "shapes": [ + { + "id": "a", + "type": "rectangle", + "pos": { + "x": 0, + "y": 41 + }, + "width": 1784, + "height": 756, + "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": "a", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 12, + "labelHeight": 36, + "labelPosition": "OUTSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "a.k", + "type": "rectangle", + "pos": { + "x": 50, + "y": 168 + }, + "width": 152, + "height": 300, + "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": "k", + "fontSize": 24, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 11, + "labelHeight": 31, + "labelPosition": "OUTSIDE_TOP_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "a.k.t", + "type": "rectangle", + "pos": { + "x": 101, + "y": 341 + }, + "width": 51, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "t", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 6, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 3 + }, + { + "id": "a.f", + "type": "rectangle", + "pos": { + "x": 402, + "y": 168 + }, + "width": 176, + "height": 537, + "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": "f", + "fontSize": 24, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 8, + "labelHeight": 31, + "labelPosition": "OUTSIDE_TOP_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "a.f.i", + "type": "rectangle", + "classes": [ + "OutsideTopCenter" + ], + "pos": { + "x": 463, + "y": 333 + }, + "width": 54, + "height": 82, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "i\nii", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 9, + "labelHeight": 37, + "labelPosition": "OUTSIDE_TOP_CENTER", + "zIndex": 0, + "level": 3 + }, + { + "id": "a.f.g", + "type": "rectangle", + "pos": { + "x": 463, + "y": 453 + }, + "width": 54, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "g", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 9, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 3 + }, + { + "id": "s", + "type": "rectangle", + "pos": { + "x": 728, + "y": 1398 + }, + "width": 748, + "height": 855, + "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": "s", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 11, + "labelHeight": 36, + "labelPosition": "OUTSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "s.n", + "type": "rectangle", + "classes": [ + "icon" + ], + "pos": { + "x": 778, + "y": 1525 + }, + "width": 295, + "height": 300, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "red", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": { + "Scheme": "https", + "Opaque": "", + "User": null, + "Host": "icons.terrastruct.com", + "Path": "/essentials/time.svg", + "RawPath": "", + "OmitHost": false, + "ForceQuery": false, + "RawQuery": "", + "Fragment": "", + "RawFragment": "" + }, + "iconPosition": "OUTSIDE_TOP_LEFT", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "n", + "fontSize": 24, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 11, + "labelHeight": 31, + "labelPosition": "OUTSIDE_TOP_RIGHT", + "zIndex": 0, + "level": 2 + }, + { + "id": "k", + "type": "rectangle", + "pos": { + "x": 352, + "y": 2716 + }, + "width": 276, + "height": 295, + "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": "k", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 12, + "labelHeight": 36, + "labelPosition": "OUTSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "k.s", + "type": "rectangle", + "pos": { + "x": 464, + "y": 2886 + }, + "width": 52, + "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": "s", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 7, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "u", + "type": "rectangle", + "pos": { + "x": 728, + "y": 2406 + }, + "width": 395, + "height": 605, + "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": "u", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 11, + "labelHeight": 36, + "labelPosition": "OUTSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "u.o", + "type": "rectangle", + "pos": { + "x": 899, + "y": 2886 + }, + "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": "o", + "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": "h", + "type": "rectangle", + "pos": { + "x": 0, + "y": 1721 + }, + "width": 252, + "height": 519, + "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": "h", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 12, + "labelHeight": 36, + "labelPosition": "OUTSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "h.m", + "type": "rectangle", + "pos": { + "x": 50, + "y": 1848 + }, + "width": 152, + "height": 300, + "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": "m", + "fontSize": 24, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 18, + "labelHeight": 31, + "labelPosition": "OUTSIDE_TOP_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "h.m.s", + "type": "rectangle", + "pos": { + "x": 100, + "y": 2021 + }, + "width": 52, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "s", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 7, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 3 + }, + { + "id": "a.f.j", + "type": "rectangle", + "classes": [ + "icon", + "IconOutsideLeftTop" + ], + "pos": { + "x": 452, + "y": 539 + }, + "width": 76, + "height": 118, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": { + "Scheme": "https", + "Opaque": "", + "User": null, + "Host": "icons.terrastruct.com", + "Path": "/essentials/time.svg", + "RawPath": "", + "OmitHost": false, + "ForceQuery": false, + "RawQuery": "", + "Fragment": "", + "RawFragment": "" + }, + "iconPosition": "OUTSIDE_LEFT_TOP", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "j", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 5, + "labelHeight": 21, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 3 + }, + { + "id": "u.s", + "type": "rectangle", + "classes": [ + "OutsideBottomCenter" + ], + "pos": { + "x": 778, + "y": 2547 + }, + "width": 295, + "height": 174, + "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": "s\ns\ns\ns", + "fontSize": 24, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 10, + "labelHeight": 103, + "labelPosition": "OUTSIDE_BOTTOM_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "u.s.j", + "type": "rectangle", + "classes": [ + "OutsideBottomCenter" + ], + "pos": { + "x": 901, + "y": 2601 + }, + "width": 50, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "j", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 5, + "labelHeight": 21, + "labelPosition": "OUTSIDE_BOTTOM_CENTER", + "zIndex": 0, + "level": 3 + }, + { + "id": "u.c", + "type": "rectangle", + "classes": [ + "OutsideRightMiddle" + ], + "pos": { + "x": 828, + "y": 2800 + }, + "width": 195, + "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": "cccccccccccccccccccc", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 150, + "labelHeight": 21, + "labelPosition": "OUTSIDE_RIGHT_MIDDLE", + "zIndex": 0, + "level": 2 + }, + { + "id": "s.z", + "type": "rectangle", + "pos": { + "x": 1273, + "y": 1861 + }, + "width": 153, + "height": 300, + "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": "z", + "fontSize": 24, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 10, + "labelHeight": 31, + "labelPosition": "OUTSIDE_TOP_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "s.z.c", + "type": "rectangle", + "pos": { + "x": 1323, + "y": 2034 + }, + "width": 53, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "c", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 3 + }, + { + "id": "s.n.f", + "type": "rectangle", + "pos": { + "x": 900, + "y": 1698 + }, + "width": 51, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "f", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 6, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 3 + }, + { + "id": "y", + "type": "rectangle", + "pos": { + "x": 1223, + "y": 950 + }, + "width": 253, + "height": 295, + "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": "y", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 13, + "labelHeight": 36, + "labelPosition": "OUTSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "y.r", + "type": "rectangle", + "pos": { + "x": 1324, + "y": 1120 + }, + "width": 51, + "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": "r", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 6, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "a.g", + "type": "rectangle", + "pos": { + "x": 1585, + "y": 287 + }, + "width": 149, + "height": 300, + "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": "g", + "fontSize": 24, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 11, + "labelHeight": 31, + "labelPosition": "OUTSIDE_TOP_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "a.g.i", + "type": "rectangle", + "pos": { + "x": 1635, + "y": 460 + }, + "width": 49, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "i", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 4, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 3 + } + ], + "connections": [ + { + "id": "a.(k.t -> f.i)[0]", + "src": "a.k.t", + "srcArrow": "none", + "dst": "a.f.i", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "route": [ + { + "x": 152.5, + "y": 374.5 + }, + { + "x": 192.10000610351562, + "y": 374.5 + }, + { + "x": 212, + "y": 374.5 + }, + { + "x": 227, + "y": 374.5 + }, + { + "x": 242, + "y": 374.5 + }, + { + "x": 262, + "y": 374.5 + }, + { + "x": 277, + "y": 374.5 + }, + { + "x": 292, + "y": 374.5 + }, + { + "x": 312, + "y": 374.5 + }, + { + "x": 327, + "y": 374.5 + }, + { + "x": 342, + "y": 374.5 + }, + { + "x": 414.20001220703125, + "y": 374.5 + }, + { + "x": 463, + "y": 374.5 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(a.f.g -> s.n)[0]", + "src": "a.f.g", + "srcArrow": "none", + "dst": "s.n", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "route": [ + { + "x": 517, + "y": 477.5 + }, + { + "x": 565.7999877929688, + "y": 477.5 + }, + { + "x": 588, + "y": 477.5 + }, + { + "x": 603, + "y": 477.5 + }, + { + "x": 618, + "y": 477.5 + }, + { + "x": 638, + "y": 477.5 + }, + { + "x": 653, + "y": 477.5 + }, + { + "x": 668, + "y": 477.5 + }, + { + "x": 688, + "y": 477.5 + }, + { + "x": 703, + "y": 477.5 + }, + { + "x": 718, + "y": 477.5 + }, + { + "x": 802.2000122070312, + "y": 681.7000122070312 + }, + { + "x": 899, + "y": 1498.5 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(k.s <-> u.o)[0]", + "src": "k.s", + "srcArrow": "triangle", + "dst": "u.o", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "route": [ + { + "x": 516, + "y": 2919.5 + }, + { + "x": 565.5999755859375, + "y": 2919.5 + }, + { + "x": 588, + "y": 2919.5 + }, + { + "x": 603, + "y": 2919.5 + }, + { + "x": 618, + "y": 2919.5 + }, + { + "x": 638, + "y": 2919.5 + }, + { + "x": 653, + "y": 2919.5 + }, + { + "x": 668, + "y": 2919.5 + }, + { + "x": 688, + "y": 2919.5 + }, + { + "x": 703, + "y": 2919.5 + }, + { + "x": 718, + "y": 2919.5 + }, + { + "x": 802.0999755859375, + "y": 2919.5 + }, + { + "x": 898.5, + "y": 2919.5 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(h.m.s -> a.f.g)[0]", + "src": "h.m.s", + "srcArrow": "none", + "dst": "a.f.g", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "route": [ + { + "x": 152, + "y": 2054.5 + }, + { + "x": 192, + "y": 2054.5 + }, + { + "x": 212, + "y": 2054.5 + }, + { + "x": 227, + "y": 2054.5 + }, + { + "x": 242, + "y": 2054.5 + }, + { + "x": 262, + "y": 1740.9000244140625 + }, + { + "x": 277, + "y": 1270.5 + }, + { + "x": 292, + "y": 800.0989990234375 + }, + { + "x": 312, + "y": 486.5 + }, + { + "x": 327, + "y": 486.5 + }, + { + "x": 342, + "y": 486.5 + }, + { + "x": 414.20001220703125, + "y": 486.5 + }, + { + "x": 463, + "y": 486.5 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(a.f.j -> u.s.j)[0]", + "src": "a.f.j", + "srcArrow": "none", + "dst": "u.s.j", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "route": [ + { + "x": 528, + "y": 602 + }, + { + "x": 568, + "y": 602 + }, + { + "x": 588, + "y": 602 + }, + { + "x": 603, + "y": 602 + }, + { + "x": 618, + "y": 602 + }, + { + "x": 638, + "y": 602 + }, + { + "x": 653, + "y": 602 + }, + { + "x": 668, + "y": 602 + }, + { + "x": 688, + "y": 602 + }, + { + "x": 703, + "y": 602 + }, + { + "x": 718, + "y": 602 + }, + { + "x": 807, + "y": 1001.2000122070312 + }, + { + "x": 923, + "y": 2598 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(u.c -> s.z.c)[0]", + "src": "u.c", + "srcArrow": "none", + "dst": "s.z.c", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "route": [ + { + "x": 1023, + "y": 2842.5 + }, + { + "x": 1063, + "y": 2842.5 + }, + { + "x": 1083, + "y": 2842.5 + }, + { + "x": 1098, + "y": 2842.5 + }, + { + "x": 1113, + "y": 2842.5 + }, + { + "x": 1133, + "y": 2685.699951171875 + }, + { + "x": 1148, + "y": 2450.5 + }, + { + "x": 1163, + "y": 2215.300048828125 + }, + { + "x": 1183, + "y": 2058.5 + }, + { + "x": 1198, + "y": 2058.5 + }, + { + "x": 1213, + "y": 2058.5 + }, + { + "x": 1283, + "y": 2058.5 + }, + { + "x": 1323, + "y": 2058.5 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(s.n -> y.r)[0]", + "src": "s.n", + "srcArrow": "none", + "dst": "y.r", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 8, + "stroke": "red", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "route": [ + { + "x": 1073, + "y": 1713.5 + }, + { + "x": 1113, + "y": 1713.5 + }, + { + "x": 1133, + "y": 1713.5 + }, + { + "x": 1148, + "y": 1713.5 + }, + { + "x": 1163, + "y": 1713.5 + }, + { + "x": 1183, + "y": 1713.5 + }, + { + "x": 1198, + "y": 1713.5 + }, + { + "x": 1213, + "y": 1713.5 + }, + { + "x": 1287.4000244140625, + "y": 1608.0999755859375 + }, + { + "x": 1345, + "y": 1186.5 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(y.r -> a.g.i)[0]", + "src": "y.r", + "srcArrow": "none", + "dst": "a.g.i", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "1\n2\n3\n4", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 9, + "labelHeight": 69, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPercentage": 0, + "route": [ + { + "x": 1375, + "y": 1162.5 + }, + { + "x": 1415.800048828125, + "y": 1162.5 + }, + { + "x": 1436, + "y": 1162.5 + }, + { + "x": 1451, + "y": 1162.5 + }, + { + "x": 1466, + "y": 1162.5 + }, + { + "x": 1486.9000244140625, + "y": 1026.800048828125 + }, + { + "x": 1503.25, + "y": 823.25 + }, + { + "x": 1519.5999755859375, + "y": 619.698974609375 + }, + { + "x": 1595, + "y": 484 + }, + { + "x": 1635, + "y": 484 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + } + ], + "root": { + "id": "", + "type": "", + "pos": { + "x": 0, + "y": 0 + }, + "width": 0, + "height": 0, + "opacity": 0, + "strokeDash": 0, + "strokeWidth": 0, + "borderRadius": 0, + "fill": "N7", + "stroke": "", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "zIndex": 0, + "level": 0 + } +} diff --git a/e2etests/testdata/stable/dagre_spacing_right/dagre/sketch.exp.svg b/e2etests/testdata/stable/dagre_spacing_right/dagre/sketch.exp.svg new file mode 100644 index 000000000..a78e8ff11 --- /dev/null +++ b/e2etests/testdata/stable/dagre_spacing_right/dagre/sketch.exp.svg @@ -0,0 +1,135 @@ +askuhykfnsomsssscccccccccccccccccccczrgtiiigsjjcfi 1234 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/dagre_spacing_right/elk/board.exp.json b/e2etests/testdata/stable/dagre_spacing_right/elk/board.exp.json new file mode 100644 index 000000000..635647da1 --- /dev/null +++ b/e2etests/testdata/stable/dagre_spacing_right/elk/board.exp.json @@ -0,0 +1,1518 @@ +{ + "name": "", + "isFolderOnly": false, + "fontFamily": "SourceSansPro", + "shapes": [ + { + "id": "a", + "type": "rectangle", + "pos": { + "x": 359, + "y": 198 + }, + "width": 591, + "height": 513, + "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": "a", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 12, + "labelHeight": 36, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "a.k", + "type": "rectangle", + "pos": { + "x": 409, + "y": 248 + }, + "width": 151, + "height": 166, + "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": "k", + "fontSize": 24, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 11, + "labelHeight": 31, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "a.k.t", + "type": "rectangle", + "pos": { + "x": 459, + "y": 298 + }, + "width": 51, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "t", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 6, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 3 + }, + { + "id": "a.f", + "type": "rectangle", + "pos": { + "x": 650, + "y": 254 + }, + "width": 245, + "height": 406, + "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": "f", + "fontSize": 24, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 8, + "labelHeight": 31, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "a.f.i", + "type": "rectangle", + "classes": [ + "OutsideTopCenter" + ], + "pos": { + "x": 700, + "y": 304 + }, + "width": 54, + "height": 82, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "i\nii", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 9, + "labelHeight": 37, + "labelPosition": "OUTSIDE_TOP_CENTER", + "zIndex": 0, + "level": 3 + }, + { + "id": "a.f.g", + "type": "rectangle", + "pos": { + "x": 745, + "y": 406 + }, + "width": 54, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "g", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 9, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 3 + }, + { + "id": "s", + "type": "rectangle", + "pos": { + "x": 1630, + "y": 319 + }, + "width": 258, + "height": 476, + "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": "s", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 11, + "labelHeight": 36, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "s.n", + "type": "rectangle", + "classes": [ + "icon" + ], + "pos": { + "x": 1683, + "y": 369 + }, + "width": 151, + "height": 190, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "red", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": { + "Scheme": "https", + "Opaque": "", + "User": null, + "Host": "icons.terrastruct.com", + "Path": "/essentials/time.svg", + "RawPath": "", + "OmitHost": false, + "ForceQuery": false, + "RawQuery": "", + "Fragment": "", + "RawFragment": "" + }, + "iconPosition": "INSIDE_TOP_LEFT", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "n", + "fontSize": 24, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 11, + "labelHeight": 31, + "labelPosition": "INSIDE_TOP_RIGHT", + "zIndex": 0, + "level": 2 + }, + { + "id": "k", + "type": "rectangle", + "pos": { + "x": 798, + "y": 12 + }, + "width": 152, + "height": 166, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B4", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "k", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 12, + "labelHeight": 36, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "k.s", + "type": "rectangle", + "pos": { + "x": 848, + "y": 62 + }, + "width": 52, + "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": "s", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 7, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "u", + "type": "rectangle", + "pos": { + "x": 1090, + "y": 332 + }, + "width": 450, + "height": 438, + "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": "u", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 11, + "labelHeight": 36, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "u.o", + "type": "rectangle", + "pos": { + "x": 1145, + "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": "o", + "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": "h", + "type": "rectangle", + "pos": { + "x": 12, + "y": 321 + }, + "width": 257, + "height": 266, + "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": "h", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 12, + "labelHeight": 36, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "h.m", + "type": "rectangle", + "pos": { + "x": 62, + "y": 371 + }, + "width": 152, + "height": 166, + "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": "m", + "fontSize": 24, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 18, + "labelHeight": 31, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "h.m.s", + "type": "rectangle", + "pos": { + "x": 112, + "y": 421 + }, + "width": 52, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "s", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 7, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 3 + }, + { + "id": "a.f.j", + "type": "rectangle", + "classes": [ + "icon", + "IconOutsideLeftTop" + ], + "pos": { + "x": 769, + "y": 492 + }, + "width": 76, + "height": 118, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": { + "Scheme": "https", + "Opaque": "", + "User": null, + "Host": "icons.terrastruct.com", + "Path": "/essentials/time.svg", + "RawPath": "", + "OmitHost": false, + "ForceQuery": false, + "RawQuery": "", + "Fragment": "", + "RawFragment": "" + }, + "iconPosition": "OUTSIDE_LEFT_TOP", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "j", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 5, + "labelHeight": 21, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 3 + }, + { + "id": "u.s", + "type": "rectangle", + "classes": [ + "OutsideBottomCenter" + ], + "pos": { + "x": 1145, + "y": 468 + }, + "width": 150, + "height": 166, + "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": "s\ns\ns\ns", + "fontSize": 24, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 10, + "labelHeight": 103, + "labelPosition": "OUTSIDE_BOTTOM_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "u.s.j", + "type": "rectangle", + "classes": [ + "OutsideBottomCenter" + ], + "pos": { + "x": 1195, + "y": 518 + }, + "width": 50, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "j", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 5, + "labelHeight": 21, + "labelPosition": "OUTSIDE_BOTTOM_CENTER", + "zIndex": 0, + "level": 3 + }, + { + "id": "u.c", + "type": "rectangle", + "classes": [ + "OutsideRightMiddle" + ], + "pos": { + "x": 1140, + "y": 654 + }, + "width": 195, + "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": "cccccccccccccccccccc", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 150, + "labelHeight": 21, + "labelPosition": "OUTSIDE_RIGHT_MIDDLE", + "zIndex": 0, + "level": 2 + }, + { + "id": "s.z", + "type": "rectangle", + "pos": { + "x": 1685, + "y": 579 + }, + "width": 153, + "height": 166, + "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": "z", + "fontSize": 24, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 10, + "labelHeight": 31, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "s.z.c", + "type": "rectangle", + "pos": { + "x": 1735, + "y": 629 + }, + "width": 53, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "c", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 3 + }, + { + "id": "s.n.f", + "type": "rectangle", + "pos": { + "x": 1733, + "y": 443 + }, + "width": 51, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "f", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 6, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 3 + }, + { + "id": "y", + "type": "rectangle", + "pos": { + "x": 1968, + "y": 381 + }, + "width": 151, + "height": 166, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B4", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "y", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 13, + "labelHeight": 36, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "y.r", + "type": "rectangle", + "pos": { + "x": 2018, + "y": 431 + }, + "width": 51, + "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": "r", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 6, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "a.g", + "type": "rectangle", + "pos": { + "x": 414, + "y": 495 + }, + "width": 149, + "height": 166, + "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": "g", + "fontSize": 24, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 11, + "labelHeight": 31, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "a.g.i", + "type": "rectangle", + "pos": { + "x": 464, + "y": 545 + }, + "width": 49, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "i", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 4, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 3 + } + ], + "connections": [ + { + "id": "a.(k.t -> f.i)[0]", + "src": "a.k.t", + "srcArrow": "none", + "dst": "a.f.i", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "route": [ + { + "x": 510, + "y": 345.5 + }, + { + "x": 700, + "y": 345.5 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(a.f.g -> s.n)[0]", + "src": "a.f.g", + "srcArrow": "none", + "dst": "s.n", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "route": [ + { + "x": 799.5, + "y": 439.5 + }, + { + "x": 995, + "y": 439.5 + }, + { + "x": 995, + "y": 291.5 + }, + { + "x": 1585, + "y": 291.5 + }, + { + "x": 1585, + "y": 464.5 + }, + { + "x": 1683.5, + "y": 464.5 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(k.s <-> u.o)[0]", + "src": "k.s", + "srcArrow": "triangle", + "dst": "u.o", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "route": [ + { + "x": 900, + "y": 95 + }, + { + "x": 1045, + "y": 95 + }, + { + "x": 1045, + "y": 415.5 + }, + { + "x": 1145, + "y": 415.5 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(h.m.s -> a.f.g)[0]", + "src": "h.m.s", + "srcArrow": "none", + "dst": "a.f.g", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "route": [ + { + "x": 164, + "y": 454 + }, + { + "x": 605, + "y": 454 + }, + { + "x": 605, + "y": 439.5 + }, + { + "x": 745.5, + "y": 439.5 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(a.f.j -> u.s.j)[0]", + "src": "a.f.j", + "srcArrow": "none", + "dst": "u.s.j", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "route": [ + { + "x": 845, + "y": 551.5 + }, + { + "x": 1195, + "y": 551.5 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(u.c -> s.z.c)[0]", + "src": "u.c", + "srcArrow": "none", + "dst": "s.z.c", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "route": [ + { + "x": 1495, + "y": 687.5 + }, + { + "x": 1585, + "y": 687.5 + }, + { + "x": 1585, + "y": 662.5 + }, + { + "x": 1735, + "y": 662.5 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(s.n -> y.r)[0]", + "src": "s.n", + "srcArrow": "none", + "dst": "y.r", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 8, + "stroke": "red", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "route": [ + { + "x": 1834.5, + "y": 464.5 + }, + { + "x": 2018, + "y": 464.5 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(y.r -> a.g.i)[0]", + "src": "y.r", + "srcArrow": "none", + "dst": "a.g.i", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "1\n2\n3\n4", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 9, + "labelHeight": 69, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPercentage": 0, + "route": [ + { + "x": 2069, + "y": 464.5 + }, + { + "x": 2164, + "y": 464.5 + }, + { + "x": 2164, + "y": 898.75 + }, + { + "x": 314, + "y": 898.75 + }, + { + "x": 314, + "y": 578 + }, + { + "x": 464, + "y": 578 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + } + ], + "root": { + "id": "", + "type": "", + "pos": { + "x": 0, + "y": 0 + }, + "width": 0, + "height": 0, + "opacity": 0, + "strokeDash": 0, + "strokeWidth": 0, + "borderRadius": 0, + "fill": "N7", + "stroke": "", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "zIndex": 0, + "level": 0 + } +} diff --git a/e2etests/testdata/stable/dagre_spacing_right/elk/sketch.exp.svg b/e2etests/testdata/stable/dagre_spacing_right/elk/sketch.exp.svg new file mode 100644 index 000000000..074572c31 --- /dev/null +++ b/e2etests/testdata/stable/dagre_spacing_right/elk/sketch.exp.svg @@ -0,0 +1,135 @@ +askuhykfnsomsssscccccccccccccccccccczrgtiiigsjjcfi 1234 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From dd5b5a4ac96d2d77207db4828ea6e4b4fcca14d5 Mon Sep 17 00:00:00 2001 From: Gavin Nishizawa Date: Thu, 13 Jul 2023 11:57:07 -0700 Subject: [PATCH 03/31] add centered_horizontal_connections test --- e2etests/stable_test.go | 1 + .../files/centered_horizontal_connections.d2 | 46 ++++ .../dagre/board.exp.json | 232 ++++++++++++++++++ .../dagre/sketch.exp.svg | 103 ++++++++ .../elk/board.exp.json | 223 +++++++++++++++++ .../elk/sketch.exp.svg | 103 ++++++++ 6 files changed, 708 insertions(+) create mode 100644 e2etests/testdata/files/centered_horizontal_connections.d2 create mode 100644 e2etests/testdata/stable/centered_horizontal_connections/dagre/board.exp.json create mode 100644 e2etests/testdata/stable/centered_horizontal_connections/dagre/sketch.exp.svg create mode 100644 e2etests/testdata/stable/centered_horizontal_connections/elk/board.exp.json create mode 100644 e2etests/testdata/stable/centered_horizontal_connections/elk/sketch.exp.svg diff --git a/e2etests/stable_test.go b/e2etests/stable_test.go index 853a7b285..4e4da7075 100644 --- a/e2etests/stable_test.go +++ b/e2etests/stable_test.go @@ -2782,6 +2782,7 @@ scenarios: { loadFromFile(t, "outside_bottom_labels"), loadFromFile(t, "label_positions"), loadFromFile(t, "icon_positions"), + loadFromFile(t, "centered_horizontal_connections"), loadFromFile(t, "all_shapes_link"), loadFromFile(t, "nested_shape_labels"), loadFromFile(t, "dagre_spacing"), diff --git a/e2etests/testdata/files/centered_horizontal_connections.d2 b/e2etests/testdata/files/centered_horizontal_connections.d2 new file mode 100644 index 000000000..1b4e4f691 --- /dev/null +++ b/e2etests/testdata/files/centered_horizontal_connections.d2 @@ -0,0 +1,46 @@ +direction: right + +style: { + fill: transparent +} + +classes: { + rare: { + shape: image + icon: https://raw.githubusercontent.com/frederic-loui/RARE-web/automated-update/docs/img/rare.svg + width: 32 + height: 32 + } + xrd: { + shape: image + icon: https://raw.githubusercontent.com/frederic-loui/RARE-web/automated-update/docs/img/xrd.svg + width: 32 + height: 32 + } + vr-xrv9k: { + shape: image + icon: https://raw.githubusercontent.com/frederic-loui/RARE-web/automated-update/docs/img/vr-xrv9k.svg + width: 32 + height: 32 + } + linux: { + shape: image + icon: https://raw.githubusercontent.com/frederic-loui/RARE-web/automated-update/docs/img/linux.svg + width: 32 + height: 32 + } + crpd: { + shape: image + icon: https://raw.githubusercontent.com/frederic-loui/RARE-web/automated-update/docs/img/crpd.svg + width: 32 + height: 32 + } +} + +r1.class: rare +r2.class: rare + +r1 <-> r2: { + source-arrowhead.label: eth1 + target-arrowhead.label: eth1 +} diff --git a/e2etests/testdata/stable/centered_horizontal_connections/dagre/board.exp.json b/e2etests/testdata/stable/centered_horizontal_connections/dagre/board.exp.json new file mode 100644 index 000000000..9209f1046 --- /dev/null +++ b/e2etests/testdata/stable/centered_horizontal_connections/dagre/board.exp.json @@ -0,0 +1,232 @@ +{ + "name": "", + "isFolderOnly": false, + "fontFamily": "SourceSansPro", + "shapes": [ + { + "id": "r1", + "type": "image", + "classes": [ + "rare" + ], + "pos": { + "x": 0, + "y": 0 + }, + "width": 32, + "height": 32, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "N7", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": { + "Scheme": "https", + "Opaque": "", + "User": null, + "Host": "raw.githubusercontent.com", + "Path": "/frederic-loui/RARE-web/automated-update/docs/img/rare.svg", + "RawPath": "", + "OmitHost": false, + "ForceQuery": false, + "RawQuery": "", + "Fragment": "", + "RawFragment": "" + }, + "iconPosition": "INSIDE_MIDDLE_CENTER", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "r1", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 14, + "labelHeight": 21, + "labelPosition": "OUTSIDE_BOTTOM_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "r2", + "type": "image", + "classes": [ + "rare" + ], + "pos": { + "x": 132, + "y": 0 + }, + "width": 32, + "height": 32, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "N7", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": { + "Scheme": "https", + "Opaque": "", + "User": null, + "Host": "raw.githubusercontent.com", + "Path": "/frederic-loui/RARE-web/automated-update/docs/img/rare.svg", + "RawPath": "", + "OmitHost": false, + "ForceQuery": false, + "RawQuery": "", + "Fragment": "", + "RawFragment": "" + }, + "iconPosition": "INSIDE_MIDDLE_CENTER", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "r2", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 14, + "labelHeight": 21, + "labelPosition": "OUTSIDE_BOTTOM_CENTER", + "zIndex": 0, + "level": 1 + } + ], + "connections": [ + { + "id": "(r1 <-> r2)[0]", + "src": "r1", + "srcArrow": "triangle", + "srcLabel": { + "label": "eth1", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 29, + "labelHeight": 21 + }, + "dst": "r2", + "dstArrow": "triangle", + "dstLabel": { + "label": "eth1", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 29, + "labelHeight": 21 + }, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "route": [ + { + "x": 32, + "y": 29 + }, + { + "x": 72, + "y": 29 + }, + { + "x": 92, + "y": 29 + }, + { + "x": 132, + "y": 29 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + } + ], + "root": { + "id": "", + "type": "", + "pos": { + "x": 0, + "y": 0 + }, + "width": 0, + "height": 0, + "opacity": 0, + "strokeDash": 0, + "strokeWidth": 0, + "borderRadius": 0, + "fill": "transparent", + "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/stable/centered_horizontal_connections/dagre/sketch.exp.svg b/e2etests/testdata/stable/centered_horizontal_connections/dagre/sketch.exp.svg new file mode 100644 index 000000000..cdcc7ed57 --- /dev/null +++ b/e2etests/testdata/stable/centered_horizontal_connections/dagre/sketch.exp.svg @@ -0,0 +1,103 @@ +r1r2 eth1eth1 + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/centered_horizontal_connections/elk/board.exp.json b/e2etests/testdata/stable/centered_horizontal_connections/elk/board.exp.json new file mode 100644 index 000000000..fdf65ac74 --- /dev/null +++ b/e2etests/testdata/stable/centered_horizontal_connections/elk/board.exp.json @@ -0,0 +1,223 @@ +{ + "name": "", + "isFolderOnly": false, + "fontFamily": "SourceSansPro", + "shapes": [ + { + "id": "r1", + "type": "image", + "classes": [ + "rare" + ], + "pos": { + "x": 12, + "y": 12 + }, + "width": 32, + "height": 32, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "N7", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": { + "Scheme": "https", + "Opaque": "", + "User": null, + "Host": "raw.githubusercontent.com", + "Path": "/frederic-loui/RARE-web/automated-update/docs/img/rare.svg", + "RawPath": "", + "OmitHost": false, + "ForceQuery": false, + "RawQuery": "", + "Fragment": "", + "RawFragment": "" + }, + "iconPosition": "INSIDE_MIDDLE_CENTER", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "r1", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 14, + "labelHeight": 21, + "labelPosition": "OUTSIDE_BOTTOM_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "r2", + "type": "image", + "classes": [ + "rare" + ], + "pos": { + "x": 114, + "y": 12 + }, + "width": 32, + "height": 32, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "N7", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": { + "Scheme": "https", + "Opaque": "", + "User": null, + "Host": "raw.githubusercontent.com", + "Path": "/frederic-loui/RARE-web/automated-update/docs/img/rare.svg", + "RawPath": "", + "OmitHost": false, + "ForceQuery": false, + "RawQuery": "", + "Fragment": "", + "RawFragment": "" + }, + "iconPosition": "INSIDE_MIDDLE_CENTER", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "r2", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 14, + "labelHeight": 21, + "labelPosition": "OUTSIDE_BOTTOM_CENTER", + "zIndex": 0, + "level": 1 + } + ], + "connections": [ + { + "id": "(r1 <-> r2)[0]", + "src": "r1", + "srcArrow": "triangle", + "srcLabel": { + "label": "eth1", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 29, + "labelHeight": 21 + }, + "dst": "r2", + "dstArrow": "triangle", + "dstLabel": { + "label": "eth1", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 29, + "labelHeight": 21 + }, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "route": [ + { + "x": 44, + "y": 41 + }, + { + "x": 114, + "y": 41 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + } + ], + "root": { + "id": "", + "type": "", + "pos": { + "x": 0, + "y": 0 + }, + "width": 0, + "height": 0, + "opacity": 0, + "strokeDash": 0, + "strokeWidth": 0, + "borderRadius": 0, + "fill": "transparent", + "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/stable/centered_horizontal_connections/elk/sketch.exp.svg b/e2etests/testdata/stable/centered_horizontal_connections/elk/sketch.exp.svg new file mode 100644 index 000000000..42992a009 --- /dev/null +++ b/e2etests/testdata/stable/centered_horizontal_connections/elk/sketch.exp.svg @@ -0,0 +1,103 @@ +r1r2 eth1eth1 + + + + \ No newline at end of file From de8406d1244ec1ab6feac6a10a566d9bec260b60 Mon Sep 17 00:00:00 2001 From: Gavin Nishizawa Date: Tue, 27 Jun 2023 15:39:41 -0700 Subject: [PATCH 04/31] dagre container label adjustments with phantom node --- d2layouts/d2dagrelayout/layout.go | 275 ++++++++++++++++++++++++------ 1 file changed, 227 insertions(+), 48 deletions(-) diff --git a/d2layouts/d2dagrelayout/layout.go b/d2layouts/d2dagrelayout/layout.go index fa2072896..22175b893 100644 --- a/d2layouts/d2dagrelayout/layout.go +++ b/d2layouts/d2dagrelayout/layout.go @@ -106,6 +106,11 @@ func Layout(ctx context.Context, g *d2graph.Graph, opts *ConfigurableOpts) (err rootAttrs.rankdir = "TB" } + // set label and icon positions for dagre + for _, obj := range g.Objects { + positionLabelsIcons(obj) + } + maxContainerLabelHeight := 0 for _, obj := range g.Objects { // TODO count root level container label sizes for ranksep @@ -151,29 +156,75 @@ func Layout(ctx context.Context, g *d2graph.Graph, opts *ConfigurableOpts) (err loadScript := "" idToObj := make(map[string]*d2graph.Object) + idToWidth := make(map[string]float64) + idToHeight := make(map[string]float64) for _, obj := range g.Objects { id := obj.AbsID() idToObj[id] = obj - width, height := obj.Width, obj.Height - if obj.HasLabel() { - if obj.HasOutsideBottomLabel() || obj.Icon != nil { - height += float64(obj.LabelDimensions.Height) + label.PADDING - } - if len(obj.ChildrenArray) > 0 { - height += float64(obj.LabelDimensions.Height) + label.PADDING - } - } - // reserve extra space for 3d/multiple by providing dagre the larger dimensions - dx, dy := obj.GetModifierElementAdjustments() - width += dx - height += dy + width, height := adjustDimensions(obj) + + idToWidth[id] = width + idToHeight[id] = height loadScript += generateAddNodeLine(id, int(width), int(height)) if obj.Parent != g.Root { loadScript += generateAddParentLine(id, obj.Parent.AbsID()) } } + for _, obj := range g.Objects { + if !obj.IsContainer() { + continue + } + id := obj.AbsID() + // add phantom children to adjust container dimensions + phantomID := id + "___phantom" + widthDelta := int(math.Ceil(idToWidth[id] - obj.Width)) + height := int(math.Ceil(idToHeight[id])) + // when a container has nodes with no connections, the layout will be in a row + // adding a node will add NodeSep width in addition to the node's width + // to add a specific amount of space we need to subtract this from the desired width + // if we add the phantom node at rank 0 it should be at the far right and top + xSpace := rootAttrs.NodeSep + ySpace := rootAttrs.ranksep + + maxChildHeight := math.Inf(-1) + for _, c := range obj.ChildrenArray { + if c.Height > maxChildHeight { + maxChildHeight = c.Height + } + } + + // adjust for children with outside positioned icons + var hasTop, hasBottom bool + for _, child := range obj.ChildrenArray { + if child.Shape.Value == d2target.ShapeImage || child.IconPosition == nil { + continue + } + + switch label.Position(*child.IconPosition) { + case label.OutsideTopLeft, label.OutsideTopCenter, label.OutsideTopRight: + hasTop = true + case label.OutsideBottomLeft, label.OutsideBottomCenter, label.OutsideBottomRight: + hasBottom = true + } + if hasTop && hasBottom { + break + } + } + if hasTop || hasBottom { + // TODO ranksep is already accounting for maxLabelHeight + maxChildHeight += d2target.MAX_ICON_SIZE + 2*label.PADDING + } + + height = go2.Max(height, ySpace+int(maxChildHeight)) + + // TODO after layout remove extra height and shift downwards + + loadScript += generateAddNodeLine(phantomID, widthDelta-xSpace, height-ySpace) + loadScript += generateAddParentLine(phantomID, id) + } + for _, edge := range g.Edges { src, dst := getEdgeEndpoints(g, edge) @@ -235,30 +286,6 @@ func Layout(ctx context.Context, g *d2graph.Graph, opts *ConfigurableOpts) (err obj.TopLeft = geo.NewPoint(math.Round(dn.X-dn.Width/2), math.Round(dn.Y-dn.Height/2)) obj.Width = math.Ceil(dn.Width) obj.Height = math.Ceil(dn.Height) - - if obj.Icon != nil && obj.IconPosition == nil { - if len(obj.ChildrenArray) > 0 { - obj.IconPosition = go2.Pointer(string(label.OutsideTopLeft)) - if obj.LabelPosition == nil { - obj.LabelPosition = go2.Pointer(string(label.OutsideTopRight)) - } - } else { - obj.IconPosition = go2.Pointer(string(label.InsideMiddleCenter)) - } - } - if obj.HasLabel() && obj.LabelPosition == nil { - if len(obj.ChildrenArray) > 0 { - obj.LabelPosition = go2.Pointer(string(label.OutsideTopCenter)) - } else if obj.HasOutsideBottomLabel() { - obj.LabelPosition = go2.Pointer(string(label.OutsideBottomCenter)) - // remove the extra height we added to the node when passing to dagre - obj.Height -= float64(obj.LabelDimensions.Height) + label.PADDING - } else if obj.Icon != nil { - obj.LabelPosition = go2.Pointer(string(label.InsideTopCenter)) - } else { - obj.LabelPosition = go2.Pointer(string(label.InsideMiddleCenter)) - } - } } for i, edge := range g.Edges { @@ -410,18 +437,8 @@ func Layout(ctx context.Context, g *d2graph.Graph, opts *ConfigurableOpts) (err } } - // remove the extra width/height we added for 3d/multiple after all objects/connections are placed - // and shift the shapes down accordingly for _, obj := range g.Objects { - dx, dy := obj.GetModifierElementAdjustments() - if dx != 0 || dy != 0 { - obj.TopLeft.Y += dy - obj.ShiftDescendants(0, dy) - if !obj.IsContainer() { - obj.Width -= dx - obj.Height -= dy - } - } + cleanupAdjustment(obj) } for _, edge := range g.Edges { @@ -727,3 +744,165 @@ func inContainer(obj, container *d2graph.Object) *d2graph.Object { } return inContainer(obj.Parent, container) } + +func adjustDimensions(obj *d2graph.Object) (width, height float64) { + width = obj.Width + height = obj.Height + + // reserve spacing for labels + if obj.HasLabel() { + var position label.Position + if obj.LabelPosition != nil { + position = label.Position(*obj.LabelPosition) + } else if len(obj.ChildrenArray) == 0 && obj.HasOutsideBottomLabel() { + position = label.OutsideBottomCenter + } + + if position.IsShapePosition() { + adjustedWidth := false + if obj.IsContainer() { + switch position { + case label.InsideMiddleLeft, label.InsideMiddleRight: + width += float64(obj.LabelDimensions.Width) + label.PADDING + adjustedWidth = true + } + } + if !adjustedWidth { + switch position { + case label.OutsideLeftTop, label.OutsideLeftMiddle, label.OutsideLeftBottom, + label.OutsideRightTop, label.OutsideRightMiddle, label.OutsideRightBottom: + width += float64(obj.LabelDimensions.Width) + label.PADDING + default: + // TODO labelWidth+2*label.PADDING + width = go2.Max(width, float64(obj.LabelDimensions.Width)) + } + } + } + + // special handling + if obj.HasOutsideBottomLabel() || obj.Icon != nil { + height += float64(obj.LabelDimensions.Height) + label.PADDING + } + } + + if obj.Icon != nil && obj.Shape.Value != d2target.ShapeImage { + var position label.Position + if obj.IconPosition != nil { + position = label.Position(*obj.IconPosition) + } + + if position.IsShapePosition() { + adjustedWidth := false + if obj.IsContainer() { + switch position { + case label.InsideMiddleLeft, label.InsideMiddleRight: + width += d2target.MAX_ICON_SIZE + label.PADDING + adjustedWidth = true + } + } + if !adjustedWidth { + switch position { + case label.OutsideLeftTop, label.OutsideLeftMiddle, label.OutsideLeftBottom, + label.OutsideRightTop, label.OutsideRightMiddle, label.OutsideRightBottom, + label.InsideMiddleLeft, label.InsideMiddleRight: + width += d2target.MAX_ICON_SIZE + label.PADDING + default: + width = go2.Max(width, d2target.MAX_ICON_SIZE+2*label.PADDING) + } + } + } + } + + // reserve extra space for 3d/multiple by providing dagre the larger dimensions + dx, dy := obj.GetModifierElementAdjustments() + width += dx + height += dy + + return +} + +func cleanupAdjustment(obj *d2graph.Object) { + // adjust size and position to account for space reserved for labels + if obj.HasLabel() { + position := label.Position(*obj.LabelPosition) + if position.IsShapePosition() { + labelWidth := float64(obj.LabelDimensions.Width) + label.PADDING + switch position { + case label.OutsideLeftTop, label.OutsideLeftMiddle, label.OutsideLeftBottom, + label.OutsideRightTop, label.OutsideRightMiddle, label.OutsideRightBottom: + obj.Width -= labelWidth + } + switch position { + case label.OutsideLeftTop, label.OutsideLeftMiddle, label.OutsideLeftBottom: + obj.TopLeft.X += labelWidth + obj.ShiftDescendants(labelWidth, 0) + case label.InsideMiddleLeft: + if obj.IsContainer() || obj.Icon != nil { + obj.ShiftDescendants(labelWidth, 0) + } + } + } + } + if obj.Icon != nil && obj.Shape.Value != d2target.ShapeImage { + position := label.Position(*obj.IconPosition) + if position.IsShapePosition() { + iconWidth := float64(d2target.MAX_ICON_SIZE + label.PADDING) + switch position { + case label.OutsideLeftTop, label.OutsideLeftMiddle, label.OutsideLeftBottom, + label.OutsideRightTop, label.OutsideRightMiddle, label.OutsideRightBottom: + obj.Width -= iconWidth + } + switch position { + case label.OutsideLeftTop, label.OutsideLeftMiddle, label.OutsideLeftBottom: + obj.TopLeft.X += iconWidth + obj.ShiftDescendants(iconWidth, 0) + case label.InsideMiddleLeft: + if obj.IsContainer() || obj.Icon != nil { + obj.ShiftDescendants(iconWidth, 0) + } + } + } + } + + // special handling to start/end connections below label + if obj.HasOutsideBottomLabel() { + obj.Height -= float64(obj.LabelDimensions.Height) + label.PADDING + } + + // remove the extra width/height we added for 3d/multiple after all objects/connections are placed + // and shift the shapes down accordingly + dx, dy := obj.GetModifierElementAdjustments() + if dx != 0 || dy != 0 { + obj.TopLeft.Y += dy + obj.ShiftDescendants(0, dy) + if !obj.IsContainer() { + obj.Width -= dx + obj.Height -= dy + } + } +} + +func positionLabelsIcons(obj *d2graph.Object) { + if obj.Icon != nil && obj.IconPosition == nil { + if len(obj.ChildrenArray) > 0 { + obj.IconPosition = go2.Pointer(string(label.OutsideTopLeft)) + if obj.LabelPosition == nil { + obj.LabelPosition = go2.Pointer(string(label.OutsideTopRight)) + return + } + } else { + obj.IconPosition = go2.Pointer(string(label.InsideMiddleCenter)) + } + } + if obj.HasLabel() && obj.LabelPosition == nil { + if len(obj.ChildrenArray) > 0 { + obj.LabelPosition = go2.Pointer(string(label.OutsideTopCenter)) + } else if obj.HasOutsideBottomLabel() { + obj.LabelPosition = go2.Pointer(string(label.OutsideBottomCenter)) + } else if obj.Icon != nil { + obj.LabelPosition = go2.Pointer(string(label.InsideTopCenter)) + } else { + obj.LabelPosition = go2.Pointer(string(label.InsideMiddleCenter)) + } + } +} From 8e18103ffd9d3b53767ee571538acf408f3145bf Mon Sep 17 00:00:00 2001 From: Gavin Nishizawa Date: Mon, 3 Jul 2023 18:07:31 -0700 Subject: [PATCH 05/31] calculating object ranks adusting spacing for each rank --- d2layouts/d2dagrelayout/layout.go | 274 +++++++++++++++++++++++------- 1 file changed, 217 insertions(+), 57 deletions(-) diff --git a/d2layouts/d2dagrelayout/layout.go b/d2layouts/d2dagrelayout/layout.go index 22175b893..200402beb 100644 --- a/d2layouts/d2dagrelayout/layout.go +++ b/d2layouts/d2dagrelayout/layout.go @@ -7,6 +7,7 @@ import ( "fmt" "math" "regexp" + "sort" "strings" "cdr.dev/slog" @@ -162,7 +163,8 @@ func Layout(ctx context.Context, g *d2graph.Graph, opts *ConfigurableOpts) (err id := obj.AbsID() idToObj[id] = obj - width, height := adjustDimensions(obj) + // width, height := adjustDimensions(obj) + width, height := obj.Width, obj.Height idToWidth[id] = width idToHeight[id] = height @@ -172,58 +174,68 @@ func Layout(ctx context.Context, g *d2graph.Graph, opts *ConfigurableOpts) (err loadScript += generateAddParentLine(id, obj.Parent.AbsID()) } } - for _, obj := range g.Objects { - if !obj.IsContainer() { - continue - } - id := obj.AbsID() - // add phantom children to adjust container dimensions - phantomID := id + "___phantom" - widthDelta := int(math.Ceil(idToWidth[id] - obj.Width)) - height := int(math.Ceil(idToHeight[id])) - // when a container has nodes with no connections, the layout will be in a row - // adding a node will add NodeSep width in addition to the node's width - // to add a specific amount of space we need to subtract this from the desired width - // if we add the phantom node at rank 0 it should be at the far right and top - xSpace := rootAttrs.NodeSep - ySpace := rootAttrs.ranksep + // for _, obj := range g.Objects { + // if !obj.IsContainer() { + // continue + // } + // id := obj.AbsID() + // // add phantom children to adjust container dimensions + // // phantomID := id + "___phantom" + // // widthDelta := int(math.Ceil(idToWidth[id] - obj.Width)) + // height := int(math.Ceil(idToHeight[id])) + // // when a container has nodes with no connections, the layout will be in a row + // // adding a node will add NodeSep width in addition to the node's width + // // to add a specific amount of space we need to subtract this from the desired width + // // if we add the phantom node at rank 0 it should be at the far right and top + // // xSpace := rootAttrs.NodeSep + // ySpace := rootAttrs.ranksep - maxChildHeight := math.Inf(-1) - for _, c := range obj.ChildrenArray { - if c.Height > maxChildHeight { - maxChildHeight = c.Height - } - } + // if false { - // adjust for children with outside positioned icons - var hasTop, hasBottom bool - for _, child := range obj.ChildrenArray { - if child.Shape.Value == d2target.ShapeImage || child.IconPosition == nil { - continue - } + // maxChildHeight := math.Inf(-1) + // for _, c := range obj.ChildrenArray { + // if c.Height > maxChildHeight { + // maxChildHeight = c.Height + // } - switch label.Position(*child.IconPosition) { - case label.OutsideTopLeft, label.OutsideTopCenter, label.OutsideTopRight: - hasTop = true - case label.OutsideBottomLeft, label.OutsideBottomCenter, label.OutsideBottomRight: - hasBottom = true - } - if hasTop && hasBottom { - break - } - } - if hasTop || hasBottom { - // TODO ranksep is already accounting for maxLabelHeight - maxChildHeight += d2target.MAX_ICON_SIZE + 2*label.PADDING - } + // if c.Shape.Value == d2target.ShapeImage || c.IconPosition == nil { + // continue + // } + // h := c.Height + // switch label.Position(*c.IconPosition) { + // case label.OutsideTopLeft, label.OutsideTopCenter, label.OutsideTopRight, + // label.OutsideBottomLeft, label.OutsideBottomCenter, label.OutsideBottomRight: + // h += d2target.MAX_ICON_SIZE + 2*label.PADDING + // } + // if h > maxChildHeight { + // maxChildHeight = h + // } + // } - height = go2.Max(height, ySpace+int(maxChildHeight)) + // // adjust for children with outside positioned icons + // var hasTop, hasBottom bool + // for _, child := range obj.ChildrenArray { + // if child.Shape.Value == d2target.ShapeImage || child.IconPosition == nil { + // continue + // } - // TODO after layout remove extra height and shift downwards - - loadScript += generateAddNodeLine(phantomID, widthDelta-xSpace, height-ySpace) - loadScript += generateAddParentLine(phantomID, id) - } + // switch label.Position(*child.IconPosition) { + // case label.OutsideTopLeft, label.OutsideTopCenter, label.OutsideTopRight: + // hasTop = true + // case label.OutsideBottomLeft, label.OutsideBottomCenter, label.OutsideBottomRight: + // hasBottom = true + // } + // if hasTop && hasBottom { + // break + // } + // } + // if hasTop || hasBottom { + // // TODO ranksep is already accounting for maxLabelHeight + // // maxChildHeight += d2target.MAX_ICON_SIZE + 2*label.PADDING + // } + // height = go2.Max(height, ySpace+int(maxChildHeight)) + // } + // } for _, edge := range g.Edges { src, dst := getEdgeEndpoints(g, edge) @@ -288,6 +300,33 @@ func Layout(ctx context.Context, g *d2graph.Graph, opts *ConfigurableOpts) (err obj.Height = math.Ceil(dn.Height) } + ranks, objectRanks := getRanks(g, isHorizontal) + if ranks != nil && objectRanks != nil { + fmt.Printf("got ranks: %v\n", ranks) + } + + tops, centers, bottoms := getPositions(ranks, isHorizontal) + + if tops != nil { + fmt.Printf("got tops: %v\ncenters: %v\nbottoms: %v\n", tops, centers, bottoms) + fmt.Printf("spacing: ") + for i := 1; i < len(tops); i++ { + fmt.Printf("%v, ", tops[i]-bottoms[i-1]) + } + fmt.Printf("\n") + } + fmt.Printf("ranksep %v, nodesep %v\n", rootAttrs.ranksep, rootAttrs.NodeSep) + + // TODO + // 1. Compute all current spacings + // 2. Compute desired spacings + // 3. Apply changes (shifting anything below) + // + // Two kinds of spacing, 1. rank spacing, 2. rank alignment spacing + // all objects at a rank are center aligned, if one is much taller, then the rest will have more spacing to align with the taller node + // if there is extra spacing due to rank alignment, we may not need to increase rank spacing + // for now, just applying spacing increase for whole rank + for i, edge := range g.Edges { val, err := vm.RunString(fmt.Sprintf("JSON.stringify(g.edge(g.edges()[%d]))", i)) if err != nil { @@ -336,7 +375,22 @@ func Layout(ctx context.Context, g *d2graph.Graph, opts *ConfigurableOpts) (err edge.Route = points } - for _, obj := range g.Objects { + // shifting bottom rank down first, then moving up to next rank + for i := len(ranks) - 1; i >= 0; i-- { + objects := ranks[i] + topSpacing := 0. + for _, obj := range objects { + _, adjustedHeight := adjustDimensions(obj) + // TODO width + topSpacing = math.Max(topSpacing, adjustedHeight-obj.Height) + } + fmt.Printf("rank %d topSpacing %v\n", i, topSpacing) + // shiftDown(g, tops[i], topSpacing) + // TODO: Testing + shiftDown(g, tops[i], float64(100)) + } + + for _, obj := range []*d2graph.Object{} { if !obj.HasLabel() || len(obj.ChildrenArray) == 0 { continue } @@ -437,7 +491,8 @@ func Layout(ctx context.Context, g *d2graph.Graph, opts *ConfigurableOpts) (err } } - for _, obj := range g.Objects { + // for _, obj := range g.Objects { + for _, obj := range []*d2graph.Object{} { cleanupAdjustment(obj) } @@ -778,13 +833,9 @@ func adjustDimensions(obj *d2graph.Object) (width, height float64) { } } } - - // special handling - if obj.HasOutsideBottomLabel() || obj.Icon != nil { - height += float64(obj.LabelDimensions.Height) + label.PADDING - } } + hasIconAboveBelow := false if obj.Icon != nil && obj.Shape.Value != d2target.ShapeImage { var position label.Position if obj.IconPosition != nil { @@ -810,6 +861,19 @@ func adjustDimensions(obj *d2graph.Object) (width, height float64) { width = go2.Max(width, d2target.MAX_ICON_SIZE+2*label.PADDING) } } + + switch position { + case label.OutsideTopLeft, label.OutsideTopCenter, label.OutsideTopRight, + label.OutsideBottomLeft, label.OutsideBottomCenter, label.OutsideBottomRight: + hasIconAboveBelow = true + } + } + } + + if true { + // special handling + if obj.HasOutsideBottomLabel() || hasIconAboveBelow { + height += float64(obj.LabelDimensions.Height) + label.PADDING } } @@ -843,6 +907,7 @@ func cleanupAdjustment(obj *d2graph.Object) { } } } + hasIconAboveBelow := false if obj.Icon != nil && obj.Shape.Value != d2target.ShapeImage { position := label.Position(*obj.IconPosition) if position.IsShapePosition() { @@ -861,12 +926,23 @@ func cleanupAdjustment(obj *d2graph.Object) { obj.ShiftDescendants(iconWidth, 0) } } + switch position { + case label.OutsideTopLeft, label.OutsideTopCenter, label.OutsideTopRight, + label.OutsideBottomLeft, label.OutsideBottomCenter, label.OutsideBottomRight: + hasIconAboveBelow = true + } } } // special handling to start/end connections below label - if obj.HasOutsideBottomLabel() { - obj.Height -= float64(obj.LabelDimensions.Height) + label.PADDING + if true { + if obj.HasOutsideBottomLabel() || hasIconAboveBelow { + dy := float64(obj.LabelDimensions.Height) + label.PADDING + obj.Height -= dy + if obj.IsContainer() { + obj.ShiftDescendants(0, -dy/2) + } + } } // remove the extra width/height we added for 3d/multiple after all objects/connections are placed @@ -906,3 +982,87 @@ func positionLabelsIcons(obj *d2graph.Object) { } } } + +func getRanks(g *d2graph.Graph, isHorizontal bool) ([][]*d2graph.Object, map[*d2graph.Object]int) { + alignedObjects := make(map[float64][]*d2graph.Object) + for _, obj := range g.Objects { + if !obj.IsContainer() { + if !isHorizontal { + y := obj.TopLeft.Y + obj.Height/2 + alignedObjects[y] = append(alignedObjects[y], obj) + } else { + x := obj.TopLeft.X + obj.Width/2 + alignedObjects[x] = append(alignedObjects[x], obj) + } + } + } + + levels := make([]float64, 0, len(alignedObjects)) + for l := range alignedObjects { + levels = append(levels, l) + } + sort.Slice(levels, func(i, j int) bool { + return levels[i] < levels[j] + }) + + ranks := make([][]*d2graph.Object, 0, len(levels)) + objectRanks := make(map[*d2graph.Object]int) + for i, l := range levels { + for _, obj := range alignedObjects[l] { + objectRanks[obj] = i + } + ranks = append(ranks, alignedObjects[l]) + } + for _, obj := range g.Objects { + if rank, has := objectRanks[obj]; has { + fmt.Printf("%v rank: %d\n", obj.AbsID(), rank) + } else { + fmt.Printf("%v rank: none\n", obj.AbsID()) + } + } + + return ranks, objectRanks +} + +func getPositions(ranks [][]*d2graph.Object, isHorizontal bool) (tops, centers, bottoms []float64) { + for _, objects := range ranks { + min := math.Inf(1) + max := math.Inf(-1) + for _, obj := range objects { + if isHorizontal { + min = math.Min(min, obj.TopLeft.X) + max = math.Max(max, obj.TopLeft.X+obj.Width) + } else { + min = math.Min(min, obj.TopLeft.Y) + max = math.Max(max, obj.TopLeft.Y+obj.Height) + } + } + tops = append(tops, min) + if isHorizontal { + centers = append(centers, objects[0].TopLeft.X+objects[0].Width/2.) + } else { + centers = append(centers, objects[0].TopLeft.Y+objects[0].Height/2.) + } + bottoms = append(bottoms, max) + } + return +} + +// shift everything down by distance if it is at or below startY +func shiftDown(g *d2graph.Graph, startY, distance float64) { + for _, obj := range g.Objects { + if obj.TopLeft.Y < startY { + continue + } + obj.TopLeft.Y += distance + } + for _, edge := range g.Edges { + for _, p := range edge.Route { + // Note: == so incoming edge shifts down with object at startY + if p.Y <= startY { + continue + } + p.Y += distance + } + } +} From 27f66c8d72ca198cd82948c81bb5be22c38dfaa1 Mon Sep 17 00:00:00 2001 From: Gavin Nishizawa Date: Thu, 6 Jul 2023 12:32:51 -0700 Subject: [PATCH 06/31] get parent rank ranges --- d2layouts/d2dagrelayout/layout.go | 80 +++++++++++++++++++------------ 1 file changed, 50 insertions(+), 30 deletions(-) diff --git a/d2layouts/d2dagrelayout/layout.go b/d2layouts/d2dagrelayout/layout.go index 200402beb..e77c6c73d 100644 --- a/d2layouts/d2dagrelayout/layout.go +++ b/d2layouts/d2dagrelayout/layout.go @@ -300,33 +300,6 @@ func Layout(ctx context.Context, g *d2graph.Graph, opts *ConfigurableOpts) (err obj.Height = math.Ceil(dn.Height) } - ranks, objectRanks := getRanks(g, isHorizontal) - if ranks != nil && objectRanks != nil { - fmt.Printf("got ranks: %v\n", ranks) - } - - tops, centers, bottoms := getPositions(ranks, isHorizontal) - - if tops != nil { - fmt.Printf("got tops: %v\ncenters: %v\nbottoms: %v\n", tops, centers, bottoms) - fmt.Printf("spacing: ") - for i := 1; i < len(tops); i++ { - fmt.Printf("%v, ", tops[i]-bottoms[i-1]) - } - fmt.Printf("\n") - } - fmt.Printf("ranksep %v, nodesep %v\n", rootAttrs.ranksep, rootAttrs.NodeSep) - - // TODO - // 1. Compute all current spacings - // 2. Compute desired spacings - // 3. Apply changes (shifting anything below) - // - // Two kinds of spacing, 1. rank spacing, 2. rank alignment spacing - // all objects at a rank are center aligned, if one is much taller, then the rest will have more spacing to align with the taller node - // if there is extra spacing due to rank alignment, we may not need to increase rank spacing - // for now, just applying spacing increase for whole rank - for i, edge := range g.Edges { val, err := vm.RunString(fmt.Sprintf("JSON.stringify(g.edge(g.edges()[%d]))", i)) if err != nil { @@ -375,6 +348,32 @@ func Layout(ctx context.Context, g *d2graph.Graph, opts *ConfigurableOpts) (err edge.Route = points } + ranks, objectRanks := getRanks(g, isHorizontal) + if ranks != nil && objectRanks != nil { + fmt.Printf("got ranks: %v\n", ranks) + } + + tops, centers, bottoms := getPositions(ranks, isHorizontal) + if tops != nil { + fmt.Printf("got tops: %v\ncenters: %v\nbottoms: %v\n", tops, centers, bottoms) + fmt.Printf("spacing: ") + for i := 1; i < len(tops); i++ { + fmt.Printf("%v, ", tops[i]-bottoms[i-1]) + } + fmt.Printf("\n") + } + fmt.Printf("ranksep %v, nodesep %v\n", rootAttrs.ranksep, rootAttrs.NodeSep) + + // TODO + // 1. Compute all current spacings + // 2. Compute desired spacings + // 3. Apply changes (shifting anything below) + // + // Two kinds of spacing, 1. rank spacing, 2. rank alignment spacing + // all objects at a rank are center aligned, if one is much taller, then the rest will have more spacing to align with the taller node + // if there is extra spacing due to rank alignment, we may not need to increase rank spacing + // for now, just applying spacing increase for whole rank + // shifting bottom rank down first, then moving up to next rank for i := len(ranks) - 1; i >= 0; i-- { objects := ranks[i] @@ -983,7 +982,7 @@ func positionLabelsIcons(obj *d2graph.Object) { } } -func getRanks(g *d2graph.Graph, isHorizontal bool) ([][]*d2graph.Object, map[*d2graph.Object]int) { +func getRanks(g *d2graph.Graph, isHorizontal bool) (ranks [][]*d2graph.Object, objectRanks map[*d2graph.Object]int) { alignedObjects := make(map[float64][]*d2graph.Object) for _, obj := range g.Objects { if !obj.IsContainer() { @@ -1005,8 +1004,8 @@ func getRanks(g *d2graph.Graph, isHorizontal bool) ([][]*d2graph.Object, map[*d2 return levels[i] < levels[j] }) - ranks := make([][]*d2graph.Object, 0, len(levels)) - objectRanks := make(map[*d2graph.Object]int) + ranks = make([][]*d2graph.Object, 0, len(levels)) + objectRanks = make(map[*d2graph.Object]int) for i, l := range levels { for _, obj := range alignedObjects[l] { objectRanks[obj] = i @@ -1021,6 +1020,27 @@ func getRanks(g *d2graph.Graph, isHorizontal bool) ([][]*d2graph.Object, map[*d2 } } + startingParentRanks := make(map[*d2graph.Object]int) + endingParentRanks := make(map[*d2graph.Object]int) + for _, obj := range g.Objects { + if obj.IsContainer() { + continue + } + r := objectRanks[obj] + // update all ancestor's min/max ranks + for parent := obj.Parent; parent != nil && parent != g.Root; parent = parent.Parent { + if start, has := startingParentRanks[parent]; !has || r < start { + startingParentRanks[parent] = r + } + if end, has := endingParentRanks[parent]; !has || r > end { + endingParentRanks[parent] = r + } + } + } + for parent, start := range startingParentRanks { + fmt.Printf("parent %v start %v end %v\n", parent.AbsID(), start, endingParentRanks[parent]) + } + return ranks, objectRanks } From 81db10d67e6a0b1a18dc804f2df0370e18f6f96c Mon Sep 17 00:00:00 2001 From: Gavin Nishizawa Date: Thu, 6 Jul 2023 13:31:32 -0700 Subject: [PATCH 07/31] adjust parent heights --- d2layouts/d2dagrelayout/layout.go | 1031 ++++++++++++++++++----------- e2etests/e2e_test.go | 2 + 2 files changed, 631 insertions(+), 402 deletions(-) diff --git a/d2layouts/d2dagrelayout/layout.go b/d2layouts/d2dagrelayout/layout.go index e77c6c73d..0bde93782 100644 --- a/d2layouts/d2dagrelayout/layout.go +++ b/d2layouts/d2dagrelayout/layout.go @@ -33,6 +33,7 @@ var dagreJS string const ( MIN_RANK_SEP = 60 EDGE_LABEL_GAP = 20 + MIN_MARGIN = 10. ) type ConfigurableOpts struct { @@ -112,24 +113,6 @@ func Layout(ctx context.Context, g *d2graph.Graph, opts *ConfigurableOpts) (err positionLabelsIcons(obj) } - maxContainerLabelHeight := 0 - for _, obj := range g.Objects { - // TODO count root level container label sizes for ranksep - if len(obj.ChildrenArray) == 0 || obj.Parent == g.Root { - continue - } - if obj.HasLabel() { - maxContainerLabelHeight = go2.Max(maxContainerLabelHeight, obj.LabelDimensions.Height+label.PADDING) - } - - if obj.Icon != nil && obj.Shape.Value != d2target.ShapeImage { - s := obj.ToShape() - iconSize := d2target.GetIconSize(s.GetInnerBox(), string(label.InsideTopLeft)) - // Since dagre container labels are pushed up, we don't want a child container to collide - maxContainerLabelHeight = go2.Max(maxContainerLabelHeight, (iconSize+label.PADDING*2)*2) - } - } - maxLabelWidth := 0 maxLabelHeight := 0 for _, edge := range g.Edges { @@ -140,13 +123,13 @@ func Layout(ctx context.Context, g *d2graph.Graph, opts *ConfigurableOpts) (err } if !isHorizontal { - rootAttrs.ranksep = go2.Max(go2.Max(100, maxLabelHeight+40), maxContainerLabelHeight) + rootAttrs.ranksep = go2.Max(100, maxLabelHeight+40) } else { rootAttrs.ranksep = go2.Max(100, maxLabelWidth+40) // use existing config - rootAttrs.NodeSep = rootAttrs.EdgeSep - // configure vertical padding - rootAttrs.EdgeSep = go2.Max(maxLabelHeight+40, maxContainerLabelHeight) + // rootAttrs.NodeSep = rootAttrs.EdgeSep + // // configure vertical padding + // rootAttrs.EdgeSep = maxLabelHeight + 40 // Note: non-containers have both of these as padding (rootAttrs.NodeSep + rootAttrs.EdgeSep) } @@ -163,79 +146,49 @@ func Layout(ctx context.Context, g *d2graph.Graph, opts *ConfigurableOpts) (err id := obj.AbsID() idToObj[id] = obj - // width, height := adjustDimensions(obj) + // Note: we handle vertical spacing adjustments separately after layout, + // but for horizontal adjustments we change the width we pass to dagre. + // For containers, we use phantom nodes to adjust container widths width, height := obj.Width, obj.Height - - idToWidth[id] = width - idToHeight[id] = height + // if isHorizontal { + // height = adjustHeight(obj) + // idToHeight[id] = height + // } else { + // width = adjustWidth(obj) + // idToWidth[id] = width + // } + // TODO update to work with direction: right/left (in that case we need to adjust heights here, + // and horizontal spacing will be adjusted separately after layout loadScript += generateAddNodeLine(id, int(width), int(height)) if obj.Parent != g.Root { loadScript += generateAddParentLine(id, obj.Parent.AbsID()) } } - // for _, obj := range g.Objects { - // if !obj.IsContainer() { - // continue - // } - // id := obj.AbsID() - // // add phantom children to adjust container dimensions - // // phantomID := id + "___phantom" - // // widthDelta := int(math.Ceil(idToWidth[id] - obj.Width)) - // height := int(math.Ceil(idToHeight[id])) - // // when a container has nodes with no connections, the layout will be in a row - // // adding a node will add NodeSep width in addition to the node's width - // // to add a specific amount of space we need to subtract this from the desired width - // // if we add the phantom node at rank 0 it should be at the far right and top - // // xSpace := rootAttrs.NodeSep - // ySpace := rootAttrs.ranksep - // if false { + for _, obj := range g.Objects { + if !obj.IsContainer() || true { + continue + } + id := obj.AbsID() + phantomWidth, phantomHeight := 1, 1 + // when a container has nodes with no connections, the layout will be in a row + // adding a node will add NodeSep width in addition to the node's width + // to add a specific amount of space we need to subtract this from the desired width + // if we add the phantom node at rank 0 it should be at the far right and top + if isHorizontal { + heightDelta := int(math.Ceil(idToHeight[id] - obj.Height)) + phantomWidth = heightDelta - rootAttrs.NodeSep + } else { + widthDelta := int(math.Ceil(idToWidth[id] - obj.Width)) + phantomWidth = widthDelta - rootAttrs.NodeSep + } - // maxChildHeight := math.Inf(-1) - // for _, c := range obj.ChildrenArray { - // if c.Height > maxChildHeight { - // maxChildHeight = c.Height - // } - - // if c.Shape.Value == d2target.ShapeImage || c.IconPosition == nil { - // continue - // } - // h := c.Height - // switch label.Position(*c.IconPosition) { - // case label.OutsideTopLeft, label.OutsideTopCenter, label.OutsideTopRight, - // label.OutsideBottomLeft, label.OutsideBottomCenter, label.OutsideBottomRight: - // h += d2target.MAX_ICON_SIZE + 2*label.PADDING - // } - // if h > maxChildHeight { - // maxChildHeight = h - // } - // } - - // // adjust for children with outside positioned icons - // var hasTop, hasBottom bool - // for _, child := range obj.ChildrenArray { - // if child.Shape.Value == d2target.ShapeImage || child.IconPosition == nil { - // continue - // } - - // switch label.Position(*child.IconPosition) { - // case label.OutsideTopLeft, label.OutsideTopCenter, label.OutsideTopRight: - // hasTop = true - // case label.OutsideBottomLeft, label.OutsideBottomCenter, label.OutsideBottomRight: - // hasBottom = true - // } - // if hasTop && hasBottom { - // break - // } - // } - // if hasTop || hasBottom { - // // TODO ranksep is already accounting for maxLabelHeight - // // maxChildHeight += d2target.MAX_ICON_SIZE + 2*label.PADDING - // } - // height = go2.Max(height, ySpace+int(maxChildHeight)) - // } - // } + // add phantom children to adjust container widths + phantomID := id + "___phantom" + loadScript += generateAddNodeLine(phantomID, phantomWidth, phantomHeight) + loadScript += generateAddParentLine(phantomID, id) + } for _, edge := range g.Edges { src, dst := getEdgeEndpoints(g, edge) @@ -348,152 +301,10 @@ func Layout(ctx context.Context, g *d2graph.Graph, opts *ConfigurableOpts) (err edge.Route = points } - ranks, objectRanks := getRanks(g, isHorizontal) - if ranks != nil && objectRanks != nil { - fmt.Printf("got ranks: %v\n", ranks) - } - - tops, centers, bottoms := getPositions(ranks, isHorizontal) - if tops != nil { - fmt.Printf("got tops: %v\ncenters: %v\nbottoms: %v\n", tops, centers, bottoms) - fmt.Printf("spacing: ") - for i := 1; i < len(tops); i++ { - fmt.Printf("%v, ", tops[i]-bottoms[i-1]) - } - fmt.Printf("\n") - } - fmt.Printf("ranksep %v, nodesep %v\n", rootAttrs.ranksep, rootAttrs.NodeSep) - - // TODO - // 1. Compute all current spacings - // 2. Compute desired spacings - // 3. Apply changes (shifting anything below) - // - // Two kinds of spacing, 1. rank spacing, 2. rank alignment spacing - // all objects at a rank are center aligned, if one is much taller, then the rest will have more spacing to align with the taller node - // if there is extra spacing due to rank alignment, we may not need to increase rank spacing - // for now, just applying spacing increase for whole rank - - // shifting bottom rank down first, then moving up to next rank - for i := len(ranks) - 1; i >= 0; i-- { - objects := ranks[i] - topSpacing := 0. - for _, obj := range objects { - _, adjustedHeight := adjustDimensions(obj) - // TODO width - topSpacing = math.Max(topSpacing, adjustedHeight-obj.Height) - } - fmt.Printf("rank %d topSpacing %v\n", i, topSpacing) - // shiftDown(g, tops[i], topSpacing) - // TODO: Testing - shiftDown(g, tops[i], float64(100)) - } - - for _, obj := range []*d2graph.Object{} { - if !obj.HasLabel() || len(obj.ChildrenArray) == 0 { - continue - } - - // usually you don't want to take away here more than what was added, which is the label height - // however, if the label height is more than the ranksep/2, we'll have no padding around children anymore - // so cap the amount taken off at ranksep/2 - subtract := float64(go2.Min(rootAttrs.ranksep/2, obj.LabelDimensions.Height+label.PADDING)) - - obj.Height -= subtract - - // If the edge is connected to two descendants that are about to be downshifted, their whole route gets downshifted - movedEdges := make(map[*d2graph.Edge]struct{}) - for _, e := range g.Edges { - isSrcDesc := e.Src.IsDescendantOf(obj) - isDstDesc := e.Dst.IsDescendantOf(obj) - - if isSrcDesc && isDstDesc { - stepSize := subtract - if e.Src != obj || e.Dst != obj { - stepSize /= 2. - } - movedEdges[e] = struct{}{} - for _, p := range e.Route { - p.Y += stepSize - } - } - } - - q := []*d2graph.Object{obj} - // Downshift descendants and edges that have one endpoint connected to a descendant - for len(q) > 0 { - curr := q[0] - q = q[1:] - - stepSize := subtract - // The object itself needs to move down the height it was just subtracted - // all descendants move half, to maintain vertical padding - if curr != obj { - stepSize /= 2. - } - curr.TopLeft.Y += stepSize - almostEqual := func(a, b float64) bool { - return b-1 <= a && a <= b+1 - } - shouldMove := func(p *geo.Point) bool { - if curr != obj { - return true - } - if isHorizontal { - // Only move horizontal edges if they are connected to the top side of the shrinking container - return almostEqual(p.Y, obj.TopLeft.Y-stepSize) - } else { - // Edge should only move if it's not connected to the bottom side of the shrinking container - return !almostEqual(p.Y, obj.TopLeft.Y+obj.Height) - } - } - for _, e := range g.Edges { - if _, ok := movedEdges[e]; ok { - continue - } - moveWholeEdge := false - if e.Src == curr { - // Don't move src points on side of container - if almostEqual(e.Route[0].X, obj.TopLeft.X) || almostEqual(e.Route[0].X, obj.TopLeft.X+obj.Width) { - // Unless the dst is also on a container - if !e.Dst.HasLabel() || len(e.Dst.ChildrenArray) <= 0 { - continue - } - } - if shouldMove(e.Route[0]) { - if isHorizontal && e.Src.Parent != g.Root && e.Dst.Parent != g.Root { - moveWholeEdge = true - } else { - e.ShiftStart(stepSize, false) - } - } - } - if !moveWholeEdge && e.Dst == curr { - if shouldMove(e.Route[len(e.Route)-1]) { - if isHorizontal && e.Dst.Parent != g.Root && e.Src.Parent != g.Root { - moveWholeEdge = true - } else { - e.ShiftEnd(stepSize, false) - } - } - } - - if moveWholeEdge { - for _, p := range e.Route { - p.Y += stepSize / 2. - } - movedEdges[e] = struct{}{} - } - - } - q = append(q, curr.ChildrenArray...) - } - } - + adjustSpacing(g, float64(rootAttrs.ranksep), isHorizontal) // for _, obj := range g.Objects { - for _, obj := range []*d2graph.Object{} { - cleanupAdjustment(obj) - } + // cleanupAdjustment(obj, isHorizontal) + // } for _, edge := range g.Edges { points := edge.Route @@ -799,10 +610,11 @@ func inContainer(obj, container *d2graph.Object) *d2graph.Object { return inContainer(obj.Parent, container) } -func adjustDimensions(obj *d2graph.Object) (width, height float64) { - width = obj.Width - height = obj.Height +type spacing struct { + top, bottom, left, right float64 +} +func getSpacing(obj *d2graph.Object) (margin, padding spacing) { // reserve spacing for labels if obj.HasLabel() { var position label.Position @@ -812,151 +624,64 @@ func adjustDimensions(obj *d2graph.Object) (width, height float64) { position = label.OutsideBottomCenter } - if position.IsShapePosition() { - adjustedWidth := false - if obj.IsContainer() { - switch position { - case label.InsideMiddleLeft, label.InsideMiddleRight: - width += float64(obj.LabelDimensions.Width) + label.PADDING - adjustedWidth = true - } - } - if !adjustedWidth { - switch position { - case label.OutsideLeftTop, label.OutsideLeftMiddle, label.OutsideLeftBottom, - label.OutsideRightTop, label.OutsideRightMiddle, label.OutsideRightBottom: - width += float64(obj.LabelDimensions.Width) + label.PADDING - default: - // TODO labelWidth+2*label.PADDING - width = go2.Max(width, float64(obj.LabelDimensions.Width)) - } - } + labelWidth := float64(obj.LabelDimensions.Width) + 2*label.PADDING + labelHeight := float64(obj.LabelDimensions.Height) + 2*label.PADDING + + switch position { + case label.OutsideTopLeft, label.OutsideTopCenter, label.OutsideTopRight: + margin.top = labelHeight + case label.OutsideBottomLeft, label.OutsideBottomCenter, label.OutsideBottomRight: + margin.bottom = labelHeight + case label.OutsideLeftTop, label.OutsideLeftMiddle, label.OutsideLeftBottom: + margin.left = labelWidth + case label.OutsideRightTop, label.OutsideRightMiddle, label.OutsideRightBottom: + margin.right = labelWidth + case label.InsideTopLeft, label.InsideTopCenter, label.InsideTopRight: + padding.top = labelHeight + case label.InsideBottomLeft, label.InsideBottomCenter, label.InsideBottomRight: + padding.bottom = labelHeight + case label.InsideMiddleLeft: + padding.left = labelWidth + case label.InsideMiddleRight: + padding.right = labelWidth } } - hasIconAboveBelow := false if obj.Icon != nil && obj.Shape.Value != d2target.ShapeImage { var position label.Position if obj.IconPosition != nil { position = label.Position(*obj.IconPosition) } - if position.IsShapePosition() { - adjustedWidth := false - if obj.IsContainer() { - switch position { - case label.InsideMiddleLeft, label.InsideMiddleRight: - width += d2target.MAX_ICON_SIZE + label.PADDING - adjustedWidth = true - } - } - if !adjustedWidth { - switch position { - case label.OutsideLeftTop, label.OutsideLeftMiddle, label.OutsideLeftBottom, - label.OutsideRightTop, label.OutsideRightMiddle, label.OutsideRightBottom, - label.InsideMiddleLeft, label.InsideMiddleRight: - width += d2target.MAX_ICON_SIZE + label.PADDING - default: - width = go2.Max(width, d2target.MAX_ICON_SIZE+2*label.PADDING) - } - } - - switch position { - case label.OutsideTopLeft, label.OutsideTopCenter, label.OutsideTopRight, - label.OutsideBottomLeft, label.OutsideBottomCenter, label.OutsideBottomRight: - hasIconAboveBelow = true - } - } - } - - if true { - // special handling - if obj.HasOutsideBottomLabel() || hasIconAboveBelow { - height += float64(obj.LabelDimensions.Height) + label.PADDING + iconSize := float64(d2target.MAX_ICON_SIZE + 2*label.PADDING) + switch position { + case label.OutsideTopLeft, label.OutsideTopCenter, label.OutsideTopRight: + margin.top = math.Max(margin.top, iconSize) + case label.OutsideBottomLeft, label.OutsideBottomCenter, label.OutsideBottomRight: + margin.bottom = math.Max(margin.bottom, iconSize) + case label.OutsideLeftTop, label.OutsideLeftMiddle, label.OutsideLeftBottom: + margin.left = math.Max(margin.left, iconSize) + case label.OutsideRightTop, label.OutsideRightMiddle, label.OutsideRightBottom: + margin.right = math.Max(margin.right, iconSize) + case label.InsideTopLeft, label.InsideTopCenter, label.InsideTopRight: + padding.top = math.Max(padding.top, iconSize) + case label.InsideBottomLeft, label.InsideBottomCenter, label.InsideBottomRight: + padding.bottom = math.Max(padding.bottom, iconSize) + case label.InsideMiddleLeft: + padding.left = math.Max(padding.left, iconSize) + case label.InsideMiddleRight: + padding.right = math.Max(padding.right, iconSize) } } // reserve extra space for 3d/multiple by providing dagre the larger dimensions dx, dy := obj.GetModifierElementAdjustments() - width += dx - height += dy + margin.right += dx + margin.top += dy return } -func cleanupAdjustment(obj *d2graph.Object) { - // adjust size and position to account for space reserved for labels - if obj.HasLabel() { - position := label.Position(*obj.LabelPosition) - if position.IsShapePosition() { - labelWidth := float64(obj.LabelDimensions.Width) + label.PADDING - switch position { - case label.OutsideLeftTop, label.OutsideLeftMiddle, label.OutsideLeftBottom, - label.OutsideRightTop, label.OutsideRightMiddle, label.OutsideRightBottom: - obj.Width -= labelWidth - } - switch position { - case label.OutsideLeftTop, label.OutsideLeftMiddle, label.OutsideLeftBottom: - obj.TopLeft.X += labelWidth - obj.ShiftDescendants(labelWidth, 0) - case label.InsideMiddleLeft: - if obj.IsContainer() || obj.Icon != nil { - obj.ShiftDescendants(labelWidth, 0) - } - } - } - } - hasIconAboveBelow := false - if obj.Icon != nil && obj.Shape.Value != d2target.ShapeImage { - position := label.Position(*obj.IconPosition) - if position.IsShapePosition() { - iconWidth := float64(d2target.MAX_ICON_SIZE + label.PADDING) - switch position { - case label.OutsideLeftTop, label.OutsideLeftMiddle, label.OutsideLeftBottom, - label.OutsideRightTop, label.OutsideRightMiddle, label.OutsideRightBottom: - obj.Width -= iconWidth - } - switch position { - case label.OutsideLeftTop, label.OutsideLeftMiddle, label.OutsideLeftBottom: - obj.TopLeft.X += iconWidth - obj.ShiftDescendants(iconWidth, 0) - case label.InsideMiddleLeft: - if obj.IsContainer() || obj.Icon != nil { - obj.ShiftDescendants(iconWidth, 0) - } - } - switch position { - case label.OutsideTopLeft, label.OutsideTopCenter, label.OutsideTopRight, - label.OutsideBottomLeft, label.OutsideBottomCenter, label.OutsideBottomRight: - hasIconAboveBelow = true - } - } - } - - // special handling to start/end connections below label - if true { - if obj.HasOutsideBottomLabel() || hasIconAboveBelow { - dy := float64(obj.LabelDimensions.Height) + label.PADDING - obj.Height -= dy - if obj.IsContainer() { - obj.ShiftDescendants(0, -dy/2) - } - } - } - - // remove the extra width/height we added for 3d/multiple after all objects/connections are placed - // and shift the shapes down accordingly - dx, dy := obj.GetModifierElementAdjustments() - if dx != 0 || dy != 0 { - obj.TopLeft.Y += dy - obj.ShiftDescendants(0, dy) - if !obj.IsContainer() { - obj.Width -= dx - obj.Height -= dy - } - } -} - func positionLabelsIcons(obj *d2graph.Object) { if obj.Icon != nil && obj.IconPosition == nil { if len(obj.ChildrenArray) > 0 { @@ -982,7 +707,7 @@ func positionLabelsIcons(obj *d2graph.Object) { } } -func getRanks(g *d2graph.Graph, isHorizontal bool) (ranks [][]*d2graph.Object, objectRanks map[*d2graph.Object]int) { +func getRanks(g *d2graph.Graph, isHorizontal bool) (ranks [][]*d2graph.Object, objectRanks, startingParentRanks, endingParentRanks map[*d2graph.Object]int) { alignedObjects := make(map[float64][]*d2graph.Object) for _, obj := range g.Objects { if !obj.IsContainer() { @@ -1012,16 +737,16 @@ func getRanks(g *d2graph.Graph, isHorizontal bool) (ranks [][]*d2graph.Object, o } ranks = append(ranks, alignedObjects[l]) } - for _, obj := range g.Objects { - if rank, has := objectRanks[obj]; has { - fmt.Printf("%v rank: %d\n", obj.AbsID(), rank) - } else { - fmt.Printf("%v rank: none\n", obj.AbsID()) - } - } + // for _, obj := range g.Objects { + // if rank, has := objectRanks[obj]; has { + // fmt.Printf("%v rank: %d\n", obj.AbsID(), rank) + // } else { + // fmt.Printf("%v rank: none\n", obj.AbsID()) + // } + // } - startingParentRanks := make(map[*d2graph.Object]int) - endingParentRanks := make(map[*d2graph.Object]int) + startingParentRanks = make(map[*d2graph.Object]int) + endingParentRanks = make(map[*d2graph.Object]int) for _, obj := range g.Objects { if obj.IsContainer() { continue @@ -1037,52 +762,554 @@ func getRanks(g *d2graph.Graph, isHorizontal bool) (ranks [][]*d2graph.Object, o } } } - for parent, start := range startingParentRanks { - fmt.Printf("parent %v start %v end %v\n", parent.AbsID(), start, endingParentRanks[parent]) - } + // for parent, start := range startingParentRanks { + // fmt.Printf("parent %v start %v end %v\n", parent.AbsID(), start, endingParentRanks[parent]) + // } - return ranks, objectRanks + return ranks, objectRanks, startingParentRanks, endingParentRanks } -func getPositions(ranks [][]*d2graph.Object, isHorizontal bool) (tops, centers, bottoms []float64) { - for _, objects := range ranks { - min := math.Inf(1) - max := math.Inf(-1) - for _, obj := range objects { - if isHorizontal { - min = math.Min(min, obj.TopLeft.X) - max = math.Max(max, obj.TopLeft.X+obj.Width) - } else { - min = math.Min(min, obj.TopLeft.Y) - max = math.Max(max, obj.TopLeft.Y+obj.Height) - } +func getRankRange(rank []*d2graph.Object, isHorizontal bool) (min, max float64) { + min = math.Inf(1) + max = math.Inf(-1) + for _, obj := range rank { + if isHorizontal { + min = math.Min(min, obj.TopLeft.X) + max = math.Max(max, obj.TopLeft.X+obj.Width) + } else { + min = math.Min(min, obj.TopLeft.Y) + max = math.Max(max, obj.TopLeft.Y+obj.Height) } - tops = append(tops, min) + } + return +} + +func getPositions(ranks [][]*d2graph.Object, isHorizontal bool) (starts, centers, ends []float64) { + for _, objects := range ranks { + min, max := getRankRange(objects, isHorizontal) + starts = append(starts, min) if isHorizontal { centers = append(centers, objects[0].TopLeft.X+objects[0].Width/2.) } else { centers = append(centers, objects[0].TopLeft.Y+objects[0].Height/2.) } - bottoms = append(bottoms, max) + ends = append(ends, max) } return } -// shift everything down by distance if it is at or below startY -func shiftDown(g *d2graph.Graph, startY, distance float64) { - for _, obj := range g.Objects { - if obj.TopLeft.Y < startY { - continue - } - obj.TopLeft.Y += distance - } - for _, edge := range g.Edges { - for _, p := range edge.Route { - // Note: == so incoming edge shifts down with object at startY - if p.Y <= startY { +// shift everything down by distance if it is at or below start position +func shiftDown(g *d2graph.Graph, start, distance float64, isHorizontal bool) { + if isHorizontal { + for _, obj := range g.Objects { + if obj.TopLeft.X < start { continue } - p.Y += distance + obj.TopLeft.X += distance + } + for _, edge := range g.Edges { + for _, p := range edge.Route { + // Note: == so incoming edge shifts down with object at startY + // +1 in case it is off by 1 + if p.X+1 <= start { + continue + } + p.X += distance + } + } + } else { + for _, obj := range g.Objects { + if obj.TopLeft.Y < start { + continue + } + obj.TopLeft.Y += distance + } + for _, edge := range g.Edges { + for _, p := range edge.Route { + // Note: == so incoming edge shifts down with object at startY + // +1 in case it is off by 1 + if p.Y+1 <= start { + continue + } + p.Y += distance + } + } + } +} + +// shift down everything that is below start +// shift all nodes that are reachable via an edge or being directly below a shifting node or expanding container +// expand containers to wrap shifted nodes +func shiftReachableDown(g *d2graph.Graph, obj *d2graph.Object, start, distance float64, isHorizontal, isMargin bool) { + fmt.Printf("shifting %v at %v by %v\n", obj.AbsID(), start, distance) + // if obj.ID == "s" || obj.ID == "k" || true { + // return + // } + q := []*d2graph.Object{obj} + + seen := make(map[*d2graph.Object]struct{}) + shifted := make(map[*d2graph.Object]struct{}) + shiftedEdges := make(map[*d2graph.Edge]struct{}) + queue := func(o *d2graph.Object) { + if _, in := seen[o]; in { + return + } + fmt.Printf("queue %v\n", o.AbsID()) + q = append(q, o) + } + + checkBelow := func(curr *d2graph.Object) { + fmt.Printf("checking below %v\n", curr.AbsID()) + currBottom := curr.TopLeft.Y + curr.Height + currRight := curr.TopLeft.X + curr.Width + // if object below is within this distance after shifting, also shift it + threshold := 100. + if isHorizontal { + originalRight := currRight + if _, in := shifted[curr]; in { + originalRight -= distance + } + for _, other := range g.Objects { + if other == curr || curr.IsDescendantOf(other) { + continue + } + // fmt.Printf("%#v && %#v original right %v currRight %v other left %v\n\t%v\n", curr.AbsID(), other.AbsID(), + // originalRight, currRight, other.TopLeft.X, + // other.TopLeft.X-originalRight, + // ) + if originalRight < other.TopLeft.X && + other.TopLeft.X < originalRight+distance+threshold && + curr.TopLeft.Y < other.TopLeft.Y+other.Height && + other.TopLeft.Y < currBottom { + queue(other) + } + } + } else { + originalBottom := currBottom + if _, in := shifted[curr]; in { + originalBottom -= distance + } + for _, other := range g.Objects { + if other == curr || curr.IsDescendantOf(other) { + continue + } + if originalBottom < other.TopLeft.Y && + other.TopLeft.Y < originalBottom+distance+threshold && + curr.TopLeft.X < other.TopLeft.X+other.Width && + other.TopLeft.X < currRight { + queue(other) + } + } + } + } + + processQueue := func() { + for len(q) > 0 { + curr := q[0] + q = q[1:] + if _, was := seen[curr]; was { + fmt.Printf("\twas seen %v\n", curr.AbsID()) + continue + } + // skip other objects behind start + if curr != obj { + if isHorizontal { + if curr.TopLeft.X < start { + continue + } + } else { + if curr.TopLeft.Y < start { + continue + } + } + } + + if isHorizontal { + shift := false + if !isMargin { + shift = start < curr.TopLeft.X + } else { + shift = start <= curr.TopLeft.X + } + + if shift { + curr.TopLeft.X += distance + fmt.Printf("\tshifted %v\n", curr.AbsID()) + shifted[curr] = struct{}{} + } + } else { + shift := false + if !isMargin { + shift = start < curr.TopLeft.Y + } else { + shift = start <= curr.TopLeft.Y + } + if shift { + curr.TopLeft.Y += distance + fmt.Printf("\tshifted %v\n", curr.AbsID()) + shifted[curr] = struct{}{} + } + } + seen[curr] = struct{}{} + + if curr.Parent != g.Root && !curr.IsDescendantOf(obj) { + queue(curr.Parent) + } + + for _, child := range curr.ChildrenArray { + queue(child) + } + + for _, e := range g.Edges { + if _, in := shiftedEdges[e]; in { + continue + } + if e.Src == curr && e.Dst == curr { + // shift the whole self-loop with object + if isHorizontal { + for _, p := range e.Route { + p.X += distance + } + } else { + for _, p := range e.Route { + p.Y += distance + } + } + shiftedEdges[e] = struct{}{} + fmt.Printf("\tshifted %v\n", e.AbsID()) + continue + } else if e.Src == curr { + queue(e.Dst) + if isHorizontal { + for _, p := range e.Route { + if start <= p.X { + p.X += distance + } + } + } else { + for _, p := range e.Route { + if start <= p.Y { + p.Y += distance + } + } + } + shiftedEdges[e] = struct{}{} + } else if e.Dst == curr { + queue(e.Src) + if isHorizontal { + for _, p := range e.Route { + if start <= p.X { + p.X += distance + } + } + } else { + for _, p := range e.Route { + if start <= p.Y { + p.Y += distance + } + } + } + shiftedEdges[e] = struct{}{} + } + } + + // check for nodes below that need to move from the shift + checkBelow(curr) + } + } + + processQueue() + + grown := make(map[*d2graph.Object]struct{}) + for o := range seen { + if o.Parent == g.Root { + continue + } + if _, in := shifted[o.Parent]; in { + continue + } + if _, in := grown[o.Parent]; in { + continue + } + + for parent := o.Parent; parent != g.Root; parent = parent.Parent { + if _, in := shifted[parent]; in { + break + } + if _, in := grown[parent]; in { + break + } + + if isHorizontal { + if parent.TopLeft.X < start { + parent.Width += distance + grown[parent] = struct{}{} + fmt.Printf("grow %v\n", parent.AbsID()) + + checkBelow(parent) + processQueue() + } + } else { + if parent.TopLeft.Y < start { + parent.Height += distance + grown[parent] = struct{}{} + fmt.Printf("grow %v\n", parent.AbsID()) + + checkBelow(parent) + processQueue() + } + } + + } + + } +} + +func adjustRankSpacing(g *d2graph.Graph, rankSep float64, isHorizontal bool) { + ranks, _, startingParentRanks, endingParentRanks := getRanks(g, isHorizontal) + starts, _, ends := getPositions(ranks, isHorizontal) + + // shifting bottom rank down first, then moving up to next rank + for rank := len(ranks) - 1; rank >= 0; rank-- { + objects := ranks[rank] + rankMin := starts[rank] + rankMax := ends[rank] + var topMargin, bottomMargin, leftMargin, rightMargin float64 + var topPadding, bottomPadding, leftPadding, rightPadding float64 + for _, obj := range objects { + margin, padding := getSpacing(obj) + + if isHorizontal { + // if this object isn't the widest in the rank, the actual margin for the rank may be smaller + // so we compute how much margin goes past the rankMin + rankMarginLeft := obj.TopLeft.X - rankMin + margin.left + rankMarginRight := obj.TopLeft.X + obj.Width + margin.right - rankMax + leftMargin = math.Max(leftMargin, rankMarginLeft) + rightMargin = math.Max(rightMargin, rankMarginRight) + + topMargin = math.Max(topMargin, margin.top) + bottomMargin = math.Max(bottomMargin, margin.bottom) + } else { + rankMarginTop := obj.TopLeft.Y - rankMin + margin.top + rankMarginBottom := obj.TopLeft.Y + obj.Height + margin.bottom - rankMax + topMargin = math.Max(topMargin, rankMarginTop) + bottomMargin = math.Max(bottomMargin, rankMarginBottom) + + leftMargin = math.Max(leftMargin, margin.left) + rightMargin = math.Max(rightMargin, margin.right) + } + + padTopDelta := padding.top - obj.Height/2. + padBottomDelta := padding.bottom - obj.Height/2. + padLeftDelta := padding.left - obj.Width/2. + padRightDelta := padding.right - obj.Width/2. + // if padTopDelta > 0 { + // obj.Height += padTopDelta + // } + // if padBottomDelta > 0 { + // obj.Height += padBottomDelta + // } + // if padLeftDelta > 0 { + // obj.Width += padLeftDelta + // } + // if padRightDelta > 0 { + // obj.Width += padRightDelta + // } + + topPadding = math.Max(topPadding, padTopDelta) + bottomPadding = math.Max(bottomPadding, padBottomDelta) + leftPadding = math.Max(leftPadding, padLeftDelta) + rightPadding = math.Max(rightPadding, padRightDelta) + } + + var startDelta, endDelta float64 + var startPaddingDelta, endPaddingDelta float64 + if isHorizontal { + startDelta = math.Max(0, MIN_MARGIN+leftMargin-rankSep/2.) + endDelta = math.Max(0, MIN_MARGIN+rightMargin-rankSep/2.) + + // startPaddingDelta = leftPadding + // endPaddingDelta = rightPadding + } else { + startDelta = math.Max(0, MIN_MARGIN+topMargin-rankSep/2.) + endDelta = math.Max(0, MIN_MARGIN+bottomMargin-rankSep/2.) + + // startPaddingDelta = topPadding + // endPaddingDelta = bottomPadding + } + + fmt.Printf("r%v start %v sp %v ep %v end %v\n", rank, startDelta, startPaddingDelta, endPaddingDelta, endDelta) + // +1 to not include edges at bottom + if endDelta > 0 { + shiftDown(g, ends[rank]+1, endDelta, isHorizontal) + } + // TODO each ancestor container of rank may need its own padding shift + if endPaddingDelta > 0 { + shiftDown(g, ends[rank]-endPaddingDelta, endPaddingDelta, isHorizontal) + } + if startPaddingDelta > 0 { + shiftDown(g, starts[rank]+startPaddingDelta, startPaddingDelta, isHorizontal) + } + if startDelta > 0 { + shiftDown(g, starts[rank], startDelta, isHorizontal) + } + + additionalStarts := make(map[float64]float64) + additionalEnds := make(map[float64]float64) + var startCoords, endCoords []float64 + for _, obj := range g.Objects { + if !obj.IsContainer() { + continue + } + start := startingParentRanks[obj] + end := endingParentRanks[obj] + if start != rank && end != rank { + continue + } + // check to see if container needs additional margin to parent + margin, _ := getSpacing(obj) + + addStart := func(k, v float64) { + if _, has := additionalStarts[k]; !has { + additionalStarts[k] = v + startCoords = append(startCoords, k) + } else { + additionalStarts[k] = math.Max(additionalStarts[k], v) + } + } + addEnd := func(k, v float64) { + if _, has := additionalEnds[k]; !has { + additionalEnds[k] = v + endCoords = append(endCoords, k) + } else { + additionalEnds[k] = math.Max(additionalEnds[k], v) + } + } + + if start == rank { + if isHorizontal && margin.left > 0 { + addStart(obj.TopLeft.X, margin.left) + } else if !isHorizontal && margin.top > 0 { + addStart(obj.TopLeft.Y, margin.top) + } + } + if end == rank { + if isHorizontal && margin.right > 0 { + addEnd(obj.TopLeft.X+obj.Width, margin.right) + } else if !isHorizontal && margin.bottom > 0 { + addEnd(obj.TopLeft.Y+obj.Height, margin.bottom) + } + } + } + // bottom up + sort.Slice(startCoords, func(i, j int) bool { + return startCoords[i] > startCoords[j] + }) + sort.Slice(endCoords, func(i, j int) bool { + return endCoords[i] > endCoords[j] + }) + for _, coord := range endCoords { + delta := MIN_MARGIN + additionalEnds[coord] - rankSep/2 + if delta <= 0 { + continue + } + for _, obj := range g.Objects { + if !obj.IsContainer() { + continue + } + start := startingParentRanks[obj] + end := endingParentRanks[obj] + if start <= rank && rank <= end { + // don't want to grow the container that is shifting + if isHorizontal && obj.TopLeft.X+obj.Width > coord { + obj.Width += delta + } else if !isHorizontal && obj.TopLeft.Y+obj.Height > coord { + obj.Height += delta + } + } + } + shiftDown(g, coord+delta, delta, isHorizontal) + } + for _, coord := range startCoords { + delta := MIN_MARGIN + additionalStarts[coord] - rankSep/2 + if delta <= 0 { + continue + } + for _, obj := range g.Objects { + if !obj.IsContainer() { + continue + } + start := startingParentRanks[obj] + end := endingParentRanks[obj] + // expand all containers that pass this rank, except the ones that are moving down to fit the icon + if start <= rank && rank <= end { + // expand the containers that contain the ones moving down + if isHorizontal && obj.TopLeft.X < coord { + obj.Width += delta + } else if !isHorizontal && obj.TopLeft.Y < coord { + obj.Height += delta + } + } + } + shiftDown(g, coord, delta, isHorizontal) + } + + // We need to expand parents when shifting descendants downwards + for _, obj := range g.Objects { + if !obj.IsContainer() { + continue + } + start := startingParentRanks[obj] + end := endingParentRanks[obj] + if start <= rank && rank <= end { + if isHorizontal { + obj.Width += startDelta + endDelta + startPaddingDelta + endPaddingDelta + } else { + obj.Height += startDelta + endDelta + startPaddingDelta + endPaddingDelta + } + } + } + } + +} + +func adjustSpacing(g *d2graph.Graph, rankSep float64, isHorizontal bool) { + adjustRankSpacing(g, rankSep, isHorizontal) + + // adjust cross-rank spacing + crossRankIsHorizontal := !isHorizontal + for _, obj := range g.Objects { + margin, padding := getSpacing(obj) + if isHorizontal { + if margin.bottom > 0 { + shiftReachableDown(g, obj, obj.TopLeft.Y+obj.Height, margin.bottom, crossRankIsHorizontal, true) + } + if padding.bottom > 0 { + shiftReachableDown(g, obj, obj.TopLeft.Y+obj.Height, padding.bottom, crossRankIsHorizontal, false) + obj.Height += padding.bottom + } + if margin.top > 0 { + shiftReachableDown(g, obj, obj.TopLeft.Y, margin.top, crossRankIsHorizontal, true) + } + if padding.top > 0 { + shiftReachableDown(g, obj, obj.TopLeft.Y, padding.top, crossRankIsHorizontal, false) + obj.Height += padding.top + } + } else { + if margin.right > 0 { + shiftReachableDown(g, obj, obj.TopLeft.X+obj.Width, margin.right, crossRankIsHorizontal, true) + } + if padding.right > 0 { + shiftReachableDown(g, obj, obj.TopLeft.X+obj.Width, padding.right, crossRankIsHorizontal, false) + obj.Width += padding.right + } + if margin.left > 0 { + shiftReachableDown(g, obj, obj.TopLeft.X, margin.left, crossRankIsHorizontal, true) + } + if padding.left > 0 { + shiftReachableDown(g, obj, obj.TopLeft.X, padding.left, crossRankIsHorizontal, false) + obj.Width += padding.left + } } } } diff --git a/e2etests/e2e_test.go b/e2etests/e2e_test.go index 64ea8bbfa..74bec7b16 100644 --- a/e2etests/e2e_test.go +++ b/e2etests/e2e_test.go @@ -208,6 +208,8 @@ func run(t *testing.T, tc testCase) { renderOpts := &d2svg.RenderOpts{ Pad: 0, ThemeID: tc.themeID, + // To compare deltas at a fixed scale + // Scale: go2.Pointer(1.), } if len(diagram.Layers) > 0 || len(diagram.Scenarios) > 0 || len(diagram.Steps) > 0 { masterID, err := diagram.HashID() From 14917b75318ac4469d2a1776f33cde8a7c13f28d Mon Sep 17 00:00:00 2001 From: Gavin Nishizawa Date: Tue, 11 Jul 2023 11:51:42 -0700 Subject: [PATCH 08/31] handle rank direction ending container padding --- d2layouts/d2dagrelayout/layout.go | 420 ++++++++++-------------------- 1 file changed, 140 insertions(+), 280 deletions(-) diff --git a/d2layouts/d2dagrelayout/layout.go b/d2layouts/d2dagrelayout/layout.go index 0bde93782..8a0bb230b 100644 --- a/d2layouts/d2dagrelayout/layout.go +++ b/d2layouts/d2dagrelayout/layout.go @@ -140,25 +140,11 @@ func Layout(ctx context.Context, g *d2graph.Graph, opts *ConfigurableOpts) (err loadScript := "" idToObj := make(map[string]*d2graph.Object) - idToWidth := make(map[string]float64) - idToHeight := make(map[string]float64) for _, obj := range g.Objects { id := obj.AbsID() idToObj[id] = obj - // Note: we handle vertical spacing adjustments separately after layout, - // but for horizontal adjustments we change the width we pass to dagre. - // For containers, we use phantom nodes to adjust container widths width, height := obj.Width, obj.Height - // if isHorizontal { - // height = adjustHeight(obj) - // idToHeight[id] = height - // } else { - // width = adjustWidth(obj) - // idToWidth[id] = width - // } - // TODO update to work with direction: right/left (in that case we need to adjust heights here, - // and horizontal spacing will be adjusted separately after layout loadScript += generateAddNodeLine(id, int(width), int(height)) if obj.Parent != g.Root { @@ -166,30 +152,6 @@ func Layout(ctx context.Context, g *d2graph.Graph, opts *ConfigurableOpts) (err } } - for _, obj := range g.Objects { - if !obj.IsContainer() || true { - continue - } - id := obj.AbsID() - phantomWidth, phantomHeight := 1, 1 - // when a container has nodes with no connections, the layout will be in a row - // adding a node will add NodeSep width in addition to the node's width - // to add a specific amount of space we need to subtract this from the desired width - // if we add the phantom node at rank 0 it should be at the far right and top - if isHorizontal { - heightDelta := int(math.Ceil(idToHeight[id] - obj.Height)) - phantomWidth = heightDelta - rootAttrs.NodeSep - } else { - widthDelta := int(math.Ceil(idToWidth[id] - obj.Width)) - phantomWidth = widthDelta - rootAttrs.NodeSep - } - - // add phantom children to adjust container widths - phantomID := id + "___phantom" - loadScript += generateAddNodeLine(phantomID, phantomWidth, phantomHeight) - loadScript += generateAddParentLine(phantomID, id) - } - for _, edge := range g.Edges { src, dst := getEdgeEndpoints(g, edge) @@ -301,10 +263,8 @@ func Layout(ctx context.Context, g *d2graph.Graph, opts *ConfigurableOpts) (err edge.Route = points } - adjustSpacing(g, float64(rootAttrs.ranksep), isHorizontal) - // for _, obj := range g.Objects { - // cleanupAdjustment(obj, isHorizontal) - // } + adjustRankSpacing(g, float64(rootAttrs.ranksep), isHorizontal) + adjustCrossRankSpacing(g, float64(rootAttrs.ranksep), !isHorizontal) for _, edge := range g.Edges { points := edge.Route @@ -615,7 +575,6 @@ type spacing struct { } func getSpacing(obj *d2graph.Object) (margin, padding spacing) { - // reserve spacing for labels if obj.HasLabel() { var position label.Position if obj.LabelPosition != nil { @@ -674,7 +633,6 @@ func getSpacing(obj *d2graph.Object) (margin, padding spacing) { } } - // reserve extra space for 3d/multiple by providing dagre the larger dimensions dx, dy := obj.GetModifierElementAdjustments() margin.right += dx margin.top += dy @@ -737,13 +695,6 @@ func getRanks(g *d2graph.Graph, isHorizontal bool) (ranks [][]*d2graph.Object, o } ranks = append(ranks, alignedObjects[l]) } - // for _, obj := range g.Objects { - // if rank, has := objectRanks[obj]; has { - // fmt.Printf("%v rank: %d\n", obj.AbsID(), rank) - // } else { - // fmt.Printf("%v rank: none\n", obj.AbsID()) - // } - // } startingParentRanks = make(map[*d2graph.Object]int) endingParentRanks = make(map[*d2graph.Object]int) @@ -762,9 +713,6 @@ func getRanks(g *d2graph.Graph, isHorizontal bool) (ranks [][]*d2graph.Object, o } } } - // for parent, start := range startingParentRanks { - // fmt.Printf("parent %v start %v end %v\n", parent.AbsID(), start, endingParentRanks[parent]) - // } return ranks, objectRanks, startingParentRanks, endingParentRanks } @@ -810,8 +758,7 @@ func shiftDown(g *d2graph.Graph, start, distance float64, isHorizontal bool) { for _, edge := range g.Edges { for _, p := range edge.Route { // Note: == so incoming edge shifts down with object at startY - // +1 in case it is off by 1 - if p.X+1 <= start { + if p.X <= start { continue } p.X += distance @@ -827,8 +774,7 @@ func shiftDown(g *d2graph.Graph, start, distance float64, isHorizontal bool) { for _, edge := range g.Edges { for _, p := range edge.Route { // Note: == so incoming edge shifts down with object at startY - // +1 in case it is off by 1 - if p.Y+1 <= start { + if p.Y <= start { continue } p.Y += distance @@ -841,10 +787,6 @@ func shiftDown(g *d2graph.Graph, start, distance float64, isHorizontal bool) { // shift all nodes that are reachable via an edge or being directly below a shifting node or expanding container // expand containers to wrap shifted nodes func shiftReachableDown(g *d2graph.Graph, obj *d2graph.Object, start, distance float64, isHorizontal, isMargin bool) { - fmt.Printf("shifting %v at %v by %v\n", obj.AbsID(), start, distance) - // if obj.ID == "s" || obj.ID == "k" || true { - // return - // } q := []*d2graph.Object{obj} seen := make(map[*d2graph.Object]struct{}) @@ -854,12 +796,10 @@ func shiftReachableDown(g *d2graph.Graph, obj *d2graph.Object, start, distance f if _, in := seen[o]; in { return } - fmt.Printf("queue %v\n", o.AbsID()) q = append(q, o) } checkBelow := func(curr *d2graph.Object) { - fmt.Printf("checking below %v\n", curr.AbsID()) currBottom := curr.TopLeft.Y + curr.Height currRight := curr.TopLeft.X + curr.Width // if object below is within this distance after shifting, also shift it @@ -873,10 +813,6 @@ func shiftReachableDown(g *d2graph.Graph, obj *d2graph.Object, start, distance f if other == curr || curr.IsDescendantOf(other) { continue } - // fmt.Printf("%#v && %#v original right %v currRight %v other left %v\n\t%v\n", curr.AbsID(), other.AbsID(), - // originalRight, currRight, other.TopLeft.X, - // other.TopLeft.X-originalRight, - // ) if originalRight < other.TopLeft.X && other.TopLeft.X < originalRight+distance+threshold && curr.TopLeft.Y < other.TopLeft.Y+other.Height && @@ -908,7 +844,6 @@ func shiftReachableDown(g *d2graph.Graph, obj *d2graph.Object, start, distance f curr := q[0] q = q[1:] if _, was := seen[curr]; was { - fmt.Printf("\twas seen %v\n", curr.AbsID()) continue } // skip other objects behind start @@ -934,7 +869,6 @@ func shiftReachableDown(g *d2graph.Graph, obj *d2graph.Object, start, distance f if shift { curr.TopLeft.X += distance - fmt.Printf("\tshifted %v\n", curr.AbsID()) shifted[curr] = struct{}{} } } else { @@ -946,7 +880,6 @@ func shiftReachableDown(g *d2graph.Graph, obj *d2graph.Object, start, distance f } if shift { curr.TopLeft.Y += distance - fmt.Printf("\tshifted %v\n", curr.AbsID()) shifted[curr] = struct{}{} } } @@ -965,7 +898,6 @@ func shiftReachableDown(g *d2graph.Graph, obj *d2graph.Object, start, distance f continue } if e.Src == curr && e.Dst == curr { - // shift the whole self-loop with object if isHorizontal { for _, p := range e.Route { p.X += distance @@ -976,7 +908,6 @@ func shiftReachableDown(g *d2graph.Graph, obj *d2graph.Object, start, distance f } } shiftedEdges[e] = struct{}{} - fmt.Printf("\tshifted %v\n", e.AbsID()) continue } else if e.Src == curr { queue(e.Dst) @@ -1044,7 +975,6 @@ func shiftReachableDown(g *d2graph.Graph, obj *d2graph.Object, start, distance f if parent.TopLeft.X < start { parent.Width += distance grown[parent] = struct{}{} - fmt.Printf("grow %v\n", parent.AbsID()) checkBelow(parent) processQueue() @@ -1053,261 +983,191 @@ func shiftReachableDown(g *d2graph.Graph, obj *d2graph.Object, start, distance f if parent.TopLeft.Y < start { parent.Height += distance grown[parent] = struct{}{} - fmt.Printf("grow %v\n", parent.AbsID()) checkBelow(parent) processQueue() } } - } - } } func adjustRankSpacing(g *d2graph.Graph, rankSep float64, isHorizontal bool) { - ranks, _, startingParentRanks, endingParentRanks := getRanks(g, isHorizontal) + ranks, objectRanks, startingParentRanks, endingParentRanks := getRanks(g, isHorizontal) starts, _, ends := getPositions(ranks, isHorizontal) // shifting bottom rank down first, then moving up to next rank for rank := len(ranks) - 1; rank >= 0; rank-- { - objects := ranks[rank] - rankMin := starts[rank] - rankMax := ends[rank] - var topMargin, bottomMargin, leftMargin, rightMargin float64 - var topPadding, bottomPadding, leftPadding, rightPadding float64 - for _, obj := range objects { - margin, padding := getSpacing(obj) - - if isHorizontal { - // if this object isn't the widest in the rank, the actual margin for the rank may be smaller - // so we compute how much margin goes past the rankMin - rankMarginLeft := obj.TopLeft.X - rankMin + margin.left - rankMarginRight := obj.TopLeft.X + obj.Width + margin.right - rankMax - leftMargin = math.Max(leftMargin, rankMarginLeft) - rightMargin = math.Max(rightMargin, rankMarginRight) - - topMargin = math.Max(topMargin, margin.top) - bottomMargin = math.Max(bottomMargin, margin.bottom) - } else { - rankMarginTop := obj.TopLeft.Y - rankMin + margin.top - rankMarginBottom := obj.TopLeft.Y + obj.Height + margin.bottom - rankMax - topMargin = math.Max(topMargin, rankMarginTop) - bottomMargin = math.Max(bottomMargin, rankMarginBottom) - - leftMargin = math.Max(leftMargin, margin.left) - rightMargin = math.Max(rightMargin, margin.right) - } - - padTopDelta := padding.top - obj.Height/2. - padBottomDelta := padding.bottom - obj.Height/2. - padLeftDelta := padding.left - obj.Width/2. - padRightDelta := padding.right - obj.Width/2. - // if padTopDelta > 0 { - // obj.Height += padTopDelta - // } - // if padBottomDelta > 0 { - // obj.Height += padBottomDelta - // } - // if padLeftDelta > 0 { - // obj.Width += padLeftDelta - // } - // if padRightDelta > 0 { - // obj.Width += padRightDelta - // } - - topPadding = math.Max(topPadding, padTopDelta) - bottomPadding = math.Max(bottomPadding, padBottomDelta) - leftPadding = math.Max(leftPadding, padLeftDelta) - rightPadding = math.Max(rightPadding, padRightDelta) - } - - var startDelta, endDelta float64 - var startPaddingDelta, endPaddingDelta float64 - if isHorizontal { - startDelta = math.Max(0, MIN_MARGIN+leftMargin-rankSep/2.) - endDelta = math.Max(0, MIN_MARGIN+rightMargin-rankSep/2.) - - // startPaddingDelta = leftPadding - // endPaddingDelta = rightPadding - } else { - startDelta = math.Max(0, MIN_MARGIN+topMargin-rankSep/2.) - endDelta = math.Max(0, MIN_MARGIN+bottomMargin-rankSep/2.) - - // startPaddingDelta = topPadding - // endPaddingDelta = bottomPadding - } - - fmt.Printf("r%v start %v sp %v ep %v end %v\n", rank, startDelta, startPaddingDelta, endPaddingDelta, endDelta) - // +1 to not include edges at bottom - if endDelta > 0 { - shiftDown(g, ends[rank]+1, endDelta, isHorizontal) - } - // TODO each ancestor container of rank may need its own padding shift - if endPaddingDelta > 0 { - shiftDown(g, ends[rank]-endPaddingDelta, endPaddingDelta, isHorizontal) - } - if startPaddingDelta > 0 { - shiftDown(g, starts[rank]+startPaddingDelta, startPaddingDelta, isHorizontal) - } - if startDelta > 0 { - shiftDown(g, starts[rank], startDelta, isHorizontal) - } - - additionalStarts := make(map[float64]float64) - additionalEnds := make(map[float64]float64) - var startCoords, endCoords []float64 - for _, obj := range g.Objects { - if !obj.IsContainer() { + var startingParents []*d2graph.Object + var endingParents []*d2graph.Object + for _, obj := range ranks[rank] { + if obj.Parent == g.Root { continue } - start := startingParentRanks[obj] - end := endingParentRanks[obj] - if start != rank && end != rank { - continue + if r, has := endingParentRanks[obj.Parent]; has && r == rank { + endingParents = append(endingParents, obj.Parent) } - // check to see if container needs additional margin to parent - margin, _ := getSpacing(obj) - - addStart := func(k, v float64) { - if _, has := additionalStarts[k]; !has { - additionalStarts[k] = v - startCoords = append(startCoords, k) - } else { - additionalStarts[k] = math.Max(additionalStarts[k], v) - } - } - addEnd := func(k, v float64) { - if _, has := additionalEnds[k]; !has { - additionalEnds[k] = v - endCoords = append(endCoords, k) - } else { - additionalEnds[k] = math.Max(additionalEnds[k], v) - } - } - - if start == rank { - if isHorizontal && margin.left > 0 { - addStart(obj.TopLeft.X, margin.left) - } else if !isHorizontal && margin.top > 0 { - addStart(obj.TopLeft.Y, margin.top) - } - } - if end == rank { - if isHorizontal && margin.right > 0 { - addEnd(obj.TopLeft.X+obj.Width, margin.right) - } else if !isHorizontal && margin.bottom > 0 { - addEnd(obj.TopLeft.Y+obj.Height, margin.bottom) - } + if r, has := startingParentRanks[obj.Parent]; has && r == rank { + startingParents = append(startingParents, obj.Parent) } } - // bottom up - sort.Slice(startCoords, func(i, j int) bool { - return startCoords[i] > startCoords[j] - }) - sort.Slice(endCoords, func(i, j int) bool { - return endCoords[i] > endCoords[j] - }) - for _, coord := range endCoords { - delta := MIN_MARGIN + additionalEnds[coord] - rankSep/2 - if delta <= 0 { - continue - } - for _, obj := range g.Objects { - if !obj.IsContainer() { - continue - } - start := startingParentRanks[obj] - end := endingParentRanks[obj] - if start <= rank && rank <= end { - // don't want to grow the container that is shifting - if isHorizontal && obj.TopLeft.X+obj.Width > coord { - obj.Width += delta - } else if !isHorizontal && obj.TopLeft.Y+obj.Height > coord { - obj.Height += delta - } - } - } - shiftDown(g, coord+delta, delta, isHorizontal) - } - for _, coord := range startCoords { - delta := MIN_MARGIN + additionalStarts[coord] - rankSep/2 - if delta <= 0 { - continue - } - for _, obj := range g.Objects { - if !obj.IsContainer() { - continue - } - start := startingParentRanks[obj] - end := endingParentRanks[obj] - // expand all containers that pass this rank, except the ones that are moving down to fit the icon - if start <= rank && rank <= end { - // expand the containers that contain the ones moving down - if isHorizontal && obj.TopLeft.X < coord { - obj.Width += delta - } else if !isHorizontal && obj.TopLeft.Y < coord { - obj.Height += delta - } - } - } - shiftDown(g, coord, delta, isHorizontal) - } - // We need to expand parents when shifting descendants downwards - for _, obj := range g.Objects { - if !obj.IsContainer() { - continue - } - start := startingParentRanks[obj] - end := endingParentRanks[obj] - if start <= rank && rank <= end { + var startingAncestorDeltas []float64 + for len(startingParents) > 0 { + var delta float64 + var ancestors []*d2graph.Object + for _, parent := range startingParents { + _, padding := getSpacing(parent) if isHorizontal { - obj.Width += startDelta + endDelta + startPaddingDelta + endPaddingDelta + delta = math.Max(delta, padding.left) } else { - obj.Height += startDelta + endDelta + startPaddingDelta + endPaddingDelta + delta = math.Max(delta, padding.top) } + for _, child := range parent.ChildrenArray { + if r, has := objectRanks[child]; has { + if r != rank { + continue + } + } else { + startingRank := startingParentRanks[child] + endingRank := endingParentRanks[child] + if startingRank != rank && endingRank != rank { + continue + } + } + margin, _ := getSpacing(child) + if isHorizontal { + delta = math.Max(delta, margin.left) + } else { + delta = math.Max(delta, margin.top) + } + } + if parent.Parent != g.Root { + ancestors = append(ancestors, parent.Parent) + } + } + + startingAncestorDeltas = append(startingAncestorDeltas, delta) + startingParents = ancestors + } + + var endingAncestorDeltas []float64 + for len(endingParents) > 0 { + var delta float64 + var ancestors []*d2graph.Object + for _, parent := range endingParents { + _, padding := getSpacing(parent) + if isHorizontal { + delta = math.Max(delta, padding.right) + } else { + delta = math.Max(delta, padding.bottom) + } + for _, child := range parent.ChildrenArray { + if r, has := objectRanks[child]; has { + if r != rank { + continue + } + } else { + startingRank := startingParentRanks[child] + endingRank := endingParentRanks[child] + if startingRank != rank && endingRank != rank { + continue + } + } + margin, _ := getSpacing(child) + if isHorizontal { + delta = math.Max(delta, margin.right) + } else { + delta = math.Max(delta, margin.bottom) + } + } + if parent.Parent != g.Root { + ancestors = append(ancestors, parent.Parent) + } + } + + endingAncestorDeltas = append(endingAncestorDeltas, delta) + endingParents = ancestors + } + for i := len(endingAncestorDeltas) - 1; i >= 0; i-- { + endDelta := math.Max(0, MIN_MARGIN+endingAncestorDeltas[i]-rankSep/2.) + if endDelta > 0 { + // each nested container adds rankSep/2. space in rank direction + // +1 to not include edges at bottom + position := ends[rank] + float64(i)*rankSep/2. + 1 + for _, obj := range g.Objects { + if !obj.IsContainer() { + continue + } + start := startingParentRanks[obj] + end := endingParentRanks[obj] + if start <= rank && rank <= end { + if isHorizontal && obj.TopLeft.X+obj.Width > position { + obj.Width += endDelta + } else if !isHorizontal && obj.TopLeft.Y+obj.Height > position { + obj.Height += endDelta + } + } + } + shiftDown(g, position, endDelta, isHorizontal) + } + } + for i := 0; i < len(startingAncestorDeltas); i++ { + startDelta := math.Max(0, MIN_MARGIN+startingAncestorDeltas[i]-rankSep/2.) + if startDelta > 0 { + // each nested container adds rankSep/2. space in rank direction + position := starts[rank] - float64(i)*rankSep/2. + for _, obj := range g.Objects { + if !obj.IsContainer() { + continue + } + start := startingParentRanks[obj] + end := endingParentRanks[obj] + if start <= rank && rank <= end { + if isHorizontal && obj.TopLeft.X < position { + obj.Width += startDelta + } else if !isHorizontal && obj.TopLeft.Y < position { + obj.Height += startDelta + } + } + } + shiftDown(g, position, startDelta, isHorizontal) } } } - } -func adjustSpacing(g *d2graph.Graph, rankSep float64, isHorizontal bool) { - adjustRankSpacing(g, rankSep, isHorizontal) - - // adjust cross-rank spacing - crossRankIsHorizontal := !isHorizontal +func adjustCrossRankSpacing(g *d2graph.Graph, rankSep float64, isHorizontal bool) { for _, obj := range g.Objects { margin, padding := getSpacing(obj) - if isHorizontal { + if !isHorizontal { if margin.bottom > 0 { - shiftReachableDown(g, obj, obj.TopLeft.Y+obj.Height, margin.bottom, crossRankIsHorizontal, true) + shiftReachableDown(g, obj, obj.TopLeft.Y+obj.Height, margin.bottom, isHorizontal, true) } if padding.bottom > 0 { - shiftReachableDown(g, obj, obj.TopLeft.Y+obj.Height, padding.bottom, crossRankIsHorizontal, false) + shiftReachableDown(g, obj, obj.TopLeft.Y+obj.Height, padding.bottom, isHorizontal, false) obj.Height += padding.bottom } if margin.top > 0 { - shiftReachableDown(g, obj, obj.TopLeft.Y, margin.top, crossRankIsHorizontal, true) + shiftReachableDown(g, obj, obj.TopLeft.Y, margin.top, isHorizontal, true) } if padding.top > 0 { - shiftReachableDown(g, obj, obj.TopLeft.Y, padding.top, crossRankIsHorizontal, false) + shiftReachableDown(g, obj, obj.TopLeft.Y, padding.top, isHorizontal, false) obj.Height += padding.top } } else { if margin.right > 0 { - shiftReachableDown(g, obj, obj.TopLeft.X+obj.Width, margin.right, crossRankIsHorizontal, true) + shiftReachableDown(g, obj, obj.TopLeft.X+obj.Width, margin.right, isHorizontal, true) } if padding.right > 0 { - shiftReachableDown(g, obj, obj.TopLeft.X+obj.Width, padding.right, crossRankIsHorizontal, false) + shiftReachableDown(g, obj, obj.TopLeft.X+obj.Width, padding.right, isHorizontal, false) obj.Width += padding.right } if margin.left > 0 { - shiftReachableDown(g, obj, obj.TopLeft.X, margin.left, crossRankIsHorizontal, true) + shiftReachableDown(g, obj, obj.TopLeft.X, margin.left, isHorizontal, true) } if padding.left > 0 { - shiftReachableDown(g, obj, obj.TopLeft.X, padding.left, crossRankIsHorizontal, false) + shiftReachableDown(g, obj, obj.TopLeft.X, padding.left, isHorizontal, false) obj.Width += padding.left } } From f4854bf43d12a0d30940735799c91af1f3737501 Mon Sep 17 00:00:00 2001 From: Gavin Nishizawa Date: Tue, 11 Jul 2023 14:14:47 -0700 Subject: [PATCH 09/31] fix 3d/multiple --- d2graph/layout.go | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/d2graph/layout.go b/d2graph/layout.go index 60f3bdcca..c919c841a 100644 --- a/d2graph/layout.go +++ b/d2graph/layout.go @@ -320,6 +320,7 @@ func (edge *Edge) TraceToShape(points []*geo.Point, startIndex, endIndex int) (n srcShape := edge.Src.ToShape() dstShape := edge.Dst.ToShape() + startingSegment := geo.Segment{Start: points[startIndex+1], End: points[startIndex]} // if an edge runs into an outside label, stop the edge at the label instead overlapsOutsideLabel := false if edge.Src.HasLabel() { @@ -330,7 +331,6 @@ func (edge *Edge) TraceToShape(points []*geo.Point, startIndex, endIndex int) (n labelHeight := float64(edge.Src.LabelDimensions.Height) labelTL := labelPosition.GetPointOnBox(edge.Src.Box, label.PADDING, labelWidth, labelHeight) - startingSegment := geo.Segment{Start: points[startIndex+1], End: points[startIndex]} labelBox := geo.NewBox(labelTL, labelWidth, labelHeight) // add left/right padding to box labelBox.TopLeft.X -= label.PADDING @@ -349,9 +349,20 @@ func (edge *Edge) TraceToShape(points []*geo.Point, startIndex, endIndex int) (n } } if !overlapsOutsideLabel { + if intersections := edge.Src.Intersections(startingSegment); len(intersections) > 0 { + // move starting segment to intersection point + points[startIndex] = intersections[0] + startingSegment.End = intersections[0] + // if the segment becomes too short, just merge it with the next segment + if startIndex < len(points) && startingSegment.Length() < MIN_SEGMENT_LEN { + points[startIndex+1] = points[startIndex] + startIndex++ + } + } // trace the edge to the specific shape's border points[startIndex] = shape.TraceToShapeBorder(srcShape, points[startIndex], points[startIndex+1]) } + endingSegment := geo.Segment{Start: points[endIndex-1], End: points[endIndex]} overlapsOutsideLabel = false if edge.Dst.HasLabel() { // assumes LabelPosition, LabelWidth, LabelHeight are all set if there is a label @@ -361,7 +372,6 @@ func (edge *Edge) TraceToShape(points []*geo.Point, startIndex, endIndex int) (n labelHeight := float64(edge.Dst.LabelDimensions.Height) labelTL := labelPosition.GetPointOnBox(edge.Dst.Box, label.PADDING, labelWidth, labelHeight) - endingSegment := geo.Segment{Start: points[endIndex-1], End: points[endIndex]} labelBox := geo.NewBox(labelTL, labelWidth, labelHeight) // add left/right padding to box labelBox.TopLeft.X -= label.PADDING @@ -380,6 +390,16 @@ func (edge *Edge) TraceToShape(points []*geo.Point, startIndex, endIndex int) (n } } if !overlapsOutsideLabel { + if intersections := edge.Dst.Intersections(endingSegment); len(intersections) > 0 { + // move ending segment to intersection point + points[endIndex] = intersections[0] + endingSegment.End = intersections[0] + // if the segment becomes too short, just merge it with the previous segment + if endIndex-1 > 0 && endingSegment.Length() < MIN_SEGMENT_LEN { + points[endIndex-1] = points[endIndex] + endIndex-- + } + } points[endIndex] = shape.TraceToShapeBorder(dstShape, points[endIndex], points[endIndex-1]) } return startIndex, endIndex From d25d1a3bf0d2c97dd46ab240cea1096cca26fc8a Mon Sep 17 00:00:00 2001 From: Gavin Nishizawa Date: Tue, 11 Jul 2023 16:06:42 -0700 Subject: [PATCH 10/31] deduplicate cross rank margin adjustments --- d2layouts/d2dagrelayout/layout.go | 93 ++++++++++++++++++++++++++++--- 1 file changed, 86 insertions(+), 7 deletions(-) diff --git a/d2layouts/d2dagrelayout/layout.go b/d2layouts/d2dagrelayout/layout.go index 8a0bb230b..620026d2d 100644 --- a/d2layouts/d2dagrelayout/layout.go +++ b/d2layouts/d2dagrelayout/layout.go @@ -786,7 +786,7 @@ func shiftDown(g *d2graph.Graph, start, distance float64, isHorizontal bool) { // shift down everything that is below start // shift all nodes that are reachable via an edge or being directly below a shifting node or expanding container // expand containers to wrap shifted nodes -func shiftReachableDown(g *d2graph.Graph, obj *d2graph.Object, start, distance float64, isHorizontal, isMargin bool) { +func shiftReachableDown(g *d2graph.Graph, obj *d2graph.Object, start, distance float64, isHorizontal, isMargin bool) map[*d2graph.Object]struct{} { q := []*d2graph.Object{obj} seen := make(map[*d2graph.Object]struct{}) @@ -799,11 +799,11 @@ func shiftReachableDown(g *d2graph.Graph, obj *d2graph.Object, start, distance f q = append(q, o) } + // if object below is within this distance after shifting, also shift it + threshold := 100. checkBelow := func(curr *d2graph.Object) { currBottom := curr.TopLeft.Y + curr.Height currRight := curr.TopLeft.X + curr.Width - // if object below is within this distance after shifting, also shift it - threshold := 100. if isHorizontal { originalRight := currRight if _, in := shifted[curr]; in { @@ -990,6 +990,53 @@ func shiftReachableDown(g *d2graph.Graph, obj *d2graph.Object, start, distance f } } } + + increasedMargins := make(map[*d2graph.Object]struct{}) + shiftedObjects := make([]*d2graph.Object, 0, len(shifted)) + for obj := range shifted { + shiftedObjects = append(shiftedObjects, obj) + } + for _, shifted := range shiftedObjects { + counts := true + // check if any other shifted is directly above + for _, other := range shiftedObjects { + if other == shifted || shifted.IsDescendantOf(other) { + continue + } + if isHorizontal { + if other.TopLeft.Y+other.Height < shifted.TopLeft.Y || + shifted.TopLeft.Y+shifted.Height < other.TopLeft.Y { + // doesn't line up vertically + continue + } + + // above and within threshold + if other.TopLeft.X+other.Width < shifted.TopLeft.X && + shifted.TopLeft.X < other.TopLeft.X+other.Width+threshold { + counts = false + break + } + } else { + if other.TopLeft.X+other.Width < shifted.TopLeft.X || + shifted.TopLeft.X+shifted.Width < other.TopLeft.X { + // doesn't line up horizontally + continue + } + + // above and within threshold + if other.TopLeft.Y+other.Height < shifted.TopLeft.Y && + shifted.TopLeft.Y < other.TopLeft.Y+other.Height+threshold { + counts = false + break + } + } + } + if counts { + increasedMargins[shifted] = struct{}{} + } + } + + return increasedMargins } func adjustRankSpacing(g *d2graph.Graph, rankSep float64, isHorizontal bool) { @@ -1138,33 +1185,65 @@ func adjustRankSpacing(g *d2graph.Graph, rankSep float64, isHorizontal bool) { } func adjustCrossRankSpacing(g *d2graph.Graph, rankSep float64, isHorizontal bool) { + var prevMarginTop, prevMarginBottom, prevMarginLeft, prevMarginRight map[*d2graph.Object]float64 + if isHorizontal { + prevMarginLeft = make(map[*d2graph.Object]float64) + prevMarginRight = make(map[*d2graph.Object]float64) + } else { + prevMarginTop = make(map[*d2graph.Object]float64) + prevMarginBottom = make(map[*d2graph.Object]float64) + } for _, obj := range g.Objects { margin, padding := getSpacing(obj) if !isHorizontal { + if prevShift, has := prevMarginBottom[obj]; has { + margin.bottom -= prevShift + } if margin.bottom > 0 { - shiftReachableDown(g, obj, obj.TopLeft.Y+obj.Height, margin.bottom, isHorizontal, true) + increased := shiftReachableDown(g, obj, obj.TopLeft.Y+obj.Height, margin.bottom, isHorizontal, true) + for o := range increased { + prevMarginBottom[o] = math.Max(prevMarginBottom[o], margin.bottom) + } } if padding.bottom > 0 { shiftReachableDown(g, obj, obj.TopLeft.Y+obj.Height, padding.bottom, isHorizontal, false) obj.Height += padding.bottom } + if prevShift, has := prevMarginTop[obj]; has { + margin.top -= prevShift + } if margin.top > 0 { - shiftReachableDown(g, obj, obj.TopLeft.Y, margin.top, isHorizontal, true) + increased := shiftReachableDown(g, obj, obj.TopLeft.Y, margin.top, isHorizontal, true) + for o := range increased { + prevMarginTop[o] = math.Max(prevMarginTop[o], margin.top) + } } if padding.top > 0 { shiftReachableDown(g, obj, obj.TopLeft.Y, padding.top, isHorizontal, false) obj.Height += padding.top } } else { + if prevShift, has := prevMarginRight[obj]; has { + margin.right -= prevShift + } if margin.right > 0 { - shiftReachableDown(g, obj, obj.TopLeft.X+obj.Width, margin.right, isHorizontal, true) + increased := shiftReachableDown(g, obj, obj.TopLeft.X+obj.Width, margin.right, isHorizontal, true) + for o := range increased { + prevMarginRight[o] = math.Max(prevMarginRight[o], margin.right) + } } if padding.right > 0 { shiftReachableDown(g, obj, obj.TopLeft.X+obj.Width, padding.right, isHorizontal, false) obj.Width += padding.right } + if prevShift, has := prevMarginLeft[obj]; has { + margin.left -= prevShift + } if margin.left > 0 { - shiftReachableDown(g, obj, obj.TopLeft.X, margin.left, isHorizontal, true) + increased := shiftReachableDown(g, obj, obj.TopLeft.X, margin.left, isHorizontal, true) + for o := range increased { + prevMarginLeft[o] = math.Max(prevMarginLeft[o], margin.left) + } } if padding.left > 0 { shiftReachableDown(g, obj, obj.TopLeft.X, padding.left, isHorizontal, false) From b6795e65e127af3e50af1f520f08b4c021986693 Mon Sep 17 00:00:00 2001 From: Gavin Nishizawa Date: Tue, 11 Jul 2023 16:30:16 -0700 Subject: [PATCH 11/31] fixes --- d2graph/layout.go | 4 +- d2layouts/d2dagrelayout/layout.go | 161 ++++++++++++++++-------------- 2 files changed, 90 insertions(+), 75 deletions(-) diff --git a/d2graph/layout.go b/d2graph/layout.go index c919c841a..a93b3a61a 100644 --- a/d2graph/layout.go +++ b/d2graph/layout.go @@ -341,7 +341,7 @@ func (edge *Edge) TraceToShape(points []*geo.Point, startIndex, endIndex int) (n points[startIndex] = intersections[0] startingSegment.End = intersections[0] // if the segment becomes too short, just merge it with the next segment - if startIndex < len(points) && startingSegment.Length() < MIN_SEGMENT_LEN { + if startIndex+1 < len(points)-1 && startingSegment.Length() < MIN_SEGMENT_LEN { points[startIndex+1] = points[startIndex] startIndex++ } @@ -354,7 +354,7 @@ func (edge *Edge) TraceToShape(points []*geo.Point, startIndex, endIndex int) (n points[startIndex] = intersections[0] startingSegment.End = intersections[0] // if the segment becomes too short, just merge it with the next segment - if startIndex < len(points) && startingSegment.Length() < MIN_SEGMENT_LEN { + if startIndex+1 < len(points)-1 && startingSegment.Length() < MIN_SEGMENT_LEN { points[startIndex+1] = points[startIndex] startIndex++ } diff --git a/d2layouts/d2dagrelayout/layout.go b/d2layouts/d2dagrelayout/layout.go index 620026d2d..f2539ccf6 100644 --- a/d2layouts/d2dagrelayout/layout.go +++ b/d2layouts/d2dagrelayout/layout.go @@ -670,10 +670,10 @@ func getRanks(g *d2graph.Graph, isHorizontal bool) (ranks [][]*d2graph.Object, o for _, obj := range g.Objects { if !obj.IsContainer() { if !isHorizontal { - y := obj.TopLeft.Y + obj.Height/2 + y := math.Ceil(obj.TopLeft.Y + obj.Height/2) alignedObjects[y] = append(alignedObjects[y], obj) } else { - x := obj.TopLeft.X + obj.Width/2 + x := math.Ceil(obj.TopLeft.X + obj.Width/2) alignedObjects[x] = append(alignedObjects[x], obj) } } @@ -717,35 +717,6 @@ func getRanks(g *d2graph.Graph, isHorizontal bool) (ranks [][]*d2graph.Object, o return ranks, objectRanks, startingParentRanks, endingParentRanks } -func getRankRange(rank []*d2graph.Object, isHorizontal bool) (min, max float64) { - min = math.Inf(1) - max = math.Inf(-1) - for _, obj := range rank { - if isHorizontal { - min = math.Min(min, obj.TopLeft.X) - max = math.Max(max, obj.TopLeft.X+obj.Width) - } else { - min = math.Min(min, obj.TopLeft.Y) - max = math.Max(max, obj.TopLeft.Y+obj.Height) - } - } - return -} - -func getPositions(ranks [][]*d2graph.Object, isHorizontal bool) (starts, centers, ends []float64) { - for _, objects := range ranks { - min, max := getRankRange(objects, isHorizontal) - starts = append(starts, min) - if isHorizontal { - centers = append(centers, objects[0].TopLeft.X+objects[0].Width/2.) - } else { - centers = append(centers, objects[0].TopLeft.Y+objects[0].Height/2.) - } - ends = append(ends, max) - } - return -} - // shift everything down by distance if it is at or below start position func shiftDown(g *d2graph.Graph, start, distance float64, isHorizontal bool) { if isHorizontal { @@ -992,47 +963,50 @@ func shiftReachableDown(g *d2graph.Graph, obj *d2graph.Object, start, distance f } increasedMargins := make(map[*d2graph.Object]struct{}) - shiftedObjects := make([]*d2graph.Object, 0, len(shifted)) + movedObjects := make([]*d2graph.Object, 0, len(shifted)) for obj := range shifted { - shiftedObjects = append(shiftedObjects, obj) + movedObjects = append(movedObjects, obj) } - for _, shifted := range shiftedObjects { + for obj := range grown { + movedObjects = append(movedObjects, obj) + } + for _, moved := range movedObjects { counts := true // check if any other shifted is directly above - for _, other := range shiftedObjects { - if other == shifted || shifted.IsDescendantOf(other) { + for _, other := range movedObjects { + if other == moved { continue } if isHorizontal { - if other.TopLeft.Y+other.Height < shifted.TopLeft.Y || - shifted.TopLeft.Y+shifted.Height < other.TopLeft.Y { + if other.TopLeft.Y+other.Height < moved.TopLeft.Y || + moved.TopLeft.Y+moved.Height < other.TopLeft.Y { // doesn't line up vertically continue } // above and within threshold - if other.TopLeft.X+other.Width < shifted.TopLeft.X && - shifted.TopLeft.X < other.TopLeft.X+other.Width+threshold { + if other.TopLeft.X < moved.TopLeft.X && + moved.TopLeft.X < other.TopLeft.X+other.Width+threshold { counts = false break } } else { - if other.TopLeft.X+other.Width < shifted.TopLeft.X || - shifted.TopLeft.X+shifted.Width < other.TopLeft.X { + if other.TopLeft.X+other.Width < moved.TopLeft.X || + moved.TopLeft.X+moved.Width < other.TopLeft.X { // doesn't line up horizontally continue } // above and within threshold - if other.TopLeft.Y+other.Height < shifted.TopLeft.Y && - shifted.TopLeft.Y < other.TopLeft.Y+other.Height+threshold { + if other.TopLeft.Y < moved.TopLeft.Y && + moved.TopLeft.Y < other.TopLeft.Y+other.Height+threshold { counts = false break } } } if counts { - increasedMargins[shifted] = struct{}{} + increasedMargins[moved] = struct{}{} } } @@ -1041,7 +1015,6 @@ func shiftReachableDown(g *d2graph.Graph, obj *d2graph.Object, start, distance f func adjustRankSpacing(g *d2graph.Graph, rankSep float64, isHorizontal bool) { ranks, objectRanks, startingParentRanks, endingParentRanks := getRanks(g, isHorizontal) - starts, _, ends := getPositions(ranks, isHorizontal) // shifting bottom rank down first, then moving up to next rank for rank := len(ranks) - 1; rank >= 0; rank-- { @@ -1059,16 +1032,18 @@ func adjustRankSpacing(g *d2graph.Graph, rankSep float64, isHorizontal bool) { } } - var startingAncestorDeltas []float64 + startingAncestorPositions := make(map[*d2graph.Object]float64) for len(startingParents) > 0 { - var delta float64 var ancestors []*d2graph.Object for _, parent := range startingParents { _, padding := getSpacing(parent) + if _, has := startingAncestorPositions[parent]; !has { + startingAncestorPositions[parent] = math.Inf(1) + } if isHorizontal { - delta = math.Max(delta, padding.left) + startingAncestorPositions[parent] = math.Min(startingAncestorPositions[parent], parent.TopLeft.X+rankSep/2.-MIN_MARGIN-padding.left) } else { - delta = math.Max(delta, padding.top) + startingAncestorPositions[parent] = math.Min(startingAncestorPositions[parent], parent.TopLeft.Y+rankSep/2.-MIN_MARGIN-padding.top) } for _, child := range parent.ChildrenArray { if r, has := objectRanks[child]; has { @@ -1084,30 +1059,33 @@ func adjustRankSpacing(g *d2graph.Graph, rankSep float64, isHorizontal bool) { } margin, _ := getSpacing(child) if isHorizontal { - delta = math.Max(delta, margin.left) + startingAncestorPositions[parent] = math.Min(startingAncestorPositions[parent], child.TopLeft.X-margin.left-MIN_MARGIN) } else { - delta = math.Max(delta, margin.top) + startingAncestorPositions[parent] = math.Min(startingAncestorPositions[parent], child.TopLeft.Y-margin.top-MIN_MARGIN) } } if parent.Parent != g.Root { ancestors = append(ancestors, parent.Parent) } } - - startingAncestorDeltas = append(startingAncestorDeltas, delta) startingParents = ancestors } - var endingAncestorDeltas []float64 + endingAncestorPositions := make(map[*d2graph.Object]float64) for len(endingParents) > 0 { - var delta float64 + delta := 0. var ancestors []*d2graph.Object for _, parent := range endingParents { _, padding := getSpacing(parent) + if _, has := endingAncestorPositions[parent]; !has { + endingAncestorPositions[parent] = math.Inf(-1) + } if isHorizontal { delta = math.Max(delta, padding.right) + endingAncestorPositions[parent] = math.Max(endingAncestorPositions[parent], parent.TopLeft.X+parent.Width-rankSep/2+MIN_MARGIN+padding.right) } else { delta = math.Max(delta, padding.bottom) + endingAncestorPositions[parent] = math.Max(endingAncestorPositions[parent], parent.TopLeft.Y+parent.Height-rankSep/2+MIN_MARGIN+padding.bottom) } for _, child := range parent.ChildrenArray { if r, has := objectRanks[child]; has { @@ -1124,24 +1102,42 @@ func adjustRankSpacing(g *d2graph.Graph, rankSep float64, isHorizontal bool) { margin, _ := getSpacing(child) if isHorizontal { delta = math.Max(delta, margin.right) + endingAncestorPositions[parent] = math.Max(endingAncestorPositions[parent], child.TopLeft.X+child.Width+margin.right+MIN_MARGIN) } else { delta = math.Max(delta, margin.bottom) + endingAncestorPositions[parent] = math.Max(endingAncestorPositions[parent], child.TopLeft.Y+child.Height+margin.bottom+MIN_MARGIN) } } if parent.Parent != g.Root { ancestors = append(ancestors, parent.Parent) } } - - endingAncestorDeltas = append(endingAncestorDeltas, delta) endingParents = ancestors } - for i := len(endingAncestorDeltas) - 1; i >= 0; i-- { - endDelta := math.Max(0, MIN_MARGIN+endingAncestorDeltas[i]-rankSep/2.) + + endingAncestorPositionOrder := make([]*d2graph.Object, 0, len(endingAncestorPositions)) + for ancestor := range endingAncestorPositions { + endingAncestorPositionOrder = append(endingAncestorPositionOrder, ancestor) + } + // adjust rank ancestors bottom-up + sort.Slice(endingAncestorPositionOrder, func(i, j int) bool { + return endingAncestorPositions[endingAncestorPositionOrder[i]] > endingAncestorPositions[endingAncestorPositionOrder[j]] + }) + + for _, ancestor := range endingAncestorPositionOrder { + var endDelta float64 + if isHorizontal { + endDelta = endingAncestorPositions[ancestor] - (ancestor.TopLeft.X + ancestor.Width) + } else { + endDelta = endingAncestorPositions[ancestor] - (ancestor.TopLeft.Y + ancestor.Height) + } if endDelta > 0 { - // each nested container adds rankSep/2. space in rank direction - // +1 to not include edges at bottom - position := ends[rank] + float64(i)*rankSep/2. + 1 + var position float64 + if isHorizontal { + position = ancestor.TopLeft.X + ancestor.Width - 1 + } else { + position = ancestor.TopLeft.Y + ancestor.Height - 1 + } for _, obj := range g.Objects { if !obj.IsContainer() { continue @@ -1159,11 +1155,30 @@ func adjustRankSpacing(g *d2graph.Graph, rankSep float64, isHorizontal bool) { shiftDown(g, position, endDelta, isHorizontal) } } - for i := 0; i < len(startingAncestorDeltas); i++ { - startDelta := math.Max(0, MIN_MARGIN+startingAncestorDeltas[i]-rankSep/2.) - if startDelta > 0 { - // each nested container adds rankSep/2. space in rank direction - position := starts[rank] - float64(i)*rankSep/2. + + startingAncestorPositionOrder := make([]*d2graph.Object, 0, len(startingAncestorPositions)) + for ancestor := range startingAncestorPositions { + startingAncestorPositionOrder = append(startingAncestorPositionOrder, ancestor) + } + // adjust rank ancestors bottom-up + sort.Slice(startingAncestorPositionOrder, func(i, j int) bool { + return startingAncestorPositions[startingAncestorPositionOrder[i]] > startingAncestorPositions[startingAncestorPositionOrder[j]] + }) + + for _, ancestor := range startingAncestorPositionOrder { + var endDelta float64 + if isHorizontal { + endDelta = ancestor.TopLeft.X - startingAncestorPositions[ancestor] + } else { + endDelta = ancestor.TopLeft.Y - startingAncestorPositions[ancestor] + } + if endDelta > 0 { + var position float64 + if isHorizontal { + position = ancestor.TopLeft.X + 1 + } else { + position = ancestor.TopLeft.Y + 1 + } for _, obj := range g.Objects { if !obj.IsContainer() { continue @@ -1171,14 +1186,14 @@ func adjustRankSpacing(g *d2graph.Graph, rankSep float64, isHorizontal bool) { start := startingParentRanks[obj] end := endingParentRanks[obj] if start <= rank && rank <= end { - if isHorizontal && obj.TopLeft.X < position { - obj.Width += startDelta - } else if !isHorizontal && obj.TopLeft.Y < position { - obj.Height += startDelta + if isHorizontal && obj.TopLeft.X+obj.Width > position { + obj.Width += endDelta + } else if !isHorizontal && obj.TopLeft.Y+obj.Height > position { + obj.Height += endDelta } } } - shiftDown(g, position, startDelta, isHorizontal) + shiftDown(g, position, endDelta, isHorizontal) } } } From 2c5c39531598d1a413089199f689c49ca777c2ae Mon Sep 17 00:00:00 2001 From: Gavin Nishizawa Date: Wed, 12 Jul 2023 14:21:51 -0700 Subject: [PATCH 12/31] handle merging multiple different child margins and container padding in rank direction --- d2layouts/d2dagrelayout/layout.go | 178 ++++++++++++++++++------------ 1 file changed, 107 insertions(+), 71 deletions(-) diff --git a/d2layouts/d2dagrelayout/layout.go b/d2layouts/d2dagrelayout/layout.go index f2539ccf6..cea99951f 100644 --- a/d2layouts/d2dagrelayout/layout.go +++ b/d2layouts/d2dagrelayout/layout.go @@ -754,6 +754,42 @@ func shiftDown(g *d2graph.Graph, start, distance float64, isHorizontal bool) { } } +func shiftUp(g *d2graph.Graph, start, distance float64, isHorizontal bool) { + if isHorizontal { + for _, obj := range g.Objects { + if start < obj.TopLeft.X { + continue + } + obj.TopLeft.X -= distance + } + for _, edge := range g.Edges { + for _, p := range edge.Route { + // Note: == so incoming edge shifts down with object at startY + if start <= p.X { + continue + } + p.X -= distance + } + } + } else { + for _, obj := range g.Objects { + if start < obj.TopLeft.Y { + continue + } + obj.TopLeft.Y -= distance + } + for _, edge := range g.Edges { + for _, p := range edge.Route { + // Note: == so incoming edge shifts down with object at startY + if start <= p.Y { + continue + } + p.Y -= distance + } + } + } +} + // shift down everything that is below start // shift all nodes that are reachable via an edge or being directly below a shifting node or expanding container // expand containers to wrap shifted nodes @@ -1040,11 +1076,15 @@ func adjustRankSpacing(g *d2graph.Graph, rankSep float64, isHorizontal bool) { if _, has := startingAncestorPositions[parent]; !has { startingAncestorPositions[parent] = math.Inf(1) } + var startPosition float64 if isHorizontal { - startingAncestorPositions[parent] = math.Min(startingAncestorPositions[parent], parent.TopLeft.X+rankSep/2.-MIN_MARGIN-padding.left) + paddingIncrease := math.Max(0, padding.left-rankSep/2) + startPosition = parent.TopLeft.X - paddingIncrease } else { - startingAncestorPositions[parent] = math.Min(startingAncestorPositions[parent], parent.TopLeft.Y+rankSep/2.-MIN_MARGIN-padding.top) + paddingIncrease := math.Max(0, padding.top-rankSep/2) + startPosition = parent.TopLeft.Y - paddingIncrease } + startingAncestorPositions[parent] = math.Min(startingAncestorPositions[parent], startPosition) for _, child := range parent.ChildrenArray { if r, has := objectRanks[child]; has { if r != rank { @@ -1059,10 +1099,11 @@ func adjustRankSpacing(g *d2graph.Graph, rankSep float64, isHorizontal bool) { } margin, _ := getSpacing(child) if isHorizontal { - startingAncestorPositions[parent] = math.Min(startingAncestorPositions[parent], child.TopLeft.X-margin.left-MIN_MARGIN) + startPosition = child.TopLeft.X - margin.left } else { - startingAncestorPositions[parent] = math.Min(startingAncestorPositions[parent], child.TopLeft.Y-margin.top-MIN_MARGIN) + startPosition = child.TopLeft.Y - margin.top } + startingAncestorPositions[parent] = math.Min(startingAncestorPositions[parent], startPosition) } if parent.Parent != g.Root { ancestors = append(ancestors, parent.Parent) @@ -1073,20 +1114,19 @@ func adjustRankSpacing(g *d2graph.Graph, rankSep float64, isHorizontal bool) { endingAncestorPositions := make(map[*d2graph.Object]float64) for len(endingParents) > 0 { - delta := 0. var ancestors []*d2graph.Object for _, parent := range endingParents { _, padding := getSpacing(parent) if _, has := endingAncestorPositions[parent]; !has { endingAncestorPositions[parent] = math.Inf(-1) } + var endPosition float64 if isHorizontal { - delta = math.Max(delta, padding.right) - endingAncestorPositions[parent] = math.Max(endingAncestorPositions[parent], parent.TopLeft.X+parent.Width-rankSep/2+MIN_MARGIN+padding.right) + endPosition = parent.TopLeft.X + parent.Width + padding.right - rankSep/2. } else { - delta = math.Max(delta, padding.bottom) - endingAncestorPositions[parent] = math.Max(endingAncestorPositions[parent], parent.TopLeft.Y+parent.Height-rankSep/2+MIN_MARGIN+padding.bottom) + endPosition = parent.TopLeft.Y + parent.Height + padding.bottom - rankSep/2. } + endingAncestorPositions[parent] = math.Max(endingAncestorPositions[parent], endPosition) for _, child := range parent.ChildrenArray { if r, has := objectRanks[child]; has { if r != rank { @@ -1100,13 +1140,13 @@ func adjustRankSpacing(g *d2graph.Graph, rankSep float64, isHorizontal bool) { } } margin, _ := getSpacing(child) + if isHorizontal { - delta = math.Max(delta, margin.right) - endingAncestorPositions[parent] = math.Max(endingAncestorPositions[parent], child.TopLeft.X+child.Width+margin.right+MIN_MARGIN) + endPosition = child.TopLeft.X + child.Width + margin.right } else { - delta = math.Max(delta, margin.bottom) - endingAncestorPositions[parent] = math.Max(endingAncestorPositions[parent], child.TopLeft.Y+child.Height+margin.bottom+MIN_MARGIN) + endPosition = child.TopLeft.Y + child.Height + margin.bottom } + endingAncestorPositions[parent] = math.Max(endingAncestorPositions[parent], endPosition) } if parent.Parent != g.Root { ancestors = append(ancestors, parent.Parent) @@ -1115,70 +1155,38 @@ func adjustRankSpacing(g *d2graph.Graph, rankSep float64, isHorizontal bool) { endingParents = ancestors } - endingAncestorPositionOrder := make([]*d2graph.Object, 0, len(endingAncestorPositions)) - for ancestor := range endingAncestorPositions { - endingAncestorPositionOrder = append(endingAncestorPositionOrder, ancestor) - } - // adjust rank ancestors bottom-up - sort.Slice(endingAncestorPositionOrder, func(i, j int) bool { - return endingAncestorPositions[endingAncestorPositionOrder[i]] > endingAncestorPositions[endingAncestorPositionOrder[j]] - }) - - for _, ancestor := range endingAncestorPositionOrder { - var endDelta float64 - if isHorizontal { - endDelta = endingAncestorPositions[ancestor] - (ancestor.TopLeft.X + ancestor.Width) - } else { - endDelta = endingAncestorPositions[ancestor] - (ancestor.TopLeft.Y + ancestor.Height) - } - if endDelta > 0 { - var position float64 - if isHorizontal { - position = ancestor.TopLeft.X + ancestor.Width - 1 - } else { - position = ancestor.TopLeft.Y + ancestor.Height - 1 - } - for _, obj := range g.Objects { - if !obj.IsContainer() { - continue - } - start := startingParentRanks[obj] - end := endingParentRanks[obj] - if start <= rank && rank <= end { - if isHorizontal && obj.TopLeft.X+obj.Width > position { - obj.Width += endDelta - } else if !isHorizontal && obj.TopLeft.Y+obj.Height > position { - obj.Height += endDelta - } - } - } - shiftDown(g, position, endDelta, isHorizontal) - } - } - - startingAncestorPositionOrder := make([]*d2graph.Object, 0, len(startingAncestorPositions)) + startingAdjustmentOrder := make([]*d2graph.Object, 0, len(startingAncestorPositions)) for ancestor := range startingAncestorPositions { - startingAncestorPositionOrder = append(startingAncestorPositionOrder, ancestor) + startingAdjustmentOrder = append(startingAdjustmentOrder, ancestor) } - // adjust rank ancestors bottom-up - sort.Slice(startingAncestorPositionOrder, func(i, j int) bool { - return startingAncestorPositions[startingAncestorPositionOrder[i]] > startingAncestorPositions[startingAncestorPositionOrder[j]] + // adjust starting ancestors top-down + sort.Slice(startingAdjustmentOrder, func(i, j int) bool { + iPos := startingAncestorPositions[startingAdjustmentOrder[i]] + jPos := startingAncestorPositions[startingAdjustmentOrder[j]] + return iPos < jPos }) - for _, ancestor := range startingAncestorPositionOrder { - var endDelta float64 + endingAdjustmentOrder := make([]*d2graph.Object, 0, len(endingAncestorPositions)) + for ancestor := range endingAncestorPositions { + endingAdjustmentOrder = append(endingAdjustmentOrder, ancestor) + } + + // adjust ending ancestors bottom-up + sort.Slice(endingAdjustmentOrder, func(i, j int) bool { + iPos := endingAncestorPositions[endingAdjustmentOrder[i]] + jPos := endingAncestorPositions[endingAdjustmentOrder[j]] + return jPos < iPos + }) + + for _, ancestor := range endingAdjustmentOrder { + var position float64 if isHorizontal { - endDelta = ancestor.TopLeft.X - startingAncestorPositions[ancestor] + position = ancestor.TopLeft.X + ancestor.Width } else { - endDelta = ancestor.TopLeft.Y - startingAncestorPositions[ancestor] + position = ancestor.TopLeft.Y + ancestor.Height } + endDelta := endingAncestorPositions[ancestor] - position if endDelta > 0 { - var position float64 - if isHorizontal { - position = ancestor.TopLeft.X + 1 - } else { - position = ancestor.TopLeft.Y + 1 - } for _, obj := range g.Objects { if !obj.IsContainer() { continue @@ -1186,9 +1194,10 @@ func adjustRankSpacing(g *d2graph.Graph, rankSep float64, isHorizontal bool) { start := startingParentRanks[obj] end := endingParentRanks[obj] if start <= rank && rank <= end { - if isHorizontal && obj.TopLeft.X+obj.Width > position { + if isHorizontal && position <= obj.TopLeft.X+obj.Width { obj.Width += endDelta - } else if !isHorizontal && obj.TopLeft.Y+obj.Height > position { + } else if !isHorizontal && + position <= obj.TopLeft.Y+obj.Height { obj.Height += endDelta } } @@ -1196,6 +1205,33 @@ func adjustRankSpacing(g *d2graph.Graph, rankSep float64, isHorizontal bool) { shiftDown(g, position, endDelta, isHorizontal) } } + + for _, ancestor := range startingAdjustmentOrder { + var position float64 + if isHorizontal { + position = ancestor.TopLeft.X + } else { + position = ancestor.TopLeft.Y + } + startDelta := position - startingAncestorPositions[ancestor] + if startDelta > 0 { + for _, obj := range g.Objects { + if !obj.IsContainer() { + continue + } + start := startingParentRanks[obj] + end := endingParentRanks[obj] + if start <= rank && rank <= end { + if isHorizontal && obj.TopLeft.X <= position { + obj.Width += startDelta + } else if !isHorizontal && obj.TopLeft.Y <= position { + obj.Height += startDelta + } + } + } + shiftUp(g, position, startDelta, isHorizontal) + } + } } } From e52f0bb8bad43a649188dc4250e9d79f8b0a342d Mon Sep 17 00:00:00 2001 From: Gavin Nishizawa Date: Wed, 12 Jul 2023 14:45:59 -0700 Subject: [PATCH 13/31] fix tracing edge to label with multiple intersections --- d2graph/layout.go | 39 +++++++++++++++++++++++++++++++++++---- 1 file changed, 35 insertions(+), 4 deletions(-) diff --git a/d2graph/layout.go b/d2graph/layout.go index a93b3a61a..4b53cee12 100644 --- a/d2graph/layout.go +++ b/d2graph/layout.go @@ -1,6 +1,7 @@ package d2graph import ( + "sort" "strings" "oss.terrastruct.com/d2/d2target" @@ -337,9 +338,13 @@ func (edge *Edge) TraceToShape(points []*geo.Point, startIndex, endIndex int) (n labelBox.Width += 2 * label.PADDING if intersections := labelBox.Intersections(startingSegment); len(intersections) > 0 { overlapsOutsideLabel = true + p := intersections[0] + if len(intersections) > 1 { + p = findOuterIntersection(labelPosition, intersections) + } // move starting segment to label intersection point - points[startIndex] = intersections[0] - startingSegment.End = intersections[0] + points[startIndex] = p + startingSegment.End = p // if the segment becomes too short, just merge it with the next segment if startIndex+1 < len(points)-1 && startingSegment.Length() < MIN_SEGMENT_LEN { points[startIndex+1] = points[startIndex] @@ -378,9 +383,13 @@ func (edge *Edge) TraceToShape(points []*geo.Point, startIndex, endIndex int) (n labelBox.Width += 2 * label.PADDING if intersections := labelBox.Intersections(endingSegment); len(intersections) > 0 { overlapsOutsideLabel = true + p := intersections[0] + if len(intersections) > 1 { + p = findOuterIntersection(labelPosition, intersections) + } // move ending segment to label intersection point - points[endIndex] = intersections[0] - endingSegment.End = intersections[0] + points[endIndex] = p + endingSegment.End = p // if the segment becomes too short, just merge it with the previous segment if endIndex-1 > 0 && endingSegment.Length() < MIN_SEGMENT_LEN { points[endIndex-1] = points[endIndex] @@ -404,3 +413,25 @@ func (edge *Edge) TraceToShape(points []*geo.Point, startIndex, endIndex int) (n } return startIndex, endIndex } + +func findOuterIntersection(labelPosition label.Position, intersections []*geo.Point) *geo.Point { + switch labelPosition { + case label.OutsideTopLeft, label.OutsideTopRight, label.OutsideTopCenter: + sort.Slice(intersections, func(i, j int) bool { + return intersections[i].Y < intersections[j].Y + }) + case label.OutsideBottomLeft, label.OutsideBottomRight, label.OutsideBottomCenter: + sort.Slice(intersections, func(i, j int) bool { + return intersections[i].Y > intersections[j].Y + }) + case label.OutsideLeftTop, label.OutsideLeftMiddle, label.OutsideLeftBottom: + sort.Slice(intersections, func(i, j int) bool { + return intersections[i].X < intersections[j].X + }) + case label.OutsideRightTop, label.OutsideRightMiddle, label.OutsideRightBottom: + sort.Slice(intersections, func(i, j int) bool { + return intersections[i].X > intersections[j].X + }) + } + return intersections[0] +} From a32319d59838ad845b305f3e62d458ad1c229ffa Mon Sep 17 00:00:00 2001 From: Gavin Nishizawa Date: Wed, 12 Jul 2023 15:30:41 -0700 Subject: [PATCH 14/31] fix dagre_broken_arrowhead --- d2graph/layout.go | 8 ++++---- d2layouts/d2dagrelayout/layout.go | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/d2graph/layout.go b/d2graph/layout.go index 4b53cee12..05ef65fb0 100644 --- a/d2graph/layout.go +++ b/d2graph/layout.go @@ -346,7 +346,7 @@ func (edge *Edge) TraceToShape(points []*geo.Point, startIndex, endIndex int) (n points[startIndex] = p startingSegment.End = p // if the segment becomes too short, just merge it with the next segment - if startIndex+1 < len(points)-1 && startingSegment.Length() < MIN_SEGMENT_LEN { + if startIndex+1 < endIndex && startingSegment.Length() < MIN_SEGMENT_LEN { points[startIndex+1] = points[startIndex] startIndex++ } @@ -359,7 +359,7 @@ func (edge *Edge) TraceToShape(points []*geo.Point, startIndex, endIndex int) (n points[startIndex] = intersections[0] startingSegment.End = intersections[0] // if the segment becomes too short, just merge it with the next segment - if startIndex+1 < len(points)-1 && startingSegment.Length() < MIN_SEGMENT_LEN { + if startIndex+1 < endIndex && startingSegment.Length() < MIN_SEGMENT_LEN { points[startIndex+1] = points[startIndex] startIndex++ } @@ -391,7 +391,7 @@ func (edge *Edge) TraceToShape(points []*geo.Point, startIndex, endIndex int) (n points[endIndex] = p endingSegment.End = p // if the segment becomes too short, just merge it with the previous segment - if endIndex-1 > 0 && endingSegment.Length() < MIN_SEGMENT_LEN { + if endIndex-1 > startIndex && endingSegment.Length() < MIN_SEGMENT_LEN { points[endIndex-1] = points[endIndex] endIndex-- } @@ -404,7 +404,7 @@ func (edge *Edge) TraceToShape(points []*geo.Point, startIndex, endIndex int) (n points[endIndex] = intersections[0] endingSegment.End = intersections[0] // if the segment becomes too short, just merge it with the previous segment - if endIndex-1 > 0 && endingSegment.Length() < MIN_SEGMENT_LEN { + if endIndex-1 > startIndex && endingSegment.Length() < MIN_SEGMENT_LEN { points[endIndex-1] = points[endIndex] endIndex-- } diff --git a/d2layouts/d2dagrelayout/layout.go b/d2layouts/d2dagrelayout/layout.go index cea99951f..6949f7179 100644 --- a/d2layouts/d2dagrelayout/layout.go +++ b/d2layouts/d2dagrelayout/layout.go @@ -273,7 +273,7 @@ func Layout(ctx context.Context, g *d2graph.Graph, opts *ConfigurableOpts) (err // arrowheads can appear broken if segments are very short from dagre routing a point just outside the shape // to fix this, we try extending the previous segment into the shape instead of having a very short segment - if !start.Equals(points[0]) && startIndex+2 < len(points) { + if startIndex+2 < len(points) { newStartingSegment := *geo.NewSegment(start, points[startIndex+1]) if newStartingSegment.Length() < d2graph.MIN_SEGMENT_LEN { // we don't want a very short segment right next to the source because it will mess up the arrowhead @@ -294,7 +294,7 @@ func Layout(ctx context.Context, g *d2graph.Graph, opts *ConfigurableOpts) (err } } } - if !end.Equals(points[len(points)-1]) && endIndex-2 >= 0 { + if endIndex-2 >= 0 { newEndingSegment := *geo.NewSegment(end, points[endIndex-1]) if newEndingSegment.Length() < d2graph.MIN_SEGMENT_LEN { // extend the prev segment into the shape border if possible From 180a444ca0d5aae561cd39af569a4e2cbac96c12 Mon Sep 17 00:00:00 2001 From: Gavin Nishizawa Date: Wed, 12 Jul 2023 17:17:49 -0700 Subject: [PATCH 15/31] fix grid diagram shift --- d2layouts/d2dagrelayout/layout.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/d2layouts/d2dagrelayout/layout.go b/d2layouts/d2dagrelayout/layout.go index 6949f7179..bbf9ef4d0 100644 --- a/d2layouts/d2dagrelayout/layout.go +++ b/d2layouts/d2dagrelayout/layout.go @@ -1245,6 +1245,9 @@ func adjustCrossRankSpacing(g *d2graph.Graph, rankSep float64, isHorizontal bool prevMarginBottom = make(map[*d2graph.Object]float64) } for _, obj := range g.Objects { + if obj.IsGridDiagram() { + continue + } margin, padding := getSpacing(obj) if !isHorizontal { if prevShift, has := prevMarginBottom[obj]; has { From f99405eaa395ec49e3d726e75e026ca137b826e4 Mon Sep 17 00:00:00 2001 From: Gavin Nishizawa Date: Thu, 13 Jul 2023 17:13:34 -0700 Subject: [PATCH 16/31] fit container padding --- d2layouts/d2dagrelayout/layout.go | 136 +++++++++++++++++++++++++++++- 1 file changed, 133 insertions(+), 3 deletions(-) diff --git a/d2layouts/d2dagrelayout/layout.go b/d2layouts/d2dagrelayout/layout.go index bbf9ef4d0..deb8d3860 100644 --- a/d2layouts/d2dagrelayout/layout.go +++ b/d2layouts/d2dagrelayout/layout.go @@ -22,6 +22,7 @@ import ( "oss.terrastruct.com/d2/lib/geo" "oss.terrastruct.com/d2/lib/label" "oss.terrastruct.com/d2/lib/log" + "oss.terrastruct.com/d2/lib/shape" ) //go:embed setup.js @@ -31,9 +32,9 @@ var setupJS string var dagreJS string const ( - MIN_RANK_SEP = 60 - EDGE_LABEL_GAP = 20 - MIN_MARGIN = 10. + MIN_RANK_SEP = 60 + EDGE_LABEL_GAP = 20 + DEFAULT_PADDING = 30. ) type ConfigurableOpts struct { @@ -266,6 +267,8 @@ func Layout(ctx context.Context, g *d2graph.Graph, opts *ConfigurableOpts) (err adjustRankSpacing(g, float64(rootAttrs.ranksep), isHorizontal) adjustCrossRankSpacing(g, float64(rootAttrs.ranksep), !isHorizontal) + fitContainerPadding(g, float64(rootAttrs.ranksep), isHorizontal) + for _, edge := range g.Edges { points := edge.Route startIndex, endIndex := 0, len(points)-1 @@ -1306,3 +1309,130 @@ func adjustCrossRankSpacing(g *d2graph.Graph, rankSep float64, isHorizontal bool } } } + +func fitContainerPadding(g *d2graph.Graph, rankSep float64, isHorizontal bool) { + for _, obj := range g.Root.ChildrenArray { + fitPadding(obj) + } +} + +func fitPadding(obj *d2graph.Object) { + dslShape := strings.ToLower(obj.Shape.Value) + shapeType := d2target.DSL_SHAPE_TO_SHAPE_TYPE[dslShape] + // Note: there's no shape-specific padding/placement in dagre yet + if !obj.IsContainer() || shapeType != shape.SQUARE_TYPE { + return + } + for _, child := range obj.ChildrenArray { + fitPadding(child) + } + + _, padding := getSpacing(obj) + padding.top = math.Max(padding.top, DEFAULT_PADDING) + padding.bottom = math.Max(padding.bottom, DEFAULT_PADDING) + padding.left = math.Max(padding.left, DEFAULT_PADDING) + padding.right = math.Max(padding.right, DEFAULT_PADDING) + + innerTop := math.Inf(1) + innerBottom := math.Inf(-1) + innerLeft := math.Inf(1) + innerRight := math.Inf(-1) + + for _, child := range obj.ChildrenArray { + margin, _ := getSpacing(child) + + innerTop = math.Min(innerTop, child.TopLeft.Y-math.Max(margin.top, padding.top)) + innerBottom = math.Max(innerBottom, child.TopLeft.Y+child.Height+math.Max(margin.bottom, padding.bottom)) + innerLeft = math.Min(innerLeft, child.TopLeft.X-math.Max(margin.left, padding.left)) + innerRight = math.Max(innerRight, child.TopLeft.X+child.Width+math.Max(margin.right, padding.right)) + } + + currentTop := obj.TopLeft.Y + currentBottom := obj.TopLeft.Y + obj.Height + currentLeft := obj.TopLeft.X + currentRight := obj.TopLeft.X + obj.Width + + topDelta := innerTop - currentTop + bottomDelta := currentBottom - innerBottom + leftDelta := innerLeft - currentLeft + rightDelta := currentRight - innerRight + + if 0 < topDelta { + obj.TopLeft.Y += topDelta + obj.Height -= topDelta + adjustEdges(obj, currentTop, topDelta, false) + } + if 0 < bottomDelta { + obj.Height -= bottomDelta + adjustEdges(obj, currentBottom, -bottomDelta, false) + } + if 0 < leftDelta { + obj.TopLeft.X += leftDelta + obj.Width -= leftDelta + adjustEdges(obj, currentLeft, leftDelta, true) + } + if 0 < rightDelta { + obj.Width -= rightDelta + adjustEdges(obj, currentRight, -rightDelta, true) + } +} + +func adjustEdges(obj *d2graph.Object, objPosition, delta float64, isHorizontal bool) { + adjust := func(p *geo.Point) { + var position float64 + if isHorizontal { + position = p.X + } else { + position = p.Y + } + if geo.PrecisionCompare(position, objPosition, 1) == 0 { + if isHorizontal { + p.X += delta + } else { + p.Y += delta + } + } else { + // check side corners + var isOnSide bool + if isHorizontal { + if geo.PrecisionCompare(p.Y, obj.TopLeft.Y, 1) == 0 || + geo.PrecisionCompare(p.Y, obj.TopLeft.Y+obj.Height, 1) == 0 { + isOnSide = true + } + } else { + if geo.PrecisionCompare(p.X, obj.TopLeft.X, 1) == 0 || + geo.PrecisionCompare(p.X, obj.TopLeft.X+obj.Width, 1) == 0 { + isOnSide = true + } + } + if isOnSide { + var isInRange bool + if delta > 0 { + if objPosition < position && position < objPosition+delta { + isInRange = true + } + } else { + if objPosition+delta < position && position < objPosition { + isInRange = true + } + } + if isInRange { + if isHorizontal { + p.X = objPosition + delta + } else { + p.Y = objPosition + delta + } + } + } + } + } + + for _, edge := range obj.Graph.Edges { + if edge.Src == obj { + adjust(edge.Route[0]) + } + if edge.Dst == obj { + adjust(edge.Route[len(edge.Route)-1]) + } + } +} From 8cce0aa54cbe440c7bfc1c91cfcc1869b5211bbe Mon Sep 17 00:00:00 2001 From: Gavin Nishizawa Date: Fri, 14 Jul 2023 11:51:45 -0700 Subject: [PATCH 17/31] don't shrink padding past edges on side --- d2layouts/d2dagrelayout/layout.go | 124 +++++++++++++++++++++++++++--- 1 file changed, 114 insertions(+), 10 deletions(-) diff --git a/d2layouts/d2dagrelayout/layout.go b/d2layouts/d2dagrelayout/layout.go index deb8d3860..0c97abd44 100644 --- a/d2layouts/d2dagrelayout/layout.go +++ b/d2layouts/d2dagrelayout/layout.go @@ -1358,25 +1358,129 @@ func fitPadding(obj *d2graph.Object) { rightDelta := currentRight - innerRight if 0 < topDelta { - obj.TopLeft.Y += topDelta - obj.Height -= topDelta - adjustEdges(obj, currentTop, topDelta, false) + topDelta = adjustDeltaForEdges(obj, currentTop, topDelta, false) + if 0 < topDelta { + obj.TopLeft.Y += topDelta + obj.Height -= topDelta + adjustEdges(obj, currentTop, topDelta, false) + } } if 0 < bottomDelta { - obj.Height -= bottomDelta - adjustEdges(obj, currentBottom, -bottomDelta, false) + bottomDelta = adjustDeltaForEdges(obj, currentBottom, -bottomDelta, false) + if 0 < bottomDelta { + obj.Height -= bottomDelta + adjustEdges(obj, currentBottom, -bottomDelta, false) + } } if 0 < leftDelta { - obj.TopLeft.X += leftDelta - obj.Width -= leftDelta - adjustEdges(obj, currentLeft, leftDelta, true) + leftDelta = adjustDeltaForEdges(obj, currentLeft, leftDelta, true) + if 0 < leftDelta { + obj.TopLeft.X += leftDelta + obj.Width -= leftDelta + adjustEdges(obj, currentLeft, leftDelta, true) + } } if 0 < rightDelta { - obj.Width -= rightDelta - adjustEdges(obj, currentRight, -rightDelta, true) + rightDelta = adjustDeltaForEdges(obj, currentRight, -rightDelta, true) + if 0 < rightDelta { + obj.Width -= rightDelta + adjustEdges(obj, currentRight, -rightDelta, true) + } } } +func adjustDeltaForEdges(obj *d2graph.Object, objPosition, delta float64, isHorizontal bool) (newMagnitude float64) { + isOnCollapsingSide := func(p *geo.Point) bool { + var position float64 + if isHorizontal { + position = p.X + } else { + position = p.Y + } + if geo.PrecisionCompare(position, objPosition, 1) == 0 { + return false + } + // check for edges on side corners + var isOnSide bool + if isHorizontal { + if geo.PrecisionCompare(p.Y, obj.TopLeft.Y, 1) == 0 || + geo.PrecisionCompare(p.Y, obj.TopLeft.Y+obj.Height, 1) == 0 { + isOnSide = true + } + } else { + if geo.PrecisionCompare(p.X, obj.TopLeft.X, 1) == 0 || + geo.PrecisionCompare(p.X, obj.TopLeft.X+obj.Width, 1) == 0 { + isOnSide = true + } + } + if isOnSide { + var isInRange bool + if delta > 0 { + if objPosition < position && position < objPosition+delta { + isInRange = true + } + } else { + if objPosition+delta < position && position < objPosition { + isInRange = true + } + } + if !isInRange { + if isHorizontal { + return false + } else { + return false + } + } + } + return true + } + outermost := objPosition + delta + for _, edge := range obj.Graph.Edges { + if edge.Src == obj { + p := edge.Route[0] + if isOnCollapsingSide(p) { + var position float64 + if isHorizontal { + position = p.X + } else { + position = p.Y + } + if delta < 0 { + outermost = math.Max(outermost, position) + } else { + outermost = math.Min(outermost, position) + } + } + } + if edge.Dst == obj { + p := edge.Route[len(edge.Route)-1] + if isOnCollapsingSide(p) { + var position float64 + if isHorizontal { + position = p.X + } else { + position = p.Y + } + if delta < 0 { + outermost = math.Max(outermost, position) + } else { + outermost = math.Min(outermost, position) + } + } + } + } + newMagnitude = math.Abs(delta) + if outermost != objPosition+delta { + // only reduce to outermost + DEFAULT_PADDING + if delta < 0 { + newMagnitude = math.Max(0, objPosition-(outermost+DEFAULT_PADDING)) + } else { + newMagnitude = math.Max(0, (outermost-DEFAULT_PADDING)-objPosition) + } + } + return newMagnitude +} + func adjustEdges(obj *d2graph.Object, objPosition, delta float64, isHorizontal bool) { adjust := func(p *geo.Point) { var position float64 From 5d7b0af127a5a04339caa590cca00849f43dd5bb Mon Sep 17 00:00:00 2001 From: Gavin Nishizawa Date: Fri, 14 Jul 2023 12:01:54 -0700 Subject: [PATCH 18/31] account for child 3d/multiple in bounding box --- d2layouts/d2dagrelayout/layout.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/d2layouts/d2dagrelayout/layout.go b/d2layouts/d2dagrelayout/layout.go index 0c97abd44..7272002e7 100644 --- a/d2layouts/d2dagrelayout/layout.go +++ b/d2layouts/d2dagrelayout/layout.go @@ -1340,11 +1340,12 @@ func fitPadding(obj *d2graph.Object) { for _, child := range obj.ChildrenArray { margin, _ := getSpacing(child) + dx, dy := child.GetModifierElementAdjustments() - innerTop = math.Min(innerTop, child.TopLeft.Y-math.Max(margin.top, padding.top)) + innerTop = math.Min(innerTop, child.TopLeft.Y-dy-math.Max(margin.top, padding.top)) innerBottom = math.Max(innerBottom, child.TopLeft.Y+child.Height+math.Max(margin.bottom, padding.bottom)) innerLeft = math.Min(innerLeft, child.TopLeft.X-math.Max(margin.left, padding.left)) - innerRight = math.Max(innerRight, child.TopLeft.X+child.Width+math.Max(margin.right, padding.right)) + innerRight = math.Max(innerRight, child.TopLeft.X+child.Width+dx+math.Max(margin.right, padding.right)) } currentTop := obj.TopLeft.Y From b1cb08027e3ec33936552dbfc55db63ee0fbd8f6 Mon Sep 17 00:00:00 2001 From: Gavin Nishizawa Date: Fri, 14 Jul 2023 13:24:00 -0700 Subject: [PATCH 19/31] update tracing to label box --- d2graph/layout.go | 11 +++++++++++ lib/geo/box.go | 5 +++++ 2 files changed, 16 insertions(+) diff --git a/d2graph/layout.go b/d2graph/layout.go index 05ef65fb0..358a95934 100644 --- a/d2graph/layout.go +++ b/d2graph/layout.go @@ -336,6 +336,12 @@ func (edge *Edge) TraceToShape(points []*geo.Point, startIndex, endIndex int) (n // add left/right padding to box labelBox.TopLeft.X -= label.PADDING labelBox.Width += 2 * label.PADDING + + for labelBox.Contains(startingSegment.End) && startIndex+1 > endIndex { + startingSegment.Start = startingSegment.End + startingSegment.End = points[startIndex+2] + startIndex++ + } if intersections := labelBox.Intersections(startingSegment); len(intersections) > 0 { overlapsOutsideLabel = true p := intersections[0] @@ -381,6 +387,11 @@ func (edge *Edge) TraceToShape(points []*geo.Point, startIndex, endIndex int) (n // add left/right padding to box labelBox.TopLeft.X -= label.PADDING labelBox.Width += 2 * label.PADDING + for labelBox.Contains(endingSegment.Start) && endIndex-1 > startIndex { + endingSegment.End = endingSegment.Start + endingSegment.Start = points[endIndex-2] + endIndex-- + } if intersections := labelBox.Intersections(endingSegment); len(intersections) > 0 { overlapsOutsideLabel = true p := intersections[0] diff --git a/lib/geo/box.go b/lib/geo/box.go index 3fe0eb7c2..de9b36cff 100644 --- a/lib/geo/box.go +++ b/lib/geo/box.go @@ -78,3 +78,8 @@ func (b *Box) ToString() string { } return fmt.Sprintf("{TopLeft: %s, Width: %.0f, Height: %.0f}", b.TopLeft.ToString(), b.Width, b.Height) } + +func (b *Box) Contains(p *Point) bool { + return !(p.X < b.TopLeft.X || b.TopLeft.X+b.Width < p.X || + p.Y < b.TopLeft.Y || b.TopLeft.Y+b.Height < p.Y) +} From 874696da3d101f62ded48339afd3e56a04deece2 Mon Sep 17 00:00:00 2001 From: Gavin Nishizawa Date: Fri, 14 Jul 2023 16:08:22 -0700 Subject: [PATCH 20/31] fix --- d2layouts/d2dagrelayout/layout.go | 155 ++++++++++++++++++++---------- 1 file changed, 106 insertions(+), 49 deletions(-) diff --git a/d2layouts/d2dagrelayout/layout.go b/d2layouts/d2dagrelayout/layout.go index 7272002e7..5a2ff9145 100644 --- a/d2layouts/d2dagrelayout/layout.go +++ b/d2layouts/d2dagrelayout/layout.go @@ -266,7 +266,6 @@ func Layout(ctx context.Context, g *d2graph.Graph, opts *ConfigurableOpts) (err adjustRankSpacing(g, float64(rootAttrs.ranksep), isHorizontal) adjustCrossRankSpacing(g, float64(rootAttrs.ranksep), !isHorizontal) - fitContainerPadding(g, float64(rootAttrs.ranksep), isHorizontal) for _, edge := range g.Edges { @@ -723,73 +722,130 @@ func getRanks(g *d2graph.Graph, isHorizontal bool) (ranks [][]*d2graph.Object, o // shift everything down by distance if it is at or below start position func shiftDown(g *d2graph.Graph, start, distance float64, isHorizontal bool) { if isHorizontal { + for _, edge := range g.Edges { + first, last := edge.Route[0], edge.Route[len(edge.Route)-1] + if start <= first.X { + onStaticSrc := first.X == edge.Src.TopLeft.X+edge.Src.Width && edge.Src.TopLeft.X < start + if !onStaticSrc { + // src is not shifting and we are on src so don't shift + first.X += distance + } + } + if start <= last.X { + onStaticDst := last.X == edge.Dst.TopLeft.X+edge.Dst.Width && edge.Dst.TopLeft.X < start + if !onStaticDst { + last.X += distance + } + } + for i := 1; i < len(edge.Route)-1; i++ { + p := edge.Route[i] + if p.X < start { + continue + } + p.X += distance + } + } for _, obj := range g.Objects { if obj.TopLeft.X < start { continue } obj.TopLeft.X += distance } + } else { for _, edge := range g.Edges { - for _, p := range edge.Route { - // Note: == so incoming edge shifts down with object at startY - if p.X <= start { + first, last := edge.Route[0], edge.Route[len(edge.Route)-1] + if start <= first.Y { + onStaticSrc := first.Y == edge.Src.TopLeft.Y+edge.Src.Height && edge.Src.TopLeft.Y < start + if !onStaticSrc { + // src is not shifting and we are on src so don't shift + first.Y += distance + } + } + if start <= last.Y { + onStaticDst := last.Y == edge.Dst.TopLeft.Y+edge.Dst.Height && edge.Dst.TopLeft.Y < start + if !onStaticDst { + last.Y += distance + } + } + for i := 1; i < len(edge.Route)-1; i++ { + p := edge.Route[i] + if p.Y < start { continue } - p.X += distance + p.Y += distance } } - } else { for _, obj := range g.Objects { if obj.TopLeft.Y < start { continue } obj.TopLeft.Y += distance } - for _, edge := range g.Edges { - for _, p := range edge.Route { - // Note: == so incoming edge shifts down with object at startY - if p.Y <= start { - continue - } - p.Y += distance - } - } } } func shiftUp(g *d2graph.Graph, start, distance float64, isHorizontal bool) { if isHorizontal { + for _, edge := range g.Edges { + first, last := edge.Route[0], edge.Route[len(edge.Route)-1] + if first.X <= start { + onStaticSrc := first.X == edge.Src.TopLeft.X && start < edge.Src.TopLeft.X+edge.Src.Width + if !onStaticSrc { + // src is not shifting and we are on src so don't shift + first.X -= distance + } + } + if last.X <= start { + onStaticDst := last.X == edge.Dst.TopLeft.X && start < edge.Dst.TopLeft.X+edge.Dst.Width + if !onStaticDst { + last.X -= distance + } + } + for i := 1; i < len(edge.Route)-1; i++ { + p := edge.Route[i] + if start < p.X { + continue + } + p.X -= distance + } + } for _, obj := range g.Objects { if start < obj.TopLeft.X { continue } obj.TopLeft.X -= distance } + } else { for _, edge := range g.Edges { - for _, p := range edge.Route { - // Note: == so incoming edge shifts down with object at startY - if start <= p.X { + first, last := edge.Route[0], edge.Route[len(edge.Route)-1] + if first.Y <= start { + // don't shift first edge point if src is not shifting and we are on src + onStaticSrc := first.Y == edge.Src.TopLeft.Y && start < edge.Src.TopLeft.Y+edge.Src.Height + if !onStaticSrc { + first.Y -= distance + } + } + if last.Y <= start { + onStaticDst := last.Y == edge.Dst.TopLeft.Y && start < edge.Dst.TopLeft.Y + if !onStaticDst { + last.Y -= distance + } + } + for i := 1; i < len(edge.Route)-1; i++ { + p := edge.Route[i] + // for _, p := range edge.Route { + if start < p.Y { continue } - p.X -= distance + p.Y -= distance } } - } else { for _, obj := range g.Objects { if start < obj.TopLeft.Y { continue } obj.TopLeft.Y -= distance } - for _, edge := range g.Edges { - for _, p := range edge.Route { - // Note: == so incoming edge shifts down with object at startY - if start <= p.Y { - continue - } - p.Y -= distance - } - } } } @@ -1361,31 +1417,31 @@ func fitPadding(obj *d2graph.Object) { if 0 < topDelta { topDelta = adjustDeltaForEdges(obj, currentTop, topDelta, false) if 0 < topDelta { + adjustEdges(obj, currentTop, topDelta, false) obj.TopLeft.Y += topDelta obj.Height -= topDelta - adjustEdges(obj, currentTop, topDelta, false) } } if 0 < bottomDelta { bottomDelta = adjustDeltaForEdges(obj, currentBottom, -bottomDelta, false) if 0 < bottomDelta { - obj.Height -= bottomDelta adjustEdges(obj, currentBottom, -bottomDelta, false) + obj.Height -= bottomDelta } } if 0 < leftDelta { leftDelta = adjustDeltaForEdges(obj, currentLeft, leftDelta, true) if 0 < leftDelta { + adjustEdges(obj, currentLeft, leftDelta, true) obj.TopLeft.X += leftDelta obj.Width -= leftDelta - adjustEdges(obj, currentLeft, leftDelta, true) } } if 0 < rightDelta { rightDelta = adjustDeltaForEdges(obj, currentRight, -rightDelta, true) if 0 < rightDelta { - obj.Width -= rightDelta adjustEdges(obj, currentRight, -rightDelta, true) + obj.Width -= rightDelta } } } @@ -1414,23 +1470,24 @@ func adjustDeltaForEdges(obj *d2graph.Object, objPosition, delta float64, isHori isOnSide = true } } - if isOnSide { - var isInRange bool - if delta > 0 { - if objPosition < position && position < objPosition+delta { - isInRange = true - } - } else { - if objPosition+delta < position && position < objPosition { - isInRange = true - } + if !isOnSide { + return false + } + var isInRange bool + if delta > 0 { + if objPosition < position && position < objPosition+delta { + isInRange = true } - if !isInRange { - if isHorizontal { - return false - } else { - return false - } + } else { + if objPosition+delta < position && position < objPosition { + isInRange = true + } + } + if !isInRange { + if isHorizontal { + return false + } else { + return false } } return true From 205bf8b43d57fa14aff41cb1657f8d8385e26f3e Mon Sep 17 00:00:00 2001 From: Gavin Nishizawa Date: Fri, 14 Jul 2023 12:05:10 -0700 Subject: [PATCH 21/31] update tests --- .../testdata/all_shapes/sketch.exp.svg | 156 +-- .../testdata/all_shapes_dark/sketch.exp.svg | 156 +-- .../d2sketch/testdata/animated/sketch.exp.svg | 170 +-- .../testdata/animated_dark/sketch.exp.svg | 170 +-- .../testdata/arrowheads/sketch.exp.svg | 162 +-- .../testdata/arrowheads_dark/sketch.exp.svg | 162 +-- .../testdata/child_to_child/sketch.exp.svg | 170 +-- .../child_to_child_dark/sketch.exp.svg | 170 +-- .../testdata/connection_label/sketch.exp.svg | 160 +-- .../connection_label_dark/sketch.exp.svg | 160 +-- .../d2sketch/testdata/dots-3d/sketch.exp.svg | 168 +-- .../d2sketch/testdata/dots-all/sketch.exp.svg | 156 +-- .../testdata/dots-multiple/sketch.exp.svg | 190 +-- .../testdata/dots-real/sketch.exp.svg | 176 +-- .../testdata/double-border/sketch.exp.svg | 174 +-- .../d2sketch/testdata/opacity/sketch.exp.svg | 560 ++++---- .../testdata/opacity_dark/sketch.exp.svg | 560 ++++---- .../testdata/paper-real/sketch.exp.svg | 176 +-- .../testdata/root-fill/sketch.exp.svg | 572 ++++---- .../d2sketch/testdata/terminal/sketch.exp.svg | 198 +-- .../d2sketch/testdata/twitter/sketch.exp.svg | 644 ++++----- .../testdata/twitter_dark/sketch.exp.svg | 644 ++++----- .../testdata/all_shapes/dark_theme.exp.svg | 154 +-- .../testdata/animated/dark_theme.exp.svg | 168 +-- .../testdata/arrowheads/dark_theme.exp.svg | 160 +-- .../child_to_child/dark_theme.exp.svg | 168 +-- .../connection_label/dark_theme.exp.svg | 158 +-- .../testdata/opacity/dark_theme.exp.svg | 560 ++++---- .../testdata/twitter/dark_theme.exp.svg | 644 ++++----- .../TestCLI_E2E/multiboard/life/index.exp.svg | 152 +-- .../multiboard/life/scenarios/why.exp.svg | 152 +-- .../multiboard/life_index_d2/index.exp.svg | 152 +-- .../life_index_d2/scenarios/why.exp.svg | 152 +-- .../testdata/TestCLI_E2E/with-font.exp.svg | 158 +-- .../testdata/patterns/3d/dagre/board.exp.json | 4 +- .../testdata/patterns/3d/dagre/sketch.exp.svg | 168 +-- .../patterns/all_shapes/dagre/board.exp.json | 6 +- .../patterns/all_shapes/dagre/sketch.exp.svg | 156 +-- .../patterns/multiple/dagre/board.exp.json | 232 ++-- .../patterns/multiple/dagre/sketch.exp.svg | 190 +-- .../patterns/paper/dagre/board.exp.json | 6 +- .../patterns/paper/dagre/sketch.exp.svg | 156 +-- .../patterns/real-lines/dagre/board.exp.json | 70 +- .../patterns/real-lines/dagre/sketch.exp.svg | 182 +-- .../patterns/real/dagre/board.exp.json | 54 +- .../patterns/real/dagre/sketch.exp.svg | 176 +-- .../root-dots-with-fill/dagre/board.exp.json | 16 +- .../root-dots-with-fill/dagre/sketch.exp.svg | 154 +-- .../patterns/root-dots/dagre/board.exp.json | 16 +- .../patterns/root-dots/dagre/sketch.exp.svg | 154 +-- .../patterns/shape/dagre/board.exp.json | 16 +- .../patterns/shape/dagre/sketch.exp.svg | 154 +-- .../dagre/board.exp.json | 352 ++--- .../dagre/sketch.exp.svg | 276 ++-- .../bold_edge_label/dagre/board.exp.json | 8 +- .../bold_edge_label/dagre/sketch.exp.svg | 158 +-- .../dagre-disconnect/dagre/board.exp.json | 202 +-- .../dagre-disconnect/dagre/sketch.exp.svg | 220 ++-- .../dagre-disconnect/elk/board.exp.json | 4 +- .../dagre-disconnect/elk/sketch.exp.svg | 164 +-- .../dagre/board.exp.json | 48 +- .../dagre/sketch.exp.svg | 180 +-- .../dagre/board.exp.json | 54 +- .../dagre/sketch.exp.svg | 186 +-- .../elk_alignment/dagre/board.exp.json | 110 +- .../elk_alignment/dagre/sketch.exp.svg | 210 +-- .../elk_loop_panic/dagre/board.exp.json | 46 +- .../elk_loop_panic/dagre/sketch.exp.svg | 166 +-- .../nested_steps/dagre/board.exp.json | 20 +- .../nested_steps/dagre/sketch.exp.svg | 166 +-- .../nested_steps/elk/board.exp.json | 4 +- .../nested_steps/elk/sketch.exp.svg | 158 +-- .../opacity-on-label/dagre/board.exp.json | 4 +- .../opacity-on-label/dagre/sketch.exp.svg | 560 ++++---- .../dagre/board.exp.json | 64 +- .../dagre/sketch.exp.svg | 194 +-- .../query_param_escape/dagre/board.exp.json | 2 +- .../query_param_escape/dagre/sketch.exp.svg | 154 +-- .../root-container/dagre/board.exp.json | 68 +- .../root-container/dagre/sketch.exp.svg | 176 +-- .../dagre/board.exp.json | 278 ++-- .../dagre/sketch.exp.svg | 210 +-- .../unconnected/dagre/board.exp.json | 214 +-- .../unconnected/dagre/sketch.exp.svg | 584 ++++----- .../regression/unconnected/elk/board.exp.json | 4 +- .../regression/unconnected/elk/sketch.exp.svg | 554 ++++---- .../sanity/1_to_2/dagre/board.exp.json | 8 +- .../sanity/1_to_2/dagre/sketch.exp.svg | 152 +-- .../child_to_child/dagre/board.exp.json | 28 +- .../child_to_child/dagre/sketch.exp.svg | 168 +-- .../connection_label/dagre/board.exp.json | 4 +- .../connection_label/dagre/sketch.exp.svg | 158 +-- .../3d_fill_and_stroke/dagre/board.exp.json | 38 +- .../3d_fill_and_stroke/dagre/sketch.exp.svg | 172 +-- .../3d_fill_and_stroke/elk/board.exp.json | 2 +- .../3d_fill_and_stroke/elk/sketch.exp.svg | 154 +-- .../stable/all_shapes/dagre/board.exp.json | 6 +- .../stable/all_shapes/dagre/sketch.exp.svg | 154 +-- .../stable/all_shapes/elk/board.exp.json | 4 +- .../stable/all_shapes/elk/sketch.exp.svg | 152 +-- .../all_shapes_link/dagre/board.exp.json | 406 +++--- .../all_shapes_link/dagre/sketch.exp.svg | 404 +++--- .../stable/all_shapes_link/elk/board.exp.json | 16 +- .../stable/all_shapes_link/elk/sketch.exp.svg | 160 +-- .../all_shapes_multiple/dagre/board.exp.json | 232 ++-- .../all_shapes_multiple/dagre/sketch.exp.svg | 188 +-- .../all_shapes_multiple/elk/board.exp.json | 2 +- .../all_shapes_multiple/elk/sketch.exp.svg | 152 +-- .../all_shapes_shadow/dagre/board.exp.json | 6 +- .../all_shapes_shadow/dagre/sketch.exp.svg | 156 +-- .../all_shapes_shadow/elk/board.exp.json | 4 +- .../all_shapes_shadow/elk/sketch.exp.svg | 154 +-- .../stable/animated/dagre/board.exp.json | 52 +- .../stable/animated/dagre/sketch.exp.svg | 158 +-- .../arrowhead_labels/dagre/board.exp.json | 4 +- .../arrowhead_labels/dagre/sketch.exp.svg | 158 +-- .../arrowhead_scaling/dagre/board.exp.json | 1166 ++++++++--------- .../arrowhead_scaling/dagre/sketch.exp.svg | 518 ++++---- .../stable/binary_tree/dagre/board.exp.json | 60 +- .../stable/binary_tree/dagre/sketch.exp.svg | 152 +-- .../dagre/board.exp.json | 10 +- .../dagre/sketch.exp.svg | 168 +-- .../stable/border-radius/dagre/board.exp.json | 10 +- .../stable/border-radius/dagre/sketch.exp.svg | 168 +-- .../dagre/board.exp.json | 8 +- .../dagre/sketch.exp.svg | 160 +-- .../stable/chaos2/dagre/board.exp.json | 164 +-- .../stable/chaos2/dagre/sketch.exp.svg | 606 ++++----- .../circle_arrowhead/dagre/board.exp.json | 8 +- .../circle_arrowhead/dagre/sketch.exp.svg | 158 +-- .../circular_dependency/dagre/board.exp.json | 16 +- .../circular_dependency/dagre/sketch.exp.svg | 152 +-- .../complex-layers/dagre/board.exp.json | 60 +- .../complex-layers/dagre/sketch.exp.svg | 228 ++-- .../connected_container/dagre/board.exp.json | 50 +- .../connected_container/dagre/sketch.exp.svg | 174 +-- .../constant_near_title/dagre/board.exp.json | 16 +- .../constant_near_title/dagre/sketch.exp.svg | 554 ++++---- .../container_edges/dagre/board.exp.json | 74 +- .../container_edges/dagre/sketch.exp.svg | 172 +-- .../stable/cycle-order/dagre/board.exp.json | 396 +++--- .../stable/cycle-order/dagre/sketch.exp.svg | 196 +-- .../dagre-container/dagre/board.exp.json | 36 +- .../dagre-container/dagre/sketch.exp.svg | 176 +-- .../stable/dagre_spacing/dagre/board.exp.json | 452 +++---- .../stable/dagre_spacing/dagre/sketch.exp.svg | 220 ++-- .../dagre_spacing_right/dagre/board.exp.json | 456 +++---- .../dagre_spacing_right/dagre/sketch.exp.svg | 220 ++-- .../dagre_spacing_right/elk/board.exp.json | 8 +- .../dagre_spacing_right/elk/sketch.exp.svg | 164 +-- .../stable/dense/dagre/board.exp.json | 84 +- .../stable/dense/dagre/sketch.exp.svg | 152 +-- .../different_subgraphs/dagre/board.exp.json | 86 +- .../different_subgraphs/dagre/sketch.exp.svg | 172 +-- .../stable/direction/dagre/board.exp.json | 102 +- .../stable/direction/dagre/sketch.exp.svg | 180 +-- .../edge-label-overflow/dagre/board.exp.json | 32 +- .../edge-label-overflow/dagre/sketch.exp.svg | 158 +-- .../elk_border_radius/dagre/board.exp.json | 28 +- .../elk_border_radius/dagre/sketch.exp.svg | 152 +-- .../elk_container_height/dagre/board.exp.json | 6 +- .../elk_container_height/dagre/sketch.exp.svg | 164 +-- .../stable/elk_shim/dagre/board.exp.json | 252 ++-- .../stable/elk_shim/dagre/sketch.exp.svg | 202 +-- .../stable/ent2d2_basic/dagre/board.exp.json | 36 +- .../stable/ent2d2_basic/dagre/sketch.exp.svg | 158 +-- .../stable/ent2d2_right/dagre/board.exp.json | 130 +- .../stable/ent2d2_right/dagre/sketch.exp.svg | 174 +-- .../stable/font_colors/dagre/board.exp.json | 4 +- .../stable/font_colors/dagre/sketch.exp.svg | 158 +-- .../dagre/board.exp.json | 22 +- .../dagre/sketch.exp.svg | 170 +-- .../dagre/board.exp.json | 34 +- .../dagre/sketch.exp.svg | 170 +-- .../stable/grid_icon/dagre/board.exp.json | 138 +- .../stable/grid_icon/dagre/sketch.exp.svg | 212 +-- .../stable/grid_nested/dagre/board.exp.json | 214 +-- .../stable/grid_nested/dagre/sketch.exp.svg | 256 ++-- .../stable/hexagon_3d/dagre/board.exp.json | 2 +- .../stable/hexagon_3d/dagre/sketch.exp.svg | 160 +-- .../icon-containers/dagre/board.exp.json | 20 +- .../icon-containers/dagre/sketch.exp.svg | 168 +-- .../stable/icon-label/dagre/board.exp.json | 2 +- .../stable/icon-label/dagre/sketch.exp.svg | 154 +-- .../icon_positions/dagre/board.exp.json | 466 +++---- .../icon_positions/dagre/sketch.exp.svg | 342 ++--- .../stable/images/dagre/board.exp.json | 8 +- .../stable/images/dagre/sketch.exp.svg | 156 +-- .../stable/investigate/dagre/board.exp.json | 496 +++---- .../stable/investigate/dagre/sketch.exp.svg | 226 ++-- .../stable/investigate/elk/board.exp.json | 20 +- .../stable/investigate/elk/sketch.exp.svg | 164 +-- .../label_positions/dagre/board.exp.json | 776 +++++------ .../label_positions/dagre/sketch.exp.svg | 432 +++--- .../stable/large_arch/dagre/board.exp.json | 336 ++--- .../stable/large_arch/dagre/sketch.exp.svg | 208 +-- .../stable/large_arch/elk/board.exp.json | 22 +- .../stable/large_arch/elk/sketch.exp.svg | 158 +-- .../stable/latex/dagre/board.exp.json | 12 +- .../stable/latex/dagre/sketch.exp.svg | 552 ++++---- .../testdata/stable/latex/elk/board.exp.json | 4 +- .../testdata/stable/latex/elk/sketch.exp.svg | 552 ++++---- .../legend_with_near_key/dagre/board.exp.json | 10 +- .../legend_with_near_key/dagre/sketch.exp.svg | 558 ++++---- .../markdown_stroke_fill/dagre/board.exp.json | 14 +- .../markdown_stroke_fill/dagre/sketch.exp.svg | 564 ++++---- .../md_2space_newline/dagre/board.exp.json | 10 +- .../md_2space_newline/dagre/sketch.exp.svg | 556 ++++---- .../md_backslash_newline/dagre/board.exp.json | 10 +- .../md_backslash_newline/dagre/sketch.exp.svg | 556 ++++---- .../stable/mono-font/dagre/board.exp.json | 46 +- .../stable/mono-font/dagre/sketch.exp.svg | 170 +-- .../stable/mono-font/elk/board.exp.json | 2 +- .../stable/mono-font/elk/sketch.exp.svg | 160 +-- .../dagre/board.exp.json | 92 +- .../dagre/sketch.exp.svg | 172 +-- .../multiple_offset/dagre/board.exp.json | 314 ++--- .../multiple_offset/dagre/sketch.exp.svg | 256 ++-- .../multiple_offset_left/dagre/board.exp.json | 308 ++--- .../multiple_offset_left/dagre/sketch.exp.svg | 256 ++-- .../dagre/board.exp.json | 2 +- .../dagre/sketch.exp.svg | 156 +-- .../multiple_trees/dagre/board.exp.json | 88 +- .../multiple_trees/dagre/sketch.exp.svg | 152 +-- .../stable/n22_e32/dagre/board.exp.json | 88 +- .../stable/n22_e32/dagre/sketch.exp.svg | 152 +-- .../dagre/board.exp.json | 176 +-- .../dagre/sketch.exp.svg | 202 +-- .../nested_shape_labels/dagre/board.exp.json | 12 +- .../nested_shape_labels/dagre/sketch.exp.svg | 168 +-- .../one_container_loop/dagre/board.exp.json | 28 +- .../one_container_loop/dagre/sketch.exp.svg | 166 +-- .../dagre/board.exp.json | 48 +- .../dagre/sketch.exp.svg | 168 +-- .../dagre/board.exp.json | 82 +- .../dagre/sketch.exp.svg | 158 +-- .../dagre/board.exp.json | 112 +- .../dagre/sketch.exp.svg | 202 +-- .../self-referencing/dagre/board.exp.json | 40 +- .../self-referencing/dagre/sketch.exp.svg | 158 +-- .../sequence_diagrams/dagre/board.exp.json | 244 ++-- .../sequence_diagrams/dagre/sketch.exp.svg | 220 ++-- .../sequence_diagrams/elk/board.exp.json | 4 +- .../sequence_diagrams/elk/sketch.exp.svg | 164 +-- .../stable/square_3d/dagre/board.exp.json | 20 +- .../stable/square_3d/dagre/sketch.exp.svg | 166 +-- .../dagre/board.exp.json | 184 +-- .../dagre/sketch.exp.svg | 204 +-- .../stable/stylish/dagre/board.exp.json | 20 +- .../stable/stylish/dagre/sketch.exp.svg | 172 +-- .../stable/teleport_grid/dagre/board.exp.json | 100 +- .../stable/teleport_grid/dagre/sketch.exp.svg | 604 ++++----- .../transparent_3d/dagre/board.exp.json | 2 +- .../transparent_3d/dagre/sketch.exp.svg | 160 +-- .../stable/us_map/dagre/board.exp.json | 356 ++--- .../stable/us_map/dagre/sketch.exp.svg | 152 +-- .../dagre/board.exp.json | 258 ++-- .../dagre/sketch.exp.svg | 624 ++++----- .../themes/origami/dagre/board.exp.json | 284 ++-- .../themes/origami/dagre/sketch.exp.svg | 204 +-- .../themes/terminal/dagre/board.exp.json | 274 ++-- .../themes/terminal/dagre/sketch.exp.svg | 618 ++++----- .../terminal_grayscale/dagre/board.exp.json | 246 ++-- .../terminal_grayscale/dagre/sketch.exp.svg | 198 +-- .../container_icon_label/dagre/board.exp.json | 34 +- .../container_icon_label/dagre/sketch.exp.svg | 170 +-- .../dagre/board.exp.json | 33 +- .../dagre/sketch.exp.svg | 162 +-- .../dagre/board.exp.json | 14 +- .../dagre/sketch.exp.svg | 170 +-- .../dagre/board.exp.json | 20 +- .../dagre/sketch.exp.svg | 554 ++++---- .../dagre/board.exp.json | 28 +- .../dagre/sketch.exp.svg | 588 ++++----- .../japanese-full/dagre/board.exp.json | 4 +- .../japanese-full/dagre/sketch.exp.svg | 158 +-- .../mixed-language/dagre/board.exp.json | 8 +- .../mixed-language/dagre/sketch.exp.svg | 554 ++++---- 278 files changed, 25220 insertions(+), 25217 deletions(-) diff --git a/d2renderers/d2sketch/testdata/all_shapes/sketch.exp.svg b/d2renderers/d2sketch/testdata/all_shapes/sketch.exp.svg index 9d890f6ad..84b8e7c33 100644 --- a/d2renderers/d2sketch/testdata/all_shapes/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/all_shapes/sketch.exp.svg @@ -1,9 +1,9 @@ - + .d2-324871669 .fill-N1{fill:#0A0F25;} + .d2-324871669 .fill-N2{fill:#676C7E;} + .d2-324871669 .fill-N3{fill:#9499AB;} + .d2-324871669 .fill-N4{fill:#CFD2DD;} + .d2-324871669 .fill-N5{fill:#DEE1EB;} + .d2-324871669 .fill-N6{fill:#EEF1F8;} + .d2-324871669 .fill-N7{fill:#FFFFFF;} + .d2-324871669 .fill-B1{fill:#0D32B2;} + .d2-324871669 .fill-B2{fill:#0D32B2;} + .d2-324871669 .fill-B3{fill:#E3E9FD;} + .d2-324871669 .fill-B4{fill:#E3E9FD;} + .d2-324871669 .fill-B5{fill:#EDF0FD;} + .d2-324871669 .fill-B6{fill:#F7F8FE;} + .d2-324871669 .fill-AA2{fill:#4A6FF3;} + .d2-324871669 .fill-AA4{fill:#EDF0FD;} + .d2-324871669 .fill-AA5{fill:#F7F8FE;} + .d2-324871669 .fill-AB4{fill:#EDF0FD;} + .d2-324871669 .fill-AB5{fill:#F7F8FE;} + .d2-324871669 .stroke-N1{stroke:#0A0F25;} + .d2-324871669 .stroke-N2{stroke:#676C7E;} + .d2-324871669 .stroke-N3{stroke:#9499AB;} + .d2-324871669 .stroke-N4{stroke:#CFD2DD;} + .d2-324871669 .stroke-N5{stroke:#DEE1EB;} + .d2-324871669 .stroke-N6{stroke:#EEF1F8;} + .d2-324871669 .stroke-N7{stroke:#FFFFFF;} + .d2-324871669 .stroke-B1{stroke:#0D32B2;} + .d2-324871669 .stroke-B2{stroke:#0D32B2;} + .d2-324871669 .stroke-B3{stroke:#E3E9FD;} + .d2-324871669 .stroke-B4{stroke:#E3E9FD;} + .d2-324871669 .stroke-B5{stroke:#EDF0FD;} + .d2-324871669 .stroke-B6{stroke:#F7F8FE;} + .d2-324871669 .stroke-AA2{stroke:#4A6FF3;} + .d2-324871669 .stroke-AA4{stroke:#EDF0FD;} + .d2-324871669 .stroke-AA5{stroke:#F7F8FE;} + .d2-324871669 .stroke-AB4{stroke:#EDF0FD;} + .d2-324871669 .stroke-AB5{stroke:#F7F8FE;} + .d2-324871669 .background-color-N1{background-color:#0A0F25;} + .d2-324871669 .background-color-N2{background-color:#676C7E;} + .d2-324871669 .background-color-N3{background-color:#9499AB;} + .d2-324871669 .background-color-N4{background-color:#CFD2DD;} + .d2-324871669 .background-color-N5{background-color:#DEE1EB;} + .d2-324871669 .background-color-N6{background-color:#EEF1F8;} + .d2-324871669 .background-color-N7{background-color:#FFFFFF;} + .d2-324871669 .background-color-B1{background-color:#0D32B2;} + .d2-324871669 .background-color-B2{background-color:#0D32B2;} + .d2-324871669 .background-color-B3{background-color:#E3E9FD;} + .d2-324871669 .background-color-B4{background-color:#E3E9FD;} + .d2-324871669 .background-color-B5{background-color:#EDF0FD;} + .d2-324871669 .background-color-B6{background-color:#F7F8FE;} + .d2-324871669 .background-color-AA2{background-color:#4A6FF3;} + .d2-324871669 .background-color-AA4{background-color:#EDF0FD;} + .d2-324871669 .background-color-AA5{background-color:#F7F8FE;} + .d2-324871669 .background-color-AB4{background-color:#EDF0FD;} + .d2-324871669 .background-color-AB5{background-color:#F7F8FE;} + .d2-324871669 .color-N1{color:#0A0F25;} + .d2-324871669 .color-N2{color:#676C7E;} + .d2-324871669 .color-N3{color:#9499AB;} + .d2-324871669 .color-N4{color:#CFD2DD;} + .d2-324871669 .color-N5{color:#DEE1EB;} + .d2-324871669 .color-N6{color:#EEF1F8;} + .d2-324871669 .color-N7{color:#FFFFFF;} + .d2-324871669 .color-B1{color:#0D32B2;} + .d2-324871669 .color-B2{color:#0D32B2;} + .d2-324871669 .color-B3{color:#E3E9FD;} + .d2-324871669 .color-B4{color:#E3E9FD;} + .d2-324871669 .color-B5{color:#EDF0FD;} + .d2-324871669 .color-B6{color:#F7F8FE;} + .d2-324871669 .color-AA2{color:#4A6FF3;} + .d2-324871669 .color-AA4{color:#EDF0FD;} + .d2-324871669 .color-AA5{color:#F7F8FE;} + .d2-324871669 .color-AB4{color:#EDF0FD;} + .d2-324871669 .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 @@ -110,7 +110,7 @@ - + diff --git a/d2renderers/d2sketch/testdata/all_shapes_dark/sketch.exp.svg b/d2renderers/d2sketch/testdata/all_shapes_dark/sketch.exp.svg index 767d96afd..daa14ad8f 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-324871669 .fill-N1{fill:#CDD6F4;} + .d2-324871669 .fill-N2{fill:#BAC2DE;} + .d2-324871669 .fill-N3{fill:#A6ADC8;} + .d2-324871669 .fill-N4{fill:#585B70;} + .d2-324871669 .fill-N5{fill:#45475A;} + .d2-324871669 .fill-N6{fill:#313244;} + .d2-324871669 .fill-N7{fill:#1E1E2E;} + .d2-324871669 .fill-B1{fill:#CBA6f7;} + .d2-324871669 .fill-B2{fill:#CBA6f7;} + .d2-324871669 .fill-B3{fill:#6C7086;} + .d2-324871669 .fill-B4{fill:#585B70;} + .d2-324871669 .fill-B5{fill:#45475A;} + .d2-324871669 .fill-B6{fill:#313244;} + .d2-324871669 .fill-AA2{fill:#f38BA8;} + .d2-324871669 .fill-AA4{fill:#45475A;} + .d2-324871669 .fill-AA5{fill:#313244;} + .d2-324871669 .fill-AB4{fill:#45475A;} + .d2-324871669 .fill-AB5{fill:#313244;} + .d2-324871669 .stroke-N1{stroke:#CDD6F4;} + .d2-324871669 .stroke-N2{stroke:#BAC2DE;} + .d2-324871669 .stroke-N3{stroke:#A6ADC8;} + .d2-324871669 .stroke-N4{stroke:#585B70;} + .d2-324871669 .stroke-N5{stroke:#45475A;} + .d2-324871669 .stroke-N6{stroke:#313244;} + .d2-324871669 .stroke-N7{stroke:#1E1E2E;} + .d2-324871669 .stroke-B1{stroke:#CBA6f7;} + .d2-324871669 .stroke-B2{stroke:#CBA6f7;} + .d2-324871669 .stroke-B3{stroke:#6C7086;} + .d2-324871669 .stroke-B4{stroke:#585B70;} + .d2-324871669 .stroke-B5{stroke:#45475A;} + .d2-324871669 .stroke-B6{stroke:#313244;} + .d2-324871669 .stroke-AA2{stroke:#f38BA8;} + .d2-324871669 .stroke-AA4{stroke:#45475A;} + .d2-324871669 .stroke-AA5{stroke:#313244;} + .d2-324871669 .stroke-AB4{stroke:#45475A;} + .d2-324871669 .stroke-AB5{stroke:#313244;} + .d2-324871669 .background-color-N1{background-color:#CDD6F4;} + .d2-324871669 .background-color-N2{background-color:#BAC2DE;} + .d2-324871669 .background-color-N3{background-color:#A6ADC8;} + .d2-324871669 .background-color-N4{background-color:#585B70;} + .d2-324871669 .background-color-N5{background-color:#45475A;} + .d2-324871669 .background-color-N6{background-color:#313244;} + .d2-324871669 .background-color-N7{background-color:#1E1E2E;} + .d2-324871669 .background-color-B1{background-color:#CBA6f7;} + .d2-324871669 .background-color-B2{background-color:#CBA6f7;} + .d2-324871669 .background-color-B3{background-color:#6C7086;} + .d2-324871669 .background-color-B4{background-color:#585B70;} + .d2-324871669 .background-color-B5{background-color:#45475A;} + .d2-324871669 .background-color-B6{background-color:#313244;} + .d2-324871669 .background-color-AA2{background-color:#f38BA8;} + .d2-324871669 .background-color-AA4{background-color:#45475A;} + .d2-324871669 .background-color-AA5{background-color:#313244;} + .d2-324871669 .background-color-AB4{background-color:#45475A;} + .d2-324871669 .background-color-AB5{background-color:#313244;} + .d2-324871669 .color-N1{color:#CDD6F4;} + .d2-324871669 .color-N2{color:#BAC2DE;} + .d2-324871669 .color-N3{color:#A6ADC8;} + .d2-324871669 .color-N4{color:#585B70;} + .d2-324871669 .color-N5{color:#45475A;} + .d2-324871669 .color-N6{color:#313244;} + .d2-324871669 .color-N7{color:#1E1E2E;} + .d2-324871669 .color-B1{color:#CBA6f7;} + .d2-324871669 .color-B2{color:#CBA6f7;} + .d2-324871669 .color-B3{color:#6C7086;} + .d2-324871669 .color-B4{color:#585B70;} + .d2-324871669 .color-B5{color:#45475A;} + .d2-324871669 .color-B6{color:#313244;} + .d2-324871669 .color-AA2{color:#f38BA8;} + .d2-324871669 .color-AA4{color:#45475A;} + .d2-324871669 .color-AA5{color:#313244;} + .d2-324871669 .color-AB4{color:#45475A;} + .d2-324871669 .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 @@ -108,7 +108,7 @@ - + diff --git a/d2renderers/d2sketch/testdata/animated/sketch.exp.svg b/d2renderers/d2sketch/testdata/animated/sketch.exp.svg index e3da23c82..ff6000380 100644 --- a/d2renderers/d2sketch/testdata/animated/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/animated/sketch.exp.svg @@ -1,9 +1,9 @@ - + .d2-4283185193 .fill-N1{fill:#0A0F25;} + .d2-4283185193 .fill-N2{fill:#676C7E;} + .d2-4283185193 .fill-N3{fill:#9499AB;} + .d2-4283185193 .fill-N4{fill:#CFD2DD;} + .d2-4283185193 .fill-N5{fill:#DEE1EB;} + .d2-4283185193 .fill-N6{fill:#EEF1F8;} + .d2-4283185193 .fill-N7{fill:#FFFFFF;} + .d2-4283185193 .fill-B1{fill:#0D32B2;} + .d2-4283185193 .fill-B2{fill:#0D32B2;} + .d2-4283185193 .fill-B3{fill:#E3E9FD;} + .d2-4283185193 .fill-B4{fill:#E3E9FD;} + .d2-4283185193 .fill-B5{fill:#EDF0FD;} + .d2-4283185193 .fill-B6{fill:#F7F8FE;} + .d2-4283185193 .fill-AA2{fill:#4A6FF3;} + .d2-4283185193 .fill-AA4{fill:#EDF0FD;} + .d2-4283185193 .fill-AA5{fill:#F7F8FE;} + .d2-4283185193 .fill-AB4{fill:#EDF0FD;} + .d2-4283185193 .fill-AB5{fill:#F7F8FE;} + .d2-4283185193 .stroke-N1{stroke:#0A0F25;} + .d2-4283185193 .stroke-N2{stroke:#676C7E;} + .d2-4283185193 .stroke-N3{stroke:#9499AB;} + .d2-4283185193 .stroke-N4{stroke:#CFD2DD;} + .d2-4283185193 .stroke-N5{stroke:#DEE1EB;} + .d2-4283185193 .stroke-N6{stroke:#EEF1F8;} + .d2-4283185193 .stroke-N7{stroke:#FFFFFF;} + .d2-4283185193 .stroke-B1{stroke:#0D32B2;} + .d2-4283185193 .stroke-B2{stroke:#0D32B2;} + .d2-4283185193 .stroke-B3{stroke:#E3E9FD;} + .d2-4283185193 .stroke-B4{stroke:#E3E9FD;} + .d2-4283185193 .stroke-B5{stroke:#EDF0FD;} + .d2-4283185193 .stroke-B6{stroke:#F7F8FE;} + .d2-4283185193 .stroke-AA2{stroke:#4A6FF3;} + .d2-4283185193 .stroke-AA4{stroke:#EDF0FD;} + .d2-4283185193 .stroke-AA5{stroke:#F7F8FE;} + .d2-4283185193 .stroke-AB4{stroke:#EDF0FD;} + .d2-4283185193 .stroke-AB5{stroke:#F7F8FE;} + .d2-4283185193 .background-color-N1{background-color:#0A0F25;} + .d2-4283185193 .background-color-N2{background-color:#676C7E;} + .d2-4283185193 .background-color-N3{background-color:#9499AB;} + .d2-4283185193 .background-color-N4{background-color:#CFD2DD;} + .d2-4283185193 .background-color-N5{background-color:#DEE1EB;} + .d2-4283185193 .background-color-N6{background-color:#EEF1F8;} + .d2-4283185193 .background-color-N7{background-color:#FFFFFF;} + .d2-4283185193 .background-color-B1{background-color:#0D32B2;} + .d2-4283185193 .background-color-B2{background-color:#0D32B2;} + .d2-4283185193 .background-color-B3{background-color:#E3E9FD;} + .d2-4283185193 .background-color-B4{background-color:#E3E9FD;} + .d2-4283185193 .background-color-B5{background-color:#EDF0FD;} + .d2-4283185193 .background-color-B6{background-color:#F7F8FE;} + .d2-4283185193 .background-color-AA2{background-color:#4A6FF3;} + .d2-4283185193 .background-color-AA4{background-color:#EDF0FD;} + .d2-4283185193 .background-color-AA5{background-color:#F7F8FE;} + .d2-4283185193 .background-color-AB4{background-color:#EDF0FD;} + .d2-4283185193 .background-color-AB5{background-color:#F7F8FE;} + .d2-4283185193 .color-N1{color:#0A0F25;} + .d2-4283185193 .color-N2{color:#676C7E;} + .d2-4283185193 .color-N3{color:#9499AB;} + .d2-4283185193 .color-N4{color:#CFD2DD;} + .d2-4283185193 .color-N5{color:#DEE1EB;} + .d2-4283185193 .color-N6{color:#EEF1F8;} + .d2-4283185193 .color-N7{color:#FFFFFF;} + .d2-4283185193 .color-B1{color:#0D32B2;} + .d2-4283185193 .color-B2{color:#0D32B2;} + .d2-4283185193 .color-B3{color:#E3E9FD;} + .d2-4283185193 .color-B4{color:#E3E9FD;} + .d2-4283185193 .color-B5{color:#EDF0FD;} + .d2-4283185193 .color-B6{color:#F7F8FE;} + .d2-4283185193 .color-AA2{color:#4A6FF3;} + .d2-4283185193 .color-AA4{color:#EDF0FD;} + .d2-4283185193 .color-AA5{color:#F7F8FE;} + .d2-4283185193 .color-AB4{color:#EDF0FD;} + .d2-4283185193 .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}]]> @@ -110,11 +110,11 @@ -wintersummertreessnowsun - - - +wintersummertreessnowsun + + + - - + + \ No newline at end of file diff --git a/d2renderers/d2sketch/testdata/animated_dark/sketch.exp.svg b/d2renderers/d2sketch/testdata/animated_dark/sketch.exp.svg index 8eededaa0..b79c12f4d 100644 --- a/d2renderers/d2sketch/testdata/animated_dark/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/animated_dark/sketch.exp.svg @@ -1,9 +1,9 @@ - + .d2-4283185193 .fill-N1{fill:#CDD6F4;} + .d2-4283185193 .fill-N2{fill:#BAC2DE;} + .d2-4283185193 .fill-N3{fill:#A6ADC8;} + .d2-4283185193 .fill-N4{fill:#585B70;} + .d2-4283185193 .fill-N5{fill:#45475A;} + .d2-4283185193 .fill-N6{fill:#313244;} + .d2-4283185193 .fill-N7{fill:#1E1E2E;} + .d2-4283185193 .fill-B1{fill:#CBA6f7;} + .d2-4283185193 .fill-B2{fill:#CBA6f7;} + .d2-4283185193 .fill-B3{fill:#6C7086;} + .d2-4283185193 .fill-B4{fill:#585B70;} + .d2-4283185193 .fill-B5{fill:#45475A;} + .d2-4283185193 .fill-B6{fill:#313244;} + .d2-4283185193 .fill-AA2{fill:#f38BA8;} + .d2-4283185193 .fill-AA4{fill:#45475A;} + .d2-4283185193 .fill-AA5{fill:#313244;} + .d2-4283185193 .fill-AB4{fill:#45475A;} + .d2-4283185193 .fill-AB5{fill:#313244;} + .d2-4283185193 .stroke-N1{stroke:#CDD6F4;} + .d2-4283185193 .stroke-N2{stroke:#BAC2DE;} + .d2-4283185193 .stroke-N3{stroke:#A6ADC8;} + .d2-4283185193 .stroke-N4{stroke:#585B70;} + .d2-4283185193 .stroke-N5{stroke:#45475A;} + .d2-4283185193 .stroke-N6{stroke:#313244;} + .d2-4283185193 .stroke-N7{stroke:#1E1E2E;} + .d2-4283185193 .stroke-B1{stroke:#CBA6f7;} + .d2-4283185193 .stroke-B2{stroke:#CBA6f7;} + .d2-4283185193 .stroke-B3{stroke:#6C7086;} + .d2-4283185193 .stroke-B4{stroke:#585B70;} + .d2-4283185193 .stroke-B5{stroke:#45475A;} + .d2-4283185193 .stroke-B6{stroke:#313244;} + .d2-4283185193 .stroke-AA2{stroke:#f38BA8;} + .d2-4283185193 .stroke-AA4{stroke:#45475A;} + .d2-4283185193 .stroke-AA5{stroke:#313244;} + .d2-4283185193 .stroke-AB4{stroke:#45475A;} + .d2-4283185193 .stroke-AB5{stroke:#313244;} + .d2-4283185193 .background-color-N1{background-color:#CDD6F4;} + .d2-4283185193 .background-color-N2{background-color:#BAC2DE;} + .d2-4283185193 .background-color-N3{background-color:#A6ADC8;} + .d2-4283185193 .background-color-N4{background-color:#585B70;} + .d2-4283185193 .background-color-N5{background-color:#45475A;} + .d2-4283185193 .background-color-N6{background-color:#313244;} + .d2-4283185193 .background-color-N7{background-color:#1E1E2E;} + .d2-4283185193 .background-color-B1{background-color:#CBA6f7;} + .d2-4283185193 .background-color-B2{background-color:#CBA6f7;} + .d2-4283185193 .background-color-B3{background-color:#6C7086;} + .d2-4283185193 .background-color-B4{background-color:#585B70;} + .d2-4283185193 .background-color-B5{background-color:#45475A;} + .d2-4283185193 .background-color-B6{background-color:#313244;} + .d2-4283185193 .background-color-AA2{background-color:#f38BA8;} + .d2-4283185193 .background-color-AA4{background-color:#45475A;} + .d2-4283185193 .background-color-AA5{background-color:#313244;} + .d2-4283185193 .background-color-AB4{background-color:#45475A;} + .d2-4283185193 .background-color-AB5{background-color:#313244;} + .d2-4283185193 .color-N1{color:#CDD6F4;} + .d2-4283185193 .color-N2{color:#BAC2DE;} + .d2-4283185193 .color-N3{color:#A6ADC8;} + .d2-4283185193 .color-N4{color:#585B70;} + .d2-4283185193 .color-N5{color:#45475A;} + .d2-4283185193 .color-N6{color:#313244;} + .d2-4283185193 .color-N7{color:#1E1E2E;} + .d2-4283185193 .color-B1{color:#CBA6f7;} + .d2-4283185193 .color-B2{color:#CBA6f7;} + .d2-4283185193 .color-B3{color:#6C7086;} + .d2-4283185193 .color-B4{color:#585B70;} + .d2-4283185193 .color-B5{color:#45475A;} + .d2-4283185193 .color-B6{color:#313244;} + .d2-4283185193 .color-AA2{color:#f38BA8;} + .d2-4283185193 .color-AA4{color:#45475A;} + .d2-4283185193 .color-AA5{color:#313244;} + .d2-4283185193 .color-AB4{color:#45475A;} + .d2-4283185193 .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}]]> -wintersummertreessnowsun - - - +wintersummertreessnowsun + + + - - + + \ No newline at end of file diff --git a/d2renderers/d2sketch/testdata/arrowheads/sketch.exp.svg b/d2renderers/d2sketch/testdata/arrowheads/sketch.exp.svg index 1c7c2251d..150973451 100644 --- a/d2renderers/d2sketch/testdata/arrowheads/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/arrowheads/sketch.exp.svg @@ -1,16 +1,16 @@ - + .d2-1616297415 .fill-N1{fill:#0A0F25;} + .d2-1616297415 .fill-N2{fill:#676C7E;} + .d2-1616297415 .fill-N3{fill:#9499AB;} + .d2-1616297415 .fill-N4{fill:#CFD2DD;} + .d2-1616297415 .fill-N5{fill:#DEE1EB;} + .d2-1616297415 .fill-N6{fill:#EEF1F8;} + .d2-1616297415 .fill-N7{fill:#FFFFFF;} + .d2-1616297415 .fill-B1{fill:#0D32B2;} + .d2-1616297415 .fill-B2{fill:#0D32B2;} + .d2-1616297415 .fill-B3{fill:#E3E9FD;} + .d2-1616297415 .fill-B4{fill:#E3E9FD;} + .d2-1616297415 .fill-B5{fill:#EDF0FD;} + .d2-1616297415 .fill-B6{fill:#F7F8FE;} + .d2-1616297415 .fill-AA2{fill:#4A6FF3;} + .d2-1616297415 .fill-AA4{fill:#EDF0FD;} + .d2-1616297415 .fill-AA5{fill:#F7F8FE;} + .d2-1616297415 .fill-AB4{fill:#EDF0FD;} + .d2-1616297415 .fill-AB5{fill:#F7F8FE;} + .d2-1616297415 .stroke-N1{stroke:#0A0F25;} + .d2-1616297415 .stroke-N2{stroke:#676C7E;} + .d2-1616297415 .stroke-N3{stroke:#9499AB;} + .d2-1616297415 .stroke-N4{stroke:#CFD2DD;} + .d2-1616297415 .stroke-N5{stroke:#DEE1EB;} + .d2-1616297415 .stroke-N6{stroke:#EEF1F8;} + .d2-1616297415 .stroke-N7{stroke:#FFFFFF;} + .d2-1616297415 .stroke-B1{stroke:#0D32B2;} + .d2-1616297415 .stroke-B2{stroke:#0D32B2;} + .d2-1616297415 .stroke-B3{stroke:#E3E9FD;} + .d2-1616297415 .stroke-B4{stroke:#E3E9FD;} + .d2-1616297415 .stroke-B5{stroke:#EDF0FD;} + .d2-1616297415 .stroke-B6{stroke:#F7F8FE;} + .d2-1616297415 .stroke-AA2{stroke:#4A6FF3;} + .d2-1616297415 .stroke-AA4{stroke:#EDF0FD;} + .d2-1616297415 .stroke-AA5{stroke:#F7F8FE;} + .d2-1616297415 .stroke-AB4{stroke:#EDF0FD;} + .d2-1616297415 .stroke-AB5{stroke:#F7F8FE;} + .d2-1616297415 .background-color-N1{background-color:#0A0F25;} + .d2-1616297415 .background-color-N2{background-color:#676C7E;} + .d2-1616297415 .background-color-N3{background-color:#9499AB;} + .d2-1616297415 .background-color-N4{background-color:#CFD2DD;} + .d2-1616297415 .background-color-N5{background-color:#DEE1EB;} + .d2-1616297415 .background-color-N6{background-color:#EEF1F8;} + .d2-1616297415 .background-color-N7{background-color:#FFFFFF;} + .d2-1616297415 .background-color-B1{background-color:#0D32B2;} + .d2-1616297415 .background-color-B2{background-color:#0D32B2;} + .d2-1616297415 .background-color-B3{background-color:#E3E9FD;} + .d2-1616297415 .background-color-B4{background-color:#E3E9FD;} + .d2-1616297415 .background-color-B5{background-color:#EDF0FD;} + .d2-1616297415 .background-color-B6{background-color:#F7F8FE;} + .d2-1616297415 .background-color-AA2{background-color:#4A6FF3;} + .d2-1616297415 .background-color-AA4{background-color:#EDF0FD;} + .d2-1616297415 .background-color-AA5{background-color:#F7F8FE;} + .d2-1616297415 .background-color-AB4{background-color:#EDF0FD;} + .d2-1616297415 .background-color-AB5{background-color:#F7F8FE;} + .d2-1616297415 .color-N1{color:#0A0F25;} + .d2-1616297415 .color-N2{color:#676C7E;} + .d2-1616297415 .color-N3{color:#9499AB;} + .d2-1616297415 .color-N4{color:#CFD2DD;} + .d2-1616297415 .color-N5{color:#DEE1EB;} + .d2-1616297415 .color-N6{color:#EEF1F8;} + .d2-1616297415 .color-N7{color:#FFFFFF;} + .d2-1616297415 .color-B1{color:#0D32B2;} + .d2-1616297415 .color-B2{color:#0D32B2;} + .d2-1616297415 .color-B3{color:#E3E9FD;} + .d2-1616297415 .color-B4{color:#E3E9FD;} + .d2-1616297415 .color-B5{color:#EDF0FD;} + .d2-1616297415 .color-B6{color:#F7F8FE;} + .d2-1616297415 .color-AA2{color:#4A6FF3;} + .d2-1616297415 .color-AA4{color:#EDF0FD;} + .d2-1616297415 .color-AA5{color:#F7F8FE;} + .d2-1616297415 .color-AB4{color:#EDF0FD;} + .d2-1616297415 .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}]]> @@ -104,8 +104,8 @@ -112233445566778899none arrow triangle diamond diamond filled cf-many cf-many-required cf-one cf-one-required - +112233445566778899none arrow triangle diamond diamond filled cf-many cf-many-required cf-one cf-one-required + diff --git a/d2renderers/d2sketch/testdata/arrowheads_dark/sketch.exp.svg b/d2renderers/d2sketch/testdata/arrowheads_dark/sketch.exp.svg index 8d824fc4d..a7f10b75a 100644 --- a/d2renderers/d2sketch/testdata/arrowheads_dark/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/arrowheads_dark/sketch.exp.svg @@ -1,16 +1,16 @@ - + .d2-1616297415 .fill-N1{fill:#CDD6F4;} + .d2-1616297415 .fill-N2{fill:#BAC2DE;} + .d2-1616297415 .fill-N3{fill:#A6ADC8;} + .d2-1616297415 .fill-N4{fill:#585B70;} + .d2-1616297415 .fill-N5{fill:#45475A;} + .d2-1616297415 .fill-N6{fill:#313244;} + .d2-1616297415 .fill-N7{fill:#1E1E2E;} + .d2-1616297415 .fill-B1{fill:#CBA6f7;} + .d2-1616297415 .fill-B2{fill:#CBA6f7;} + .d2-1616297415 .fill-B3{fill:#6C7086;} + .d2-1616297415 .fill-B4{fill:#585B70;} + .d2-1616297415 .fill-B5{fill:#45475A;} + .d2-1616297415 .fill-B6{fill:#313244;} + .d2-1616297415 .fill-AA2{fill:#f38BA8;} + .d2-1616297415 .fill-AA4{fill:#45475A;} + .d2-1616297415 .fill-AA5{fill:#313244;} + .d2-1616297415 .fill-AB4{fill:#45475A;} + .d2-1616297415 .fill-AB5{fill:#313244;} + .d2-1616297415 .stroke-N1{stroke:#CDD6F4;} + .d2-1616297415 .stroke-N2{stroke:#BAC2DE;} + .d2-1616297415 .stroke-N3{stroke:#A6ADC8;} + .d2-1616297415 .stroke-N4{stroke:#585B70;} + .d2-1616297415 .stroke-N5{stroke:#45475A;} + .d2-1616297415 .stroke-N6{stroke:#313244;} + .d2-1616297415 .stroke-N7{stroke:#1E1E2E;} + .d2-1616297415 .stroke-B1{stroke:#CBA6f7;} + .d2-1616297415 .stroke-B2{stroke:#CBA6f7;} + .d2-1616297415 .stroke-B3{stroke:#6C7086;} + .d2-1616297415 .stroke-B4{stroke:#585B70;} + .d2-1616297415 .stroke-B5{stroke:#45475A;} + .d2-1616297415 .stroke-B6{stroke:#313244;} + .d2-1616297415 .stroke-AA2{stroke:#f38BA8;} + .d2-1616297415 .stroke-AA4{stroke:#45475A;} + .d2-1616297415 .stroke-AA5{stroke:#313244;} + .d2-1616297415 .stroke-AB4{stroke:#45475A;} + .d2-1616297415 .stroke-AB5{stroke:#313244;} + .d2-1616297415 .background-color-N1{background-color:#CDD6F4;} + .d2-1616297415 .background-color-N2{background-color:#BAC2DE;} + .d2-1616297415 .background-color-N3{background-color:#A6ADC8;} + .d2-1616297415 .background-color-N4{background-color:#585B70;} + .d2-1616297415 .background-color-N5{background-color:#45475A;} + .d2-1616297415 .background-color-N6{background-color:#313244;} + .d2-1616297415 .background-color-N7{background-color:#1E1E2E;} + .d2-1616297415 .background-color-B1{background-color:#CBA6f7;} + .d2-1616297415 .background-color-B2{background-color:#CBA6f7;} + .d2-1616297415 .background-color-B3{background-color:#6C7086;} + .d2-1616297415 .background-color-B4{background-color:#585B70;} + .d2-1616297415 .background-color-B5{background-color:#45475A;} + .d2-1616297415 .background-color-B6{background-color:#313244;} + .d2-1616297415 .background-color-AA2{background-color:#f38BA8;} + .d2-1616297415 .background-color-AA4{background-color:#45475A;} + .d2-1616297415 .background-color-AA5{background-color:#313244;} + .d2-1616297415 .background-color-AB4{background-color:#45475A;} + .d2-1616297415 .background-color-AB5{background-color:#313244;} + .d2-1616297415 .color-N1{color:#CDD6F4;} + .d2-1616297415 .color-N2{color:#BAC2DE;} + .d2-1616297415 .color-N3{color:#A6ADC8;} + .d2-1616297415 .color-N4{color:#585B70;} + .d2-1616297415 .color-N5{color:#45475A;} + .d2-1616297415 .color-N6{color:#313244;} + .d2-1616297415 .color-N7{color:#1E1E2E;} + .d2-1616297415 .color-B1{color:#CBA6f7;} + .d2-1616297415 .color-B2{color:#CBA6f7;} + .d2-1616297415 .color-B3{color:#6C7086;} + .d2-1616297415 .color-B4{color:#585B70;} + .d2-1616297415 .color-B5{color:#45475A;} + .d2-1616297415 .color-B6{color:#313244;} + .d2-1616297415 .color-AA2{color:#f38BA8;} + .d2-1616297415 .color-AA4{color:#45475A;} + .d2-1616297415 .color-AA5{color:#313244;} + .d2-1616297415 .color-AB4{color:#45475A;} + .d2-1616297415 .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}]]> -112233445566778899none arrow triangle diamond diamond filled cf-many cf-many-required cf-one cf-one-required - +112233445566778899none arrow triangle diamond diamond filled cf-many cf-many-required cf-one cf-one-required + diff --git a/d2renderers/d2sketch/testdata/child_to_child/sketch.exp.svg b/d2renderers/d2sketch/testdata/child_to_child/sketch.exp.svg index eef04da66..79ebb0171 100644 --- a/d2renderers/d2sketch/testdata/child_to_child/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/child_to_child/sketch.exp.svg @@ -1,16 +1,16 @@ - + .d2-3924832427 .fill-N1{fill:#0A0F25;} + .d2-3924832427 .fill-N2{fill:#676C7E;} + .d2-3924832427 .fill-N3{fill:#9499AB;} + .d2-3924832427 .fill-N4{fill:#CFD2DD;} + .d2-3924832427 .fill-N5{fill:#DEE1EB;} + .d2-3924832427 .fill-N6{fill:#EEF1F8;} + .d2-3924832427 .fill-N7{fill:#FFFFFF;} + .d2-3924832427 .fill-B1{fill:#0D32B2;} + .d2-3924832427 .fill-B2{fill:#0D32B2;} + .d2-3924832427 .fill-B3{fill:#E3E9FD;} + .d2-3924832427 .fill-B4{fill:#E3E9FD;} + .d2-3924832427 .fill-B5{fill:#EDF0FD;} + .d2-3924832427 .fill-B6{fill:#F7F8FE;} + .d2-3924832427 .fill-AA2{fill:#4A6FF3;} + .d2-3924832427 .fill-AA4{fill:#EDF0FD;} + .d2-3924832427 .fill-AA5{fill:#F7F8FE;} + .d2-3924832427 .fill-AB4{fill:#EDF0FD;} + .d2-3924832427 .fill-AB5{fill:#F7F8FE;} + .d2-3924832427 .stroke-N1{stroke:#0A0F25;} + .d2-3924832427 .stroke-N2{stroke:#676C7E;} + .d2-3924832427 .stroke-N3{stroke:#9499AB;} + .d2-3924832427 .stroke-N4{stroke:#CFD2DD;} + .d2-3924832427 .stroke-N5{stroke:#DEE1EB;} + .d2-3924832427 .stroke-N6{stroke:#EEF1F8;} + .d2-3924832427 .stroke-N7{stroke:#FFFFFF;} + .d2-3924832427 .stroke-B1{stroke:#0D32B2;} + .d2-3924832427 .stroke-B2{stroke:#0D32B2;} + .d2-3924832427 .stroke-B3{stroke:#E3E9FD;} + .d2-3924832427 .stroke-B4{stroke:#E3E9FD;} + .d2-3924832427 .stroke-B5{stroke:#EDF0FD;} + .d2-3924832427 .stroke-B6{stroke:#F7F8FE;} + .d2-3924832427 .stroke-AA2{stroke:#4A6FF3;} + .d2-3924832427 .stroke-AA4{stroke:#EDF0FD;} + .d2-3924832427 .stroke-AA5{stroke:#F7F8FE;} + .d2-3924832427 .stroke-AB4{stroke:#EDF0FD;} + .d2-3924832427 .stroke-AB5{stroke:#F7F8FE;} + .d2-3924832427 .background-color-N1{background-color:#0A0F25;} + .d2-3924832427 .background-color-N2{background-color:#676C7E;} + .d2-3924832427 .background-color-N3{background-color:#9499AB;} + .d2-3924832427 .background-color-N4{background-color:#CFD2DD;} + .d2-3924832427 .background-color-N5{background-color:#DEE1EB;} + .d2-3924832427 .background-color-N6{background-color:#EEF1F8;} + .d2-3924832427 .background-color-N7{background-color:#FFFFFF;} + .d2-3924832427 .background-color-B1{background-color:#0D32B2;} + .d2-3924832427 .background-color-B2{background-color:#0D32B2;} + .d2-3924832427 .background-color-B3{background-color:#E3E9FD;} + .d2-3924832427 .background-color-B4{background-color:#E3E9FD;} + .d2-3924832427 .background-color-B5{background-color:#EDF0FD;} + .d2-3924832427 .background-color-B6{background-color:#F7F8FE;} + .d2-3924832427 .background-color-AA2{background-color:#4A6FF3;} + .d2-3924832427 .background-color-AA4{background-color:#EDF0FD;} + .d2-3924832427 .background-color-AA5{background-color:#F7F8FE;} + .d2-3924832427 .background-color-AB4{background-color:#EDF0FD;} + .d2-3924832427 .background-color-AB5{background-color:#F7F8FE;} + .d2-3924832427 .color-N1{color:#0A0F25;} + .d2-3924832427 .color-N2{color:#676C7E;} + .d2-3924832427 .color-N3{color:#9499AB;} + .d2-3924832427 .color-N4{color:#CFD2DD;} + .d2-3924832427 .color-N5{color:#DEE1EB;} + .d2-3924832427 .color-N6{color:#EEF1F8;} + .d2-3924832427 .color-N7{color:#FFFFFF;} + .d2-3924832427 .color-B1{color:#0D32B2;} + .d2-3924832427 .color-B2{color:#0D32B2;} + .d2-3924832427 .color-B3{color:#E3E9FD;} + .d2-3924832427 .color-B4{color:#E3E9FD;} + .d2-3924832427 .color-B5{color:#EDF0FD;} + .d2-3924832427 .color-B6{color:#F7F8FE;} + .d2-3924832427 .color-AA2{color:#4A6FF3;} + .d2-3924832427 .color-AA4{color:#EDF0FD;} + .d2-3924832427 .color-AA5{color:#F7F8FE;} + .d2-3924832427 .color-AB4{color:#EDF0FD;} + .d2-3924832427 .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}]]> @@ -104,10 +104,10 @@ -wintersummersnowsun - - - - - +wintersummersnowsun + + + + + \ No newline at end of file diff --git a/d2renderers/d2sketch/testdata/child_to_child_dark/sketch.exp.svg b/d2renderers/d2sketch/testdata/child_to_child_dark/sketch.exp.svg index ea2f23deb..11f5c2e7d 100644 --- a/d2renderers/d2sketch/testdata/child_to_child_dark/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/child_to_child_dark/sketch.exp.svg @@ -1,16 +1,16 @@ - + .d2-3924832427 .fill-N1{fill:#CDD6F4;} + .d2-3924832427 .fill-N2{fill:#BAC2DE;} + .d2-3924832427 .fill-N3{fill:#A6ADC8;} + .d2-3924832427 .fill-N4{fill:#585B70;} + .d2-3924832427 .fill-N5{fill:#45475A;} + .d2-3924832427 .fill-N6{fill:#313244;} + .d2-3924832427 .fill-N7{fill:#1E1E2E;} + .d2-3924832427 .fill-B1{fill:#CBA6f7;} + .d2-3924832427 .fill-B2{fill:#CBA6f7;} + .d2-3924832427 .fill-B3{fill:#6C7086;} + .d2-3924832427 .fill-B4{fill:#585B70;} + .d2-3924832427 .fill-B5{fill:#45475A;} + .d2-3924832427 .fill-B6{fill:#313244;} + .d2-3924832427 .fill-AA2{fill:#f38BA8;} + .d2-3924832427 .fill-AA4{fill:#45475A;} + .d2-3924832427 .fill-AA5{fill:#313244;} + .d2-3924832427 .fill-AB4{fill:#45475A;} + .d2-3924832427 .fill-AB5{fill:#313244;} + .d2-3924832427 .stroke-N1{stroke:#CDD6F4;} + .d2-3924832427 .stroke-N2{stroke:#BAC2DE;} + .d2-3924832427 .stroke-N3{stroke:#A6ADC8;} + .d2-3924832427 .stroke-N4{stroke:#585B70;} + .d2-3924832427 .stroke-N5{stroke:#45475A;} + .d2-3924832427 .stroke-N6{stroke:#313244;} + .d2-3924832427 .stroke-N7{stroke:#1E1E2E;} + .d2-3924832427 .stroke-B1{stroke:#CBA6f7;} + .d2-3924832427 .stroke-B2{stroke:#CBA6f7;} + .d2-3924832427 .stroke-B3{stroke:#6C7086;} + .d2-3924832427 .stroke-B4{stroke:#585B70;} + .d2-3924832427 .stroke-B5{stroke:#45475A;} + .d2-3924832427 .stroke-B6{stroke:#313244;} + .d2-3924832427 .stroke-AA2{stroke:#f38BA8;} + .d2-3924832427 .stroke-AA4{stroke:#45475A;} + .d2-3924832427 .stroke-AA5{stroke:#313244;} + .d2-3924832427 .stroke-AB4{stroke:#45475A;} + .d2-3924832427 .stroke-AB5{stroke:#313244;} + .d2-3924832427 .background-color-N1{background-color:#CDD6F4;} + .d2-3924832427 .background-color-N2{background-color:#BAC2DE;} + .d2-3924832427 .background-color-N3{background-color:#A6ADC8;} + .d2-3924832427 .background-color-N4{background-color:#585B70;} + .d2-3924832427 .background-color-N5{background-color:#45475A;} + .d2-3924832427 .background-color-N6{background-color:#313244;} + .d2-3924832427 .background-color-N7{background-color:#1E1E2E;} + .d2-3924832427 .background-color-B1{background-color:#CBA6f7;} + .d2-3924832427 .background-color-B2{background-color:#CBA6f7;} + .d2-3924832427 .background-color-B3{background-color:#6C7086;} + .d2-3924832427 .background-color-B4{background-color:#585B70;} + .d2-3924832427 .background-color-B5{background-color:#45475A;} + .d2-3924832427 .background-color-B6{background-color:#313244;} + .d2-3924832427 .background-color-AA2{background-color:#f38BA8;} + .d2-3924832427 .background-color-AA4{background-color:#45475A;} + .d2-3924832427 .background-color-AA5{background-color:#313244;} + .d2-3924832427 .background-color-AB4{background-color:#45475A;} + .d2-3924832427 .background-color-AB5{background-color:#313244;} + .d2-3924832427 .color-N1{color:#CDD6F4;} + .d2-3924832427 .color-N2{color:#BAC2DE;} + .d2-3924832427 .color-N3{color:#A6ADC8;} + .d2-3924832427 .color-N4{color:#585B70;} + .d2-3924832427 .color-N5{color:#45475A;} + .d2-3924832427 .color-N6{color:#313244;} + .d2-3924832427 .color-N7{color:#1E1E2E;} + .d2-3924832427 .color-B1{color:#CBA6f7;} + .d2-3924832427 .color-B2{color:#CBA6f7;} + .d2-3924832427 .color-B3{color:#6C7086;} + .d2-3924832427 .color-B4{color:#585B70;} + .d2-3924832427 .color-B5{color:#45475A;} + .d2-3924832427 .color-B6{color:#313244;} + .d2-3924832427 .color-AA2{color:#f38BA8;} + .d2-3924832427 .color-AA4{color:#45475A;} + .d2-3924832427 .color-AA5{color:#313244;} + .d2-3924832427 .color-AB4{color:#45475A;} + .d2-3924832427 .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}]]> -wintersummersnowsun - - - - - +wintersummersnowsun + + + + + \ No newline at end of file diff --git a/d2renderers/d2sketch/testdata/connection_label/sketch.exp.svg b/d2renderers/d2sketch/testdata/connection_label/sketch.exp.svg index e1e5daa83..dbe261607 100644 --- a/d2renderers/d2sketch/testdata/connection_label/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/connection_label/sketch.exp.svg @@ -1,16 +1,16 @@ - + .d2-1073612227 .fill-N1{fill:#0A0F25;} + .d2-1073612227 .fill-N2{fill:#676C7E;} + .d2-1073612227 .fill-N3{fill:#9499AB;} + .d2-1073612227 .fill-N4{fill:#CFD2DD;} + .d2-1073612227 .fill-N5{fill:#DEE1EB;} + .d2-1073612227 .fill-N6{fill:#EEF1F8;} + .d2-1073612227 .fill-N7{fill:#FFFFFF;} + .d2-1073612227 .fill-B1{fill:#0D32B2;} + .d2-1073612227 .fill-B2{fill:#0D32B2;} + .d2-1073612227 .fill-B3{fill:#E3E9FD;} + .d2-1073612227 .fill-B4{fill:#E3E9FD;} + .d2-1073612227 .fill-B5{fill:#EDF0FD;} + .d2-1073612227 .fill-B6{fill:#F7F8FE;} + .d2-1073612227 .fill-AA2{fill:#4A6FF3;} + .d2-1073612227 .fill-AA4{fill:#EDF0FD;} + .d2-1073612227 .fill-AA5{fill:#F7F8FE;} + .d2-1073612227 .fill-AB4{fill:#EDF0FD;} + .d2-1073612227 .fill-AB5{fill:#F7F8FE;} + .d2-1073612227 .stroke-N1{stroke:#0A0F25;} + .d2-1073612227 .stroke-N2{stroke:#676C7E;} + .d2-1073612227 .stroke-N3{stroke:#9499AB;} + .d2-1073612227 .stroke-N4{stroke:#CFD2DD;} + .d2-1073612227 .stroke-N5{stroke:#DEE1EB;} + .d2-1073612227 .stroke-N6{stroke:#EEF1F8;} + .d2-1073612227 .stroke-N7{stroke:#FFFFFF;} + .d2-1073612227 .stroke-B1{stroke:#0D32B2;} + .d2-1073612227 .stroke-B2{stroke:#0D32B2;} + .d2-1073612227 .stroke-B3{stroke:#E3E9FD;} + .d2-1073612227 .stroke-B4{stroke:#E3E9FD;} + .d2-1073612227 .stroke-B5{stroke:#EDF0FD;} + .d2-1073612227 .stroke-B6{stroke:#F7F8FE;} + .d2-1073612227 .stroke-AA2{stroke:#4A6FF3;} + .d2-1073612227 .stroke-AA4{stroke:#EDF0FD;} + .d2-1073612227 .stroke-AA5{stroke:#F7F8FE;} + .d2-1073612227 .stroke-AB4{stroke:#EDF0FD;} + .d2-1073612227 .stroke-AB5{stroke:#F7F8FE;} + .d2-1073612227 .background-color-N1{background-color:#0A0F25;} + .d2-1073612227 .background-color-N2{background-color:#676C7E;} + .d2-1073612227 .background-color-N3{background-color:#9499AB;} + .d2-1073612227 .background-color-N4{background-color:#CFD2DD;} + .d2-1073612227 .background-color-N5{background-color:#DEE1EB;} + .d2-1073612227 .background-color-N6{background-color:#EEF1F8;} + .d2-1073612227 .background-color-N7{background-color:#FFFFFF;} + .d2-1073612227 .background-color-B1{background-color:#0D32B2;} + .d2-1073612227 .background-color-B2{background-color:#0D32B2;} + .d2-1073612227 .background-color-B3{background-color:#E3E9FD;} + .d2-1073612227 .background-color-B4{background-color:#E3E9FD;} + .d2-1073612227 .background-color-B5{background-color:#EDF0FD;} + .d2-1073612227 .background-color-B6{background-color:#F7F8FE;} + .d2-1073612227 .background-color-AA2{background-color:#4A6FF3;} + .d2-1073612227 .background-color-AA4{background-color:#EDF0FD;} + .d2-1073612227 .background-color-AA5{background-color:#F7F8FE;} + .d2-1073612227 .background-color-AB4{background-color:#EDF0FD;} + .d2-1073612227 .background-color-AB5{background-color:#F7F8FE;} + .d2-1073612227 .color-N1{color:#0A0F25;} + .d2-1073612227 .color-N2{color:#676C7E;} + .d2-1073612227 .color-N3{color:#9499AB;} + .d2-1073612227 .color-N4{color:#CFD2DD;} + .d2-1073612227 .color-N5{color:#DEE1EB;} + .d2-1073612227 .color-N6{color:#EEF1F8;} + .d2-1073612227 .color-N7{color:#FFFFFF;} + .d2-1073612227 .color-B1{color:#0D32B2;} + .d2-1073612227 .color-B2{color:#0D32B2;} + .d2-1073612227 .color-B3{color:#E3E9FD;} + .d2-1073612227 .color-B4{color:#E3E9FD;} + .d2-1073612227 .color-B5{color:#EDF0FD;} + .d2-1073612227 .color-B6{color:#F7F8FE;} + .d2-1073612227 .color-AA2{color:#4A6FF3;} + .d2-1073612227 .color-AA4{color:#EDF0FD;} + .d2-1073612227 .color-AA5{color:#F7F8FE;} + .d2-1073612227 .color-AB4{color:#EDF0FD;} + .d2-1073612227 .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}]]> @@ -104,7 +104,7 @@ -ab hello +ab hello diff --git a/d2renderers/d2sketch/testdata/connection_label_dark/sketch.exp.svg b/d2renderers/d2sketch/testdata/connection_label_dark/sketch.exp.svg index 737ff46ac..bea6382ef 100644 --- a/d2renderers/d2sketch/testdata/connection_label_dark/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/connection_label_dark/sketch.exp.svg @@ -1,16 +1,16 @@ - + .d2-1073612227 .fill-N1{fill:#CDD6F4;} + .d2-1073612227 .fill-N2{fill:#BAC2DE;} + .d2-1073612227 .fill-N3{fill:#A6ADC8;} + .d2-1073612227 .fill-N4{fill:#585B70;} + .d2-1073612227 .fill-N5{fill:#45475A;} + .d2-1073612227 .fill-N6{fill:#313244;} + .d2-1073612227 .fill-N7{fill:#1E1E2E;} + .d2-1073612227 .fill-B1{fill:#CBA6f7;} + .d2-1073612227 .fill-B2{fill:#CBA6f7;} + .d2-1073612227 .fill-B3{fill:#6C7086;} + .d2-1073612227 .fill-B4{fill:#585B70;} + .d2-1073612227 .fill-B5{fill:#45475A;} + .d2-1073612227 .fill-B6{fill:#313244;} + .d2-1073612227 .fill-AA2{fill:#f38BA8;} + .d2-1073612227 .fill-AA4{fill:#45475A;} + .d2-1073612227 .fill-AA5{fill:#313244;} + .d2-1073612227 .fill-AB4{fill:#45475A;} + .d2-1073612227 .fill-AB5{fill:#313244;} + .d2-1073612227 .stroke-N1{stroke:#CDD6F4;} + .d2-1073612227 .stroke-N2{stroke:#BAC2DE;} + .d2-1073612227 .stroke-N3{stroke:#A6ADC8;} + .d2-1073612227 .stroke-N4{stroke:#585B70;} + .d2-1073612227 .stroke-N5{stroke:#45475A;} + .d2-1073612227 .stroke-N6{stroke:#313244;} + .d2-1073612227 .stroke-N7{stroke:#1E1E2E;} + .d2-1073612227 .stroke-B1{stroke:#CBA6f7;} + .d2-1073612227 .stroke-B2{stroke:#CBA6f7;} + .d2-1073612227 .stroke-B3{stroke:#6C7086;} + .d2-1073612227 .stroke-B4{stroke:#585B70;} + .d2-1073612227 .stroke-B5{stroke:#45475A;} + .d2-1073612227 .stroke-B6{stroke:#313244;} + .d2-1073612227 .stroke-AA2{stroke:#f38BA8;} + .d2-1073612227 .stroke-AA4{stroke:#45475A;} + .d2-1073612227 .stroke-AA5{stroke:#313244;} + .d2-1073612227 .stroke-AB4{stroke:#45475A;} + .d2-1073612227 .stroke-AB5{stroke:#313244;} + .d2-1073612227 .background-color-N1{background-color:#CDD6F4;} + .d2-1073612227 .background-color-N2{background-color:#BAC2DE;} + .d2-1073612227 .background-color-N3{background-color:#A6ADC8;} + .d2-1073612227 .background-color-N4{background-color:#585B70;} + .d2-1073612227 .background-color-N5{background-color:#45475A;} + .d2-1073612227 .background-color-N6{background-color:#313244;} + .d2-1073612227 .background-color-N7{background-color:#1E1E2E;} + .d2-1073612227 .background-color-B1{background-color:#CBA6f7;} + .d2-1073612227 .background-color-B2{background-color:#CBA6f7;} + .d2-1073612227 .background-color-B3{background-color:#6C7086;} + .d2-1073612227 .background-color-B4{background-color:#585B70;} + .d2-1073612227 .background-color-B5{background-color:#45475A;} + .d2-1073612227 .background-color-B6{background-color:#313244;} + .d2-1073612227 .background-color-AA2{background-color:#f38BA8;} + .d2-1073612227 .background-color-AA4{background-color:#45475A;} + .d2-1073612227 .background-color-AA5{background-color:#313244;} + .d2-1073612227 .background-color-AB4{background-color:#45475A;} + .d2-1073612227 .background-color-AB5{background-color:#313244;} + .d2-1073612227 .color-N1{color:#CDD6F4;} + .d2-1073612227 .color-N2{color:#BAC2DE;} + .d2-1073612227 .color-N3{color:#A6ADC8;} + .d2-1073612227 .color-N4{color:#585B70;} + .d2-1073612227 .color-N5{color:#45475A;} + .d2-1073612227 .color-N6{color:#313244;} + .d2-1073612227 .color-N7{color:#1E1E2E;} + .d2-1073612227 .color-B1{color:#CBA6f7;} + .d2-1073612227 .color-B2{color:#CBA6f7;} + .d2-1073612227 .color-B3{color:#6C7086;} + .d2-1073612227 .color-B4{color:#585B70;} + .d2-1073612227 .color-B5{color:#45475A;} + .d2-1073612227 .color-B6{color:#313244;} + .d2-1073612227 .color-AA2{color:#f38BA8;} + .d2-1073612227 .color-AA4{color:#45475A;} + .d2-1073612227 .color-AA5{color:#313244;} + .d2-1073612227 .color-AB4{color:#45475A;} + .d2-1073612227 .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}]]> -ab hello +ab hello diff --git a/d2renderers/d2sketch/testdata/dots-3d/sketch.exp.svg b/d2renderers/d2sketch/testdata/dots-3d/sketch.exp.svg index 189facffc..1e92714dc 100644 --- a/d2renderers/d2sketch/testdata/dots-3d/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/dots-3d/sketch.exp.svg @@ -1,9 +1,9 @@ - + .d2-4178408065 .fill-N1{fill:#0A0F25;} + .d2-4178408065 .fill-N2{fill:#676C7E;} + .d2-4178408065 .fill-N3{fill:#9499AB;} + .d2-4178408065 .fill-N4{fill:#CFD2DD;} + .d2-4178408065 .fill-N5{fill:#DEE1EB;} + .d2-4178408065 .fill-N6{fill:#EEF1F8;} + .d2-4178408065 .fill-N7{fill:#FFFFFF;} + .d2-4178408065 .fill-B1{fill:#0D32B2;} + .d2-4178408065 .fill-B2{fill:#0D32B2;} + .d2-4178408065 .fill-B3{fill:#E3E9FD;} + .d2-4178408065 .fill-B4{fill:#E3E9FD;} + .d2-4178408065 .fill-B5{fill:#EDF0FD;} + .d2-4178408065 .fill-B6{fill:#F7F8FE;} + .d2-4178408065 .fill-AA2{fill:#4A6FF3;} + .d2-4178408065 .fill-AA4{fill:#EDF0FD;} + .d2-4178408065 .fill-AA5{fill:#F7F8FE;} + .d2-4178408065 .fill-AB4{fill:#EDF0FD;} + .d2-4178408065 .fill-AB5{fill:#F7F8FE;} + .d2-4178408065 .stroke-N1{stroke:#0A0F25;} + .d2-4178408065 .stroke-N2{stroke:#676C7E;} + .d2-4178408065 .stroke-N3{stroke:#9499AB;} + .d2-4178408065 .stroke-N4{stroke:#CFD2DD;} + .d2-4178408065 .stroke-N5{stroke:#DEE1EB;} + .d2-4178408065 .stroke-N6{stroke:#EEF1F8;} + .d2-4178408065 .stroke-N7{stroke:#FFFFFF;} + .d2-4178408065 .stroke-B1{stroke:#0D32B2;} + .d2-4178408065 .stroke-B2{stroke:#0D32B2;} + .d2-4178408065 .stroke-B3{stroke:#E3E9FD;} + .d2-4178408065 .stroke-B4{stroke:#E3E9FD;} + .d2-4178408065 .stroke-B5{stroke:#EDF0FD;} + .d2-4178408065 .stroke-B6{stroke:#F7F8FE;} + .d2-4178408065 .stroke-AA2{stroke:#4A6FF3;} + .d2-4178408065 .stroke-AA4{stroke:#EDF0FD;} + .d2-4178408065 .stroke-AA5{stroke:#F7F8FE;} + .d2-4178408065 .stroke-AB4{stroke:#EDF0FD;} + .d2-4178408065 .stroke-AB5{stroke:#F7F8FE;} + .d2-4178408065 .background-color-N1{background-color:#0A0F25;} + .d2-4178408065 .background-color-N2{background-color:#676C7E;} + .d2-4178408065 .background-color-N3{background-color:#9499AB;} + .d2-4178408065 .background-color-N4{background-color:#CFD2DD;} + .d2-4178408065 .background-color-N5{background-color:#DEE1EB;} + .d2-4178408065 .background-color-N6{background-color:#EEF1F8;} + .d2-4178408065 .background-color-N7{background-color:#FFFFFF;} + .d2-4178408065 .background-color-B1{background-color:#0D32B2;} + .d2-4178408065 .background-color-B2{background-color:#0D32B2;} + .d2-4178408065 .background-color-B3{background-color:#E3E9FD;} + .d2-4178408065 .background-color-B4{background-color:#E3E9FD;} + .d2-4178408065 .background-color-B5{background-color:#EDF0FD;} + .d2-4178408065 .background-color-B6{background-color:#F7F8FE;} + .d2-4178408065 .background-color-AA2{background-color:#4A6FF3;} + .d2-4178408065 .background-color-AA4{background-color:#EDF0FD;} + .d2-4178408065 .background-color-AA5{background-color:#F7F8FE;} + .d2-4178408065 .background-color-AB4{background-color:#EDF0FD;} + .d2-4178408065 .background-color-AB5{background-color:#F7F8FE;} + .d2-4178408065 .color-N1{color:#0A0F25;} + .d2-4178408065 .color-N2{color:#676C7E;} + .d2-4178408065 .color-N3{color:#9499AB;} + .d2-4178408065 .color-N4{color:#CFD2DD;} + .d2-4178408065 .color-N5{color:#DEE1EB;} + .d2-4178408065 .color-N6{color:#EEF1F8;} + .d2-4178408065 .color-N7{color:#FFFFFF;} + .d2-4178408065 .color-B1{color:#0D32B2;} + .d2-4178408065 .color-B2{color:#0D32B2;} + .d2-4178408065 .color-B3{color:#E3E9FD;} + .d2-4178408065 .color-B4{color:#E3E9FD;} + .d2-4178408065 .color-B5{color:#EDF0FD;} + .d2-4178408065 .color-B6{color:#F7F8FE;} + .d2-4178408065 .color-AA2{color:#4A6FF3;} + .d2-4178408065 .color-AA4{color:#EDF0FD;} + .d2-4178408065 .color-AA5{color:#F7F8FE;} + .d2-4178408065 .color-AB4{color:#EDF0FD;} + .d2-4178408065 .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,12 +130,12 @@ - - -x - -y - - - + + +x + +y + + + \ No newline at end of file diff --git a/d2renderers/d2sketch/testdata/dots-all/sketch.exp.svg b/d2renderers/d2sketch/testdata/dots-all/sketch.exp.svg index 03479bcfa..a3e76c87c 100644 --- a/d2renderers/d2sketch/testdata/dots-all/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/dots-all/sketch.exp.svg @@ -1,9 +1,9 @@ - + .d2-157526690 .fill-N1{fill:#0A0F25;} + .d2-157526690 .fill-N2{fill:#676C7E;} + .d2-157526690 .fill-N3{fill:#9499AB;} + .d2-157526690 .fill-N4{fill:#CFD2DD;} + .d2-157526690 .fill-N5{fill:#DEE1EB;} + .d2-157526690 .fill-N6{fill:#EEF1F8;} + .d2-157526690 .fill-N7{fill:#FFFFFF;} + .d2-157526690 .fill-B1{fill:#0D32B2;} + .d2-157526690 .fill-B2{fill:#0D32B2;} + .d2-157526690 .fill-B3{fill:#E3E9FD;} + .d2-157526690 .fill-B4{fill:#E3E9FD;} + .d2-157526690 .fill-B5{fill:#EDF0FD;} + .d2-157526690 .fill-B6{fill:#F7F8FE;} + .d2-157526690 .fill-AA2{fill:#4A6FF3;} + .d2-157526690 .fill-AA4{fill:#EDF0FD;} + .d2-157526690 .fill-AA5{fill:#F7F8FE;} + .d2-157526690 .fill-AB4{fill:#EDF0FD;} + .d2-157526690 .fill-AB5{fill:#F7F8FE;} + .d2-157526690 .stroke-N1{stroke:#0A0F25;} + .d2-157526690 .stroke-N2{stroke:#676C7E;} + .d2-157526690 .stroke-N3{stroke:#9499AB;} + .d2-157526690 .stroke-N4{stroke:#CFD2DD;} + .d2-157526690 .stroke-N5{stroke:#DEE1EB;} + .d2-157526690 .stroke-N6{stroke:#EEF1F8;} + .d2-157526690 .stroke-N7{stroke:#FFFFFF;} + .d2-157526690 .stroke-B1{stroke:#0D32B2;} + .d2-157526690 .stroke-B2{stroke:#0D32B2;} + .d2-157526690 .stroke-B3{stroke:#E3E9FD;} + .d2-157526690 .stroke-B4{stroke:#E3E9FD;} + .d2-157526690 .stroke-B5{stroke:#EDF0FD;} + .d2-157526690 .stroke-B6{stroke:#F7F8FE;} + .d2-157526690 .stroke-AA2{stroke:#4A6FF3;} + .d2-157526690 .stroke-AA4{stroke:#EDF0FD;} + .d2-157526690 .stroke-AA5{stroke:#F7F8FE;} + .d2-157526690 .stroke-AB4{stroke:#EDF0FD;} + .d2-157526690 .stroke-AB5{stroke:#F7F8FE;} + .d2-157526690 .background-color-N1{background-color:#0A0F25;} + .d2-157526690 .background-color-N2{background-color:#676C7E;} + .d2-157526690 .background-color-N3{background-color:#9499AB;} + .d2-157526690 .background-color-N4{background-color:#CFD2DD;} + .d2-157526690 .background-color-N5{background-color:#DEE1EB;} + .d2-157526690 .background-color-N6{background-color:#EEF1F8;} + .d2-157526690 .background-color-N7{background-color:#FFFFFF;} + .d2-157526690 .background-color-B1{background-color:#0D32B2;} + .d2-157526690 .background-color-B2{background-color:#0D32B2;} + .d2-157526690 .background-color-B3{background-color:#E3E9FD;} + .d2-157526690 .background-color-B4{background-color:#E3E9FD;} + .d2-157526690 .background-color-B5{background-color:#EDF0FD;} + .d2-157526690 .background-color-B6{background-color:#F7F8FE;} + .d2-157526690 .background-color-AA2{background-color:#4A6FF3;} + .d2-157526690 .background-color-AA4{background-color:#EDF0FD;} + .d2-157526690 .background-color-AA5{background-color:#F7F8FE;} + .d2-157526690 .background-color-AB4{background-color:#EDF0FD;} + .d2-157526690 .background-color-AB5{background-color:#F7F8FE;} + .d2-157526690 .color-N1{color:#0A0F25;} + .d2-157526690 .color-N2{color:#676C7E;} + .d2-157526690 .color-N3{color:#9499AB;} + .d2-157526690 .color-N4{color:#CFD2DD;} + .d2-157526690 .color-N5{color:#DEE1EB;} + .d2-157526690 .color-N6{color:#EEF1F8;} + .d2-157526690 .color-N7{color:#FFFFFF;} + .d2-157526690 .color-B1{color:#0D32B2;} + .d2-157526690 .color-B2{color:#0D32B2;} + .d2-157526690 .color-B3{color:#E3E9FD;} + .d2-157526690 .color-B4{color:#E3E9FD;} + .d2-157526690 .color-B5{color:#EDF0FD;} + .d2-157526690 .color-B6{color:#F7F8FE;} + .d2-157526690 .color-AA2{color:#4A6FF3;} + .d2-157526690 .color-AA4{color:#EDF0FD;} + .d2-157526690 .color-AA5{color:#F7F8FE;} + .d2-157526690 .color-AB4{color:#EDF0FD;} + .d2-157526690 .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 @@ -143,7 +143,7 @@ - + diff --git a/d2renderers/d2sketch/testdata/dots-multiple/sketch.exp.svg b/d2renderers/d2sketch/testdata/dots-multiple/sketch.exp.svg index 318eb6da9..4aee06007 100644 --- a/d2renderers/d2sketch/testdata/dots-multiple/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/dots-multiple/sketch.exp.svg @@ -1,9 +1,9 @@ - + .d2-1385175444 .fill-N1{fill:#0A0F25;} + .d2-1385175444 .fill-N2{fill:#676C7E;} + .d2-1385175444 .fill-N3{fill:#9499AB;} + .d2-1385175444 .fill-N4{fill:#CFD2DD;} + .d2-1385175444 .fill-N5{fill:#DEE1EB;} + .d2-1385175444 .fill-N6{fill:#EEF1F8;} + .d2-1385175444 .fill-N7{fill:#FFFFFF;} + .d2-1385175444 .fill-B1{fill:#0D32B2;} + .d2-1385175444 .fill-B2{fill:#0D32B2;} + .d2-1385175444 .fill-B3{fill:#E3E9FD;} + .d2-1385175444 .fill-B4{fill:#E3E9FD;} + .d2-1385175444 .fill-B5{fill:#EDF0FD;} + .d2-1385175444 .fill-B6{fill:#F7F8FE;} + .d2-1385175444 .fill-AA2{fill:#4A6FF3;} + .d2-1385175444 .fill-AA4{fill:#EDF0FD;} + .d2-1385175444 .fill-AA5{fill:#F7F8FE;} + .d2-1385175444 .fill-AB4{fill:#EDF0FD;} + .d2-1385175444 .fill-AB5{fill:#F7F8FE;} + .d2-1385175444 .stroke-N1{stroke:#0A0F25;} + .d2-1385175444 .stroke-N2{stroke:#676C7E;} + .d2-1385175444 .stroke-N3{stroke:#9499AB;} + .d2-1385175444 .stroke-N4{stroke:#CFD2DD;} + .d2-1385175444 .stroke-N5{stroke:#DEE1EB;} + .d2-1385175444 .stroke-N6{stroke:#EEF1F8;} + .d2-1385175444 .stroke-N7{stroke:#FFFFFF;} + .d2-1385175444 .stroke-B1{stroke:#0D32B2;} + .d2-1385175444 .stroke-B2{stroke:#0D32B2;} + .d2-1385175444 .stroke-B3{stroke:#E3E9FD;} + .d2-1385175444 .stroke-B4{stroke:#E3E9FD;} + .d2-1385175444 .stroke-B5{stroke:#EDF0FD;} + .d2-1385175444 .stroke-B6{stroke:#F7F8FE;} + .d2-1385175444 .stroke-AA2{stroke:#4A6FF3;} + .d2-1385175444 .stroke-AA4{stroke:#EDF0FD;} + .d2-1385175444 .stroke-AA5{stroke:#F7F8FE;} + .d2-1385175444 .stroke-AB4{stroke:#EDF0FD;} + .d2-1385175444 .stroke-AB5{stroke:#F7F8FE;} + .d2-1385175444 .background-color-N1{background-color:#0A0F25;} + .d2-1385175444 .background-color-N2{background-color:#676C7E;} + .d2-1385175444 .background-color-N3{background-color:#9499AB;} + .d2-1385175444 .background-color-N4{background-color:#CFD2DD;} + .d2-1385175444 .background-color-N5{background-color:#DEE1EB;} + .d2-1385175444 .background-color-N6{background-color:#EEF1F8;} + .d2-1385175444 .background-color-N7{background-color:#FFFFFF;} + .d2-1385175444 .background-color-B1{background-color:#0D32B2;} + .d2-1385175444 .background-color-B2{background-color:#0D32B2;} + .d2-1385175444 .background-color-B3{background-color:#E3E9FD;} + .d2-1385175444 .background-color-B4{background-color:#E3E9FD;} + .d2-1385175444 .background-color-B5{background-color:#EDF0FD;} + .d2-1385175444 .background-color-B6{background-color:#F7F8FE;} + .d2-1385175444 .background-color-AA2{background-color:#4A6FF3;} + .d2-1385175444 .background-color-AA4{background-color:#EDF0FD;} + .d2-1385175444 .background-color-AA5{background-color:#F7F8FE;} + .d2-1385175444 .background-color-AB4{background-color:#EDF0FD;} + .d2-1385175444 .background-color-AB5{background-color:#F7F8FE;} + .d2-1385175444 .color-N1{color:#0A0F25;} + .d2-1385175444 .color-N2{color:#676C7E;} + .d2-1385175444 .color-N3{color:#9499AB;} + .d2-1385175444 .color-N4{color:#CFD2DD;} + .d2-1385175444 .color-N5{color:#DEE1EB;} + .d2-1385175444 .color-N6{color:#EEF1F8;} + .d2-1385175444 .color-N7{color:#FFFFFF;} + .d2-1385175444 .color-B1{color:#0D32B2;} + .d2-1385175444 .color-B2{color:#0D32B2;} + .d2-1385175444 .color-B3{color:#E3E9FD;} + .d2-1385175444 .color-B4{color:#E3E9FD;} + .d2-1385175444 .color-B5{color:#EDF0FD;} + .d2-1385175444 .color-B6{color:#F7F8FE;} + .d2-1385175444 .color-AA2{color:#4A6FF3;} + .d2-1385175444 .color-AA4{color:#EDF0FD;} + .d2-1385175444 .color-AA5{color:#F7F8FE;} + .d2-1385175444 .color-AB4{color:#EDF0FD;} + .d2-1385175444 .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,23 +130,23 @@ -rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud - - - - - - - - - - - - - - - - - - +rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/d2renderers/d2sketch/testdata/dots-real/sketch.exp.svg b/d2renderers/d2sketch/testdata/dots-real/sketch.exp.svg index 1f4426801..1f4097ba0 100644 --- a/d2renderers/d2sketch/testdata/dots-real/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/dots-real/sketch.exp.svg @@ -1,16 +1,16 @@ - + .d2-1726486961 .fill-N1{fill:#0A0F25;} + .d2-1726486961 .fill-N2{fill:#676C7E;} + .d2-1726486961 .fill-N3{fill:#9499AB;} + .d2-1726486961 .fill-N4{fill:#CFD2DD;} + .d2-1726486961 .fill-N5{fill:#DEE1EB;} + .d2-1726486961 .fill-N6{fill:#EEF1F8;} + .d2-1726486961 .fill-N7{fill:#FFFFFF;} + .d2-1726486961 .fill-B1{fill:#0D32B2;} + .d2-1726486961 .fill-B2{fill:#0D32B2;} + .d2-1726486961 .fill-B3{fill:#E3E9FD;} + .d2-1726486961 .fill-B4{fill:#E3E9FD;} + .d2-1726486961 .fill-B5{fill:#EDF0FD;} + .d2-1726486961 .fill-B6{fill:#F7F8FE;} + .d2-1726486961 .fill-AA2{fill:#4A6FF3;} + .d2-1726486961 .fill-AA4{fill:#EDF0FD;} + .d2-1726486961 .fill-AA5{fill:#F7F8FE;} + .d2-1726486961 .fill-AB4{fill:#EDF0FD;} + .d2-1726486961 .fill-AB5{fill:#F7F8FE;} + .d2-1726486961 .stroke-N1{stroke:#0A0F25;} + .d2-1726486961 .stroke-N2{stroke:#676C7E;} + .d2-1726486961 .stroke-N3{stroke:#9499AB;} + .d2-1726486961 .stroke-N4{stroke:#CFD2DD;} + .d2-1726486961 .stroke-N5{stroke:#DEE1EB;} + .d2-1726486961 .stroke-N6{stroke:#EEF1F8;} + .d2-1726486961 .stroke-N7{stroke:#FFFFFF;} + .d2-1726486961 .stroke-B1{stroke:#0D32B2;} + .d2-1726486961 .stroke-B2{stroke:#0D32B2;} + .d2-1726486961 .stroke-B3{stroke:#E3E9FD;} + .d2-1726486961 .stroke-B4{stroke:#E3E9FD;} + .d2-1726486961 .stroke-B5{stroke:#EDF0FD;} + .d2-1726486961 .stroke-B6{stroke:#F7F8FE;} + .d2-1726486961 .stroke-AA2{stroke:#4A6FF3;} + .d2-1726486961 .stroke-AA4{stroke:#EDF0FD;} + .d2-1726486961 .stroke-AA5{stroke:#F7F8FE;} + .d2-1726486961 .stroke-AB4{stroke:#EDF0FD;} + .d2-1726486961 .stroke-AB5{stroke:#F7F8FE;} + .d2-1726486961 .background-color-N1{background-color:#0A0F25;} + .d2-1726486961 .background-color-N2{background-color:#676C7E;} + .d2-1726486961 .background-color-N3{background-color:#9499AB;} + .d2-1726486961 .background-color-N4{background-color:#CFD2DD;} + .d2-1726486961 .background-color-N5{background-color:#DEE1EB;} + .d2-1726486961 .background-color-N6{background-color:#EEF1F8;} + .d2-1726486961 .background-color-N7{background-color:#FFFFFF;} + .d2-1726486961 .background-color-B1{background-color:#0D32B2;} + .d2-1726486961 .background-color-B2{background-color:#0D32B2;} + .d2-1726486961 .background-color-B3{background-color:#E3E9FD;} + .d2-1726486961 .background-color-B4{background-color:#E3E9FD;} + .d2-1726486961 .background-color-B5{background-color:#EDF0FD;} + .d2-1726486961 .background-color-B6{background-color:#F7F8FE;} + .d2-1726486961 .background-color-AA2{background-color:#4A6FF3;} + .d2-1726486961 .background-color-AA4{background-color:#EDF0FD;} + .d2-1726486961 .background-color-AA5{background-color:#F7F8FE;} + .d2-1726486961 .background-color-AB4{background-color:#EDF0FD;} + .d2-1726486961 .background-color-AB5{background-color:#F7F8FE;} + .d2-1726486961 .color-N1{color:#0A0F25;} + .d2-1726486961 .color-N2{color:#676C7E;} + .d2-1726486961 .color-N3{color:#9499AB;} + .d2-1726486961 .color-N4{color:#CFD2DD;} + .d2-1726486961 .color-N5{color:#DEE1EB;} + .d2-1726486961 .color-N6{color:#EEF1F8;} + .d2-1726486961 .color-N7{color:#FFFFFF;} + .d2-1726486961 .color-B1{color:#0D32B2;} + .d2-1726486961 .color-B2{color:#0D32B2;} + .d2-1726486961 .color-B3{color:#E3E9FD;} + .d2-1726486961 .color-B4{color:#E3E9FD;} + .d2-1726486961 .color-B5{color:#EDF0FD;} + .d2-1726486961 .color-B6{color:#F7F8FE;} + .d2-1726486961 .color-AA2{color:#4A6FF3;} + .d2-1726486961 .color-AA4{color:#EDF0FD;} + .d2-1726486961 .color-AA5{color:#F7F8FE;} + .d2-1726486961 .color-AB4{color:#EDF0FD;} + .d2-1726486961 .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}]]> @@ -159,13 +159,13 @@ -NETWORKD2 Parser+readerio.RuneReader+readerPosd2ast.Position-lookahead[]rune#peekn(n int)(s string, eof bool)+peek()(r rune, eof bool)+rewind()void+commit()voidCELL TOWERSATELLITESTRANSMITTER SEND SEND SEND - - - - - - - - +NETWORKD2 Parser+readerio.RuneReader+readerPosd2ast.Position-lookahead[]rune#peekn(n int)(s string, eof bool)+peek()(r rune, eof bool)+rewind()void+commit()voidCELL TOWERSATELLITESTRANSMITTER SEND SEND SEND + + + + + + + + \ No newline at end of file diff --git a/d2renderers/d2sketch/testdata/double-border/sketch.exp.svg b/d2renderers/d2sketch/testdata/double-border/sketch.exp.svg index 6603d4227..f05834d4d 100644 --- a/d2renderers/d2sketch/testdata/double-border/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/double-border/sketch.exp.svg @@ -1,16 +1,16 @@ - + .d2-884331314 .fill-N1{fill:#0A0F25;} + .d2-884331314 .fill-N2{fill:#676C7E;} + .d2-884331314 .fill-N3{fill:#9499AB;} + .d2-884331314 .fill-N4{fill:#CFD2DD;} + .d2-884331314 .fill-N5{fill:#DEE1EB;} + .d2-884331314 .fill-N6{fill:#EEF1F8;} + .d2-884331314 .fill-N7{fill:#FFFFFF;} + .d2-884331314 .fill-B1{fill:#0D32B2;} + .d2-884331314 .fill-B2{fill:#0D32B2;} + .d2-884331314 .fill-B3{fill:#E3E9FD;} + .d2-884331314 .fill-B4{fill:#E3E9FD;} + .d2-884331314 .fill-B5{fill:#EDF0FD;} + .d2-884331314 .fill-B6{fill:#F7F8FE;} + .d2-884331314 .fill-AA2{fill:#4A6FF3;} + .d2-884331314 .fill-AA4{fill:#EDF0FD;} + .d2-884331314 .fill-AA5{fill:#F7F8FE;} + .d2-884331314 .fill-AB4{fill:#EDF0FD;} + .d2-884331314 .fill-AB5{fill:#F7F8FE;} + .d2-884331314 .stroke-N1{stroke:#0A0F25;} + .d2-884331314 .stroke-N2{stroke:#676C7E;} + .d2-884331314 .stroke-N3{stroke:#9499AB;} + .d2-884331314 .stroke-N4{stroke:#CFD2DD;} + .d2-884331314 .stroke-N5{stroke:#DEE1EB;} + .d2-884331314 .stroke-N6{stroke:#EEF1F8;} + .d2-884331314 .stroke-N7{stroke:#FFFFFF;} + .d2-884331314 .stroke-B1{stroke:#0D32B2;} + .d2-884331314 .stroke-B2{stroke:#0D32B2;} + .d2-884331314 .stroke-B3{stroke:#E3E9FD;} + .d2-884331314 .stroke-B4{stroke:#E3E9FD;} + .d2-884331314 .stroke-B5{stroke:#EDF0FD;} + .d2-884331314 .stroke-B6{stroke:#F7F8FE;} + .d2-884331314 .stroke-AA2{stroke:#4A6FF3;} + .d2-884331314 .stroke-AA4{stroke:#EDF0FD;} + .d2-884331314 .stroke-AA5{stroke:#F7F8FE;} + .d2-884331314 .stroke-AB4{stroke:#EDF0FD;} + .d2-884331314 .stroke-AB5{stroke:#F7F8FE;} + .d2-884331314 .background-color-N1{background-color:#0A0F25;} + .d2-884331314 .background-color-N2{background-color:#676C7E;} + .d2-884331314 .background-color-N3{background-color:#9499AB;} + .d2-884331314 .background-color-N4{background-color:#CFD2DD;} + .d2-884331314 .background-color-N5{background-color:#DEE1EB;} + .d2-884331314 .background-color-N6{background-color:#EEF1F8;} + .d2-884331314 .background-color-N7{background-color:#FFFFFF;} + .d2-884331314 .background-color-B1{background-color:#0D32B2;} + .d2-884331314 .background-color-B2{background-color:#0D32B2;} + .d2-884331314 .background-color-B3{background-color:#E3E9FD;} + .d2-884331314 .background-color-B4{background-color:#E3E9FD;} + .d2-884331314 .background-color-B5{background-color:#EDF0FD;} + .d2-884331314 .background-color-B6{background-color:#F7F8FE;} + .d2-884331314 .background-color-AA2{background-color:#4A6FF3;} + .d2-884331314 .background-color-AA4{background-color:#EDF0FD;} + .d2-884331314 .background-color-AA5{background-color:#F7F8FE;} + .d2-884331314 .background-color-AB4{background-color:#EDF0FD;} + .d2-884331314 .background-color-AB5{background-color:#F7F8FE;} + .d2-884331314 .color-N1{color:#0A0F25;} + .d2-884331314 .color-N2{color:#676C7E;} + .d2-884331314 .color-N3{color:#9499AB;} + .d2-884331314 .color-N4{color:#CFD2DD;} + .d2-884331314 .color-N5{color:#DEE1EB;} + .d2-884331314 .color-N6{color:#EEF1F8;} + .d2-884331314 .color-N7{color:#FFFFFF;} + .d2-884331314 .color-B1{color:#0D32B2;} + .d2-884331314 .color-B2{color:#0D32B2;} + .d2-884331314 .color-B3{color:#E3E9FD;} + .d2-884331314 .color-B4{color:#E3E9FD;} + .d2-884331314 .color-B5{color:#EDF0FD;} + .d2-884331314 .color-B6{color:#F7F8FE;} + .d2-884331314 .color-AA2{color:#4A6FF3;} + .d2-884331314 .color-AA4{color:#EDF0FD;} + .d2-884331314 .color-AA5{color:#F7F8FE;} + .d2-884331314 .color-AB4{color:#EDF0FD;} + .d2-884331314 .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}]]> @@ -104,13 +104,13 @@ -acnormalsomethingbdnested normal - - - - +acnormalsomethingbdnested normal + + + + - - - + + + \ No newline at end of file diff --git a/d2renderers/d2sketch/testdata/opacity/sketch.exp.svg b/d2renderers/d2sketch/testdata/opacity/sketch.exp.svg index e505986ad..2b38a2a71 100644 --- a/d2renderers/d2sketch/testdata/opacity/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/opacity/sketch.exp.svg @@ -1,27 +1,27 @@ - @@ -852,7 +852,7 @@ x

linux: because a PC is a terrible thing to waste

-
auserslast_logindatetime You don't have to know how the computer works,just how to work the computer. +auserslast_logindatetime You don't have to know how the computer works,just how to work the computer. diff --git a/d2renderers/d2sketch/testdata/opacity_dark/sketch.exp.svg b/d2renderers/d2sketch/testdata/opacity_dark/sketch.exp.svg index 2f2882a2d..444121bd0 100644 --- a/d2renderers/d2sketch/testdata/opacity_dark/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/opacity_dark/sketch.exp.svg @@ -1,27 +1,27 @@ - @@ -850,7 +850,7 @@ x

linux: because a PC is a terrible thing to waste

-
auserslast_logindatetime You don't have to know how the computer works,just how to work the computer. +auserslast_logindatetime You don't have to know how the computer works,just how to work the computer. diff --git a/d2renderers/d2sketch/testdata/paper-real/sketch.exp.svg b/d2renderers/d2sketch/testdata/paper-real/sketch.exp.svg index 080039407..575f38b74 100644 --- a/d2renderers/d2sketch/testdata/paper-real/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/paper-real/sketch.exp.svg @@ -1,16 +1,16 @@ - + .d2-3722833969 .fill-N1{fill:#0A0F25;} + .d2-3722833969 .fill-N2{fill:#676C7E;} + .d2-3722833969 .fill-N3{fill:#9499AB;} + .d2-3722833969 .fill-N4{fill:#CFD2DD;} + .d2-3722833969 .fill-N5{fill:#DEE1EB;} + .d2-3722833969 .fill-N6{fill:#EEF1F8;} + .d2-3722833969 .fill-N7{fill:#FFFFFF;} + .d2-3722833969 .fill-B1{fill:#0D32B2;} + .d2-3722833969 .fill-B2{fill:#0D32B2;} + .d2-3722833969 .fill-B3{fill:#E3E9FD;} + .d2-3722833969 .fill-B4{fill:#E3E9FD;} + .d2-3722833969 .fill-B5{fill:#EDF0FD;} + .d2-3722833969 .fill-B6{fill:#F7F8FE;} + .d2-3722833969 .fill-AA2{fill:#4A6FF3;} + .d2-3722833969 .fill-AA4{fill:#EDF0FD;} + .d2-3722833969 .fill-AA5{fill:#F7F8FE;} + .d2-3722833969 .fill-AB4{fill:#EDF0FD;} + .d2-3722833969 .fill-AB5{fill:#F7F8FE;} + .d2-3722833969 .stroke-N1{stroke:#0A0F25;} + .d2-3722833969 .stroke-N2{stroke:#676C7E;} + .d2-3722833969 .stroke-N3{stroke:#9499AB;} + .d2-3722833969 .stroke-N4{stroke:#CFD2DD;} + .d2-3722833969 .stroke-N5{stroke:#DEE1EB;} + .d2-3722833969 .stroke-N6{stroke:#EEF1F8;} + .d2-3722833969 .stroke-N7{stroke:#FFFFFF;} + .d2-3722833969 .stroke-B1{stroke:#0D32B2;} + .d2-3722833969 .stroke-B2{stroke:#0D32B2;} + .d2-3722833969 .stroke-B3{stroke:#E3E9FD;} + .d2-3722833969 .stroke-B4{stroke:#E3E9FD;} + .d2-3722833969 .stroke-B5{stroke:#EDF0FD;} + .d2-3722833969 .stroke-B6{stroke:#F7F8FE;} + .d2-3722833969 .stroke-AA2{stroke:#4A6FF3;} + .d2-3722833969 .stroke-AA4{stroke:#EDF0FD;} + .d2-3722833969 .stroke-AA5{stroke:#F7F8FE;} + .d2-3722833969 .stroke-AB4{stroke:#EDF0FD;} + .d2-3722833969 .stroke-AB5{stroke:#F7F8FE;} + .d2-3722833969 .background-color-N1{background-color:#0A0F25;} + .d2-3722833969 .background-color-N2{background-color:#676C7E;} + .d2-3722833969 .background-color-N3{background-color:#9499AB;} + .d2-3722833969 .background-color-N4{background-color:#CFD2DD;} + .d2-3722833969 .background-color-N5{background-color:#DEE1EB;} + .d2-3722833969 .background-color-N6{background-color:#EEF1F8;} + .d2-3722833969 .background-color-N7{background-color:#FFFFFF;} + .d2-3722833969 .background-color-B1{background-color:#0D32B2;} + .d2-3722833969 .background-color-B2{background-color:#0D32B2;} + .d2-3722833969 .background-color-B3{background-color:#E3E9FD;} + .d2-3722833969 .background-color-B4{background-color:#E3E9FD;} + .d2-3722833969 .background-color-B5{background-color:#EDF0FD;} + .d2-3722833969 .background-color-B6{background-color:#F7F8FE;} + .d2-3722833969 .background-color-AA2{background-color:#4A6FF3;} + .d2-3722833969 .background-color-AA4{background-color:#EDF0FD;} + .d2-3722833969 .background-color-AA5{background-color:#F7F8FE;} + .d2-3722833969 .background-color-AB4{background-color:#EDF0FD;} + .d2-3722833969 .background-color-AB5{background-color:#F7F8FE;} + .d2-3722833969 .color-N1{color:#0A0F25;} + .d2-3722833969 .color-N2{color:#676C7E;} + .d2-3722833969 .color-N3{color:#9499AB;} + .d2-3722833969 .color-N4{color:#CFD2DD;} + .d2-3722833969 .color-N5{color:#DEE1EB;} + .d2-3722833969 .color-N6{color:#EEF1F8;} + .d2-3722833969 .color-N7{color:#FFFFFF;} + .d2-3722833969 .color-B1{color:#0D32B2;} + .d2-3722833969 .color-B2{color:#0D32B2;} + .d2-3722833969 .color-B3{color:#E3E9FD;} + .d2-3722833969 .color-B4{color:#E3E9FD;} + .d2-3722833969 .color-B5{color:#EDF0FD;} + .d2-3722833969 .color-B6{color:#F7F8FE;} + .d2-3722833969 .color-AA2{color:#4A6FF3;} + .d2-3722833969 .color-AA4{color:#EDF0FD;} + .d2-3722833969 .color-AA5{color:#F7F8FE;} + .d2-3722833969 .color-AB4{color:#EDF0FD;} + .d2-3722833969 .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}]]> @@ -1205,13 +1205,13 @@ -NETWORKCELL TOWERSATELLITESTRANSMITTER SEND SEND SEND - - - - - - - - +NETWORKCELL TOWERSATELLITESTRANSMITTER SEND SEND SEND + + + + + + + + \ No newline at end of file diff --git a/d2renderers/d2sketch/testdata/root-fill/sketch.exp.svg b/d2renderers/d2sketch/testdata/root-fill/sketch.exp.svg index 45c1f4c51..d9f42d653 100644 --- a/d2renderers/d2sketch/testdata/root-fill/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/root-fill/sketch.exp.svg @@ -1,20 +1,20 @@ - @@ -844,23 +844,23 @@ -OEM FactoryOEM WarehouseDistributor Warehousecompany WarehouseFlow-I (Warehousing, Installation)MasterRegional-1Regional-2Regional-N

company Warehouse

+OEM FactoryOEM WarehouseDistributor Warehousecompany WarehouseFlow-I (Warehousing, Installation)MasterRegional-1Regional-2Regional-N

company Warehouse

  • Asset Tagging
  • Inventory
  • Staging
  • Dispatch to Site
-
 - +
 + - - - - - - - + + + + + + + \ No newline at end of file diff --git a/d2renderers/d2sketch/testdata/terminal/sketch.exp.svg b/d2renderers/d2sketch/testdata/terminal/sketch.exp.svg index 3e5b79366..7f5ade5d5 100644 --- a/d2renderers/d2sketch/testdata/terminal/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/terminal/sketch.exp.svg @@ -1,16 +1,16 @@ - + .d2-3227579264 .fill-N1{fill:#000410;} + .d2-3227579264 .fill-N2{fill:#0000B8;} + .d2-3227579264 .fill-N3{fill:#9499AB;} + .d2-3227579264 .fill-N4{fill:#CFD2DD;} + .d2-3227579264 .fill-N5{fill:#C3DEF3;} + .d2-3227579264 .fill-N6{fill:#EEF1F8;} + .d2-3227579264 .fill-N7{fill:#FFFFFF;} + .d2-3227579264 .fill-B1{fill:#000410;} + .d2-3227579264 .fill-B2{fill:#0000E4;} + .d2-3227579264 .fill-B3{fill:#5AA4DC;} + .d2-3227579264 .fill-B4{fill:#E7E9EE;} + .d2-3227579264 .fill-B5{fill:#F5F6F9;} + .d2-3227579264 .fill-B6{fill:#FFFFFF;} + .d2-3227579264 .fill-AA2{fill:#008566;} + .d2-3227579264 .fill-AA4{fill:#45BBA5;} + .d2-3227579264 .fill-AA5{fill:#7ACCBD;} + .d2-3227579264 .fill-AB4{fill:#F1C759;} + .d2-3227579264 .fill-AB5{fill:#F9E088;} + .d2-3227579264 .stroke-N1{stroke:#000410;} + .d2-3227579264 .stroke-N2{stroke:#0000B8;} + .d2-3227579264 .stroke-N3{stroke:#9499AB;} + .d2-3227579264 .stroke-N4{stroke:#CFD2DD;} + .d2-3227579264 .stroke-N5{stroke:#C3DEF3;} + .d2-3227579264 .stroke-N6{stroke:#EEF1F8;} + .d2-3227579264 .stroke-N7{stroke:#FFFFFF;} + .d2-3227579264 .stroke-B1{stroke:#000410;} + .d2-3227579264 .stroke-B2{stroke:#0000E4;} + .d2-3227579264 .stroke-B3{stroke:#5AA4DC;} + .d2-3227579264 .stroke-B4{stroke:#E7E9EE;} + .d2-3227579264 .stroke-B5{stroke:#F5F6F9;} + .d2-3227579264 .stroke-B6{stroke:#FFFFFF;} + .d2-3227579264 .stroke-AA2{stroke:#008566;} + .d2-3227579264 .stroke-AA4{stroke:#45BBA5;} + .d2-3227579264 .stroke-AA5{stroke:#7ACCBD;} + .d2-3227579264 .stroke-AB4{stroke:#F1C759;} + .d2-3227579264 .stroke-AB5{stroke:#F9E088;} + .d2-3227579264 .background-color-N1{background-color:#000410;} + .d2-3227579264 .background-color-N2{background-color:#0000B8;} + .d2-3227579264 .background-color-N3{background-color:#9499AB;} + .d2-3227579264 .background-color-N4{background-color:#CFD2DD;} + .d2-3227579264 .background-color-N5{background-color:#C3DEF3;} + .d2-3227579264 .background-color-N6{background-color:#EEF1F8;} + .d2-3227579264 .background-color-N7{background-color:#FFFFFF;} + .d2-3227579264 .background-color-B1{background-color:#000410;} + .d2-3227579264 .background-color-B2{background-color:#0000E4;} + .d2-3227579264 .background-color-B3{background-color:#5AA4DC;} + .d2-3227579264 .background-color-B4{background-color:#E7E9EE;} + .d2-3227579264 .background-color-B5{background-color:#F5F6F9;} + .d2-3227579264 .background-color-B6{background-color:#FFFFFF;} + .d2-3227579264 .background-color-AA2{background-color:#008566;} + .d2-3227579264 .background-color-AA4{background-color:#45BBA5;} + .d2-3227579264 .background-color-AA5{background-color:#7ACCBD;} + .d2-3227579264 .background-color-AB4{background-color:#F1C759;} + .d2-3227579264 .background-color-AB5{background-color:#F9E088;} + .d2-3227579264 .color-N1{color:#000410;} + .d2-3227579264 .color-N2{color:#0000B8;} + .d2-3227579264 .color-N3{color:#9499AB;} + .d2-3227579264 .color-N4{color:#CFD2DD;} + .d2-3227579264 .color-N5{color:#C3DEF3;} + .d2-3227579264 .color-N6{color:#EEF1F8;} + .d2-3227579264 .color-N7{color:#FFFFFF;} + .d2-3227579264 .color-B1{color:#000410;} + .d2-3227579264 .color-B2{color:#0000E4;} + .d2-3227579264 .color-B3{color:#5AA4DC;} + .d2-3227579264 .color-B4{color:#E7E9EE;} + .d2-3227579264 .color-B5{color:#F5F6F9;} + .d2-3227579264 .color-B6{color:#FFFFFF;} + .d2-3227579264 .color-AA2{color:#008566;} + .d2-3227579264 .color-AA4{color:#45BBA5;} + .d2-3227579264 .color-AA5{color:#7ACCBD;} + .d2-3227579264 .color-AB4{color:#F1C759;} + .d2-3227579264 .color-AB5{color:#F9E088;}.appendix text.text{fill:#000410}.md{--color-fg-default:#000410;--color-fg-muted:#0000B8;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#000410;--color-border-muted:#0000E4;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0000E4;--color-accent-emphasis:#0000E4;--color-attention-subtle:#0000B8;--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-normal);mix-blend-mode:color-burn}.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-normal);mix-blend-mode:color-burn}.sketch-overlay-AA5{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-AB4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-AB5{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-darker);mix-blend-mode:lighten}.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-normal);mix-blend-mode:color-burn}.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}]]> @@ -137,25 +137,25 @@ -NETWORKUSERAPI SERVERLOGSCELL TOWERONLINE PORTALDATA PROCESSORSATELLITESTRANSMITTERUISTORAGE SEND SEND SEND PHONE LOGS MAKE CALL ACCESS DISPLAY PERSIST - - +NETWORKUSERAPI SERVERLOGSCELL TOWERONLINE PORTALDATA PROCESSORSATELLITESTRANSMITTERUISTORAGE SEND SEND SEND PHONE LOGS MAKE CALL ACCESS DISPLAY PERSIST + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/d2renderers/d2sketch/testdata/twitter/sketch.exp.svg b/d2renderers/d2sketch/testdata/twitter/sketch.exp.svg index c16c9ba1e..2c5f9eac3 100644 --- a/d2renderers/d2sketch/testdata/twitter/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/twitter/sketch.exp.svg @@ -1,27 +1,27 @@ - @@ -859,7 +859,7 @@ -People discovery serviceAd mixerOnboarding serviceTwitter Frontend WebIphoneAndroidTimelineScorerHome RankerTimeline ServiceHome mixerManhattanGizmoduckSocial graphTweety PiePrediction ServiceHome ScorerManhattanMemcacheFetchFeatureScoringPrediction Service...etc

Timeline mixer

+People discovery serviceAd mixerOnboarding serviceTwitter Frontend WebIphoneAndroidTimelineScorerHome RankerTimeline ServiceHome mixerManhattanGizmoduckSocial graphTweety PiePrediction ServiceHome ScorerManhattanMemcacheFetchFeatureScoringPrediction Service...etc

Timeline mixer

  • Inject ads, who-to-follow, onboarding
  • Conversation module
    • @@ -867,46 +867,46 @@
  • Tweat deduplication
  • Served data logging
-
GraphQLFederated Strato Column

Tweet/user content hydration, visibility filtering

-
TLS-API (being deprecated)CrMixerEarlyBirdUtagSpaceCommunities iPhone web HTTP Android Thrift RPC Candidate Fetch Feature Hydration Candidate sources - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +
GraphQLFederated Strato Column

Tweet/user content hydration, visibility filtering

+
TLS-API (being deprecated)CrMixerEarlyBirdUtagSpaceCommunities iPhone web HTTP Android Thrift RPC Candidate Fetch Feature Hydration Candidate sources + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/d2renderers/d2sketch/testdata/twitter_dark/sketch.exp.svg b/d2renderers/d2sketch/testdata/twitter_dark/sketch.exp.svg index 5e0872052..d4aee7d64 100644 --- a/d2renderers/d2sketch/testdata/twitter_dark/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/twitter_dark/sketch.exp.svg @@ -1,27 +1,27 @@ - @@ -859,7 +859,7 @@ -People discovery serviceAd mixerOnboarding serviceTwitter Frontend WebIphoneAndroidTimelineScorerHome RankerTimeline ServiceHome mixerManhattanGizmoduckSocial graphTweety PiePrediction ServiceHome ScorerManhattanMemcacheFetchFeatureScoringPrediction Service...etc

Timeline mixer

+People discovery serviceAd mixerOnboarding serviceTwitter Frontend WebIphoneAndroidTimelineScorerHome RankerTimeline ServiceHome mixerManhattanGizmoduckSocial graphTweety PiePrediction ServiceHome ScorerManhattanMemcacheFetchFeatureScoringPrediction Service...etc

Timeline mixer

  • Inject ads, who-to-follow, onboarding
  • Conversation module
    • @@ -867,46 +867,46 @@
  • Tweat deduplication
  • Served data logging
-
GraphQLFederated Strato Column

Tweet/user content hydration, visibility filtering

-
TLS-API (being deprecated)CrMixerEarlyBirdUtagSpaceCommunities iPhone web HTTP Android Thrift RPC Candidate Fetch Feature Hydration Candidate sources - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +
GraphQLFederated Strato Column

Tweet/user content hydration, visibility filtering

+
TLS-API (being deprecated)CrMixerEarlyBirdUtagSpaceCommunities iPhone web HTTP Android Thrift RPC Candidate Fetch Feature Hydration Candidate sources + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file 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 7416db269..cdb8f1df3 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-324871669 .fill-N1{fill:#CDD6F4;} + .d2-324871669 .fill-N2{fill:#BAC2DE;} + .d2-324871669 .fill-N3{fill:#A6ADC8;} + .d2-324871669 .fill-N4{fill:#585B70;} + .d2-324871669 .fill-N5{fill:#45475A;} + .d2-324871669 .fill-N6{fill:#313244;} + .d2-324871669 .fill-N7{fill:#1E1E2E;} + .d2-324871669 .fill-B1{fill:#CBA6f7;} + .d2-324871669 .fill-B2{fill:#CBA6f7;} + .d2-324871669 .fill-B3{fill:#6C7086;} + .d2-324871669 .fill-B4{fill:#585B70;} + .d2-324871669 .fill-B5{fill:#45475A;} + .d2-324871669 .fill-B6{fill:#313244;} + .d2-324871669 .fill-AA2{fill:#f38BA8;} + .d2-324871669 .fill-AA4{fill:#45475A;} + .d2-324871669 .fill-AA5{fill:#313244;} + .d2-324871669 .fill-AB4{fill:#45475A;} + .d2-324871669 .fill-AB5{fill:#313244;} + .d2-324871669 .stroke-N1{stroke:#CDD6F4;} + .d2-324871669 .stroke-N2{stroke:#BAC2DE;} + .d2-324871669 .stroke-N3{stroke:#A6ADC8;} + .d2-324871669 .stroke-N4{stroke:#585B70;} + .d2-324871669 .stroke-N5{stroke:#45475A;} + .d2-324871669 .stroke-N6{stroke:#313244;} + .d2-324871669 .stroke-N7{stroke:#1E1E2E;} + .d2-324871669 .stroke-B1{stroke:#CBA6f7;} + .d2-324871669 .stroke-B2{stroke:#CBA6f7;} + .d2-324871669 .stroke-B3{stroke:#6C7086;} + .d2-324871669 .stroke-B4{stroke:#585B70;} + .d2-324871669 .stroke-B5{stroke:#45475A;} + .d2-324871669 .stroke-B6{stroke:#313244;} + .d2-324871669 .stroke-AA2{stroke:#f38BA8;} + .d2-324871669 .stroke-AA4{stroke:#45475A;} + .d2-324871669 .stroke-AA5{stroke:#313244;} + .d2-324871669 .stroke-AB4{stroke:#45475A;} + .d2-324871669 .stroke-AB5{stroke:#313244;} + .d2-324871669 .background-color-N1{background-color:#CDD6F4;} + .d2-324871669 .background-color-N2{background-color:#BAC2DE;} + .d2-324871669 .background-color-N3{background-color:#A6ADC8;} + .d2-324871669 .background-color-N4{background-color:#585B70;} + .d2-324871669 .background-color-N5{background-color:#45475A;} + .d2-324871669 .background-color-N6{background-color:#313244;} + .d2-324871669 .background-color-N7{background-color:#1E1E2E;} + .d2-324871669 .background-color-B1{background-color:#CBA6f7;} + .d2-324871669 .background-color-B2{background-color:#CBA6f7;} + .d2-324871669 .background-color-B3{background-color:#6C7086;} + .d2-324871669 .background-color-B4{background-color:#585B70;} + .d2-324871669 .background-color-B5{background-color:#45475A;} + .d2-324871669 .background-color-B6{background-color:#313244;} + .d2-324871669 .background-color-AA2{background-color:#f38BA8;} + .d2-324871669 .background-color-AA4{background-color:#45475A;} + .d2-324871669 .background-color-AA5{background-color:#313244;} + .d2-324871669 .background-color-AB4{background-color:#45475A;} + .d2-324871669 .background-color-AB5{background-color:#313244;} + .d2-324871669 .color-N1{color:#CDD6F4;} + .d2-324871669 .color-N2{color:#BAC2DE;} + .d2-324871669 .color-N3{color:#A6ADC8;} + .d2-324871669 .color-N4{color:#585B70;} + .d2-324871669 .color-N5{color:#45475A;} + .d2-324871669 .color-N6{color:#313244;} + .d2-324871669 .color-N7{color:#1E1E2E;} + .d2-324871669 .color-B1{color:#CBA6f7;} + .d2-324871669 .color-B2{color:#CBA6f7;} + .d2-324871669 .color-B3{color:#6C7086;} + .d2-324871669 .color-B4{color:#585B70;} + .d2-324871669 .color-B5{color:#45475A;} + .d2-324871669 .color-B6{color:#313244;} + .d2-324871669 .color-AA2{color:#f38BA8;} + .d2-324871669 .color-AA4{color:#45475A;} + .d2-324871669 .color-AA5{color:#313244;} + .d2-324871669 .color-AB4{color:#45475A;} + .d2-324871669 .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 @@ -102,7 +102,7 @@ - + diff --git a/d2renderers/d2svg/dark_theme/testdata/animated/dark_theme.exp.svg b/d2renderers/d2svg/dark_theme/testdata/animated/dark_theme.exp.svg index 67cf082c8..4cb78e9db 100644 --- a/d2renderers/d2svg/dark_theme/testdata/animated/dark_theme.exp.svg +++ b/d2renderers/d2svg/dark_theme/testdata/animated/dark_theme.exp.svg @@ -1,9 +1,9 @@ -wintersummertreessnowsun - - - + .d2-4283185193 .fill-N1{fill:#CDD6F4;} + .d2-4283185193 .fill-N2{fill:#BAC2DE;} + .d2-4283185193 .fill-N3{fill:#A6ADC8;} + .d2-4283185193 .fill-N4{fill:#585B70;} + .d2-4283185193 .fill-N5{fill:#45475A;} + .d2-4283185193 .fill-N6{fill:#313244;} + .d2-4283185193 .fill-N7{fill:#1E1E2E;} + .d2-4283185193 .fill-B1{fill:#CBA6f7;} + .d2-4283185193 .fill-B2{fill:#CBA6f7;} + .d2-4283185193 .fill-B3{fill:#6C7086;} + .d2-4283185193 .fill-B4{fill:#585B70;} + .d2-4283185193 .fill-B5{fill:#45475A;} + .d2-4283185193 .fill-B6{fill:#313244;} + .d2-4283185193 .fill-AA2{fill:#f38BA8;} + .d2-4283185193 .fill-AA4{fill:#45475A;} + .d2-4283185193 .fill-AA5{fill:#313244;} + .d2-4283185193 .fill-AB4{fill:#45475A;} + .d2-4283185193 .fill-AB5{fill:#313244;} + .d2-4283185193 .stroke-N1{stroke:#CDD6F4;} + .d2-4283185193 .stroke-N2{stroke:#BAC2DE;} + .d2-4283185193 .stroke-N3{stroke:#A6ADC8;} + .d2-4283185193 .stroke-N4{stroke:#585B70;} + .d2-4283185193 .stroke-N5{stroke:#45475A;} + .d2-4283185193 .stroke-N6{stroke:#313244;} + .d2-4283185193 .stroke-N7{stroke:#1E1E2E;} + .d2-4283185193 .stroke-B1{stroke:#CBA6f7;} + .d2-4283185193 .stroke-B2{stroke:#CBA6f7;} + .d2-4283185193 .stroke-B3{stroke:#6C7086;} + .d2-4283185193 .stroke-B4{stroke:#585B70;} + .d2-4283185193 .stroke-B5{stroke:#45475A;} + .d2-4283185193 .stroke-B6{stroke:#313244;} + .d2-4283185193 .stroke-AA2{stroke:#f38BA8;} + .d2-4283185193 .stroke-AA4{stroke:#45475A;} + .d2-4283185193 .stroke-AA5{stroke:#313244;} + .d2-4283185193 .stroke-AB4{stroke:#45475A;} + .d2-4283185193 .stroke-AB5{stroke:#313244;} + .d2-4283185193 .background-color-N1{background-color:#CDD6F4;} + .d2-4283185193 .background-color-N2{background-color:#BAC2DE;} + .d2-4283185193 .background-color-N3{background-color:#A6ADC8;} + .d2-4283185193 .background-color-N4{background-color:#585B70;} + .d2-4283185193 .background-color-N5{background-color:#45475A;} + .d2-4283185193 .background-color-N6{background-color:#313244;} + .d2-4283185193 .background-color-N7{background-color:#1E1E2E;} + .d2-4283185193 .background-color-B1{background-color:#CBA6f7;} + .d2-4283185193 .background-color-B2{background-color:#CBA6f7;} + .d2-4283185193 .background-color-B3{background-color:#6C7086;} + .d2-4283185193 .background-color-B4{background-color:#585B70;} + .d2-4283185193 .background-color-B5{background-color:#45475A;} + .d2-4283185193 .background-color-B6{background-color:#313244;} + .d2-4283185193 .background-color-AA2{background-color:#f38BA8;} + .d2-4283185193 .background-color-AA4{background-color:#45475A;} + .d2-4283185193 .background-color-AA5{background-color:#313244;} + .d2-4283185193 .background-color-AB4{background-color:#45475A;} + .d2-4283185193 .background-color-AB5{background-color:#313244;} + .d2-4283185193 .color-N1{color:#CDD6F4;} + .d2-4283185193 .color-N2{color:#BAC2DE;} + .d2-4283185193 .color-N3{color:#A6ADC8;} + .d2-4283185193 .color-N4{color:#585B70;} + .d2-4283185193 .color-N5{color:#45475A;} + .d2-4283185193 .color-N6{color:#313244;} + .d2-4283185193 .color-N7{color:#1E1E2E;} + .d2-4283185193 .color-B1{color:#CBA6f7;} + .d2-4283185193 .color-B2{color:#CBA6f7;} + .d2-4283185193 .color-B3{color:#6C7086;} + .d2-4283185193 .color-B4{color:#585B70;} + .d2-4283185193 .color-B5{color:#45475A;} + .d2-4283185193 .color-B6{color:#313244;} + .d2-4283185193 .color-AA2{color:#f38BA8;} + .d2-4283185193 .color-AA4{color:#45475A;} + .d2-4283185193 .color-AA5{color:#313244;} + .d2-4283185193 .color-AB4{color:#45475A;} + .d2-4283185193 .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}]]>wintersummertreessnowsun + + + - - + + \ No newline at end of file diff --git a/d2renderers/d2svg/dark_theme/testdata/arrowheads/dark_theme.exp.svg b/d2renderers/d2svg/dark_theme/testdata/arrowheads/dark_theme.exp.svg index 04281f795..d63b8c8df 100644 --- a/d2renderers/d2svg/dark_theme/testdata/arrowheads/dark_theme.exp.svg +++ b/d2renderers/d2svg/dark_theme/testdata/arrowheads/dark_theme.exp.svg @@ -1,16 +1,16 @@ -112233445566778899none arrow triangle diamond diamond filled cf-many cf-many-required cf-one cf-one-required - + .d2-1616297415 .fill-N1{fill:#CDD6F4;} + .d2-1616297415 .fill-N2{fill:#BAC2DE;} + .d2-1616297415 .fill-N3{fill:#A6ADC8;} + .d2-1616297415 .fill-N4{fill:#585B70;} + .d2-1616297415 .fill-N5{fill:#45475A;} + .d2-1616297415 .fill-N6{fill:#313244;} + .d2-1616297415 .fill-N7{fill:#1E1E2E;} + .d2-1616297415 .fill-B1{fill:#CBA6f7;} + .d2-1616297415 .fill-B2{fill:#CBA6f7;} + .d2-1616297415 .fill-B3{fill:#6C7086;} + .d2-1616297415 .fill-B4{fill:#585B70;} + .d2-1616297415 .fill-B5{fill:#45475A;} + .d2-1616297415 .fill-B6{fill:#313244;} + .d2-1616297415 .fill-AA2{fill:#f38BA8;} + .d2-1616297415 .fill-AA4{fill:#45475A;} + .d2-1616297415 .fill-AA5{fill:#313244;} + .d2-1616297415 .fill-AB4{fill:#45475A;} + .d2-1616297415 .fill-AB5{fill:#313244;} + .d2-1616297415 .stroke-N1{stroke:#CDD6F4;} + .d2-1616297415 .stroke-N2{stroke:#BAC2DE;} + .d2-1616297415 .stroke-N3{stroke:#A6ADC8;} + .d2-1616297415 .stroke-N4{stroke:#585B70;} + .d2-1616297415 .stroke-N5{stroke:#45475A;} + .d2-1616297415 .stroke-N6{stroke:#313244;} + .d2-1616297415 .stroke-N7{stroke:#1E1E2E;} + .d2-1616297415 .stroke-B1{stroke:#CBA6f7;} + .d2-1616297415 .stroke-B2{stroke:#CBA6f7;} + .d2-1616297415 .stroke-B3{stroke:#6C7086;} + .d2-1616297415 .stroke-B4{stroke:#585B70;} + .d2-1616297415 .stroke-B5{stroke:#45475A;} + .d2-1616297415 .stroke-B6{stroke:#313244;} + .d2-1616297415 .stroke-AA2{stroke:#f38BA8;} + .d2-1616297415 .stroke-AA4{stroke:#45475A;} + .d2-1616297415 .stroke-AA5{stroke:#313244;} + .d2-1616297415 .stroke-AB4{stroke:#45475A;} + .d2-1616297415 .stroke-AB5{stroke:#313244;} + .d2-1616297415 .background-color-N1{background-color:#CDD6F4;} + .d2-1616297415 .background-color-N2{background-color:#BAC2DE;} + .d2-1616297415 .background-color-N3{background-color:#A6ADC8;} + .d2-1616297415 .background-color-N4{background-color:#585B70;} + .d2-1616297415 .background-color-N5{background-color:#45475A;} + .d2-1616297415 .background-color-N6{background-color:#313244;} + .d2-1616297415 .background-color-N7{background-color:#1E1E2E;} + .d2-1616297415 .background-color-B1{background-color:#CBA6f7;} + .d2-1616297415 .background-color-B2{background-color:#CBA6f7;} + .d2-1616297415 .background-color-B3{background-color:#6C7086;} + .d2-1616297415 .background-color-B4{background-color:#585B70;} + .d2-1616297415 .background-color-B5{background-color:#45475A;} + .d2-1616297415 .background-color-B6{background-color:#313244;} + .d2-1616297415 .background-color-AA2{background-color:#f38BA8;} + .d2-1616297415 .background-color-AA4{background-color:#45475A;} + .d2-1616297415 .background-color-AA5{background-color:#313244;} + .d2-1616297415 .background-color-AB4{background-color:#45475A;} + .d2-1616297415 .background-color-AB5{background-color:#313244;} + .d2-1616297415 .color-N1{color:#CDD6F4;} + .d2-1616297415 .color-N2{color:#BAC2DE;} + .d2-1616297415 .color-N3{color:#A6ADC8;} + .d2-1616297415 .color-N4{color:#585B70;} + .d2-1616297415 .color-N5{color:#45475A;} + .d2-1616297415 .color-N6{color:#313244;} + .d2-1616297415 .color-N7{color:#1E1E2E;} + .d2-1616297415 .color-B1{color:#CBA6f7;} + .d2-1616297415 .color-B2{color:#CBA6f7;} + .d2-1616297415 .color-B3{color:#6C7086;} + .d2-1616297415 .color-B4{color:#585B70;} + .d2-1616297415 .color-B5{color:#45475A;} + .d2-1616297415 .color-B6{color:#313244;} + .d2-1616297415 .color-AA2{color:#f38BA8;} + .d2-1616297415 .color-AA4{color:#45475A;} + .d2-1616297415 .color-AA5{color:#313244;} + .d2-1616297415 .color-AB4{color:#45475A;} + .d2-1616297415 .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}]]>112233445566778899none arrow triangle diamond diamond filled cf-many cf-many-required cf-one cf-one-required + diff --git a/d2renderers/d2svg/dark_theme/testdata/child_to_child/dark_theme.exp.svg b/d2renderers/d2svg/dark_theme/testdata/child_to_child/dark_theme.exp.svg index 6d0c2c544..108039f81 100644 --- a/d2renderers/d2svg/dark_theme/testdata/child_to_child/dark_theme.exp.svg +++ b/d2renderers/d2svg/dark_theme/testdata/child_to_child/dark_theme.exp.svg @@ -1,16 +1,16 @@ -wintersummersnowsun - - - - - + .d2-3924832427 .fill-N1{fill:#CDD6F4;} + .d2-3924832427 .fill-N2{fill:#BAC2DE;} + .d2-3924832427 .fill-N3{fill:#A6ADC8;} + .d2-3924832427 .fill-N4{fill:#585B70;} + .d2-3924832427 .fill-N5{fill:#45475A;} + .d2-3924832427 .fill-N6{fill:#313244;} + .d2-3924832427 .fill-N7{fill:#1E1E2E;} + .d2-3924832427 .fill-B1{fill:#CBA6f7;} + .d2-3924832427 .fill-B2{fill:#CBA6f7;} + .d2-3924832427 .fill-B3{fill:#6C7086;} + .d2-3924832427 .fill-B4{fill:#585B70;} + .d2-3924832427 .fill-B5{fill:#45475A;} + .d2-3924832427 .fill-B6{fill:#313244;} + .d2-3924832427 .fill-AA2{fill:#f38BA8;} + .d2-3924832427 .fill-AA4{fill:#45475A;} + .d2-3924832427 .fill-AA5{fill:#313244;} + .d2-3924832427 .fill-AB4{fill:#45475A;} + .d2-3924832427 .fill-AB5{fill:#313244;} + .d2-3924832427 .stroke-N1{stroke:#CDD6F4;} + .d2-3924832427 .stroke-N2{stroke:#BAC2DE;} + .d2-3924832427 .stroke-N3{stroke:#A6ADC8;} + .d2-3924832427 .stroke-N4{stroke:#585B70;} + .d2-3924832427 .stroke-N5{stroke:#45475A;} + .d2-3924832427 .stroke-N6{stroke:#313244;} + .d2-3924832427 .stroke-N7{stroke:#1E1E2E;} + .d2-3924832427 .stroke-B1{stroke:#CBA6f7;} + .d2-3924832427 .stroke-B2{stroke:#CBA6f7;} + .d2-3924832427 .stroke-B3{stroke:#6C7086;} + .d2-3924832427 .stroke-B4{stroke:#585B70;} + .d2-3924832427 .stroke-B5{stroke:#45475A;} + .d2-3924832427 .stroke-B6{stroke:#313244;} + .d2-3924832427 .stroke-AA2{stroke:#f38BA8;} + .d2-3924832427 .stroke-AA4{stroke:#45475A;} + .d2-3924832427 .stroke-AA5{stroke:#313244;} + .d2-3924832427 .stroke-AB4{stroke:#45475A;} + .d2-3924832427 .stroke-AB5{stroke:#313244;} + .d2-3924832427 .background-color-N1{background-color:#CDD6F4;} + .d2-3924832427 .background-color-N2{background-color:#BAC2DE;} + .d2-3924832427 .background-color-N3{background-color:#A6ADC8;} + .d2-3924832427 .background-color-N4{background-color:#585B70;} + .d2-3924832427 .background-color-N5{background-color:#45475A;} + .d2-3924832427 .background-color-N6{background-color:#313244;} + .d2-3924832427 .background-color-N7{background-color:#1E1E2E;} + .d2-3924832427 .background-color-B1{background-color:#CBA6f7;} + .d2-3924832427 .background-color-B2{background-color:#CBA6f7;} + .d2-3924832427 .background-color-B3{background-color:#6C7086;} + .d2-3924832427 .background-color-B4{background-color:#585B70;} + .d2-3924832427 .background-color-B5{background-color:#45475A;} + .d2-3924832427 .background-color-B6{background-color:#313244;} + .d2-3924832427 .background-color-AA2{background-color:#f38BA8;} + .d2-3924832427 .background-color-AA4{background-color:#45475A;} + .d2-3924832427 .background-color-AA5{background-color:#313244;} + .d2-3924832427 .background-color-AB4{background-color:#45475A;} + .d2-3924832427 .background-color-AB5{background-color:#313244;} + .d2-3924832427 .color-N1{color:#CDD6F4;} + .d2-3924832427 .color-N2{color:#BAC2DE;} + .d2-3924832427 .color-N3{color:#A6ADC8;} + .d2-3924832427 .color-N4{color:#585B70;} + .d2-3924832427 .color-N5{color:#45475A;} + .d2-3924832427 .color-N6{color:#313244;} + .d2-3924832427 .color-N7{color:#1E1E2E;} + .d2-3924832427 .color-B1{color:#CBA6f7;} + .d2-3924832427 .color-B2{color:#CBA6f7;} + .d2-3924832427 .color-B3{color:#6C7086;} + .d2-3924832427 .color-B4{color:#585B70;} + .d2-3924832427 .color-B5{color:#45475A;} + .d2-3924832427 .color-B6{color:#313244;} + .d2-3924832427 .color-AA2{color:#f38BA8;} + .d2-3924832427 .color-AA4{color:#45475A;} + .d2-3924832427 .color-AA5{color:#313244;} + .d2-3924832427 .color-AB4{color:#45475A;} + .d2-3924832427 .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}]]>wintersummersnowsun + + + + + \ No newline at end of file diff --git a/d2renderers/d2svg/dark_theme/testdata/connection_label/dark_theme.exp.svg b/d2renderers/d2svg/dark_theme/testdata/connection_label/dark_theme.exp.svg index ac464f2aa..82fe9f2b4 100644 --- a/d2renderers/d2svg/dark_theme/testdata/connection_label/dark_theme.exp.svg +++ b/d2renderers/d2svg/dark_theme/testdata/connection_label/dark_theme.exp.svg @@ -1,16 +1,16 @@ -ab hello + .d2-1073612227 .fill-N1{fill:#CDD6F4;} + .d2-1073612227 .fill-N2{fill:#BAC2DE;} + .d2-1073612227 .fill-N3{fill:#A6ADC8;} + .d2-1073612227 .fill-N4{fill:#585B70;} + .d2-1073612227 .fill-N5{fill:#45475A;} + .d2-1073612227 .fill-N6{fill:#313244;} + .d2-1073612227 .fill-N7{fill:#1E1E2E;} + .d2-1073612227 .fill-B1{fill:#CBA6f7;} + .d2-1073612227 .fill-B2{fill:#CBA6f7;} + .d2-1073612227 .fill-B3{fill:#6C7086;} + .d2-1073612227 .fill-B4{fill:#585B70;} + .d2-1073612227 .fill-B5{fill:#45475A;} + .d2-1073612227 .fill-B6{fill:#313244;} + .d2-1073612227 .fill-AA2{fill:#f38BA8;} + .d2-1073612227 .fill-AA4{fill:#45475A;} + .d2-1073612227 .fill-AA5{fill:#313244;} + .d2-1073612227 .fill-AB4{fill:#45475A;} + .d2-1073612227 .fill-AB5{fill:#313244;} + .d2-1073612227 .stroke-N1{stroke:#CDD6F4;} + .d2-1073612227 .stroke-N2{stroke:#BAC2DE;} + .d2-1073612227 .stroke-N3{stroke:#A6ADC8;} + .d2-1073612227 .stroke-N4{stroke:#585B70;} + .d2-1073612227 .stroke-N5{stroke:#45475A;} + .d2-1073612227 .stroke-N6{stroke:#313244;} + .d2-1073612227 .stroke-N7{stroke:#1E1E2E;} + .d2-1073612227 .stroke-B1{stroke:#CBA6f7;} + .d2-1073612227 .stroke-B2{stroke:#CBA6f7;} + .d2-1073612227 .stroke-B3{stroke:#6C7086;} + .d2-1073612227 .stroke-B4{stroke:#585B70;} + .d2-1073612227 .stroke-B5{stroke:#45475A;} + .d2-1073612227 .stroke-B6{stroke:#313244;} + .d2-1073612227 .stroke-AA2{stroke:#f38BA8;} + .d2-1073612227 .stroke-AA4{stroke:#45475A;} + .d2-1073612227 .stroke-AA5{stroke:#313244;} + .d2-1073612227 .stroke-AB4{stroke:#45475A;} + .d2-1073612227 .stroke-AB5{stroke:#313244;} + .d2-1073612227 .background-color-N1{background-color:#CDD6F4;} + .d2-1073612227 .background-color-N2{background-color:#BAC2DE;} + .d2-1073612227 .background-color-N3{background-color:#A6ADC8;} + .d2-1073612227 .background-color-N4{background-color:#585B70;} + .d2-1073612227 .background-color-N5{background-color:#45475A;} + .d2-1073612227 .background-color-N6{background-color:#313244;} + .d2-1073612227 .background-color-N7{background-color:#1E1E2E;} + .d2-1073612227 .background-color-B1{background-color:#CBA6f7;} + .d2-1073612227 .background-color-B2{background-color:#CBA6f7;} + .d2-1073612227 .background-color-B3{background-color:#6C7086;} + .d2-1073612227 .background-color-B4{background-color:#585B70;} + .d2-1073612227 .background-color-B5{background-color:#45475A;} + .d2-1073612227 .background-color-B6{background-color:#313244;} + .d2-1073612227 .background-color-AA2{background-color:#f38BA8;} + .d2-1073612227 .background-color-AA4{background-color:#45475A;} + .d2-1073612227 .background-color-AA5{background-color:#313244;} + .d2-1073612227 .background-color-AB4{background-color:#45475A;} + .d2-1073612227 .background-color-AB5{background-color:#313244;} + .d2-1073612227 .color-N1{color:#CDD6F4;} + .d2-1073612227 .color-N2{color:#BAC2DE;} + .d2-1073612227 .color-N3{color:#A6ADC8;} + .d2-1073612227 .color-N4{color:#585B70;} + .d2-1073612227 .color-N5{color:#45475A;} + .d2-1073612227 .color-N6{color:#313244;} + .d2-1073612227 .color-N7{color:#1E1E2E;} + .d2-1073612227 .color-B1{color:#CBA6f7;} + .d2-1073612227 .color-B2{color:#CBA6f7;} + .d2-1073612227 .color-B3{color:#6C7086;} + .d2-1073612227 .color-B4{color:#585B70;} + .d2-1073612227 .color-B5{color:#45475A;} + .d2-1073612227 .color-B6{color:#313244;} + .d2-1073612227 .color-AA2{color:#f38BA8;} + .d2-1073612227 .color-AA4{color:#45475A;} + .d2-1073612227 .color-AA5{color:#313244;} + .d2-1073612227 .color-AB4{color:#45475A;} + .d2-1073612227 .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}]]>ab hello diff --git a/d2renderers/d2svg/dark_theme/testdata/opacity/dark_theme.exp.svg b/d2renderers/d2svg/dark_theme/testdata/opacity/dark_theme.exp.svg index adcf552e7..f8a608a9c 100644 --- a/d2renderers/d2svg/dark_theme/testdata/opacity/dark_theme.exp.svg +++ b/d2renderers/d2svg/dark_theme/testdata/opacity/dark_theme.exp.svg @@ -1,27 +1,27 @@ -x

linux: because a PC is a terrible thing to waste

-
auserslast_logindatetime You don't have to know how the computer works,just how to work the computer. +auserslast_logindatetime You don't have to know how the computer works,just how to work the computer. diff --git a/d2renderers/d2svg/dark_theme/testdata/twitter/dark_theme.exp.svg b/d2renderers/d2svg/dark_theme/testdata/twitter/dark_theme.exp.svg index aafb4ab50..7d7f70bb6 100644 --- a/d2renderers/d2svg/dark_theme/testdata/twitter/dark_theme.exp.svg +++ b/d2renderers/d2svg/dark_theme/testdata/twitter/dark_theme.exp.svg @@ -1,27 +1,27 @@ -People discovery serviceAd mixerOnboarding serviceTwitter Frontend WebIphoneAndroidTimelineScorerHome RankerTimeline ServiceHome mixerManhattanGizmoduckSocial graphTweety PiePrediction ServiceHome ScorerManhattanMemcacheFetchFeatureScoringPrediction Service...etc

Timeline mixer

+People discovery serviceAd mixerOnboarding serviceTwitter Frontend WebIphoneAndroidTimelineScorerHome RankerTimeline ServiceHome mixerManhattanGizmoduckSocial graphTweety PiePrediction ServiceHome ScorerManhattanMemcacheFetchFeatureScoringPrediction Service...etc

Timeline mixer

  • Inject ads, who-to-follow, onboarding
  • Conversation module
    • @@ -851,46 +851,46 @@
  • Tweat deduplication
  • Served data logging
-
GraphQLFederated Strato Column

Tweet/user content hydration, visibility filtering

-
TLS-API (being deprecated)CrMixerEarlyBirdUtagSpaceCommunities iPhone webHTTP AndroidThrift RPC Candidate FetchFeature HydrationCandidate sources - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +
GraphQLFederated Strato Column

Tweet/user content hydration, visibility filtering

+
TLS-API (being deprecated)CrMixerEarlyBirdUtagSpaceCommunities iPhone webHTTP AndroidThrift RPC Candidate FetchFeature HydrationCandidate sources + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests-cli/testdata/TestCLI_E2E/multiboard/life/index.exp.svg b/e2etests-cli/testdata/TestCLI_E2E/multiboard/life/index.exp.svg index da9ffaff9..debb64a29 100644 --- a/e2etests-cli/testdata/TestCLI_E2E/multiboard/life/index.exp.svg +++ b/e2etests-cli/testdata/TestCLI_E2E/multiboard/life/index.exp.svg @@ -1,9 +1,9 @@ -xy + .d2-3098664959 .fill-N1{fill:#0A0F25;} + .d2-3098664959 .fill-N2{fill:#676C7E;} + .d2-3098664959 .fill-N3{fill:#9499AB;} + .d2-3098664959 .fill-N4{fill:#CFD2DD;} + .d2-3098664959 .fill-N5{fill:#DEE1EB;} + .d2-3098664959 .fill-N6{fill:#EEF1F8;} + .d2-3098664959 .fill-N7{fill:#FFFFFF;} + .d2-3098664959 .fill-B1{fill:#0D32B2;} + .d2-3098664959 .fill-B2{fill:#0D32B2;} + .d2-3098664959 .fill-B3{fill:#E3E9FD;} + .d2-3098664959 .fill-B4{fill:#E3E9FD;} + .d2-3098664959 .fill-B5{fill:#EDF0FD;} + .d2-3098664959 .fill-B6{fill:#F7F8FE;} + .d2-3098664959 .fill-AA2{fill:#4A6FF3;} + .d2-3098664959 .fill-AA4{fill:#EDF0FD;} + .d2-3098664959 .fill-AA5{fill:#F7F8FE;} + .d2-3098664959 .fill-AB4{fill:#EDF0FD;} + .d2-3098664959 .fill-AB5{fill:#F7F8FE;} + .d2-3098664959 .stroke-N1{stroke:#0A0F25;} + .d2-3098664959 .stroke-N2{stroke:#676C7E;} + .d2-3098664959 .stroke-N3{stroke:#9499AB;} + .d2-3098664959 .stroke-N4{stroke:#CFD2DD;} + .d2-3098664959 .stroke-N5{stroke:#DEE1EB;} + .d2-3098664959 .stroke-N6{stroke:#EEF1F8;} + .d2-3098664959 .stroke-N7{stroke:#FFFFFF;} + .d2-3098664959 .stroke-B1{stroke:#0D32B2;} + .d2-3098664959 .stroke-B2{stroke:#0D32B2;} + .d2-3098664959 .stroke-B3{stroke:#E3E9FD;} + .d2-3098664959 .stroke-B4{stroke:#E3E9FD;} + .d2-3098664959 .stroke-B5{stroke:#EDF0FD;} + .d2-3098664959 .stroke-B6{stroke:#F7F8FE;} + .d2-3098664959 .stroke-AA2{stroke:#4A6FF3;} + .d2-3098664959 .stroke-AA4{stroke:#EDF0FD;} + .d2-3098664959 .stroke-AA5{stroke:#F7F8FE;} + .d2-3098664959 .stroke-AB4{stroke:#EDF0FD;} + .d2-3098664959 .stroke-AB5{stroke:#F7F8FE;} + .d2-3098664959 .background-color-N1{background-color:#0A0F25;} + .d2-3098664959 .background-color-N2{background-color:#676C7E;} + .d2-3098664959 .background-color-N3{background-color:#9499AB;} + .d2-3098664959 .background-color-N4{background-color:#CFD2DD;} + .d2-3098664959 .background-color-N5{background-color:#DEE1EB;} + .d2-3098664959 .background-color-N6{background-color:#EEF1F8;} + .d2-3098664959 .background-color-N7{background-color:#FFFFFF;} + .d2-3098664959 .background-color-B1{background-color:#0D32B2;} + .d2-3098664959 .background-color-B2{background-color:#0D32B2;} + .d2-3098664959 .background-color-B3{background-color:#E3E9FD;} + .d2-3098664959 .background-color-B4{background-color:#E3E9FD;} + .d2-3098664959 .background-color-B5{background-color:#EDF0FD;} + .d2-3098664959 .background-color-B6{background-color:#F7F8FE;} + .d2-3098664959 .background-color-AA2{background-color:#4A6FF3;} + .d2-3098664959 .background-color-AA4{background-color:#EDF0FD;} + .d2-3098664959 .background-color-AA5{background-color:#F7F8FE;} + .d2-3098664959 .background-color-AB4{background-color:#EDF0FD;} + .d2-3098664959 .background-color-AB5{background-color:#F7F8FE;} + .d2-3098664959 .color-N1{color:#0A0F25;} + .d2-3098664959 .color-N2{color:#676C7E;} + .d2-3098664959 .color-N3{color:#9499AB;} + .d2-3098664959 .color-N4{color:#CFD2DD;} + .d2-3098664959 .color-N5{color:#DEE1EB;} + .d2-3098664959 .color-N6{color:#EEF1F8;} + .d2-3098664959 .color-N7{color:#FFFFFF;} + .d2-3098664959 .color-B1{color:#0D32B2;} + .d2-3098664959 .color-B2{color:#0D32B2;} + .d2-3098664959 .color-B3{color:#E3E9FD;} + .d2-3098664959 .color-B4{color:#E3E9FD;} + .d2-3098664959 .color-B5{color:#EDF0FD;} + .d2-3098664959 .color-B6{color:#F7F8FE;} + .d2-3098664959 .color-AA2{color:#4A6FF3;} + .d2-3098664959 .color-AA4{color:#EDF0FD;} + .d2-3098664959 .color-AA5{color:#F7F8FE;} + .d2-3098664959 .color-AB4{color:#EDF0FD;} + .d2-3098664959 .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-cli/testdata/TestCLI_E2E/multiboard/life/scenarios/why.exp.svg b/e2etests-cli/testdata/TestCLI_E2E/multiboard/life/scenarios/why.exp.svg index 62f45f0f8..a9859f3d1 100644 --- a/e2etests-cli/testdata/TestCLI_E2E/multiboard/life/scenarios/why.exp.svg +++ b/e2etests-cli/testdata/TestCLI_E2E/multiboard/life/scenarios/why.exp.svg @@ -1,9 +1,9 @@ -xy + .d2-225207715 .fill-N1{fill:#0A0F25;} + .d2-225207715 .fill-N2{fill:#676C7E;} + .d2-225207715 .fill-N3{fill:#9499AB;} + .d2-225207715 .fill-N4{fill:#CFD2DD;} + .d2-225207715 .fill-N5{fill:#DEE1EB;} + .d2-225207715 .fill-N6{fill:#EEF1F8;} + .d2-225207715 .fill-N7{fill:#FFFFFF;} + .d2-225207715 .fill-B1{fill:#0D32B2;} + .d2-225207715 .fill-B2{fill:#0D32B2;} + .d2-225207715 .fill-B3{fill:#E3E9FD;} + .d2-225207715 .fill-B4{fill:#E3E9FD;} + .d2-225207715 .fill-B5{fill:#EDF0FD;} + .d2-225207715 .fill-B6{fill:#F7F8FE;} + .d2-225207715 .fill-AA2{fill:#4A6FF3;} + .d2-225207715 .fill-AA4{fill:#EDF0FD;} + .d2-225207715 .fill-AA5{fill:#F7F8FE;} + .d2-225207715 .fill-AB4{fill:#EDF0FD;} + .d2-225207715 .fill-AB5{fill:#F7F8FE;} + .d2-225207715 .stroke-N1{stroke:#0A0F25;} + .d2-225207715 .stroke-N2{stroke:#676C7E;} + .d2-225207715 .stroke-N3{stroke:#9499AB;} + .d2-225207715 .stroke-N4{stroke:#CFD2DD;} + .d2-225207715 .stroke-N5{stroke:#DEE1EB;} + .d2-225207715 .stroke-N6{stroke:#EEF1F8;} + .d2-225207715 .stroke-N7{stroke:#FFFFFF;} + .d2-225207715 .stroke-B1{stroke:#0D32B2;} + .d2-225207715 .stroke-B2{stroke:#0D32B2;} + .d2-225207715 .stroke-B3{stroke:#E3E9FD;} + .d2-225207715 .stroke-B4{stroke:#E3E9FD;} + .d2-225207715 .stroke-B5{stroke:#EDF0FD;} + .d2-225207715 .stroke-B6{stroke:#F7F8FE;} + .d2-225207715 .stroke-AA2{stroke:#4A6FF3;} + .d2-225207715 .stroke-AA4{stroke:#EDF0FD;} + .d2-225207715 .stroke-AA5{stroke:#F7F8FE;} + .d2-225207715 .stroke-AB4{stroke:#EDF0FD;} + .d2-225207715 .stroke-AB5{stroke:#F7F8FE;} + .d2-225207715 .background-color-N1{background-color:#0A0F25;} + .d2-225207715 .background-color-N2{background-color:#676C7E;} + .d2-225207715 .background-color-N3{background-color:#9499AB;} + .d2-225207715 .background-color-N4{background-color:#CFD2DD;} + .d2-225207715 .background-color-N5{background-color:#DEE1EB;} + .d2-225207715 .background-color-N6{background-color:#EEF1F8;} + .d2-225207715 .background-color-N7{background-color:#FFFFFF;} + .d2-225207715 .background-color-B1{background-color:#0D32B2;} + .d2-225207715 .background-color-B2{background-color:#0D32B2;} + .d2-225207715 .background-color-B3{background-color:#E3E9FD;} + .d2-225207715 .background-color-B4{background-color:#E3E9FD;} + .d2-225207715 .background-color-B5{background-color:#EDF0FD;} + .d2-225207715 .background-color-B6{background-color:#F7F8FE;} + .d2-225207715 .background-color-AA2{background-color:#4A6FF3;} + .d2-225207715 .background-color-AA4{background-color:#EDF0FD;} + .d2-225207715 .background-color-AA5{background-color:#F7F8FE;} + .d2-225207715 .background-color-AB4{background-color:#EDF0FD;} + .d2-225207715 .background-color-AB5{background-color:#F7F8FE;} + .d2-225207715 .color-N1{color:#0A0F25;} + .d2-225207715 .color-N2{color:#676C7E;} + .d2-225207715 .color-N3{color:#9499AB;} + .d2-225207715 .color-N4{color:#CFD2DD;} + .d2-225207715 .color-N5{color:#DEE1EB;} + .d2-225207715 .color-N6{color:#EEF1F8;} + .d2-225207715 .color-N7{color:#FFFFFF;} + .d2-225207715 .color-B1{color:#0D32B2;} + .d2-225207715 .color-B2{color:#0D32B2;} + .d2-225207715 .color-B3{color:#E3E9FD;} + .d2-225207715 .color-B4{color:#E3E9FD;} + .d2-225207715 .color-B5{color:#EDF0FD;} + .d2-225207715 .color-B6{color:#F7F8FE;} + .d2-225207715 .color-AA2{color:#4A6FF3;} + .d2-225207715 .color-AA4{color:#EDF0FD;} + .d2-225207715 .color-AA5{color:#F7F8FE;} + .d2-225207715 .color-AB4{color:#EDF0FD;} + .d2-225207715 .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-cli/testdata/TestCLI_E2E/multiboard/life_index_d2/index.exp.svg b/e2etests-cli/testdata/TestCLI_E2E/multiboard/life_index_d2/index.exp.svg index da9ffaff9..debb64a29 100644 --- a/e2etests-cli/testdata/TestCLI_E2E/multiboard/life_index_d2/index.exp.svg +++ b/e2etests-cli/testdata/TestCLI_E2E/multiboard/life_index_d2/index.exp.svg @@ -1,9 +1,9 @@ -xy + .d2-3098664959 .fill-N1{fill:#0A0F25;} + .d2-3098664959 .fill-N2{fill:#676C7E;} + .d2-3098664959 .fill-N3{fill:#9499AB;} + .d2-3098664959 .fill-N4{fill:#CFD2DD;} + .d2-3098664959 .fill-N5{fill:#DEE1EB;} + .d2-3098664959 .fill-N6{fill:#EEF1F8;} + .d2-3098664959 .fill-N7{fill:#FFFFFF;} + .d2-3098664959 .fill-B1{fill:#0D32B2;} + .d2-3098664959 .fill-B2{fill:#0D32B2;} + .d2-3098664959 .fill-B3{fill:#E3E9FD;} + .d2-3098664959 .fill-B4{fill:#E3E9FD;} + .d2-3098664959 .fill-B5{fill:#EDF0FD;} + .d2-3098664959 .fill-B6{fill:#F7F8FE;} + .d2-3098664959 .fill-AA2{fill:#4A6FF3;} + .d2-3098664959 .fill-AA4{fill:#EDF0FD;} + .d2-3098664959 .fill-AA5{fill:#F7F8FE;} + .d2-3098664959 .fill-AB4{fill:#EDF0FD;} + .d2-3098664959 .fill-AB5{fill:#F7F8FE;} + .d2-3098664959 .stroke-N1{stroke:#0A0F25;} + .d2-3098664959 .stroke-N2{stroke:#676C7E;} + .d2-3098664959 .stroke-N3{stroke:#9499AB;} + .d2-3098664959 .stroke-N4{stroke:#CFD2DD;} + .d2-3098664959 .stroke-N5{stroke:#DEE1EB;} + .d2-3098664959 .stroke-N6{stroke:#EEF1F8;} + .d2-3098664959 .stroke-N7{stroke:#FFFFFF;} + .d2-3098664959 .stroke-B1{stroke:#0D32B2;} + .d2-3098664959 .stroke-B2{stroke:#0D32B2;} + .d2-3098664959 .stroke-B3{stroke:#E3E9FD;} + .d2-3098664959 .stroke-B4{stroke:#E3E9FD;} + .d2-3098664959 .stroke-B5{stroke:#EDF0FD;} + .d2-3098664959 .stroke-B6{stroke:#F7F8FE;} + .d2-3098664959 .stroke-AA2{stroke:#4A6FF3;} + .d2-3098664959 .stroke-AA4{stroke:#EDF0FD;} + .d2-3098664959 .stroke-AA5{stroke:#F7F8FE;} + .d2-3098664959 .stroke-AB4{stroke:#EDF0FD;} + .d2-3098664959 .stroke-AB5{stroke:#F7F8FE;} + .d2-3098664959 .background-color-N1{background-color:#0A0F25;} + .d2-3098664959 .background-color-N2{background-color:#676C7E;} + .d2-3098664959 .background-color-N3{background-color:#9499AB;} + .d2-3098664959 .background-color-N4{background-color:#CFD2DD;} + .d2-3098664959 .background-color-N5{background-color:#DEE1EB;} + .d2-3098664959 .background-color-N6{background-color:#EEF1F8;} + .d2-3098664959 .background-color-N7{background-color:#FFFFFF;} + .d2-3098664959 .background-color-B1{background-color:#0D32B2;} + .d2-3098664959 .background-color-B2{background-color:#0D32B2;} + .d2-3098664959 .background-color-B3{background-color:#E3E9FD;} + .d2-3098664959 .background-color-B4{background-color:#E3E9FD;} + .d2-3098664959 .background-color-B5{background-color:#EDF0FD;} + .d2-3098664959 .background-color-B6{background-color:#F7F8FE;} + .d2-3098664959 .background-color-AA2{background-color:#4A6FF3;} + .d2-3098664959 .background-color-AA4{background-color:#EDF0FD;} + .d2-3098664959 .background-color-AA5{background-color:#F7F8FE;} + .d2-3098664959 .background-color-AB4{background-color:#EDF0FD;} + .d2-3098664959 .background-color-AB5{background-color:#F7F8FE;} + .d2-3098664959 .color-N1{color:#0A0F25;} + .d2-3098664959 .color-N2{color:#676C7E;} + .d2-3098664959 .color-N3{color:#9499AB;} + .d2-3098664959 .color-N4{color:#CFD2DD;} + .d2-3098664959 .color-N5{color:#DEE1EB;} + .d2-3098664959 .color-N6{color:#EEF1F8;} + .d2-3098664959 .color-N7{color:#FFFFFF;} + .d2-3098664959 .color-B1{color:#0D32B2;} + .d2-3098664959 .color-B2{color:#0D32B2;} + .d2-3098664959 .color-B3{color:#E3E9FD;} + .d2-3098664959 .color-B4{color:#E3E9FD;} + .d2-3098664959 .color-B5{color:#EDF0FD;} + .d2-3098664959 .color-B6{color:#F7F8FE;} + .d2-3098664959 .color-AA2{color:#4A6FF3;} + .d2-3098664959 .color-AA4{color:#EDF0FD;} + .d2-3098664959 .color-AA5{color:#F7F8FE;} + .d2-3098664959 .color-AB4{color:#EDF0FD;} + .d2-3098664959 .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-cli/testdata/TestCLI_E2E/multiboard/life_index_d2/scenarios/why.exp.svg b/e2etests-cli/testdata/TestCLI_E2E/multiboard/life_index_d2/scenarios/why.exp.svg index 62f45f0f8..a9859f3d1 100644 --- a/e2etests-cli/testdata/TestCLI_E2E/multiboard/life_index_d2/scenarios/why.exp.svg +++ b/e2etests-cli/testdata/TestCLI_E2E/multiboard/life_index_d2/scenarios/why.exp.svg @@ -1,9 +1,9 @@ -xy + .d2-225207715 .fill-N1{fill:#0A0F25;} + .d2-225207715 .fill-N2{fill:#676C7E;} + .d2-225207715 .fill-N3{fill:#9499AB;} + .d2-225207715 .fill-N4{fill:#CFD2DD;} + .d2-225207715 .fill-N5{fill:#DEE1EB;} + .d2-225207715 .fill-N6{fill:#EEF1F8;} + .d2-225207715 .fill-N7{fill:#FFFFFF;} + .d2-225207715 .fill-B1{fill:#0D32B2;} + .d2-225207715 .fill-B2{fill:#0D32B2;} + .d2-225207715 .fill-B3{fill:#E3E9FD;} + .d2-225207715 .fill-B4{fill:#E3E9FD;} + .d2-225207715 .fill-B5{fill:#EDF0FD;} + .d2-225207715 .fill-B6{fill:#F7F8FE;} + .d2-225207715 .fill-AA2{fill:#4A6FF3;} + .d2-225207715 .fill-AA4{fill:#EDF0FD;} + .d2-225207715 .fill-AA5{fill:#F7F8FE;} + .d2-225207715 .fill-AB4{fill:#EDF0FD;} + .d2-225207715 .fill-AB5{fill:#F7F8FE;} + .d2-225207715 .stroke-N1{stroke:#0A0F25;} + .d2-225207715 .stroke-N2{stroke:#676C7E;} + .d2-225207715 .stroke-N3{stroke:#9499AB;} + .d2-225207715 .stroke-N4{stroke:#CFD2DD;} + .d2-225207715 .stroke-N5{stroke:#DEE1EB;} + .d2-225207715 .stroke-N6{stroke:#EEF1F8;} + .d2-225207715 .stroke-N7{stroke:#FFFFFF;} + .d2-225207715 .stroke-B1{stroke:#0D32B2;} + .d2-225207715 .stroke-B2{stroke:#0D32B2;} + .d2-225207715 .stroke-B3{stroke:#E3E9FD;} + .d2-225207715 .stroke-B4{stroke:#E3E9FD;} + .d2-225207715 .stroke-B5{stroke:#EDF0FD;} + .d2-225207715 .stroke-B6{stroke:#F7F8FE;} + .d2-225207715 .stroke-AA2{stroke:#4A6FF3;} + .d2-225207715 .stroke-AA4{stroke:#EDF0FD;} + .d2-225207715 .stroke-AA5{stroke:#F7F8FE;} + .d2-225207715 .stroke-AB4{stroke:#EDF0FD;} + .d2-225207715 .stroke-AB5{stroke:#F7F8FE;} + .d2-225207715 .background-color-N1{background-color:#0A0F25;} + .d2-225207715 .background-color-N2{background-color:#676C7E;} + .d2-225207715 .background-color-N3{background-color:#9499AB;} + .d2-225207715 .background-color-N4{background-color:#CFD2DD;} + .d2-225207715 .background-color-N5{background-color:#DEE1EB;} + .d2-225207715 .background-color-N6{background-color:#EEF1F8;} + .d2-225207715 .background-color-N7{background-color:#FFFFFF;} + .d2-225207715 .background-color-B1{background-color:#0D32B2;} + .d2-225207715 .background-color-B2{background-color:#0D32B2;} + .d2-225207715 .background-color-B3{background-color:#E3E9FD;} + .d2-225207715 .background-color-B4{background-color:#E3E9FD;} + .d2-225207715 .background-color-B5{background-color:#EDF0FD;} + .d2-225207715 .background-color-B6{background-color:#F7F8FE;} + .d2-225207715 .background-color-AA2{background-color:#4A6FF3;} + .d2-225207715 .background-color-AA4{background-color:#EDF0FD;} + .d2-225207715 .background-color-AA5{background-color:#F7F8FE;} + .d2-225207715 .background-color-AB4{background-color:#EDF0FD;} + .d2-225207715 .background-color-AB5{background-color:#F7F8FE;} + .d2-225207715 .color-N1{color:#0A0F25;} + .d2-225207715 .color-N2{color:#676C7E;} + .d2-225207715 .color-N3{color:#9499AB;} + .d2-225207715 .color-N4{color:#CFD2DD;} + .d2-225207715 .color-N5{color:#DEE1EB;} + .d2-225207715 .color-N6{color:#EEF1F8;} + .d2-225207715 .color-N7{color:#FFFFFF;} + .d2-225207715 .color-B1{color:#0D32B2;} + .d2-225207715 .color-B2{color:#0D32B2;} + .d2-225207715 .color-B3{color:#E3E9FD;} + .d2-225207715 .color-B4{color:#E3E9FD;} + .d2-225207715 .color-B5{color:#EDF0FD;} + .d2-225207715 .color-B6{color:#F7F8FE;} + .d2-225207715 .color-AA2{color:#4A6FF3;} + .d2-225207715 .color-AA4{color:#EDF0FD;} + .d2-225207715 .color-AA5{color:#F7F8FE;} + .d2-225207715 .color-AB4{color:#EDF0FD;} + .d2-225207715 .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-cli/testdata/TestCLI_E2E/with-font.exp.svg b/e2etests-cli/testdata/TestCLI_E2E/with-font.exp.svg index 6f99c984e..8072f6585 100644 --- a/e2etests-cli/testdata/TestCLI_E2E/with-font.exp.svg +++ b/e2etests-cli/testdata/TestCLI_E2E/with-font.exp.svg @@ -1,16 +1,16 @@ -Why do computers get sick often?Because their Windows are always open! italic font + .d2-3823319541 .fill-N1{fill:#0A0F25;} + .d2-3823319541 .fill-N2{fill:#676C7E;} + .d2-3823319541 .fill-N3{fill:#9499AB;} + .d2-3823319541 .fill-N4{fill:#CFD2DD;} + .d2-3823319541 .fill-N5{fill:#DEE1EB;} + .d2-3823319541 .fill-N6{fill:#EEF1F8;} + .d2-3823319541 .fill-N7{fill:#FFFFFF;} + .d2-3823319541 .fill-B1{fill:#0D32B2;} + .d2-3823319541 .fill-B2{fill:#0D32B2;} + .d2-3823319541 .fill-B3{fill:#E3E9FD;} + .d2-3823319541 .fill-B4{fill:#E3E9FD;} + .d2-3823319541 .fill-B5{fill:#EDF0FD;} + .d2-3823319541 .fill-B6{fill:#F7F8FE;} + .d2-3823319541 .fill-AA2{fill:#4A6FF3;} + .d2-3823319541 .fill-AA4{fill:#EDF0FD;} + .d2-3823319541 .fill-AA5{fill:#F7F8FE;} + .d2-3823319541 .fill-AB4{fill:#EDF0FD;} + .d2-3823319541 .fill-AB5{fill:#F7F8FE;} + .d2-3823319541 .stroke-N1{stroke:#0A0F25;} + .d2-3823319541 .stroke-N2{stroke:#676C7E;} + .d2-3823319541 .stroke-N3{stroke:#9499AB;} + .d2-3823319541 .stroke-N4{stroke:#CFD2DD;} + .d2-3823319541 .stroke-N5{stroke:#DEE1EB;} + .d2-3823319541 .stroke-N6{stroke:#EEF1F8;} + .d2-3823319541 .stroke-N7{stroke:#FFFFFF;} + .d2-3823319541 .stroke-B1{stroke:#0D32B2;} + .d2-3823319541 .stroke-B2{stroke:#0D32B2;} + .d2-3823319541 .stroke-B3{stroke:#E3E9FD;} + .d2-3823319541 .stroke-B4{stroke:#E3E9FD;} + .d2-3823319541 .stroke-B5{stroke:#EDF0FD;} + .d2-3823319541 .stroke-B6{stroke:#F7F8FE;} + .d2-3823319541 .stroke-AA2{stroke:#4A6FF3;} + .d2-3823319541 .stroke-AA4{stroke:#EDF0FD;} + .d2-3823319541 .stroke-AA5{stroke:#F7F8FE;} + .d2-3823319541 .stroke-AB4{stroke:#EDF0FD;} + .d2-3823319541 .stroke-AB5{stroke:#F7F8FE;} + .d2-3823319541 .background-color-N1{background-color:#0A0F25;} + .d2-3823319541 .background-color-N2{background-color:#676C7E;} + .d2-3823319541 .background-color-N3{background-color:#9499AB;} + .d2-3823319541 .background-color-N4{background-color:#CFD2DD;} + .d2-3823319541 .background-color-N5{background-color:#DEE1EB;} + .d2-3823319541 .background-color-N6{background-color:#EEF1F8;} + .d2-3823319541 .background-color-N7{background-color:#FFFFFF;} + .d2-3823319541 .background-color-B1{background-color:#0D32B2;} + .d2-3823319541 .background-color-B2{background-color:#0D32B2;} + .d2-3823319541 .background-color-B3{background-color:#E3E9FD;} + .d2-3823319541 .background-color-B4{background-color:#E3E9FD;} + .d2-3823319541 .background-color-B5{background-color:#EDF0FD;} + .d2-3823319541 .background-color-B6{background-color:#F7F8FE;} + .d2-3823319541 .background-color-AA2{background-color:#4A6FF3;} + .d2-3823319541 .background-color-AA4{background-color:#EDF0FD;} + .d2-3823319541 .background-color-AA5{background-color:#F7F8FE;} + .d2-3823319541 .background-color-AB4{background-color:#EDF0FD;} + .d2-3823319541 .background-color-AB5{background-color:#F7F8FE;} + .d2-3823319541 .color-N1{color:#0A0F25;} + .d2-3823319541 .color-N2{color:#676C7E;} + .d2-3823319541 .color-N3{color:#9499AB;} + .d2-3823319541 .color-N4{color:#CFD2DD;} + .d2-3823319541 .color-N5{color:#DEE1EB;} + .d2-3823319541 .color-N6{color:#EEF1F8;} + .d2-3823319541 .color-N7{color:#FFFFFF;} + .d2-3823319541 .color-B1{color:#0D32B2;} + .d2-3823319541 .color-B2{color:#0D32B2;} + .d2-3823319541 .color-B3{color:#E3E9FD;} + .d2-3823319541 .color-B4{color:#E3E9FD;} + .d2-3823319541 .color-B5{color:#EDF0FD;} + .d2-3823319541 .color-B6{color:#F7F8FE;} + .d2-3823319541 .color-AA2{color:#4A6FF3;} + .d2-3823319541 .color-AA4{color:#EDF0FD;} + .d2-3823319541 .color-AA5{color:#F7F8FE;} + .d2-3823319541 .color-AB4{color:#EDF0FD;} + .d2-3823319541 .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}]]>Why do computers get sick often?Because their Windows are always open! italic font diff --git a/e2etests/testdata/patterns/3d/dagre/board.exp.json b/e2etests/testdata/patterns/3d/dagre/board.exp.json index a07a3e175..7f4aaad05 100644 --- a/e2etests/testdata/patterns/3d/dagre/board.exp.json +++ b/e2etests/testdata/patterns/3d/dagre/board.exp.json @@ -8,7 +8,7 @@ "type": "rectangle", "pos": { "x": 0, - "y": 15 + "y": 2 }, "width": 53, "height": 66, @@ -50,7 +50,7 @@ "type": "hexagon", "pos": { "x": 128, - "y": 10 + "y": 0 }, "width": 51, "height": 69, diff --git a/e2etests/testdata/patterns/3d/dagre/sketch.exp.svg b/e2etests/testdata/patterns/3d/dagre/sketch.exp.svg index 77e541a79..01eb2db3a 100644 --- a/e2etests/testdata/patterns/3d/dagre/sketch.exp.svg +++ b/e2etests/testdata/patterns/3d/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -trianglenonearrowdiamondfilled diamondcirclefilled circlecf onecf one requiredcf manycf many requiredabcdabcdabcdabcdabcdabcdabcdabcdabcdabcdabcd 11 111111 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + .d2-1692964923 .fill-N1{fill:#0A0F25;} + .d2-1692964923 .fill-N2{fill:#676C7E;} + .d2-1692964923 .fill-N3{fill:#9499AB;} + .d2-1692964923 .fill-N4{fill:#CFD2DD;} + .d2-1692964923 .fill-N5{fill:#DEE1EB;} + .d2-1692964923 .fill-N6{fill:#EEF1F8;} + .d2-1692964923 .fill-N7{fill:#FFFFFF;} + .d2-1692964923 .fill-B1{fill:#0D32B2;} + .d2-1692964923 .fill-B2{fill:#0D32B2;} + .d2-1692964923 .fill-B3{fill:#E3E9FD;} + .d2-1692964923 .fill-B4{fill:#E3E9FD;} + .d2-1692964923 .fill-B5{fill:#EDF0FD;} + .d2-1692964923 .fill-B6{fill:#F7F8FE;} + .d2-1692964923 .fill-AA2{fill:#4A6FF3;} + .d2-1692964923 .fill-AA4{fill:#EDF0FD;} + .d2-1692964923 .fill-AA5{fill:#F7F8FE;} + .d2-1692964923 .fill-AB4{fill:#EDF0FD;} + .d2-1692964923 .fill-AB5{fill:#F7F8FE;} + .d2-1692964923 .stroke-N1{stroke:#0A0F25;} + .d2-1692964923 .stroke-N2{stroke:#676C7E;} + .d2-1692964923 .stroke-N3{stroke:#9499AB;} + .d2-1692964923 .stroke-N4{stroke:#CFD2DD;} + .d2-1692964923 .stroke-N5{stroke:#DEE1EB;} + .d2-1692964923 .stroke-N6{stroke:#EEF1F8;} + .d2-1692964923 .stroke-N7{stroke:#FFFFFF;} + .d2-1692964923 .stroke-B1{stroke:#0D32B2;} + .d2-1692964923 .stroke-B2{stroke:#0D32B2;} + .d2-1692964923 .stroke-B3{stroke:#E3E9FD;} + .d2-1692964923 .stroke-B4{stroke:#E3E9FD;} + .d2-1692964923 .stroke-B5{stroke:#EDF0FD;} + .d2-1692964923 .stroke-B6{stroke:#F7F8FE;} + .d2-1692964923 .stroke-AA2{stroke:#4A6FF3;} + .d2-1692964923 .stroke-AA4{stroke:#EDF0FD;} + .d2-1692964923 .stroke-AA5{stroke:#F7F8FE;} + .d2-1692964923 .stroke-AB4{stroke:#EDF0FD;} + .d2-1692964923 .stroke-AB5{stroke:#F7F8FE;} + .d2-1692964923 .background-color-N1{background-color:#0A0F25;} + .d2-1692964923 .background-color-N2{background-color:#676C7E;} + .d2-1692964923 .background-color-N3{background-color:#9499AB;} + .d2-1692964923 .background-color-N4{background-color:#CFD2DD;} + .d2-1692964923 .background-color-N5{background-color:#DEE1EB;} + .d2-1692964923 .background-color-N6{background-color:#EEF1F8;} + .d2-1692964923 .background-color-N7{background-color:#FFFFFF;} + .d2-1692964923 .background-color-B1{background-color:#0D32B2;} + .d2-1692964923 .background-color-B2{background-color:#0D32B2;} + .d2-1692964923 .background-color-B3{background-color:#E3E9FD;} + .d2-1692964923 .background-color-B4{background-color:#E3E9FD;} + .d2-1692964923 .background-color-B5{background-color:#EDF0FD;} + .d2-1692964923 .background-color-B6{background-color:#F7F8FE;} + .d2-1692964923 .background-color-AA2{background-color:#4A6FF3;} + .d2-1692964923 .background-color-AA4{background-color:#EDF0FD;} + .d2-1692964923 .background-color-AA5{background-color:#F7F8FE;} + .d2-1692964923 .background-color-AB4{background-color:#EDF0FD;} + .d2-1692964923 .background-color-AB5{background-color:#F7F8FE;} + .d2-1692964923 .color-N1{color:#0A0F25;} + .d2-1692964923 .color-N2{color:#676C7E;} + .d2-1692964923 .color-N3{color:#9499AB;} + .d2-1692964923 .color-N4{color:#CFD2DD;} + .d2-1692964923 .color-N5{color:#DEE1EB;} + .d2-1692964923 .color-N6{color:#EEF1F8;} + .d2-1692964923 .color-N7{color:#FFFFFF;} + .d2-1692964923 .color-B1{color:#0D32B2;} + .d2-1692964923 .color-B2{color:#0D32B2;} + .d2-1692964923 .color-B3{color:#E3E9FD;} + .d2-1692964923 .color-B4{color:#E3E9FD;} + .d2-1692964923 .color-B5{color:#EDF0FD;} + .d2-1692964923 .color-B6{color:#F7F8FE;} + .d2-1692964923 .color-AA2{color:#4A6FF3;} + .d2-1692964923 .color-AA4{color:#EDF0FD;} + .d2-1692964923 .color-AA5{color:#F7F8FE;} + .d2-1692964923 .color-AB4{color:#EDF0FD;} + .d2-1692964923 .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}]]>trianglenonearrowdiamondfilled diamondcirclefilled circlecf onecf one requiredcf manycf many requiredabcdabcdabcdabcdabcdabcdabcdabcdabcdabcdabcd 11 111111 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/regression/bold_edge_label/dagre/board.exp.json b/e2etests/testdata/regression/bold_edge_label/dagre/board.exp.json index fe29298b1..8d006d204 100644 --- a/e2etests/testdata/regression/bold_edge_label/dagre/board.exp.json +++ b/e2etests/testdata/regression/bold_edge_label/dagre/board.exp.json @@ -153,11 +153,11 @@ "labelPercentage": 0, "route": [ { - "x": 53, + "x": 52.5, "y": 33 }, { - "x": 105.4000015258789, + "x": 105.30000305175781, "y": 33 }, { @@ -200,11 +200,11 @@ "labelPercentage": 0, "route": [ { - "x": 238, + "x": 237.5, "y": 33 }, { - "x": 291.20001220703125, + "x": 291.1000061035156, "y": 33 }, { diff --git a/e2etests/testdata/regression/bold_edge_label/dagre/sketch.exp.svg b/e2etests/testdata/regression/bold_edge_label/dagre/sketch.exp.svg index 20116a72b..309424dd6 100644 --- a/e2etests/testdata/regression/bold_edge_label/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/bold_edge_label/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -xyz syncsync + .d2-3526140621 .fill-N1{fill:#0A0F25;} + .d2-3526140621 .fill-N2{fill:#676C7E;} + .d2-3526140621 .fill-N3{fill:#9499AB;} + .d2-3526140621 .fill-N4{fill:#CFD2DD;} + .d2-3526140621 .fill-N5{fill:#DEE1EB;} + .d2-3526140621 .fill-N6{fill:#EEF1F8;} + .d2-3526140621 .fill-N7{fill:#FFFFFF;} + .d2-3526140621 .fill-B1{fill:#0D32B2;} + .d2-3526140621 .fill-B2{fill:#0D32B2;} + .d2-3526140621 .fill-B3{fill:#E3E9FD;} + .d2-3526140621 .fill-B4{fill:#E3E9FD;} + .d2-3526140621 .fill-B5{fill:#EDF0FD;} + .d2-3526140621 .fill-B6{fill:#F7F8FE;} + .d2-3526140621 .fill-AA2{fill:#4A6FF3;} + .d2-3526140621 .fill-AA4{fill:#EDF0FD;} + .d2-3526140621 .fill-AA5{fill:#F7F8FE;} + .d2-3526140621 .fill-AB4{fill:#EDF0FD;} + .d2-3526140621 .fill-AB5{fill:#F7F8FE;} + .d2-3526140621 .stroke-N1{stroke:#0A0F25;} + .d2-3526140621 .stroke-N2{stroke:#676C7E;} + .d2-3526140621 .stroke-N3{stroke:#9499AB;} + .d2-3526140621 .stroke-N4{stroke:#CFD2DD;} + .d2-3526140621 .stroke-N5{stroke:#DEE1EB;} + .d2-3526140621 .stroke-N6{stroke:#EEF1F8;} + .d2-3526140621 .stroke-N7{stroke:#FFFFFF;} + .d2-3526140621 .stroke-B1{stroke:#0D32B2;} + .d2-3526140621 .stroke-B2{stroke:#0D32B2;} + .d2-3526140621 .stroke-B3{stroke:#E3E9FD;} + .d2-3526140621 .stroke-B4{stroke:#E3E9FD;} + .d2-3526140621 .stroke-B5{stroke:#EDF0FD;} + .d2-3526140621 .stroke-B6{stroke:#F7F8FE;} + .d2-3526140621 .stroke-AA2{stroke:#4A6FF3;} + .d2-3526140621 .stroke-AA4{stroke:#EDF0FD;} + .d2-3526140621 .stroke-AA5{stroke:#F7F8FE;} + .d2-3526140621 .stroke-AB4{stroke:#EDF0FD;} + .d2-3526140621 .stroke-AB5{stroke:#F7F8FE;} + .d2-3526140621 .background-color-N1{background-color:#0A0F25;} + .d2-3526140621 .background-color-N2{background-color:#676C7E;} + .d2-3526140621 .background-color-N3{background-color:#9499AB;} + .d2-3526140621 .background-color-N4{background-color:#CFD2DD;} + .d2-3526140621 .background-color-N5{background-color:#DEE1EB;} + .d2-3526140621 .background-color-N6{background-color:#EEF1F8;} + .d2-3526140621 .background-color-N7{background-color:#FFFFFF;} + .d2-3526140621 .background-color-B1{background-color:#0D32B2;} + .d2-3526140621 .background-color-B2{background-color:#0D32B2;} + .d2-3526140621 .background-color-B3{background-color:#E3E9FD;} + .d2-3526140621 .background-color-B4{background-color:#E3E9FD;} + .d2-3526140621 .background-color-B5{background-color:#EDF0FD;} + .d2-3526140621 .background-color-B6{background-color:#F7F8FE;} + .d2-3526140621 .background-color-AA2{background-color:#4A6FF3;} + .d2-3526140621 .background-color-AA4{background-color:#EDF0FD;} + .d2-3526140621 .background-color-AA5{background-color:#F7F8FE;} + .d2-3526140621 .background-color-AB4{background-color:#EDF0FD;} + .d2-3526140621 .background-color-AB5{background-color:#F7F8FE;} + .d2-3526140621 .color-N1{color:#0A0F25;} + .d2-3526140621 .color-N2{color:#676C7E;} + .d2-3526140621 .color-N3{color:#9499AB;} + .d2-3526140621 .color-N4{color:#CFD2DD;} + .d2-3526140621 .color-N5{color:#DEE1EB;} + .d2-3526140621 .color-N6{color:#EEF1F8;} + .d2-3526140621 .color-N7{color:#FFFFFF;} + .d2-3526140621 .color-B1{color:#0D32B2;} + .d2-3526140621 .color-B2{color:#0D32B2;} + .d2-3526140621 .color-B3{color:#E3E9FD;} + .d2-3526140621 .color-B4{color:#E3E9FD;} + .d2-3526140621 .color-B5{color:#EDF0FD;} + .d2-3526140621 .color-B6{color:#F7F8FE;} + .d2-3526140621 .color-AA2{color:#4A6FF3;} + .d2-3526140621 .color-AA4{color:#EDF0FD;} + .d2-3526140621 .color-AA5{color:#F7F8FE;} + .d2-3526140621 .color-AB4{color:#EDF0FD;} + .d2-3526140621 .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}]]>xyz syncsync diff --git a/e2etests/testdata/regression/dagre-disconnect/dagre/board.exp.json b/e2etests/testdata/regression/dagre-disconnect/dagre/board.exp.json index f4db0058c..ea2e876a1 100644 --- a/e2etests/testdata/regression/dagre-disconnect/dagre/board.exp.json +++ b/e2etests/testdata/regression/dagre-disconnect/dagre/board.exp.json @@ -8,10 +8,10 @@ "type": "rectangle", "pos": { "x": 0, - "y": 41 + "y": 38 }, "width": 394, - "height": 1830, + "height": 1784, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -48,11 +48,11 @@ "id": "a.k", "type": "rectangle", "pos": { - "x": 20, - "y": 111 + "x": 30, + "y": 79 }, - "width": 131, - "height": 139, + "width": 111, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -90,7 +90,7 @@ "type": "rectangle", "pos": { "x": 60, - "y": 147 + "y": 109 }, "width": 51, "height": 66, @@ -130,11 +130,11 @@ "id": "a.f", "type": "rectangle", "pos": { - "x": 21, - "y": 504 + "x": 31, + "y": 472 }, - "width": 353, - "height": 139, + "width": 333, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -172,7 +172,7 @@ "type": "rectangle", "pos": { "x": 61, - "y": 540 + "y": 502 }, "width": 49, "height": 66, @@ -213,7 +213,7 @@ "type": "rectangle", "pos": { "x": 170, - "y": 540 + "y": 502 }, "width": 54, "height": 66, @@ -254,10 +254,10 @@ "type": "rectangle", "pos": { "x": 565, - "y": 827 + "y": 824 }, "width": 259, - "height": 636, + "height": 590, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -294,11 +294,11 @@ "id": "s.n", "type": "rectangle", "pos": { - "x": 585, - "y": 897 + "x": 595, + "y": 865 }, - "width": 131, - "height": 139, + "width": 111, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -335,11 +335,11 @@ "id": "k", "type": "rectangle", "pos": { - "x": 1108, - "y": 434 + "x": 1118, + "y": 472 }, - "width": 132, - "height": 243, + "width": 112, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -377,7 +377,7 @@ "type": "rectangle", "pos": { "x": 1148, - "y": 522 + "y": 502 }, "width": 52, "height": 66, @@ -418,10 +418,10 @@ "type": "rectangle", "pos": { "x": 844, - "y": 827 + "y": 824 }, - "width": 397, - "height": 243, + "width": 387, + "height": 197, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -459,7 +459,7 @@ "type": "rectangle", "pos": { "x": 1147, - "y": 915 + "y": 895 }, "width": 54, "height": 66, @@ -500,10 +500,10 @@ "type": "rectangle", "pos": { "x": 741, - "y": 41 + "y": 38 }, "width": 172, - "height": 243, + "height": 197, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -540,11 +540,11 @@ "id": "h.m", "type": "rectangle", "pos": { - "x": 761, - "y": 111 + "x": 771, + "y": 79 }, - "width": 132, - "height": 139, + "width": 112, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -582,7 +582,7 @@ "type": "rectangle", "pos": { "x": 801, - "y": 147 + "y": 109 }, "width": 52, "height": 66, @@ -623,7 +623,7 @@ "type": "rectangle", "pos": { "x": 284, - "y": 540 + "y": 502 }, "width": 50, "height": 66, @@ -663,11 +663,11 @@ "id": "u.s", "type": "rectangle", "pos": { - "x": 864, - "y": 897 + "x": 874, + "y": 865 }, - "width": 130, - "height": 139, + "width": 110, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -705,7 +705,7 @@ "type": "rectangle", "pos": { "x": 904, - "y": 933 + "y": 895 }, "width": 50, "height": 66, @@ -746,7 +746,7 @@ "type": "rectangle", "pos": { "x": 1034, - "y": 915 + "y": 895 }, "width": 53, "height": 66, @@ -786,11 +786,11 @@ "id": "s.z", "type": "rectangle", "pos": { - "x": 671, - "y": 1290 + "x": 681, + "y": 1258 }, - "width": 133, - "height": 139, + "width": 113, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -828,7 +828,7 @@ "type": "rectangle", "pos": { "x": 711, - "y": 1326 + "y": 1288 }, "width": 53, "height": 66, @@ -869,7 +869,7 @@ "type": "rectangle", "pos": { "x": 625, - "y": 933 + "y": 895 }, "width": 51, "height": 66, @@ -909,11 +909,11 @@ "id": "y", "type": "rectangle", "pos": { - "x": 414, - "y": 1220 + "x": 424, + "y": 1258 }, - "width": 131, - "height": 243, + "width": 111, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -951,7 +951,7 @@ "type": "rectangle", "pos": { "x": 454, - "y": 1308 + "y": 1288 }, "width": 51, "height": 66, @@ -991,11 +991,11 @@ "id": "a.g", "type": "rectangle", "pos": { - "x": 133, - "y": 1697 + "x": 143, + "y": 1666 }, - "width": 129, - "height": 139, + "width": 109, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1033,7 +1033,7 @@ "type": "rectangle", "pos": { "x": 173, - "y": 1734 + "y": 1696 }, "width": 49, "height": 66, @@ -1097,55 +1097,55 @@ "route": [ { "x": 85.5, - "y": 213.5 + "y": 174.5 }, { "x": 85.5, - "y": 242.6999969482422 + "y": 218.5 }, { "x": 85.5, - "y": 260.89898681640625 + "y": 240.39999389648438 }, { "x": 85.5, - "y": 277.25 + "y": 256.75 }, { "x": 85.5, - "y": 293.6000061035156 + "y": 273.1000061035156 }, { "x": 85.5, - "y": 315.3999938964844 + "y": 294.8999938964844 }, { "x": 85.5, - "y": 331.75 + "y": 311.25 }, { "x": 85.5, - "y": 348.1000061035156 + "y": 327.6000061035156 }, { "x": 85.5, - "y": 369.8999938964844 + "y": 349.3999938964844 }, { "x": 85.5, - "y": 386.25 + "y": 365.75 }, { "x": 85.5, - "y": 402.6000061035156 + "y": 382.1000061035156 }, { "x": 85.5, - "y": 482.6000061035156 + "y": 458.5 }, { "x": 85.5, - "y": 541 + "y": 502.5 } ], "isCurve": true, @@ -1180,11 +1180,11 @@ "route": [ { "x": 197, - "y": 606.5 + "y": 567.5 }, { "x": 197, - "y": 619.2999877929688 + "y": 611.5 }, { "x": 197, @@ -1223,12 +1223,12 @@ "y": 775.0999755859375 }, { - "x": 274.6000061035156, - "y": 866.7999877929688 + "x": 276.6000061035156, + "y": 855.5 }, { - "x": 585, - "y": 972 + "x": 595, + "y": 915.5 } ], "isCurve": true, @@ -1263,11 +1263,11 @@ "route": [ { "x": 1173.5, - "y": 588.5 + "y": 567.5 }, { "x": 1173.5, - "y": 615.7000122070312 + "y": 611.5 }, { "x": 1173.5, @@ -1307,11 +1307,11 @@ }, { "x": 1173.5, - "y": 855.5999755859375 + "y": 851.5 }, { "x": 1173.5, - "y": 916 + "y": 895.5 } ], "isCurve": true, @@ -1346,11 +1346,11 @@ "route": [ { "x": 827.25, - "y": 213.5 + "y": 174.5 }, { "x": 827.25, - "y": 226.3000030517578 + "y": 218.5 }, { "x": 827.25, @@ -1390,11 +1390,11 @@ }, { "x": 197, - "y": 466.20001220703125 + "y": 458.5 }, { "x": 197, - "y": 541 + "y": 502.5 } ], "isCurve": true, @@ -1429,11 +1429,11 @@ "route": [ { "x": 309, - "y": 606.5 + "y": 567.5 }, { "x": 309, - "y": 619.2999877929688 + "y": 611.5 }, { "x": 309, @@ -1473,11 +1473,11 @@ }, { "x": 427.8999938964844, - "y": 864.9929809570312 + "y": 857.2930297851562 }, { "x": 903.5, - "y": 962.968017578125 + "y": 924.468017578125 } ], "isCurve": true, @@ -1512,11 +1512,11 @@ "route": [ { "x": 1060, - "y": 981.5 + "y": 960.5 }, { "x": 1060, - "y": 1008.7000122070312 + "y": 1004.5 }, { "x": 1060, @@ -1556,11 +1556,11 @@ }, { "x": 737, - "y": 1252.199951171875 + "y": 1244.5 }, { "x": 737, - "y": 1327 + "y": 1288.5 } ], "isCurve": true, @@ -1595,11 +1595,11 @@ "route": [ { "x": 650.5, - "y": 1037 + "y": 991.5 }, { "x": 650.5, - "y": 1063.4000244140625 + "y": 1054.300048828125 }, { "x": 650.5, @@ -1627,11 +1627,11 @@ }, { "x": 621.2999877929688, - "y": 1252.4000244140625 + "y": 1248.300048828125 }, { "x": 504.5, - "y": 1328 + "y": 1307.5 } ], "isCurve": true, @@ -1666,11 +1666,11 @@ "route": [ { "x": 479.5, - "y": 1374.5 + "y": 1353.5 }, { "x": 479.5, - "y": 1401.699951171875 + "y": 1397.5 }, { "x": 479.5, @@ -1698,11 +1698,11 @@ }, { "x": 197, - "y": 1659.5999755859375 + "y": 1651.9000244140625 }, { "x": 197, - "y": 1734 + "y": 1695.5 } ], "isCurve": true, diff --git a/e2etests/testdata/regression/dagre-disconnect/dagre/sketch.exp.svg b/e2etests/testdata/regression/dagre-disconnect/dagre/sketch.exp.svg index 4bb381897..774187ecf 100644 --- a/e2etests/testdata/regression/dagre-disconnect/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/dagre-disconnect/dagre/sketch.exp.svg @@ -1,23 +1,23 @@ -askuhykfnsomsczrgtigsjjcfi 1234 - - - - - - - - - - - - - - - - - - - - - - - - - - - - + .d2-1071049415 .fill-N1{fill:#0A0F25;} + .d2-1071049415 .fill-N2{fill:#676C7E;} + .d2-1071049415 .fill-N3{fill:#9499AB;} + .d2-1071049415 .fill-N4{fill:#CFD2DD;} + .d2-1071049415 .fill-N5{fill:#DEE1EB;} + .d2-1071049415 .fill-N6{fill:#EEF1F8;} + .d2-1071049415 .fill-N7{fill:#FFFFFF;} + .d2-1071049415 .fill-B1{fill:#0D32B2;} + .d2-1071049415 .fill-B2{fill:#0D32B2;} + .d2-1071049415 .fill-B3{fill:#E3E9FD;} + .d2-1071049415 .fill-B4{fill:#E3E9FD;} + .d2-1071049415 .fill-B5{fill:#EDF0FD;} + .d2-1071049415 .fill-B6{fill:#F7F8FE;} + .d2-1071049415 .fill-AA2{fill:#4A6FF3;} + .d2-1071049415 .fill-AA4{fill:#EDF0FD;} + .d2-1071049415 .fill-AA5{fill:#F7F8FE;} + .d2-1071049415 .fill-AB4{fill:#EDF0FD;} + .d2-1071049415 .fill-AB5{fill:#F7F8FE;} + .d2-1071049415 .stroke-N1{stroke:#0A0F25;} + .d2-1071049415 .stroke-N2{stroke:#676C7E;} + .d2-1071049415 .stroke-N3{stroke:#9499AB;} + .d2-1071049415 .stroke-N4{stroke:#CFD2DD;} + .d2-1071049415 .stroke-N5{stroke:#DEE1EB;} + .d2-1071049415 .stroke-N6{stroke:#EEF1F8;} + .d2-1071049415 .stroke-N7{stroke:#FFFFFF;} + .d2-1071049415 .stroke-B1{stroke:#0D32B2;} + .d2-1071049415 .stroke-B2{stroke:#0D32B2;} + .d2-1071049415 .stroke-B3{stroke:#E3E9FD;} + .d2-1071049415 .stroke-B4{stroke:#E3E9FD;} + .d2-1071049415 .stroke-B5{stroke:#EDF0FD;} + .d2-1071049415 .stroke-B6{stroke:#F7F8FE;} + .d2-1071049415 .stroke-AA2{stroke:#4A6FF3;} + .d2-1071049415 .stroke-AA4{stroke:#EDF0FD;} + .d2-1071049415 .stroke-AA5{stroke:#F7F8FE;} + .d2-1071049415 .stroke-AB4{stroke:#EDF0FD;} + .d2-1071049415 .stroke-AB5{stroke:#F7F8FE;} + .d2-1071049415 .background-color-N1{background-color:#0A0F25;} + .d2-1071049415 .background-color-N2{background-color:#676C7E;} + .d2-1071049415 .background-color-N3{background-color:#9499AB;} + .d2-1071049415 .background-color-N4{background-color:#CFD2DD;} + .d2-1071049415 .background-color-N5{background-color:#DEE1EB;} + .d2-1071049415 .background-color-N6{background-color:#EEF1F8;} + .d2-1071049415 .background-color-N7{background-color:#FFFFFF;} + .d2-1071049415 .background-color-B1{background-color:#0D32B2;} + .d2-1071049415 .background-color-B2{background-color:#0D32B2;} + .d2-1071049415 .background-color-B3{background-color:#E3E9FD;} + .d2-1071049415 .background-color-B4{background-color:#E3E9FD;} + .d2-1071049415 .background-color-B5{background-color:#EDF0FD;} + .d2-1071049415 .background-color-B6{background-color:#F7F8FE;} + .d2-1071049415 .background-color-AA2{background-color:#4A6FF3;} + .d2-1071049415 .background-color-AA4{background-color:#EDF0FD;} + .d2-1071049415 .background-color-AA5{background-color:#F7F8FE;} + .d2-1071049415 .background-color-AB4{background-color:#EDF0FD;} + .d2-1071049415 .background-color-AB5{background-color:#F7F8FE;} + .d2-1071049415 .color-N1{color:#0A0F25;} + .d2-1071049415 .color-N2{color:#676C7E;} + .d2-1071049415 .color-N3{color:#9499AB;} + .d2-1071049415 .color-N4{color:#CFD2DD;} + .d2-1071049415 .color-N5{color:#DEE1EB;} + .d2-1071049415 .color-N6{color:#EEF1F8;} + .d2-1071049415 .color-N7{color:#FFFFFF;} + .d2-1071049415 .color-B1{color:#0D32B2;} + .d2-1071049415 .color-B2{color:#0D32B2;} + .d2-1071049415 .color-B3{color:#E3E9FD;} + .d2-1071049415 .color-B4{color:#E3E9FD;} + .d2-1071049415 .color-B5{color:#EDF0FD;} + .d2-1071049415 .color-B6{color:#F7F8FE;} + .d2-1071049415 .color-AA2{color:#4A6FF3;} + .d2-1071049415 .color-AA4{color:#EDF0FD;} + .d2-1071049415 .color-AA5{color:#F7F8FE;} + .d2-1071049415 .color-AB4{color:#EDF0FD;} + .d2-1071049415 .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}]]>askuhykfnsomsczrgtigsjjcfi 1234 + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/regression/dagre-disconnect/elk/board.exp.json b/e2etests/testdata/regression/dagre-disconnect/elk/board.exp.json index 7c812c6fd..b5a1bf653 100644 --- a/e2etests/testdata/regression/dagre-disconnect/elk/board.exp.json +++ b/e2etests/testdata/regression/dagre-disconnect/elk/board.exp.json @@ -1163,7 +1163,7 @@ }, { "x": 413.75, - "y": 1453.5 + "y": 1454 } ], "animated": false, @@ -1365,7 +1365,7 @@ "route": [ { "x": 413.75, - "y": 1619.5 + "y": 1619 }, { "x": 413.75, diff --git a/e2etests/testdata/regression/dagre-disconnect/elk/sketch.exp.svg b/e2etests/testdata/regression/dagre-disconnect/elk/sketch.exp.svg index b57b2f821..413a8b544 100644 --- a/e2etests/testdata/regression/dagre-disconnect/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/dagre-disconnect/elk/sketch.exp.svg @@ -1,23 +1,23 @@ -askuhykfnsomsczrgtigsjjcfi 1234 + .d2-3244895320 .fill-N1{fill:#0A0F25;} + .d2-3244895320 .fill-N2{fill:#676C7E;} + .d2-3244895320 .fill-N3{fill:#9499AB;} + .d2-3244895320 .fill-N4{fill:#CFD2DD;} + .d2-3244895320 .fill-N5{fill:#DEE1EB;} + .d2-3244895320 .fill-N6{fill:#EEF1F8;} + .d2-3244895320 .fill-N7{fill:#FFFFFF;} + .d2-3244895320 .fill-B1{fill:#0D32B2;} + .d2-3244895320 .fill-B2{fill:#0D32B2;} + .d2-3244895320 .fill-B3{fill:#E3E9FD;} + .d2-3244895320 .fill-B4{fill:#E3E9FD;} + .d2-3244895320 .fill-B5{fill:#EDF0FD;} + .d2-3244895320 .fill-B6{fill:#F7F8FE;} + .d2-3244895320 .fill-AA2{fill:#4A6FF3;} + .d2-3244895320 .fill-AA4{fill:#EDF0FD;} + .d2-3244895320 .fill-AA5{fill:#F7F8FE;} + .d2-3244895320 .fill-AB4{fill:#EDF0FD;} + .d2-3244895320 .fill-AB5{fill:#F7F8FE;} + .d2-3244895320 .stroke-N1{stroke:#0A0F25;} + .d2-3244895320 .stroke-N2{stroke:#676C7E;} + .d2-3244895320 .stroke-N3{stroke:#9499AB;} + .d2-3244895320 .stroke-N4{stroke:#CFD2DD;} + .d2-3244895320 .stroke-N5{stroke:#DEE1EB;} + .d2-3244895320 .stroke-N6{stroke:#EEF1F8;} + .d2-3244895320 .stroke-N7{stroke:#FFFFFF;} + .d2-3244895320 .stroke-B1{stroke:#0D32B2;} + .d2-3244895320 .stroke-B2{stroke:#0D32B2;} + .d2-3244895320 .stroke-B3{stroke:#E3E9FD;} + .d2-3244895320 .stroke-B4{stroke:#E3E9FD;} + .d2-3244895320 .stroke-B5{stroke:#EDF0FD;} + .d2-3244895320 .stroke-B6{stroke:#F7F8FE;} + .d2-3244895320 .stroke-AA2{stroke:#4A6FF3;} + .d2-3244895320 .stroke-AA4{stroke:#EDF0FD;} + .d2-3244895320 .stroke-AA5{stroke:#F7F8FE;} + .d2-3244895320 .stroke-AB4{stroke:#EDF0FD;} + .d2-3244895320 .stroke-AB5{stroke:#F7F8FE;} + .d2-3244895320 .background-color-N1{background-color:#0A0F25;} + .d2-3244895320 .background-color-N2{background-color:#676C7E;} + .d2-3244895320 .background-color-N3{background-color:#9499AB;} + .d2-3244895320 .background-color-N4{background-color:#CFD2DD;} + .d2-3244895320 .background-color-N5{background-color:#DEE1EB;} + .d2-3244895320 .background-color-N6{background-color:#EEF1F8;} + .d2-3244895320 .background-color-N7{background-color:#FFFFFF;} + .d2-3244895320 .background-color-B1{background-color:#0D32B2;} + .d2-3244895320 .background-color-B2{background-color:#0D32B2;} + .d2-3244895320 .background-color-B3{background-color:#E3E9FD;} + .d2-3244895320 .background-color-B4{background-color:#E3E9FD;} + .d2-3244895320 .background-color-B5{background-color:#EDF0FD;} + .d2-3244895320 .background-color-B6{background-color:#F7F8FE;} + .d2-3244895320 .background-color-AA2{background-color:#4A6FF3;} + .d2-3244895320 .background-color-AA4{background-color:#EDF0FD;} + .d2-3244895320 .background-color-AA5{background-color:#F7F8FE;} + .d2-3244895320 .background-color-AB4{background-color:#EDF0FD;} + .d2-3244895320 .background-color-AB5{background-color:#F7F8FE;} + .d2-3244895320 .color-N1{color:#0A0F25;} + .d2-3244895320 .color-N2{color:#676C7E;} + .d2-3244895320 .color-N3{color:#9499AB;} + .d2-3244895320 .color-N4{color:#CFD2DD;} + .d2-3244895320 .color-N5{color:#DEE1EB;} + .d2-3244895320 .color-N6{color:#EEF1F8;} + .d2-3244895320 .color-N7{color:#FFFFFF;} + .d2-3244895320 .color-B1{color:#0D32B2;} + .d2-3244895320 .color-B2{color:#0D32B2;} + .d2-3244895320 .color-B3{color:#E3E9FD;} + .d2-3244895320 .color-B4{color:#E3E9FD;} + .d2-3244895320 .color-B5{color:#EDF0FD;} + .d2-3244895320 .color-B6{color:#F7F8FE;} + .d2-3244895320 .color-AA2{color:#4A6FF3;} + .d2-3244895320 .color-AA4{color:#EDF0FD;} + .d2-3244895320 .color-AA5{color:#F7F8FE;} + .d2-3244895320 .color-AB4{color:#EDF0FD;} + .d2-3244895320 .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}]]>askuhykfnsomsczrgtigsjjcfi 1234 diff --git a/e2etests/testdata/regression/dagre_broken_arrowhead/dagre/board.exp.json b/e2etests/testdata/regression/dagre_broken_arrowhead/dagre/board.exp.json index 933a2048f..4b5bdb62f 100644 --- a/e2etests/testdata/regression/dagre_broken_arrowhead/dagre/board.exp.json +++ b/e2etests/testdata/regression/dagre_broken_arrowhead/dagre/board.exp.json @@ -7,11 +7,11 @@ "id": "a", "type": "rectangle", "pos": { - "x": 0, - "y": 41 + "x": 7, + "y": 25 }, - "width": 358, - "height": 487, + "width": 343, + "height": 454, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -49,7 +49,7 @@ "type": "rectangle", "pos": { "x": 40, - "y": 75 + "y": 55 }, "width": 53, "height": 66, @@ -89,11 +89,11 @@ "id": "a.c", "type": "rectangle", "pos": { - "x": 23, - "y": 355 + "x": 37, + "y": 323 }, - "width": 299, - "height": 139, + "width": 283, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -131,7 +131,7 @@ "type": "rectangle", "pos": { "x": 153, - "y": 75 + "y": 55 }, "width": 52, "height": 66, @@ -172,7 +172,7 @@ "type": "rectangle", "pos": { "x": 265, - "y": 75 + "y": 55 }, "width": 53, "height": 66, @@ -213,7 +213,7 @@ "type": "rectangle", "pos": { "x": 152, - "y": 391 + "y": 353 }, "width": 54, "height": 66, @@ -277,19 +277,19 @@ "route": [ { "x": 66.5, - "y": 142 + "y": 121.5 }, { "x": 66.5, - "y": 212.39999389648438 + "y": 191.89999389648438 }, { "x": 66.69999694824219, - "y": 326.3999938964844 + "y": 303.5 }, { "x": 67.5, - "y": 356 + "y": 323.5 } ], "isCurve": true, @@ -324,19 +324,19 @@ "route": [ { "x": 179, - "y": 142 + "y": 121.5 }, { "x": 179, - "y": 212.39999389648438 + "y": 191.89999389648438 }, { "x": 179, - "y": 248 + "y": 225.10000610351562 }, { "x": 179, - "y": 320 + "y": 287.5 } ], "isCurve": true, @@ -371,19 +371,19 @@ "route": [ { "x": 291.5, - "y": 142 + "y": 121.5 }, { "x": 291.5, - "y": 212.39999389648438 + "y": 191.89999389648438 }, { "x": 291.29998779296875, - "y": 326.3999938964844 + "y": 303.5 }, { "x": 290.5, - "y": 356 + "y": 323.5 } ], "isCurve": true, diff --git a/e2etests/testdata/regression/dagre_broken_arrowhead/dagre/sketch.exp.svg b/e2etests/testdata/regression/dagre_broken_arrowhead/dagre/sketch.exp.svg index dd3533724..fa8b0409a 100644 --- a/e2etests/testdata/regression/dagre_broken_arrowhead/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/dagre_broken_arrowhead/dagre/sketch.exp.svg @@ -1,23 +1,23 @@ -abc12d line 1line 2line 3line 4 - - - - - - - - + .d2-4267680593 .fill-N1{fill:#0A0F25;} + .d2-4267680593 .fill-N2{fill:#676C7E;} + .d2-4267680593 .fill-N3{fill:#9499AB;} + .d2-4267680593 .fill-N4{fill:#CFD2DD;} + .d2-4267680593 .fill-N5{fill:#DEE1EB;} + .d2-4267680593 .fill-N6{fill:#EEF1F8;} + .d2-4267680593 .fill-N7{fill:#FFFFFF;} + .d2-4267680593 .fill-B1{fill:#0D32B2;} + .d2-4267680593 .fill-B2{fill:#0D32B2;} + .d2-4267680593 .fill-B3{fill:#E3E9FD;} + .d2-4267680593 .fill-B4{fill:#E3E9FD;} + .d2-4267680593 .fill-B5{fill:#EDF0FD;} + .d2-4267680593 .fill-B6{fill:#F7F8FE;} + .d2-4267680593 .fill-AA2{fill:#4A6FF3;} + .d2-4267680593 .fill-AA4{fill:#EDF0FD;} + .d2-4267680593 .fill-AA5{fill:#F7F8FE;} + .d2-4267680593 .fill-AB4{fill:#EDF0FD;} + .d2-4267680593 .fill-AB5{fill:#F7F8FE;} + .d2-4267680593 .stroke-N1{stroke:#0A0F25;} + .d2-4267680593 .stroke-N2{stroke:#676C7E;} + .d2-4267680593 .stroke-N3{stroke:#9499AB;} + .d2-4267680593 .stroke-N4{stroke:#CFD2DD;} + .d2-4267680593 .stroke-N5{stroke:#DEE1EB;} + .d2-4267680593 .stroke-N6{stroke:#EEF1F8;} + .d2-4267680593 .stroke-N7{stroke:#FFFFFF;} + .d2-4267680593 .stroke-B1{stroke:#0D32B2;} + .d2-4267680593 .stroke-B2{stroke:#0D32B2;} + .d2-4267680593 .stroke-B3{stroke:#E3E9FD;} + .d2-4267680593 .stroke-B4{stroke:#E3E9FD;} + .d2-4267680593 .stroke-B5{stroke:#EDF0FD;} + .d2-4267680593 .stroke-B6{stroke:#F7F8FE;} + .d2-4267680593 .stroke-AA2{stroke:#4A6FF3;} + .d2-4267680593 .stroke-AA4{stroke:#EDF0FD;} + .d2-4267680593 .stroke-AA5{stroke:#F7F8FE;} + .d2-4267680593 .stroke-AB4{stroke:#EDF0FD;} + .d2-4267680593 .stroke-AB5{stroke:#F7F8FE;} + .d2-4267680593 .background-color-N1{background-color:#0A0F25;} + .d2-4267680593 .background-color-N2{background-color:#676C7E;} + .d2-4267680593 .background-color-N3{background-color:#9499AB;} + .d2-4267680593 .background-color-N4{background-color:#CFD2DD;} + .d2-4267680593 .background-color-N5{background-color:#DEE1EB;} + .d2-4267680593 .background-color-N6{background-color:#EEF1F8;} + .d2-4267680593 .background-color-N7{background-color:#FFFFFF;} + .d2-4267680593 .background-color-B1{background-color:#0D32B2;} + .d2-4267680593 .background-color-B2{background-color:#0D32B2;} + .d2-4267680593 .background-color-B3{background-color:#E3E9FD;} + .d2-4267680593 .background-color-B4{background-color:#E3E9FD;} + .d2-4267680593 .background-color-B5{background-color:#EDF0FD;} + .d2-4267680593 .background-color-B6{background-color:#F7F8FE;} + .d2-4267680593 .background-color-AA2{background-color:#4A6FF3;} + .d2-4267680593 .background-color-AA4{background-color:#EDF0FD;} + .d2-4267680593 .background-color-AA5{background-color:#F7F8FE;} + .d2-4267680593 .background-color-AB4{background-color:#EDF0FD;} + .d2-4267680593 .background-color-AB5{background-color:#F7F8FE;} + .d2-4267680593 .color-N1{color:#0A0F25;} + .d2-4267680593 .color-N2{color:#676C7E;} + .d2-4267680593 .color-N3{color:#9499AB;} + .d2-4267680593 .color-N4{color:#CFD2DD;} + .d2-4267680593 .color-N5{color:#DEE1EB;} + .d2-4267680593 .color-N6{color:#EEF1F8;} + .d2-4267680593 .color-N7{color:#FFFFFF;} + .d2-4267680593 .color-B1{color:#0D32B2;} + .d2-4267680593 .color-B2{color:#0D32B2;} + .d2-4267680593 .color-B3{color:#E3E9FD;} + .d2-4267680593 .color-B4{color:#E3E9FD;} + .d2-4267680593 .color-B5{color:#EDF0FD;} + .d2-4267680593 .color-B6{color:#F7F8FE;} + .d2-4267680593 .color-AA2{color:#4A6FF3;} + .d2-4267680593 .color-AA4{color:#EDF0FD;} + .d2-4267680593 .color-AA5{color:#F7F8FE;} + .d2-4267680593 .color-AB4{color:#EDF0FD;} + .d2-4267680593 .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}]]>abc12d line 1line 2line 3line 4 + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/regression/dagre_edge_label_spacing/dagre/board.exp.json b/e2etests/testdata/regression/dagre_edge_label_spacing/dagre/board.exp.json index cf8775f3e..31bf03db6 100644 --- a/e2etests/testdata/regression/dagre_edge_label_spacing/dagre/board.exp.json +++ b/e2etests/testdata/regression/dagre_edge_label_spacing/dagre/board.exp.json @@ -7,11 +7,11 @@ "id": "build_workflow", "type": "rectangle", "pos": { - "x": 0, - "y": 41 + "x": 75, + "y": 56 }, - "width": 2328, - "height": 117, + "width": 2179, + "height": 137, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -49,7 +49,7 @@ "type": "rectangle", "pos": { "x": 105, - "y": 61 + "y": 86 }, "width": 270, "height": 77, @@ -90,7 +90,7 @@ "type": "rectangle", "pos": { "x": 638, - "y": 61 + "y": 86 }, "width": 209, "height": 77, @@ -131,7 +131,7 @@ "type": "rectangle", "pos": { "x": 1194, - "y": 61 + "y": 86 }, "width": 71, "height": 77, @@ -172,7 +172,7 @@ "type": "rectangle", "pos": { "x": 1593, - "y": 61 + "y": 86 }, "width": 158, "height": 77, @@ -213,7 +213,7 @@ "type": "rectangle", "pos": { "x": 2129, - "y": 61 + "y": 86 }, "width": 95, "height": 77, @@ -277,19 +277,19 @@ "route": [ { "x": 375.5, - "y": 99.5 + "y": 124.5 }, { "x": 479.8999938964844, - "y": 99.5 + "y": 124.5 }, { "x": 532.2999877929688, - "y": 99.5 + "y": 124.5 }, { "x": 637.5, - "y": 99.5 + "y": 124.5 } ], "isCurve": true, @@ -323,20 +323,20 @@ "labelPercentage": 0, "route": [ { - "x": 846.5, - "y": 99.5 + "x": 847, + "y": 124.5 }, { - "x": 985.2999877929688, - "y": 99.5 + "x": 985.4000244140625, + "y": 124.5 }, { "x": 1054.699951171875, - "y": 99.5 + "y": 124.5 }, { "x": 1193.5, - "y": 99.5 + "y": 124.5 } ], "isCurve": true, @@ -371,19 +371,19 @@ "route": [ { "x": 1265.5, - "y": 99.5 + "y": 124.5 }, { "x": 1395.9000244140625, - "y": 99.5 + "y": 124.5 }, { "x": 1461.300048828125, - "y": 99.5 + "y": 124.5 }, { "x": 1592.5, - "y": 99.5 + "y": 124.5 } ], "isCurve": true, @@ -418,19 +418,19 @@ "route": [ { "x": 1751.5, - "y": 99.5 + "y": 124.5 }, { "x": 1901.9000244140625, - "y": 99.5 + "y": 124.5 }, { "x": 1977.300048828125, - "y": 99.5 + "y": 124.5 }, { "x": 2128.5, - "y": 99.5 + "y": 124.5 } ], "isCurve": true, diff --git a/e2etests/testdata/regression/dagre_edge_label_spacing/dagre/sketch.exp.svg b/e2etests/testdata/regression/dagre_edge_label_spacing/dagre/sketch.exp.svg index 702eadc48..12b109a42 100644 --- a/e2etests/testdata/regression/dagre_edge_label_spacing/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/dagre_edge_label_spacing/dagre/sketch.exp.svg @@ -1,23 +1,23 @@ -lambda-build.yamlPush to main branchGitHub ActionsS3TerraformAWS TriggersBuilds zip & pushes it Pulls zip to deployChanges the live lambdas - - - - - - - - - - - + .d2-3124104395 .fill-N1{fill:#0A0F25;} + .d2-3124104395 .fill-N2{fill:#676C7E;} + .d2-3124104395 .fill-N3{fill:#9499AB;} + .d2-3124104395 .fill-N4{fill:#CFD2DD;} + .d2-3124104395 .fill-N5{fill:#DEE1EB;} + .d2-3124104395 .fill-N6{fill:#EEF1F8;} + .d2-3124104395 .fill-N7{fill:#FFFFFF;} + .d2-3124104395 .fill-B1{fill:#0D32B2;} + .d2-3124104395 .fill-B2{fill:#0D32B2;} + .d2-3124104395 .fill-B3{fill:#E3E9FD;} + .d2-3124104395 .fill-B4{fill:#E3E9FD;} + .d2-3124104395 .fill-B5{fill:#EDF0FD;} + .d2-3124104395 .fill-B6{fill:#F7F8FE;} + .d2-3124104395 .fill-AA2{fill:#4A6FF3;} + .d2-3124104395 .fill-AA4{fill:#EDF0FD;} + .d2-3124104395 .fill-AA5{fill:#F7F8FE;} + .d2-3124104395 .fill-AB4{fill:#EDF0FD;} + .d2-3124104395 .fill-AB5{fill:#F7F8FE;} + .d2-3124104395 .stroke-N1{stroke:#0A0F25;} + .d2-3124104395 .stroke-N2{stroke:#676C7E;} + .d2-3124104395 .stroke-N3{stroke:#9499AB;} + .d2-3124104395 .stroke-N4{stroke:#CFD2DD;} + .d2-3124104395 .stroke-N5{stroke:#DEE1EB;} + .d2-3124104395 .stroke-N6{stroke:#EEF1F8;} + .d2-3124104395 .stroke-N7{stroke:#FFFFFF;} + .d2-3124104395 .stroke-B1{stroke:#0D32B2;} + .d2-3124104395 .stroke-B2{stroke:#0D32B2;} + .d2-3124104395 .stroke-B3{stroke:#E3E9FD;} + .d2-3124104395 .stroke-B4{stroke:#E3E9FD;} + .d2-3124104395 .stroke-B5{stroke:#EDF0FD;} + .d2-3124104395 .stroke-B6{stroke:#F7F8FE;} + .d2-3124104395 .stroke-AA2{stroke:#4A6FF3;} + .d2-3124104395 .stroke-AA4{stroke:#EDF0FD;} + .d2-3124104395 .stroke-AA5{stroke:#F7F8FE;} + .d2-3124104395 .stroke-AB4{stroke:#EDF0FD;} + .d2-3124104395 .stroke-AB5{stroke:#F7F8FE;} + .d2-3124104395 .background-color-N1{background-color:#0A0F25;} + .d2-3124104395 .background-color-N2{background-color:#676C7E;} + .d2-3124104395 .background-color-N3{background-color:#9499AB;} + .d2-3124104395 .background-color-N4{background-color:#CFD2DD;} + .d2-3124104395 .background-color-N5{background-color:#DEE1EB;} + .d2-3124104395 .background-color-N6{background-color:#EEF1F8;} + .d2-3124104395 .background-color-N7{background-color:#FFFFFF;} + .d2-3124104395 .background-color-B1{background-color:#0D32B2;} + .d2-3124104395 .background-color-B2{background-color:#0D32B2;} + .d2-3124104395 .background-color-B3{background-color:#E3E9FD;} + .d2-3124104395 .background-color-B4{background-color:#E3E9FD;} + .d2-3124104395 .background-color-B5{background-color:#EDF0FD;} + .d2-3124104395 .background-color-B6{background-color:#F7F8FE;} + .d2-3124104395 .background-color-AA2{background-color:#4A6FF3;} + .d2-3124104395 .background-color-AA4{background-color:#EDF0FD;} + .d2-3124104395 .background-color-AA5{background-color:#F7F8FE;} + .d2-3124104395 .background-color-AB4{background-color:#EDF0FD;} + .d2-3124104395 .background-color-AB5{background-color:#F7F8FE;} + .d2-3124104395 .color-N1{color:#0A0F25;} + .d2-3124104395 .color-N2{color:#676C7E;} + .d2-3124104395 .color-N3{color:#9499AB;} + .d2-3124104395 .color-N4{color:#CFD2DD;} + .d2-3124104395 .color-N5{color:#DEE1EB;} + .d2-3124104395 .color-N6{color:#EEF1F8;} + .d2-3124104395 .color-N7{color:#FFFFFF;} + .d2-3124104395 .color-B1{color:#0D32B2;} + .d2-3124104395 .color-B2{color:#0D32B2;} + .d2-3124104395 .color-B3{color:#E3E9FD;} + .d2-3124104395 .color-B4{color:#E3E9FD;} + .d2-3124104395 .color-B5{color:#EDF0FD;} + .d2-3124104395 .color-B6{color:#F7F8FE;} + .d2-3124104395 .color-AA2{color:#4A6FF3;} + .d2-3124104395 .color-AA4{color:#EDF0FD;} + .d2-3124104395 .color-AA5{color:#F7F8FE;} + .d2-3124104395 .color-AB4{color:#EDF0FD;} + .d2-3124104395 .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}]]>lambda-build.yamlPush to main branchGitHub ActionsS3TerraformAWS TriggersBuilds zip & pushes it Pulls zip to deployChanges the live lambdas + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/regression/elk_alignment/dagre/board.exp.json b/e2etests/testdata/regression/elk_alignment/dagre/board.exp.json index 04ce3f321..c0ffb1802 100644 --- a/e2etests/testdata/regression/elk_alignment/dagre/board.exp.json +++ b/e2etests/testdata/regression/elk_alignment/dagre/board.exp.json @@ -7,11 +7,11 @@ "id": "build_workflow", "type": "rectangle", "pos": { - "x": 0, - "y": 41 + "x": 10, + "y": 43 }, - "width": 350, - "height": 1331, + "width": 330, + "height": 1286, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -49,7 +49,7 @@ "type": "rectangle", "pos": { "x": 40, - "y": 93 + "y": 73 }, "width": 270, "height": 77, @@ -90,7 +90,7 @@ "type": "rectangle", "pos": { "x": 71, - "y": 342 + "y": 322 }, "width": 209, "height": 77, @@ -131,7 +131,7 @@ "type": "rectangle", "pos": { "x": 140, - "y": 671 + "y": 651 }, "width": 71, "height": 77, @@ -172,7 +172,7 @@ "type": "rectangle", "pos": { "x": 96, - "y": 993 + "y": 973 }, "width": 158, "height": 77, @@ -213,7 +213,7 @@ "type": "rectangle", "pos": { "x": 128, - "y": 1242 + "y": 1222 }, "width": 95, "height": 77, @@ -253,11 +253,11 @@ "id": "deploy_workflow", "type": "rectangle", "pos": { - "x": 370, - "y": 41 + "x": 380, + "y": 43 }, - "width": 291, - "height": 760, + "width": 271, + "height": 715, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -295,7 +295,7 @@ "type": "rectangle", "pos": { "x": 410, - "y": 93 + "y": 73 }, "width": 211, "height": 77, @@ -336,7 +336,7 @@ "type": "rectangle", "pos": { "x": 411, - "y": 342 + "y": 322 }, "width": 209, "height": 77, @@ -377,7 +377,7 @@ "type": "rectangle", "pos": { "x": 468, - "y": 671 + "y": 651 }, "width": 95, "height": 77, @@ -417,11 +417,11 @@ "id": "apollo_workflow", "type": "rectangle", "pos": { - "x": 681, - "y": 41 + "x": 833, + "y": 43 }, - "width": 573, - "height": 760, + "width": 269, + "height": 715, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -459,7 +459,7 @@ "type": "rectangle", "pos": { "x": 879, - "y": 93 + "y": 73 }, "width": 178, "height": 77, @@ -500,7 +500,7 @@ "type": "rectangle", "pos": { "x": 863, - "y": 342 + "y": 322 }, "width": 209, "height": 77, @@ -541,7 +541,7 @@ "type": "rectangle", "pos": { "x": 920, - "y": 671 + "y": 651 }, "width": 95, "height": 77, @@ -605,19 +605,19 @@ "route": [ { "x": 175, - "y": 170.5 + "y": 150 }, { "x": 175, - "y": 239.3000030517578 + "y": 218.8000030517578 }, { "x": 175, - "y": 273.70001220703125 + "y": 253.1999969482422 }, { "x": 175, - "y": 342.5 + "y": 322 } ], "isCurve": true, @@ -652,19 +652,19 @@ "route": [ { "x": 175, - "y": 419.5 + "y": 399 }, { "x": 175, - "y": 520.2990112304688 + "y": 499.79998779296875 }, { "x": 175, - "y": 570.7000122070312 + "y": 550.2000122070312 }, { "x": 175, - "y": 671.5 + "y": 651 } ], "isCurve": true, @@ -699,19 +699,19 @@ "route": [ { "x": 175, - "y": 748.5 + "y": 728 }, { "x": 175, - "y": 806.9000244140625 + "y": 786.4000244140625 }, { "x": 175, - "y": 924.7000122070312 + "y": 904.2000122070312 }, { "x": 175, - "y": 993.5 + "y": 973 } ], "isCurve": true, @@ -746,19 +746,19 @@ "route": [ { "x": 175, - "y": 1070.5 + "y": 1050 }, { "x": 175, - "y": 1139.300048828125 + "y": 1118.800048828125 }, { "x": 175, - "y": 1173.699951171875 + "y": 1153.199951171875 }, { "x": 175, - "y": 1242.5 + "y": 1222 } ], "isCurve": true, @@ -793,19 +793,19 @@ "route": [ { "x": 515.5, - "y": 170.5 + "y": 150 }, { "x": 515.5, - "y": 239.3000030517578 + "y": 218.8000030517578 }, { "x": 515.5, - "y": 273.70001220703125 + "y": 253.1999969482422 }, { "x": 515.5, - "y": 342.5 + "y": 322 } ], "isCurve": true, @@ -840,19 +840,19 @@ "route": [ { "x": 515.5, - "y": 419.5 + "y": 399 }, { "x": 515.5, - "y": 520.2990112304688 + "y": 499.79998779296875 }, { "x": 515.5, - "y": 570.7000122070312 + "y": 550.2000122070312 }, { "x": 515.5, - "y": 671.5 + "y": 651 } ], "isCurve": true, @@ -887,19 +887,19 @@ "route": [ { "x": 967.5, - "y": 170.5 + "y": 150 }, { "x": 967.5, - "y": 239.3000030517578 + "y": 218.8000030517578 }, { "x": 967.5, - "y": 273.70001220703125 + "y": 253.1999969482422 }, { "x": 967.5, - "y": 342.5 + "y": 322 } ], "isCurve": true, @@ -934,19 +934,19 @@ "route": [ { "x": 967.5, - "y": 419.5 + "y": 399 }, { "x": 967.5, - "y": 520.2990112304688 + "y": 499.79998779296875 }, { "x": 967.5, - "y": 570.7000122070312 + "y": 550.2000122070312 }, { "x": 967.5, - "y": 671.5 + "y": 651 } ], "isCurve": true, diff --git a/e2etests/testdata/regression/elk_alignment/dagre/sketch.exp.svg b/e2etests/testdata/regression/elk_alignment/dagre/sketch.exp.svg index 8db5f0b7e..722b8090b 100644 --- a/e2etests/testdata/regression/elk_alignment/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/elk_alignment/dagre/sketch.exp.svg @@ -1,23 +1,23 @@ -lambda-build.yamllambda-deploy.yamlapollo-deploy.yamlPush to main branchGitHub ActionsS3TerraformAWSManual TriggerGitHub ActionsAWSApollo RepoGitHub ActionsAWS TriggersBuilds zip and pushes it Pulls zip to deployChanges live lambdasLaunchesBuilds zippushes them to S3. Deploys lambdasusing TerraformTriggered manually/push to master test test test test test test testtest - - - - - - - - - - - - - - - - - - - - - - - + .d2-3115112857 .fill-N1{fill:#0A0F25;} + .d2-3115112857 .fill-N2{fill:#676C7E;} + .d2-3115112857 .fill-N3{fill:#9499AB;} + .d2-3115112857 .fill-N4{fill:#CFD2DD;} + .d2-3115112857 .fill-N5{fill:#DEE1EB;} + .d2-3115112857 .fill-N6{fill:#EEF1F8;} + .d2-3115112857 .fill-N7{fill:#FFFFFF;} + .d2-3115112857 .fill-B1{fill:#0D32B2;} + .d2-3115112857 .fill-B2{fill:#0D32B2;} + .d2-3115112857 .fill-B3{fill:#E3E9FD;} + .d2-3115112857 .fill-B4{fill:#E3E9FD;} + .d2-3115112857 .fill-B5{fill:#EDF0FD;} + .d2-3115112857 .fill-B6{fill:#F7F8FE;} + .d2-3115112857 .fill-AA2{fill:#4A6FF3;} + .d2-3115112857 .fill-AA4{fill:#EDF0FD;} + .d2-3115112857 .fill-AA5{fill:#F7F8FE;} + .d2-3115112857 .fill-AB4{fill:#EDF0FD;} + .d2-3115112857 .fill-AB5{fill:#F7F8FE;} + .d2-3115112857 .stroke-N1{stroke:#0A0F25;} + .d2-3115112857 .stroke-N2{stroke:#676C7E;} + .d2-3115112857 .stroke-N3{stroke:#9499AB;} + .d2-3115112857 .stroke-N4{stroke:#CFD2DD;} + .d2-3115112857 .stroke-N5{stroke:#DEE1EB;} + .d2-3115112857 .stroke-N6{stroke:#EEF1F8;} + .d2-3115112857 .stroke-N7{stroke:#FFFFFF;} + .d2-3115112857 .stroke-B1{stroke:#0D32B2;} + .d2-3115112857 .stroke-B2{stroke:#0D32B2;} + .d2-3115112857 .stroke-B3{stroke:#E3E9FD;} + .d2-3115112857 .stroke-B4{stroke:#E3E9FD;} + .d2-3115112857 .stroke-B5{stroke:#EDF0FD;} + .d2-3115112857 .stroke-B6{stroke:#F7F8FE;} + .d2-3115112857 .stroke-AA2{stroke:#4A6FF3;} + .d2-3115112857 .stroke-AA4{stroke:#EDF0FD;} + .d2-3115112857 .stroke-AA5{stroke:#F7F8FE;} + .d2-3115112857 .stroke-AB4{stroke:#EDF0FD;} + .d2-3115112857 .stroke-AB5{stroke:#F7F8FE;} + .d2-3115112857 .background-color-N1{background-color:#0A0F25;} + .d2-3115112857 .background-color-N2{background-color:#676C7E;} + .d2-3115112857 .background-color-N3{background-color:#9499AB;} + .d2-3115112857 .background-color-N4{background-color:#CFD2DD;} + .d2-3115112857 .background-color-N5{background-color:#DEE1EB;} + .d2-3115112857 .background-color-N6{background-color:#EEF1F8;} + .d2-3115112857 .background-color-N7{background-color:#FFFFFF;} + .d2-3115112857 .background-color-B1{background-color:#0D32B2;} + .d2-3115112857 .background-color-B2{background-color:#0D32B2;} + .d2-3115112857 .background-color-B3{background-color:#E3E9FD;} + .d2-3115112857 .background-color-B4{background-color:#E3E9FD;} + .d2-3115112857 .background-color-B5{background-color:#EDF0FD;} + .d2-3115112857 .background-color-B6{background-color:#F7F8FE;} + .d2-3115112857 .background-color-AA2{background-color:#4A6FF3;} + .d2-3115112857 .background-color-AA4{background-color:#EDF0FD;} + .d2-3115112857 .background-color-AA5{background-color:#F7F8FE;} + .d2-3115112857 .background-color-AB4{background-color:#EDF0FD;} + .d2-3115112857 .background-color-AB5{background-color:#F7F8FE;} + .d2-3115112857 .color-N1{color:#0A0F25;} + .d2-3115112857 .color-N2{color:#676C7E;} + .d2-3115112857 .color-N3{color:#9499AB;} + .d2-3115112857 .color-N4{color:#CFD2DD;} + .d2-3115112857 .color-N5{color:#DEE1EB;} + .d2-3115112857 .color-N6{color:#EEF1F8;} + .d2-3115112857 .color-N7{color:#FFFFFF;} + .d2-3115112857 .color-B1{color:#0D32B2;} + .d2-3115112857 .color-B2{color:#0D32B2;} + .d2-3115112857 .color-B3{color:#E3E9FD;} + .d2-3115112857 .color-B4{color:#E3E9FD;} + .d2-3115112857 .color-B5{color:#EDF0FD;} + .d2-3115112857 .color-B6{color:#F7F8FE;} + .d2-3115112857 .color-AA2{color:#4A6FF3;} + .d2-3115112857 .color-AA4{color:#EDF0FD;} + .d2-3115112857 .color-AA5{color:#F7F8FE;} + .d2-3115112857 .color-AB4{color:#EDF0FD;} + .d2-3115112857 .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}]]>lambda-build.yamllambda-deploy.yamlapollo-deploy.yamlPush to main branchGitHub ActionsS3TerraformAWSManual TriggerGitHub ActionsAWSApollo RepoGitHub ActionsAWS TriggersBuilds zip and pushes it Pulls zip to deployChanges live lambdasLaunchesBuilds zippushes them to S3. Deploys lambdasusing TerraformTriggered manually/push to master test test test test test test testtest + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/regression/elk_loop_panic/dagre/board.exp.json b/e2etests/testdata/regression/elk_loop_panic/dagre/board.exp.json index 26c6671e4..c31719ee2 100644 --- a/e2etests/testdata/regression/elk_loop_panic/dagre/board.exp.json +++ b/e2etests/testdata/regression/elk_loop_panic/dagre/board.exp.json @@ -7,11 +7,11 @@ "id": "x", "type": "rectangle", "pos": { - "x": 0, - "y": 41 + "x": 10, + "y": 20 }, - "width": 266, - "height": 125, + "width": 246, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -49,7 +49,7 @@ "type": "rectangle", "pos": { "x": 40, - "y": 70 + "y": 50 }, "width": 53, "height": 66, @@ -90,7 +90,7 @@ "type": "rectangle", "pos": { "x": 173, - "y": 70 + "y": 50 }, "width": 53, "height": 66, @@ -153,56 +153,56 @@ "labelPercentage": 0, "route": [ { - "x": 93, - "y": 87.0510025024414 + "x": 92.66600036621094, + "y": 67 }, { - "x": 114.33300018310547, - "y": 73.80999755859375 + "x": 114.26599884033203, + "y": 53.400001525878906 }, { "x": 121, - "y": 70.5 + "y": 50 }, { "x": 123, - "y": 70.5 + "y": 50 }, { "x": 125, - "y": 70.5 + "y": 50 }, { "x": 127.66600036621094, - "y": 77.0999984741211 + "y": 56.599998474121094 }, { "x": 129.66600036621094, - "y": 87 + "y": 66.5 }, { "x": 131.66600036621094, - "y": 96.9000015258789 + "y": 76.4000015258789 }, { "x": 131.66600036621094, - "y": 110.0999984741211 + "y": 89.5999984741211 }, { "x": 129.66600036621094, - "y": 120 + "y": 99.5 }, { "x": 127.66600036621094, - "y": 129.89999389648438 + "y": 109.4000015258789 }, { - "x": 114.33300018310547, - "y": 133.18899536132812 + "x": 114.26599884033203, + "y": 112.5999984741211 }, { - "x": 93, - "y": 119.947998046875 + "x": 92.66600036621094, + "y": 99 } ], "isCurve": true, diff --git a/e2etests/testdata/regression/elk_loop_panic/dagre/sketch.exp.svg b/e2etests/testdata/regression/elk_loop_panic/dagre/sketch.exp.svg index f39aabdea..8c462a8fe 100644 --- a/e2etests/testdata/regression/elk_loop_panic/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/elk_loop_panic/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -xab - - - - + .d2-3864938258 .fill-N1{fill:#0A0F25;} + .d2-3864938258 .fill-N2{fill:#676C7E;} + .d2-3864938258 .fill-N3{fill:#9499AB;} + .d2-3864938258 .fill-N4{fill:#CFD2DD;} + .d2-3864938258 .fill-N5{fill:#DEE1EB;} + .d2-3864938258 .fill-N6{fill:#EEF1F8;} + .d2-3864938258 .fill-N7{fill:#FFFFFF;} + .d2-3864938258 .fill-B1{fill:#0D32B2;} + .d2-3864938258 .fill-B2{fill:#0D32B2;} + .d2-3864938258 .fill-B3{fill:#E3E9FD;} + .d2-3864938258 .fill-B4{fill:#E3E9FD;} + .d2-3864938258 .fill-B5{fill:#EDF0FD;} + .d2-3864938258 .fill-B6{fill:#F7F8FE;} + .d2-3864938258 .fill-AA2{fill:#4A6FF3;} + .d2-3864938258 .fill-AA4{fill:#EDF0FD;} + .d2-3864938258 .fill-AA5{fill:#F7F8FE;} + .d2-3864938258 .fill-AB4{fill:#EDF0FD;} + .d2-3864938258 .fill-AB5{fill:#F7F8FE;} + .d2-3864938258 .stroke-N1{stroke:#0A0F25;} + .d2-3864938258 .stroke-N2{stroke:#676C7E;} + .d2-3864938258 .stroke-N3{stroke:#9499AB;} + .d2-3864938258 .stroke-N4{stroke:#CFD2DD;} + .d2-3864938258 .stroke-N5{stroke:#DEE1EB;} + .d2-3864938258 .stroke-N6{stroke:#EEF1F8;} + .d2-3864938258 .stroke-N7{stroke:#FFFFFF;} + .d2-3864938258 .stroke-B1{stroke:#0D32B2;} + .d2-3864938258 .stroke-B2{stroke:#0D32B2;} + .d2-3864938258 .stroke-B3{stroke:#E3E9FD;} + .d2-3864938258 .stroke-B4{stroke:#E3E9FD;} + .d2-3864938258 .stroke-B5{stroke:#EDF0FD;} + .d2-3864938258 .stroke-B6{stroke:#F7F8FE;} + .d2-3864938258 .stroke-AA2{stroke:#4A6FF3;} + .d2-3864938258 .stroke-AA4{stroke:#EDF0FD;} + .d2-3864938258 .stroke-AA5{stroke:#F7F8FE;} + .d2-3864938258 .stroke-AB4{stroke:#EDF0FD;} + .d2-3864938258 .stroke-AB5{stroke:#F7F8FE;} + .d2-3864938258 .background-color-N1{background-color:#0A0F25;} + .d2-3864938258 .background-color-N2{background-color:#676C7E;} + .d2-3864938258 .background-color-N3{background-color:#9499AB;} + .d2-3864938258 .background-color-N4{background-color:#CFD2DD;} + .d2-3864938258 .background-color-N5{background-color:#DEE1EB;} + .d2-3864938258 .background-color-N6{background-color:#EEF1F8;} + .d2-3864938258 .background-color-N7{background-color:#FFFFFF;} + .d2-3864938258 .background-color-B1{background-color:#0D32B2;} + .d2-3864938258 .background-color-B2{background-color:#0D32B2;} + .d2-3864938258 .background-color-B3{background-color:#E3E9FD;} + .d2-3864938258 .background-color-B4{background-color:#E3E9FD;} + .d2-3864938258 .background-color-B5{background-color:#EDF0FD;} + .d2-3864938258 .background-color-B6{background-color:#F7F8FE;} + .d2-3864938258 .background-color-AA2{background-color:#4A6FF3;} + .d2-3864938258 .background-color-AA4{background-color:#EDF0FD;} + .d2-3864938258 .background-color-AA5{background-color:#F7F8FE;} + .d2-3864938258 .background-color-AB4{background-color:#EDF0FD;} + .d2-3864938258 .background-color-AB5{background-color:#F7F8FE;} + .d2-3864938258 .color-N1{color:#0A0F25;} + .d2-3864938258 .color-N2{color:#676C7E;} + .d2-3864938258 .color-N3{color:#9499AB;} + .d2-3864938258 .color-N4{color:#CFD2DD;} + .d2-3864938258 .color-N5{color:#DEE1EB;} + .d2-3864938258 .color-N6{color:#EEF1F8;} + .d2-3864938258 .color-N7{color:#FFFFFF;} + .d2-3864938258 .color-B1{color:#0D32B2;} + .d2-3864938258 .color-B2{color:#0D32B2;} + .d2-3864938258 .color-B3{color:#E3E9FD;} + .d2-3864938258 .color-B4{color:#E3E9FD;} + .d2-3864938258 .color-B5{color:#EDF0FD;} + .d2-3864938258 .color-B6{color:#F7F8FE;} + .d2-3864938258 .color-AA2{color:#4A6FF3;} + .d2-3864938258 .color-AA4{color:#EDF0FD;} + .d2-3864938258 .color-AA5{color:#F7F8FE;} + .d2-3864938258 .color-AB4{color:#EDF0FD;} + .d2-3864938258 .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}]]>xab + + + + \ No newline at end of file diff --git a/e2etests/testdata/regression/nested_steps/dagre/board.exp.json b/e2etests/testdata/regression/nested_steps/dagre/board.exp.json index cd584039b..a05bdd6e0 100644 --- a/e2etests/testdata/regression/nested_steps/dagre/board.exp.json +++ b/e2etests/testdata/regression/nested_steps/dagre/board.exp.json @@ -7,11 +7,11 @@ "id": "a", "type": "rectangle", "pos": { - "x": 0, - "y": 41 + "x": 10, + "y": 20 }, - "width": 173, - "height": 361, + "width": 153, + "height": 362, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -49,7 +49,7 @@ "type": "step", "pos": { "x": 40, - "y": 70 + "y": 50 }, "width": 93, "height": 101, @@ -90,7 +90,7 @@ "type": "step", "pos": { "x": 40, - "y": 271 + "y": 251 }, "width": 93, "height": 101, @@ -236,19 +236,19 @@ "route": [ { "x": 86, - "y": 172 + "y": 151 }, { "x": 86.4000015258789, - "y": 211.60000610351562 + "y": 191 }, { "x": 86.5999984741211, - "y": 231.60000610351562 + "y": 211 }, { "x": 87, - "y": 272 + "y": 251 } ], "isCurve": true, diff --git a/e2etests/testdata/regression/nested_steps/dagre/sketch.exp.svg b/e2etests/testdata/regression/nested_steps/dagre/sketch.exp.svg index 6074573bb..fd9388ae8 100644 --- a/e2etests/testdata/regression/nested_steps/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/nested_steps/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -acdab - - + .d2-1542977856 .fill-N1{fill:#0A0F25;} + .d2-1542977856 .fill-N2{fill:#676C7E;} + .d2-1542977856 .fill-N3{fill:#9499AB;} + .d2-1542977856 .fill-N4{fill:#CFD2DD;} + .d2-1542977856 .fill-N5{fill:#DEE1EB;} + .d2-1542977856 .fill-N6{fill:#EEF1F8;} + .d2-1542977856 .fill-N7{fill:#FFFFFF;} + .d2-1542977856 .fill-B1{fill:#0D32B2;} + .d2-1542977856 .fill-B2{fill:#0D32B2;} + .d2-1542977856 .fill-B3{fill:#E3E9FD;} + .d2-1542977856 .fill-B4{fill:#E3E9FD;} + .d2-1542977856 .fill-B5{fill:#EDF0FD;} + .d2-1542977856 .fill-B6{fill:#F7F8FE;} + .d2-1542977856 .fill-AA2{fill:#4A6FF3;} + .d2-1542977856 .fill-AA4{fill:#EDF0FD;} + .d2-1542977856 .fill-AA5{fill:#F7F8FE;} + .d2-1542977856 .fill-AB4{fill:#EDF0FD;} + .d2-1542977856 .fill-AB5{fill:#F7F8FE;} + .d2-1542977856 .stroke-N1{stroke:#0A0F25;} + .d2-1542977856 .stroke-N2{stroke:#676C7E;} + .d2-1542977856 .stroke-N3{stroke:#9499AB;} + .d2-1542977856 .stroke-N4{stroke:#CFD2DD;} + .d2-1542977856 .stroke-N5{stroke:#DEE1EB;} + .d2-1542977856 .stroke-N6{stroke:#EEF1F8;} + .d2-1542977856 .stroke-N7{stroke:#FFFFFF;} + .d2-1542977856 .stroke-B1{stroke:#0D32B2;} + .d2-1542977856 .stroke-B2{stroke:#0D32B2;} + .d2-1542977856 .stroke-B3{stroke:#E3E9FD;} + .d2-1542977856 .stroke-B4{stroke:#E3E9FD;} + .d2-1542977856 .stroke-B5{stroke:#EDF0FD;} + .d2-1542977856 .stroke-B6{stroke:#F7F8FE;} + .d2-1542977856 .stroke-AA2{stroke:#4A6FF3;} + .d2-1542977856 .stroke-AA4{stroke:#EDF0FD;} + .d2-1542977856 .stroke-AA5{stroke:#F7F8FE;} + .d2-1542977856 .stroke-AB4{stroke:#EDF0FD;} + .d2-1542977856 .stroke-AB5{stroke:#F7F8FE;} + .d2-1542977856 .background-color-N1{background-color:#0A0F25;} + .d2-1542977856 .background-color-N2{background-color:#676C7E;} + .d2-1542977856 .background-color-N3{background-color:#9499AB;} + .d2-1542977856 .background-color-N4{background-color:#CFD2DD;} + .d2-1542977856 .background-color-N5{background-color:#DEE1EB;} + .d2-1542977856 .background-color-N6{background-color:#EEF1F8;} + .d2-1542977856 .background-color-N7{background-color:#FFFFFF;} + .d2-1542977856 .background-color-B1{background-color:#0D32B2;} + .d2-1542977856 .background-color-B2{background-color:#0D32B2;} + .d2-1542977856 .background-color-B3{background-color:#E3E9FD;} + .d2-1542977856 .background-color-B4{background-color:#E3E9FD;} + .d2-1542977856 .background-color-B5{background-color:#EDF0FD;} + .d2-1542977856 .background-color-B6{background-color:#F7F8FE;} + .d2-1542977856 .background-color-AA2{background-color:#4A6FF3;} + .d2-1542977856 .background-color-AA4{background-color:#EDF0FD;} + .d2-1542977856 .background-color-AA5{background-color:#F7F8FE;} + .d2-1542977856 .background-color-AB4{background-color:#EDF0FD;} + .d2-1542977856 .background-color-AB5{background-color:#F7F8FE;} + .d2-1542977856 .color-N1{color:#0A0F25;} + .d2-1542977856 .color-N2{color:#676C7E;} + .d2-1542977856 .color-N3{color:#9499AB;} + .d2-1542977856 .color-N4{color:#CFD2DD;} + .d2-1542977856 .color-N5{color:#DEE1EB;} + .d2-1542977856 .color-N6{color:#EEF1F8;} + .d2-1542977856 .color-N7{color:#FFFFFF;} + .d2-1542977856 .color-B1{color:#0D32B2;} + .d2-1542977856 .color-B2{color:#0D32B2;} + .d2-1542977856 .color-B3{color:#E3E9FD;} + .d2-1542977856 .color-B4{color:#E3E9FD;} + .d2-1542977856 .color-B5{color:#EDF0FD;} + .d2-1542977856 .color-B6{color:#F7F8FE;} + .d2-1542977856 .color-AA2{color:#4A6FF3;} + .d2-1542977856 .color-AA4{color:#EDF0FD;} + .d2-1542977856 .color-AA5{color:#F7F8FE;} + .d2-1542977856 .color-AB4{color:#EDF0FD;} + .d2-1542977856 .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}]]>acdab + + - - + + \ No newline at end of file diff --git a/e2etests/testdata/regression/nested_steps/elk/board.exp.json b/e2etests/testdata/regression/nested_steps/elk/board.exp.json index aad53f272..165657d4f 100644 --- a/e2etests/testdata/regression/nested_steps/elk/board.exp.json +++ b/e2etests/testdata/regression/nested_steps/elk/board.exp.json @@ -239,7 +239,7 @@ "y": 163 }, { - "x": 108, + "x": 109, "y": 233 } ], @@ -277,7 +277,7 @@ "y": 384 }, { - "x": 271, + "x": 272, "y": 454 } ], diff --git a/e2etests/testdata/regression/nested_steps/elk/sketch.exp.svg b/e2etests/testdata/regression/nested_steps/elk/sketch.exp.svg index 586ed6529..6fe55a571 100644 --- a/e2etests/testdata/regression/nested_steps/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/nested_steps/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -acdab + .d2-3156367360 .fill-N1{fill:#0A0F25;} + .d2-3156367360 .fill-N2{fill:#676C7E;} + .d2-3156367360 .fill-N3{fill:#9499AB;} + .d2-3156367360 .fill-N4{fill:#CFD2DD;} + .d2-3156367360 .fill-N5{fill:#DEE1EB;} + .d2-3156367360 .fill-N6{fill:#EEF1F8;} + .d2-3156367360 .fill-N7{fill:#FFFFFF;} + .d2-3156367360 .fill-B1{fill:#0D32B2;} + .d2-3156367360 .fill-B2{fill:#0D32B2;} + .d2-3156367360 .fill-B3{fill:#E3E9FD;} + .d2-3156367360 .fill-B4{fill:#E3E9FD;} + .d2-3156367360 .fill-B5{fill:#EDF0FD;} + .d2-3156367360 .fill-B6{fill:#F7F8FE;} + .d2-3156367360 .fill-AA2{fill:#4A6FF3;} + .d2-3156367360 .fill-AA4{fill:#EDF0FD;} + .d2-3156367360 .fill-AA5{fill:#F7F8FE;} + .d2-3156367360 .fill-AB4{fill:#EDF0FD;} + .d2-3156367360 .fill-AB5{fill:#F7F8FE;} + .d2-3156367360 .stroke-N1{stroke:#0A0F25;} + .d2-3156367360 .stroke-N2{stroke:#676C7E;} + .d2-3156367360 .stroke-N3{stroke:#9499AB;} + .d2-3156367360 .stroke-N4{stroke:#CFD2DD;} + .d2-3156367360 .stroke-N5{stroke:#DEE1EB;} + .d2-3156367360 .stroke-N6{stroke:#EEF1F8;} + .d2-3156367360 .stroke-N7{stroke:#FFFFFF;} + .d2-3156367360 .stroke-B1{stroke:#0D32B2;} + .d2-3156367360 .stroke-B2{stroke:#0D32B2;} + .d2-3156367360 .stroke-B3{stroke:#E3E9FD;} + .d2-3156367360 .stroke-B4{stroke:#E3E9FD;} + .d2-3156367360 .stroke-B5{stroke:#EDF0FD;} + .d2-3156367360 .stroke-B6{stroke:#F7F8FE;} + .d2-3156367360 .stroke-AA2{stroke:#4A6FF3;} + .d2-3156367360 .stroke-AA4{stroke:#EDF0FD;} + .d2-3156367360 .stroke-AA5{stroke:#F7F8FE;} + .d2-3156367360 .stroke-AB4{stroke:#EDF0FD;} + .d2-3156367360 .stroke-AB5{stroke:#F7F8FE;} + .d2-3156367360 .background-color-N1{background-color:#0A0F25;} + .d2-3156367360 .background-color-N2{background-color:#676C7E;} + .d2-3156367360 .background-color-N3{background-color:#9499AB;} + .d2-3156367360 .background-color-N4{background-color:#CFD2DD;} + .d2-3156367360 .background-color-N5{background-color:#DEE1EB;} + .d2-3156367360 .background-color-N6{background-color:#EEF1F8;} + .d2-3156367360 .background-color-N7{background-color:#FFFFFF;} + .d2-3156367360 .background-color-B1{background-color:#0D32B2;} + .d2-3156367360 .background-color-B2{background-color:#0D32B2;} + .d2-3156367360 .background-color-B3{background-color:#E3E9FD;} + .d2-3156367360 .background-color-B4{background-color:#E3E9FD;} + .d2-3156367360 .background-color-B5{background-color:#EDF0FD;} + .d2-3156367360 .background-color-B6{background-color:#F7F8FE;} + .d2-3156367360 .background-color-AA2{background-color:#4A6FF3;} + .d2-3156367360 .background-color-AA4{background-color:#EDF0FD;} + .d2-3156367360 .background-color-AA5{background-color:#F7F8FE;} + .d2-3156367360 .background-color-AB4{background-color:#EDF0FD;} + .d2-3156367360 .background-color-AB5{background-color:#F7F8FE;} + .d2-3156367360 .color-N1{color:#0A0F25;} + .d2-3156367360 .color-N2{color:#676C7E;} + .d2-3156367360 .color-N3{color:#9499AB;} + .d2-3156367360 .color-N4{color:#CFD2DD;} + .d2-3156367360 .color-N5{color:#DEE1EB;} + .d2-3156367360 .color-N6{color:#EEF1F8;} + .d2-3156367360 .color-N7{color:#FFFFFF;} + .d2-3156367360 .color-B1{color:#0D32B2;} + .d2-3156367360 .color-B2{color:#0D32B2;} + .d2-3156367360 .color-B3{color:#E3E9FD;} + .d2-3156367360 .color-B4{color:#E3E9FD;} + .d2-3156367360 .color-B5{color:#EDF0FD;} + .d2-3156367360 .color-B6{color:#F7F8FE;} + .d2-3156367360 .color-AA2{color:#4A6FF3;} + .d2-3156367360 .color-AA4{color:#EDF0FD;} + .d2-3156367360 .color-AA5{color:#F7F8FE;} + .d2-3156367360 .color-AB4{color:#EDF0FD;} + .d2-3156367360 .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}]]>acdab diff --git a/e2etests/testdata/regression/opacity-on-label/dagre/board.exp.json b/e2etests/testdata/regression/opacity-on-label/dagre/board.exp.json index bef75715d..4a2c0b80a 100644 --- a/e2etests/testdata/regression/opacity-on-label/dagre/board.exp.json +++ b/e2etests/testdata/regression/opacity-on-label/dagre/board.exp.json @@ -153,11 +153,11 @@ "route": [ { "x": 161, - "y": 66 + "y": 65.5 }, { "x": 161, - "y": 120.80000305175781 + "y": 120.69999694824219 }, { "x": 161, diff --git a/e2etests/testdata/regression/opacity-on-label/dagre/sketch.exp.svg b/e2etests/testdata/regression/opacity-on-label/dagre/sketch.exp.svg index 3fd901ccb..990db8fe2 100644 --- a/e2etests/testdata/regression/opacity-on-label/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/opacity-on-label/dagre/sketch.exp.svg @@ -1,27 +1,27 @@ -x

linux: because a PC is a terrible thing to waste

-
a You don't have to know how the computer works,just how to work the computer. +a You don't have to know how the computer works,just how to work the computer. diff --git a/e2etests/testdata/regression/overlapping-edge-label/dagre/board.exp.json b/e2etests/testdata/regression/overlapping-edge-label/dagre/board.exp.json index dfd3b611c..d09ceeafe 100644 --- a/e2etests/testdata/regression/overlapping-edge-label/dagre/board.exp.json +++ b/e2etests/testdata/regression/overlapping-edge-label/dagre/board.exp.json @@ -7,11 +7,11 @@ "id": "k8s", "type": "rectangle", "pos": { - "x": 0, - "y": 41 + "x": 10, + "y": 20 }, - "width": 1175, - "height": 125, + "width": 1155, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -49,7 +49,7 @@ "type": "rectangle", "pos": { "x": 40, - "y": 70 + "y": 50 }, "width": 132, "height": 66, @@ -90,7 +90,7 @@ "type": "rectangle", "pos": { "x": 232, - "y": 70 + "y": 50 }, "width": 132, "height": 66, @@ -131,7 +131,7 @@ "type": "rectangle", "pos": { "x": 424, - "y": 70 + "y": 50 }, "width": 132, "height": 66, @@ -172,7 +172,7 @@ "type": "rectangle", "pos": { "x": 616, - "y": 70 + "y": 50 }, "width": 133, "height": 66, @@ -213,7 +213,7 @@ "type": "rectangle", "pos": { "x": 809, - "y": 70 + "y": 50 }, "width": 133, "height": 66, @@ -254,7 +254,7 @@ "type": "rectangle", "pos": { "x": 1002, - "y": 70 + "y": 50 }, "width": 133, "height": 66, @@ -294,11 +294,11 @@ "id": "osvc", "type": "rectangle", "pos": { - "x": 406, - "y": 328 + "x": 416, + "y": 307 }, - "width": 455, - "height": 125, + "width": 425, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -336,7 +336,7 @@ "type": "rectangle", "pos": { "x": 446, - "y": 357 + "y": 337 }, "width": 76, "height": 66, @@ -377,7 +377,7 @@ "type": "rectangle", "pos": { "x": 645, - "y": 357 + "y": 337 }, "width": 76, "height": 66, @@ -441,19 +441,19 @@ "route": [ { "x": 532.5, - "y": 166 + "y": 145.5 }, { "x": 532.5, - "y": 214.39999389648438 + "y": 210.3000030517578 }, { "x": 532.5, - "y": 246.89999389648438 + "y": 242.6999969482422 }, { "x": 532.5, - "y": 328.5 + "y": 307.5 } ], "isCurve": true, @@ -488,19 +488,19 @@ "route": [ { "x": 634.5, - "y": 166 + "y": 145.5 }, { "x": 634.5, - "y": 214.39999389648438 + "y": 210.3000030517578 }, { "x": 634.5, - "y": 238.6999969482422 + "y": 234.5 }, { "x": 634.5, - "y": 287.5 + "y": 266.5 } ], "isCurve": true, @@ -535,19 +535,19 @@ "route": [ { "x": 730.5, - "y": 166 + "y": 145.5 }, { "x": 730.5, - "y": 214.39999389648438 + "y": 210.3000030517578 }, { "x": 730.5, - "y": 246.89999389648438 + "y": 242.6999969482422 }, { "x": 730.5, - "y": 328.5 + "y": 307.5 } ], "isCurve": true, @@ -582,19 +582,19 @@ "route": [ { "x": 811.5, - "y": 166 + "y": 145.5 }, { "x": 811.5, - "y": 214.39999389648438 + "y": 210.3000030517578 }, { "x": 811.5, - "y": 246.89999389648438 + "y": 242.6999969482422 }, { "x": 811.5, - "y": 328.5 + "y": 307.5 } ], "isCurve": true, diff --git a/e2etests/testdata/regression/overlapping-edge-label/dagre/sketch.exp.svg b/e2etests/testdata/regression/overlapping-edge-label/dagre/sketch.exp.svg index 347ad8307..bf048e535 100644 --- a/e2etests/testdata/regression/overlapping-edge-label/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/overlapping-edge-label/dagre/sketch.exp.svg @@ -1,23 +1,23 @@ -Kubernetesopensvck8s-master1k8s-master2k8s-master3k8s-worker1k8s-worker2k8s-worker3VM1VM2 keycloakheptapodharborvault - - - - - - - - - - - - - - - + .d2-2526460272 .fill-N1{fill:#0A0F25;} + .d2-2526460272 .fill-N2{fill:#676C7E;} + .d2-2526460272 .fill-N3{fill:#9499AB;} + .d2-2526460272 .fill-N4{fill:#CFD2DD;} + .d2-2526460272 .fill-N5{fill:#DEE1EB;} + .d2-2526460272 .fill-N6{fill:#EEF1F8;} + .d2-2526460272 .fill-N7{fill:#FFFFFF;} + .d2-2526460272 .fill-B1{fill:#0D32B2;} + .d2-2526460272 .fill-B2{fill:#0D32B2;} + .d2-2526460272 .fill-B3{fill:#E3E9FD;} + .d2-2526460272 .fill-B4{fill:#E3E9FD;} + .d2-2526460272 .fill-B5{fill:#EDF0FD;} + .d2-2526460272 .fill-B6{fill:#F7F8FE;} + .d2-2526460272 .fill-AA2{fill:#4A6FF3;} + .d2-2526460272 .fill-AA4{fill:#EDF0FD;} + .d2-2526460272 .fill-AA5{fill:#F7F8FE;} + .d2-2526460272 .fill-AB4{fill:#EDF0FD;} + .d2-2526460272 .fill-AB5{fill:#F7F8FE;} + .d2-2526460272 .stroke-N1{stroke:#0A0F25;} + .d2-2526460272 .stroke-N2{stroke:#676C7E;} + .d2-2526460272 .stroke-N3{stroke:#9499AB;} + .d2-2526460272 .stroke-N4{stroke:#CFD2DD;} + .d2-2526460272 .stroke-N5{stroke:#DEE1EB;} + .d2-2526460272 .stroke-N6{stroke:#EEF1F8;} + .d2-2526460272 .stroke-N7{stroke:#FFFFFF;} + .d2-2526460272 .stroke-B1{stroke:#0D32B2;} + .d2-2526460272 .stroke-B2{stroke:#0D32B2;} + .d2-2526460272 .stroke-B3{stroke:#E3E9FD;} + .d2-2526460272 .stroke-B4{stroke:#E3E9FD;} + .d2-2526460272 .stroke-B5{stroke:#EDF0FD;} + .d2-2526460272 .stroke-B6{stroke:#F7F8FE;} + .d2-2526460272 .stroke-AA2{stroke:#4A6FF3;} + .d2-2526460272 .stroke-AA4{stroke:#EDF0FD;} + .d2-2526460272 .stroke-AA5{stroke:#F7F8FE;} + .d2-2526460272 .stroke-AB4{stroke:#EDF0FD;} + .d2-2526460272 .stroke-AB5{stroke:#F7F8FE;} + .d2-2526460272 .background-color-N1{background-color:#0A0F25;} + .d2-2526460272 .background-color-N2{background-color:#676C7E;} + .d2-2526460272 .background-color-N3{background-color:#9499AB;} + .d2-2526460272 .background-color-N4{background-color:#CFD2DD;} + .d2-2526460272 .background-color-N5{background-color:#DEE1EB;} + .d2-2526460272 .background-color-N6{background-color:#EEF1F8;} + .d2-2526460272 .background-color-N7{background-color:#FFFFFF;} + .d2-2526460272 .background-color-B1{background-color:#0D32B2;} + .d2-2526460272 .background-color-B2{background-color:#0D32B2;} + .d2-2526460272 .background-color-B3{background-color:#E3E9FD;} + .d2-2526460272 .background-color-B4{background-color:#E3E9FD;} + .d2-2526460272 .background-color-B5{background-color:#EDF0FD;} + .d2-2526460272 .background-color-B6{background-color:#F7F8FE;} + .d2-2526460272 .background-color-AA2{background-color:#4A6FF3;} + .d2-2526460272 .background-color-AA4{background-color:#EDF0FD;} + .d2-2526460272 .background-color-AA5{background-color:#F7F8FE;} + .d2-2526460272 .background-color-AB4{background-color:#EDF0FD;} + .d2-2526460272 .background-color-AB5{background-color:#F7F8FE;} + .d2-2526460272 .color-N1{color:#0A0F25;} + .d2-2526460272 .color-N2{color:#676C7E;} + .d2-2526460272 .color-N3{color:#9499AB;} + .d2-2526460272 .color-N4{color:#CFD2DD;} + .d2-2526460272 .color-N5{color:#DEE1EB;} + .d2-2526460272 .color-N6{color:#EEF1F8;} + .d2-2526460272 .color-N7{color:#FFFFFF;} + .d2-2526460272 .color-B1{color:#0D32B2;} + .d2-2526460272 .color-B2{color:#0D32B2;} + .d2-2526460272 .color-B3{color:#E3E9FD;} + .d2-2526460272 .color-B4{color:#E3E9FD;} + .d2-2526460272 .color-B5{color:#EDF0FD;} + .d2-2526460272 .color-B6{color:#F7F8FE;} + .d2-2526460272 .color-AA2{color:#4A6FF3;} + .d2-2526460272 .color-AA4{color:#EDF0FD;} + .d2-2526460272 .color-AA5{color:#F7F8FE;} + .d2-2526460272 .color-AB4{color:#EDF0FD;} + .d2-2526460272 .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}]]>Kubernetesopensvck8s-master1k8s-master2k8s-master3k8s-worker1k8s-worker2k8s-worker3VM1VM2 keycloakheptapodharborvault + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/regression/query_param_escape/dagre/board.exp.json b/e2etests/testdata/regression/query_param_escape/dagre/board.exp.json index b691f4363..56e80e247 100644 --- a/e2etests/testdata/regression/query_param_escape/dagre/board.exp.json +++ b/e2etests/testdata/regression/query_param_escape/dagre/board.exp.json @@ -11,7 +11,7 @@ "y": 0 }, "width": 156, - "height": 118, + "height": 92, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, diff --git a/e2etests/testdata/regression/query_param_escape/dagre/sketch.exp.svg b/e2etests/testdata/regression/query_param_escape/dagre/sketch.exp.svg index 5e0006e71..3902cd9b0 100644 --- a/e2etests/testdata/regression/query_param_escape/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/query_param_escape/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -my network - + .d2-2973538838 .fill-N1{fill:#0A0F25;} + .d2-2973538838 .fill-N2{fill:#676C7E;} + .d2-2973538838 .fill-N3{fill:#9499AB;} + .d2-2973538838 .fill-N4{fill:#CFD2DD;} + .d2-2973538838 .fill-N5{fill:#DEE1EB;} + .d2-2973538838 .fill-N6{fill:#EEF1F8;} + .d2-2973538838 .fill-N7{fill:#FFFFFF;} + .d2-2973538838 .fill-B1{fill:#0D32B2;} + .d2-2973538838 .fill-B2{fill:#0D32B2;} + .d2-2973538838 .fill-B3{fill:#E3E9FD;} + .d2-2973538838 .fill-B4{fill:#E3E9FD;} + .d2-2973538838 .fill-B5{fill:#EDF0FD;} + .d2-2973538838 .fill-B6{fill:#F7F8FE;} + .d2-2973538838 .fill-AA2{fill:#4A6FF3;} + .d2-2973538838 .fill-AA4{fill:#EDF0FD;} + .d2-2973538838 .fill-AA5{fill:#F7F8FE;} + .d2-2973538838 .fill-AB4{fill:#EDF0FD;} + .d2-2973538838 .fill-AB5{fill:#F7F8FE;} + .d2-2973538838 .stroke-N1{stroke:#0A0F25;} + .d2-2973538838 .stroke-N2{stroke:#676C7E;} + .d2-2973538838 .stroke-N3{stroke:#9499AB;} + .d2-2973538838 .stroke-N4{stroke:#CFD2DD;} + .d2-2973538838 .stroke-N5{stroke:#DEE1EB;} + .d2-2973538838 .stroke-N6{stroke:#EEF1F8;} + .d2-2973538838 .stroke-N7{stroke:#FFFFFF;} + .d2-2973538838 .stroke-B1{stroke:#0D32B2;} + .d2-2973538838 .stroke-B2{stroke:#0D32B2;} + .d2-2973538838 .stroke-B3{stroke:#E3E9FD;} + .d2-2973538838 .stroke-B4{stroke:#E3E9FD;} + .d2-2973538838 .stroke-B5{stroke:#EDF0FD;} + .d2-2973538838 .stroke-B6{stroke:#F7F8FE;} + .d2-2973538838 .stroke-AA2{stroke:#4A6FF3;} + .d2-2973538838 .stroke-AA4{stroke:#EDF0FD;} + .d2-2973538838 .stroke-AA5{stroke:#F7F8FE;} + .d2-2973538838 .stroke-AB4{stroke:#EDF0FD;} + .d2-2973538838 .stroke-AB5{stroke:#F7F8FE;} + .d2-2973538838 .background-color-N1{background-color:#0A0F25;} + .d2-2973538838 .background-color-N2{background-color:#676C7E;} + .d2-2973538838 .background-color-N3{background-color:#9499AB;} + .d2-2973538838 .background-color-N4{background-color:#CFD2DD;} + .d2-2973538838 .background-color-N5{background-color:#DEE1EB;} + .d2-2973538838 .background-color-N6{background-color:#EEF1F8;} + .d2-2973538838 .background-color-N7{background-color:#FFFFFF;} + .d2-2973538838 .background-color-B1{background-color:#0D32B2;} + .d2-2973538838 .background-color-B2{background-color:#0D32B2;} + .d2-2973538838 .background-color-B3{background-color:#E3E9FD;} + .d2-2973538838 .background-color-B4{background-color:#E3E9FD;} + .d2-2973538838 .background-color-B5{background-color:#EDF0FD;} + .d2-2973538838 .background-color-B6{background-color:#F7F8FE;} + .d2-2973538838 .background-color-AA2{background-color:#4A6FF3;} + .d2-2973538838 .background-color-AA4{background-color:#EDF0FD;} + .d2-2973538838 .background-color-AA5{background-color:#F7F8FE;} + .d2-2973538838 .background-color-AB4{background-color:#EDF0FD;} + .d2-2973538838 .background-color-AB5{background-color:#F7F8FE;} + .d2-2973538838 .color-N1{color:#0A0F25;} + .d2-2973538838 .color-N2{color:#676C7E;} + .d2-2973538838 .color-N3{color:#9499AB;} + .d2-2973538838 .color-N4{color:#CFD2DD;} + .d2-2973538838 .color-N5{color:#DEE1EB;} + .d2-2973538838 .color-N6{color:#EEF1F8;} + .d2-2973538838 .color-N7{color:#FFFFFF;} + .d2-2973538838 .color-B1{color:#0D32B2;} + .d2-2973538838 .color-B2{color:#0D32B2;} + .d2-2973538838 .color-B3{color:#E3E9FD;} + .d2-2973538838 .color-B4{color:#E3E9FD;} + .d2-2973538838 .color-B5{color:#EDF0FD;} + .d2-2973538838 .color-B6{color:#F7F8FE;} + .d2-2973538838 .color-AA2{color:#4A6FF3;} + .d2-2973538838 .color-AA4{color:#EDF0FD;} + .d2-2973538838 .color-AA5{color:#F7F8FE;} + .d2-2973538838 .color-AB4{color:#EDF0FD;} + .d2-2973538838 .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}]]>my network + \ No newline at end of file diff --git a/e2etests/testdata/regression/root-container/dagre/board.exp.json b/e2etests/testdata/regression/root-container/dagre/board.exp.json index 7a277be91..3110ea862 100644 --- a/e2etests/testdata/regression/root-container/dagre/board.exp.json +++ b/e2etests/testdata/regression/root-container/dagre/board.exp.json @@ -7,11 +7,11 @@ "id": "main", "type": "rectangle", "pos": { - "x": 0, - "y": 41 + "x": 10, + "y": 20 }, - "width": 246, - "height": 291, + "width": 225, + "height": 292, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -49,7 +49,7 @@ "type": "rectangle", "pos": { "x": 40, - "y": 70 + "y": 50 }, "width": 53, "height": 66, @@ -90,7 +90,7 @@ "type": "rectangle", "pos": { "x": 96, - "y": 236 + "y": 216 }, "width": 54, "height": 66, @@ -131,7 +131,7 @@ "type": "rectangle", "pos": { "x": 153, - "y": 70 + "y": 50 }, "width": 52, "height": 66, @@ -171,11 +171,11 @@ "id": "root", "type": "rectangle", "pos": { - "x": 266, - "y": 41 + "x": 276, + "y": 20 }, - "width": 246, - "height": 291, + "width": 225, + "height": 292, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -213,7 +213,7 @@ "type": "rectangle", "pos": { "x": 306, - "y": 70 + "y": 50 }, "width": 53, "height": 66, @@ -254,7 +254,7 @@ "type": "rectangle", "pos": { "x": 362, - "y": 236 + "y": 216 }, "width": 54, "height": 66, @@ -295,7 +295,7 @@ "type": "rectangle", "pos": { "x": 419, - "y": 70 + "y": 50 }, "width": 52, "height": 66, @@ -359,19 +359,19 @@ "route": [ { "x": 66.75, - "y": 136.5 + "y": 116 }, { "x": 66.75, - "y": 176.5 + "y": 156 }, { "x": 73.55000305175781, - "y": 196.5 + "y": 176 }, { "x": 100.75, - "y": 236.5 + "y": 216 } ], "isCurve": true, @@ -405,20 +405,20 @@ "labelPercentage": 0, "route": [ { - "x": 145.36399841308594, - "y": 236.5 + "x": 145.25, + "y": 216 }, { - "x": 172.4720001220703, - "y": 196.5 + "x": 172.4499969482422, + "y": 176 }, { "x": 179.25, - "y": 176.5 + "y": 156 }, { "x": 179.25, - "y": 136.5 + "y": 116 } ], "isCurve": true, @@ -453,19 +453,19 @@ "route": [ { "x": 332.5, - "y": 136.5 + "y": 116 }, { "x": 332.5, - "y": 176.5 + "y": 156 }, { "x": 339.29998779296875, - "y": 196.5 + "y": 176 }, { "x": 366.5, - "y": 236.5 + "y": 216 } ], "isCurve": true, @@ -499,20 +499,20 @@ "labelPercentage": 0, "route": [ { - "x": 411.114013671875, - "y": 236.5 + "x": 411, + "y": 216 }, { - "x": 438.22198486328125, - "y": 196.5 + "x": 438.20001220703125, + "y": 176 }, { "x": 445, - "y": 176.5 + "y": 156 }, { "x": 445, - "y": 136.5 + "y": 116 } ], "isCurve": true, diff --git a/e2etests/testdata/regression/root-container/dagre/sketch.exp.svg b/e2etests/testdata/regression/root-container/dagre/sketch.exp.svg index c7e01b108..917b69be3 100644 --- a/e2etests/testdata/regression/root-container/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/root-container/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -mainrootxyzxyz - - - - - - - - - + .d2-1590620810 .fill-N1{fill:#0A0F25;} + .d2-1590620810 .fill-N2{fill:#676C7E;} + .d2-1590620810 .fill-N3{fill:#9499AB;} + .d2-1590620810 .fill-N4{fill:#CFD2DD;} + .d2-1590620810 .fill-N5{fill:#DEE1EB;} + .d2-1590620810 .fill-N6{fill:#EEF1F8;} + .d2-1590620810 .fill-N7{fill:#FFFFFF;} + .d2-1590620810 .fill-B1{fill:#0D32B2;} + .d2-1590620810 .fill-B2{fill:#0D32B2;} + .d2-1590620810 .fill-B3{fill:#E3E9FD;} + .d2-1590620810 .fill-B4{fill:#E3E9FD;} + .d2-1590620810 .fill-B5{fill:#EDF0FD;} + .d2-1590620810 .fill-B6{fill:#F7F8FE;} + .d2-1590620810 .fill-AA2{fill:#4A6FF3;} + .d2-1590620810 .fill-AA4{fill:#EDF0FD;} + .d2-1590620810 .fill-AA5{fill:#F7F8FE;} + .d2-1590620810 .fill-AB4{fill:#EDF0FD;} + .d2-1590620810 .fill-AB5{fill:#F7F8FE;} + .d2-1590620810 .stroke-N1{stroke:#0A0F25;} + .d2-1590620810 .stroke-N2{stroke:#676C7E;} + .d2-1590620810 .stroke-N3{stroke:#9499AB;} + .d2-1590620810 .stroke-N4{stroke:#CFD2DD;} + .d2-1590620810 .stroke-N5{stroke:#DEE1EB;} + .d2-1590620810 .stroke-N6{stroke:#EEF1F8;} + .d2-1590620810 .stroke-N7{stroke:#FFFFFF;} + .d2-1590620810 .stroke-B1{stroke:#0D32B2;} + .d2-1590620810 .stroke-B2{stroke:#0D32B2;} + .d2-1590620810 .stroke-B3{stroke:#E3E9FD;} + .d2-1590620810 .stroke-B4{stroke:#E3E9FD;} + .d2-1590620810 .stroke-B5{stroke:#EDF0FD;} + .d2-1590620810 .stroke-B6{stroke:#F7F8FE;} + .d2-1590620810 .stroke-AA2{stroke:#4A6FF3;} + .d2-1590620810 .stroke-AA4{stroke:#EDF0FD;} + .d2-1590620810 .stroke-AA5{stroke:#F7F8FE;} + .d2-1590620810 .stroke-AB4{stroke:#EDF0FD;} + .d2-1590620810 .stroke-AB5{stroke:#F7F8FE;} + .d2-1590620810 .background-color-N1{background-color:#0A0F25;} + .d2-1590620810 .background-color-N2{background-color:#676C7E;} + .d2-1590620810 .background-color-N3{background-color:#9499AB;} + .d2-1590620810 .background-color-N4{background-color:#CFD2DD;} + .d2-1590620810 .background-color-N5{background-color:#DEE1EB;} + .d2-1590620810 .background-color-N6{background-color:#EEF1F8;} + .d2-1590620810 .background-color-N7{background-color:#FFFFFF;} + .d2-1590620810 .background-color-B1{background-color:#0D32B2;} + .d2-1590620810 .background-color-B2{background-color:#0D32B2;} + .d2-1590620810 .background-color-B3{background-color:#E3E9FD;} + .d2-1590620810 .background-color-B4{background-color:#E3E9FD;} + .d2-1590620810 .background-color-B5{background-color:#EDF0FD;} + .d2-1590620810 .background-color-B6{background-color:#F7F8FE;} + .d2-1590620810 .background-color-AA2{background-color:#4A6FF3;} + .d2-1590620810 .background-color-AA4{background-color:#EDF0FD;} + .d2-1590620810 .background-color-AA5{background-color:#F7F8FE;} + .d2-1590620810 .background-color-AB4{background-color:#EDF0FD;} + .d2-1590620810 .background-color-AB5{background-color:#F7F8FE;} + .d2-1590620810 .color-N1{color:#0A0F25;} + .d2-1590620810 .color-N2{color:#676C7E;} + .d2-1590620810 .color-N3{color:#9499AB;} + .d2-1590620810 .color-N4{color:#CFD2DD;} + .d2-1590620810 .color-N5{color:#DEE1EB;} + .d2-1590620810 .color-N6{color:#EEF1F8;} + .d2-1590620810 .color-N7{color:#FFFFFF;} + .d2-1590620810 .color-B1{color:#0D32B2;} + .d2-1590620810 .color-B2{color:#0D32B2;} + .d2-1590620810 .color-B3{color:#E3E9FD;} + .d2-1590620810 .color-B4{color:#E3E9FD;} + .d2-1590620810 .color-B5{color:#EDF0FD;} + .d2-1590620810 .color-B6{color:#F7F8FE;} + .d2-1590620810 .color-AA2{color:#4A6FF3;} + .d2-1590620810 .color-AA4{color:#EDF0FD;} + .d2-1590620810 .color-AA5{color:#F7F8FE;} + .d2-1590620810 .color-AB4{color:#EDF0FD;} + .d2-1590620810 .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}]]>mainrootxyzxyz + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/regression/straight_hierarchy_container_direction_right/dagre/board.exp.json b/e2etests/testdata/regression/straight_hierarchy_container_direction_right/dagre/board.exp.json index 3fff3261c..f59d42506 100644 --- a/e2etests/testdata/regression/straight_hierarchy_container_direction_right/dagre/board.exp.json +++ b/e2etests/testdata/regression/straight_hierarchy_container_direction_right/dagre/board.exp.json @@ -8,7 +8,7 @@ "type": "rectangle", "pos": { "x": 0, - "y": 87 + "y": 147 }, "width": 53, "height": 66, @@ -49,7 +49,7 @@ "type": "rectangle", "pos": { "x": 0, - "y": 453 + "y": 653 }, "width": 53, "height": 66, @@ -90,7 +90,7 @@ "type": "rectangle", "pos": { "x": 0, - "y": 270 + "y": 400 }, "width": 53, "height": 66, @@ -130,11 +130,11 @@ "id": "l1", "type": "rectangle", "pos": { - "x": 153, - "y": 81 + "x": 173, + "y": 117 }, - "width": 153, - "height": 468, + "width": 113, + "height": 632, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -172,7 +172,7 @@ "type": "rectangle", "pos": { "x": 203, - "y": 290 + "y": 400 }, "width": 53, "height": 66, @@ -213,7 +213,7 @@ "type": "rectangle", "pos": { "x": 203, - "y": 107 + "y": 147 }, "width": 53, "height": 66, @@ -254,7 +254,7 @@ "type": "rectangle", "pos": { "x": 203, - "y": 473 + "y": 653 }, "width": 53, "height": 66, @@ -294,11 +294,11 @@ "id": "l2c1", "type": "rectangle", "pos": { - "x": 406, - "y": 81 + "x": 426, + "y": 117 }, - "width": 153, - "height": 102, + "width": 113, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -336,7 +336,7 @@ "type": "rectangle", "pos": { "x": 456, - "y": 107 + "y": 147 }, "width": 53, "height": 66, @@ -376,11 +376,11 @@ "id": "l2c3", "type": "rectangle", "pos": { - "x": 406, - "y": 447 + "x": 426, + "y": 623 }, - "width": 153, - "height": 102, + "width": 113, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -418,7 +418,7 @@ "type": "rectangle", "pos": { "x": 456, - "y": 473 + "y": 653 }, "width": 53, "height": 66, @@ -458,11 +458,11 @@ "id": "l2c2", "type": "rectangle", "pos": { - "x": 406, - "y": 264 + "x": 426, + "y": 370 }, - "width": 153, - "height": 102, + "width": 113, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -500,7 +500,7 @@ "type": "rectangle", "pos": { "x": 456, - "y": 290 + "y": 400 }, "width": 53, "height": 66, @@ -540,11 +540,11 @@ "id": "l3c1", "type": "rectangle", "pos": { - "x": 659, - "y": 81 + "x": 679, + "y": 117 }, - "width": 153, - "height": 285, + "width": 113, + "height": 379, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -582,7 +582,7 @@ "type": "rectangle", "pos": { "x": 709, - "y": 107 + "y": 147 }, "width": 53, "height": 66, @@ -623,7 +623,7 @@ "type": "rectangle", "pos": { "x": 709, - "y": 290 + "y": 400 }, "width": 53, "height": 66, @@ -663,11 +663,11 @@ "id": "l3c2", "type": "rectangle", "pos": { - "x": 659, - "y": 447 + "x": 679, + "y": 623 }, - "width": 153, - "height": 102, + "width": 113, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -705,7 +705,7 @@ "type": "rectangle", "pos": { "x": 709, - "y": 473 + "y": 653 }, "width": 53, "height": 66, @@ -745,11 +745,11 @@ "id": "l4", "type": "rectangle", "pos": { - "x": 912, - "y": 41 + "x": 952, + "y": 76 }, - "width": 253, - "height": 548, + "width": 173, + "height": 703, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -786,11 +786,11 @@ "id": "l4.c1", "type": "rectangle", "pos": { - "x": 962, - "y": 96 + "x": 982, + "y": 117 }, - "width": 153, - "height": 107, + "width": 113, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -828,7 +828,7 @@ "type": "rectangle", "pos": { "x": 1012, - "y": 125 + "y": 147 }, "width": 53, "height": 66, @@ -868,11 +868,11 @@ "id": "l4.c2", "type": "rectangle", "pos": { - "x": 962, - "y": 279 + "x": 982, + "y": 370 }, - "width": 153, - "height": 107, + "width": 113, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -910,7 +910,7 @@ "type": "rectangle", "pos": { "x": 1012, - "y": 308 + "y": 400 }, "width": 53, "height": 66, @@ -950,11 +950,11 @@ "id": "l4.c3", "type": "rectangle", "pos": { - "x": 962, - "y": 462 + "x": 982, + "y": 623 }, - "width": 153, - "height": 107, + "width": 113, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -992,7 +992,7 @@ "type": "rectangle", "pos": { "x": 1012, - "y": 491 + "y": 653 }, "width": 53, "height": 66, @@ -1056,19 +1056,19 @@ "route": [ { "x": 53, - "y": 303 + "y": 433 }, { "x": 93, - "y": 303 + "y": 433 }, { "x": 163, - "y": 307.1000061035156 + "y": 433 }, { "x": 203, - "y": 323.5 + "y": 433 } ], "isCurve": true, @@ -1103,19 +1103,19 @@ "route": [ { "x": 53, - "y": 120 + "y": 180 }, { "x": 93, - "y": 120 + "y": 180 }, { "x": 163, - "y": 124.0999984741211 + "y": 180 }, { "x": 203, - "y": 140.5 + "y": 180 } ], "isCurve": true, @@ -1150,19 +1150,19 @@ "route": [ { "x": 53, - "y": 486 + "y": 686 }, { "x": 93, - "y": 486 + "y": 686 }, { "x": 163, - "y": 490.1000061035156 + "y": 686 }, { "x": 203, - "y": 506.5 + "y": 686 } ], "isCurve": true, @@ -1197,31 +1197,31 @@ "route": [ { "x": 256, - "y": 140.5 + "y": 180 }, { "x": 296, - "y": 140.5 + "y": 180 }, { "x": 316, - "y": 140.5 + "y": 180 }, { "x": 331, - "y": 140.5 + "y": 180 }, { "x": 346, - "y": 140.5 + "y": 180 }, { "x": 416, - "y": 140.5 + "y": 180 }, { "x": 456, - "y": 140.5 + "y": 180 } ], "isCurve": true, @@ -1256,31 +1256,31 @@ "route": [ { "x": 256, - "y": 506.5 + "y": 686 }, { "x": 296, - "y": 506.5 + "y": 686 }, { "x": 316, - "y": 506.5 + "y": 686 }, { "x": 331, - "y": 506.5 + "y": 686 }, { "x": 346, - "y": 506.5 + "y": 686 }, { "x": 416, - "y": 506.5 + "y": 686 }, { "x": 456, - "y": 506.5 + "y": 686 } ], "isCurve": true, @@ -1315,31 +1315,31 @@ "route": [ { "x": 256, - "y": 323.5 + "y": 433 }, { "x": 296, - "y": 323.5 + "y": 433 }, { "x": 316, - "y": 323.5 + "y": 433 }, { "x": 331, - "y": 323.5 + "y": 433 }, { "x": 346, - "y": 323.5 + "y": 433 }, { "x": 416, - "y": 323.5 + "y": 433 }, { "x": 456, - "y": 323.5 + "y": 433 } ], "isCurve": true, @@ -1374,31 +1374,31 @@ "route": [ { "x": 509, - "y": 140.5 + "y": 180 }, { "x": 549, - "y": 140.5 + "y": 180 }, { "x": 569, - "y": 140.5 + "y": 180 }, { "x": 584, - "y": 140.5 + "y": 180 }, { "x": 599, - "y": 140.5 + "y": 180 }, { "x": 669, - "y": 140.5 + "y": 180 }, { "x": 709, - "y": 140.5 + "y": 180 } ], "isCurve": true, @@ -1433,31 +1433,31 @@ "route": [ { "x": 509, - "y": 323.5 + "y": 433 }, { "x": 549, - "y": 323.5 + "y": 433 }, { "x": 569, - "y": 323.5 + "y": 433 }, { "x": 584, - "y": 323.5 + "y": 433 }, { "x": 599, - "y": 323.5 + "y": 433 }, { "x": 669, - "y": 323.5 + "y": 433 }, { "x": 709, - "y": 323.5 + "y": 433 } ], "isCurve": true, @@ -1492,31 +1492,31 @@ "route": [ { "x": 509, - "y": 506.5 + "y": 686 }, { "x": 549, - "y": 506.5 + "y": 686 }, { "x": 569, - "y": 506.5 + "y": 686 }, { "x": 584, - "y": 506.5 + "y": 686 }, { "x": 599, - "y": 506.5 + "y": 686 }, { "x": 669, - "y": 506.5 + "y": 686 }, { "x": 709, - "y": 506.5 + "y": 686 } ], "isCurve": true, @@ -1551,43 +1551,43 @@ "route": [ { "x": 762, - "y": 149.5 + "y": 180 }, { "x": 802, - "y": 149.5 + "y": 180 }, { "x": 822, - "y": 149.5 + "y": 180 }, { "x": 837, - "y": 149.5 + "y": 180 }, { "x": 852, - "y": 149.5 + "y": 180 }, { "x": 872, - "y": 149.5 + "y": 180 }, { "x": 887, - "y": 149.5 + "y": 180 }, { "x": 902, - "y": 149.5 + "y": 180 }, { "x": 972, - "y": 149.5 + "y": 180 }, { "x": 1012, - "y": 149.5 + "y": 180 } ], "isCurve": true, @@ -1622,43 +1622,43 @@ "route": [ { "x": 762, - "y": 332.5 + "y": 433 }, { "x": 802, - "y": 332.5 + "y": 433 }, { "x": 822, - "y": 332.5 + "y": 433 }, { "x": 837, - "y": 332.5 + "y": 433 }, { "x": 852, - "y": 332.5 + "y": 433 }, { "x": 872, - "y": 332.5 + "y": 433 }, { "x": 887, - "y": 332.5 + "y": 433 }, { "x": 902, - "y": 332.5 + "y": 433 }, { "x": 972, - "y": 332.5 + "y": 433 }, { "x": 1012, - "y": 332.5 + "y": 433 } ], "isCurve": true, @@ -1693,43 +1693,43 @@ "route": [ { "x": 762, - "y": 515.5 + "y": 686 }, { "x": 802, - "y": 515.5 + "y": 686 }, { "x": 822, - "y": 515.5 + "y": 686 }, { "x": 837, - "y": 515.5 + "y": 686 }, { "x": 852, - "y": 515.5 + "y": 686 }, { "x": 872, - "y": 515.5 + "y": 686 }, { "x": 887, - "y": 515.5 + "y": 686 }, { "x": 902, - "y": 515.5 + "y": 686 }, { "x": 972, - "y": 515.5 + "y": 686 }, { "x": 1012, - "y": 515.5 + "y": 686 } ], "isCurve": true, diff --git a/e2etests/testdata/regression/straight_hierarchy_container_direction_right/dagre/sketch.exp.svg b/e2etests/testdata/regression/straight_hierarchy_container_direction_right/dagre/sketch.exp.svg index 44d3daa25..3bff1b1e8 100644 --- a/e2etests/testdata/regression/straight_hierarchy_container_direction_right/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/straight_hierarchy_container_direction_right/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -acbl1l2c1l2c3l2c2l3c1l3c2l4bacacbabcc1c2c3abc - - - - - - - - - - - - - - - - - - - - - - - - - - + .d2-283775832 .fill-N1{fill:#0A0F25;} + .d2-283775832 .fill-N2{fill:#676C7E;} + .d2-283775832 .fill-N3{fill:#9499AB;} + .d2-283775832 .fill-N4{fill:#CFD2DD;} + .d2-283775832 .fill-N5{fill:#DEE1EB;} + .d2-283775832 .fill-N6{fill:#EEF1F8;} + .d2-283775832 .fill-N7{fill:#FFFFFF;} + .d2-283775832 .fill-B1{fill:#0D32B2;} + .d2-283775832 .fill-B2{fill:#0D32B2;} + .d2-283775832 .fill-B3{fill:#E3E9FD;} + .d2-283775832 .fill-B4{fill:#E3E9FD;} + .d2-283775832 .fill-B5{fill:#EDF0FD;} + .d2-283775832 .fill-B6{fill:#F7F8FE;} + .d2-283775832 .fill-AA2{fill:#4A6FF3;} + .d2-283775832 .fill-AA4{fill:#EDF0FD;} + .d2-283775832 .fill-AA5{fill:#F7F8FE;} + .d2-283775832 .fill-AB4{fill:#EDF0FD;} + .d2-283775832 .fill-AB5{fill:#F7F8FE;} + .d2-283775832 .stroke-N1{stroke:#0A0F25;} + .d2-283775832 .stroke-N2{stroke:#676C7E;} + .d2-283775832 .stroke-N3{stroke:#9499AB;} + .d2-283775832 .stroke-N4{stroke:#CFD2DD;} + .d2-283775832 .stroke-N5{stroke:#DEE1EB;} + .d2-283775832 .stroke-N6{stroke:#EEF1F8;} + .d2-283775832 .stroke-N7{stroke:#FFFFFF;} + .d2-283775832 .stroke-B1{stroke:#0D32B2;} + .d2-283775832 .stroke-B2{stroke:#0D32B2;} + .d2-283775832 .stroke-B3{stroke:#E3E9FD;} + .d2-283775832 .stroke-B4{stroke:#E3E9FD;} + .d2-283775832 .stroke-B5{stroke:#EDF0FD;} + .d2-283775832 .stroke-B6{stroke:#F7F8FE;} + .d2-283775832 .stroke-AA2{stroke:#4A6FF3;} + .d2-283775832 .stroke-AA4{stroke:#EDF0FD;} + .d2-283775832 .stroke-AA5{stroke:#F7F8FE;} + .d2-283775832 .stroke-AB4{stroke:#EDF0FD;} + .d2-283775832 .stroke-AB5{stroke:#F7F8FE;} + .d2-283775832 .background-color-N1{background-color:#0A0F25;} + .d2-283775832 .background-color-N2{background-color:#676C7E;} + .d2-283775832 .background-color-N3{background-color:#9499AB;} + .d2-283775832 .background-color-N4{background-color:#CFD2DD;} + .d2-283775832 .background-color-N5{background-color:#DEE1EB;} + .d2-283775832 .background-color-N6{background-color:#EEF1F8;} + .d2-283775832 .background-color-N7{background-color:#FFFFFF;} + .d2-283775832 .background-color-B1{background-color:#0D32B2;} + .d2-283775832 .background-color-B2{background-color:#0D32B2;} + .d2-283775832 .background-color-B3{background-color:#E3E9FD;} + .d2-283775832 .background-color-B4{background-color:#E3E9FD;} + .d2-283775832 .background-color-B5{background-color:#EDF0FD;} + .d2-283775832 .background-color-B6{background-color:#F7F8FE;} + .d2-283775832 .background-color-AA2{background-color:#4A6FF3;} + .d2-283775832 .background-color-AA4{background-color:#EDF0FD;} + .d2-283775832 .background-color-AA5{background-color:#F7F8FE;} + .d2-283775832 .background-color-AB4{background-color:#EDF0FD;} + .d2-283775832 .background-color-AB5{background-color:#F7F8FE;} + .d2-283775832 .color-N1{color:#0A0F25;} + .d2-283775832 .color-N2{color:#676C7E;} + .d2-283775832 .color-N3{color:#9499AB;} + .d2-283775832 .color-N4{color:#CFD2DD;} + .d2-283775832 .color-N5{color:#DEE1EB;} + .d2-283775832 .color-N6{color:#EEF1F8;} + .d2-283775832 .color-N7{color:#FFFFFF;} + .d2-283775832 .color-B1{color:#0D32B2;} + .d2-283775832 .color-B2{color:#0D32B2;} + .d2-283775832 .color-B3{color:#E3E9FD;} + .d2-283775832 .color-B4{color:#E3E9FD;} + .d2-283775832 .color-B5{color:#EDF0FD;} + .d2-283775832 .color-B6{color:#F7F8FE;} + .d2-283775832 .color-AA2{color:#4A6FF3;} + .d2-283775832 .color-AA4{color:#EDF0FD;} + .d2-283775832 .color-AA5{color:#F7F8FE;} + .d2-283775832 .color-AB4{color:#EDF0FD;} + .d2-283775832 .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}]]>acbl1l2c1l2c3l2c2l3c1l3c2l4bacacbabcc1c2c3abc + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/regression/unconnected/dagre/board.exp.json b/e2etests/testdata/regression/unconnected/dagre/board.exp.json index a96c9cff3..eef3f08fe 100644 --- a/e2etests/testdata/regression/unconnected/dagre/board.exp.json +++ b/e2etests/testdata/regression/unconnected/dagre/board.exp.json @@ -8,7 +8,7 @@ "type": "rectangle", "pos": { "x": 50, - "y": 262 + "y": 414 }, "width": 135, "height": 66, @@ -49,7 +49,7 @@ "type": "rectangle", "pos": { "x": 358, - "y": 282 + "y": 424 }, "width": 159, "height": 66, @@ -90,7 +90,7 @@ "type": "rectangle", "pos": { "x": 335, - "y": 368 + "y": 550 }, "width": 204, "height": 66, @@ -130,11 +130,11 @@ "id": "Gos Warehouse", "type": "rectangle", "pos": { - "x": 639, - "y": 169 + "x": 659, + "y": 299 }, - "width": 872, - "height": 272, + "width": 832, + "height": 294, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -172,7 +172,7 @@ "type": "rectangle", "pos": { "x": 689, - "y": 271 + "y": 388 }, "width": 94, "height": 66, @@ -213,7 +213,7 @@ "type": "rectangle", "pos": { "x": 883, - "y": 325 + "y": 461 }, "width": 120, "height": 66, @@ -254,7 +254,7 @@ "type": "rectangle", "pos": { "x": 1103, - "y": 238 + "y": 340 }, "width": 120, "height": 66, @@ -295,7 +295,7 @@ "type": "rectangle", "pos": { "x": 1331, - "y": 237 + "y": 329 }, "width": 122, "height": 66, @@ -336,7 +336,7 @@ "type": "text", "pos": { "x": 1323, - "y": 323 + "y": 455 }, "width": 138, "height": 108, @@ -375,11 +375,11 @@ "id": "Customer Site", "type": "rectangle", "pos": { - "x": 0, - "y": 41 + "x": 25, + "y": 56 }, - "width": 235, - "height": 171, + "width": 186, + "height": 252, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -417,7 +417,7 @@ "type": "rectangle", "pos": { "x": 55, - "y": 50 + "y": 86 }, "width": 126, "height": 66, @@ -458,7 +458,7 @@ "type": "rectangle", "pos": { "x": 66, - "y": 136 + "y": 212 }, "width": 103, "height": 66, @@ -498,8 +498,8 @@ "id": "title", "type": "text", "pos": { - "x": 436, - "y": -71 + "x": 438, + "y": -56 }, "width": 639, "height": 51, @@ -562,19 +562,19 @@ "route": [ { "x": 185, - "y": 306.489013671875 + "y": 453 }, { "x": 225, - "y": 313.2969970703125 + "y": 456.20001220703125 }, { "x": 299.5, - "y": 315 + "y": 457 }, { "x": 357.5, - "y": 315 + "y": 457 } ], "isCurve": true, @@ -608,20 +608,20 @@ "labelPercentage": 0, "route": [ { - "x": 154.0800018310547, - "y": 328 + "x": 146, + "y": 480 }, { - "x": 218.8159942626953, - "y": 386.3999938964844 + "x": 217.1999969482422, + "y": 562.4000244140625 }, { "x": 295, - "y": 401 + "y": 583 }, { "x": 335, - "y": 401 + "y": 583 } ], "isCurve": true, @@ -655,44 +655,44 @@ "labelPercentage": 0, "route": [ { - "x": 185, - "y": 270.2969970703125 + "x": 179, + "y": 414 }, { - "x": 225, - "y": 255.65899658203125 + "x": 223.8000030517578, + "y": 390 }, { "x": 245, - "y": 252 + "y": 384 }, { "x": 260, - "y": 252 + "y": 384 }, { "x": 275, - "y": 252 + "y": 384 }, { "x": 315.3999938964844, - "y": 252 + "y": 384 }, { "x": 361, - "y": 252 + "y": 384 }, { "x": 406.6000061035156, - "y": 252 + "y": 384 }, { - "x": 599, - "y": 252 + "x": 603, + "y": 384 }, { - "x": 639, - "y": 252 + "x": 659, + "y": 384 } ], "isCurve": true, @@ -726,20 +726,20 @@ "labelPercentage": 0, "route": [ { - "x": 783, - "y": 330.4070129394531 + "x": 780.8489990234375, + "y": 454.5 }, { - "x": 823, - "y": 352.8810119628906 + "x": 822.5689697265625, + "y": 485.70001220703125 }, { "x": 843, - "y": 358.5 + "y": 493.5 }, { "x": 883, - "y": 358.5 + "y": 493.5 } ], "isCurve": true, @@ -773,32 +773,32 @@ "labelPercentage": 0, "route": [ { - "x": 783, - "y": 278.5610046386719 + "x": 779.2559814453125, + "y": 387.5 }, { - "x": 823, - "y": 256.9119873046875 + "x": 822.2509765625, + "y": 354.70001220703125 }, { "x": 855, - "y": 251.5 + "y": 346.5 }, { "x": 888, - "y": 251.5 + "y": 346.5 }, { "x": 921, - "y": 251.5 + "y": 346.5 }, { "x": 1063, - "y": 253.3000030517578 + "y": 348.8999938964844 }, { "x": 1103, - "y": 260.5 + "y": 358.5 } ], "isCurve": true, @@ -832,56 +832,56 @@ "labelPercentage": 0, "route": [ { - "x": 766.7780151367188, - "y": 271 + "x": 762.5640258789062, + "y": 387.5 }, { - "x": 819.7550048828125, - "y": 214.1999969482422 + "x": 818.9119873046875, + "y": 317.5 }, { "x": 855, - "y": 200 + "y": 300 }, { "x": 888, - "y": 200 + "y": 300 }, { "x": 921, - "y": 200 + "y": 300 }, { "x": 965, - "y": 200 + "y": 300 }, { "x": 998, - "y": 200 + "y": 300 }, { "x": 1031, - "y": 200 + "y": 300 }, { "x": 1075, - "y": 200 + "y": 300 }, { "x": 1108, - "y": 200 + "y": 300 }, { "x": 1141, - "y": 200 + "y": 300 }, { - "x": 1285.5999755859375, - "y": 207.60000610351562 + "x": 1284.5999755859375, + "y": 306 }, { - "x": 1336, - "y": 238 + "x": 1331, + "y": 330 } ], "isCurve": true, @@ -916,19 +916,19 @@ "route": [ { "x": 1003, - "y": 340.7720031738281 + "y": 468 }, { "x": 1043, - "y": 328.9540100097656 + "y": 450.3999938964844 }, { - "x": 1063, - "y": 321 + "x": 1065, + "y": 438 }, { - "x": 1103, - "y": 301 + "x": 1113, + "y": 406 } ], "isCurve": true, @@ -963,19 +963,19 @@ "route": [ { "x": 1223, - "y": 271.5 + "y": 373 }, { "x": 1263, - "y": 271.5 + "y": 373 }, { "x": 1284.5999755859375, - "y": 271.5 + "y": 372 }, { "x": 1331, - "y": 271.5 + "y": 368 } ], "isCurve": true, @@ -1009,32 +1009,32 @@ "labelPercentage": 0, "route": [ { - "x": 1355.637939453125, - "y": 303.5 + "x": 1367, + "y": 395 }, { - "x": 1289.5269775390625, - "y": 363.5 + "x": 1291.800048828125, + "y": 495 }, { "x": 1251, - "y": 378.5 + "y": 520 }, { "x": 1218, - "y": 378.5 + "y": 520 }, { "x": 1185, - "y": 378.5 + "y": 520 }, { "x": 1043, - "y": 376.70001220703125 + "y": 517.5999755859375 }, { "x": 1003, - "y": 369.5 + "y": 508 } ], "isCurve": true, @@ -1069,19 +1069,19 @@ "route": [ { "x": 517.5, - "y": 315 + "y": 457 }, { "x": 574.7000122070312, - "y": 315 + "y": 457 }, { - "x": 599, - "y": 315 + "x": 603, + "y": 457 }, { - "x": 639, - "y": 315 + "x": 659, + "y": 457 } ], "isCurve": true, @@ -1116,19 +1116,19 @@ "route": [ { "x": 539, - "y": 401 + "y": 583 }, { "x": 579, - "y": 401 + "y": 583 }, { - "x": 599, - "y": 401 + "x": 603, + "y": 583 }, { - "x": 639, - "y": 401 + "x": 659, + "y": 583 } ], "isCurve": true, diff --git a/e2etests/testdata/regression/unconnected/dagre/sketch.exp.svg b/e2etests/testdata/regression/unconnected/dagre/sketch.exp.svg index 7d9070e88..a27d41448 100644 --- a/e2etests/testdata/regression/unconnected/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/unconnected/dagre/sketch.exp.svg @@ -1,20 +1,20 @@ -OEM FactoryOEM WarehouseDistributor WarehouseGos WarehouseCustomer SiteWorkflow-I (Warehousing, Installation)MasterRegional-1Regional-2Regional-N
    +OEM FactoryOEM WarehouseDistributor WarehouseGos WarehouseCustomer SiteWorkflow-I (Warehousing, Installation)MasterRegional-1Regional-2Regional-N
    • Asset Tagging
    • Inventory
    • Staging
    • Dispatch to Site
    -
    InstallationSupport - - - - - - - - - - - - - - +
InstallationSupport + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/regression/unconnected/elk/board.exp.json b/e2etests/testdata/regression/unconnected/elk/board.exp.json index be39c6d92..a30837f37 100644 --- a/e2etests/testdata/regression/unconnected/elk/board.exp.json +++ b/e2etests/testdata/regression/unconnected/elk/board.exp.json @@ -573,7 +573,7 @@ "y": 107.875 }, { - "x": 390.5, + "x": 391, "y": 107.875 } ], @@ -967,7 +967,7 @@ "labelPercentage": 0, "route": [ { - "x": 549.5, + "x": 549, "y": 107.875 }, { diff --git a/e2etests/testdata/regression/unconnected/elk/sketch.exp.svg b/e2etests/testdata/regression/unconnected/elk/sketch.exp.svg index 815d5aae1..9573b4f80 100644 --- a/e2etests/testdata/regression/unconnected/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/unconnected/elk/sketch.exp.svg @@ -1,20 +1,20 @@ -OEM FactoryOEM WarehouseDistributor WarehouseGos WarehouseCustomer SiteWorkflow-I (Warehousing, Installation)MasterRegional-1Regional-2Regional-N
    @@ -842,7 +842,7 @@
  • Staging
  • Dispatch to Site
-
InstallationSupport +InstallationSupport diff --git a/e2etests/testdata/sanity/1_to_2/dagre/board.exp.json b/e2etests/testdata/sanity/1_to_2/dagre/board.exp.json index b822752f8..ea5199e2c 100644 --- a/e2etests/testdata/sanity/1_to_2/dagre/board.exp.json +++ b/e2etests/testdata/sanity/1_to_2/dagre/board.exp.json @@ -153,11 +153,11 @@ "labelPercentage": 0, "route": [ { - "x": 60.5359992980957, + "x": 60.5, "y": 66 }, { - "x": 33.30699920654297, + "x": 33.29999923706055, "y": 106 }, { @@ -200,11 +200,11 @@ "labelPercentage": 0, "route": [ { - "x": 105.46299743652344, + "x": 105.5, "y": 66 }, { - "x": 132.69200134277344, + "x": 132.6999969482422, "y": 106 }, { diff --git a/e2etests/testdata/sanity/1_to_2/dagre/sketch.exp.svg b/e2etests/testdata/sanity/1_to_2/dagre/sketch.exp.svg index e7171621a..b87a2f699 100644 --- a/e2etests/testdata/sanity/1_to_2/dagre/sketch.exp.svg +++ b/e2etests/testdata/sanity/1_to_2/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -abc + .d2-4184818569 .fill-N1{fill:#0A0F25;} + .d2-4184818569 .fill-N2{fill:#676C7E;} + .d2-4184818569 .fill-N3{fill:#9499AB;} + .d2-4184818569 .fill-N4{fill:#CFD2DD;} + .d2-4184818569 .fill-N5{fill:#DEE1EB;} + .d2-4184818569 .fill-N6{fill:#EEF1F8;} + .d2-4184818569 .fill-N7{fill:#FFFFFF;} + .d2-4184818569 .fill-B1{fill:#0D32B2;} + .d2-4184818569 .fill-B2{fill:#0D32B2;} + .d2-4184818569 .fill-B3{fill:#E3E9FD;} + .d2-4184818569 .fill-B4{fill:#E3E9FD;} + .d2-4184818569 .fill-B5{fill:#EDF0FD;} + .d2-4184818569 .fill-B6{fill:#F7F8FE;} + .d2-4184818569 .fill-AA2{fill:#4A6FF3;} + .d2-4184818569 .fill-AA4{fill:#EDF0FD;} + .d2-4184818569 .fill-AA5{fill:#F7F8FE;} + .d2-4184818569 .fill-AB4{fill:#EDF0FD;} + .d2-4184818569 .fill-AB5{fill:#F7F8FE;} + .d2-4184818569 .stroke-N1{stroke:#0A0F25;} + .d2-4184818569 .stroke-N2{stroke:#676C7E;} + .d2-4184818569 .stroke-N3{stroke:#9499AB;} + .d2-4184818569 .stroke-N4{stroke:#CFD2DD;} + .d2-4184818569 .stroke-N5{stroke:#DEE1EB;} + .d2-4184818569 .stroke-N6{stroke:#EEF1F8;} + .d2-4184818569 .stroke-N7{stroke:#FFFFFF;} + .d2-4184818569 .stroke-B1{stroke:#0D32B2;} + .d2-4184818569 .stroke-B2{stroke:#0D32B2;} + .d2-4184818569 .stroke-B3{stroke:#E3E9FD;} + .d2-4184818569 .stroke-B4{stroke:#E3E9FD;} + .d2-4184818569 .stroke-B5{stroke:#EDF0FD;} + .d2-4184818569 .stroke-B6{stroke:#F7F8FE;} + .d2-4184818569 .stroke-AA2{stroke:#4A6FF3;} + .d2-4184818569 .stroke-AA4{stroke:#EDF0FD;} + .d2-4184818569 .stroke-AA5{stroke:#F7F8FE;} + .d2-4184818569 .stroke-AB4{stroke:#EDF0FD;} + .d2-4184818569 .stroke-AB5{stroke:#F7F8FE;} + .d2-4184818569 .background-color-N1{background-color:#0A0F25;} + .d2-4184818569 .background-color-N2{background-color:#676C7E;} + .d2-4184818569 .background-color-N3{background-color:#9499AB;} + .d2-4184818569 .background-color-N4{background-color:#CFD2DD;} + .d2-4184818569 .background-color-N5{background-color:#DEE1EB;} + .d2-4184818569 .background-color-N6{background-color:#EEF1F8;} + .d2-4184818569 .background-color-N7{background-color:#FFFFFF;} + .d2-4184818569 .background-color-B1{background-color:#0D32B2;} + .d2-4184818569 .background-color-B2{background-color:#0D32B2;} + .d2-4184818569 .background-color-B3{background-color:#E3E9FD;} + .d2-4184818569 .background-color-B4{background-color:#E3E9FD;} + .d2-4184818569 .background-color-B5{background-color:#EDF0FD;} + .d2-4184818569 .background-color-B6{background-color:#F7F8FE;} + .d2-4184818569 .background-color-AA2{background-color:#4A6FF3;} + .d2-4184818569 .background-color-AA4{background-color:#EDF0FD;} + .d2-4184818569 .background-color-AA5{background-color:#F7F8FE;} + .d2-4184818569 .background-color-AB4{background-color:#EDF0FD;} + .d2-4184818569 .background-color-AB5{background-color:#F7F8FE;} + .d2-4184818569 .color-N1{color:#0A0F25;} + .d2-4184818569 .color-N2{color:#676C7E;} + .d2-4184818569 .color-N3{color:#9499AB;} + .d2-4184818569 .color-N4{color:#CFD2DD;} + .d2-4184818569 .color-N5{color:#DEE1EB;} + .d2-4184818569 .color-N6{color:#EEF1F8;} + .d2-4184818569 .color-N7{color:#FFFFFF;} + .d2-4184818569 .color-B1{color:#0D32B2;} + .d2-4184818569 .color-B2{color:#0D32B2;} + .d2-4184818569 .color-B3{color:#E3E9FD;} + .d2-4184818569 .color-B4{color:#E3E9FD;} + .d2-4184818569 .color-B5{color:#EDF0FD;} + .d2-4184818569 .color-B6{color:#F7F8FE;} + .d2-4184818569 .color-AA2{color:#4A6FF3;} + .d2-4184818569 .color-AA4{color:#EDF0FD;} + .d2-4184818569 .color-AA5{color:#F7F8FE;} + .d2-4184818569 .color-AB4{color:#EDF0FD;} + .d2-4184818569 .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}]]>abc diff --git a/e2etests/testdata/sanity/child_to_child/dagre/board.exp.json b/e2etests/testdata/sanity/child_to_child/dagre/board.exp.json index 34276371b..bbc33c06d 100644 --- a/e2etests/testdata/sanity/child_to_child/dagre/board.exp.json +++ b/e2etests/testdata/sanity/child_to_child/dagre/board.exp.json @@ -7,11 +7,11 @@ "id": "a", "type": "rectangle", "pos": { - "x": 1, - "y": 41 + "x": 11, + "y": 20 }, - "width": 133, - "height": 125, + "width": 113, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -49,7 +49,7 @@ "type": "rectangle", "pos": { "x": 41, - "y": 70 + "y": 50 }, "width": 53, "height": 66, @@ -89,11 +89,11 @@ "id": "c", "type": "rectangle", "pos": { - "x": 0, - "y": 307 + "x": 10, + "y": 286 }, - "width": 134, - "height": 125, + "width": 114, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -131,7 +131,7 @@ "type": "rectangle", "pos": { "x": 40, - "y": 336 + "y": 316 }, "width": 54, "height": 66, @@ -195,11 +195,11 @@ "route": [ { "x": 67, - "y": 136.5 + "y": 116 }, { "x": 67, - "y": 160.10000610351562 + "y": 156 }, { "x": 67, @@ -215,11 +215,11 @@ }, { "x": 67, - "y": 280.1000061035156 + "y": 276 }, { "x": 67, - "y": 336.5 + "y": 316 } ], "isCurve": true, diff --git a/e2etests/testdata/sanity/child_to_child/dagre/sketch.exp.svg b/e2etests/testdata/sanity/child_to_child/dagre/sketch.exp.svg index 00eb18985..e230d32f5 100644 --- a/e2etests/testdata/sanity/child_to_child/dagre/sketch.exp.svg +++ b/e2etests/testdata/sanity/child_to_child/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -acbd - - - - - + .d2-1868225435 .fill-N1{fill:#0A0F25;} + .d2-1868225435 .fill-N2{fill:#676C7E;} + .d2-1868225435 .fill-N3{fill:#9499AB;} + .d2-1868225435 .fill-N4{fill:#CFD2DD;} + .d2-1868225435 .fill-N5{fill:#DEE1EB;} + .d2-1868225435 .fill-N6{fill:#EEF1F8;} + .d2-1868225435 .fill-N7{fill:#FFFFFF;} + .d2-1868225435 .fill-B1{fill:#0D32B2;} + .d2-1868225435 .fill-B2{fill:#0D32B2;} + .d2-1868225435 .fill-B3{fill:#E3E9FD;} + .d2-1868225435 .fill-B4{fill:#E3E9FD;} + .d2-1868225435 .fill-B5{fill:#EDF0FD;} + .d2-1868225435 .fill-B6{fill:#F7F8FE;} + .d2-1868225435 .fill-AA2{fill:#4A6FF3;} + .d2-1868225435 .fill-AA4{fill:#EDF0FD;} + .d2-1868225435 .fill-AA5{fill:#F7F8FE;} + .d2-1868225435 .fill-AB4{fill:#EDF0FD;} + .d2-1868225435 .fill-AB5{fill:#F7F8FE;} + .d2-1868225435 .stroke-N1{stroke:#0A0F25;} + .d2-1868225435 .stroke-N2{stroke:#676C7E;} + .d2-1868225435 .stroke-N3{stroke:#9499AB;} + .d2-1868225435 .stroke-N4{stroke:#CFD2DD;} + .d2-1868225435 .stroke-N5{stroke:#DEE1EB;} + .d2-1868225435 .stroke-N6{stroke:#EEF1F8;} + .d2-1868225435 .stroke-N7{stroke:#FFFFFF;} + .d2-1868225435 .stroke-B1{stroke:#0D32B2;} + .d2-1868225435 .stroke-B2{stroke:#0D32B2;} + .d2-1868225435 .stroke-B3{stroke:#E3E9FD;} + .d2-1868225435 .stroke-B4{stroke:#E3E9FD;} + .d2-1868225435 .stroke-B5{stroke:#EDF0FD;} + .d2-1868225435 .stroke-B6{stroke:#F7F8FE;} + .d2-1868225435 .stroke-AA2{stroke:#4A6FF3;} + .d2-1868225435 .stroke-AA4{stroke:#EDF0FD;} + .d2-1868225435 .stroke-AA5{stroke:#F7F8FE;} + .d2-1868225435 .stroke-AB4{stroke:#EDF0FD;} + .d2-1868225435 .stroke-AB5{stroke:#F7F8FE;} + .d2-1868225435 .background-color-N1{background-color:#0A0F25;} + .d2-1868225435 .background-color-N2{background-color:#676C7E;} + .d2-1868225435 .background-color-N3{background-color:#9499AB;} + .d2-1868225435 .background-color-N4{background-color:#CFD2DD;} + .d2-1868225435 .background-color-N5{background-color:#DEE1EB;} + .d2-1868225435 .background-color-N6{background-color:#EEF1F8;} + .d2-1868225435 .background-color-N7{background-color:#FFFFFF;} + .d2-1868225435 .background-color-B1{background-color:#0D32B2;} + .d2-1868225435 .background-color-B2{background-color:#0D32B2;} + .d2-1868225435 .background-color-B3{background-color:#E3E9FD;} + .d2-1868225435 .background-color-B4{background-color:#E3E9FD;} + .d2-1868225435 .background-color-B5{background-color:#EDF0FD;} + .d2-1868225435 .background-color-B6{background-color:#F7F8FE;} + .d2-1868225435 .background-color-AA2{background-color:#4A6FF3;} + .d2-1868225435 .background-color-AA4{background-color:#EDF0FD;} + .d2-1868225435 .background-color-AA5{background-color:#F7F8FE;} + .d2-1868225435 .background-color-AB4{background-color:#EDF0FD;} + .d2-1868225435 .background-color-AB5{background-color:#F7F8FE;} + .d2-1868225435 .color-N1{color:#0A0F25;} + .d2-1868225435 .color-N2{color:#676C7E;} + .d2-1868225435 .color-N3{color:#9499AB;} + .d2-1868225435 .color-N4{color:#CFD2DD;} + .d2-1868225435 .color-N5{color:#DEE1EB;} + .d2-1868225435 .color-N6{color:#EEF1F8;} + .d2-1868225435 .color-N7{color:#FFFFFF;} + .d2-1868225435 .color-B1{color:#0D32B2;} + .d2-1868225435 .color-B2{color:#0D32B2;} + .d2-1868225435 .color-B3{color:#E3E9FD;} + .d2-1868225435 .color-B4{color:#E3E9FD;} + .d2-1868225435 .color-B5{color:#EDF0FD;} + .d2-1868225435 .color-B6{color:#F7F8FE;} + .d2-1868225435 .color-AA2{color:#4A6FF3;} + .d2-1868225435 .color-AA4{color:#EDF0FD;} + .d2-1868225435 .color-AA5{color:#F7F8FE;} + .d2-1868225435 .color-AB4{color:#EDF0FD;} + .d2-1868225435 .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}]]>acbd + + + + + \ No newline at end of file diff --git a/e2etests/testdata/sanity/connection_label/dagre/board.exp.json b/e2etests/testdata/sanity/connection_label/dagre/board.exp.json index 312307315..434db15e4 100644 --- a/e2etests/testdata/sanity/connection_label/dagre/board.exp.json +++ b/e2etests/testdata/sanity/connection_label/dagre/board.exp.json @@ -113,11 +113,11 @@ "route": [ { "x": 26.5, - "y": 66 + "y": 65.5 }, { "x": 26.5, - "y": 114.4000015258789 + "y": 114.30000305175781 }, { "x": 26.5, diff --git a/e2etests/testdata/sanity/connection_label/dagre/sketch.exp.svg b/e2etests/testdata/sanity/connection_label/dagre/sketch.exp.svg index 04e56647d..f8ed8f019 100644 --- a/e2etests/testdata/sanity/connection_label/dagre/sketch.exp.svg +++ b/e2etests/testdata/sanity/connection_label/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -ab hello + .d2-3766461834 .fill-N1{fill:#0A0F25;} + .d2-3766461834 .fill-N2{fill:#676C7E;} + .d2-3766461834 .fill-N3{fill:#9499AB;} + .d2-3766461834 .fill-N4{fill:#CFD2DD;} + .d2-3766461834 .fill-N5{fill:#DEE1EB;} + .d2-3766461834 .fill-N6{fill:#EEF1F8;} + .d2-3766461834 .fill-N7{fill:#FFFFFF;} + .d2-3766461834 .fill-B1{fill:#0D32B2;} + .d2-3766461834 .fill-B2{fill:#0D32B2;} + .d2-3766461834 .fill-B3{fill:#E3E9FD;} + .d2-3766461834 .fill-B4{fill:#E3E9FD;} + .d2-3766461834 .fill-B5{fill:#EDF0FD;} + .d2-3766461834 .fill-B6{fill:#F7F8FE;} + .d2-3766461834 .fill-AA2{fill:#4A6FF3;} + .d2-3766461834 .fill-AA4{fill:#EDF0FD;} + .d2-3766461834 .fill-AA5{fill:#F7F8FE;} + .d2-3766461834 .fill-AB4{fill:#EDF0FD;} + .d2-3766461834 .fill-AB5{fill:#F7F8FE;} + .d2-3766461834 .stroke-N1{stroke:#0A0F25;} + .d2-3766461834 .stroke-N2{stroke:#676C7E;} + .d2-3766461834 .stroke-N3{stroke:#9499AB;} + .d2-3766461834 .stroke-N4{stroke:#CFD2DD;} + .d2-3766461834 .stroke-N5{stroke:#DEE1EB;} + .d2-3766461834 .stroke-N6{stroke:#EEF1F8;} + .d2-3766461834 .stroke-N7{stroke:#FFFFFF;} + .d2-3766461834 .stroke-B1{stroke:#0D32B2;} + .d2-3766461834 .stroke-B2{stroke:#0D32B2;} + .d2-3766461834 .stroke-B3{stroke:#E3E9FD;} + .d2-3766461834 .stroke-B4{stroke:#E3E9FD;} + .d2-3766461834 .stroke-B5{stroke:#EDF0FD;} + .d2-3766461834 .stroke-B6{stroke:#F7F8FE;} + .d2-3766461834 .stroke-AA2{stroke:#4A6FF3;} + .d2-3766461834 .stroke-AA4{stroke:#EDF0FD;} + .d2-3766461834 .stroke-AA5{stroke:#F7F8FE;} + .d2-3766461834 .stroke-AB4{stroke:#EDF0FD;} + .d2-3766461834 .stroke-AB5{stroke:#F7F8FE;} + .d2-3766461834 .background-color-N1{background-color:#0A0F25;} + .d2-3766461834 .background-color-N2{background-color:#676C7E;} + .d2-3766461834 .background-color-N3{background-color:#9499AB;} + .d2-3766461834 .background-color-N4{background-color:#CFD2DD;} + .d2-3766461834 .background-color-N5{background-color:#DEE1EB;} + .d2-3766461834 .background-color-N6{background-color:#EEF1F8;} + .d2-3766461834 .background-color-N7{background-color:#FFFFFF;} + .d2-3766461834 .background-color-B1{background-color:#0D32B2;} + .d2-3766461834 .background-color-B2{background-color:#0D32B2;} + .d2-3766461834 .background-color-B3{background-color:#E3E9FD;} + .d2-3766461834 .background-color-B4{background-color:#E3E9FD;} + .d2-3766461834 .background-color-B5{background-color:#EDF0FD;} + .d2-3766461834 .background-color-B6{background-color:#F7F8FE;} + .d2-3766461834 .background-color-AA2{background-color:#4A6FF3;} + .d2-3766461834 .background-color-AA4{background-color:#EDF0FD;} + .d2-3766461834 .background-color-AA5{background-color:#F7F8FE;} + .d2-3766461834 .background-color-AB4{background-color:#EDF0FD;} + .d2-3766461834 .background-color-AB5{background-color:#F7F8FE;} + .d2-3766461834 .color-N1{color:#0A0F25;} + .d2-3766461834 .color-N2{color:#676C7E;} + .d2-3766461834 .color-N3{color:#9499AB;} + .d2-3766461834 .color-N4{color:#CFD2DD;} + .d2-3766461834 .color-N5{color:#DEE1EB;} + .d2-3766461834 .color-N6{color:#EEF1F8;} + .d2-3766461834 .color-N7{color:#FFFFFF;} + .d2-3766461834 .color-B1{color:#0D32B2;} + .d2-3766461834 .color-B2{color:#0D32B2;} + .d2-3766461834 .color-B3{color:#E3E9FD;} + .d2-3766461834 .color-B4{color:#E3E9FD;} + .d2-3766461834 .color-B5{color:#EDF0FD;} + .d2-3766461834 .color-B6{color:#F7F8FE;} + .d2-3766461834 .color-AA2{color:#4A6FF3;} + .d2-3766461834 .color-AA4{color:#EDF0FD;} + .d2-3766461834 .color-AA5{color:#F7F8FE;} + .d2-3766461834 .color-AB4{color:#EDF0FD;} + .d2-3766461834 .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}]]>ab hello diff --git a/e2etests/testdata/stable/3d_fill_and_stroke/dagre/board.exp.json b/e2etests/testdata/stable/3d_fill_and_stroke/dagre/board.exp.json index 4cf806b54..34bc15428 100644 --- a/e2etests/testdata/stable/3d_fill_and_stroke/dagre/board.exp.json +++ b/e2etests/testdata/stable/3d_fill_and_stroke/dagre/board.exp.json @@ -8,7 +8,7 @@ "type": "hexagon", "pos": { "x": 0, - "y": 7 + "y": 0 }, "width": 128, "height": 69, @@ -49,7 +49,7 @@ "type": "rectangle", "pos": { "x": 28, - "y": 400 + "y": 363 }, "width": 73, "height": 66, @@ -90,7 +90,7 @@ "type": "rectangle", "pos": { "x": 17, - "y": 191 + "y": 169 }, "width": 94, "height": 94, @@ -153,20 +153,20 @@ "labelPercentage": 0, "route": [ { - "x": 72, - "y": 76 + "x": 64, + "y": 69 }, { - "x": 71.5999984741211, - "y": 116 + "x": 64, + "y": 109 }, { - "x": 71.5, - "y": 136 + "x": 64, + "y": 126 }, { - "x": 71.5, - "y": 176 + "x": 64, + "y": 154 } ], "isCurve": true, @@ -200,20 +200,20 @@ "labelPercentage": 0, "route": [ { - "x": 71.5, - "y": 285 + "x": 64, + "y": 263 }, { - "x": 71.5, - "y": 325 + "x": 64, + "y": 303 }, { - "x": 71.5, - "y": 345 + "x": 64, + "y": 320 }, { - "x": 71.5, - "y": 385 + "x": 64, + "y": 348 } ], "isCurve": true, diff --git a/e2etests/testdata/stable/3d_fill_and_stroke/dagre/sketch.exp.svg b/e2etests/testdata/stable/3d_fill_and_stroke/dagre/sketch.exp.svg index 5f653e080..01bf8424a 100644 --- a/e2etests/testdata/stable/3d_fill_and_stroke/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/3d_fill_and_stroke/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ - - -hexagon - -rect - -square - - - - + .d2-489701467 .fill-N1{fill:#0A0F25;} + .d2-489701467 .fill-N2{fill:#676C7E;} + .d2-489701467 .fill-N3{fill:#9499AB;} + .d2-489701467 .fill-N4{fill:#CFD2DD;} + .d2-489701467 .fill-N5{fill:#DEE1EB;} + .d2-489701467 .fill-N6{fill:#EEF1F8;} + .d2-489701467 .fill-N7{fill:#FFFFFF;} + .d2-489701467 .fill-B1{fill:#0D32B2;} + .d2-489701467 .fill-B2{fill:#0D32B2;} + .d2-489701467 .fill-B3{fill:#E3E9FD;} + .d2-489701467 .fill-B4{fill:#E3E9FD;} + .d2-489701467 .fill-B5{fill:#EDF0FD;} + .d2-489701467 .fill-B6{fill:#F7F8FE;} + .d2-489701467 .fill-AA2{fill:#4A6FF3;} + .d2-489701467 .fill-AA4{fill:#EDF0FD;} + .d2-489701467 .fill-AA5{fill:#F7F8FE;} + .d2-489701467 .fill-AB4{fill:#EDF0FD;} + .d2-489701467 .fill-AB5{fill:#F7F8FE;} + .d2-489701467 .stroke-N1{stroke:#0A0F25;} + .d2-489701467 .stroke-N2{stroke:#676C7E;} + .d2-489701467 .stroke-N3{stroke:#9499AB;} + .d2-489701467 .stroke-N4{stroke:#CFD2DD;} + .d2-489701467 .stroke-N5{stroke:#DEE1EB;} + .d2-489701467 .stroke-N6{stroke:#EEF1F8;} + .d2-489701467 .stroke-N7{stroke:#FFFFFF;} + .d2-489701467 .stroke-B1{stroke:#0D32B2;} + .d2-489701467 .stroke-B2{stroke:#0D32B2;} + .d2-489701467 .stroke-B3{stroke:#E3E9FD;} + .d2-489701467 .stroke-B4{stroke:#E3E9FD;} + .d2-489701467 .stroke-B5{stroke:#EDF0FD;} + .d2-489701467 .stroke-B6{stroke:#F7F8FE;} + .d2-489701467 .stroke-AA2{stroke:#4A6FF3;} + .d2-489701467 .stroke-AA4{stroke:#EDF0FD;} + .d2-489701467 .stroke-AA5{stroke:#F7F8FE;} + .d2-489701467 .stroke-AB4{stroke:#EDF0FD;} + .d2-489701467 .stroke-AB5{stroke:#F7F8FE;} + .d2-489701467 .background-color-N1{background-color:#0A0F25;} + .d2-489701467 .background-color-N2{background-color:#676C7E;} + .d2-489701467 .background-color-N3{background-color:#9499AB;} + .d2-489701467 .background-color-N4{background-color:#CFD2DD;} + .d2-489701467 .background-color-N5{background-color:#DEE1EB;} + .d2-489701467 .background-color-N6{background-color:#EEF1F8;} + .d2-489701467 .background-color-N7{background-color:#FFFFFF;} + .d2-489701467 .background-color-B1{background-color:#0D32B2;} + .d2-489701467 .background-color-B2{background-color:#0D32B2;} + .d2-489701467 .background-color-B3{background-color:#E3E9FD;} + .d2-489701467 .background-color-B4{background-color:#E3E9FD;} + .d2-489701467 .background-color-B5{background-color:#EDF0FD;} + .d2-489701467 .background-color-B6{background-color:#F7F8FE;} + .d2-489701467 .background-color-AA2{background-color:#4A6FF3;} + .d2-489701467 .background-color-AA4{background-color:#EDF0FD;} + .d2-489701467 .background-color-AA5{background-color:#F7F8FE;} + .d2-489701467 .background-color-AB4{background-color:#EDF0FD;} + .d2-489701467 .background-color-AB5{background-color:#F7F8FE;} + .d2-489701467 .color-N1{color:#0A0F25;} + .d2-489701467 .color-N2{color:#676C7E;} + .d2-489701467 .color-N3{color:#9499AB;} + .d2-489701467 .color-N4{color:#CFD2DD;} + .d2-489701467 .color-N5{color:#DEE1EB;} + .d2-489701467 .color-N6{color:#EEF1F8;} + .d2-489701467 .color-N7{color:#FFFFFF;} + .d2-489701467 .color-B1{color:#0D32B2;} + .d2-489701467 .color-B2{color:#0D32B2;} + .d2-489701467 .color-B3{color:#E3E9FD;} + .d2-489701467 .color-B4{color:#E3E9FD;} + .d2-489701467 .color-B5{color:#EDF0FD;} + .d2-489701467 .color-B6{color:#F7F8FE;} + .d2-489701467 .color-AA2{color:#4A6FF3;} + .d2-489701467 .color-AA4{color:#EDF0FD;} + .d2-489701467 .color-AA5{color:#F7F8FE;} + .d2-489701467 .color-AB4{color:#EDF0FD;} + .d2-489701467 .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}]]> + +hexagon + +rect + +square + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/3d_fill_and_stroke/elk/board.exp.json b/e2etests/testdata/stable/3d_fill_and_stroke/elk/board.exp.json index 8705f3a7d..644bffb9d 100644 --- a/e2etests/testdata/stable/3d_fill_and_stroke/elk/board.exp.json +++ b/e2etests/testdata/stable/3d_fill_and_stroke/elk/board.exp.json @@ -157,7 +157,7 @@ "y": 88 }, { - "x": 83.5, + "x": 83, "y": 158 } ], diff --git a/e2etests/testdata/stable/3d_fill_and_stroke/elk/sketch.exp.svg b/e2etests/testdata/stable/3d_fill_and_stroke/elk/sketch.exp.svg index a95e8a4ae..2d9b9d012 100644 --- a/e2etests/testdata/stable/3d_fill_and_stroke/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/3d_fill_and_stroke/elk/sketch.exp.svg @@ -1,9 +1,9 @@ - + .d2-1489188284 .fill-N1{fill:#0A0F25;} + .d2-1489188284 .fill-N2{fill:#676C7E;} + .d2-1489188284 .fill-N3{fill:#9499AB;} + .d2-1489188284 .fill-N4{fill:#CFD2DD;} + .d2-1489188284 .fill-N5{fill:#DEE1EB;} + .d2-1489188284 .fill-N6{fill:#EEF1F8;} + .d2-1489188284 .fill-N7{fill:#FFFFFF;} + .d2-1489188284 .fill-B1{fill:#0D32B2;} + .d2-1489188284 .fill-B2{fill:#0D32B2;} + .d2-1489188284 .fill-B3{fill:#E3E9FD;} + .d2-1489188284 .fill-B4{fill:#E3E9FD;} + .d2-1489188284 .fill-B5{fill:#EDF0FD;} + .d2-1489188284 .fill-B6{fill:#F7F8FE;} + .d2-1489188284 .fill-AA2{fill:#4A6FF3;} + .d2-1489188284 .fill-AA4{fill:#EDF0FD;} + .d2-1489188284 .fill-AA5{fill:#F7F8FE;} + .d2-1489188284 .fill-AB4{fill:#EDF0FD;} + .d2-1489188284 .fill-AB5{fill:#F7F8FE;} + .d2-1489188284 .stroke-N1{stroke:#0A0F25;} + .d2-1489188284 .stroke-N2{stroke:#676C7E;} + .d2-1489188284 .stroke-N3{stroke:#9499AB;} + .d2-1489188284 .stroke-N4{stroke:#CFD2DD;} + .d2-1489188284 .stroke-N5{stroke:#DEE1EB;} + .d2-1489188284 .stroke-N6{stroke:#EEF1F8;} + .d2-1489188284 .stroke-N7{stroke:#FFFFFF;} + .d2-1489188284 .stroke-B1{stroke:#0D32B2;} + .d2-1489188284 .stroke-B2{stroke:#0D32B2;} + .d2-1489188284 .stroke-B3{stroke:#E3E9FD;} + .d2-1489188284 .stroke-B4{stroke:#E3E9FD;} + .d2-1489188284 .stroke-B5{stroke:#EDF0FD;} + .d2-1489188284 .stroke-B6{stroke:#F7F8FE;} + .d2-1489188284 .stroke-AA2{stroke:#4A6FF3;} + .d2-1489188284 .stroke-AA4{stroke:#EDF0FD;} + .d2-1489188284 .stroke-AA5{stroke:#F7F8FE;} + .d2-1489188284 .stroke-AB4{stroke:#EDF0FD;} + .d2-1489188284 .stroke-AB5{stroke:#F7F8FE;} + .d2-1489188284 .background-color-N1{background-color:#0A0F25;} + .d2-1489188284 .background-color-N2{background-color:#676C7E;} + .d2-1489188284 .background-color-N3{background-color:#9499AB;} + .d2-1489188284 .background-color-N4{background-color:#CFD2DD;} + .d2-1489188284 .background-color-N5{background-color:#DEE1EB;} + .d2-1489188284 .background-color-N6{background-color:#EEF1F8;} + .d2-1489188284 .background-color-N7{background-color:#FFFFFF;} + .d2-1489188284 .background-color-B1{background-color:#0D32B2;} + .d2-1489188284 .background-color-B2{background-color:#0D32B2;} + .d2-1489188284 .background-color-B3{background-color:#E3E9FD;} + .d2-1489188284 .background-color-B4{background-color:#E3E9FD;} + .d2-1489188284 .background-color-B5{background-color:#EDF0FD;} + .d2-1489188284 .background-color-B6{background-color:#F7F8FE;} + .d2-1489188284 .background-color-AA2{background-color:#4A6FF3;} + .d2-1489188284 .background-color-AA4{background-color:#EDF0FD;} + .d2-1489188284 .background-color-AA5{background-color:#F7F8FE;} + .d2-1489188284 .background-color-AB4{background-color:#EDF0FD;} + .d2-1489188284 .background-color-AB5{background-color:#F7F8FE;} + .d2-1489188284 .color-N1{color:#0A0F25;} + .d2-1489188284 .color-N2{color:#676C7E;} + .d2-1489188284 .color-N3{color:#9499AB;} + .d2-1489188284 .color-N4{color:#CFD2DD;} + .d2-1489188284 .color-N5{color:#DEE1EB;} + .d2-1489188284 .color-N6{color:#EEF1F8;} + .d2-1489188284 .color-N7{color:#FFFFFF;} + .d2-1489188284 .color-B1{color:#0D32B2;} + .d2-1489188284 .color-B2{color:#0D32B2;} + .d2-1489188284 .color-B3{color:#E3E9FD;} + .d2-1489188284 .color-B4{color:#E3E9FD;} + .d2-1489188284 .color-B5{color:#EDF0FD;} + .d2-1489188284 .color-B6{color:#F7F8FE;} + .d2-1489188284 .color-AA2{color:#4A6FF3;} + .d2-1489188284 .color-AA4{color:#EDF0FD;} + .d2-1489188284 .color-AA5{color:#F7F8FE;} + .d2-1489188284 .color-AB4{color:#EDF0FD;} + .d2-1489188284 .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}]]> hexagon rect -square +square diff --git a/e2etests/testdata/stable/all_shapes/dagre/board.exp.json b/e2etests/testdata/stable/all_shapes/dagre/board.exp.json index 8823bccf8..9166a58a3 100644 --- a/e2etests/testdata/stable/all_shapes/dagre/board.exp.json +++ b/e2etests/testdata/stable/all_shapes/dagre/board.exp.json @@ -459,7 +459,7 @@ "type": "person", "pos": { "x": 653, - "y": 399 + "y": 412 }, "width": 63, "height": 66, @@ -1065,11 +1065,11 @@ }, { "x": 684.5999755859375, - "y": 348.6000061035156 + "y": 351.20001220703125 }, { "x": 685, - "y": 399 + "y": 412 } ], "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 2aa7b692e..5de5642c0 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-3329031849 .fill-N1{fill:#0A0F25;} + .d2-3329031849 .fill-N2{fill:#676C7E;} + .d2-3329031849 .fill-N3{fill:#9499AB;} + .d2-3329031849 .fill-N4{fill:#CFD2DD;} + .d2-3329031849 .fill-N5{fill:#DEE1EB;} + .d2-3329031849 .fill-N6{fill:#EEF1F8;} + .d2-3329031849 .fill-N7{fill:#FFFFFF;} + .d2-3329031849 .fill-B1{fill:#0D32B2;} + .d2-3329031849 .fill-B2{fill:#0D32B2;} + .d2-3329031849 .fill-B3{fill:#E3E9FD;} + .d2-3329031849 .fill-B4{fill:#E3E9FD;} + .d2-3329031849 .fill-B5{fill:#EDF0FD;} + .d2-3329031849 .fill-B6{fill:#F7F8FE;} + .d2-3329031849 .fill-AA2{fill:#4A6FF3;} + .d2-3329031849 .fill-AA4{fill:#EDF0FD;} + .d2-3329031849 .fill-AA5{fill:#F7F8FE;} + .d2-3329031849 .fill-AB4{fill:#EDF0FD;} + .d2-3329031849 .fill-AB5{fill:#F7F8FE;} + .d2-3329031849 .stroke-N1{stroke:#0A0F25;} + .d2-3329031849 .stroke-N2{stroke:#676C7E;} + .d2-3329031849 .stroke-N3{stroke:#9499AB;} + .d2-3329031849 .stroke-N4{stroke:#CFD2DD;} + .d2-3329031849 .stroke-N5{stroke:#DEE1EB;} + .d2-3329031849 .stroke-N6{stroke:#EEF1F8;} + .d2-3329031849 .stroke-N7{stroke:#FFFFFF;} + .d2-3329031849 .stroke-B1{stroke:#0D32B2;} + .d2-3329031849 .stroke-B2{stroke:#0D32B2;} + .d2-3329031849 .stroke-B3{stroke:#E3E9FD;} + .d2-3329031849 .stroke-B4{stroke:#E3E9FD;} + .d2-3329031849 .stroke-B5{stroke:#EDF0FD;} + .d2-3329031849 .stroke-B6{stroke:#F7F8FE;} + .d2-3329031849 .stroke-AA2{stroke:#4A6FF3;} + .d2-3329031849 .stroke-AA4{stroke:#EDF0FD;} + .d2-3329031849 .stroke-AA5{stroke:#F7F8FE;} + .d2-3329031849 .stroke-AB4{stroke:#EDF0FD;} + .d2-3329031849 .stroke-AB5{stroke:#F7F8FE;} + .d2-3329031849 .background-color-N1{background-color:#0A0F25;} + .d2-3329031849 .background-color-N2{background-color:#676C7E;} + .d2-3329031849 .background-color-N3{background-color:#9499AB;} + .d2-3329031849 .background-color-N4{background-color:#CFD2DD;} + .d2-3329031849 .background-color-N5{background-color:#DEE1EB;} + .d2-3329031849 .background-color-N6{background-color:#EEF1F8;} + .d2-3329031849 .background-color-N7{background-color:#FFFFFF;} + .d2-3329031849 .background-color-B1{background-color:#0D32B2;} + .d2-3329031849 .background-color-B2{background-color:#0D32B2;} + .d2-3329031849 .background-color-B3{background-color:#E3E9FD;} + .d2-3329031849 .background-color-B4{background-color:#E3E9FD;} + .d2-3329031849 .background-color-B5{background-color:#EDF0FD;} + .d2-3329031849 .background-color-B6{background-color:#F7F8FE;} + .d2-3329031849 .background-color-AA2{background-color:#4A6FF3;} + .d2-3329031849 .background-color-AA4{background-color:#EDF0FD;} + .d2-3329031849 .background-color-AA5{background-color:#F7F8FE;} + .d2-3329031849 .background-color-AB4{background-color:#EDF0FD;} + .d2-3329031849 .background-color-AB5{background-color:#F7F8FE;} + .d2-3329031849 .color-N1{color:#0A0F25;} + .d2-3329031849 .color-N2{color:#676C7E;} + .d2-3329031849 .color-N3{color:#9499AB;} + .d2-3329031849 .color-N4{color:#CFD2DD;} + .d2-3329031849 .color-N5{color:#DEE1EB;} + .d2-3329031849 .color-N6{color:#EEF1F8;} + .d2-3329031849 .color-N7{color:#FFFFFF;} + .d2-3329031849 .color-B1{color:#0D32B2;} + .d2-3329031849 .color-B2{color:#0D32B2;} + .d2-3329031849 .color-B3{color:#E3E9FD;} + .d2-3329031849 .color-B4{color:#E3E9FD;} + .d2-3329031849 .color-B5{color:#EDF0FD;} + .d2-3329031849 .color-B6{color:#F7F8FE;} + .d2-3329031849 .color-AA2{color:#4A6FF3;} + .d2-3329031849 .color-AA4{color:#EDF0FD;} + .d2-3329031849 .color-AA5{color:#F7F8FE;} + .d2-3329031849 .color-AB4{color:#EDF0FD;} + .d2-3329031849 .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 @@ -102,7 +102,7 @@ - + diff --git a/e2etests/testdata/stable/all_shapes/elk/board.exp.json b/e2etests/testdata/stable/all_shapes/elk/board.exp.json index 4a1c2d4cc..af2fba9bd 100644 --- a/e2etests/testdata/stable/all_shapes/elk/board.exp.json +++ b/e2etests/testdata/stable/all_shapes/elk/board.exp.json @@ -921,7 +921,7 @@ "y": 258 }, { - "x": 429, + "x": 430, "y": 338 } ], @@ -959,7 +959,7 @@ "y": 59 }, { - "x": 577, + "x": 576, "y": 188 } ], diff --git a/e2etests/testdata/stable/all_shapes/elk/sketch.exp.svg b/e2etests/testdata/stable/all_shapes/elk/sketch.exp.svg index 1934530d5..bb159295b 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-3786904532 .fill-N1{fill:#0A0F25;} + .d2-3786904532 .fill-N2{fill:#676C7E;} + .d2-3786904532 .fill-N3{fill:#9499AB;} + .d2-3786904532 .fill-N4{fill:#CFD2DD;} + .d2-3786904532 .fill-N5{fill:#DEE1EB;} + .d2-3786904532 .fill-N6{fill:#EEF1F8;} + .d2-3786904532 .fill-N7{fill:#FFFFFF;} + .d2-3786904532 .fill-B1{fill:#0D32B2;} + .d2-3786904532 .fill-B2{fill:#0D32B2;} + .d2-3786904532 .fill-B3{fill:#E3E9FD;} + .d2-3786904532 .fill-B4{fill:#E3E9FD;} + .d2-3786904532 .fill-B5{fill:#EDF0FD;} + .d2-3786904532 .fill-B6{fill:#F7F8FE;} + .d2-3786904532 .fill-AA2{fill:#4A6FF3;} + .d2-3786904532 .fill-AA4{fill:#EDF0FD;} + .d2-3786904532 .fill-AA5{fill:#F7F8FE;} + .d2-3786904532 .fill-AB4{fill:#EDF0FD;} + .d2-3786904532 .fill-AB5{fill:#F7F8FE;} + .d2-3786904532 .stroke-N1{stroke:#0A0F25;} + .d2-3786904532 .stroke-N2{stroke:#676C7E;} + .d2-3786904532 .stroke-N3{stroke:#9499AB;} + .d2-3786904532 .stroke-N4{stroke:#CFD2DD;} + .d2-3786904532 .stroke-N5{stroke:#DEE1EB;} + .d2-3786904532 .stroke-N6{stroke:#EEF1F8;} + .d2-3786904532 .stroke-N7{stroke:#FFFFFF;} + .d2-3786904532 .stroke-B1{stroke:#0D32B2;} + .d2-3786904532 .stroke-B2{stroke:#0D32B2;} + .d2-3786904532 .stroke-B3{stroke:#E3E9FD;} + .d2-3786904532 .stroke-B4{stroke:#E3E9FD;} + .d2-3786904532 .stroke-B5{stroke:#EDF0FD;} + .d2-3786904532 .stroke-B6{stroke:#F7F8FE;} + .d2-3786904532 .stroke-AA2{stroke:#4A6FF3;} + .d2-3786904532 .stroke-AA4{stroke:#EDF0FD;} + .d2-3786904532 .stroke-AA5{stroke:#F7F8FE;} + .d2-3786904532 .stroke-AB4{stroke:#EDF0FD;} + .d2-3786904532 .stroke-AB5{stroke:#F7F8FE;} + .d2-3786904532 .background-color-N1{background-color:#0A0F25;} + .d2-3786904532 .background-color-N2{background-color:#676C7E;} + .d2-3786904532 .background-color-N3{background-color:#9499AB;} + .d2-3786904532 .background-color-N4{background-color:#CFD2DD;} + .d2-3786904532 .background-color-N5{background-color:#DEE1EB;} + .d2-3786904532 .background-color-N6{background-color:#EEF1F8;} + .d2-3786904532 .background-color-N7{background-color:#FFFFFF;} + .d2-3786904532 .background-color-B1{background-color:#0D32B2;} + .d2-3786904532 .background-color-B2{background-color:#0D32B2;} + .d2-3786904532 .background-color-B3{background-color:#E3E9FD;} + .d2-3786904532 .background-color-B4{background-color:#E3E9FD;} + .d2-3786904532 .background-color-B5{background-color:#EDF0FD;} + .d2-3786904532 .background-color-B6{background-color:#F7F8FE;} + .d2-3786904532 .background-color-AA2{background-color:#4A6FF3;} + .d2-3786904532 .background-color-AA4{background-color:#EDF0FD;} + .d2-3786904532 .background-color-AA5{background-color:#F7F8FE;} + .d2-3786904532 .background-color-AB4{background-color:#EDF0FD;} + .d2-3786904532 .background-color-AB5{background-color:#F7F8FE;} + .d2-3786904532 .color-N1{color:#0A0F25;} + .d2-3786904532 .color-N2{color:#676C7E;} + .d2-3786904532 .color-N3{color:#9499AB;} + .d2-3786904532 .color-N4{color:#CFD2DD;} + .d2-3786904532 .color-N5{color:#DEE1EB;} + .d2-3786904532 .color-N6{color:#EEF1F8;} + .d2-3786904532 .color-N7{color:#FFFFFF;} + .d2-3786904532 .color-B1{color:#0D32B2;} + .d2-3786904532 .color-B2{color:#0D32B2;} + .d2-3786904532 .color-B3{color:#E3E9FD;} + .d2-3786904532 .color-B4{color:#E3E9FD;} + .d2-3786904532 .color-B5{color:#EDF0FD;} + .d2-3786904532 .color-B6{color:#F7F8FE;} + .d2-3786904532 .color-AA2{color:#4A6FF3;} + .d2-3786904532 .color-AA4{color:#EDF0FD;} + .d2-3786904532 .color-AA5{color:#F7F8FE;} + .d2-3786904532 .color-AB4{color:#EDF0FD;} + .d2-3786904532 .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_link/dagre/board.exp.json b/e2etests/testdata/stable/all_shapes_link/dagre/board.exp.json index 8755431c2..98d98d5d3 100644 --- a/e2etests/testdata/stable/all_shapes_link/dagre/board.exp.json +++ b/e2etests/testdata/stable/all_shapes_link/dagre/board.exp.json @@ -7,11 +7,11 @@ "id": "linked", "type": "rectangle", "pos": { - "x": 80, - "y": 41 + "x": 90, + "y": 20 }, - "width": 1413, - "height": 595, + "width": 1393, + "height": 596, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -52,7 +52,7 @@ ], "pos": { "x": 120, - "y": 83 + "y": 63 }, "width": 143, "height": 66, @@ -96,7 +96,7 @@ ], "pos": { "x": 129, - "y": 262 + "y": 242 }, "width": 126, "height": 126, @@ -140,7 +140,7 @@ ], "pos": { "x": 136, - "y": 504 + "y": 484 }, "width": 111, "height": 87, @@ -184,7 +184,7 @@ ], "pos": { "x": 323, - "y": 83 + "y": 63 }, "width": 228, "height": 66, @@ -228,7 +228,7 @@ ], "pos": { "x": 363, - "y": 287 + "y": 267 }, "width": 149, "height": 76, @@ -272,7 +272,7 @@ ], "pos": { "x": 369, - "y": 488 + "y": 468 }, "width": 136, "height": 118, @@ -316,7 +316,7 @@ ], "pos": { "x": 611, - "y": 83 + "y": 63 }, "width": 173, "height": 66, @@ -360,7 +360,7 @@ ], "pos": { "x": 630, - "y": 289 + "y": 269 }, "width": 135, "height": 73, @@ -404,7 +404,7 @@ ], "pos": { "x": 624, - "y": 497 + "y": 477 }, "width": 148, "height": 101, @@ -448,7 +448,7 @@ ], "pos": { "x": 853, - "y": 71 + "y": 51 }, "width": 127, "height": 91, @@ -492,7 +492,7 @@ ], "pos": { "x": 825, - "y": 292 + "y": 272 }, "width": 183, "height": 66, @@ -536,7 +536,7 @@ ], "pos": { "x": 869, - "y": 501 + "y": 494 }, "width": 95, "height": 66, @@ -580,7 +580,7 @@ ], "pos": { "x": 1040, - "y": 70 + "y": 50 }, "width": 220, "height": 92, @@ -624,7 +624,7 @@ ], "pos": { "x": 1083, - "y": 290 + "y": 270 }, "width": 134, "height": 70, @@ -668,7 +668,7 @@ ], "pos": { "x": 1091, - "y": 488 + "y": 468 }, "width": 118, "height": 118, @@ -712,7 +712,7 @@ ], "pos": { "x": 1277, - "y": 291 + "y": 271 }, "width": 176, "height": 69, @@ -756,7 +756,7 @@ ], "pos": { "x": 1294, - "y": 505 + "y": 485 }, "width": 143, "height": 84, @@ -796,11 +796,11 @@ "id": "tooltipped", "type": "rectangle", "pos": { - "x": 80, - "y": 777 + "x": 90, + "y": 756 }, - "width": 1413, - "height": 595, + "width": 1393, + "height": 596, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -841,7 +841,7 @@ ], "pos": { "x": 120, - "y": 819 + "y": 799 }, "width": 143, "height": 66, @@ -885,7 +885,7 @@ ], "pos": { "x": 129, - "y": 998 + "y": 978 }, "width": 126, "height": 126, @@ -929,7 +929,7 @@ ], "pos": { "x": 136, - "y": 1240 + "y": 1220 }, "width": 111, "height": 87, @@ -973,7 +973,7 @@ ], "pos": { "x": 323, - "y": 819 + "y": 799 }, "width": 228, "height": 66, @@ -1017,7 +1017,7 @@ ], "pos": { "x": 363, - "y": 1023 + "y": 1003 }, "width": 149, "height": 76, @@ -1061,7 +1061,7 @@ ], "pos": { "x": 369, - "y": 1224 + "y": 1204 }, "width": 136, "height": 118, @@ -1105,7 +1105,7 @@ ], "pos": { "x": 611, - "y": 819 + "y": 799 }, "width": 173, "height": 66, @@ -1149,7 +1149,7 @@ ], "pos": { "x": 630, - "y": 1025 + "y": 1005 }, "width": 135, "height": 73, @@ -1193,7 +1193,7 @@ ], "pos": { "x": 624, - "y": 1233 + "y": 1213 }, "width": 148, "height": 101, @@ -1237,7 +1237,7 @@ ], "pos": { "x": 853, - "y": 807 + "y": 787 }, "width": 127, "height": 91, @@ -1281,7 +1281,7 @@ ], "pos": { "x": 825, - "y": 1028 + "y": 1008 }, "width": 183, "height": 66, @@ -1325,7 +1325,7 @@ ], "pos": { "x": 869, - "y": 1237 + "y": 1230 }, "width": 95, "height": 66, @@ -1369,7 +1369,7 @@ ], "pos": { "x": 1040, - "y": 806 + "y": 786 }, "width": 220, "height": 92, @@ -1413,7 +1413,7 @@ ], "pos": { "x": 1083, - "y": 1026 + "y": 1006 }, "width": 134, "height": 70, @@ -1457,7 +1457,7 @@ ], "pos": { "x": 1091, - "y": 1224 + "y": 1204 }, "width": 118, "height": 118, @@ -1501,7 +1501,7 @@ ], "pos": { "x": 1277, - "y": 1027 + "y": 1007 }, "width": 176, "height": 69, @@ -1545,7 +1545,7 @@ ], "pos": { "x": 1294, - "y": 1241 + "y": 1221 }, "width": 143, "height": 84, @@ -1585,11 +1585,11 @@ "id": "both", "type": "rectangle", "pos": { - "x": 0, - "y": 1513 + "x": 10, + "y": 1492 }, - "width": 1640, - "height": 656, + "width": 1620, + "height": 657, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1631,7 +1631,7 @@ ], "pos": { "x": 40, - "y": 1555 + "y": 1535 }, "width": 175, "height": 66, @@ -1676,7 +1676,7 @@ ], "pos": { "x": 49, - "y": 1734 + "y": 1714 }, "width": 158, "height": 158, @@ -1721,7 +1721,7 @@ ], "pos": { "x": 56, - "y": 2022 + "y": 2002 }, "width": 143, "height": 87, @@ -1766,7 +1766,7 @@ ], "pos": { "x": 275, - "y": 1555 + "y": 1535 }, "width": 260, "height": 66, @@ -1811,7 +1811,7 @@ ], "pos": { "x": 315, - "y": 1775 + "y": 1755 }, "width": 181, "height": 76, @@ -1856,7 +1856,7 @@ ], "pos": { "x": 321, - "y": 2007 + "y": 1987 }, "width": 168, "height": 118, @@ -1901,7 +1901,7 @@ ], "pos": { "x": 595, - "y": 1555 + "y": 1535 }, "width": 205, "height": 66, @@ -1946,7 +1946,7 @@ ], "pos": { "x": 614, - "y": 1777 + "y": 1757 }, "width": 167, "height": 73, @@ -1991,7 +1991,7 @@ ], "pos": { "x": 608, - "y": 2015 + "y": 1995 }, "width": 180, "height": 101, @@ -2036,7 +2036,7 @@ ], "pos": { "x": 869, - "y": 1543 + "y": 1523 }, "width": 159, "height": 91, @@ -2081,7 +2081,7 @@ ], "pos": { "x": 841, - "y": 1780 + "y": 1760 }, "width": 215, "height": 66, @@ -2126,7 +2126,7 @@ ], "pos": { "x": 885, - "y": 2010 + "y": 2003 }, "width": 127, "height": 85, @@ -2171,7 +2171,7 @@ ], "pos": { "x": 1088, - "y": 1542 + "y": 1522 }, "width": 284, "height": 92, @@ -2216,7 +2216,7 @@ ], "pos": { "x": 1145, - "y": 1778 + "y": 1758 }, "width": 171, "height": 70, @@ -2261,7 +2261,7 @@ ], "pos": { "x": 1157, - "y": 1992 + "y": 1972 }, "width": 147, "height": 147, @@ -2306,7 +2306,7 @@ ], "pos": { "x": 1376, - "y": 1779 + "y": 1759 }, "width": 224, "height": 69, @@ -2351,7 +2351,7 @@ ], "pos": { "x": 1397, - "y": 2024 + "y": 2004 }, "width": 182, "height": 84, @@ -2415,19 +2415,19 @@ "route": [ { "x": 191.5, - "y": 149.5 + "y": 129 }, { "x": 191.5, - "y": 199.89999389648438 + "y": 179.39999389648438 }, { "x": 191.5, - "y": 222.5 + "y": 202 }, { "x": 191.5, - "y": 262.5 + "y": 242 } ], "isCurve": true, @@ -2462,19 +2462,19 @@ "route": [ { "x": 191.5, - "y": 388.5 + "y": 368 }, { "x": 191.5, - "y": 428.5 + "y": 408 }, { "x": 191.60000610351562, - "y": 451.79998779296875 + "y": 431.20001220703125 }, { "x": 192, - "y": 505 + "y": 484 } ], "isCurve": true, @@ -2509,19 +2509,19 @@ "route": [ { "x": 437, - "y": 150 + "y": 129 }, { "x": 437, - "y": 200 + "y": 179.39999389648438 }, { "x": 437, - "y": 227.60000610351562 + "y": 207 }, { "x": 437, - "y": 288 + "y": 267 } ], "isCurve": true, @@ -2556,19 +2556,19 @@ "route": [ { "x": 437, - "y": 354 + "y": 333 }, { "x": 437, - "y": 421.6000061035156 + "y": 401 }, { "x": 437, - "y": 448.6000061035156 + "y": 428 }, { "x": 437, - "y": 489 + "y": 468 } ], "isCurve": true, @@ -2603,19 +2603,19 @@ "route": [ { "x": 697, - "y": 150 + "y": 129 }, { "x": 697.4000244140625, - "y": 200 + "y": 179.39999389648438 }, { "x": 697.5999755859375, - "y": 228 + "y": 207.39999389648438 }, { "x": 698, - "y": 290 + "y": 269 } ], "isCurve": true, @@ -2650,19 +2650,19 @@ "route": [ { "x": 697, - "y": 363 + "y": 342 }, { "x": 697.4000244140625, - "y": 423.3999938964844 + "y": 402.79998779296875 }, { "x": 697.5999755859375, - "y": 450.3999938964844 + "y": 429.79998779296875 }, { "x": 698, - "y": 498 + "y": 477 } ], "isCurve": true, @@ -2697,19 +2697,19 @@ "route": [ { "x": 917, - "y": 118 + "y": 97 }, { "x": 916.5999755859375, - "y": 193.60000610351562 + "y": 173 }, { "x": 916.5999755859375, - "y": 228.60000610351562 + "y": 208 }, { "x": 917, - "y": 293 + "y": 272 } ], "isCurve": true, @@ -2744,19 +2744,19 @@ "route": [ { "x": 917, - "y": 359 + "y": 338 }, { "x": 916.5999755859375, - "y": 422.6000061035156 + "y": 402 }, { "x": 916.5999755859375, - "y": 451.20001220703125 + "y": 433.20001220703125 }, { "x": 917, - "y": 502 + "y": 494 } ], "isCurve": true, @@ -2791,19 +2791,19 @@ "route": [ { "x": 1150, - "y": 163 + "y": 142 }, { "x": 1150, - "y": 202.60000610351562 + "y": 182 }, { "x": 1150, - "y": 228.1999969482422 + "y": 207.60000610351562 }, { "x": 1150, - "y": 291 + "y": 270 } ], "isCurve": true, @@ -2838,19 +2838,19 @@ "route": [ { "x": 1150, - "y": 361 + "y": 340 }, { "x": 1150, - "y": 423 + "y": 402.3999938964844 }, { "x": 1150, - "y": 448.6000061035156 + "y": 428 }, { "x": 1150, - "y": 489 + "y": 468 } ], "isCurve": true, @@ -2885,19 +2885,19 @@ "route": [ { "x": 1365, - "y": 361 + "y": 340 }, { "x": 1365, - "y": 423 + "y": 402.3999938964844 }, { "x": 1365, - "y": 452.20001220703125 + "y": 431.6000061035156 }, { "x": 1365, - "y": 507 + "y": 486 } ], "isCurve": true, @@ -2932,19 +2932,19 @@ "route": [ { "x": 191.5, - "y": 885.5 + "y": 865 }, { "x": 191.5, - "y": 935.9000244140625 + "y": 915.4000244140625 }, { "x": 191.5, - "y": 958.5 + "y": 938 }, { "x": 191.5, - "y": 998.5 + "y": 978 } ], "isCurve": true, @@ -2979,19 +2979,19 @@ "route": [ { "x": 191.5, - "y": 1124.5 + "y": 1104 }, { "x": 191.5, - "y": 1164.5 + "y": 1144 }, { "x": 191.60000610351562, - "y": 1187.800048828125 + "y": 1167.199951171875 }, { "x": 192, - "y": 1241 + "y": 1220 } ], "isCurve": true, @@ -3026,19 +3026,19 @@ "route": [ { "x": 437, - "y": 886 + "y": 865 }, { "x": 437, - "y": 936 + "y": 915.4000244140625 }, { "x": 437, - "y": 963.5999755859375 + "y": 943 }, { "x": 437, - "y": 1024 + "y": 1003 } ], "isCurve": true, @@ -3073,19 +3073,19 @@ "route": [ { "x": 437, - "y": 1090 + "y": 1069 }, { "x": 437, - "y": 1157.5999755859375 + "y": 1137 }, { "x": 437, - "y": 1184.5999755859375 + "y": 1164 }, { "x": 437, - "y": 1225 + "y": 1204 } ], "isCurve": true, @@ -3120,19 +3120,19 @@ "route": [ { "x": 697, - "y": 886 + "y": 865 }, { "x": 697.4000244140625, - "y": 936 + "y": 915.4000244140625 }, { "x": 697.5999755859375, - "y": 964 + "y": 943.4000244140625 }, { "x": 698, - "y": 1026 + "y": 1005 } ], "isCurve": true, @@ -3167,19 +3167,19 @@ "route": [ { "x": 697, - "y": 1099 + "y": 1078 }, { "x": 697.4000244140625, - "y": 1159.4000244140625 + "y": 1138.800048828125 }, { "x": 697.5999755859375, - "y": 1186.4000244140625 + "y": 1165.800048828125 }, { "x": 698, - "y": 1234 + "y": 1213 } ], "isCurve": true, @@ -3214,19 +3214,19 @@ "route": [ { "x": 917, - "y": 854 + "y": 833 }, { "x": 916.5999755859375, - "y": 929.5999755859375 + "y": 909 }, { "x": 916.5999755859375, - "y": 964.5999755859375 + "y": 944 }, { "x": 917, - "y": 1029 + "y": 1008 } ], "isCurve": true, @@ -3261,19 +3261,19 @@ "route": [ { "x": 917, - "y": 1095 + "y": 1074 }, { "x": 916.5999755859375, - "y": 1158.5999755859375 + "y": 1138 }, { "x": 916.5999755859375, - "y": 1187.199951171875 + "y": 1169.199951171875 }, { "x": 917, - "y": 1238 + "y": 1230 } ], "isCurve": true, @@ -3308,19 +3308,19 @@ "route": [ { "x": 1150, - "y": 899 + "y": 878 }, { "x": 1150, - "y": 938.5999755859375 + "y": 918 }, { "x": 1150, - "y": 964.2000122070312 + "y": 943.5999755859375 }, { "x": 1150, - "y": 1027 + "y": 1006 } ], "isCurve": true, @@ -3355,19 +3355,19 @@ "route": [ { "x": 1150, - "y": 1097 + "y": 1076 }, { "x": 1150, - "y": 1159 + "y": 1138.4000244140625 }, { "x": 1150, - "y": 1184.5999755859375 + "y": 1164 }, { "x": 1150, - "y": 1225 + "y": 1204 } ], "isCurve": true, @@ -3402,19 +3402,19 @@ "route": [ { "x": 1365, - "y": 1097 + "y": 1076 }, { "x": 1365, - "y": 1159 + "y": 1138.4000244140625 }, { "x": 1365, - "y": 1188.199951171875 + "y": 1167.5999755859375 }, { "x": 1365, - "y": 1243 + "y": 1222 } ], "isCurve": true, @@ -3449,19 +3449,19 @@ "route": [ { "x": 127.5, - "y": 1621.5 + "y": 1601 }, { "x": 127.5, - "y": 1671.9000244140625 + "y": 1651.4000244140625 }, { "x": 127.5, - "y": 1694.5 + "y": 1674 }, { "x": 127.5, - "y": 1734.5 + "y": 1714 } ], "isCurve": true, @@ -3496,19 +3496,19 @@ "route": [ { "x": 127.5, - "y": 1892.5 + "y": 1872 }, { "x": 127.5, - "y": 1932.5 + "y": 1912 }, { "x": 127.5999984741211, - "y": 1958.5999755859375 + "y": 1938 }, { "x": 128, - "y": 2023 + "y": 2002 } ], "isCurve": true, @@ -3543,19 +3543,19 @@ "route": [ { "x": 405, - "y": 1622 + "y": 1601 }, { "x": 405, - "y": 1672 + "y": 1651.4000244140625 }, { "x": 405, - "y": 1702.800048828125 + "y": 1682.199951171875 }, { "x": 405, - "y": 1776 + "y": 1755 } ], "isCurve": true, @@ -3590,19 +3590,19 @@ "route": [ { "x": 405, - "y": 1841 + "y": 1820 }, { "x": 405, - "y": 1922.199951171875 + "y": 1901.5999755859375 }, { "x": 405, - "y": 1955.5999755859375 + "y": 1935 }, { "x": 405, - "y": 2008 + "y": 1987 } ], "isCurve": true, @@ -3637,19 +3637,19 @@ "route": [ { "x": 697, - "y": 1622 + "y": 1601 }, { "x": 697.4000244140625, - "y": 1672 + "y": 1651.4000244140625 }, { "x": 697.5999755859375, - "y": 1703.199951171875 + "y": 1682.5999755859375 }, { "x": 698, - "y": 1778 + "y": 1757 } ], "isCurve": true, @@ -3684,19 +3684,19 @@ "route": [ { "x": 697, - "y": 1851 + "y": 1830 }, { "x": 697.4000244140625, - "y": 1924.199951171875 + "y": 1903.5999755859375 }, { "x": 697.5999755859375, - "y": 1957.199951171875 + "y": 1936.5999755859375 }, { "x": 698, - "y": 2016 + "y": 1995 } ], "isCurve": true, @@ -3731,19 +3731,19 @@ "route": [ { "x": 949, - "y": 1590 + "y": 1569 }, { "x": 948.5999755859375, - "y": 1665.5999755859375 + "y": 1645 }, { "x": 948.5999755859375, - "y": 1703.800048828125 + "y": 1683.199951171875 }, { "x": 949, - "y": 1781 + "y": 1760 } ], "isCurve": true, @@ -3778,19 +3778,19 @@ "route": [ { "x": 948, - "y": 1847 + "y": 1826 }, { "x": 948.4000244140625, - "y": 1923.4000244140625 + "y": 1902.800048828125 }, { "x": 948.5999755859375, - "y": 1956.199951171875 + "y": 1938.199951171875 }, { "x": 949, - "y": 2011 + "y": 2003 } ], "isCurve": true, @@ -3825,19 +3825,19 @@ "route": [ { "x": 1230, - "y": 1635 + "y": 1614 }, { "x": 1230, - "y": 1674.5999755859375 + "y": 1654 }, { "x": 1230, - "y": 1703.4000244140625 + "y": 1682.800048828125 }, { "x": 1230, - "y": 1779 + "y": 1758 } ], "isCurve": true, @@ -3872,19 +3872,19 @@ "route": [ { "x": 1230, - "y": 1848 + "y": 1828 }, { "x": 1230, - "y": 1923.5999755859375 + "y": 1903.199951171875 }, { "x": 1230, - "y": 1952.5999755859375 + "y": 1932 }, { "x": 1230, - "y": 1993 + "y": 1972 } ], "isCurve": true, @@ -3919,19 +3919,19 @@ "route": [ { "x": 1488, - "y": 1849 + "y": 1828 }, { "x": 1487.5999755859375, - "y": 1923.800048828125 + "y": 1903.199951171875 }, { "x": 1487.5999755859375, - "y": 1959.4000244140625 + "y": 1938.800048828125 }, { "x": 1488, - "y": 2027 + "y": 2006 } ], "isCurve": true, @@ -3966,19 +3966,19 @@ "route": [ { "x": 697.5, - "y": 636 + "y": 616 }, { "x": 697.5, - "y": 676 + "y": 672 }, { "x": 697.5, - "y": 704.2000122070312 + "y": 700 }, { "x": 697.5, - "y": 777 + "y": 756 } ], "isCurve": true, @@ -4013,19 +4013,19 @@ "route": [ { "x": 697.5, - "y": 1372 + "y": 1352 }, { "x": 697.5, - "y": 1412 + "y": 1408 }, { "x": 697.5, - "y": 1440.199951171875 + "y": 1436 }, { "x": 697.5, - "y": 1513 + "y": 1492 } ], "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 81239c0c1..48400e686 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_datapersondiamondovalcirclehexagoncloudrectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloudrectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud + .d2-3720214040 .fill-N1{fill:#0A0F25;} + .d2-3720214040 .fill-N2{fill:#676C7E;} + .d2-3720214040 .fill-N3{fill:#9499AB;} + .d2-3720214040 .fill-N4{fill:#CFD2DD;} + .d2-3720214040 .fill-N5{fill:#DEE1EB;} + .d2-3720214040 .fill-N6{fill:#EEF1F8;} + .d2-3720214040 .fill-N7{fill:#FFFFFF;} + .d2-3720214040 .fill-B1{fill:#0D32B2;} + .d2-3720214040 .fill-B2{fill:#0D32B2;} + .d2-3720214040 .fill-B3{fill:#E3E9FD;} + .d2-3720214040 .fill-B4{fill:#E3E9FD;} + .d2-3720214040 .fill-B5{fill:#EDF0FD;} + .d2-3720214040 .fill-B6{fill:#F7F8FE;} + .d2-3720214040 .fill-AA2{fill:#4A6FF3;} + .d2-3720214040 .fill-AA4{fill:#EDF0FD;} + .d2-3720214040 .fill-AA5{fill:#F7F8FE;} + .d2-3720214040 .fill-AB4{fill:#EDF0FD;} + .d2-3720214040 .fill-AB5{fill:#F7F8FE;} + .d2-3720214040 .stroke-N1{stroke:#0A0F25;} + .d2-3720214040 .stroke-N2{stroke:#676C7E;} + .d2-3720214040 .stroke-N3{stroke:#9499AB;} + .d2-3720214040 .stroke-N4{stroke:#CFD2DD;} + .d2-3720214040 .stroke-N5{stroke:#DEE1EB;} + .d2-3720214040 .stroke-N6{stroke:#EEF1F8;} + .d2-3720214040 .stroke-N7{stroke:#FFFFFF;} + .d2-3720214040 .stroke-B1{stroke:#0D32B2;} + .d2-3720214040 .stroke-B2{stroke:#0D32B2;} + .d2-3720214040 .stroke-B3{stroke:#E3E9FD;} + .d2-3720214040 .stroke-B4{stroke:#E3E9FD;} + .d2-3720214040 .stroke-B5{stroke:#EDF0FD;} + .d2-3720214040 .stroke-B6{stroke:#F7F8FE;} + .d2-3720214040 .stroke-AA2{stroke:#4A6FF3;} + .d2-3720214040 .stroke-AA4{stroke:#EDF0FD;} + .d2-3720214040 .stroke-AA5{stroke:#F7F8FE;} + .d2-3720214040 .stroke-AB4{stroke:#EDF0FD;} + .d2-3720214040 .stroke-AB5{stroke:#F7F8FE;} + .d2-3720214040 .background-color-N1{background-color:#0A0F25;} + .d2-3720214040 .background-color-N2{background-color:#676C7E;} + .d2-3720214040 .background-color-N3{background-color:#9499AB;} + .d2-3720214040 .background-color-N4{background-color:#CFD2DD;} + .d2-3720214040 .background-color-N5{background-color:#DEE1EB;} + .d2-3720214040 .background-color-N6{background-color:#EEF1F8;} + .d2-3720214040 .background-color-N7{background-color:#FFFFFF;} + .d2-3720214040 .background-color-B1{background-color:#0D32B2;} + .d2-3720214040 .background-color-B2{background-color:#0D32B2;} + .d2-3720214040 .background-color-B3{background-color:#E3E9FD;} + .d2-3720214040 .background-color-B4{background-color:#E3E9FD;} + .d2-3720214040 .background-color-B5{background-color:#EDF0FD;} + .d2-3720214040 .background-color-B6{background-color:#F7F8FE;} + .d2-3720214040 .background-color-AA2{background-color:#4A6FF3;} + .d2-3720214040 .background-color-AA4{background-color:#EDF0FD;} + .d2-3720214040 .background-color-AA5{background-color:#F7F8FE;} + .d2-3720214040 .background-color-AB4{background-color:#EDF0FD;} + .d2-3720214040 .background-color-AB5{background-color:#F7F8FE;} + .d2-3720214040 .color-N1{color:#0A0F25;} + .d2-3720214040 .color-N2{color:#676C7E;} + .d2-3720214040 .color-N3{color:#9499AB;} + .d2-3720214040 .color-N4{color:#CFD2DD;} + .d2-3720214040 .color-N5{color:#DEE1EB;} + .d2-3720214040 .color-N6{color:#EEF1F8;} + .d2-3720214040 .color-N7{color:#FFFFFF;} + .d2-3720214040 .color-B1{color:#0D32B2;} + .d2-3720214040 .color-B2{color:#0D32B2;} + .d2-3720214040 .color-B3{color:#E3E9FD;} + .d2-3720214040 .color-B4{color:#E3E9FD;} + .d2-3720214040 .color-B5{color:#EDF0FD;} + .d2-3720214040 .color-B6{color:#F7F8FE;} + .d2-3720214040 .color-AA2{color:#4A6FF3;} + .d2-3720214040 .color-AA4{color:#EDF0FD;} + .d2-3720214040 .color-AA5{color:#F7F8FE;} + .d2-3720214040 .color-AB4{color:#EDF0FD;} + .d2-3720214040 .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_datapersondiamondovalcirclehexagoncloudrectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloudrectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud @@ -111,7 +111,7 @@ - + @@ -123,7 +123,7 @@ - + @@ -135,7 +135,7 @@ - + @@ -147,7 +147,7 @@ - + @@ -159,7 +159,7 @@ - + @@ -171,7 +171,7 @@ - + @@ -183,7 +183,7 @@ - + @@ -195,7 +195,7 @@ - + @@ -207,7 +207,7 @@ - + @@ -219,7 +219,7 @@ - + @@ -231,7 +231,7 @@ - + @@ -243,7 +243,7 @@ - + @@ -255,7 +255,7 @@ - + @@ -267,7 +267,7 @@ - + @@ -279,7 +279,7 @@ - + @@ -291,7 +291,7 @@ - + @@ -303,7 +303,7 @@ - + @@ -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 @@ -example +example @@ -549,7 +549,7 @@ - + @@ -562,7 +562,7 @@ -example +example @@ -574,7 +574,7 @@ - + @@ -587,7 +587,7 @@ -example +example @@ -599,7 +599,7 @@ - + @@ -612,7 +612,7 @@ -example +example @@ -624,7 +624,7 @@ - + @@ -637,7 +637,7 @@ -example +example @@ -649,7 +649,7 @@ - + @@ -662,7 +662,7 @@ -example +example @@ -674,7 +674,7 @@ - + @@ -687,7 +687,7 @@ -example +example @@ -699,7 +699,7 @@ - + @@ -712,7 +712,7 @@ -example +example @@ -724,7 +724,7 @@ - + @@ -737,7 +737,7 @@ -example +example @@ -749,7 +749,7 @@ - + @@ -762,7 +762,7 @@ -example +example @@ -774,7 +774,7 @@ - + @@ -787,7 +787,7 @@ -example +example @@ -799,7 +799,7 @@ - + @@ -812,7 +812,7 @@ -example +example @@ -824,7 +824,7 @@ - + @@ -837,7 +837,7 @@ -example +example @@ -849,7 +849,7 @@ - + @@ -862,7 +862,7 @@ -example +example @@ -874,7 +874,7 @@ - + @@ -887,7 +887,7 @@ -example +example @@ -899,7 +899,7 @@ - + @@ -912,7 +912,7 @@ -example +example @@ -924,7 +924,7 @@ - + @@ -937,7 +937,7 @@ -example +example @@ -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 5482b7844..1085c73a9 100644 --- a/e2etests/testdata/stable/all_shapes_link/elk/board.exp.json +++ b/e2etests/testdata/stable/all_shapes_link/elk/board.exp.json @@ -2571,7 +2571,7 @@ }, { "x": 680, - "y": 251 + "y": 265 } ], "animated": false, @@ -2646,7 +2646,7 @@ "y": 109 }, { - "x": 859, + "x": 858, "y": 254 } ], @@ -2684,7 +2684,7 @@ "y": 320 }, { - "x": 859, + "x": 858, "y": 420 } ], @@ -2989,7 +2989,7 @@ }, { "x": 680, - "y": 897 + "y": 911 } ], "animated": false, @@ -3064,7 +3064,7 @@ "y": 755 }, { - "x": 859, + "x": 858, "y": 900 } ], @@ -3102,7 +3102,7 @@ "y": 966 }, { - "x": 859, + "x": 858, "y": 1066 } ], @@ -3407,7 +3407,7 @@ }, { "x": 640, - "y": 1559 + "y": 1573 } ], "animated": false, @@ -3444,7 +3444,7 @@ "y": 1632 }, { - "x": 639, + "x": 640, "y": 1744 } ], 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 ae8524149..5a3182b68 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_datapersondiamondovalcirclehexagoncloudrectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloudrectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud + .d2-2197716131 .fill-N1{fill:#0A0F25;} + .d2-2197716131 .fill-N2{fill:#676C7E;} + .d2-2197716131 .fill-N3{fill:#9499AB;} + .d2-2197716131 .fill-N4{fill:#CFD2DD;} + .d2-2197716131 .fill-N5{fill:#DEE1EB;} + .d2-2197716131 .fill-N6{fill:#EEF1F8;} + .d2-2197716131 .fill-N7{fill:#FFFFFF;} + .d2-2197716131 .fill-B1{fill:#0D32B2;} + .d2-2197716131 .fill-B2{fill:#0D32B2;} + .d2-2197716131 .fill-B3{fill:#E3E9FD;} + .d2-2197716131 .fill-B4{fill:#E3E9FD;} + .d2-2197716131 .fill-B5{fill:#EDF0FD;} + .d2-2197716131 .fill-B6{fill:#F7F8FE;} + .d2-2197716131 .fill-AA2{fill:#4A6FF3;} + .d2-2197716131 .fill-AA4{fill:#EDF0FD;} + .d2-2197716131 .fill-AA5{fill:#F7F8FE;} + .d2-2197716131 .fill-AB4{fill:#EDF0FD;} + .d2-2197716131 .fill-AB5{fill:#F7F8FE;} + .d2-2197716131 .stroke-N1{stroke:#0A0F25;} + .d2-2197716131 .stroke-N2{stroke:#676C7E;} + .d2-2197716131 .stroke-N3{stroke:#9499AB;} + .d2-2197716131 .stroke-N4{stroke:#CFD2DD;} + .d2-2197716131 .stroke-N5{stroke:#DEE1EB;} + .d2-2197716131 .stroke-N6{stroke:#EEF1F8;} + .d2-2197716131 .stroke-N7{stroke:#FFFFFF;} + .d2-2197716131 .stroke-B1{stroke:#0D32B2;} + .d2-2197716131 .stroke-B2{stroke:#0D32B2;} + .d2-2197716131 .stroke-B3{stroke:#E3E9FD;} + .d2-2197716131 .stroke-B4{stroke:#E3E9FD;} + .d2-2197716131 .stroke-B5{stroke:#EDF0FD;} + .d2-2197716131 .stroke-B6{stroke:#F7F8FE;} + .d2-2197716131 .stroke-AA2{stroke:#4A6FF3;} + .d2-2197716131 .stroke-AA4{stroke:#EDF0FD;} + .d2-2197716131 .stroke-AA5{stroke:#F7F8FE;} + .d2-2197716131 .stroke-AB4{stroke:#EDF0FD;} + .d2-2197716131 .stroke-AB5{stroke:#F7F8FE;} + .d2-2197716131 .background-color-N1{background-color:#0A0F25;} + .d2-2197716131 .background-color-N2{background-color:#676C7E;} + .d2-2197716131 .background-color-N3{background-color:#9499AB;} + .d2-2197716131 .background-color-N4{background-color:#CFD2DD;} + .d2-2197716131 .background-color-N5{background-color:#DEE1EB;} + .d2-2197716131 .background-color-N6{background-color:#EEF1F8;} + .d2-2197716131 .background-color-N7{background-color:#FFFFFF;} + .d2-2197716131 .background-color-B1{background-color:#0D32B2;} + .d2-2197716131 .background-color-B2{background-color:#0D32B2;} + .d2-2197716131 .background-color-B3{background-color:#E3E9FD;} + .d2-2197716131 .background-color-B4{background-color:#E3E9FD;} + .d2-2197716131 .background-color-B5{background-color:#EDF0FD;} + .d2-2197716131 .background-color-B6{background-color:#F7F8FE;} + .d2-2197716131 .background-color-AA2{background-color:#4A6FF3;} + .d2-2197716131 .background-color-AA4{background-color:#EDF0FD;} + .d2-2197716131 .background-color-AA5{background-color:#F7F8FE;} + .d2-2197716131 .background-color-AB4{background-color:#EDF0FD;} + .d2-2197716131 .background-color-AB5{background-color:#F7F8FE;} + .d2-2197716131 .color-N1{color:#0A0F25;} + .d2-2197716131 .color-N2{color:#676C7E;} + .d2-2197716131 .color-N3{color:#9499AB;} + .d2-2197716131 .color-N4{color:#CFD2DD;} + .d2-2197716131 .color-N5{color:#DEE1EB;} + .d2-2197716131 .color-N6{color:#EEF1F8;} + .d2-2197716131 .color-N7{color:#FFFFFF;} + .d2-2197716131 .color-B1{color:#0D32B2;} + .d2-2197716131 .color-B2{color:#0D32B2;} + .d2-2197716131 .color-B3{color:#E3E9FD;} + .d2-2197716131 .color-B4{color:#E3E9FD;} + .d2-2197716131 .color-B5{color:#EDF0FD;} + .d2-2197716131 .color-B6{color:#F7F8FE;} + .d2-2197716131 .color-AA2{color:#4A6FF3;} + .d2-2197716131 .color-AA4{color:#EDF0FD;} + .d2-2197716131 .color-AA5{color:#F7F8FE;} + .d2-2197716131 .color-AB4{color:#EDF0FD;} + .d2-2197716131 .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_datapersondiamondovalcirclehexagoncloudrectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloudrectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud @@ -949,7 +949,7 @@ - + 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 2a9dfa653..d36e36dcb 100644 --- a/e2etests/testdata/stable/all_shapes_multiple/dagre/board.exp.json +++ b/e2etests/testdata/stable/all_shapes_multiple/dagre/board.exp.json @@ -8,7 +8,7 @@ "type": "rectangle", "pos": { "x": 0, - "y": 23 + "y": 13 }, "width": 111, "height": 66, @@ -49,7 +49,7 @@ "type": "rectangle", "pos": { "x": 9, - "y": 212 + "y": 192 }, "width": 94, "height": 94, @@ -90,7 +90,7 @@ "type": "page", "pos": { "x": 16, - "y": 432 + "y": 402 }, "width": 79, "height": 87, @@ -131,7 +131,7 @@ "type": "parallelogram", "pos": { "x": 181, - "y": 23 + "y": 13 }, "width": 196, "height": 66, @@ -172,7 +172,7 @@ "type": "document", "pos": { "x": 221, - "y": 221 + "y": 201 }, "width": 117, "height": 76, @@ -213,7 +213,7 @@ "type": "cylinder", "pos": { "x": 227, - "y": 416 + "y": 386 }, "width": 104, "height": 118, @@ -253,8 +253,8 @@ "id": "queue", "type": "queue", "pos": { - "x": 447, - "y": 23 + "x": 437, + "y": 13 }, "width": 141, "height": 66, @@ -294,8 +294,8 @@ "id": "package", "type": "package", "pos": { - "x": 466, - "y": 223 + "x": 456, + "y": 203 }, "width": 103, "height": 73, @@ -335,8 +335,8 @@ "id": "step", "type": "step", "pos": { - "x": 460, - "y": 425 + "x": 450, + "y": 395 }, "width": 116, "height": 101, @@ -376,8 +376,8 @@ "id": "callout", "type": "callout", "pos": { - "x": 667, - "y": 11 + "x": 657, + "y": 1 }, "width": 95, "height": 91, @@ -417,8 +417,8 @@ "id": "stored_data", "type": "stored_data", "pos": { - "x": 639, - "y": 226 + "x": 629, + "y": 206 }, "width": 151, "height": 66, @@ -458,8 +458,8 @@ "id": "person", "type": "person", "pos": { - "x": 683, - "y": 429 + "x": 673, + "y": 412 }, "width": 63, "height": 66, @@ -499,8 +499,8 @@ "id": "diamond", "type": "diamond", "pos": { - "x": 832, - "y": 10 + "x": 812, + "y": 0 }, "width": 156, "height": 92, @@ -540,8 +540,8 @@ "id": "oval", "type": "oval", "pos": { - "x": 862, - "y": 224 + "x": 842, + "y": 204 }, "width": 97, "height": 70, @@ -581,8 +581,8 @@ "id": "circle", "type": "oval", "pos": { - "x": 865, - "y": 430 + "x": 845, + "y": 400 }, "width": 91, "height": 91, @@ -622,8 +622,8 @@ "id": "hexagon", "type": "hexagon", "pos": { - "x": 1058, - "y": 22 + "x": 1038, + "y": 12 }, "width": 128, "height": 69, @@ -663,8 +663,8 @@ "id": "cloud", "type": "cloud", "pos": { - "x": 1070, - "y": 217 + "x": 1050, + "y": 197 }, "width": 104, "height": 84, @@ -727,20 +727,20 @@ "labelPercentage": 0, "route": [ { - "x": 60.5, - "y": 89 + "x": 55.5, + "y": 79 }, { - "x": 60.5, - "y": 139.39999389648438 + "x": 55.5, + "y": 129.39999389648438 }, { - "x": 60.5, - "y": 162 + "x": 55.5, + "y": 150 }, { - "x": 60.5, - "y": 202 + "x": 55.5, + "y": 182 } ], "isCurve": true, @@ -774,20 +774,20 @@ "labelPercentage": 0, "route": [ { - "x": 60.5, - "y": 306 + "x": 55.5, + "y": 286 }, { - "x": 60.5, - "y": 346 + "x": 55.5, + "y": 326 }, { - "x": 60.599998474121094, - "y": 369.20001220703125 + "x": 55.599998474121094, + "y": 347.20001220703125 }, { - "x": 61, - "y": 422 + "x": 56, + "y": 392 } ], "isCurve": true, @@ -821,20 +821,20 @@ "labelPercentage": 0, "route": [ { - "x": 284, - "y": 89 + "x": 279, + "y": 79 }, { - "x": 284, - "y": 139.39999389648438 + "x": 279, + "y": 129.39999389648438 }, { - "x": 284, - "y": 163.8000030517578 + "x": 279, + "y": 151.8000030517578 }, { - "x": 284, - "y": 211 + "x": 279, + "y": 191 } ], "isCurve": true, @@ -868,20 +868,20 @@ "labelPercentage": 0, "route": [ { - "x": 284, - "y": 283 + "x": 279, + "y": 267 }, { - "x": 284, - "y": 341.3999938964844 + "x": 279, + "y": 322.20001220703125 }, { - "x": 284, - "y": 366 + "x": 279, + "y": 344 }, { - "x": 284, - "y": 406 + "x": 279, + "y": 376 } ], "isCurve": true, @@ -915,20 +915,20 @@ "labelPercentage": 0, "route": [ { - "x": 522, - "y": 89 + "x": 507, + "y": 79 }, { - "x": 522.4000244140625, - "y": 139.39999389648438 + "x": 507.3999938964844, + "y": 129.39999389648438 }, { - "x": 522.5999755859375, - "y": 164.1999969482422 + "x": 507.6000061035156, + "y": 152.1999969482422 }, { - "x": 523, - "y": 213 + "x": 508, + "y": 193 } ], "isCurve": true, @@ -962,20 +962,20 @@ "labelPercentage": 0, "route": [ { - "x": 522, - "y": 296 + "x": 507, + "y": 276 }, { - "x": 522.4000244140625, - "y": 344 + "x": 507.3999938964844, + "y": 324 }, { - "x": 522.5999755859375, - "y": 367.79998779296875 + "x": 507.6000061035156, + "y": 345.79998779296875 }, { - "x": 523, - "y": 415 + "x": 508, + "y": 385 } ], "isCurve": true, @@ -1009,20 +1009,20 @@ "labelPercentage": 0, "route": [ { - "x": 720, - "y": 95 + "x": 705, + "y": 47 }, { - "x": 719.5999755859375, - "y": 140.60000610351562 + "x": 704.5999755859375, + "y": 123 }, { - "x": 719.5999755859375, - "y": 164.8000030517578 + "x": 704.5999755859375, + "y": 152.8000030517578 }, { - "x": 720, - "y": 216 + "x": 705, + "y": 196 } ], "isCurve": true, @@ -1056,20 +1056,20 @@ "labelPercentage": 0, "route": [ { - "x": 719, - "y": 292 + "x": 704, + "y": 272 }, { - "x": 719.4000244140625, - "y": 343.20001220703125 + "x": 704.4000244140625, + "y": 323.20001220703125 }, { - "x": 719.5999755859375, - "y": 368.6000061035156 + "x": 704.5999755859375, + "y": 349.6000061035156 }, { - "x": 720, - "y": 419 + "x": 705, + "y": 404 } ], "isCurve": true, @@ -1103,20 +1103,20 @@ "labelPercentage": 0, "route": [ { - "x": 915, - "y": 100 + "x": 890, + "y": 92 }, { - "x": 915, - "y": 141.60000610351562 + "x": 890, + "y": 132 }, { - "x": 915, - "y": 164.39999389648438 + "x": 890, + "y": 152.60000610351562 }, { - "x": 915, - "y": 214 + "x": 890, + "y": 195 } ], "isCurve": true, @@ -1150,20 +1150,20 @@ "labelPercentage": 0, "route": [ { - "x": 915, - "y": 294 + "x": 890, + "y": 274 }, { - "x": 915, - "y": 343.6000061035156 + "x": 890, + "y": 323.6000061035156 }, { - "x": 915, - "y": 368.79998779296875 + "x": 890, + "y": 347 }, { - "x": 915, - "y": 420 + "x": 890, + "y": 391 } ], "isCurve": true, @@ -1197,20 +1197,20 @@ "labelPercentage": 0, "route": [ { - "x": 1127, - "y": 91 + "x": 1102, + "y": 81 }, { - "x": 1127, - "y": 139.8000030517578 + "x": 1102, + "y": 129.8000030517578 }, { - "x": 1127, - "y": 163.8000030517578 + "x": 1102, + "y": 152.60000610351562 }, { - "x": 1127, - "y": 211 + "x": 1102, + "y": 195 } ], "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 766cb4a0d..310e68bc2 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-3711942085 .fill-N1{fill:#0A0F25;} + .d2-3711942085 .fill-N2{fill:#676C7E;} + .d2-3711942085 .fill-N3{fill:#9499AB;} + .d2-3711942085 .fill-N4{fill:#CFD2DD;} + .d2-3711942085 .fill-N5{fill:#DEE1EB;} + .d2-3711942085 .fill-N6{fill:#EEF1F8;} + .d2-3711942085 .fill-N7{fill:#FFFFFF;} + .d2-3711942085 .fill-B1{fill:#0D32B2;} + .d2-3711942085 .fill-B2{fill:#0D32B2;} + .d2-3711942085 .fill-B3{fill:#E3E9FD;} + .d2-3711942085 .fill-B4{fill:#E3E9FD;} + .d2-3711942085 .fill-B5{fill:#EDF0FD;} + .d2-3711942085 .fill-B6{fill:#F7F8FE;} + .d2-3711942085 .fill-AA2{fill:#4A6FF3;} + .d2-3711942085 .fill-AA4{fill:#EDF0FD;} + .d2-3711942085 .fill-AA5{fill:#F7F8FE;} + .d2-3711942085 .fill-AB4{fill:#EDF0FD;} + .d2-3711942085 .fill-AB5{fill:#F7F8FE;} + .d2-3711942085 .stroke-N1{stroke:#0A0F25;} + .d2-3711942085 .stroke-N2{stroke:#676C7E;} + .d2-3711942085 .stroke-N3{stroke:#9499AB;} + .d2-3711942085 .stroke-N4{stroke:#CFD2DD;} + .d2-3711942085 .stroke-N5{stroke:#DEE1EB;} + .d2-3711942085 .stroke-N6{stroke:#EEF1F8;} + .d2-3711942085 .stroke-N7{stroke:#FFFFFF;} + .d2-3711942085 .stroke-B1{stroke:#0D32B2;} + .d2-3711942085 .stroke-B2{stroke:#0D32B2;} + .d2-3711942085 .stroke-B3{stroke:#E3E9FD;} + .d2-3711942085 .stroke-B4{stroke:#E3E9FD;} + .d2-3711942085 .stroke-B5{stroke:#EDF0FD;} + .d2-3711942085 .stroke-B6{stroke:#F7F8FE;} + .d2-3711942085 .stroke-AA2{stroke:#4A6FF3;} + .d2-3711942085 .stroke-AA4{stroke:#EDF0FD;} + .d2-3711942085 .stroke-AA5{stroke:#F7F8FE;} + .d2-3711942085 .stroke-AB4{stroke:#EDF0FD;} + .d2-3711942085 .stroke-AB5{stroke:#F7F8FE;} + .d2-3711942085 .background-color-N1{background-color:#0A0F25;} + .d2-3711942085 .background-color-N2{background-color:#676C7E;} + .d2-3711942085 .background-color-N3{background-color:#9499AB;} + .d2-3711942085 .background-color-N4{background-color:#CFD2DD;} + .d2-3711942085 .background-color-N5{background-color:#DEE1EB;} + .d2-3711942085 .background-color-N6{background-color:#EEF1F8;} + .d2-3711942085 .background-color-N7{background-color:#FFFFFF;} + .d2-3711942085 .background-color-B1{background-color:#0D32B2;} + .d2-3711942085 .background-color-B2{background-color:#0D32B2;} + .d2-3711942085 .background-color-B3{background-color:#E3E9FD;} + .d2-3711942085 .background-color-B4{background-color:#E3E9FD;} + .d2-3711942085 .background-color-B5{background-color:#EDF0FD;} + .d2-3711942085 .background-color-B6{background-color:#F7F8FE;} + .d2-3711942085 .background-color-AA2{background-color:#4A6FF3;} + .d2-3711942085 .background-color-AA4{background-color:#EDF0FD;} + .d2-3711942085 .background-color-AA5{background-color:#F7F8FE;} + .d2-3711942085 .background-color-AB4{background-color:#EDF0FD;} + .d2-3711942085 .background-color-AB5{background-color:#F7F8FE;} + .d2-3711942085 .color-N1{color:#0A0F25;} + .d2-3711942085 .color-N2{color:#676C7E;} + .d2-3711942085 .color-N3{color:#9499AB;} + .d2-3711942085 .color-N4{color:#CFD2DD;} + .d2-3711942085 .color-N5{color:#DEE1EB;} + .d2-3711942085 .color-N6{color:#EEF1F8;} + .d2-3711942085 .color-N7{color:#FFFFFF;} + .d2-3711942085 .color-B1{color:#0D32B2;} + .d2-3711942085 .color-B2{color:#0D32B2;} + .d2-3711942085 .color-B3{color:#E3E9FD;} + .d2-3711942085 .color-B4{color:#E3E9FD;} + .d2-3711942085 .color-B5{color:#EDF0FD;} + .d2-3711942085 .color-B6{color:#F7F8FE;} + .d2-3711942085 .color-AA2{color:#4A6FF3;} + .d2-3711942085 .color-AA4{color:#EDF0FD;} + .d2-3711942085 .color-AA5{color:#F7F8FE;} + .d2-3711942085 .color-AB4{color:#EDF0FD;} + .d2-3711942085 .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 + + + + + + + + + + + + + + + + + + \ No newline at end of file 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 8d0479cff..da3e013e0 100644 --- a/e2etests/testdata/stable/all_shapes_multiple/elk/board.exp.json +++ b/e2etests/testdata/stable/all_shapes_multiple/elk/board.exp.json @@ -921,7 +921,7 @@ "y": 278 }, { - "x": 454, + "x": 455, "y": 358 } ], 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 d2124ad22..5bcce435c 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-1362320649 .fill-N1{fill:#0A0F25;} + .d2-1362320649 .fill-N2{fill:#676C7E;} + .d2-1362320649 .fill-N3{fill:#9499AB;} + .d2-1362320649 .fill-N4{fill:#CFD2DD;} + .d2-1362320649 .fill-N5{fill:#DEE1EB;} + .d2-1362320649 .fill-N6{fill:#EEF1F8;} + .d2-1362320649 .fill-N7{fill:#FFFFFF;} + .d2-1362320649 .fill-B1{fill:#0D32B2;} + .d2-1362320649 .fill-B2{fill:#0D32B2;} + .d2-1362320649 .fill-B3{fill:#E3E9FD;} + .d2-1362320649 .fill-B4{fill:#E3E9FD;} + .d2-1362320649 .fill-B5{fill:#EDF0FD;} + .d2-1362320649 .fill-B6{fill:#F7F8FE;} + .d2-1362320649 .fill-AA2{fill:#4A6FF3;} + .d2-1362320649 .fill-AA4{fill:#EDF0FD;} + .d2-1362320649 .fill-AA5{fill:#F7F8FE;} + .d2-1362320649 .fill-AB4{fill:#EDF0FD;} + .d2-1362320649 .fill-AB5{fill:#F7F8FE;} + .d2-1362320649 .stroke-N1{stroke:#0A0F25;} + .d2-1362320649 .stroke-N2{stroke:#676C7E;} + .d2-1362320649 .stroke-N3{stroke:#9499AB;} + .d2-1362320649 .stroke-N4{stroke:#CFD2DD;} + .d2-1362320649 .stroke-N5{stroke:#DEE1EB;} + .d2-1362320649 .stroke-N6{stroke:#EEF1F8;} + .d2-1362320649 .stroke-N7{stroke:#FFFFFF;} + .d2-1362320649 .stroke-B1{stroke:#0D32B2;} + .d2-1362320649 .stroke-B2{stroke:#0D32B2;} + .d2-1362320649 .stroke-B3{stroke:#E3E9FD;} + .d2-1362320649 .stroke-B4{stroke:#E3E9FD;} + .d2-1362320649 .stroke-B5{stroke:#EDF0FD;} + .d2-1362320649 .stroke-B6{stroke:#F7F8FE;} + .d2-1362320649 .stroke-AA2{stroke:#4A6FF3;} + .d2-1362320649 .stroke-AA4{stroke:#EDF0FD;} + .d2-1362320649 .stroke-AA5{stroke:#F7F8FE;} + .d2-1362320649 .stroke-AB4{stroke:#EDF0FD;} + .d2-1362320649 .stroke-AB5{stroke:#F7F8FE;} + .d2-1362320649 .background-color-N1{background-color:#0A0F25;} + .d2-1362320649 .background-color-N2{background-color:#676C7E;} + .d2-1362320649 .background-color-N3{background-color:#9499AB;} + .d2-1362320649 .background-color-N4{background-color:#CFD2DD;} + .d2-1362320649 .background-color-N5{background-color:#DEE1EB;} + .d2-1362320649 .background-color-N6{background-color:#EEF1F8;} + .d2-1362320649 .background-color-N7{background-color:#FFFFFF;} + .d2-1362320649 .background-color-B1{background-color:#0D32B2;} + .d2-1362320649 .background-color-B2{background-color:#0D32B2;} + .d2-1362320649 .background-color-B3{background-color:#E3E9FD;} + .d2-1362320649 .background-color-B4{background-color:#E3E9FD;} + .d2-1362320649 .background-color-B5{background-color:#EDF0FD;} + .d2-1362320649 .background-color-B6{background-color:#F7F8FE;} + .d2-1362320649 .background-color-AA2{background-color:#4A6FF3;} + .d2-1362320649 .background-color-AA4{background-color:#EDF0FD;} + .d2-1362320649 .background-color-AA5{background-color:#F7F8FE;} + .d2-1362320649 .background-color-AB4{background-color:#EDF0FD;} + .d2-1362320649 .background-color-AB5{background-color:#F7F8FE;} + .d2-1362320649 .color-N1{color:#0A0F25;} + .d2-1362320649 .color-N2{color:#676C7E;} + .d2-1362320649 .color-N3{color:#9499AB;} + .d2-1362320649 .color-N4{color:#CFD2DD;} + .d2-1362320649 .color-N5{color:#DEE1EB;} + .d2-1362320649 .color-N6{color:#EEF1F8;} + .d2-1362320649 .color-N7{color:#FFFFFF;} + .d2-1362320649 .color-B1{color:#0D32B2;} + .d2-1362320649 .color-B2{color:#0D32B2;} + .d2-1362320649 .color-B3{color:#E3E9FD;} + .d2-1362320649 .color-B4{color:#E3E9FD;} + .d2-1362320649 .color-B5{color:#EDF0FD;} + .d2-1362320649 .color-B6{color:#F7F8FE;} + .d2-1362320649 .color-AA2{color:#4A6FF3;} + .d2-1362320649 .color-AA4{color:#EDF0FD;} + .d2-1362320649 .color-AA5{color:#F7F8FE;} + .d2-1362320649 .color-AB4{color:#EDF0FD;} + .d2-1362320649 .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_shadow/dagre/board.exp.json b/e2etests/testdata/stable/all_shapes_shadow/dagre/board.exp.json index 2ebf32b0d..df40e65bd 100644 --- a/e2etests/testdata/stable/all_shapes_shadow/dagre/board.exp.json +++ b/e2etests/testdata/stable/all_shapes_shadow/dagre/board.exp.json @@ -459,7 +459,7 @@ "type": "person", "pos": { "x": 653, - "y": 399 + "y": 412 }, "width": 63, "height": 66, @@ -1065,11 +1065,11 @@ }, { "x": 684.5999755859375, - "y": 348.6000061035156 + "y": 351.20001220703125 }, { "x": 685, - "y": 399 + "y": 412 } ], "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 4904853c2..c48a01919 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-3724172000 .fill-N1{fill:#0A0F25;} + .d2-3724172000 .fill-N2{fill:#676C7E;} + .d2-3724172000 .fill-N3{fill:#9499AB;} + .d2-3724172000 .fill-N4{fill:#CFD2DD;} + .d2-3724172000 .fill-N5{fill:#DEE1EB;} + .d2-3724172000 .fill-N6{fill:#EEF1F8;} + .d2-3724172000 .fill-N7{fill:#FFFFFF;} + .d2-3724172000 .fill-B1{fill:#0D32B2;} + .d2-3724172000 .fill-B2{fill:#0D32B2;} + .d2-3724172000 .fill-B3{fill:#E3E9FD;} + .d2-3724172000 .fill-B4{fill:#E3E9FD;} + .d2-3724172000 .fill-B5{fill:#EDF0FD;} + .d2-3724172000 .fill-B6{fill:#F7F8FE;} + .d2-3724172000 .fill-AA2{fill:#4A6FF3;} + .d2-3724172000 .fill-AA4{fill:#EDF0FD;} + .d2-3724172000 .fill-AA5{fill:#F7F8FE;} + .d2-3724172000 .fill-AB4{fill:#EDF0FD;} + .d2-3724172000 .fill-AB5{fill:#F7F8FE;} + .d2-3724172000 .stroke-N1{stroke:#0A0F25;} + .d2-3724172000 .stroke-N2{stroke:#676C7E;} + .d2-3724172000 .stroke-N3{stroke:#9499AB;} + .d2-3724172000 .stroke-N4{stroke:#CFD2DD;} + .d2-3724172000 .stroke-N5{stroke:#DEE1EB;} + .d2-3724172000 .stroke-N6{stroke:#EEF1F8;} + .d2-3724172000 .stroke-N7{stroke:#FFFFFF;} + .d2-3724172000 .stroke-B1{stroke:#0D32B2;} + .d2-3724172000 .stroke-B2{stroke:#0D32B2;} + .d2-3724172000 .stroke-B3{stroke:#E3E9FD;} + .d2-3724172000 .stroke-B4{stroke:#E3E9FD;} + .d2-3724172000 .stroke-B5{stroke:#EDF0FD;} + .d2-3724172000 .stroke-B6{stroke:#F7F8FE;} + .d2-3724172000 .stroke-AA2{stroke:#4A6FF3;} + .d2-3724172000 .stroke-AA4{stroke:#EDF0FD;} + .d2-3724172000 .stroke-AA5{stroke:#F7F8FE;} + .d2-3724172000 .stroke-AB4{stroke:#EDF0FD;} + .d2-3724172000 .stroke-AB5{stroke:#F7F8FE;} + .d2-3724172000 .background-color-N1{background-color:#0A0F25;} + .d2-3724172000 .background-color-N2{background-color:#676C7E;} + .d2-3724172000 .background-color-N3{background-color:#9499AB;} + .d2-3724172000 .background-color-N4{background-color:#CFD2DD;} + .d2-3724172000 .background-color-N5{background-color:#DEE1EB;} + .d2-3724172000 .background-color-N6{background-color:#EEF1F8;} + .d2-3724172000 .background-color-N7{background-color:#FFFFFF;} + .d2-3724172000 .background-color-B1{background-color:#0D32B2;} + .d2-3724172000 .background-color-B2{background-color:#0D32B2;} + .d2-3724172000 .background-color-B3{background-color:#E3E9FD;} + .d2-3724172000 .background-color-B4{background-color:#E3E9FD;} + .d2-3724172000 .background-color-B5{background-color:#EDF0FD;} + .d2-3724172000 .background-color-B6{background-color:#F7F8FE;} + .d2-3724172000 .background-color-AA2{background-color:#4A6FF3;} + .d2-3724172000 .background-color-AA4{background-color:#EDF0FD;} + .d2-3724172000 .background-color-AA5{background-color:#F7F8FE;} + .d2-3724172000 .background-color-AB4{background-color:#EDF0FD;} + .d2-3724172000 .background-color-AB5{background-color:#F7F8FE;} + .d2-3724172000 .color-N1{color:#0A0F25;} + .d2-3724172000 .color-N2{color:#676C7E;} + .d2-3724172000 .color-N3{color:#9499AB;} + .d2-3724172000 .color-N4{color:#CFD2DD;} + .d2-3724172000 .color-N5{color:#DEE1EB;} + .d2-3724172000 .color-N6{color:#EEF1F8;} + .d2-3724172000 .color-N7{color:#FFFFFF;} + .d2-3724172000 .color-B1{color:#0D32B2;} + .d2-3724172000 .color-B2{color:#0D32B2;} + .d2-3724172000 .color-B3{color:#E3E9FD;} + .d2-3724172000 .color-B4{color:#E3E9FD;} + .d2-3724172000 .color-B5{color:#EDF0FD;} + .d2-3724172000 .color-B6{color:#F7F8FE;} + .d2-3724172000 .color-AA2{color:#4A6FF3;} + .d2-3724172000 .color-AA4{color:#EDF0FD;} + .d2-3724172000 .color-AA5{color:#F7F8FE;} + .d2-3724172000 .color-AB4{color:#EDF0FD;} + .d2-3724172000 .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 @@ -110,7 +110,7 @@ - + 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 a803707f8..b1404b802 100644 --- a/e2etests/testdata/stable/all_shapes_shadow/elk/board.exp.json +++ b/e2etests/testdata/stable/all_shapes_shadow/elk/board.exp.json @@ -921,7 +921,7 @@ "y": 258 }, { - "x": 429, + "x": 430, "y": 338 } ], @@ -959,7 +959,7 @@ "y": 59 }, { - "x": 577, + "x": 576, "y": 188 } ], 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 98d73c2a9..2e0c91694 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-3775577395 .fill-N1{fill:#0A0F25;} + .d2-3775577395 .fill-N2{fill:#676C7E;} + .d2-3775577395 .fill-N3{fill:#9499AB;} + .d2-3775577395 .fill-N4{fill:#CFD2DD;} + .d2-3775577395 .fill-N5{fill:#DEE1EB;} + .d2-3775577395 .fill-N6{fill:#EEF1F8;} + .d2-3775577395 .fill-N7{fill:#FFFFFF;} + .d2-3775577395 .fill-B1{fill:#0D32B2;} + .d2-3775577395 .fill-B2{fill:#0D32B2;} + .d2-3775577395 .fill-B3{fill:#E3E9FD;} + .d2-3775577395 .fill-B4{fill:#E3E9FD;} + .d2-3775577395 .fill-B5{fill:#EDF0FD;} + .d2-3775577395 .fill-B6{fill:#F7F8FE;} + .d2-3775577395 .fill-AA2{fill:#4A6FF3;} + .d2-3775577395 .fill-AA4{fill:#EDF0FD;} + .d2-3775577395 .fill-AA5{fill:#F7F8FE;} + .d2-3775577395 .fill-AB4{fill:#EDF0FD;} + .d2-3775577395 .fill-AB5{fill:#F7F8FE;} + .d2-3775577395 .stroke-N1{stroke:#0A0F25;} + .d2-3775577395 .stroke-N2{stroke:#676C7E;} + .d2-3775577395 .stroke-N3{stroke:#9499AB;} + .d2-3775577395 .stroke-N4{stroke:#CFD2DD;} + .d2-3775577395 .stroke-N5{stroke:#DEE1EB;} + .d2-3775577395 .stroke-N6{stroke:#EEF1F8;} + .d2-3775577395 .stroke-N7{stroke:#FFFFFF;} + .d2-3775577395 .stroke-B1{stroke:#0D32B2;} + .d2-3775577395 .stroke-B2{stroke:#0D32B2;} + .d2-3775577395 .stroke-B3{stroke:#E3E9FD;} + .d2-3775577395 .stroke-B4{stroke:#E3E9FD;} + .d2-3775577395 .stroke-B5{stroke:#EDF0FD;} + .d2-3775577395 .stroke-B6{stroke:#F7F8FE;} + .d2-3775577395 .stroke-AA2{stroke:#4A6FF3;} + .d2-3775577395 .stroke-AA4{stroke:#EDF0FD;} + .d2-3775577395 .stroke-AA5{stroke:#F7F8FE;} + .d2-3775577395 .stroke-AB4{stroke:#EDF0FD;} + .d2-3775577395 .stroke-AB5{stroke:#F7F8FE;} + .d2-3775577395 .background-color-N1{background-color:#0A0F25;} + .d2-3775577395 .background-color-N2{background-color:#676C7E;} + .d2-3775577395 .background-color-N3{background-color:#9499AB;} + .d2-3775577395 .background-color-N4{background-color:#CFD2DD;} + .d2-3775577395 .background-color-N5{background-color:#DEE1EB;} + .d2-3775577395 .background-color-N6{background-color:#EEF1F8;} + .d2-3775577395 .background-color-N7{background-color:#FFFFFF;} + .d2-3775577395 .background-color-B1{background-color:#0D32B2;} + .d2-3775577395 .background-color-B2{background-color:#0D32B2;} + .d2-3775577395 .background-color-B3{background-color:#E3E9FD;} + .d2-3775577395 .background-color-B4{background-color:#E3E9FD;} + .d2-3775577395 .background-color-B5{background-color:#EDF0FD;} + .d2-3775577395 .background-color-B6{background-color:#F7F8FE;} + .d2-3775577395 .background-color-AA2{background-color:#4A6FF3;} + .d2-3775577395 .background-color-AA4{background-color:#EDF0FD;} + .d2-3775577395 .background-color-AA5{background-color:#F7F8FE;} + .d2-3775577395 .background-color-AB4{background-color:#EDF0FD;} + .d2-3775577395 .background-color-AB5{background-color:#F7F8FE;} + .d2-3775577395 .color-N1{color:#0A0F25;} + .d2-3775577395 .color-N2{color:#676C7E;} + .d2-3775577395 .color-N3{color:#9499AB;} + .d2-3775577395 .color-N4{color:#CFD2DD;} + .d2-3775577395 .color-N5{color:#DEE1EB;} + .d2-3775577395 .color-N6{color:#EEF1F8;} + .d2-3775577395 .color-N7{color:#FFFFFF;} + .d2-3775577395 .color-B1{color:#0D32B2;} + .d2-3775577395 .color-B2{color:#0D32B2;} + .d2-3775577395 .color-B3{color:#E3E9FD;} + .d2-3775577395 .color-B4{color:#E3E9FD;} + .d2-3775577395 .color-B5{color:#EDF0FD;} + .d2-3775577395 .color-B6{color:#F7F8FE;} + .d2-3775577395 .color-AA2{color:#4A6FF3;} + .d2-3775577395 .color-AA4{color:#EDF0FD;} + .d2-3775577395 .color-AA5{color:#F7F8FE;} + .d2-3775577395 .color-AB4{color:#EDF0FD;} + .d2-3775577395 .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/animated/dagre/board.exp.json b/e2etests/testdata/stable/animated/dagre/board.exp.json index 808ce1b9c..7ef09c9b6 100644 --- a/e2etests/testdata/stable/animated/dagre/board.exp.json +++ b/e2etests/testdata/stable/animated/dagre/board.exp.json @@ -563,12 +563,12 @@ "labelPercentage": 0, "route": [ { - "x": 94.322998046875, - "y": 66 + "x": 94.5, + "y": 65.5 }, { - "x": 54.4640007019043, - "y": 114.4000015258789 + "x": 54.5, + "y": 114.30000305175781 }, { "x": 44.5, @@ -610,12 +610,12 @@ "labelPercentage": 0, "route": [ { - "x": 154.14700317382812, - "y": 66 + "x": 154, + "y": 65.5 }, { - "x": 202.0290069580078, - "y": 114.4000015258789 + "x": 202, + "y": 114.30000305175781 }, { "x": 214, @@ -658,11 +658,11 @@ "route": [ { "x": 405.25, - "y": 187 + "y": 187.5 }, { "x": 405.25, - "y": 138.60000610351562 + "y": 138.6999969482422 }, { "x": 405.25, @@ -705,11 +705,11 @@ "route": [ { "x": 575.75, - "y": 66 + "y": 65.5 }, { "x": 575.75, - "y": 114.4000015258789 + "y": 114.30000305175781 }, { "x": 575.75, @@ -751,12 +751,12 @@ "labelPercentage": 0, "route": [ { - "x": 828.5, - "y": 66 + "x": 828.25, + "y": 65.5 }, { - "x": 751.5, - "y": 114.4000015258789 + "x": 751.4500122070312, + "y": 114.30000305175781 }, { "x": 732.25, @@ -798,12 +798,12 @@ "labelPercentage": 0, "route": [ { - "x": 879.5, - "y": 66 + "x": 879.75, + "y": 65.5 }, { - "x": 877.2999877929688, - "y": 114.4000015258789 + "x": 877.3499755859375, + "y": 114.30000305175781 }, { "x": 876.75, @@ -845,12 +845,12 @@ "labelPercentage": 0, "route": [ { - "x": 931.5579833984375, - "y": 66 + "x": 931.25, + "y": 65.5 }, { - "x": 1005.7109985351562, - "y": 114.4000015258789 + "x": 1005.6500244140625, + "y": 114.30000305175781 }, { "x": 1024.25, @@ -893,11 +893,11 @@ "route": [ { "x": 1175.5, - "y": 66 + "y": 65.5 }, { "x": 1175.5, - "y": 114.4000015258789 + "y": 114.30000305175781 }, { "x": 1175.5, diff --git a/e2etests/testdata/stable/animated/dagre/sketch.exp.svg b/e2etests/testdata/stable/animated/dagre/sketch.exp.svg index 7649abeaa..485c905ab 100644 --- a/e2etests/testdata/stable/animated/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/animated/dagre/sketch.exp.svg @@ -1,22 +1,22 @@ -your love life will behappyharmoniousboredomimmortalityFridayMondayInsomniaSleepWakeDreamListenTalk hear + .d2-3123507233 .fill-N1{fill:#0A0F25;} + .d2-3123507233 .fill-N2{fill:#676C7E;} + .d2-3123507233 .fill-N3{fill:#9499AB;} + .d2-3123507233 .fill-N4{fill:#CFD2DD;} + .d2-3123507233 .fill-N5{fill:#DEE1EB;} + .d2-3123507233 .fill-N6{fill:#EEF1F8;} + .d2-3123507233 .fill-N7{fill:#FFFFFF;} + .d2-3123507233 .fill-B1{fill:#0D32B2;} + .d2-3123507233 .fill-B2{fill:#0D32B2;} + .d2-3123507233 .fill-B3{fill:#E3E9FD;} + .d2-3123507233 .fill-B4{fill:#E3E9FD;} + .d2-3123507233 .fill-B5{fill:#EDF0FD;} + .d2-3123507233 .fill-B6{fill:#F7F8FE;} + .d2-3123507233 .fill-AA2{fill:#4A6FF3;} + .d2-3123507233 .fill-AA4{fill:#EDF0FD;} + .d2-3123507233 .fill-AA5{fill:#F7F8FE;} + .d2-3123507233 .fill-AB4{fill:#EDF0FD;} + .d2-3123507233 .fill-AB5{fill:#F7F8FE;} + .d2-3123507233 .stroke-N1{stroke:#0A0F25;} + .d2-3123507233 .stroke-N2{stroke:#676C7E;} + .d2-3123507233 .stroke-N3{stroke:#9499AB;} + .d2-3123507233 .stroke-N4{stroke:#CFD2DD;} + .d2-3123507233 .stroke-N5{stroke:#DEE1EB;} + .d2-3123507233 .stroke-N6{stroke:#EEF1F8;} + .d2-3123507233 .stroke-N7{stroke:#FFFFFF;} + .d2-3123507233 .stroke-B1{stroke:#0D32B2;} + .d2-3123507233 .stroke-B2{stroke:#0D32B2;} + .d2-3123507233 .stroke-B3{stroke:#E3E9FD;} + .d2-3123507233 .stroke-B4{stroke:#E3E9FD;} + .d2-3123507233 .stroke-B5{stroke:#EDF0FD;} + .d2-3123507233 .stroke-B6{stroke:#F7F8FE;} + .d2-3123507233 .stroke-AA2{stroke:#4A6FF3;} + .d2-3123507233 .stroke-AA4{stroke:#EDF0FD;} + .d2-3123507233 .stroke-AA5{stroke:#F7F8FE;} + .d2-3123507233 .stroke-AB4{stroke:#EDF0FD;} + .d2-3123507233 .stroke-AB5{stroke:#F7F8FE;} + .d2-3123507233 .background-color-N1{background-color:#0A0F25;} + .d2-3123507233 .background-color-N2{background-color:#676C7E;} + .d2-3123507233 .background-color-N3{background-color:#9499AB;} + .d2-3123507233 .background-color-N4{background-color:#CFD2DD;} + .d2-3123507233 .background-color-N5{background-color:#DEE1EB;} + .d2-3123507233 .background-color-N6{background-color:#EEF1F8;} + .d2-3123507233 .background-color-N7{background-color:#FFFFFF;} + .d2-3123507233 .background-color-B1{background-color:#0D32B2;} + .d2-3123507233 .background-color-B2{background-color:#0D32B2;} + .d2-3123507233 .background-color-B3{background-color:#E3E9FD;} + .d2-3123507233 .background-color-B4{background-color:#E3E9FD;} + .d2-3123507233 .background-color-B5{background-color:#EDF0FD;} + .d2-3123507233 .background-color-B6{background-color:#F7F8FE;} + .d2-3123507233 .background-color-AA2{background-color:#4A6FF3;} + .d2-3123507233 .background-color-AA4{background-color:#EDF0FD;} + .d2-3123507233 .background-color-AA5{background-color:#F7F8FE;} + .d2-3123507233 .background-color-AB4{background-color:#EDF0FD;} + .d2-3123507233 .background-color-AB5{background-color:#F7F8FE;} + .d2-3123507233 .color-N1{color:#0A0F25;} + .d2-3123507233 .color-N2{color:#676C7E;} + .d2-3123507233 .color-N3{color:#9499AB;} + .d2-3123507233 .color-N4{color:#CFD2DD;} + .d2-3123507233 .color-N5{color:#DEE1EB;} + .d2-3123507233 .color-N6{color:#EEF1F8;} + .d2-3123507233 .color-N7{color:#FFFFFF;} + .d2-3123507233 .color-B1{color:#0D32B2;} + .d2-3123507233 .color-B2{color:#0D32B2;} + .d2-3123507233 .color-B3{color:#E3E9FD;} + .d2-3123507233 .color-B4{color:#E3E9FD;} + .d2-3123507233 .color-B5{color:#EDF0FD;} + .d2-3123507233 .color-B6{color:#F7F8FE;} + .d2-3123507233 .color-AA2{color:#4A6FF3;} + .d2-3123507233 .color-AA4{color:#EDF0FD;} + .d2-3123507233 .color-AA5{color:#F7F8FE;} + .d2-3123507233 .color-AB4{color:#EDF0FD;} + .d2-3123507233 .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}]]>your love life will behappyharmoniousboredomimmortalityFridayMondayInsomniaSleepWakeDreamListenTalk hear diff --git a/e2etests/testdata/stable/arrowhead_labels/dagre/board.exp.json b/e2etests/testdata/stable/arrowhead_labels/dagre/board.exp.json index 86ecae421..3311c9b1e 100644 --- a/e2etests/testdata/stable/arrowhead_labels/dagre/board.exp.json +++ b/e2etests/testdata/stable/arrowhead_labels/dagre/board.exp.json @@ -137,11 +137,11 @@ "route": [ { "x": 100.5, - "y": 66 + "y": 65.5 }, { "x": 100.5, - "y": 114.4000015258789 + "y": 114.30000305175781 }, { "x": 100.5, diff --git a/e2etests/testdata/stable/arrowhead_labels/dagre/sketch.exp.svg b/e2etests/testdata/stable/arrowhead_labels/dagre/sketch.exp.svg index 73478444e..284e9a38f 100644 --- a/e2etests/testdata/stable/arrowhead_labels/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/arrowhead_labels/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -ab To err is human, to moo bovine1* + .d2-634513937 .fill-N1{fill:#0A0F25;} + .d2-634513937 .fill-N2{fill:#676C7E;} + .d2-634513937 .fill-N3{fill:#9499AB;} + .d2-634513937 .fill-N4{fill:#CFD2DD;} + .d2-634513937 .fill-N5{fill:#DEE1EB;} + .d2-634513937 .fill-N6{fill:#EEF1F8;} + .d2-634513937 .fill-N7{fill:#FFFFFF;} + .d2-634513937 .fill-B1{fill:#0D32B2;} + .d2-634513937 .fill-B2{fill:#0D32B2;} + .d2-634513937 .fill-B3{fill:#E3E9FD;} + .d2-634513937 .fill-B4{fill:#E3E9FD;} + .d2-634513937 .fill-B5{fill:#EDF0FD;} + .d2-634513937 .fill-B6{fill:#F7F8FE;} + .d2-634513937 .fill-AA2{fill:#4A6FF3;} + .d2-634513937 .fill-AA4{fill:#EDF0FD;} + .d2-634513937 .fill-AA5{fill:#F7F8FE;} + .d2-634513937 .fill-AB4{fill:#EDF0FD;} + .d2-634513937 .fill-AB5{fill:#F7F8FE;} + .d2-634513937 .stroke-N1{stroke:#0A0F25;} + .d2-634513937 .stroke-N2{stroke:#676C7E;} + .d2-634513937 .stroke-N3{stroke:#9499AB;} + .d2-634513937 .stroke-N4{stroke:#CFD2DD;} + .d2-634513937 .stroke-N5{stroke:#DEE1EB;} + .d2-634513937 .stroke-N6{stroke:#EEF1F8;} + .d2-634513937 .stroke-N7{stroke:#FFFFFF;} + .d2-634513937 .stroke-B1{stroke:#0D32B2;} + .d2-634513937 .stroke-B2{stroke:#0D32B2;} + .d2-634513937 .stroke-B3{stroke:#E3E9FD;} + .d2-634513937 .stroke-B4{stroke:#E3E9FD;} + .d2-634513937 .stroke-B5{stroke:#EDF0FD;} + .d2-634513937 .stroke-B6{stroke:#F7F8FE;} + .d2-634513937 .stroke-AA2{stroke:#4A6FF3;} + .d2-634513937 .stroke-AA4{stroke:#EDF0FD;} + .d2-634513937 .stroke-AA5{stroke:#F7F8FE;} + .d2-634513937 .stroke-AB4{stroke:#EDF0FD;} + .d2-634513937 .stroke-AB5{stroke:#F7F8FE;} + .d2-634513937 .background-color-N1{background-color:#0A0F25;} + .d2-634513937 .background-color-N2{background-color:#676C7E;} + .d2-634513937 .background-color-N3{background-color:#9499AB;} + .d2-634513937 .background-color-N4{background-color:#CFD2DD;} + .d2-634513937 .background-color-N5{background-color:#DEE1EB;} + .d2-634513937 .background-color-N6{background-color:#EEF1F8;} + .d2-634513937 .background-color-N7{background-color:#FFFFFF;} + .d2-634513937 .background-color-B1{background-color:#0D32B2;} + .d2-634513937 .background-color-B2{background-color:#0D32B2;} + .d2-634513937 .background-color-B3{background-color:#E3E9FD;} + .d2-634513937 .background-color-B4{background-color:#E3E9FD;} + .d2-634513937 .background-color-B5{background-color:#EDF0FD;} + .d2-634513937 .background-color-B6{background-color:#F7F8FE;} + .d2-634513937 .background-color-AA2{background-color:#4A6FF3;} + .d2-634513937 .background-color-AA4{background-color:#EDF0FD;} + .d2-634513937 .background-color-AA5{background-color:#F7F8FE;} + .d2-634513937 .background-color-AB4{background-color:#EDF0FD;} + .d2-634513937 .background-color-AB5{background-color:#F7F8FE;} + .d2-634513937 .color-N1{color:#0A0F25;} + .d2-634513937 .color-N2{color:#676C7E;} + .d2-634513937 .color-N3{color:#9499AB;} + .d2-634513937 .color-N4{color:#CFD2DD;} + .d2-634513937 .color-N5{color:#DEE1EB;} + .d2-634513937 .color-N6{color:#EEF1F8;} + .d2-634513937 .color-N7{color:#FFFFFF;} + .d2-634513937 .color-B1{color:#0D32B2;} + .d2-634513937 .color-B2{color:#0D32B2;} + .d2-634513937 .color-B3{color:#E3E9FD;} + .d2-634513937 .color-B4{color:#E3E9FD;} + .d2-634513937 .color-B5{color:#EDF0FD;} + .d2-634513937 .color-B6{color:#F7F8FE;} + .d2-634513937 .color-AA2{color:#4A6FF3;} + .d2-634513937 .color-AA4{color:#EDF0FD;} + .d2-634513937 .color-AA5{color:#F7F8FE;} + .d2-634513937 .color-AB4{color:#EDF0FD;} + .d2-634513937 .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}]]>ab To err is human, to moo bovine1* diff --git a/e2etests/testdata/stable/arrowhead_scaling/dagre/board.exp.json b/e2etests/testdata/stable/arrowhead_scaling/dagre/board.exp.json index 81469cb78..da688e287 100644 --- a/e2etests/testdata/stable/arrowhead_scaling/dagre/board.exp.json +++ b/e2etests/testdata/stable/arrowhead_scaling/dagre/board.exp.json @@ -8,10 +8,10 @@ "type": "rectangle", "pos": { "x": 0, - "y": 41 + "y": 40 }, "width": 633, - "height": 512, + "height": 473, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -48,11 +48,11 @@ "id": "default.start", "type": "rectangle", "pos": { - "x": 20, + "x": 30, "y": 70 }, - "width": 593, - "height": 166, + "width": 573, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -88,11 +88,11 @@ "id": "default.end", "type": "rectangle", "pos": { - "x": 20, + "x": 30, "y": 357 }, - "width": 593, - "height": 166, + "width": 573, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -129,7 +129,7 @@ "type": "rectangle", "pos": { "x": 60, - "y": 120 + "y": 100 }, "width": 52, "height": 66, @@ -170,7 +170,7 @@ "type": "rectangle", "pos": { "x": 60, - "y": 407 + "y": 387 }, "width": 52, "height": 66, @@ -211,7 +211,7 @@ "type": "rectangle", "pos": { "x": 172, - "y": 120 + "y": 100 }, "width": 53, "height": 66, @@ -252,7 +252,7 @@ "type": "rectangle", "pos": { "x": 172, - "y": 407 + "y": 387 }, "width": 53, "height": 66, @@ -293,7 +293,7 @@ "type": "rectangle", "pos": { "x": 285, - "y": 120 + "y": 100 }, "width": 54, "height": 66, @@ -334,7 +334,7 @@ "type": "rectangle", "pos": { "x": 285, - "y": 407 + "y": 387 }, "width": 54, "height": 66, @@ -375,7 +375,7 @@ "type": "rectangle", "pos": { "x": 399, - "y": 120 + "y": 100 }, "width": 53, "height": 66, @@ -416,7 +416,7 @@ "type": "rectangle", "pos": { "x": 399, - "y": 407 + "y": 387 }, "width": 53, "height": 66, @@ -457,7 +457,7 @@ "type": "rectangle", "pos": { "x": 512, - "y": 120 + "y": 100 }, "width": 61, "height": 66, @@ -498,7 +498,7 @@ "type": "rectangle", "pos": { "x": 512, - "y": 407 + "y": 387 }, "width": 61, "height": 66, @@ -539,10 +539,10 @@ "type": "rectangle", "pos": { "x": 653, - "y": 41 + "y": 40 }, "width": 633, - "height": 512, + "height": 473, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -579,11 +579,11 @@ "id": "line.start", "type": "rectangle", "pos": { - "x": 673, + "x": 683, "y": 70 }, - "width": 593, - "height": 166, + "width": 573, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -619,11 +619,11 @@ "id": "line.end", "type": "rectangle", "pos": { - "x": 673, + "x": 683, "y": 357 }, - "width": 593, - "height": 166, + "width": 573, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -660,7 +660,7 @@ "type": "rectangle", "pos": { "x": 713, - "y": 120 + "y": 100 }, "width": 52, "height": 66, @@ -701,7 +701,7 @@ "type": "rectangle", "pos": { "x": 713, - "y": 407 + "y": 387 }, "width": 52, "height": 66, @@ -742,7 +742,7 @@ "type": "rectangle", "pos": { "x": 825, - "y": 120 + "y": 100 }, "width": 53, "height": 66, @@ -783,7 +783,7 @@ "type": "rectangle", "pos": { "x": 825, - "y": 407 + "y": 387 }, "width": 53, "height": 66, @@ -824,7 +824,7 @@ "type": "rectangle", "pos": { "x": 938, - "y": 120 + "y": 100 }, "width": 54, "height": 66, @@ -865,7 +865,7 @@ "type": "rectangle", "pos": { "x": 938, - "y": 407 + "y": 387 }, "width": 54, "height": 66, @@ -906,7 +906,7 @@ "type": "rectangle", "pos": { "x": 1052, - "y": 120 + "y": 100 }, "width": 53, "height": 66, @@ -947,7 +947,7 @@ "type": "rectangle", "pos": { "x": 1052, - "y": 407 + "y": 387 }, "width": 53, "height": 66, @@ -988,7 +988,7 @@ "type": "rectangle", "pos": { "x": 1165, - "y": 120 + "y": 100 }, "width": 61, "height": 66, @@ -1029,7 +1029,7 @@ "type": "rectangle", "pos": { "x": 1165, - "y": 407 + "y": 387 }, "width": 61, "height": 66, @@ -1070,10 +1070,10 @@ "type": "rectangle", "pos": { "x": 1306, - "y": 41 + "y": 40 }, "width": 633, - "height": 512, + "height": 473, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1110,11 +1110,11 @@ "id": "arrow.start", "type": "rectangle", "pos": { - "x": 1326, + "x": 1336, "y": 70 }, - "width": 593, - "height": 166, + "width": 573, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1150,11 +1150,11 @@ "id": "arrow.end", "type": "rectangle", "pos": { - "x": 1326, + "x": 1336, "y": 357 }, - "width": 593, - "height": 166, + "width": 573, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1191,7 +1191,7 @@ "type": "rectangle", "pos": { "x": 1366, - "y": 120 + "y": 100 }, "width": 52, "height": 66, @@ -1232,7 +1232,7 @@ "type": "rectangle", "pos": { "x": 1366, - "y": 407 + "y": 387 }, "width": 52, "height": 66, @@ -1273,7 +1273,7 @@ "type": "rectangle", "pos": { "x": 1478, - "y": 120 + "y": 100 }, "width": 53, "height": 66, @@ -1314,7 +1314,7 @@ "type": "rectangle", "pos": { "x": 1478, - "y": 407 + "y": 387 }, "width": 53, "height": 66, @@ -1355,7 +1355,7 @@ "type": "rectangle", "pos": { "x": 1591, - "y": 120 + "y": 100 }, "width": 54, "height": 66, @@ -1396,7 +1396,7 @@ "type": "rectangle", "pos": { "x": 1591, - "y": 407 + "y": 387 }, "width": 54, "height": 66, @@ -1437,7 +1437,7 @@ "type": "rectangle", "pos": { "x": 1705, - "y": 120 + "y": 100 }, "width": 53, "height": 66, @@ -1478,7 +1478,7 @@ "type": "rectangle", "pos": { "x": 1705, - "y": 407 + "y": 387 }, "width": 53, "height": 66, @@ -1519,7 +1519,7 @@ "type": "rectangle", "pos": { "x": 1818, - "y": 120 + "y": 100 }, "width": 61, "height": 66, @@ -1560,7 +1560,7 @@ "type": "rectangle", "pos": { "x": 1818, - "y": 407 + "y": 387 }, "width": 61, "height": 66, @@ -1601,10 +1601,10 @@ "type": "rectangle", "pos": { "x": 1959, - "y": 41 + "y": 40 }, "width": 633, - "height": 512, + "height": 473, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1641,11 +1641,11 @@ "id": "diamond.start", "type": "rectangle", "pos": { - "x": 1979, + "x": 1989, "y": 70 }, - "width": 593, - "height": 166, + "width": 573, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1681,11 +1681,11 @@ "id": "diamond.end", "type": "rectangle", "pos": { - "x": 1979, + "x": 1989, "y": 357 }, - "width": 593, - "height": 166, + "width": 573, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1722,7 +1722,7 @@ "type": "rectangle", "pos": { "x": 2019, - "y": 120 + "y": 100 }, "width": 52, "height": 66, @@ -1763,7 +1763,7 @@ "type": "rectangle", "pos": { "x": 2019, - "y": 407 + "y": 387 }, "width": 52, "height": 66, @@ -1804,7 +1804,7 @@ "type": "rectangle", "pos": { "x": 2131, - "y": 120 + "y": 100 }, "width": 53, "height": 66, @@ -1845,7 +1845,7 @@ "type": "rectangle", "pos": { "x": 2131, - "y": 407 + "y": 387 }, "width": 53, "height": 66, @@ -1886,7 +1886,7 @@ "type": "rectangle", "pos": { "x": 2244, - "y": 120 + "y": 100 }, "width": 54, "height": 66, @@ -1927,7 +1927,7 @@ "type": "rectangle", "pos": { "x": 2244, - "y": 407 + "y": 387 }, "width": 54, "height": 66, @@ -1968,7 +1968,7 @@ "type": "rectangle", "pos": { "x": 2358, - "y": 120 + "y": 100 }, "width": 53, "height": 66, @@ -2009,7 +2009,7 @@ "type": "rectangle", "pos": { "x": 2358, - "y": 407 + "y": 387 }, "width": 53, "height": 66, @@ -2050,7 +2050,7 @@ "type": "rectangle", "pos": { "x": 2471, - "y": 120 + "y": 100 }, "width": 61, "height": 66, @@ -2091,7 +2091,7 @@ "type": "rectangle", "pos": { "x": 2471, - "y": 407 + "y": 387 }, "width": 61, "height": 66, @@ -2132,10 +2132,10 @@ "type": "rectangle", "pos": { "x": 2612, - "y": 41 + "y": 40 }, "width": 633, - "height": 512, + "height": 473, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -2172,11 +2172,11 @@ "id": "filled diamond.start", "type": "rectangle", "pos": { - "x": 2632, + "x": 2642, "y": 70 }, - "width": 593, - "height": 166, + "width": 573, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -2212,11 +2212,11 @@ "id": "filled diamond.end", "type": "rectangle", "pos": { - "x": 2632, + "x": 2642, "y": 357 }, - "width": 593, - "height": 166, + "width": 573, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -2253,7 +2253,7 @@ "type": "rectangle", "pos": { "x": 2672, - "y": 120 + "y": 100 }, "width": 52, "height": 66, @@ -2294,7 +2294,7 @@ "type": "rectangle", "pos": { "x": 2672, - "y": 407 + "y": 387 }, "width": 52, "height": 66, @@ -2335,7 +2335,7 @@ "type": "rectangle", "pos": { "x": 2784, - "y": 120 + "y": 100 }, "width": 53, "height": 66, @@ -2376,7 +2376,7 @@ "type": "rectangle", "pos": { "x": 2784, - "y": 407 + "y": 387 }, "width": 53, "height": 66, @@ -2417,7 +2417,7 @@ "type": "rectangle", "pos": { "x": 2897, - "y": 120 + "y": 100 }, "width": 54, "height": 66, @@ -2458,7 +2458,7 @@ "type": "rectangle", "pos": { "x": 2897, - "y": 407 + "y": 387 }, "width": 54, "height": 66, @@ -2499,7 +2499,7 @@ "type": "rectangle", "pos": { "x": 3011, - "y": 120 + "y": 100 }, "width": 53, "height": 66, @@ -2540,7 +2540,7 @@ "type": "rectangle", "pos": { "x": 3011, - "y": 407 + "y": 387 }, "width": 53, "height": 66, @@ -2581,7 +2581,7 @@ "type": "rectangle", "pos": { "x": 3124, - "y": 120 + "y": 100 }, "width": 61, "height": 66, @@ -2622,7 +2622,7 @@ "type": "rectangle", "pos": { "x": 3124, - "y": 407 + "y": 387 }, "width": 61, "height": 66, @@ -2663,10 +2663,10 @@ "type": "rectangle", "pos": { "x": 3265, - "y": 41 + "y": 40 }, "width": 633, - "height": 512, + "height": 473, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -2703,11 +2703,11 @@ "id": "circle.start", "type": "rectangle", "pos": { - "x": 3285, + "x": 3295, "y": 70 }, - "width": 593, - "height": 166, + "width": 573, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -2743,11 +2743,11 @@ "id": "circle.end", "type": "rectangle", "pos": { - "x": 3285, + "x": 3295, "y": 357 }, - "width": 593, - "height": 166, + "width": 573, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -2784,7 +2784,7 @@ "type": "rectangle", "pos": { "x": 3325, - "y": 120 + "y": 100 }, "width": 52, "height": 66, @@ -2825,7 +2825,7 @@ "type": "rectangle", "pos": { "x": 3325, - "y": 407 + "y": 387 }, "width": 52, "height": 66, @@ -2866,7 +2866,7 @@ "type": "rectangle", "pos": { "x": 3437, - "y": 120 + "y": 100 }, "width": 53, "height": 66, @@ -2907,7 +2907,7 @@ "type": "rectangle", "pos": { "x": 3437, - "y": 407 + "y": 387 }, "width": 53, "height": 66, @@ -2948,7 +2948,7 @@ "type": "rectangle", "pos": { "x": 3550, - "y": 120 + "y": 100 }, "width": 54, "height": 66, @@ -2989,7 +2989,7 @@ "type": "rectangle", "pos": { "x": 3550, - "y": 407 + "y": 387 }, "width": 54, "height": 66, @@ -3030,7 +3030,7 @@ "type": "rectangle", "pos": { "x": 3664, - "y": 120 + "y": 100 }, "width": 53, "height": 66, @@ -3071,7 +3071,7 @@ "type": "rectangle", "pos": { "x": 3664, - "y": 407 + "y": 387 }, "width": 53, "height": 66, @@ -3112,7 +3112,7 @@ "type": "rectangle", "pos": { "x": 3777, - "y": 120 + "y": 100 }, "width": 61, "height": 66, @@ -3153,7 +3153,7 @@ "type": "rectangle", "pos": { "x": 3777, - "y": 407 + "y": 387 }, "width": 61, "height": 66, @@ -3194,10 +3194,10 @@ "type": "rectangle", "pos": { "x": 3918, - "y": 41 + "y": 40 }, "width": 633, - "height": 512, + "height": 473, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -3234,11 +3234,11 @@ "id": "filled circle.start", "type": "rectangle", "pos": { - "x": 3938, + "x": 3948, "y": 70 }, - "width": 593, - "height": 166, + "width": 573, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -3274,11 +3274,11 @@ "id": "filled circle.end", "type": "rectangle", "pos": { - "x": 3938, + "x": 3948, "y": 357 }, - "width": 593, - "height": 166, + "width": 573, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -3315,7 +3315,7 @@ "type": "rectangle", "pos": { "x": 3978, - "y": 120 + "y": 100 }, "width": 52, "height": 66, @@ -3356,7 +3356,7 @@ "type": "rectangle", "pos": { "x": 3978, - "y": 407 + "y": 387 }, "width": 52, "height": 66, @@ -3397,7 +3397,7 @@ "type": "rectangle", "pos": { "x": 4090, - "y": 120 + "y": 100 }, "width": 53, "height": 66, @@ -3438,7 +3438,7 @@ "type": "rectangle", "pos": { "x": 4090, - "y": 407 + "y": 387 }, "width": 53, "height": 66, @@ -3479,7 +3479,7 @@ "type": "rectangle", "pos": { "x": 4203, - "y": 120 + "y": 100 }, "width": 54, "height": 66, @@ -3520,7 +3520,7 @@ "type": "rectangle", "pos": { "x": 4203, - "y": 407 + "y": 387 }, "width": 54, "height": 66, @@ -3561,7 +3561,7 @@ "type": "rectangle", "pos": { "x": 4317, - "y": 120 + "y": 100 }, "width": 53, "height": 66, @@ -3602,7 +3602,7 @@ "type": "rectangle", "pos": { "x": 4317, - "y": 407 + "y": 387 }, "width": 53, "height": 66, @@ -3643,7 +3643,7 @@ "type": "rectangle", "pos": { "x": 4430, - "y": 120 + "y": 100 }, "width": 61, "height": 66, @@ -3684,7 +3684,7 @@ "type": "rectangle", "pos": { "x": 4430, - "y": 407 + "y": 387 }, "width": 61, "height": 66, @@ -3725,10 +3725,10 @@ "type": "rectangle", "pos": { "x": 4571, - "y": 41 + "y": 40 }, "width": 633, - "height": 512, + "height": 473, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -3765,11 +3765,11 @@ "id": "cf one.start", "type": "rectangle", "pos": { - "x": 4591, + "x": 4601, "y": 70 }, - "width": 593, - "height": 166, + "width": 573, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -3805,11 +3805,11 @@ "id": "cf one.end", "type": "rectangle", "pos": { - "x": 4591, + "x": 4601, "y": 357 }, - "width": 593, - "height": 166, + "width": 573, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -3846,7 +3846,7 @@ "type": "rectangle", "pos": { "x": 4631, - "y": 120 + "y": 100 }, "width": 52, "height": 66, @@ -3887,7 +3887,7 @@ "type": "rectangle", "pos": { "x": 4631, - "y": 407 + "y": 387 }, "width": 52, "height": 66, @@ -3928,7 +3928,7 @@ "type": "rectangle", "pos": { "x": 4743, - "y": 120 + "y": 100 }, "width": 53, "height": 66, @@ -3969,7 +3969,7 @@ "type": "rectangle", "pos": { "x": 4743, - "y": 407 + "y": 387 }, "width": 53, "height": 66, @@ -4010,7 +4010,7 @@ "type": "rectangle", "pos": { "x": 4856, - "y": 120 + "y": 100 }, "width": 54, "height": 66, @@ -4051,7 +4051,7 @@ "type": "rectangle", "pos": { "x": 4856, - "y": 407 + "y": 387 }, "width": 54, "height": 66, @@ -4092,7 +4092,7 @@ "type": "rectangle", "pos": { "x": 4970, - "y": 120 + "y": 100 }, "width": 53, "height": 66, @@ -4133,7 +4133,7 @@ "type": "rectangle", "pos": { "x": 4970, - "y": 407 + "y": 387 }, "width": 53, "height": 66, @@ -4174,7 +4174,7 @@ "type": "rectangle", "pos": { "x": 5083, - "y": 120 + "y": 100 }, "width": 61, "height": 66, @@ -4215,7 +4215,7 @@ "type": "rectangle", "pos": { "x": 5083, - "y": 407 + "y": 387 }, "width": 61, "height": 66, @@ -4256,10 +4256,10 @@ "type": "rectangle", "pos": { "x": 5224, - "y": 41 + "y": 40 }, "width": 633, - "height": 512, + "height": 473, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -4296,11 +4296,11 @@ "id": "cf one required.start", "type": "rectangle", "pos": { - "x": 5244, + "x": 5254, "y": 70 }, - "width": 593, - "height": 166, + "width": 573, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -4336,11 +4336,11 @@ "id": "cf one required.end", "type": "rectangle", "pos": { - "x": 5244, + "x": 5254, "y": 357 }, - "width": 593, - "height": 166, + "width": 573, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -4377,7 +4377,7 @@ "type": "rectangle", "pos": { "x": 5284, - "y": 120 + "y": 100 }, "width": 52, "height": 66, @@ -4418,7 +4418,7 @@ "type": "rectangle", "pos": { "x": 5284, - "y": 407 + "y": 387 }, "width": 52, "height": 66, @@ -4459,7 +4459,7 @@ "type": "rectangle", "pos": { "x": 5396, - "y": 120 + "y": 100 }, "width": 53, "height": 66, @@ -4500,7 +4500,7 @@ "type": "rectangle", "pos": { "x": 5396, - "y": 407 + "y": 387 }, "width": 53, "height": 66, @@ -4541,7 +4541,7 @@ "type": "rectangle", "pos": { "x": 5509, - "y": 120 + "y": 100 }, "width": 54, "height": 66, @@ -4582,7 +4582,7 @@ "type": "rectangle", "pos": { "x": 5509, - "y": 407 + "y": 387 }, "width": 54, "height": 66, @@ -4623,7 +4623,7 @@ "type": "rectangle", "pos": { "x": 5623, - "y": 120 + "y": 100 }, "width": 53, "height": 66, @@ -4664,7 +4664,7 @@ "type": "rectangle", "pos": { "x": 5623, - "y": 407 + "y": 387 }, "width": 53, "height": 66, @@ -4705,7 +4705,7 @@ "type": "rectangle", "pos": { "x": 5736, - "y": 120 + "y": 100 }, "width": 61, "height": 66, @@ -4746,7 +4746,7 @@ "type": "rectangle", "pos": { "x": 5736, - "y": 407 + "y": 387 }, "width": 61, "height": 66, @@ -4787,10 +4787,10 @@ "type": "rectangle", "pos": { "x": 5877, - "y": 41 + "y": 40 }, "width": 633, - "height": 512, + "height": 473, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -4827,11 +4827,11 @@ "id": "cf many.start", "type": "rectangle", "pos": { - "x": 5897, + "x": 5907, "y": 70 }, - "width": 593, - "height": 166, + "width": 573, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -4867,11 +4867,11 @@ "id": "cf many.end", "type": "rectangle", "pos": { - "x": 5897, + "x": 5907, "y": 357 }, - "width": 593, - "height": 166, + "width": 573, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -4908,7 +4908,7 @@ "type": "rectangle", "pos": { "x": 5937, - "y": 120 + "y": 100 }, "width": 52, "height": 66, @@ -4949,7 +4949,7 @@ "type": "rectangle", "pos": { "x": 5937, - "y": 407 + "y": 387 }, "width": 52, "height": 66, @@ -4990,7 +4990,7 @@ "type": "rectangle", "pos": { "x": 6049, - "y": 120 + "y": 100 }, "width": 53, "height": 66, @@ -5031,7 +5031,7 @@ "type": "rectangle", "pos": { "x": 6049, - "y": 407 + "y": 387 }, "width": 53, "height": 66, @@ -5072,7 +5072,7 @@ "type": "rectangle", "pos": { "x": 6162, - "y": 120 + "y": 100 }, "width": 54, "height": 66, @@ -5113,7 +5113,7 @@ "type": "rectangle", "pos": { "x": 6162, - "y": 407 + "y": 387 }, "width": 54, "height": 66, @@ -5154,7 +5154,7 @@ "type": "rectangle", "pos": { "x": 6276, - "y": 120 + "y": 100 }, "width": 53, "height": 66, @@ -5195,7 +5195,7 @@ "type": "rectangle", "pos": { "x": 6276, - "y": 407 + "y": 387 }, "width": 53, "height": 66, @@ -5236,7 +5236,7 @@ "type": "rectangle", "pos": { "x": 6389, - "y": 120 + "y": 100 }, "width": 61, "height": 66, @@ -5277,7 +5277,7 @@ "type": "rectangle", "pos": { "x": 6389, - "y": 407 + "y": 387 }, "width": 61, "height": 66, @@ -5318,10 +5318,10 @@ "type": "rectangle", "pos": { "x": 6530, - "y": 41 + "y": 40 }, "width": 633, - "height": 512, + "height": 473, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -5358,11 +5358,11 @@ "id": "cf many required.start", "type": "rectangle", "pos": { - "x": 6550, + "x": 6560, "y": 70 }, - "width": 593, - "height": 166, + "width": 573, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -5398,11 +5398,11 @@ "id": "cf many required.end", "type": "rectangle", "pos": { - "x": 6550, + "x": 6560, "y": 357 }, - "width": 593, - "height": 166, + "width": 573, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -5439,7 +5439,7 @@ "type": "rectangle", "pos": { "x": 6590, - "y": 120 + "y": 100 }, "width": 52, "height": 66, @@ -5480,7 +5480,7 @@ "type": "rectangle", "pos": { "x": 6590, - "y": 407 + "y": 387 }, "width": 52, "height": 66, @@ -5521,7 +5521,7 @@ "type": "rectangle", "pos": { "x": 6702, - "y": 120 + "y": 100 }, "width": 53, "height": 66, @@ -5562,7 +5562,7 @@ "type": "rectangle", "pos": { "x": 6702, - "y": 407 + "y": 387 }, "width": 53, "height": 66, @@ -5603,7 +5603,7 @@ "type": "rectangle", "pos": { "x": 6815, - "y": 120 + "y": 100 }, "width": 54, "height": 66, @@ -5644,7 +5644,7 @@ "type": "rectangle", "pos": { "x": 6815, - "y": 407 + "y": 387 }, "width": 54, "height": 66, @@ -5685,7 +5685,7 @@ "type": "rectangle", "pos": { "x": 6929, - "y": 120 + "y": 100 }, "width": 53, "height": 66, @@ -5726,7 +5726,7 @@ "type": "rectangle", "pos": { "x": 6929, - "y": 407 + "y": 387 }, "width": 53, "height": 66, @@ -5767,7 +5767,7 @@ "type": "rectangle", "pos": { "x": 7042, - "y": 120 + "y": 100 }, "width": 61, "height": 66, @@ -5808,7 +5808,7 @@ "type": "rectangle", "pos": { "x": 7042, - "y": 407 + "y": 387 }, "width": 61, "height": 66, @@ -5872,31 +5872,31 @@ "route": [ { "x": 86, - "y": 186.5 + "y": 166 }, { "x": 86, - "y": 226.5 + "y": 206 }, { "x": 86, - "y": 248.60000610351562 + "y": 228.10000610351562 }, { "x": 86, - "y": 266.75 + "y": 246.25 }, { "x": 86, - "y": 284.8999938964844 + "y": 264.3999938964844 }, { "x": 86, - "y": 367.5 + "y": 347 }, { "x": 86, - "y": 407.5 + "y": 387 } ], "isCurve": true, @@ -5931,31 +5931,31 @@ "route": [ { "x": 198.5, - "y": 186.5 + "y": 166 }, { "x": 198.5, - "y": 226.5 + "y": 206 }, { "x": 198.5, - "y": 248.60000610351562 + "y": 228.10000610351562 }, { "x": 198.5, - "y": 266.75 + "y": 246.25 }, { "x": 198.5, - "y": 284.8999938964844 + "y": 264.3999938964844 }, { "x": 198.5, - "y": 367.5 + "y": 347 }, { "x": 198.5, - "y": 407.5 + "y": 387 } ], "isCurve": true, @@ -5990,31 +5990,31 @@ "route": [ { "x": 312, - "y": 186.5 + "y": 166 }, { "x": 312, - "y": 226.5 + "y": 206 }, { "x": 312, - "y": 248.60000610351562 + "y": 228.10000610351562 }, { "x": 312, - "y": 266.75 + "y": 246.25 }, { "x": 312, - "y": 284.8999938964844 + "y": 264.3999938964844 }, { "x": 312, - "y": 367.5 + "y": 347 }, { "x": 312, - "y": 407.5 + "y": 387 } ], "isCurve": true, @@ -6049,31 +6049,31 @@ "route": [ { "x": 425.5, - "y": 186.5 + "y": 166 }, { "x": 425.5, - "y": 226.5 + "y": 206 }, { "x": 425.5, - "y": 248.60000610351562 + "y": 228.10000610351562 }, { "x": 425.5, - "y": 266.75 + "y": 246.25 }, { "x": 425.5, - "y": 284.8999938964844 + "y": 264.3999938964844 }, { "x": 425.5, - "y": 367.5 + "y": 347 }, { "x": 425.5, - "y": 407.5 + "y": 387 } ], "isCurve": true, @@ -6108,31 +6108,31 @@ "route": [ { "x": 542.5, - "y": 186.5 + "y": 166 }, { "x": 542.5, - "y": 226.5 + "y": 206 }, { "x": 542.5, - "y": 248.60000610351562 + "y": 228.10000610351562 }, { "x": 542.5, - "y": 266.75 + "y": 246.25 }, { "x": 542.5, - "y": 284.8999938964844 + "y": 264.3999938964844 }, { "x": 542.5, - "y": 367.5 + "y": 347 }, { "x": 542.5, - "y": 407.5 + "y": 387 } ], "isCurve": true, @@ -6167,31 +6167,31 @@ "route": [ { "x": 739, - "y": 186.5 + "y": 166 }, { "x": 739, - "y": 226.5 + "y": 206 }, { "x": 739, - "y": 248.60000610351562 + "y": 228.10000610351562 }, { "x": 739, - "y": 266.75 + "y": 246.25 }, { "x": 739, - "y": 284.8999938964844 + "y": 264.3999938964844 }, { "x": 739, - "y": 367.5 + "y": 347 }, { "x": 739, - "y": 407.5 + "y": 387 } ], "isCurve": true, @@ -6226,31 +6226,31 @@ "route": [ { "x": 851.5, - "y": 186.5 + "y": 166 }, { "x": 851.5, - "y": 226.5 + "y": 206 }, { "x": 851.5, - "y": 248.60000610351562 + "y": 228.10000610351562 }, { "x": 851.5, - "y": 266.75 + "y": 246.25 }, { "x": 851.5, - "y": 284.8999938964844 + "y": 264.3999938964844 }, { "x": 851.5, - "y": 367.5 + "y": 347 }, { "x": 851.5, - "y": 407.5 + "y": 387 } ], "isCurve": true, @@ -6285,31 +6285,31 @@ "route": [ { "x": 965, - "y": 186.5 + "y": 166 }, { "x": 965, - "y": 226.5 + "y": 206 }, { "x": 965, - "y": 248.60000610351562 + "y": 228.10000610351562 }, { "x": 965, - "y": 266.75 + "y": 246.25 }, { "x": 965, - "y": 284.8999938964844 + "y": 264.3999938964844 }, { "x": 965, - "y": 367.5 + "y": 347 }, { "x": 965, - "y": 407.5 + "y": 387 } ], "isCurve": true, @@ -6344,31 +6344,31 @@ "route": [ { "x": 1078.5, - "y": 186.5 + "y": 166 }, { "x": 1078.5, - "y": 226.5 + "y": 206 }, { "x": 1078.5, - "y": 248.60000610351562 + "y": 228.10000610351562 }, { "x": 1078.5, - "y": 266.75 + "y": 246.25 }, { "x": 1078.5, - "y": 284.8999938964844 + "y": 264.3999938964844 }, { "x": 1078.5, - "y": 367.5 + "y": 347 }, { "x": 1078.5, - "y": 407.5 + "y": 387 } ], "isCurve": true, @@ -6403,31 +6403,31 @@ "route": [ { "x": 1195.5, - "y": 186.5 + "y": 166 }, { "x": 1195.5, - "y": 226.5 + "y": 206 }, { "x": 1195.5, - "y": 248.60000610351562 + "y": 228.10000610351562 }, { "x": 1195.5, - "y": 266.75 + "y": 246.25 }, { "x": 1195.5, - "y": 284.8999938964844 + "y": 264.3999938964844 }, { "x": 1195.5, - "y": 367.5 + "y": 347 }, { "x": 1195.5, - "y": 407.5 + "y": 387 } ], "isCurve": true, @@ -6462,31 +6462,31 @@ "route": [ { "x": 1392, - "y": 186.5 + "y": 166 }, { "x": 1392, - "y": 226.5 + "y": 206 }, { "x": 1392, - "y": 248.60000610351562 + "y": 228.10000610351562 }, { "x": 1392, - "y": 266.75 + "y": 246.25 }, { "x": 1392, - "y": 284.8999938964844 + "y": 264.3999938964844 }, { "x": 1392, - "y": 367.5 + "y": 347 }, { "x": 1392, - "y": 407.5 + "y": 387 } ], "isCurve": true, @@ -6521,31 +6521,31 @@ "route": [ { "x": 1504.5, - "y": 186.5 + "y": 166 }, { "x": 1504.5, - "y": 226.5 + "y": 206 }, { "x": 1504.5, - "y": 248.60000610351562 + "y": 228.10000610351562 }, { "x": 1504.5, - "y": 266.75 + "y": 246.25 }, { "x": 1504.5, - "y": 284.8999938964844 + "y": 264.3999938964844 }, { "x": 1504.5, - "y": 367.5 + "y": 347 }, { "x": 1504.5, - "y": 407.5 + "y": 387 } ], "isCurve": true, @@ -6580,31 +6580,31 @@ "route": [ { "x": 1618, - "y": 186.5 + "y": 166 }, { "x": 1618, - "y": 226.5 + "y": 206 }, { "x": 1618, - "y": 248.60000610351562 + "y": 228.10000610351562 }, { "x": 1618, - "y": 266.75 + "y": 246.25 }, { "x": 1618, - "y": 284.8999938964844 + "y": 264.3999938964844 }, { "x": 1618, - "y": 367.5 + "y": 347 }, { "x": 1618, - "y": 407.5 + "y": 387 } ], "isCurve": true, @@ -6639,31 +6639,31 @@ "route": [ { "x": 1731.5, - "y": 186.5 + "y": 166 }, { "x": 1731.5, - "y": 226.5 + "y": 206 }, { "x": 1731.5, - "y": 248.60000610351562 + "y": 228.10000610351562 }, { "x": 1731.5, - "y": 266.75 + "y": 246.25 }, { "x": 1731.5, - "y": 284.8999938964844 + "y": 264.3999938964844 }, { "x": 1731.5, - "y": 367.5 + "y": 347 }, { "x": 1731.5, - "y": 407.5 + "y": 387 } ], "isCurve": true, @@ -6698,31 +6698,31 @@ "route": [ { "x": 1848.5, - "y": 186.5 + "y": 166 }, { "x": 1848.5, - "y": 226.5 + "y": 206 }, { "x": 1848.5, - "y": 248.60000610351562 + "y": 228.10000610351562 }, { "x": 1848.5, - "y": 266.75 + "y": 246.25 }, { "x": 1848.5, - "y": 284.8999938964844 + "y": 264.3999938964844 }, { "x": 1848.5, - "y": 367.5 + "y": 347 }, { "x": 1848.5, - "y": 407.5 + "y": 387 } ], "isCurve": true, @@ -6757,31 +6757,31 @@ "route": [ { "x": 2045, - "y": 186.5 + "y": 166 }, { "x": 2045, - "y": 226.5 + "y": 206 }, { "x": 2045, - "y": 248.60000610351562 + "y": 228.10000610351562 }, { "x": 2045, - "y": 266.75 + "y": 246.25 }, { "x": 2045, - "y": 284.8999938964844 + "y": 264.3999938964844 }, { "x": 2045, - "y": 367.5 + "y": 347 }, { "x": 2045, - "y": 407.5 + "y": 387 } ], "isCurve": true, @@ -6816,31 +6816,31 @@ "route": [ { "x": 2157.5, - "y": 186.5 + "y": 166 }, { "x": 2157.5, - "y": 226.5 + "y": 206 }, { "x": 2157.5, - "y": 248.60000610351562 + "y": 228.10000610351562 }, { "x": 2157.5, - "y": 266.75 + "y": 246.25 }, { "x": 2157.5, - "y": 284.8999938964844 + "y": 264.3999938964844 }, { "x": 2157.5, - "y": 367.5 + "y": 347 }, { "x": 2157.5, - "y": 407.5 + "y": 387 } ], "isCurve": true, @@ -6875,31 +6875,31 @@ "route": [ { "x": 2271, - "y": 186.5 + "y": 166 }, { "x": 2271, - "y": 226.5 + "y": 206 }, { "x": 2271, - "y": 248.60000610351562 + "y": 228.10000610351562 }, { "x": 2271, - "y": 266.75 + "y": 246.25 }, { "x": 2271, - "y": 284.8999938964844 + "y": 264.3999938964844 }, { "x": 2271, - "y": 367.5 + "y": 347 }, { "x": 2271, - "y": 407.5 + "y": 387 } ], "isCurve": true, @@ -6934,31 +6934,31 @@ "route": [ { "x": 2384.5, - "y": 186.5 + "y": 166 }, { "x": 2384.5, - "y": 226.5 + "y": 206 }, { "x": 2384.5, - "y": 248.60000610351562 + "y": 228.10000610351562 }, { "x": 2384.5, - "y": 266.75 + "y": 246.25 }, { "x": 2384.5, - "y": 284.8999938964844 + "y": 264.3999938964844 }, { "x": 2384.5, - "y": 367.5 + "y": 347 }, { "x": 2384.5, - "y": 407.5 + "y": 387 } ], "isCurve": true, @@ -6993,31 +6993,31 @@ "route": [ { "x": 2501.5, - "y": 186.5 + "y": 166 }, { "x": 2501.5, - "y": 226.5 + "y": 206 }, { "x": 2501.5, - "y": 248.60000610351562 + "y": 228.10000610351562 }, { "x": 2501.5, - "y": 266.75 + "y": 246.25 }, { "x": 2501.5, - "y": 284.8999938964844 + "y": 264.3999938964844 }, { "x": 2501.5, - "y": 367.5 + "y": 347 }, { "x": 2501.5, - "y": 407.5 + "y": 387 } ], "isCurve": true, @@ -7052,31 +7052,31 @@ "route": [ { "x": 2698, - "y": 186.5 + "y": 166 }, { "x": 2698, - "y": 226.5 + "y": 206 }, { "x": 2698, - "y": 248.60000610351562 + "y": 228.10000610351562 }, { "x": 2698, - "y": 266.75 + "y": 246.25 }, { "x": 2698, - "y": 284.8999938964844 + "y": 264.3999938964844 }, { "x": 2698, - "y": 367.5 + "y": 347 }, { "x": 2698, - "y": 407.5 + "y": 387 } ], "isCurve": true, @@ -7111,31 +7111,31 @@ "route": [ { "x": 2810.5, - "y": 186.5 + "y": 166 }, { "x": 2810.5, - "y": 226.5 + "y": 206 }, { "x": 2810.5, - "y": 248.60000610351562 + "y": 228.10000610351562 }, { "x": 2810.5, - "y": 266.75 + "y": 246.25 }, { "x": 2810.5, - "y": 284.8999938964844 + "y": 264.3999938964844 }, { "x": 2810.5, - "y": 367.5 + "y": 347 }, { "x": 2810.5, - "y": 407.5 + "y": 387 } ], "isCurve": true, @@ -7170,31 +7170,31 @@ "route": [ { "x": 2924, - "y": 186.5 + "y": 166 }, { "x": 2924, - "y": 226.5 + "y": 206 }, { "x": 2924, - "y": 248.60000610351562 + "y": 228.10000610351562 }, { "x": 2924, - "y": 266.75 + "y": 246.25 }, { "x": 2924, - "y": 284.8999938964844 + "y": 264.3999938964844 }, { "x": 2924, - "y": 367.5 + "y": 347 }, { "x": 2924, - "y": 407.5 + "y": 387 } ], "isCurve": true, @@ -7229,31 +7229,31 @@ "route": [ { "x": 3037.5, - "y": 186.5 + "y": 166 }, { "x": 3037.5, - "y": 226.5 + "y": 206 }, { "x": 3037.5, - "y": 248.60000610351562 + "y": 228.10000610351562 }, { "x": 3037.5, - "y": 266.75 + "y": 246.25 }, { "x": 3037.5, - "y": 284.8999938964844 + "y": 264.3999938964844 }, { "x": 3037.5, - "y": 367.5 + "y": 347 }, { "x": 3037.5, - "y": 407.5 + "y": 387 } ], "isCurve": true, @@ -7288,31 +7288,31 @@ "route": [ { "x": 3154.5, - "y": 186.5 + "y": 166 }, { "x": 3154.5, - "y": 226.5 + "y": 206 }, { "x": 3154.5, - "y": 248.60000610351562 + "y": 228.10000610351562 }, { "x": 3154.5, - "y": 266.75 + "y": 246.25 }, { "x": 3154.5, - "y": 284.8999938964844 + "y": 264.3999938964844 }, { "x": 3154.5, - "y": 367.5 + "y": 347 }, { "x": 3154.5, - "y": 407.5 + "y": 387 } ], "isCurve": true, @@ -7347,31 +7347,31 @@ "route": [ { "x": 3351, - "y": 186.5 + "y": 166 }, { "x": 3351, - "y": 226.5 + "y": 206 }, { "x": 3351, - "y": 248.60000610351562 + "y": 228.10000610351562 }, { "x": 3351, - "y": 266.75 + "y": 246.25 }, { "x": 3351, - "y": 284.8999938964844 + "y": 264.3999938964844 }, { "x": 3351, - "y": 367.5 + "y": 347 }, { "x": 3351, - "y": 407.5 + "y": 387 } ], "isCurve": true, @@ -7406,31 +7406,31 @@ "route": [ { "x": 3463.5, - "y": 186.5 + "y": 166 }, { "x": 3463.5, - "y": 226.5 + "y": 206 }, { "x": 3463.5, - "y": 248.60000610351562 + "y": 228.10000610351562 }, { "x": 3463.5, - "y": 266.75 + "y": 246.25 }, { "x": 3463.5, - "y": 284.8999938964844 + "y": 264.3999938964844 }, { "x": 3463.5, - "y": 367.5 + "y": 347 }, { "x": 3463.5, - "y": 407.5 + "y": 387 } ], "isCurve": true, @@ -7465,31 +7465,31 @@ "route": [ { "x": 3577, - "y": 186.5 + "y": 166 }, { "x": 3577, - "y": 226.5 + "y": 206 }, { "x": 3577, - "y": 248.60000610351562 + "y": 228.10000610351562 }, { "x": 3577, - "y": 266.75 + "y": 246.25 }, { "x": 3577, - "y": 284.8999938964844 + "y": 264.3999938964844 }, { "x": 3577, - "y": 367.5 + "y": 347 }, { "x": 3577, - "y": 407.5 + "y": 387 } ], "isCurve": true, @@ -7524,31 +7524,31 @@ "route": [ { "x": 3690.5, - "y": 186.5 + "y": 166 }, { "x": 3690.5, - "y": 226.5 + "y": 206 }, { "x": 3690.5, - "y": 248.60000610351562 + "y": 228.10000610351562 }, { "x": 3690.5, - "y": 266.75 + "y": 246.25 }, { "x": 3690.5, - "y": 284.8999938964844 + "y": 264.3999938964844 }, { "x": 3690.5, - "y": 367.5 + "y": 347 }, { "x": 3690.5, - "y": 407.5 + "y": 387 } ], "isCurve": true, @@ -7583,31 +7583,31 @@ "route": [ { "x": 3807.5, - "y": 186.5 + "y": 166 }, { "x": 3807.5, - "y": 226.5 + "y": 206 }, { "x": 3807.5, - "y": 248.60000610351562 + "y": 228.10000610351562 }, { "x": 3807.5, - "y": 266.75 + "y": 246.25 }, { "x": 3807.5, - "y": 284.8999938964844 + "y": 264.3999938964844 }, { "x": 3807.5, - "y": 367.5 + "y": 347 }, { "x": 3807.5, - "y": 407.5 + "y": 387 } ], "isCurve": true, @@ -7642,31 +7642,31 @@ "route": [ { "x": 4004, - "y": 186.5 + "y": 166 }, { "x": 4004, - "y": 226.5 + "y": 206 }, { "x": 4004, - "y": 248.60000610351562 + "y": 228.10000610351562 }, { "x": 4004, - "y": 266.75 + "y": 246.25 }, { "x": 4004, - "y": 284.8999938964844 + "y": 264.3999938964844 }, { "x": 4004, - "y": 367.5 + "y": 347 }, { "x": 4004, - "y": 407.5 + "y": 387 } ], "isCurve": true, @@ -7701,31 +7701,31 @@ "route": [ { "x": 4116.5, - "y": 186.5 + "y": 166 }, { "x": 4116.5, - "y": 226.5 + "y": 206 }, { "x": 4116.5, - "y": 248.60000610351562 + "y": 228.10000610351562 }, { "x": 4116.5, - "y": 266.75 + "y": 246.25 }, { "x": 4116.5, - "y": 284.8999938964844 + "y": 264.3999938964844 }, { "x": 4116.5, - "y": 367.5 + "y": 347 }, { "x": 4116.5, - "y": 407.5 + "y": 387 } ], "isCurve": true, @@ -7760,31 +7760,31 @@ "route": [ { "x": 4230, - "y": 186.5 + "y": 166 }, { "x": 4230, - "y": 226.5 + "y": 206 }, { "x": 4230, - "y": 248.60000610351562 + "y": 228.10000610351562 }, { "x": 4230, - "y": 266.75 + "y": 246.25 }, { "x": 4230, - "y": 284.8999938964844 + "y": 264.3999938964844 }, { "x": 4230, - "y": 367.5 + "y": 347 }, { "x": 4230, - "y": 407.5 + "y": 387 } ], "isCurve": true, @@ -7819,31 +7819,31 @@ "route": [ { "x": 4343.5, - "y": 186.5 + "y": 166 }, { "x": 4343.5, - "y": 226.5 + "y": 206 }, { "x": 4343.5, - "y": 248.60000610351562 + "y": 228.10000610351562 }, { "x": 4343.5, - "y": 266.75 + "y": 246.25 }, { "x": 4343.5, - "y": 284.8999938964844 + "y": 264.3999938964844 }, { "x": 4343.5, - "y": 367.5 + "y": 347 }, { "x": 4343.5, - "y": 407.5 + "y": 387 } ], "isCurve": true, @@ -7878,31 +7878,31 @@ "route": [ { "x": 4460.5, - "y": 186.5 + "y": 166 }, { "x": 4460.5, - "y": 226.5 + "y": 206 }, { "x": 4460.5, - "y": 248.60000610351562 + "y": 228.10000610351562 }, { "x": 4460.5, - "y": 266.75 + "y": 246.25 }, { "x": 4460.5, - "y": 284.8999938964844 + "y": 264.3999938964844 }, { "x": 4460.5, - "y": 367.5 + "y": 347 }, { "x": 4460.5, - "y": 407.5 + "y": 387 } ], "isCurve": true, @@ -7937,31 +7937,31 @@ "route": [ { "x": 4657, - "y": 186.5 + "y": 166 }, { "x": 4657, - "y": 226.5 + "y": 206 }, { "x": 4657, - "y": 248.60000610351562 + "y": 228.10000610351562 }, { "x": 4657, - "y": 266.75 + "y": 246.25 }, { "x": 4657, - "y": 284.8999938964844 + "y": 264.3999938964844 }, { "x": 4657, - "y": 367.5 + "y": 347 }, { "x": 4657, - "y": 407.5 + "y": 387 } ], "isCurve": true, @@ -7996,31 +7996,31 @@ "route": [ { "x": 4769.5, - "y": 186.5 + "y": 166 }, { "x": 4769.5, - "y": 226.5 + "y": 206 }, { "x": 4769.5, - "y": 248.60000610351562 + "y": 228.10000610351562 }, { "x": 4769.5, - "y": 266.75 + "y": 246.25 }, { "x": 4769.5, - "y": 284.8999938964844 + "y": 264.3999938964844 }, { "x": 4769.5, - "y": 367.5 + "y": 347 }, { "x": 4769.5, - "y": 407.5 + "y": 387 } ], "isCurve": true, @@ -8055,31 +8055,31 @@ "route": [ { "x": 4883, - "y": 186.5 + "y": 166 }, { "x": 4883, - "y": 226.5 + "y": 206 }, { "x": 4883, - "y": 248.60000610351562 + "y": 228.10000610351562 }, { "x": 4883, - "y": 266.75 + "y": 246.25 }, { "x": 4883, - "y": 284.8999938964844 + "y": 264.3999938964844 }, { "x": 4883, - "y": 367.5 + "y": 347 }, { "x": 4883, - "y": 407.5 + "y": 387 } ], "isCurve": true, @@ -8114,31 +8114,31 @@ "route": [ { "x": 4996.5, - "y": 186.5 + "y": 166 }, { "x": 4996.5, - "y": 226.5 + "y": 206 }, { "x": 4996.5, - "y": 248.60000610351562 + "y": 228.10000610351562 }, { "x": 4996.5, - "y": 266.75 + "y": 246.25 }, { "x": 4996.5, - "y": 284.8999938964844 + "y": 264.3999938964844 }, { "x": 4996.5, - "y": 367.5 + "y": 347 }, { "x": 4996.5, - "y": 407.5 + "y": 387 } ], "isCurve": true, @@ -8173,31 +8173,31 @@ "route": [ { "x": 5113.5, - "y": 186.5 + "y": 166 }, { "x": 5113.5, - "y": 226.5 + "y": 206 }, { "x": 5113.5, - "y": 248.60000610351562 + "y": 228.10000610351562 }, { "x": 5113.5, - "y": 266.75 + "y": 246.25 }, { "x": 5113.5, - "y": 284.8999938964844 + "y": 264.3999938964844 }, { "x": 5113.5, - "y": 367.5 + "y": 347 }, { "x": 5113.5, - "y": 407.5 + "y": 387 } ], "isCurve": true, @@ -8232,31 +8232,31 @@ "route": [ { "x": 5310, - "y": 186.5 + "y": 166 }, { "x": 5310, - "y": 226.5 + "y": 206 }, { "x": 5310, - "y": 248.60000610351562 + "y": 228.10000610351562 }, { "x": 5310, - "y": 266.75 + "y": 246.25 }, { "x": 5310, - "y": 284.8999938964844 + "y": 264.3999938964844 }, { "x": 5310, - "y": 367.5 + "y": 347 }, { "x": 5310, - "y": 407.5 + "y": 387 } ], "isCurve": true, @@ -8291,31 +8291,31 @@ "route": [ { "x": 5422.5, - "y": 186.5 + "y": 166 }, { "x": 5422.5, - "y": 226.5 + "y": 206 }, { "x": 5422.5, - "y": 248.60000610351562 + "y": 228.10000610351562 }, { "x": 5422.5, - "y": 266.75 + "y": 246.25 }, { "x": 5422.5, - "y": 284.8999938964844 + "y": 264.3999938964844 }, { "x": 5422.5, - "y": 367.5 + "y": 347 }, { "x": 5422.5, - "y": 407.5 + "y": 387 } ], "isCurve": true, @@ -8350,31 +8350,31 @@ "route": [ { "x": 5536, - "y": 186.5 + "y": 166 }, { "x": 5536, - "y": 226.5 + "y": 206 }, { "x": 5536, - "y": 248.60000610351562 + "y": 228.10000610351562 }, { "x": 5536, - "y": 266.75 + "y": 246.25 }, { "x": 5536, - "y": 284.8999938964844 + "y": 264.3999938964844 }, { "x": 5536, - "y": 367.5 + "y": 347 }, { "x": 5536, - "y": 407.5 + "y": 387 } ], "isCurve": true, @@ -8409,31 +8409,31 @@ "route": [ { "x": 5649.5, - "y": 186.5 + "y": 166 }, { "x": 5649.5, - "y": 226.5 + "y": 206 }, { "x": 5649.5, - "y": 248.60000610351562 + "y": 228.10000610351562 }, { "x": 5649.5, - "y": 266.75 + "y": 246.25 }, { "x": 5649.5, - "y": 284.8999938964844 + "y": 264.3999938964844 }, { "x": 5649.5, - "y": 367.5 + "y": 347 }, { "x": 5649.5, - "y": 407.5 + "y": 387 } ], "isCurve": true, @@ -8468,31 +8468,31 @@ "route": [ { "x": 5766.5, - "y": 186.5 + "y": 166 }, { "x": 5766.5, - "y": 226.5 + "y": 206 }, { "x": 5766.5, - "y": 248.60000610351562 + "y": 228.10000610351562 }, { "x": 5766.5, - "y": 266.75 + "y": 246.25 }, { "x": 5766.5, - "y": 284.8999938964844 + "y": 264.3999938964844 }, { "x": 5766.5, - "y": 367.5 + "y": 347 }, { "x": 5766.5, - "y": 407.5 + "y": 387 } ], "isCurve": true, @@ -8527,31 +8527,31 @@ "route": [ { "x": 5963, - "y": 186.5 + "y": 166 }, { "x": 5963, - "y": 226.5 + "y": 206 }, { "x": 5963, - "y": 248.60000610351562 + "y": 228.10000610351562 }, { "x": 5963, - "y": 266.75 + "y": 246.25 }, { "x": 5963, - "y": 284.8999938964844 + "y": 264.3999938964844 }, { "x": 5963, - "y": 367.5 + "y": 347 }, { "x": 5963, - "y": 407.5 + "y": 387 } ], "isCurve": true, @@ -8586,31 +8586,31 @@ "route": [ { "x": 6075.5, - "y": 186.5 + "y": 166 }, { "x": 6075.5, - "y": 226.5 + "y": 206 }, { "x": 6075.5, - "y": 248.60000610351562 + "y": 228.10000610351562 }, { "x": 6075.5, - "y": 266.75 + "y": 246.25 }, { "x": 6075.5, - "y": 284.8999938964844 + "y": 264.3999938964844 }, { "x": 6075.5, - "y": 367.5 + "y": 347 }, { "x": 6075.5, - "y": 407.5 + "y": 387 } ], "isCurve": true, @@ -8645,31 +8645,31 @@ "route": [ { "x": 6189, - "y": 186.5 + "y": 166 }, { "x": 6189, - "y": 226.5 + "y": 206 }, { "x": 6189, - "y": 248.60000610351562 + "y": 228.10000610351562 }, { "x": 6189, - "y": 266.75 + "y": 246.25 }, { "x": 6189, - "y": 284.8999938964844 + "y": 264.3999938964844 }, { "x": 6189, - "y": 367.5 + "y": 347 }, { "x": 6189, - "y": 407.5 + "y": 387 } ], "isCurve": true, @@ -8704,31 +8704,31 @@ "route": [ { "x": 6302.5, - "y": 186.5 + "y": 166 }, { "x": 6302.5, - "y": 226.5 + "y": 206 }, { "x": 6302.5, - "y": 248.60000610351562 + "y": 228.10000610351562 }, { "x": 6302.5, - "y": 266.75 + "y": 246.25 }, { "x": 6302.5, - "y": 284.8999938964844 + "y": 264.3999938964844 }, { "x": 6302.5, - "y": 367.5 + "y": 347 }, { "x": 6302.5, - "y": 407.5 + "y": 387 } ], "isCurve": true, @@ -8763,31 +8763,31 @@ "route": [ { "x": 6419.5, - "y": 186.5 + "y": 166 }, { "x": 6419.5, - "y": 226.5 + "y": 206 }, { "x": 6419.5, - "y": 248.60000610351562 + "y": 228.10000610351562 }, { "x": 6419.5, - "y": 266.75 + "y": 246.25 }, { "x": 6419.5, - "y": 284.8999938964844 + "y": 264.3999938964844 }, { "x": 6419.5, - "y": 367.5 + "y": 347 }, { "x": 6419.5, - "y": 407.5 + "y": 387 } ], "isCurve": true, @@ -8822,31 +8822,31 @@ "route": [ { "x": 6616, - "y": 186.5 + "y": 166 }, { "x": 6616, - "y": 226.5 + "y": 206 }, { "x": 6616, - "y": 248.60000610351562 + "y": 228.10000610351562 }, { "x": 6616, - "y": 266.75 + "y": 246.25 }, { "x": 6616, - "y": 284.8999938964844 + "y": 264.3999938964844 }, { "x": 6616, - "y": 367.5 + "y": 347 }, { "x": 6616, - "y": 407.5 + "y": 387 } ], "isCurve": true, @@ -8881,31 +8881,31 @@ "route": [ { "x": 6728.5, - "y": 186.5 + "y": 166 }, { "x": 6728.5, - "y": 226.5 + "y": 206 }, { "x": 6728.5, - "y": 248.60000610351562 + "y": 228.10000610351562 }, { "x": 6728.5, - "y": 266.75 + "y": 246.25 }, { "x": 6728.5, - "y": 284.8999938964844 + "y": 264.3999938964844 }, { "x": 6728.5, - "y": 367.5 + "y": 347 }, { "x": 6728.5, - "y": 407.5 + "y": 387 } ], "isCurve": true, @@ -8940,31 +8940,31 @@ "route": [ { "x": 6842, - "y": 186.5 + "y": 166 }, { "x": 6842, - "y": 226.5 + "y": 206 }, { "x": 6842, - "y": 248.60000610351562 + "y": 228.10000610351562 }, { "x": 6842, - "y": 266.75 + "y": 246.25 }, { "x": 6842, - "y": 284.8999938964844 + "y": 264.3999938964844 }, { "x": 6842, - "y": 367.5 + "y": 347 }, { "x": 6842, - "y": 407.5 + "y": 387 } ], "isCurve": true, @@ -8999,31 +8999,31 @@ "route": [ { "x": 6955.5, - "y": 186.5 + "y": 166 }, { "x": 6955.5, - "y": 226.5 + "y": 206 }, { "x": 6955.5, - "y": 248.60000610351562 + "y": 228.10000610351562 }, { "x": 6955.5, - "y": 266.75 + "y": 246.25 }, { "x": 6955.5, - "y": 284.8999938964844 + "y": 264.3999938964844 }, { "x": 6955.5, - "y": 367.5 + "y": 347 }, { "x": 6955.5, - "y": 407.5 + "y": 387 } ], "isCurve": true, @@ -9058,31 +9058,31 @@ "route": [ { "x": 7072.5, - "y": 186.5 + "y": 166 }, { "x": 7072.5, - "y": 226.5 + "y": 206 }, { "x": 7072.5, - "y": 248.60000610351562 + "y": 228.10000610351562 }, { "x": 7072.5, - "y": 266.75 + "y": 246.25 }, { "x": 7072.5, - "y": 284.8999938964844 + "y": 264.3999938964844 }, { "x": 7072.5, - "y": 367.5 + "y": 347 }, { "x": 7072.5, - "y": 407.5 + "y": 387 } ], "isCurve": true, diff --git a/e2etests/testdata/stable/arrowhead_scaling/dagre/sketch.exp.svg b/e2etests/testdata/stable/arrowhead_scaling/dagre/sketch.exp.svg index 0adedcfd4..47613983b 100644 --- a/e2etests/testdata/stable/arrowhead_scaling/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/arrowhead_scaling/dagre/sketch.exp.svg @@ -1,23 +1,23 @@ -defaultlinearrowdiamondfilled diamondcirclefilled circlecf onecf one requiredcf manycf many required112244881515112244881515112244881515112244881515112244881515112244881515112244881515112244881515112244881515112244881515112244881515 1 2 4 8 15124815 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + .d2-179009198 .fill-N1{fill:#0A0F25;} + .d2-179009198 .fill-N2{fill:#676C7E;} + .d2-179009198 .fill-N3{fill:#9499AB;} + .d2-179009198 .fill-N4{fill:#CFD2DD;} + .d2-179009198 .fill-N5{fill:#DEE1EB;} + .d2-179009198 .fill-N6{fill:#EEF1F8;} + .d2-179009198 .fill-N7{fill:#FFFFFF;} + .d2-179009198 .fill-B1{fill:#0D32B2;} + .d2-179009198 .fill-B2{fill:#0D32B2;} + .d2-179009198 .fill-B3{fill:#E3E9FD;} + .d2-179009198 .fill-B4{fill:#E3E9FD;} + .d2-179009198 .fill-B5{fill:#EDF0FD;} + .d2-179009198 .fill-B6{fill:#F7F8FE;} + .d2-179009198 .fill-AA2{fill:#4A6FF3;} + .d2-179009198 .fill-AA4{fill:#EDF0FD;} + .d2-179009198 .fill-AA5{fill:#F7F8FE;} + .d2-179009198 .fill-AB4{fill:#EDF0FD;} + .d2-179009198 .fill-AB5{fill:#F7F8FE;} + .d2-179009198 .stroke-N1{stroke:#0A0F25;} + .d2-179009198 .stroke-N2{stroke:#676C7E;} + .d2-179009198 .stroke-N3{stroke:#9499AB;} + .d2-179009198 .stroke-N4{stroke:#CFD2DD;} + .d2-179009198 .stroke-N5{stroke:#DEE1EB;} + .d2-179009198 .stroke-N6{stroke:#EEF1F8;} + .d2-179009198 .stroke-N7{stroke:#FFFFFF;} + .d2-179009198 .stroke-B1{stroke:#0D32B2;} + .d2-179009198 .stroke-B2{stroke:#0D32B2;} + .d2-179009198 .stroke-B3{stroke:#E3E9FD;} + .d2-179009198 .stroke-B4{stroke:#E3E9FD;} + .d2-179009198 .stroke-B5{stroke:#EDF0FD;} + .d2-179009198 .stroke-B6{stroke:#F7F8FE;} + .d2-179009198 .stroke-AA2{stroke:#4A6FF3;} + .d2-179009198 .stroke-AA4{stroke:#EDF0FD;} + .d2-179009198 .stroke-AA5{stroke:#F7F8FE;} + .d2-179009198 .stroke-AB4{stroke:#EDF0FD;} + .d2-179009198 .stroke-AB5{stroke:#F7F8FE;} + .d2-179009198 .background-color-N1{background-color:#0A0F25;} + .d2-179009198 .background-color-N2{background-color:#676C7E;} + .d2-179009198 .background-color-N3{background-color:#9499AB;} + .d2-179009198 .background-color-N4{background-color:#CFD2DD;} + .d2-179009198 .background-color-N5{background-color:#DEE1EB;} + .d2-179009198 .background-color-N6{background-color:#EEF1F8;} + .d2-179009198 .background-color-N7{background-color:#FFFFFF;} + .d2-179009198 .background-color-B1{background-color:#0D32B2;} + .d2-179009198 .background-color-B2{background-color:#0D32B2;} + .d2-179009198 .background-color-B3{background-color:#E3E9FD;} + .d2-179009198 .background-color-B4{background-color:#E3E9FD;} + .d2-179009198 .background-color-B5{background-color:#EDF0FD;} + .d2-179009198 .background-color-B6{background-color:#F7F8FE;} + .d2-179009198 .background-color-AA2{background-color:#4A6FF3;} + .d2-179009198 .background-color-AA4{background-color:#EDF0FD;} + .d2-179009198 .background-color-AA5{background-color:#F7F8FE;} + .d2-179009198 .background-color-AB4{background-color:#EDF0FD;} + .d2-179009198 .background-color-AB5{background-color:#F7F8FE;} + .d2-179009198 .color-N1{color:#0A0F25;} + .d2-179009198 .color-N2{color:#676C7E;} + .d2-179009198 .color-N3{color:#9499AB;} + .d2-179009198 .color-N4{color:#CFD2DD;} + .d2-179009198 .color-N5{color:#DEE1EB;} + .d2-179009198 .color-N6{color:#EEF1F8;} + .d2-179009198 .color-N7{color:#FFFFFF;} + .d2-179009198 .color-B1{color:#0D32B2;} + .d2-179009198 .color-B2{color:#0D32B2;} + .d2-179009198 .color-B3{color:#E3E9FD;} + .d2-179009198 .color-B4{color:#E3E9FD;} + .d2-179009198 .color-B5{color:#EDF0FD;} + .d2-179009198 .color-B6{color:#F7F8FE;} + .d2-179009198 .color-AA2{color:#4A6FF3;} + .d2-179009198 .color-AA4{color:#EDF0FD;} + .d2-179009198 .color-AA5{color:#F7F8FE;} + .d2-179009198 .color-AB4{color:#EDF0FD;} + .d2-179009198 .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}]]>defaultlinearrowdiamondfilled diamondcirclefilled circlecf onecf one requiredcf manycf many required112244881515112244881515112244881515112244881515112244881515112244881515112244881515112244881515112244881515112244881515112244881515 1 2 4 8 15124815 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/binary_tree/dagre/board.exp.json b/e2etests/testdata/stable/binary_tree/dagre/board.exp.json index 8b80123da..803757e7f 100644 --- a/e2etests/testdata/stable/binary_tree/dagre/board.exp.json +++ b/e2etests/testdata/stable/binary_tree/dagre/board.exp.json @@ -645,12 +645,12 @@ "labelPercentage": 0, "route": [ { - "x": 392.25, - "y": 42.72100067138672 + "x": 392.5, + "y": 43 }, { - "x": 232.4499969482422, - "y": 101.34400177001953 + "x": 232.5, + "y": 101.4000015258789 }, { "x": 192.5, @@ -740,11 +740,11 @@ "route": [ { "x": 166, - "y": 218.9040069580078 + "y": 219 }, { "x": 98.80000305175781, - "y": 269.3800048828125 + "y": 269.3999938964844 }, { "x": 82, @@ -786,12 +786,12 @@ "labelPercentage": 0, "route": [ { - "x": 219, - "y": 218.9499969482422 + "x": 218.75, + "y": 219 }, { - "x": 286, - "y": 269.3900146484375 + "x": 285.95001220703125, + "y": 269.3999938964844 }, { "x": 302.75, @@ -880,12 +880,12 @@ "labelPercentage": 0, "route": [ { - "x": 666.75, - "y": 218.29299926757812 + "x": 667.25, + "y": 218 }, { - "x": 736.75, - "y": 269.25799560546875 + "x": 736.8499755859375, + "y": 269.20001220703125 }, { "x": 754.25, @@ -927,11 +927,11 @@ "labelPercentage": 0, "route": [ { - "x": 59.93299865722656, + "x": 59.5, "y": 398 }, { - "x": 33.18600082397461, + "x": 33.0989990234375, "y": 438 }, { @@ -974,11 +974,11 @@ "labelPercentage": 0, "route": [ { - "x": 104.06600189208984, + "x": 104.5, "y": 398 }, { - "x": 130.81300354003906, + "x": 130.89999389648438, "y": 438 }, { @@ -1021,11 +1021,11 @@ "labelPercentage": 0, "route": [ { - "x": 280.5840148925781, + "x": 281, "y": 398 }, { - "x": 253.71600341796875, + "x": 253.8000030517578, "y": 438 }, { @@ -1068,11 +1068,11 @@ "labelPercentage": 0, "route": [ { - "x": 324.9150085449219, + "x": 324.5, "y": 398 }, { - "x": 351.7829895019531, + "x": 351.70001220703125, "y": 438 }, { @@ -1115,11 +1115,11 @@ "labelPercentage": 0, "route": [ { - "x": 503.5360107421875, + "x": 503.5, "y": 398 }, { - "x": 476.3070068359375, + "x": 476.29998779296875, "y": 438 }, { @@ -1162,11 +1162,11 @@ "labelPercentage": 0, "route": [ { - "x": 548.4630126953125, + "x": 548.5, "y": 398 }, { - "x": 575.6920166015625, + "x": 575.7000122070312, "y": 438 }, { @@ -1209,11 +1209,11 @@ "labelPercentage": 0, "route": [ { - "x": 731.6859741210938, + "x": 731.5, "y": 398 }, { - "x": 704.3369750976562, + "x": 704.2999877929688, "y": 438 }, { @@ -1256,11 +1256,11 @@ "labelPercentage": 0, "route": [ { - "x": 776.81298828125, + "x": 777, "y": 398 }, { - "x": 804.1619873046875, + "x": 804.2000122070312, "y": 438 }, { diff --git a/e2etests/testdata/stable/binary_tree/dagre/sketch.exp.svg b/e2etests/testdata/stable/binary_tree/dagre/sketch.exp.svg index 94fa5f5f4..1bd5bf5f4 100644 --- a/e2etests/testdata/stable/binary_tree/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/binary_tree/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -abcdefghijklmno + .d2-3211180343 .fill-N1{fill:#0A0F25;} + .d2-3211180343 .fill-N2{fill:#676C7E;} + .d2-3211180343 .fill-N3{fill:#9499AB;} + .d2-3211180343 .fill-N4{fill:#CFD2DD;} + .d2-3211180343 .fill-N5{fill:#DEE1EB;} + .d2-3211180343 .fill-N6{fill:#EEF1F8;} + .d2-3211180343 .fill-N7{fill:#FFFFFF;} + .d2-3211180343 .fill-B1{fill:#0D32B2;} + .d2-3211180343 .fill-B2{fill:#0D32B2;} + .d2-3211180343 .fill-B3{fill:#E3E9FD;} + .d2-3211180343 .fill-B4{fill:#E3E9FD;} + .d2-3211180343 .fill-B5{fill:#EDF0FD;} + .d2-3211180343 .fill-B6{fill:#F7F8FE;} + .d2-3211180343 .fill-AA2{fill:#4A6FF3;} + .d2-3211180343 .fill-AA4{fill:#EDF0FD;} + .d2-3211180343 .fill-AA5{fill:#F7F8FE;} + .d2-3211180343 .fill-AB4{fill:#EDF0FD;} + .d2-3211180343 .fill-AB5{fill:#F7F8FE;} + .d2-3211180343 .stroke-N1{stroke:#0A0F25;} + .d2-3211180343 .stroke-N2{stroke:#676C7E;} + .d2-3211180343 .stroke-N3{stroke:#9499AB;} + .d2-3211180343 .stroke-N4{stroke:#CFD2DD;} + .d2-3211180343 .stroke-N5{stroke:#DEE1EB;} + .d2-3211180343 .stroke-N6{stroke:#EEF1F8;} + .d2-3211180343 .stroke-N7{stroke:#FFFFFF;} + .d2-3211180343 .stroke-B1{stroke:#0D32B2;} + .d2-3211180343 .stroke-B2{stroke:#0D32B2;} + .d2-3211180343 .stroke-B3{stroke:#E3E9FD;} + .d2-3211180343 .stroke-B4{stroke:#E3E9FD;} + .d2-3211180343 .stroke-B5{stroke:#EDF0FD;} + .d2-3211180343 .stroke-B6{stroke:#F7F8FE;} + .d2-3211180343 .stroke-AA2{stroke:#4A6FF3;} + .d2-3211180343 .stroke-AA4{stroke:#EDF0FD;} + .d2-3211180343 .stroke-AA5{stroke:#F7F8FE;} + .d2-3211180343 .stroke-AB4{stroke:#EDF0FD;} + .d2-3211180343 .stroke-AB5{stroke:#F7F8FE;} + .d2-3211180343 .background-color-N1{background-color:#0A0F25;} + .d2-3211180343 .background-color-N2{background-color:#676C7E;} + .d2-3211180343 .background-color-N3{background-color:#9499AB;} + .d2-3211180343 .background-color-N4{background-color:#CFD2DD;} + .d2-3211180343 .background-color-N5{background-color:#DEE1EB;} + .d2-3211180343 .background-color-N6{background-color:#EEF1F8;} + .d2-3211180343 .background-color-N7{background-color:#FFFFFF;} + .d2-3211180343 .background-color-B1{background-color:#0D32B2;} + .d2-3211180343 .background-color-B2{background-color:#0D32B2;} + .d2-3211180343 .background-color-B3{background-color:#E3E9FD;} + .d2-3211180343 .background-color-B4{background-color:#E3E9FD;} + .d2-3211180343 .background-color-B5{background-color:#EDF0FD;} + .d2-3211180343 .background-color-B6{background-color:#F7F8FE;} + .d2-3211180343 .background-color-AA2{background-color:#4A6FF3;} + .d2-3211180343 .background-color-AA4{background-color:#EDF0FD;} + .d2-3211180343 .background-color-AA5{background-color:#F7F8FE;} + .d2-3211180343 .background-color-AB4{background-color:#EDF0FD;} + .d2-3211180343 .background-color-AB5{background-color:#F7F8FE;} + .d2-3211180343 .color-N1{color:#0A0F25;} + .d2-3211180343 .color-N2{color:#676C7E;} + .d2-3211180343 .color-N3{color:#9499AB;} + .d2-3211180343 .color-N4{color:#CFD2DD;} + .d2-3211180343 .color-N5{color:#DEE1EB;} + .d2-3211180343 .color-N6{color:#EEF1F8;} + .d2-3211180343 .color-N7{color:#FFFFFF;} + .d2-3211180343 .color-B1{color:#0D32B2;} + .d2-3211180343 .color-B2{color:#0D32B2;} + .d2-3211180343 .color-B3{color:#E3E9FD;} + .d2-3211180343 .color-B4{color:#E3E9FD;} + .d2-3211180343 .color-B5{color:#EDF0FD;} + .d2-3211180343 .color-B6{color:#F7F8FE;} + .d2-3211180343 .color-AA2{color:#4A6FF3;} + .d2-3211180343 .color-AA4{color:#EDF0FD;} + .d2-3211180343 .color-AA5{color:#F7F8FE;} + .d2-3211180343 .color-AB4{color:#EDF0FD;} + .d2-3211180343 .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}]]>abcdefghijklmno diff --git a/e2etests/testdata/stable/border-radius-pill-shape/dagre/board.exp.json b/e2etests/testdata/stable/border-radius-pill-shape/dagre/board.exp.json index dfaebf0f6..1909736bc 100644 --- a/e2etests/testdata/stable/border-radius-pill-shape/dagre/board.exp.json +++ b/e2etests/testdata/stable/border-radius-pill-shape/dagre/board.exp.json @@ -8,7 +8,7 @@ "type": "rectangle", "pos": { "x": 0, - "y": 8 + "y": 0 }, "width": 53, "height": 66, @@ -49,7 +49,7 @@ "type": "rectangle", "pos": { "x": 113, - "y": 8 + "y": 0 }, "width": 54, "height": 66, @@ -90,7 +90,7 @@ "type": "rectangle", "pos": { "x": 227, - "y": 13 + "y": 0 }, "width": 112, "height": 66, @@ -131,7 +131,7 @@ "type": "rectangle", "pos": { "x": 409, - "y": 8 + "y": 0 }, "width": 94, "height": 66, @@ -172,7 +172,7 @@ "type": "rectangle", "pos": { "x": 563, - "y": 15 + "y": 0 }, "width": 114, "height": 66, diff --git a/e2etests/testdata/stable/border-radius-pill-shape/dagre/sketch.exp.svg b/e2etests/testdata/stable/border-radius-pill-shape/dagre/sketch.exp.svg index 5e0f09e53..4864bf294 100644 --- a/e2etests/testdata/stable/border-radius-pill-shape/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/border-radius-pill-shape/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -xymultiple2double - -three-dee - - - - - - + .d2-1870845507 .fill-N1{fill:#0A0F25;} + .d2-1870845507 .fill-N2{fill:#676C7E;} + .d2-1870845507 .fill-N3{fill:#9499AB;} + .d2-1870845507 .fill-N4{fill:#CFD2DD;} + .d2-1870845507 .fill-N5{fill:#DEE1EB;} + .d2-1870845507 .fill-N6{fill:#EEF1F8;} + .d2-1870845507 .fill-N7{fill:#FFFFFF;} + .d2-1870845507 .fill-B1{fill:#0D32B2;} + .d2-1870845507 .fill-B2{fill:#0D32B2;} + .d2-1870845507 .fill-B3{fill:#E3E9FD;} + .d2-1870845507 .fill-B4{fill:#E3E9FD;} + .d2-1870845507 .fill-B5{fill:#EDF0FD;} + .d2-1870845507 .fill-B6{fill:#F7F8FE;} + .d2-1870845507 .fill-AA2{fill:#4A6FF3;} + .d2-1870845507 .fill-AA4{fill:#EDF0FD;} + .d2-1870845507 .fill-AA5{fill:#F7F8FE;} + .d2-1870845507 .fill-AB4{fill:#EDF0FD;} + .d2-1870845507 .fill-AB5{fill:#F7F8FE;} + .d2-1870845507 .stroke-N1{stroke:#0A0F25;} + .d2-1870845507 .stroke-N2{stroke:#676C7E;} + .d2-1870845507 .stroke-N3{stroke:#9499AB;} + .d2-1870845507 .stroke-N4{stroke:#CFD2DD;} + .d2-1870845507 .stroke-N5{stroke:#DEE1EB;} + .d2-1870845507 .stroke-N6{stroke:#EEF1F8;} + .d2-1870845507 .stroke-N7{stroke:#FFFFFF;} + .d2-1870845507 .stroke-B1{stroke:#0D32B2;} + .d2-1870845507 .stroke-B2{stroke:#0D32B2;} + .d2-1870845507 .stroke-B3{stroke:#E3E9FD;} + .d2-1870845507 .stroke-B4{stroke:#E3E9FD;} + .d2-1870845507 .stroke-B5{stroke:#EDF0FD;} + .d2-1870845507 .stroke-B6{stroke:#F7F8FE;} + .d2-1870845507 .stroke-AA2{stroke:#4A6FF3;} + .d2-1870845507 .stroke-AA4{stroke:#EDF0FD;} + .d2-1870845507 .stroke-AA5{stroke:#F7F8FE;} + .d2-1870845507 .stroke-AB4{stroke:#EDF0FD;} + .d2-1870845507 .stroke-AB5{stroke:#F7F8FE;} + .d2-1870845507 .background-color-N1{background-color:#0A0F25;} + .d2-1870845507 .background-color-N2{background-color:#676C7E;} + .d2-1870845507 .background-color-N3{background-color:#9499AB;} + .d2-1870845507 .background-color-N4{background-color:#CFD2DD;} + .d2-1870845507 .background-color-N5{background-color:#DEE1EB;} + .d2-1870845507 .background-color-N6{background-color:#EEF1F8;} + .d2-1870845507 .background-color-N7{background-color:#FFFFFF;} + .d2-1870845507 .background-color-B1{background-color:#0D32B2;} + .d2-1870845507 .background-color-B2{background-color:#0D32B2;} + .d2-1870845507 .background-color-B3{background-color:#E3E9FD;} + .d2-1870845507 .background-color-B4{background-color:#E3E9FD;} + .d2-1870845507 .background-color-B5{background-color:#EDF0FD;} + .d2-1870845507 .background-color-B6{background-color:#F7F8FE;} + .d2-1870845507 .background-color-AA2{background-color:#4A6FF3;} + .d2-1870845507 .background-color-AA4{background-color:#EDF0FD;} + .d2-1870845507 .background-color-AA5{background-color:#F7F8FE;} + .d2-1870845507 .background-color-AB4{background-color:#EDF0FD;} + .d2-1870845507 .background-color-AB5{background-color:#F7F8FE;} + .d2-1870845507 .color-N1{color:#0A0F25;} + .d2-1870845507 .color-N2{color:#676C7E;} + .d2-1870845507 .color-N3{color:#9499AB;} + .d2-1870845507 .color-N4{color:#CFD2DD;} + .d2-1870845507 .color-N5{color:#DEE1EB;} + .d2-1870845507 .color-N6{color:#EEF1F8;} + .d2-1870845507 .color-N7{color:#FFFFFF;} + .d2-1870845507 .color-B1{color:#0D32B2;} + .d2-1870845507 .color-B2{color:#0D32B2;} + .d2-1870845507 .color-B3{color:#E3E9FD;} + .d2-1870845507 .color-B4{color:#E3E9FD;} + .d2-1870845507 .color-B5{color:#EDF0FD;} + .d2-1870845507 .color-B6{color:#F7F8FE;} + .d2-1870845507 .color-AA2{color:#4A6FF3;} + .d2-1870845507 .color-AA4{color:#EDF0FD;} + .d2-1870845507 .color-AA5{color:#F7F8FE;} + .d2-1870845507 .color-AB4{color:#EDF0FD;} + .d2-1870845507 .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}]]>xymultiple2double + +three-dee + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/border-radius/dagre/board.exp.json b/e2etests/testdata/stable/border-radius/dagre/board.exp.json index 5ba6f7ec5..bf1caec53 100644 --- a/e2etests/testdata/stable/border-radius/dagre/board.exp.json +++ b/e2etests/testdata/stable/border-radius/dagre/board.exp.json @@ -8,7 +8,7 @@ "type": "rectangle", "pos": { "x": 0, - "y": 8 + "y": 0 }, "width": 53, "height": 66, @@ -49,7 +49,7 @@ "type": "rectangle", "pos": { "x": 113, - "y": 8 + "y": 0 }, "width": 54, "height": 66, @@ -90,7 +90,7 @@ "type": "rectangle", "pos": { "x": 227, - "y": 13 + "y": 0 }, "width": 112, "height": 66, @@ -131,7 +131,7 @@ "type": "rectangle", "pos": { "x": 409, - "y": 8 + "y": 0 }, "width": 94, "height": 66, @@ -172,7 +172,7 @@ "type": "rectangle", "pos": { "x": 563, - "y": 15 + "y": 0 }, "width": 114, "height": 66, diff --git a/e2etests/testdata/stable/border-radius/dagre/sketch.exp.svg b/e2etests/testdata/stable/border-radius/dagre/sketch.exp.svg index 5a593e723..cdde8277c 100644 --- a/e2etests/testdata/stable/border-radius/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/border-radius/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -xymultiple2double - -three-dee - - - - - - + .d2-3519978381 .fill-N1{fill:#0A0F25;} + .d2-3519978381 .fill-N2{fill:#676C7E;} + .d2-3519978381 .fill-N3{fill:#9499AB;} + .d2-3519978381 .fill-N4{fill:#CFD2DD;} + .d2-3519978381 .fill-N5{fill:#DEE1EB;} + .d2-3519978381 .fill-N6{fill:#EEF1F8;} + .d2-3519978381 .fill-N7{fill:#FFFFFF;} + .d2-3519978381 .fill-B1{fill:#0D32B2;} + .d2-3519978381 .fill-B2{fill:#0D32B2;} + .d2-3519978381 .fill-B3{fill:#E3E9FD;} + .d2-3519978381 .fill-B4{fill:#E3E9FD;} + .d2-3519978381 .fill-B5{fill:#EDF0FD;} + .d2-3519978381 .fill-B6{fill:#F7F8FE;} + .d2-3519978381 .fill-AA2{fill:#4A6FF3;} + .d2-3519978381 .fill-AA4{fill:#EDF0FD;} + .d2-3519978381 .fill-AA5{fill:#F7F8FE;} + .d2-3519978381 .fill-AB4{fill:#EDF0FD;} + .d2-3519978381 .fill-AB5{fill:#F7F8FE;} + .d2-3519978381 .stroke-N1{stroke:#0A0F25;} + .d2-3519978381 .stroke-N2{stroke:#676C7E;} + .d2-3519978381 .stroke-N3{stroke:#9499AB;} + .d2-3519978381 .stroke-N4{stroke:#CFD2DD;} + .d2-3519978381 .stroke-N5{stroke:#DEE1EB;} + .d2-3519978381 .stroke-N6{stroke:#EEF1F8;} + .d2-3519978381 .stroke-N7{stroke:#FFFFFF;} + .d2-3519978381 .stroke-B1{stroke:#0D32B2;} + .d2-3519978381 .stroke-B2{stroke:#0D32B2;} + .d2-3519978381 .stroke-B3{stroke:#E3E9FD;} + .d2-3519978381 .stroke-B4{stroke:#E3E9FD;} + .d2-3519978381 .stroke-B5{stroke:#EDF0FD;} + .d2-3519978381 .stroke-B6{stroke:#F7F8FE;} + .d2-3519978381 .stroke-AA2{stroke:#4A6FF3;} + .d2-3519978381 .stroke-AA4{stroke:#EDF0FD;} + .d2-3519978381 .stroke-AA5{stroke:#F7F8FE;} + .d2-3519978381 .stroke-AB4{stroke:#EDF0FD;} + .d2-3519978381 .stroke-AB5{stroke:#F7F8FE;} + .d2-3519978381 .background-color-N1{background-color:#0A0F25;} + .d2-3519978381 .background-color-N2{background-color:#676C7E;} + .d2-3519978381 .background-color-N3{background-color:#9499AB;} + .d2-3519978381 .background-color-N4{background-color:#CFD2DD;} + .d2-3519978381 .background-color-N5{background-color:#DEE1EB;} + .d2-3519978381 .background-color-N6{background-color:#EEF1F8;} + .d2-3519978381 .background-color-N7{background-color:#FFFFFF;} + .d2-3519978381 .background-color-B1{background-color:#0D32B2;} + .d2-3519978381 .background-color-B2{background-color:#0D32B2;} + .d2-3519978381 .background-color-B3{background-color:#E3E9FD;} + .d2-3519978381 .background-color-B4{background-color:#E3E9FD;} + .d2-3519978381 .background-color-B5{background-color:#EDF0FD;} + .d2-3519978381 .background-color-B6{background-color:#F7F8FE;} + .d2-3519978381 .background-color-AA2{background-color:#4A6FF3;} + .d2-3519978381 .background-color-AA4{background-color:#EDF0FD;} + .d2-3519978381 .background-color-AA5{background-color:#F7F8FE;} + .d2-3519978381 .background-color-AB4{background-color:#EDF0FD;} + .d2-3519978381 .background-color-AB5{background-color:#F7F8FE;} + .d2-3519978381 .color-N1{color:#0A0F25;} + .d2-3519978381 .color-N2{color:#676C7E;} + .d2-3519978381 .color-N3{color:#9499AB;} + .d2-3519978381 .color-N4{color:#CFD2DD;} + .d2-3519978381 .color-N5{color:#DEE1EB;} + .d2-3519978381 .color-N6{color:#EEF1F8;} + .d2-3519978381 .color-N7{color:#FFFFFF;} + .d2-3519978381 .color-B1{color:#0D32B2;} + .d2-3519978381 .color-B2{color:#0D32B2;} + .d2-3519978381 .color-B3{color:#E3E9FD;} + .d2-3519978381 .color-B4{color:#E3E9FD;} + .d2-3519978381 .color-B5{color:#EDF0FD;} + .d2-3519978381 .color-B6{color:#F7F8FE;} + .d2-3519978381 .color-AA2{color:#4A6FF3;} + .d2-3519978381 .color-AA4{color:#EDF0FD;} + .d2-3519978381 .color-AA5{color:#F7F8FE;} + .d2-3519978381 .color-AB4{color:#EDF0FD;} + .d2-3519978381 .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}]]>xymultiple2double + +three-dee + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/centered_horizontal_connections/dagre/board.exp.json b/e2etests/testdata/stable/centered_horizontal_connections/dagre/board.exp.json index 9209f1046..56fda7bc9 100644 --- a/e2etests/testdata/stable/centered_horizontal_connections/dagre/board.exp.json +++ b/e2etests/testdata/stable/centered_horizontal_connections/dagre/board.exp.json @@ -167,19 +167,19 @@ "route": [ { "x": 32, - "y": 29 + "y": 16 }, { "x": 72, - "y": 29 + "y": 16 }, { "x": 92, - "y": 29 + "y": 16 }, { "x": 132, - "y": 29 + "y": 16 } ], "isCurve": true, diff --git a/e2etests/testdata/stable/centered_horizontal_connections/dagre/sketch.exp.svg b/e2etests/testdata/stable/centered_horizontal_connections/dagre/sketch.exp.svg index cdcc7ed57..ba55a50e0 100644 --- a/e2etests/testdata/stable/centered_horizontal_connections/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/centered_horizontal_connections/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -r1r2 eth1eth1 - + .d2-1364058592 .fill-N1{fill:#0A0F25;} + .d2-1364058592 .fill-N2{fill:#676C7E;} + .d2-1364058592 .fill-N3{fill:#9499AB;} + .d2-1364058592 .fill-N4{fill:#CFD2DD;} + .d2-1364058592 .fill-N5{fill:#DEE1EB;} + .d2-1364058592 .fill-N6{fill:#EEF1F8;} + .d2-1364058592 .fill-N7{fill:#FFFFFF;} + .d2-1364058592 .fill-B1{fill:#0D32B2;} + .d2-1364058592 .fill-B2{fill:#0D32B2;} + .d2-1364058592 .fill-B3{fill:#E3E9FD;} + .d2-1364058592 .fill-B4{fill:#E3E9FD;} + .d2-1364058592 .fill-B5{fill:#EDF0FD;} + .d2-1364058592 .fill-B6{fill:#F7F8FE;} + .d2-1364058592 .fill-AA2{fill:#4A6FF3;} + .d2-1364058592 .fill-AA4{fill:#EDF0FD;} + .d2-1364058592 .fill-AA5{fill:#F7F8FE;} + .d2-1364058592 .fill-AB4{fill:#EDF0FD;} + .d2-1364058592 .fill-AB5{fill:#F7F8FE;} + .d2-1364058592 .stroke-N1{stroke:#0A0F25;} + .d2-1364058592 .stroke-N2{stroke:#676C7E;} + .d2-1364058592 .stroke-N3{stroke:#9499AB;} + .d2-1364058592 .stroke-N4{stroke:#CFD2DD;} + .d2-1364058592 .stroke-N5{stroke:#DEE1EB;} + .d2-1364058592 .stroke-N6{stroke:#EEF1F8;} + .d2-1364058592 .stroke-N7{stroke:#FFFFFF;} + .d2-1364058592 .stroke-B1{stroke:#0D32B2;} + .d2-1364058592 .stroke-B2{stroke:#0D32B2;} + .d2-1364058592 .stroke-B3{stroke:#E3E9FD;} + .d2-1364058592 .stroke-B4{stroke:#E3E9FD;} + .d2-1364058592 .stroke-B5{stroke:#EDF0FD;} + .d2-1364058592 .stroke-B6{stroke:#F7F8FE;} + .d2-1364058592 .stroke-AA2{stroke:#4A6FF3;} + .d2-1364058592 .stroke-AA4{stroke:#EDF0FD;} + .d2-1364058592 .stroke-AA5{stroke:#F7F8FE;} + .d2-1364058592 .stroke-AB4{stroke:#EDF0FD;} + .d2-1364058592 .stroke-AB5{stroke:#F7F8FE;} + .d2-1364058592 .background-color-N1{background-color:#0A0F25;} + .d2-1364058592 .background-color-N2{background-color:#676C7E;} + .d2-1364058592 .background-color-N3{background-color:#9499AB;} + .d2-1364058592 .background-color-N4{background-color:#CFD2DD;} + .d2-1364058592 .background-color-N5{background-color:#DEE1EB;} + .d2-1364058592 .background-color-N6{background-color:#EEF1F8;} + .d2-1364058592 .background-color-N7{background-color:#FFFFFF;} + .d2-1364058592 .background-color-B1{background-color:#0D32B2;} + .d2-1364058592 .background-color-B2{background-color:#0D32B2;} + .d2-1364058592 .background-color-B3{background-color:#E3E9FD;} + .d2-1364058592 .background-color-B4{background-color:#E3E9FD;} + .d2-1364058592 .background-color-B5{background-color:#EDF0FD;} + .d2-1364058592 .background-color-B6{background-color:#F7F8FE;} + .d2-1364058592 .background-color-AA2{background-color:#4A6FF3;} + .d2-1364058592 .background-color-AA4{background-color:#EDF0FD;} + .d2-1364058592 .background-color-AA5{background-color:#F7F8FE;} + .d2-1364058592 .background-color-AB4{background-color:#EDF0FD;} + .d2-1364058592 .background-color-AB5{background-color:#F7F8FE;} + .d2-1364058592 .color-N1{color:#0A0F25;} + .d2-1364058592 .color-N2{color:#676C7E;} + .d2-1364058592 .color-N3{color:#9499AB;} + .d2-1364058592 .color-N4{color:#CFD2DD;} + .d2-1364058592 .color-N5{color:#DEE1EB;} + .d2-1364058592 .color-N6{color:#EEF1F8;} + .d2-1364058592 .color-N7{color:#FFFFFF;} + .d2-1364058592 .color-B1{color:#0D32B2;} + .d2-1364058592 .color-B2{color:#0D32B2;} + .d2-1364058592 .color-B3{color:#E3E9FD;} + .d2-1364058592 .color-B4{color:#E3E9FD;} + .d2-1364058592 .color-B5{color:#EDF0FD;} + .d2-1364058592 .color-B6{color:#F7F8FE;} + .d2-1364058592 .color-AA2{color:#4A6FF3;} + .d2-1364058592 .color-AA4{color:#EDF0FD;} + .d2-1364058592 .color-AA5{color:#F7F8FE;} + .d2-1364058592 .color-AB4{color:#EDF0FD;} + .d2-1364058592 .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}]]>r1r2 eth1eth1 + \ 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 6c720f8ad..6c41fddc7 100644 --- a/e2etests/testdata/stable/chaos2/dagre/board.exp.json +++ b/e2etests/testdata/stable/chaos2/dagre/board.exp.json @@ -8,10 +8,10 @@ "type": "rectangle", "pos": { "x": 0, - "y": 41 + "y": 23 }, - "width": 813, - "height": 1314, + "width": 802, + "height": 1268, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -49,10 +49,10 @@ "type": "rectangle", "pos": { "x": 20, - "y": 106 + "y": 64 }, "width": 574, - "height": 1219, + "height": 1197, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -89,11 +89,11 @@ "id": "aa.bb.cc", "type": "rectangle", "pos": { - "x": 40, - "y": 721 + "x": 42, + "y": 691 }, - "width": 343, - "height": 572, + "width": 253, + "height": 540, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -130,11 +130,11 @@ "id": "aa.bb.cc.dd", "type": "rectangle", "pos": { - "x": 62, - "y": 782 + "x": 72, + "y": 722 }, - "width": 213, - "height": 140, + "width": 193, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -172,7 +172,7 @@ "type": "text", "pos": { "x": 102, - "y": 842 + "y": 775 }, "width": 16, "height": 21, @@ -212,7 +212,7 @@ "type": "rectangle", "pos": { "x": 178, - "y": 819 + "y": 752 }, "width": 57, "height": 66, @@ -253,7 +253,7 @@ "type": "text", "pos": { "x": 171, - "y": 1043 + "y": 989 }, "width": 17, "height": 21, @@ -293,7 +293,7 @@ "type": "rectangle", "pos": { "x": 177, - "y": 1189 + "y": 1135 }, "width": 63, "height": 66, @@ -334,10 +334,10 @@ "type": "package", "pos": { "x": 140, - "y": 169 + "y": 100 }, "width": 434, - "height": 161, + "height": 192, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -375,7 +375,7 @@ "type": "diamond", "pos": { "x": 434, - "y": 204 + "y": 150 }, "width": 50, "height": 92, @@ -416,7 +416,7 @@ "type": "oval", "pos": { "x": 451, - "y": 1169 + "y": 1131 }, "width": 74, "height": 74, @@ -457,7 +457,7 @@ "type": "rectangle", "pos": { "x": 676, - "y": 772 + "y": 752 }, "width": 54, "height": 66, @@ -498,7 +498,7 @@ "type": "cylinder", "pos": { "x": 667, - "y": 433 + "y": 413 }, "width": 71, "height": 118, @@ -539,7 +539,7 @@ "type": "text", "pos": { "x": 633, - "y": 1178 + "y": 1158 }, "width": 16, "height": 21, @@ -579,7 +579,7 @@ "type": "rectangle", "pos": { "x": 709, - "y": 1155 + "y": 1135 }, "width": 63, "height": 66, @@ -643,19 +643,19 @@ "route": [ { "x": 109.75, - "y": 863.5 + "y": 796.5 }, { "x": 109.75, - "y": 910.2999877929688 + "y": 853.7000122070312 }, { "x": 121.94999694824219, - "y": 994.9000244140625 + "y": 940.9000244140625 }, { "x": 170.75, - "y": 1044.5 + "y": 990.5 } ], "isCurve": true, @@ -690,19 +690,19 @@ "route": [ { "x": 179.75, - "y": 1064 + "y": 1009.5 }, { "x": 179.75, - "y": 1112.4000244140625 + "y": 1058.300048828125 }, { "x": 183.5500030517578, - "y": 1137.5 + "y": 1083.5 }, { "x": 198.75, - "y": 1189.5 + "y": 1135.5 } ], "isCurve": true, @@ -737,43 +737,43 @@ "route": [ { "x": 192, - "y": 331 + "y": 292 }, { "x": 192.1999969482422, - "y": 379 + "y": 340.3999938964844 }, { "x": 192.25, - "y": 414.8999938964844 + "y": 376.3999938964844 }, { "x": 192.25, - "y": 450.75 + "y": 412.25 }, { "x": 192.25, - "y": 486.6000061035156 + "y": 448.1000061035156 }, { "x": 192.25, - "y": 534.4000244140625 + "y": 495.8999938964844 }, { "x": 192.25, - "y": 570.25 + "y": 531.75 }, { "x": 192.25, - "y": 606.0999755859375 + "y": 567.5999755859375 }, { "x": 192.25, - "y": 708.7999877929688 + "y": 666 }, { "x": 192.25, - "y": 782 + "y": 722 } ], "isCurve": true, @@ -808,11 +808,11 @@ "route": [ { "x": 675.75, - "y": 796.2960205078125 + "y": 775.7960205078125 }, { "x": 593.75, - "y": 804.2960205078125 + "y": 747.7960205078125 } ], "animated": false, @@ -846,19 +846,19 @@ "route": [ { "x": 667, - "y": 502 + "y": 482 }, { "x": 317.79901123046875, - "y": 590 + "y": 569.5999755859375 }, { "x": 230.5, - "y": 634 + "y": 611.5 }, { "x": 230.5, - "y": 722 + "y": 691.5 } ], "isCurve": true, @@ -893,31 +893,31 @@ "route": [ { "x": 703, - "y": 552 + "y": 531 }, { "x": 702.7999877929688, - "y": 600 + "y": 579.4000244140625 }, { "x": 702.75, - "y": 624.0999755859375 + "y": 603.5999755859375 }, { "x": 702.75, - "y": 642.25 + "y": 621.75 }, { "x": 702.75, - "y": 660.4000244140625 + "y": 639.9000244140625 }, { "x": 702.75, - "y": 732.5 + "y": 712 }, { "x": 702.75, - "y": 772.5 + "y": 752 } ], "isCurve": true, @@ -952,11 +952,11 @@ "route": [ { "x": 667, - "y": 464 + "y": 443 }, { "x": 594.25, - "y": 441.12298583984375 + "y": 384.62298583984375 } ], "animated": false, @@ -990,19 +990,19 @@ "route": [ { "x": 675.75, - "y": 810.9920043945312 + "y": 790.4920043945312 }, { "x": 370.95001220703125, - "y": 872.9979858398438 + "y": 852.4979858398438 }, { "x": 273.45001220703125, - "y": 968.8499755859375 + "y": 941.6500244140625 }, { "x": 188.25, - "y": 1048.251953125 + "y": 994.2520141601562 } ], "isCurve": true, @@ -1037,19 +1037,19 @@ "route": [ { "x": 667, - "y": 472 + "y": 451 }, { "x": 531.2000122070312, - "y": 392.79998779296875 + "y": 372.20001220703125 }, { "x": 497.20001220703125, - "y": 364.6000061035156 + "y": 340.3999938964844 }, { "x": 497, - "y": 331 + "y": 292 } ], "isCurve": true, @@ -1083,12 +1083,12 @@ "labelPercentage": 0, "route": [ { - "x": 383, - "y": 895.5 + "x": 294.75, + "y": 857.0599975585938 }, { "x": 675.75, - "y": 811.5599975585938 + "y": 791.0599975585938 } ], "animated": false, @@ -1122,55 +1122,55 @@ "route": [ { "x": 403, - "y": 331 + "y": 292 }, { "x": 402.79998779296875, - "y": 364.6000061035156 + "y": 340.3999938964844 }, { "x": 402.75, - "y": 396.8999938964844 + "y": 376.3999938964844 }, { "x": 402.75, - "y": 432.75 + "y": 412.25 }, { "x": 402.75, - "y": 468.6000061035156 + "y": 448.1000061035156 }, { "x": 402.75, - "y": 516.4000244140625 + "y": 495.8999938964844 }, { "x": 402.75, - "y": 552.25 + "y": 531.75 }, { "x": 402.75, - "y": 588.0999755859375 + "y": 567.5999755859375 }, { "x": 402.75, - "y": 624.0999755859375 + "y": 603.5999755859375 }, { "x": 402.75, - "y": 642.25 + "y": 621.75 }, { "x": 402.75, - "y": 660.4000244140625 + "y": 639.9000244140625 }, { "x": 457.3500061035156, - "y": 737.6060180664062 + "y": 717.1060180664062 }, { "x": 675.75, - "y": 798.030029296875 + "y": 777.530029296875 } ], "isCurve": true, diff --git a/e2etests/testdata/stable/chaos2/dagre/sketch.exp.svg b/e2etests/testdata/stable/chaos2/dagre/sketch.exp.svg index ead9b6534..5d6e15b3e 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 + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/circle_arrowhead/dagre/board.exp.json b/e2etests/testdata/stable/circle_arrowhead/dagre/board.exp.json index 3b17bb5df..233454bdb 100644 --- a/e2etests/testdata/stable/circle_arrowhead/dagre/board.exp.json +++ b/e2etests/testdata/stable/circle_arrowhead/dagre/board.exp.json @@ -195,11 +195,11 @@ "route": [ { "x": 26.5, - "y": 66 + "y": 65.5 }, { "x": 26.5, - "y": 114.4000015258789 + "y": 114.30000305175781 }, { "x": 26.5, @@ -242,11 +242,11 @@ "route": [ { "x": 140, - "y": 66 + "y": 65.5 }, { "x": 140, - "y": 114.4000015258789 + "y": 114.30000305175781 }, { "x": 140, diff --git a/e2etests/testdata/stable/circle_arrowhead/dagre/sketch.exp.svg b/e2etests/testdata/stable/circle_arrowhead/dagre/sketch.exp.svg index 400e0c53b..12b9c1089 100644 --- a/e2etests/testdata/stable/circle_arrowhead/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/circle_arrowhead/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -abcd circle filled-circle + .d2-431616550 .fill-N1{fill:#0A0F25;} + .d2-431616550 .fill-N2{fill:#676C7E;} + .d2-431616550 .fill-N3{fill:#9499AB;} + .d2-431616550 .fill-N4{fill:#CFD2DD;} + .d2-431616550 .fill-N5{fill:#DEE1EB;} + .d2-431616550 .fill-N6{fill:#EEF1F8;} + .d2-431616550 .fill-N7{fill:#FFFFFF;} + .d2-431616550 .fill-B1{fill:#0D32B2;} + .d2-431616550 .fill-B2{fill:#0D32B2;} + .d2-431616550 .fill-B3{fill:#E3E9FD;} + .d2-431616550 .fill-B4{fill:#E3E9FD;} + .d2-431616550 .fill-B5{fill:#EDF0FD;} + .d2-431616550 .fill-B6{fill:#F7F8FE;} + .d2-431616550 .fill-AA2{fill:#4A6FF3;} + .d2-431616550 .fill-AA4{fill:#EDF0FD;} + .d2-431616550 .fill-AA5{fill:#F7F8FE;} + .d2-431616550 .fill-AB4{fill:#EDF0FD;} + .d2-431616550 .fill-AB5{fill:#F7F8FE;} + .d2-431616550 .stroke-N1{stroke:#0A0F25;} + .d2-431616550 .stroke-N2{stroke:#676C7E;} + .d2-431616550 .stroke-N3{stroke:#9499AB;} + .d2-431616550 .stroke-N4{stroke:#CFD2DD;} + .d2-431616550 .stroke-N5{stroke:#DEE1EB;} + .d2-431616550 .stroke-N6{stroke:#EEF1F8;} + .d2-431616550 .stroke-N7{stroke:#FFFFFF;} + .d2-431616550 .stroke-B1{stroke:#0D32B2;} + .d2-431616550 .stroke-B2{stroke:#0D32B2;} + .d2-431616550 .stroke-B3{stroke:#E3E9FD;} + .d2-431616550 .stroke-B4{stroke:#E3E9FD;} + .d2-431616550 .stroke-B5{stroke:#EDF0FD;} + .d2-431616550 .stroke-B6{stroke:#F7F8FE;} + .d2-431616550 .stroke-AA2{stroke:#4A6FF3;} + .d2-431616550 .stroke-AA4{stroke:#EDF0FD;} + .d2-431616550 .stroke-AA5{stroke:#F7F8FE;} + .d2-431616550 .stroke-AB4{stroke:#EDF0FD;} + .d2-431616550 .stroke-AB5{stroke:#F7F8FE;} + .d2-431616550 .background-color-N1{background-color:#0A0F25;} + .d2-431616550 .background-color-N2{background-color:#676C7E;} + .d2-431616550 .background-color-N3{background-color:#9499AB;} + .d2-431616550 .background-color-N4{background-color:#CFD2DD;} + .d2-431616550 .background-color-N5{background-color:#DEE1EB;} + .d2-431616550 .background-color-N6{background-color:#EEF1F8;} + .d2-431616550 .background-color-N7{background-color:#FFFFFF;} + .d2-431616550 .background-color-B1{background-color:#0D32B2;} + .d2-431616550 .background-color-B2{background-color:#0D32B2;} + .d2-431616550 .background-color-B3{background-color:#E3E9FD;} + .d2-431616550 .background-color-B4{background-color:#E3E9FD;} + .d2-431616550 .background-color-B5{background-color:#EDF0FD;} + .d2-431616550 .background-color-B6{background-color:#F7F8FE;} + .d2-431616550 .background-color-AA2{background-color:#4A6FF3;} + .d2-431616550 .background-color-AA4{background-color:#EDF0FD;} + .d2-431616550 .background-color-AA5{background-color:#F7F8FE;} + .d2-431616550 .background-color-AB4{background-color:#EDF0FD;} + .d2-431616550 .background-color-AB5{background-color:#F7F8FE;} + .d2-431616550 .color-N1{color:#0A0F25;} + .d2-431616550 .color-N2{color:#676C7E;} + .d2-431616550 .color-N3{color:#9499AB;} + .d2-431616550 .color-N4{color:#CFD2DD;} + .d2-431616550 .color-N5{color:#DEE1EB;} + .d2-431616550 .color-N6{color:#EEF1F8;} + .d2-431616550 .color-N7{color:#FFFFFF;} + .d2-431616550 .color-B1{color:#0D32B2;} + .d2-431616550 .color-B2{color:#0D32B2;} + .d2-431616550 .color-B3{color:#E3E9FD;} + .d2-431616550 .color-B4{color:#E3E9FD;} + .d2-431616550 .color-B5{color:#EDF0FD;} + .d2-431616550 .color-B6{color:#F7F8FE;} + .d2-431616550 .color-AA2{color:#4A6FF3;} + .d2-431616550 .color-AA4{color:#EDF0FD;} + .d2-431616550 .color-AA5{color:#F7F8FE;} + .d2-431616550 .color-AB4{color:#EDF0FD;} + .d2-431616550 .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}]]>abcd circle filled-circle diff --git a/e2etests/testdata/stable/circular_dependency/dagre/board.exp.json b/e2etests/testdata/stable/circular_dependency/dagre/board.exp.json index ae5607b91..92810f68e 100644 --- a/e2etests/testdata/stable/circular_dependency/dagre/board.exp.json +++ b/e2etests/testdata/stable/circular_dependency/dagre/board.exp.json @@ -153,11 +153,11 @@ "labelPercentage": 0, "route": [ { - "x": 22.52400016784668, + "x": 22.5, "y": 66 }, { - "x": 17.70400047302246, + "x": 17.700000762939453, "y": 106 }, { @@ -200,11 +200,11 @@ "labelPercentage": 0, "route": [ { - "x": 22.52400016784668, + "x": 22.5, "y": 232 }, { - "x": 17.70400047302246, + "x": 17.700000762939453, "y": 272 }, { @@ -247,11 +247,11 @@ "labelPercentage": 0, "route": [ { - "x": 30.475000381469727, + "x": 30.5, "y": 332 }, { - "x": 35.29499816894531, + "x": 35.29999923706055, "y": 292 }, { @@ -294,11 +294,11 @@ "labelPercentage": 0, "route": [ { - "x": 30.475000381469727, + "x": 30.5, "y": 166 }, { - "x": 35.29499816894531, + "x": 35.29999923706055, "y": 126 }, { diff --git a/e2etests/testdata/stable/circular_dependency/dagre/sketch.exp.svg b/e2etests/testdata/stable/circular_dependency/dagre/sketch.exp.svg index bea32ac65..49548aa65 100644 --- a/e2etests/testdata/stable/circular_dependency/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/circular_dependency/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -abc + .d2-2691357969 .fill-N1{fill:#0A0F25;} + .d2-2691357969 .fill-N2{fill:#676C7E;} + .d2-2691357969 .fill-N3{fill:#9499AB;} + .d2-2691357969 .fill-N4{fill:#CFD2DD;} + .d2-2691357969 .fill-N5{fill:#DEE1EB;} + .d2-2691357969 .fill-N6{fill:#EEF1F8;} + .d2-2691357969 .fill-N7{fill:#FFFFFF;} + .d2-2691357969 .fill-B1{fill:#0D32B2;} + .d2-2691357969 .fill-B2{fill:#0D32B2;} + .d2-2691357969 .fill-B3{fill:#E3E9FD;} + .d2-2691357969 .fill-B4{fill:#E3E9FD;} + .d2-2691357969 .fill-B5{fill:#EDF0FD;} + .d2-2691357969 .fill-B6{fill:#F7F8FE;} + .d2-2691357969 .fill-AA2{fill:#4A6FF3;} + .d2-2691357969 .fill-AA4{fill:#EDF0FD;} + .d2-2691357969 .fill-AA5{fill:#F7F8FE;} + .d2-2691357969 .fill-AB4{fill:#EDF0FD;} + .d2-2691357969 .fill-AB5{fill:#F7F8FE;} + .d2-2691357969 .stroke-N1{stroke:#0A0F25;} + .d2-2691357969 .stroke-N2{stroke:#676C7E;} + .d2-2691357969 .stroke-N3{stroke:#9499AB;} + .d2-2691357969 .stroke-N4{stroke:#CFD2DD;} + .d2-2691357969 .stroke-N5{stroke:#DEE1EB;} + .d2-2691357969 .stroke-N6{stroke:#EEF1F8;} + .d2-2691357969 .stroke-N7{stroke:#FFFFFF;} + .d2-2691357969 .stroke-B1{stroke:#0D32B2;} + .d2-2691357969 .stroke-B2{stroke:#0D32B2;} + .d2-2691357969 .stroke-B3{stroke:#E3E9FD;} + .d2-2691357969 .stroke-B4{stroke:#E3E9FD;} + .d2-2691357969 .stroke-B5{stroke:#EDF0FD;} + .d2-2691357969 .stroke-B6{stroke:#F7F8FE;} + .d2-2691357969 .stroke-AA2{stroke:#4A6FF3;} + .d2-2691357969 .stroke-AA4{stroke:#EDF0FD;} + .d2-2691357969 .stroke-AA5{stroke:#F7F8FE;} + .d2-2691357969 .stroke-AB4{stroke:#EDF0FD;} + .d2-2691357969 .stroke-AB5{stroke:#F7F8FE;} + .d2-2691357969 .background-color-N1{background-color:#0A0F25;} + .d2-2691357969 .background-color-N2{background-color:#676C7E;} + .d2-2691357969 .background-color-N3{background-color:#9499AB;} + .d2-2691357969 .background-color-N4{background-color:#CFD2DD;} + .d2-2691357969 .background-color-N5{background-color:#DEE1EB;} + .d2-2691357969 .background-color-N6{background-color:#EEF1F8;} + .d2-2691357969 .background-color-N7{background-color:#FFFFFF;} + .d2-2691357969 .background-color-B1{background-color:#0D32B2;} + .d2-2691357969 .background-color-B2{background-color:#0D32B2;} + .d2-2691357969 .background-color-B3{background-color:#E3E9FD;} + .d2-2691357969 .background-color-B4{background-color:#E3E9FD;} + .d2-2691357969 .background-color-B5{background-color:#EDF0FD;} + .d2-2691357969 .background-color-B6{background-color:#F7F8FE;} + .d2-2691357969 .background-color-AA2{background-color:#4A6FF3;} + .d2-2691357969 .background-color-AA4{background-color:#EDF0FD;} + .d2-2691357969 .background-color-AA5{background-color:#F7F8FE;} + .d2-2691357969 .background-color-AB4{background-color:#EDF0FD;} + .d2-2691357969 .background-color-AB5{background-color:#F7F8FE;} + .d2-2691357969 .color-N1{color:#0A0F25;} + .d2-2691357969 .color-N2{color:#676C7E;} + .d2-2691357969 .color-N3{color:#9499AB;} + .d2-2691357969 .color-N4{color:#CFD2DD;} + .d2-2691357969 .color-N5{color:#DEE1EB;} + .d2-2691357969 .color-N6{color:#EEF1F8;} + .d2-2691357969 .color-N7{color:#FFFFFF;} + .d2-2691357969 .color-B1{color:#0D32B2;} + .d2-2691357969 .color-B2{color:#0D32B2;} + .d2-2691357969 .color-B3{color:#E3E9FD;} + .d2-2691357969 .color-B4{color:#E3E9FD;} + .d2-2691357969 .color-B5{color:#EDF0FD;} + .d2-2691357969 .color-B6{color:#F7F8FE;} + .d2-2691357969 .color-AA2{color:#4A6FF3;} + .d2-2691357969 .color-AA4{color:#EDF0FD;} + .d2-2691357969 .color-AA5{color:#F7F8FE;} + .d2-2691357969 .color-AB4{color:#EDF0FD;} + .d2-2691357969 .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}]]>abc diff --git a/e2etests/testdata/stable/complex-layers/dagre/board.exp.json b/e2etests/testdata/stable/complex-layers/dagre/board.exp.json index 7994d67f4..67a45d48e 100644 --- a/e2etests/testdata/stable/complex-layers/dagre/board.exp.json +++ b/e2etests/testdata/stable/complex-layers/dagre/board.exp.json @@ -656,11 +656,11 @@ "id": "find contractors", "type": "rectangle", "pos": { - "x": 0, - "y": 41 + "x": 10, + "y": 20 }, - "width": 361, - "height": 125, + "width": 341, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -698,7 +698,7 @@ "type": "rectangle", "pos": { "x": 40, - "y": 70 + "y": 50 }, "width": 110, "height": 66, @@ -739,7 +739,7 @@ "type": "rectangle", "pos": { "x": 210, - "y": 70 + "y": 50 }, "width": 111, "height": 66, @@ -827,11 +827,11 @@ "id": "find contractors", "type": "rectangle", "pos": { - "x": 0, - "y": 41 + "x": 10, + "y": 20 }, - "width": 361, - "height": 125, + "width": 341, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -869,7 +869,7 @@ "type": "rectangle", "pos": { "x": 40, - "y": 70 + "y": 50 }, "width": 110, "height": 66, @@ -910,7 +910,7 @@ "type": "rectangle", "pos": { "x": 210, - "y": 70 + "y": 50 }, "width": 111, "height": 66, @@ -1015,11 +1015,11 @@ "route": [ { "x": 265.5, - "y": 166 + "y": 146 }, { "x": 265.5, - "y": 206 + "y": 202 }, { "x": 265.5, @@ -1087,11 +1087,11 @@ "id": "find contractors", "type": "rectangle", "pos": { - "x": 0, - "y": 41 + "x": 10, + "y": 20 }, - "width": 361, - "height": 125, + "width": 341, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1129,7 +1129,7 @@ "type": "rectangle", "pos": { "x": 40, - "y": 70 + "y": 50 }, "width": 110, "height": 66, @@ -1170,7 +1170,7 @@ "type": "rectangle", "pos": { "x": 210, - "y": 70 + "y": 50 }, "width": 111, "height": 66, @@ -1357,11 +1357,11 @@ "route": [ { "x": 265.5, - "y": 166 + "y": 146 }, { "x": 265.5, - "y": 206 + "y": 202 }, { "x": 265.5, @@ -1476,11 +1476,11 @@ "id": "find contractors", "type": "rectangle", "pos": { - "x": 0, - "y": 41 + "x": 10, + "y": 20 }, - "width": 361, - "height": 125, + "width": 341, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1518,7 +1518,7 @@ "type": "rectangle", "pos": { "x": 40, - "y": 70 + "y": 50 }, "width": 110, "height": 66, @@ -1559,7 +1559,7 @@ "type": "rectangle", "pos": { "x": 210, - "y": 70 + "y": 50 }, "width": 111, "height": 66, @@ -1787,11 +1787,11 @@ "route": [ { "x": 265.5, - "y": 166 + "y": 146 }, { "x": 265.5, - "y": 206 + "y": 202 }, { "x": 265.5, diff --git a/e2etests/testdata/stable/complex-layers/dagre/sketch.exp.svg b/e2etests/testdata/stable/complex-layers/dagre/sketch.exp.svg index a7c854fa5..258d202f1 100644 --- a/e2etests/testdata/stable/complex-layers/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/complex-layers/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -windowroofgarage +}]]>windowroofgarage -blindsglass +blindsglass -shinglesstarlinkutility hookup +shinglesstarlinkutility hookup -toolsvehicles +toolsvehicles - + -find contractorscraigslistfacebook - - - - -find contractorssolicit quotescraigslistfacebook - - +find contractorscraigslistfacebook + + + + +find contractorssolicit quotescraigslistfacebook + + - - -find contractorssolicit quotesobtain quotesnegotiatecraigslistfacebook - - + + +find contractorssolicit quotesobtain quotesnegotiatecraigslistfacebook + + - - -find contractorssolicit quotesobtain quotesnegotiatebook the best bidcraigslistfacebook - - + + +find contractorssolicit quotesobtain quotesnegotiatebook the best bidcraigslistfacebook + + - - -windowroofgaragewaterrainthunder + + +windowroofgaragewaterrainthunder diff --git a/e2etests/testdata/stable/connected_container/dagre/board.exp.json b/e2etests/testdata/stable/connected_container/dagre/board.exp.json index 8f545f1fc..a90ceb89c 100644 --- a/e2etests/testdata/stable/connected_container/dagre/board.exp.json +++ b/e2etests/testdata/stable/connected_container/dagre/board.exp.json @@ -7,11 +7,11 @@ "id": "a", "type": "rectangle", "pos": { - "x": 21, - "y": 41 + "x": 31, + "y": 20 }, - "width": 133, - "height": 125, + "width": 113, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -49,7 +49,7 @@ "type": "rectangle", "pos": { "x": 61, - "y": 70 + "y": 50 }, "width": 53, "height": 66, @@ -89,11 +89,11 @@ "id": "c", "type": "rectangle", "pos": { - "x": 20, - "y": 307 + "x": 30, + "y": 286 }, - "width": 134, - "height": 125, + "width": 114, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -131,7 +131,7 @@ "type": "rectangle", "pos": { "x": 60, - "y": 336 + "y": 316 }, "width": 54, "height": 66, @@ -172,10 +172,10 @@ "type": "rectangle", "pos": { "x": 0, - "y": 573 + "y": 561 }, "width": 174, - "height": 225, + "height": 197, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -212,11 +212,11 @@ "id": "f.h", "type": "rectangle", "pos": { - "x": 20, - "y": 638 + "x": 30, + "y": 602 }, - "width": 134, - "height": 130, + "width": 114, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -254,7 +254,7 @@ "type": "rectangle", "pos": { "x": 60, - "y": 670 + "y": 632 }, "width": 54, "height": 66, @@ -318,11 +318,11 @@ "route": [ { "x": 87, - "y": 136.5 + "y": 116 }, { "x": 87, - "y": 160.10000610351562 + "y": 156 }, { "x": 87, @@ -338,11 +338,11 @@ }, { "x": 87, - "y": 280.1000061035156 + "y": 276 }, { "x": 87, - "y": 336.5 + "y": 316 } ], "isCurve": true, @@ -377,11 +377,11 @@ "route": [ { "x": 87, - "y": 402.5 + "y": 382 }, { "x": 87, - "y": 426.1000061035156 + "y": 422 }, { "x": 87, @@ -409,11 +409,11 @@ }, { "x": 87, - "y": 599.7000122070312 + "y": 592 }, { "x": 87, - "y": 670.5 + "y": 632 } ], "isCurve": true, diff --git a/e2etests/testdata/stable/connected_container/dagre/sketch.exp.svg b/e2etests/testdata/stable/connected_container/dagre/sketch.exp.svg index 179dd14c5..52e889fc8 100644 --- a/e2etests/testdata/stable/connected_container/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/connected_container/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -acfbdhg - - - - - - - - + .d2-2101698003 .fill-N1{fill:#0A0F25;} + .d2-2101698003 .fill-N2{fill:#676C7E;} + .d2-2101698003 .fill-N3{fill:#9499AB;} + .d2-2101698003 .fill-N4{fill:#CFD2DD;} + .d2-2101698003 .fill-N5{fill:#DEE1EB;} + .d2-2101698003 .fill-N6{fill:#EEF1F8;} + .d2-2101698003 .fill-N7{fill:#FFFFFF;} + .d2-2101698003 .fill-B1{fill:#0D32B2;} + .d2-2101698003 .fill-B2{fill:#0D32B2;} + .d2-2101698003 .fill-B3{fill:#E3E9FD;} + .d2-2101698003 .fill-B4{fill:#E3E9FD;} + .d2-2101698003 .fill-B5{fill:#EDF0FD;} + .d2-2101698003 .fill-B6{fill:#F7F8FE;} + .d2-2101698003 .fill-AA2{fill:#4A6FF3;} + .d2-2101698003 .fill-AA4{fill:#EDF0FD;} + .d2-2101698003 .fill-AA5{fill:#F7F8FE;} + .d2-2101698003 .fill-AB4{fill:#EDF0FD;} + .d2-2101698003 .fill-AB5{fill:#F7F8FE;} + .d2-2101698003 .stroke-N1{stroke:#0A0F25;} + .d2-2101698003 .stroke-N2{stroke:#676C7E;} + .d2-2101698003 .stroke-N3{stroke:#9499AB;} + .d2-2101698003 .stroke-N4{stroke:#CFD2DD;} + .d2-2101698003 .stroke-N5{stroke:#DEE1EB;} + .d2-2101698003 .stroke-N6{stroke:#EEF1F8;} + .d2-2101698003 .stroke-N7{stroke:#FFFFFF;} + .d2-2101698003 .stroke-B1{stroke:#0D32B2;} + .d2-2101698003 .stroke-B2{stroke:#0D32B2;} + .d2-2101698003 .stroke-B3{stroke:#E3E9FD;} + .d2-2101698003 .stroke-B4{stroke:#E3E9FD;} + .d2-2101698003 .stroke-B5{stroke:#EDF0FD;} + .d2-2101698003 .stroke-B6{stroke:#F7F8FE;} + .d2-2101698003 .stroke-AA2{stroke:#4A6FF3;} + .d2-2101698003 .stroke-AA4{stroke:#EDF0FD;} + .d2-2101698003 .stroke-AA5{stroke:#F7F8FE;} + .d2-2101698003 .stroke-AB4{stroke:#EDF0FD;} + .d2-2101698003 .stroke-AB5{stroke:#F7F8FE;} + .d2-2101698003 .background-color-N1{background-color:#0A0F25;} + .d2-2101698003 .background-color-N2{background-color:#676C7E;} + .d2-2101698003 .background-color-N3{background-color:#9499AB;} + .d2-2101698003 .background-color-N4{background-color:#CFD2DD;} + .d2-2101698003 .background-color-N5{background-color:#DEE1EB;} + .d2-2101698003 .background-color-N6{background-color:#EEF1F8;} + .d2-2101698003 .background-color-N7{background-color:#FFFFFF;} + .d2-2101698003 .background-color-B1{background-color:#0D32B2;} + .d2-2101698003 .background-color-B2{background-color:#0D32B2;} + .d2-2101698003 .background-color-B3{background-color:#E3E9FD;} + .d2-2101698003 .background-color-B4{background-color:#E3E9FD;} + .d2-2101698003 .background-color-B5{background-color:#EDF0FD;} + .d2-2101698003 .background-color-B6{background-color:#F7F8FE;} + .d2-2101698003 .background-color-AA2{background-color:#4A6FF3;} + .d2-2101698003 .background-color-AA4{background-color:#EDF0FD;} + .d2-2101698003 .background-color-AA5{background-color:#F7F8FE;} + .d2-2101698003 .background-color-AB4{background-color:#EDF0FD;} + .d2-2101698003 .background-color-AB5{background-color:#F7F8FE;} + .d2-2101698003 .color-N1{color:#0A0F25;} + .d2-2101698003 .color-N2{color:#676C7E;} + .d2-2101698003 .color-N3{color:#9499AB;} + .d2-2101698003 .color-N4{color:#CFD2DD;} + .d2-2101698003 .color-N5{color:#DEE1EB;} + .d2-2101698003 .color-N6{color:#EEF1F8;} + .d2-2101698003 .color-N7{color:#FFFFFF;} + .d2-2101698003 .color-B1{color:#0D32B2;} + .d2-2101698003 .color-B2{color:#0D32B2;} + .d2-2101698003 .color-B3{color:#E3E9FD;} + .d2-2101698003 .color-B4{color:#E3E9FD;} + .d2-2101698003 .color-B5{color:#EDF0FD;} + .d2-2101698003 .color-B6{color:#F7F8FE;} + .d2-2101698003 .color-AA2{color:#4A6FF3;} + .d2-2101698003 .color-AA4{color:#EDF0FD;} + .d2-2101698003 .color-AA5{color:#F7F8FE;} + .d2-2101698003 .color-AB4{color:#EDF0FD;} + .d2-2101698003 .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}]]>acfbdhg + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/constant_near_title/dagre/board.exp.json b/e2etests/testdata/stable/constant_near_title/dagre/board.exp.json index 84fec31bf..ac0d6e0df 100644 --- a/e2etests/testdata/stable/constant_near_title/dagre/board.exp.json +++ b/e2etests/testdata/stable/constant_near_title/dagre/board.exp.json @@ -275,11 +275,11 @@ "labelPercentage": 0, "route": [ { - "x": 188.70399475097656, + "x": 188.5, "y": 66 }, { - "x": 227.74000549316406, + "x": 227.6999969482422, "y": 106 }, { @@ -322,11 +322,11 @@ "labelPercentage": 0, "route": [ { - "x": 201.31900024414062, + "x": 201.5, "y": 232 }, { - "x": 157.46299743652344, + "x": 157.5, "y": 272 }, { @@ -369,11 +369,11 @@ "labelPercentage": 0, "route": [ { - "x": 61.52399826049805, + "x": 61.5, "y": 332 }, { - "x": 56.70399856567383, + "x": 56.70000076293945, "y": 292 }, { @@ -428,11 +428,11 @@ "labelPercentage": 0, "route": [ { - "x": 241.47500610351562, + "x": 241.5, "y": 232 }, { - "x": 246.2949981689453, + "x": 246.3000030517578, "y": 272 }, { diff --git a/e2etests/testdata/stable/constant_near_title/dagre/sketch.exp.svg b/e2etests/testdata/stable/constant_near_title/dagre/sketch.exp.svg index 2d767b093..68c6d3b7e 100644 --- a/e2etests/testdata/stable/constant_near_title/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/constant_near_title/dagre/sketch.exp.svg @@ -1,20 +1,20 @@ -poll the peopleresultsunfavorablefavorablewill of the people

A winning strategy

-
 + diff --git a/e2etests/testdata/stable/container_edges/dagre/board.exp.json b/e2etests/testdata/stable/container_edges/dagre/board.exp.json index 9fd39e265..94aba95e2 100644 --- a/e2etests/testdata/stable/container_edges/dagre/board.exp.json +++ b/e2etests/testdata/stable/container_edges/dagre/board.exp.json @@ -48,11 +48,11 @@ "id": "g", "type": "rectangle", "pos": { - "x": 0, - "y": 207 + "x": 10, + "y": 186 }, - "width": 133, - "height": 657, + "width": 113, + "height": 658, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -90,7 +90,7 @@ "type": "rectangle", "pos": { "x": 40, - "y": 236 + "y": 216 }, "width": 53, "height": 66, @@ -131,10 +131,10 @@ "type": "rectangle", "pos": { "x": 153, - "y": 423 + "y": 411 }, "width": 173, - "height": 225, + "height": 197, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -171,11 +171,11 @@ "id": "d.h", "type": "rectangle", "pos": { - "x": 173, - "y": 488 + "x": 183, + "y": 452 }, - "width": 133, - "height": 130, + "width": 113, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -213,7 +213,7 @@ "type": "rectangle", "pos": { "x": 213, - "y": 520 + "y": 482 }, "width": 53, "height": 66, @@ -254,7 +254,7 @@ "type": "rectangle", "pos": { "x": 40, - "y": 768 + "y": 748 }, "width": 53, "height": 66, @@ -367,11 +367,11 @@ }, { "x": 66.5, - "y": 180.10000610351562 + "y": 176 }, { "x": 66.5, - "y": 236.5 + "y": 216 } ], "isCurve": true, @@ -406,11 +406,11 @@ "route": [ { "x": 66.5, - "y": 302.5 + "y": 282 }, { "x": 66.5, - "y": 326.1000061035156 + "y": 322 }, { "x": 66.5, @@ -426,11 +426,11 @@ }, { "x": 95.9000015258789, - "y": 453.70001220703125 + "y": 446 }, { "x": 213.5, - "y": 540.5 + "y": 502 } ], "isCurve": true, @@ -465,19 +465,19 @@ "route": [ { "x": 226.25, - "y": 648 + "y": 608 }, { "x": 79.8499984741211, - "y": 688 + "y": 680 }, { "x": 46.04999923706055, - "y": 712.0999755859375 + "y": 708 }, { "x": 57.25, - "y": 768.5 + "y": 748 } ], "isCurve": true, @@ -511,12 +511,12 @@ "labelPercentage": 0, "route": [ { - "x": 61.23099899291992, - "y": 834.5 + "x": 61.25, + "y": 814 }, { - "x": 54.84600067138672, - "y": 858.0999755859375 + "x": 54.849998474121094, + "y": 854 }, { "x": 54.849998474121094, @@ -558,20 +558,20 @@ "labelPercentage": 0, "route": [ { - "x": 75.74299621582031, + "x": 75.75, "y": 964 }, { - "x": 86.947998046875, + "x": 86.94999694824219, "y": 924 }, { "x": 89.75, - "y": 904 + "y": 900 }, { "x": 89.75, - "y": 864 + "y": 844 } ], "isCurve": true, @@ -605,20 +605,20 @@ "labelPercentage": 0, "route": [ { - "x": 132.75, - "y": 726 + "x": 122.75, + "y": 685 }, { - "x": 236.75, - "y": 663.5999755859375 + "x": 234.75, + "y": 655.4000244140625 }, { "x": 262.75, - "y": 642.0999755859375 + "y": 634 }, { "x": 262.75, - "y": 618.5 + "y": 578 } ], "isCurve": true, diff --git a/e2etests/testdata/stable/container_edges/dagre/sketch.exp.svg b/e2etests/testdata/stable/container_edges/dagre/sketch.exp.svg index b6eedb676..9a2dc461d 100644 --- a/e2etests/testdata/stable/container_edges/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/container_edges/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -agdfbhec - + .d2-3525810451 .fill-N1{fill:#0A0F25;} + .d2-3525810451 .fill-N2{fill:#676C7E;} + .d2-3525810451 .fill-N3{fill:#9499AB;} + .d2-3525810451 .fill-N4{fill:#CFD2DD;} + .d2-3525810451 .fill-N5{fill:#DEE1EB;} + .d2-3525810451 .fill-N6{fill:#EEF1F8;} + .d2-3525810451 .fill-N7{fill:#FFFFFF;} + .d2-3525810451 .fill-B1{fill:#0D32B2;} + .d2-3525810451 .fill-B2{fill:#0D32B2;} + .d2-3525810451 .fill-B3{fill:#E3E9FD;} + .d2-3525810451 .fill-B4{fill:#E3E9FD;} + .d2-3525810451 .fill-B5{fill:#EDF0FD;} + .d2-3525810451 .fill-B6{fill:#F7F8FE;} + .d2-3525810451 .fill-AA2{fill:#4A6FF3;} + .d2-3525810451 .fill-AA4{fill:#EDF0FD;} + .d2-3525810451 .fill-AA5{fill:#F7F8FE;} + .d2-3525810451 .fill-AB4{fill:#EDF0FD;} + .d2-3525810451 .fill-AB5{fill:#F7F8FE;} + .d2-3525810451 .stroke-N1{stroke:#0A0F25;} + .d2-3525810451 .stroke-N2{stroke:#676C7E;} + .d2-3525810451 .stroke-N3{stroke:#9499AB;} + .d2-3525810451 .stroke-N4{stroke:#CFD2DD;} + .d2-3525810451 .stroke-N5{stroke:#DEE1EB;} + .d2-3525810451 .stroke-N6{stroke:#EEF1F8;} + .d2-3525810451 .stroke-N7{stroke:#FFFFFF;} + .d2-3525810451 .stroke-B1{stroke:#0D32B2;} + .d2-3525810451 .stroke-B2{stroke:#0D32B2;} + .d2-3525810451 .stroke-B3{stroke:#E3E9FD;} + .d2-3525810451 .stroke-B4{stroke:#E3E9FD;} + .d2-3525810451 .stroke-B5{stroke:#EDF0FD;} + .d2-3525810451 .stroke-B6{stroke:#F7F8FE;} + .d2-3525810451 .stroke-AA2{stroke:#4A6FF3;} + .d2-3525810451 .stroke-AA4{stroke:#EDF0FD;} + .d2-3525810451 .stroke-AA5{stroke:#F7F8FE;} + .d2-3525810451 .stroke-AB4{stroke:#EDF0FD;} + .d2-3525810451 .stroke-AB5{stroke:#F7F8FE;} + .d2-3525810451 .background-color-N1{background-color:#0A0F25;} + .d2-3525810451 .background-color-N2{background-color:#676C7E;} + .d2-3525810451 .background-color-N3{background-color:#9499AB;} + .d2-3525810451 .background-color-N4{background-color:#CFD2DD;} + .d2-3525810451 .background-color-N5{background-color:#DEE1EB;} + .d2-3525810451 .background-color-N6{background-color:#EEF1F8;} + .d2-3525810451 .background-color-N7{background-color:#FFFFFF;} + .d2-3525810451 .background-color-B1{background-color:#0D32B2;} + .d2-3525810451 .background-color-B2{background-color:#0D32B2;} + .d2-3525810451 .background-color-B3{background-color:#E3E9FD;} + .d2-3525810451 .background-color-B4{background-color:#E3E9FD;} + .d2-3525810451 .background-color-B5{background-color:#EDF0FD;} + .d2-3525810451 .background-color-B6{background-color:#F7F8FE;} + .d2-3525810451 .background-color-AA2{background-color:#4A6FF3;} + .d2-3525810451 .background-color-AA4{background-color:#EDF0FD;} + .d2-3525810451 .background-color-AA5{background-color:#F7F8FE;} + .d2-3525810451 .background-color-AB4{background-color:#EDF0FD;} + .d2-3525810451 .background-color-AB5{background-color:#F7F8FE;} + .d2-3525810451 .color-N1{color:#0A0F25;} + .d2-3525810451 .color-N2{color:#676C7E;} + .d2-3525810451 .color-N3{color:#9499AB;} + .d2-3525810451 .color-N4{color:#CFD2DD;} + .d2-3525810451 .color-N5{color:#DEE1EB;} + .d2-3525810451 .color-N6{color:#EEF1F8;} + .d2-3525810451 .color-N7{color:#FFFFFF;} + .d2-3525810451 .color-B1{color:#0D32B2;} + .d2-3525810451 .color-B2{color:#0D32B2;} + .d2-3525810451 .color-B3{color:#E3E9FD;} + .d2-3525810451 .color-B4{color:#E3E9FD;} + .d2-3525810451 .color-B5{color:#EDF0FD;} + .d2-3525810451 .color-B6{color:#F7F8FE;} + .d2-3525810451 .color-AA2{color:#4A6FF3;} + .d2-3525810451 .color-AA4{color:#EDF0FD;} + .d2-3525810451 .color-AA5{color:#F7F8FE;} + .d2-3525810451 .color-AB4{color:#EDF0FD;} + .d2-3525810451 .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}]]>agdfbhec + - - + + - - - - + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/cycle-order/dagre/board.exp.json b/e2etests/testdata/stable/cycle-order/dagre/board.exp.json index 860aaa8f7..aae8b0aa5 100644 --- a/e2etests/testdata/stable/cycle-order/dagre/board.exp.json +++ b/e2etests/testdata/stable/cycle-order/dagre/board.exp.json @@ -10,11 +10,11 @@ "group" ], "pos": { - "x": 0, - "y": 41 + "x": 20, + "y": 150 }, - "width": 170, - "height": 216, + "width": 130, + "height": 131, "opacity": 1, "strokeDash": 5, "strokeWidth": 2, @@ -54,11 +54,11 @@ "group" ], "pos": { - "x": 270, - "y": 41 + "x": 290, + "y": 56 }, - "width": 170, - "height": 117, + "width": 130, + "height": 131, "opacity": 1, "strokeDash": 5, "strokeWidth": 2, @@ -98,11 +98,11 @@ "group" ], "pos": { - "x": 540, - "y": 41 + "x": 560, + "y": 56 }, - "width": 170, - "height": 117, + "width": 130, + "height": 131, "opacity": 1, "strokeDash": 5, "strokeWidth": 2, @@ -142,11 +142,11 @@ "group" ], "pos": { - "x": 810, - "y": 41 + "x": 830, + "y": 56 }, - "width": 170, - "height": 117, + "width": 130, + "height": 131, "opacity": 1, "strokeDash": 5, "strokeWidth": 2, @@ -186,11 +186,11 @@ "group" ], "pos": { - "x": 1080, - "y": 41 + "x": 1100, + "y": 56 }, - "width": 170, - "height": 117, + "width": 130, + "height": 131, "opacity": 1, "strokeDash": 5, "strokeWidth": 2, @@ -230,11 +230,11 @@ "group" ], "pos": { - "x": 1350, - "y": 41 + "x": 1370, + "y": 56 }, - "width": 170, - "height": 117, + "width": 130, + "height": 131, "opacity": 1, "strokeDash": 5, "strokeWidth": 2, @@ -274,11 +274,11 @@ "group" ], "pos": { - "x": 1620, - "y": 41 + "x": 1640, + "y": 56 }, - "width": 170, - "height": 117, + "width": 130, + "height": 131, "opacity": 1, "strokeDash": 5, "strokeWidth": 2, @@ -318,11 +318,11 @@ "group" ], "pos": { - "x": 1890, - "y": 41 + "x": 1910, + "y": 56 }, - "width": 170, - "height": 117, + "width": 130, + "height": 131, "opacity": 1, "strokeDash": 5, "strokeWidth": 2, @@ -362,11 +362,11 @@ "group" ], "pos": { - "x": 2160, - "y": 41 + "x": 2180, + "y": 150 }, - "width": 170, - "height": 216, + "width": 130, + "height": 131, "opacity": 1, "strokeDash": 5, "strokeWidth": 2, @@ -407,7 +407,7 @@ ], "pos": { "x": 50, - "y": 111 + "y": 180 }, "width": 70, "height": 70, @@ -463,7 +463,7 @@ ], "pos": { "x": 320, - "y": 52 + "y": 86 }, "width": 70, "height": 70, @@ -519,7 +519,7 @@ ], "pos": { "x": 590, - "y": 52 + "y": 86 }, "width": 70, "height": 70, @@ -575,7 +575,7 @@ ], "pos": { "x": 860, - "y": 52 + "y": 86 }, "width": 70, "height": 70, @@ -631,7 +631,7 @@ ], "pos": { "x": 1130, - "y": 52 + "y": 86 }, "width": 70, "height": 70, @@ -687,7 +687,7 @@ ], "pos": { "x": 1400, - "y": 52 + "y": 86 }, "width": 70, "height": 70, @@ -743,7 +743,7 @@ ], "pos": { "x": 1670, - "y": 52 + "y": 86 }, "width": 70, "height": 70, @@ -799,7 +799,7 @@ ], "pos": { "x": 1940, - "y": 52 + "y": 86 }, "width": 70, "height": 70, @@ -855,7 +855,7 @@ ], "pos": { "x": 2210, - "y": 111 + "y": 180 }, "width": 70, "height": 70, @@ -930,20 +930,20 @@ "labelPercentage": 0, "route": [ { - "x": 170, - "y": 80 + "x": 150, + "y": 167 }, { - "x": 210, - "y": 80 + "x": 206, + "y": 167 }, { - "x": 230, - "y": 80 + "x": 234, + "y": 167 }, { - "x": 270, - "y": 80 + "x": 290, + "y": 167 } ], "isCurve": true, @@ -977,20 +977,20 @@ "labelPercentage": 0, "route": [ { - "x": 440, - "y": 80 + "x": 420, + "y": 121 }, { - "x": 480, - "y": 80 + "x": 476, + "y": 121 }, { - "x": 500, - "y": 80 + "x": 504, + "y": 121 }, { - "x": 540, - "y": 80 + "x": 560, + "y": 121 } ], "isCurve": true, @@ -1024,20 +1024,20 @@ "labelPercentage": 0, "route": [ { - "x": 710, - "y": 80 + "x": 690, + "y": 121 }, { - "x": 750, - "y": 80 + "x": 746, + "y": 121 }, { - "x": 770, - "y": 80 + "x": 774, + "y": 121 }, { - "x": 810, - "y": 80 + "x": 830, + "y": 121 } ], "isCurve": true, @@ -1071,20 +1071,20 @@ "labelPercentage": 0, "route": [ { - "x": 980, - "y": 80 + "x": 960, + "y": 121 }, { - "x": 1020, - "y": 80 + "x": 1016, + "y": 121 }, { - "x": 1040, - "y": 80 + "x": 1044, + "y": 121 }, { - "x": 1080, - "y": 80 + "x": 1100, + "y": 121 } ], "isCurve": true, @@ -1118,20 +1118,20 @@ "labelPercentage": 0, "route": [ { - "x": 1250, - "y": 80 + "x": 1230, + "y": 121 }, { - "x": 1290, - "y": 80 + "x": 1286, + "y": 121 }, { - "x": 1310, - "y": 80 + "x": 1314, + "y": 121 }, { - "x": 1350, - "y": 80 + "x": 1370, + "y": 121 } ], "isCurve": true, @@ -1165,20 +1165,20 @@ "labelPercentage": 0, "route": [ { - "x": 1520, - "y": 80 + "x": 1500, + "y": 121 }, { - "x": 1560, - "y": 80 + "x": 1556, + "y": 121 }, { - "x": 1580, - "y": 80 + "x": 1584, + "y": 121 }, { - "x": 1620, - "y": 80 + "x": 1640, + "y": 121 } ], "isCurve": true, @@ -1212,20 +1212,20 @@ "labelPercentage": 0, "route": [ { - "x": 1790, - "y": 80 + "x": 1770, + "y": 121 }, { - "x": 1830, - "y": 80 + "x": 1826, + "y": 121 }, { - "x": 1850, - "y": 80 + "x": 1854, + "y": 121 }, { - "x": 1890, - "y": 80 + "x": 1910, + "y": 121 } ], "isCurve": true, @@ -1259,20 +1259,20 @@ "labelPercentage": 0, "route": [ { - "x": 2060, - "y": 80 + "x": 2040, + "y": 167 }, { - "x": 2100, - "y": 80 + "x": 2096, + "y": 167 }, { - "x": 2120, - "y": 80 + "x": 2124, + "y": 167 }, { - "x": 2160, - "y": 80 + "x": 2180, + "y": 167 } ], "isCurve": true, @@ -1306,344 +1306,344 @@ "labelPercentage": 0, "route": [ { - "x": 2160, - "y": 198 + "x": 2180, + "y": 262 }, { - "x": 2120, - "y": 198 + "x": 2124, + "y": 262 }, { "x": 2100, - "y": 198 + "y": 262 }, { "x": 2085, - "y": 198 + "y": 262 }, { "x": 2070, - "y": 198 + "y": 262 }, { "x": 2043, - "y": 198 + "y": 262 }, { "x": 2017.5, - "y": 198 + "y": 262 }, { "x": 1992, - "y": 198 + "y": 262 }, { "x": 1958, - "y": 198 + "y": 262 }, { "x": 1932.5, - "y": 198 + "y": 262 }, { "x": 1907, - "y": 198 + "y": 262 }, { "x": 1880, - "y": 198 + "y": 262 }, { "x": 1865, - "y": 198 + "y": 262 }, { "x": 1850, - "y": 198 + "y": 262 }, { "x": 1830, - "y": 198 + "y": 262 }, { "x": 1815, - "y": 198 + "y": 262 }, { "x": 1800, - "y": 198 + "y": 262 }, { "x": 1773, - "y": 198 + "y": 262 }, { "x": 1747.5, - "y": 198 + "y": 262 }, { "x": 1722, - "y": 198 + "y": 262 }, { "x": 1688, - "y": 198 + "y": 262 }, { "x": 1662.5, - "y": 198 + "y": 262 }, { "x": 1637, - "y": 198 + "y": 262 }, { "x": 1610, - "y": 198 + "y": 262 }, { "x": 1595, - "y": 198 + "y": 262 }, { "x": 1580, - "y": 198 + "y": 262 }, { "x": 1560, - "y": 198 + "y": 262 }, { "x": 1545, - "y": 198 + "y": 262 }, { "x": 1530, - "y": 198 + "y": 262 }, { "x": 1503, - "y": 198 + "y": 262 }, { "x": 1477.5, - "y": 198 + "y": 262 }, { "x": 1452, - "y": 198 + "y": 262 }, { "x": 1418, - "y": 198 + "y": 262 }, { "x": 1392.5, - "y": 198 + "y": 262 }, { "x": 1367, - "y": 198 + "y": 262 }, { "x": 1340, - "y": 198 + "y": 262 }, { "x": 1325, - "y": 198 + "y": 262 }, { "x": 1310, - "y": 198 + "y": 262 }, { "x": 1290, - "y": 198 + "y": 262 }, { "x": 1275, - "y": 198 + "y": 262 }, { "x": 1260, - "y": 198 + "y": 262 }, { "x": 1233, - "y": 198 + "y": 262 }, { "x": 1207.5, - "y": 198 + "y": 262 }, { "x": 1182, - "y": 198 + "y": 262 }, { "x": 1148, - "y": 198 + "y": 262 }, { "x": 1122.5, - "y": 198 + "y": 262 }, { "x": 1097, - "y": 198 + "y": 262 }, { "x": 1070, - "y": 198 + "y": 262 }, { "x": 1055, - "y": 198 + "y": 262 }, { "x": 1040, - "y": 198 + "y": 262 }, { "x": 1020, - "y": 198 + "y": 262 }, { "x": 1005, - "y": 198 + "y": 262 }, { "x": 990, - "y": 198 + "y": 262 }, { "x": 963, - "y": 198 + "y": 262 }, { "x": 937.5, - "y": 198 + "y": 262 }, { "x": 912, - "y": 198 + "y": 262 }, { "x": 878, - "y": 198 + "y": 262 }, { "x": 852.5, - "y": 198 + "y": 262 }, { "x": 827, - "y": 198 + "y": 262 }, { "x": 800, - "y": 198 + "y": 262 }, { "x": 785, - "y": 198 + "y": 262 }, { "x": 770, - "y": 198 + "y": 262 }, { "x": 750, - "y": 198 + "y": 262 }, { "x": 735, - "y": 198 + "y": 262 }, { "x": 720, - "y": 198 + "y": 262 }, { "x": 693, - "y": 198 + "y": 262 }, { "x": 667.5, - "y": 198 + "y": 262 }, { "x": 642, - "y": 198 + "y": 262 }, { "x": 608, - "y": 198 + "y": 262 }, { "x": 582.5, - "y": 198 + "y": 262 }, { "x": 557, - "y": 198 + "y": 262 }, { "x": 530, - "y": 198 + "y": 262 }, { "x": 515, - "y": 198 + "y": 262 }, { "x": 500, - "y": 198 + "y": 262 }, { "x": 480, - "y": 198 + "y": 262 }, { "x": 465, - "y": 198 + "y": 262 }, { "x": 450, - "y": 198 + "y": 262 }, { "x": 423, - "y": 198 + "y": 262 }, { "x": 397.5, - "y": 198 + "y": 262 }, { "x": 372, - "y": 198 + "y": 262 }, { "x": 338, - "y": 198 + "y": 262 }, { "x": 312.5, - "y": 198 + "y": 262 }, { "x": 287, - "y": 198 + "y": 262 }, { - "x": 210, - "y": 198 + "x": 206, + "y": 262 }, { - "x": 170, - "y": 198 + "x": 150, + "y": 262 } ], "isCurve": true, diff --git a/e2etests/testdata/stable/cycle-order/dagre/sketch.exp.svg b/e2etests/testdata/stable/cycle-order/dagre/sketch.exp.svg index 78deb234b..d7523362c 100644 --- a/e2etests/testdata/stable/cycle-order/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/cycle-order/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -PlanCodeBuildTestCheckReleaseDeployOperateMonitorClickUpGitDockerPlaywrightTruffleHogGithub ActionAWS CopilotAWS ECSGrafana - - - - - - - - - - - - - - - - - - - + .d2-2162570574 .fill-N1{fill:#0A0F25;} + .d2-2162570574 .fill-N2{fill:#676C7E;} + .d2-2162570574 .fill-N3{fill:#9499AB;} + .d2-2162570574 .fill-N4{fill:#CFD2DD;} + .d2-2162570574 .fill-N5{fill:#DEE1EB;} + .d2-2162570574 .fill-N6{fill:#EEF1F8;} + .d2-2162570574 .fill-N7{fill:#FFFFFF;} + .d2-2162570574 .fill-B1{fill:#0D32B2;} + .d2-2162570574 .fill-B2{fill:#0D32B2;} + .d2-2162570574 .fill-B3{fill:#E3E9FD;} + .d2-2162570574 .fill-B4{fill:#E3E9FD;} + .d2-2162570574 .fill-B5{fill:#EDF0FD;} + .d2-2162570574 .fill-B6{fill:#F7F8FE;} + .d2-2162570574 .fill-AA2{fill:#4A6FF3;} + .d2-2162570574 .fill-AA4{fill:#EDF0FD;} + .d2-2162570574 .fill-AA5{fill:#F7F8FE;} + .d2-2162570574 .fill-AB4{fill:#EDF0FD;} + .d2-2162570574 .fill-AB5{fill:#F7F8FE;} + .d2-2162570574 .stroke-N1{stroke:#0A0F25;} + .d2-2162570574 .stroke-N2{stroke:#676C7E;} + .d2-2162570574 .stroke-N3{stroke:#9499AB;} + .d2-2162570574 .stroke-N4{stroke:#CFD2DD;} + .d2-2162570574 .stroke-N5{stroke:#DEE1EB;} + .d2-2162570574 .stroke-N6{stroke:#EEF1F8;} + .d2-2162570574 .stroke-N7{stroke:#FFFFFF;} + .d2-2162570574 .stroke-B1{stroke:#0D32B2;} + .d2-2162570574 .stroke-B2{stroke:#0D32B2;} + .d2-2162570574 .stroke-B3{stroke:#E3E9FD;} + .d2-2162570574 .stroke-B4{stroke:#E3E9FD;} + .d2-2162570574 .stroke-B5{stroke:#EDF0FD;} + .d2-2162570574 .stroke-B6{stroke:#F7F8FE;} + .d2-2162570574 .stroke-AA2{stroke:#4A6FF3;} + .d2-2162570574 .stroke-AA4{stroke:#EDF0FD;} + .d2-2162570574 .stroke-AA5{stroke:#F7F8FE;} + .d2-2162570574 .stroke-AB4{stroke:#EDF0FD;} + .d2-2162570574 .stroke-AB5{stroke:#F7F8FE;} + .d2-2162570574 .background-color-N1{background-color:#0A0F25;} + .d2-2162570574 .background-color-N2{background-color:#676C7E;} + .d2-2162570574 .background-color-N3{background-color:#9499AB;} + .d2-2162570574 .background-color-N4{background-color:#CFD2DD;} + .d2-2162570574 .background-color-N5{background-color:#DEE1EB;} + .d2-2162570574 .background-color-N6{background-color:#EEF1F8;} + .d2-2162570574 .background-color-N7{background-color:#FFFFFF;} + .d2-2162570574 .background-color-B1{background-color:#0D32B2;} + .d2-2162570574 .background-color-B2{background-color:#0D32B2;} + .d2-2162570574 .background-color-B3{background-color:#E3E9FD;} + .d2-2162570574 .background-color-B4{background-color:#E3E9FD;} + .d2-2162570574 .background-color-B5{background-color:#EDF0FD;} + .d2-2162570574 .background-color-B6{background-color:#F7F8FE;} + .d2-2162570574 .background-color-AA2{background-color:#4A6FF3;} + .d2-2162570574 .background-color-AA4{background-color:#EDF0FD;} + .d2-2162570574 .background-color-AA5{background-color:#F7F8FE;} + .d2-2162570574 .background-color-AB4{background-color:#EDF0FD;} + .d2-2162570574 .background-color-AB5{background-color:#F7F8FE;} + .d2-2162570574 .color-N1{color:#0A0F25;} + .d2-2162570574 .color-N2{color:#676C7E;} + .d2-2162570574 .color-N3{color:#9499AB;} + .d2-2162570574 .color-N4{color:#CFD2DD;} + .d2-2162570574 .color-N5{color:#DEE1EB;} + .d2-2162570574 .color-N6{color:#EEF1F8;} + .d2-2162570574 .color-N7{color:#FFFFFF;} + .d2-2162570574 .color-B1{color:#0D32B2;} + .d2-2162570574 .color-B2{color:#0D32B2;} + .d2-2162570574 .color-B3{color:#E3E9FD;} + .d2-2162570574 .color-B4{color:#E3E9FD;} + .d2-2162570574 .color-B5{color:#EDF0FD;} + .d2-2162570574 .color-B6{color:#F7F8FE;} + .d2-2162570574 .color-AA2{color:#4A6FF3;} + .d2-2162570574 .color-AA4{color:#EDF0FD;} + .d2-2162570574 .color-AA5{color:#F7F8FE;} + .d2-2162570574 .color-AB4{color:#EDF0FD;} + .d2-2162570574 .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}]]>PlanCodeBuildTestCheckReleaseDeployOperateMonitorClickUpGitDockerPlaywrightTruffleHogGithub ActionAWS CopilotAWS ECSGrafana + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/dagre-container/dagre/board.exp.json b/e2etests/testdata/stable/dagre-container/dagre/board.exp.json index ff93ed8e0..e74934654 100644 --- a/e2etests/testdata/stable/dagre-container/dagre/board.exp.json +++ b/e2etests/testdata/stable/dagre-container/dagre/board.exp.json @@ -7,11 +7,11 @@ "id": "a", "type": "rectangle", "pos": { - "x": 0, - "y": 41 + "x": 10, + "y": 20 }, - "width": 359, - "height": 125, + "width": 339, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -49,7 +49,7 @@ "type": "rectangle", "pos": { "x": 40, - "y": 70 + "y": 50 }, "width": 53, "height": 66, @@ -90,7 +90,7 @@ "type": "rectangle", "pos": { "x": 153, - "y": 70 + "y": 50 }, "width": 53, "height": 66, @@ -131,7 +131,7 @@ "type": "rectangle", "pos": { "x": 266, - "y": 70 + "y": 50 }, "width": 53, "height": 66, @@ -171,11 +171,11 @@ "id": "b", "type": "rectangle", "pos": { - "x": 0, - "y": 307 + "x": 10, + "y": 286 }, - "width": 359, - "height": 125, + "width": 339, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -213,7 +213,7 @@ "type": "rectangle", "pos": { "x": 40, - "y": 336 + "y": 316 }, "width": 53, "height": 66, @@ -254,7 +254,7 @@ "type": "rectangle", "pos": { "x": 153, - "y": 336 + "y": 316 }, "width": 53, "height": 66, @@ -295,7 +295,7 @@ "type": "rectangle", "pos": { "x": 266, - "y": 336 + "y": 316 }, "width": 53, "height": 66, @@ -359,19 +359,19 @@ "route": [ { "x": 179.5, - "y": 166 + "y": 146 }, { "x": 179.5, - "y": 206 + "y": 202 }, { "x": 179.5, - "y": 226 + "y": 221.8000030517578 }, { "x": 179.5, - "y": 266 + "y": 245 } ], "isCurve": true, diff --git a/e2etests/testdata/stable/dagre-container/dagre/sketch.exp.svg b/e2etests/testdata/stable/dagre-container/dagre/sketch.exp.svg index 116abf33f..2bcb7768a 100644 --- a/e2etests/testdata/stable/dagre-container/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/dagre-container/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -ababcabc - - - - - - - - - + .d2-770613611 .fill-N1{fill:#0A0F25;} + .d2-770613611 .fill-N2{fill:#676C7E;} + .d2-770613611 .fill-N3{fill:#9499AB;} + .d2-770613611 .fill-N4{fill:#CFD2DD;} + .d2-770613611 .fill-N5{fill:#DEE1EB;} + .d2-770613611 .fill-N6{fill:#EEF1F8;} + .d2-770613611 .fill-N7{fill:#FFFFFF;} + .d2-770613611 .fill-B1{fill:#0D32B2;} + .d2-770613611 .fill-B2{fill:#0D32B2;} + .d2-770613611 .fill-B3{fill:#E3E9FD;} + .d2-770613611 .fill-B4{fill:#E3E9FD;} + .d2-770613611 .fill-B5{fill:#EDF0FD;} + .d2-770613611 .fill-B6{fill:#F7F8FE;} + .d2-770613611 .fill-AA2{fill:#4A6FF3;} + .d2-770613611 .fill-AA4{fill:#EDF0FD;} + .d2-770613611 .fill-AA5{fill:#F7F8FE;} + .d2-770613611 .fill-AB4{fill:#EDF0FD;} + .d2-770613611 .fill-AB5{fill:#F7F8FE;} + .d2-770613611 .stroke-N1{stroke:#0A0F25;} + .d2-770613611 .stroke-N2{stroke:#676C7E;} + .d2-770613611 .stroke-N3{stroke:#9499AB;} + .d2-770613611 .stroke-N4{stroke:#CFD2DD;} + .d2-770613611 .stroke-N5{stroke:#DEE1EB;} + .d2-770613611 .stroke-N6{stroke:#EEF1F8;} + .d2-770613611 .stroke-N7{stroke:#FFFFFF;} + .d2-770613611 .stroke-B1{stroke:#0D32B2;} + .d2-770613611 .stroke-B2{stroke:#0D32B2;} + .d2-770613611 .stroke-B3{stroke:#E3E9FD;} + .d2-770613611 .stroke-B4{stroke:#E3E9FD;} + .d2-770613611 .stroke-B5{stroke:#EDF0FD;} + .d2-770613611 .stroke-B6{stroke:#F7F8FE;} + .d2-770613611 .stroke-AA2{stroke:#4A6FF3;} + .d2-770613611 .stroke-AA4{stroke:#EDF0FD;} + .d2-770613611 .stroke-AA5{stroke:#F7F8FE;} + .d2-770613611 .stroke-AB4{stroke:#EDF0FD;} + .d2-770613611 .stroke-AB5{stroke:#F7F8FE;} + .d2-770613611 .background-color-N1{background-color:#0A0F25;} + .d2-770613611 .background-color-N2{background-color:#676C7E;} + .d2-770613611 .background-color-N3{background-color:#9499AB;} + .d2-770613611 .background-color-N4{background-color:#CFD2DD;} + .d2-770613611 .background-color-N5{background-color:#DEE1EB;} + .d2-770613611 .background-color-N6{background-color:#EEF1F8;} + .d2-770613611 .background-color-N7{background-color:#FFFFFF;} + .d2-770613611 .background-color-B1{background-color:#0D32B2;} + .d2-770613611 .background-color-B2{background-color:#0D32B2;} + .d2-770613611 .background-color-B3{background-color:#E3E9FD;} + .d2-770613611 .background-color-B4{background-color:#E3E9FD;} + .d2-770613611 .background-color-B5{background-color:#EDF0FD;} + .d2-770613611 .background-color-B6{background-color:#F7F8FE;} + .d2-770613611 .background-color-AA2{background-color:#4A6FF3;} + .d2-770613611 .background-color-AA4{background-color:#EDF0FD;} + .d2-770613611 .background-color-AA5{background-color:#F7F8FE;} + .d2-770613611 .background-color-AB4{background-color:#EDF0FD;} + .d2-770613611 .background-color-AB5{background-color:#F7F8FE;} + .d2-770613611 .color-N1{color:#0A0F25;} + .d2-770613611 .color-N2{color:#676C7E;} + .d2-770613611 .color-N3{color:#9499AB;} + .d2-770613611 .color-N4{color:#CFD2DD;} + .d2-770613611 .color-N5{color:#DEE1EB;} + .d2-770613611 .color-N6{color:#EEF1F8;} + .d2-770613611 .color-N7{color:#FFFFFF;} + .d2-770613611 .color-B1{color:#0D32B2;} + .d2-770613611 .color-B2{color:#0D32B2;} + .d2-770613611 .color-B3{color:#E3E9FD;} + .d2-770613611 .color-B4{color:#E3E9FD;} + .d2-770613611 .color-B5{color:#EDF0FD;} + .d2-770613611 .color-B6{color:#F7F8FE;} + .d2-770613611 .color-AA2{color:#4A6FF3;} + .d2-770613611 .color-AA4{color:#EDF0FD;} + .d2-770613611 .color-AA5{color:#F7F8FE;} + .d2-770613611 .color-AB4{color:#EDF0FD;} + .d2-770613611 .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}]]>ababcabc + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/dagre_spacing/dagre/board.exp.json b/e2etests/testdata/stable/dagre_spacing/dagre/board.exp.json index e541e6bfb..e8ecc9ba9 100644 --- a/e2etests/testdata/stable/dagre_spacing/dagre/board.exp.json +++ b/e2etests/testdata/stable/dagre_spacing/dagre/board.exp.json @@ -8,10 +8,10 @@ "type": "rectangle", "pos": { "x": 0, - "y": 41 + "y": 19 }, - "width": 424, - "height": 1922, + "width": 498, + "height": 1888, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -48,11 +48,11 @@ "id": "a.k", "type": "rectangle", "pos": { - "x": 22, - "y": 112 + "x": 32, + "y": 60 }, - "width": 131, - "height": 142, + "width": 111, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -90,7 +90,7 @@ "type": "rectangle", "pos": { "x": 62, - "y": 150 + "y": 90 }, "width": 51, "height": 66, @@ -130,11 +130,11 @@ "id": "a.f", "type": "rectangle", "pos": { - "x": 20, - "y": 514 + "x": 30, + "y": 441 }, - "width": 384, - "height": 194, + "width": 438, + "height": 164, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -175,7 +175,7 @@ ], "pos": { "x": 60, - "y": 570 + "y": 488 }, "width": 54, "height": 82, @@ -216,7 +216,7 @@ "type": "rectangle", "pos": { "x": 174, - "y": 578 + "y": 496 }, "width": 54, "height": 66, @@ -256,11 +256,11 @@ "id": "s", "type": "rectangle", "pos": { - "x": 595, - "y": 897 + "x": 669, + "y": 817 }, "width": 259, - "height": 651, + "height": 682, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -300,11 +300,11 @@ "icon" ], "pos": { - "x": 615, - "y": 968 + "x": 699, + "y": 891 }, - "width": 131, - "height": 142, + "width": 111, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -353,11 +353,11 @@ "id": "k", "type": "rectangle", "pos": { - "x": 1280, - "y": 443 + "x": 1524, + "y": 466 }, - "width": 132, - "height": 301, + "width": 112, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -394,8 +394,8 @@ "id": "k.s", "type": "rectangle", "pos": { - "x": 1320, - "y": 560 + "x": 1554, + "y": 496 }, "width": 52, "height": 66, @@ -435,11 +435,11 @@ "id": "u", "type": "rectangle", "pos": { - "x": 874, - "y": 897 + "x": 948, + "y": 861 }, - "width": 539, - "height": 249, + "width": 689, + "height": 270, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -476,8 +476,8 @@ "id": "u.o", "type": "rectangle", "pos": { - "x": 1319, - "y": 988 + "x": 1553, + "y": 921 }, "width": 54, "height": 66, @@ -518,10 +518,10 @@ "type": "rectangle", "pos": { "x": 842, - "y": 41 + "y": 19 }, "width": 172, - "height": 249, + "height": 197, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -558,11 +558,11 @@ "id": "h.m", "type": "rectangle", "pos": { - "x": 862, - "y": 112 + "x": 872, + "y": 60 }, - "width": 132, - "height": 142, + "width": 112, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -600,7 +600,7 @@ "type": "rectangle", "pos": { "x": 902, - "y": 150 + "y": 90 }, "width": 52, "height": 66, @@ -644,11 +644,11 @@ "IconOutsideLeftTop" ], "pos": { - "x": 288, - "y": 552 + "x": 362, + "y": 483 }, "width": 76, - "height": 118, + "height": 92, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -700,11 +700,11 @@ "OutsideBottomCenter" ], "pos": { - "x": 894, - "y": 988 + "x": 978, + "y": 891 }, - "width": 130, - "height": 122, + "width": 110, + "height": 127, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -744,8 +744,8 @@ "OutsideBottomCenter" ], "pos": { - "x": 934, - "y": 1016 + "x": 1008, + "y": 921 }, "width": 50, "height": 66, @@ -788,8 +788,8 @@ "OutsideRightMiddle" ], "pos": { - "x": 1064, - "y": 988 + "x": 1138, + "y": 921 }, "width": 195, "height": 66, @@ -829,11 +829,11 @@ "id": "s.z", "type": "rectangle", "pos": { - "x": 701, - "y": 1370 + "x": 785, + "y": 1343 }, - "width": 133, - "height": 142, + "width": 113, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -870,8 +870,8 @@ "id": "s.z.c", "type": "rectangle", "pos": { - "x": 741, - "y": 1408 + "x": 815, + "y": 1373 }, "width": 53, "height": 66, @@ -911,8 +911,8 @@ "id": "s.n.f", "type": "rectangle", "pos": { - "x": 655, - "y": 1006 + "x": 729, + "y": 921 }, "width": 51, "height": 66, @@ -952,11 +952,11 @@ "id": "y", "type": "rectangle", "pos": { - "x": 444, - "y": 1299 + "x": 528, + "y": 1343 }, - "width": 131, - "height": 249, + "width": 111, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -993,8 +993,8 @@ "id": "y.r", "type": "rectangle", "pos": { - "x": 484, - "y": 1390 + "x": 558, + "y": 1373 }, "width": 51, "height": 66, @@ -1034,11 +1034,11 @@ "id": "a.g", "type": "rectangle", "pos": { - "x": 148, - "y": 1785 + "x": 158, + "y": 1751 }, - "width": 129, - "height": 142, + "width": 109, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1076,7 +1076,7 @@ "type": "rectangle", "pos": { "x": 188, - "y": 1823 + "y": 1781 }, "width": 49, "height": 66, @@ -1140,55 +1140,55 @@ "route": [ { "x": 87, - "y": 216.5 + "y": 155.5 }, { "x": 87, - "y": 246.89999389648438 + "y": 199.5 }, { "x": 87, - "y": 265.70001220703125 + "y": 221.39999389648438 }, { "x": 87, - "y": 282.5 + "y": 237.75 }, { "x": 87, - "y": 299.29998779296875 + "y": 254.10000610351562 }, { "x": 87, - "y": 321.70001220703125 + "y": 275.8999938964844 }, { "x": 87, - "y": 338.5 + "y": 292.25 }, { "x": 87, - "y": 355.29998779296875 + "y": 308.6000061035156 }, { "x": 87, - "y": 377.70001220703125 + "y": 330.3999938964844 }, { "x": 87, - "y": 394.5 + "y": 346.75 }, { "x": 87, - "y": 411.29998779296875 + "y": 363.1000061035156 }, { "x": 87, - "y": 488.5 + "y": 432.1000061035156 }, { "x": 87, - "y": 528.5 + "y": 446.5 } ], "isCurve": true, @@ -1223,55 +1223,55 @@ "route": [ { "x": 201, - "y": 644.5 + "y": 561.5 }, { "x": 201, - "y": 679.2999877929688 + "y": 615.9000244140625 }, { "x": 201, - "y": 699.2000122070312 + "y": 640.4000244140625 }, { "x": 201, - "y": 716 + "y": 656.75 }, { "x": 201, - "y": 732.7999877929688 + "y": 673.0999755859375 }, { "x": 201, - "y": 755.2000122070312 + "y": 694.9000244140625 }, { "x": 201, - "y": 772 + "y": 711.25 }, { "x": 201, - "y": 788.7999877929688 + "y": 727.5999755859375 }, { "x": 201, - "y": 811.2000122070312 + "y": 749.4000244140625 }, { "x": 201, - "y": 828 + "y": 765.75 }, { "x": 201, - "y": 844.7999877929688 + "y": 782.0999755859375 }, { - "x": 283.79998779296875, - "y": 938.7000122070312 + "x": 300.6000061035156, + "y": 881.7000122070312 }, { - "x": 615, - "y": 1045.5 + "x": 699, + "y": 942.5 } ], "isCurve": true, @@ -1305,56 +1305,56 @@ "labelPercentage": 0, "route": [ { - "x": 1345.5, - "y": 626.5 + "x": 1579.5, + "y": 561.5 }, { - "x": 1345.5, - "y": 675.7000122070312 + "x": 1579.5, + "y": 615.9000244140625 }, { - "x": 1345.5, - "y": 699.2000122070312 + "x": 1579.5, + "y": 640.4000244140625 }, { - "x": 1345.5, - "y": 716 + "x": 1579.5, + "y": 656.75 }, { - "x": 1345.5, - "y": 732.7999877929688 + "x": 1579.5, + "y": 673.0999755859375 }, { - "x": 1345.5, - "y": 755.2000122070312 + "x": 1579.5, + "y": 694.9000244140625 }, { - "x": 1345.5, - "y": 772 + "x": 1579.5, + "y": 711.25 }, { - "x": 1345.5, - "y": 788.7999877929688 + "x": 1579.5, + "y": 727.5999755859375 }, { - "x": 1345.5, - "y": 811.2000122070312 + "x": 1579.5, + "y": 749.4000244140625 }, { - "x": 1345.5, - "y": 828 + "x": 1579.5, + "y": 765.75 }, { - "x": 1345.5, - "y": 844.7999877929688 + "x": 1579.5, + "y": 782.0999755859375 }, { - "x": 1345.5, - "y": 927.2999877929688 + "x": 1579.5, + "y": 877.5 }, { - "x": 1345.5, - "y": 988.5 + "x": 1579.5, + "y": 921.5 } ], "isCurve": true, @@ -1389,55 +1389,55 @@ "route": [ { "x": 928.25, - "y": 216.5 + "y": 155.5 }, { "x": 928.25, - "y": 230.5 + "y": 199.5 }, { "x": 928.25, - "y": 245.1999969482422 + "y": 221.39999389648438 }, { "x": 928.25, - "y": 262 + "y": 237.75 }, { "x": 928.25, - "y": 278.79998779296875 + "y": 254.10000610351562 }, { "x": 782.7999877929688, - "y": 301.20001220703125 + "y": 275.8999938964844 }, { "x": 564.625, - "y": 318 + "y": 292.25 }, { "x": 346.4490051269531, - "y": 334.79998779296875 + "y": 308.6000061035156 }, { "x": 201, - "y": 357.20001220703125 + "y": 330.3999938964844 }, { "x": 201, - "y": 374 + "y": 346.75 }, { "x": 201, - "y": 390.79998779296875 + "y": 363.1000061035156 }, { "x": 201, - "y": 482.1000061035156 + "y": 442.1000061035156 }, { "x": 201, - "y": 578.5 + "y": 496.5 } ], "isCurve": true, @@ -1471,56 +1471,56 @@ "labelPercentage": 0, "route": [ { - "x": 326, - "y": 670.5 + "x": 400, + "y": 574.5 }, { - "x": 326, - "y": 684.5 + "x": 400, + "y": 618.5 }, { - "x": 326, - "y": 699.2000122070312 + "x": 400, + "y": 640.4000244140625 }, { - "x": 326, - "y": 716 + "x": 400, + "y": 656.75 }, { - "x": 326, - "y": 732.7999877929688 + "x": 400, + "y": 673.0999755859375 }, { - "x": 326, - "y": 755.2000122070312 + "x": 400, + "y": 694.9000244140625 }, { - "x": 326, - "y": 772 + "x": 400, + "y": 711.25 }, { - "x": 326, - "y": 788.7999877929688 + "x": 400, + "y": 727.5999755859375 }, { - "x": 326, - "y": 811.2000122070312 + "x": 400, + "y": 749.4000244140625 }, { - "x": 326, - "y": 828 + "x": 400, + "y": 765.75 }, { - "x": 326, - "y": 844.7999877929688 + "x": 400, + "y": 782.0999755859375 }, { - "x": 447.5, - "y": 938.7960205078125 + "x": 521.5, + "y": 883.3079833984375 }, { - "x": 933.5, - "y": 1045.9820556640625 + "x": 1007.5, + "y": 950.541015625 } ], "isCurve": true, @@ -1554,56 +1554,56 @@ "labelPercentage": 0, "route": [ { - "x": 1161, - "y": 1054.5 + "x": 1235, + "y": 986.5 }, { - "x": 1161, - "y": 1082.9000244140625 + "x": 1235, + "y": 1030.5 }, { - "x": 1161, - "y": 1101.199951171875 + "x": 1235, + "y": 1064.199951171875 }, { - "x": 1161, - "y": 1118 + "x": 1235, + "y": 1098.25 }, { - "x": 1161, - "y": 1134.800048828125 + "x": 1235, + "y": 1132.300048828125 }, { - "x": 1082.199951171875, - "y": 1157.199951171875 + "x": 1156.199951171875, + "y": 1165.9000244140625 }, { - "x": 964, - "y": 1174 + "x": 1038, + "y": 1182.25 }, { - "x": 845.7999877929688, - "y": 1190.800048828125 + "x": 919.7999877929688, + "y": 1198.5999755859375 }, { - "x": 767, - "y": 1213.199951171875 + "x": 841, + "y": 1220.4000244140625 }, { - "x": 767, - "y": 1230 + "x": 841, + "y": 1236.75 }, { - "x": 767, - "y": 1246.800048828125 + "x": 841, + "y": 1253.0999755859375 }, { - "x": 767, - "y": 1332.9000244140625 + "x": 841, + "y": 1329.5 }, { - "x": 767, - "y": 1408.5 + "x": 841, + "y": 1373.5 } ], "isCurve": true, @@ -1637,44 +1637,44 @@ "labelPercentage": 0, "route": [ { - "x": 680.5, - "y": 1110.5 + "x": 754.5, + "y": 1017.5 }, { - "x": 680.5, - "y": 1138.9000244140625 + "x": 754.5, + "y": 1127.5 }, { - "x": 680.5, - "y": 1157.199951171875 + "x": 754.5, + "y": 1165.9000244140625 }, { - "x": 680.5, - "y": 1174 + "x": 754.5, + "y": 1182.25 }, { - "x": 680.5, - "y": 1190.800048828125 + "x": 754.5, + "y": 1198.5999755859375 }, { - "x": 680.5, - "y": 1213.199951171875 + "x": 754.5, + "y": 1220.4000244140625 }, { - "x": 680.5, - "y": 1230 + "x": 754.5, + "y": 1236.75 }, { - "x": 680.5, - "y": 1246.800048828125 + "x": 754.5, + "y": 1253.0999755859375 }, { - "x": 651.2999877929688, + "x": 725.2999877929688, "y": 1333.300048828125 }, { - "x": 534.5, - "y": 1410.5 + "x": 608.5, + "y": 1392.5 } ], "isCurve": true, @@ -1708,44 +1708,44 @@ "labelPercentage": 0, "route": [ { - "x": 509.5, - "y": 1456.5 + "x": 583.5, + "y": 1438.5 }, { - "x": 509.5, - "y": 1484.9000244140625 + "x": 583.5, + "y": 1482.5 }, { - "x": 509.5, - "y": 1503.199951171875 + "x": 583.5, + "y": 1504.4000244140625 }, { - "x": 509.5, - "y": 1520 + "x": 583.5, + "y": 1520.75 }, { - "x": 509.5, - "y": 1536.800048828125 + "x": 583.5, + "y": 1537.0999755859375 }, { - "x": 450, - "y": 1566.0999755859375 + "x": 509.20001220703125, + "y": 1565.800048828125 }, { - "x": 360.75, - "y": 1593.25 + "x": 397.75, + "y": 1592.5 }, { - "x": 271.5, - "y": 1620.4000244140625 + "x": 286.29998779296875, + "y": 1619.199951171875 }, { "x": 212, - "y": 1747.9000244140625 + "y": 1736.9000244140625 }, { "x": 212, - "y": 1823.5 + "y": 1780.5 } ], "isCurve": true, diff --git a/e2etests/testdata/stable/dagre_spacing/dagre/sketch.exp.svg b/e2etests/testdata/stable/dagre_spacing/dagre/sketch.exp.svg index fa88a0678..635e962da 100644 --- a/e2etests/testdata/stable/dagre_spacing/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/dagre_spacing/dagre/sketch.exp.svg @@ -1,23 +1,23 @@ -askuhykfnsomsssscccccccccccccccccccczrgtiiigsjjcfi 1234 - - - - - - - - - - - - - - - - - - - - - - - - - - - - + .d2-3512699457 .fill-N1{fill:#0A0F25;} + .d2-3512699457 .fill-N2{fill:#676C7E;} + .d2-3512699457 .fill-N3{fill:#9499AB;} + .d2-3512699457 .fill-N4{fill:#CFD2DD;} + .d2-3512699457 .fill-N5{fill:#DEE1EB;} + .d2-3512699457 .fill-N6{fill:#EEF1F8;} + .d2-3512699457 .fill-N7{fill:#FFFFFF;} + .d2-3512699457 .fill-B1{fill:#0D32B2;} + .d2-3512699457 .fill-B2{fill:#0D32B2;} + .d2-3512699457 .fill-B3{fill:#E3E9FD;} + .d2-3512699457 .fill-B4{fill:#E3E9FD;} + .d2-3512699457 .fill-B5{fill:#EDF0FD;} + .d2-3512699457 .fill-B6{fill:#F7F8FE;} + .d2-3512699457 .fill-AA2{fill:#4A6FF3;} + .d2-3512699457 .fill-AA4{fill:#EDF0FD;} + .d2-3512699457 .fill-AA5{fill:#F7F8FE;} + .d2-3512699457 .fill-AB4{fill:#EDF0FD;} + .d2-3512699457 .fill-AB5{fill:#F7F8FE;} + .d2-3512699457 .stroke-N1{stroke:#0A0F25;} + .d2-3512699457 .stroke-N2{stroke:#676C7E;} + .d2-3512699457 .stroke-N3{stroke:#9499AB;} + .d2-3512699457 .stroke-N4{stroke:#CFD2DD;} + .d2-3512699457 .stroke-N5{stroke:#DEE1EB;} + .d2-3512699457 .stroke-N6{stroke:#EEF1F8;} + .d2-3512699457 .stroke-N7{stroke:#FFFFFF;} + .d2-3512699457 .stroke-B1{stroke:#0D32B2;} + .d2-3512699457 .stroke-B2{stroke:#0D32B2;} + .d2-3512699457 .stroke-B3{stroke:#E3E9FD;} + .d2-3512699457 .stroke-B4{stroke:#E3E9FD;} + .d2-3512699457 .stroke-B5{stroke:#EDF0FD;} + .d2-3512699457 .stroke-B6{stroke:#F7F8FE;} + .d2-3512699457 .stroke-AA2{stroke:#4A6FF3;} + .d2-3512699457 .stroke-AA4{stroke:#EDF0FD;} + .d2-3512699457 .stroke-AA5{stroke:#F7F8FE;} + .d2-3512699457 .stroke-AB4{stroke:#EDF0FD;} + .d2-3512699457 .stroke-AB5{stroke:#F7F8FE;} + .d2-3512699457 .background-color-N1{background-color:#0A0F25;} + .d2-3512699457 .background-color-N2{background-color:#676C7E;} + .d2-3512699457 .background-color-N3{background-color:#9499AB;} + .d2-3512699457 .background-color-N4{background-color:#CFD2DD;} + .d2-3512699457 .background-color-N5{background-color:#DEE1EB;} + .d2-3512699457 .background-color-N6{background-color:#EEF1F8;} + .d2-3512699457 .background-color-N7{background-color:#FFFFFF;} + .d2-3512699457 .background-color-B1{background-color:#0D32B2;} + .d2-3512699457 .background-color-B2{background-color:#0D32B2;} + .d2-3512699457 .background-color-B3{background-color:#E3E9FD;} + .d2-3512699457 .background-color-B4{background-color:#E3E9FD;} + .d2-3512699457 .background-color-B5{background-color:#EDF0FD;} + .d2-3512699457 .background-color-B6{background-color:#F7F8FE;} + .d2-3512699457 .background-color-AA2{background-color:#4A6FF3;} + .d2-3512699457 .background-color-AA4{background-color:#EDF0FD;} + .d2-3512699457 .background-color-AA5{background-color:#F7F8FE;} + .d2-3512699457 .background-color-AB4{background-color:#EDF0FD;} + .d2-3512699457 .background-color-AB5{background-color:#F7F8FE;} + .d2-3512699457 .color-N1{color:#0A0F25;} + .d2-3512699457 .color-N2{color:#676C7E;} + .d2-3512699457 .color-N3{color:#9499AB;} + .d2-3512699457 .color-N4{color:#CFD2DD;} + .d2-3512699457 .color-N5{color:#DEE1EB;} + .d2-3512699457 .color-N6{color:#EEF1F8;} + .d2-3512699457 .color-N7{color:#FFFFFF;} + .d2-3512699457 .color-B1{color:#0D32B2;} + .d2-3512699457 .color-B2{color:#0D32B2;} + .d2-3512699457 .color-B3{color:#E3E9FD;} + .d2-3512699457 .color-B4{color:#E3E9FD;} + .d2-3512699457 .color-B5{color:#EDF0FD;} + .d2-3512699457 .color-B6{color:#F7F8FE;} + .d2-3512699457 .color-AA2{color:#4A6FF3;} + .d2-3512699457 .color-AA4{color:#EDF0FD;} + .d2-3512699457 .color-AA5{color:#F7F8FE;} + .d2-3512699457 .color-AB4{color:#EDF0FD;} + .d2-3512699457 .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}]]>askuhykfnsomsssscccccccccccccccccccczrgtiiigsjjcfi 1234 + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/dagre_spacing_right/dagre/board.exp.json b/e2etests/testdata/stable/dagre_spacing_right/dagre/board.exp.json index 1429be57f..b53b2c7b7 100644 --- a/e2etests/testdata/stable/dagre_spacing_right/dagre/board.exp.json +++ b/e2etests/testdata/stable/dagre_spacing_right/dagre/board.exp.json @@ -7,11 +7,11 @@ "id": "a", "type": "rectangle", "pos": { - "x": 0, - "y": 41 + "x": 17, + "y": 147 }, - "width": 1784, - "height": 756, + "width": 1787, + "height": 580, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -48,11 +48,11 @@ "id": "a.k", "type": "rectangle", "pos": { - "x": 50, - "y": 168 + "x": 47, + "y": 213 }, - "width": 152, - "height": 300, + "width": 111, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -89,8 +89,8 @@ "id": "a.k.t", "type": "rectangle", "pos": { - "x": 101, - "y": 341 + "x": 77, + "y": 243 }, "width": 51, "height": 66, @@ -130,11 +130,11 @@ "id": "a.f", "type": "rectangle", "pos": { - "x": 402, - "y": 168 + "x": 378, + "y": 188 }, - "width": 176, - "height": 537, + "width": 180, + "height": 509, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -175,7 +175,7 @@ ], "pos": { "x": 463, - "y": 333 + "y": 235 }, "width": 54, "height": 82, @@ -216,7 +216,7 @@ "type": "rectangle", "pos": { "x": 463, - "y": 453 + "y": 418 }, "width": 54, "height": 66, @@ -256,11 +256,11 @@ "id": "s", "type": "rectangle", "pos": { - "x": 728, - "y": 1398 + "x": 840, + "y": 1035 }, - "width": 748, - "height": 855, + "width": 656, + "height": 364, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -300,11 +300,11 @@ "icon" ], "pos": { - "x": 778, - "y": 1525 + "x": 870, + "y": 1109 }, - "width": 295, - "height": 300, + "width": 111, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -353,11 +353,11 @@ "id": "k", "type": "rectangle", "pos": { - "x": 352, - "y": 2716 + "x": 434, + "y": 1911 }, - "width": 276, - "height": 295, + "width": 112, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -395,7 +395,7 @@ "type": "rectangle", "pos": { "x": 464, - "y": 2886 + "y": 1941 }, "width": 52, "height": 66, @@ -435,11 +435,11 @@ "id": "u", "type": "rectangle", "pos": { - "x": 728, - "y": 2406 + "x": 798, + "y": 1465 }, - "width": 395, - "height": 605, + "width": 385, + "height": 572, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -477,7 +477,7 @@ "type": "rectangle", "pos": { "x": 899, - "y": 2886 + "y": 1941 }, "width": 54, "height": 66, @@ -517,11 +517,11 @@ "id": "h", "type": "rectangle", "pos": { - "x": 0, - "y": 1721 + "x": 16, + "y": 1105 }, - "width": 252, - "height": 519, + "width": 172, + "height": 197, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -558,11 +558,11 @@ "id": "h.m", "type": "rectangle", "pos": { - "x": 50, - "y": 1848 + "x": 46, + "y": 1146 }, - "width": 152, - "height": 300, + "width": 112, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -599,8 +599,8 @@ "id": "h.m.s", "type": "rectangle", "pos": { - "x": 100, - "y": 2021 + "x": 76, + "y": 1176 }, "width": 52, "height": 66, @@ -645,10 +645,10 @@ ], "pos": { "x": 452, - "y": 539 + "y": 544 }, "width": 76, - "height": 118, + "height": 123, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -700,11 +700,11 @@ "OutsideBottomCenter" ], "pos": { - "x": 778, - "y": 2547 + "x": 871, + "y": 1495 }, - "width": 295, - "height": 174, + "width": 110, + "height": 127, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -745,7 +745,7 @@ ], "pos": { "x": 901, - "y": 2601 + "y": 1525 }, "width": 50, "height": 66, @@ -789,7 +789,7 @@ ], "pos": { "x": 828, - "y": 2800 + "y": 1815 }, "width": 195, "height": 66, @@ -829,11 +829,11 @@ "id": "s.z", "type": "rectangle", "pos": { - "x": 1273, - "y": 1861 + "x": 1353, + "y": 1243 }, - "width": 153, - "height": 300, + "width": 113, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -870,8 +870,8 @@ "id": "s.z.c", "type": "rectangle", "pos": { - "x": 1323, - "y": 2034 + "x": 1383, + "y": 1273 }, "width": 53, "height": 66, @@ -912,7 +912,7 @@ "type": "rectangle", "pos": { "x": 900, - "y": 1698 + "y": 1139 }, "width": 51, "height": 66, @@ -952,11 +952,11 @@ "id": "y", "type": "rectangle", "pos": { - "x": 1223, - "y": 950 + "x": 1354, + "y": 803 }, - "width": 253, - "height": 295, + "width": 111, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -993,8 +993,8 @@ "id": "y.r", "type": "rectangle", "pos": { - "x": 1324, - "y": 1120 + "x": 1384, + "y": 833 }, "width": 51, "height": 66, @@ -1034,11 +1034,11 @@ "id": "a.g", "type": "rectangle", "pos": { - "x": 1585, - "y": 287 + "x": 1665, + "y": 393 }, - "width": 149, - "height": 300, + "width": 109, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1075,8 +1075,8 @@ "id": "a.g.i", "type": "rectangle", "pos": { - "x": 1635, - "y": 460 + "x": 1695, + "y": 423 }, "width": 49, "height": 66, @@ -1139,56 +1139,56 @@ "labelPercentage": 0, "route": [ { - "x": 152.5, - "y": 374.5 + "x": 128.5, + "y": 276 }, { - "x": 192.10000610351562, - "y": 374.5 + "x": 168.10000610351562, + "y": 276 }, { - "x": 212, - "y": 374.5 + "x": 188, + "y": 276 }, { - "x": 227, - "y": 374.5 + "x": 203, + "y": 276 }, { - "x": 242, - "y": 374.5 + "x": 218, + "y": 276 }, { - "x": 262, - "y": 374.5 + "x": 238, + "y": 276 }, { - "x": 277, - "y": 374.5 + "x": 253, + "y": 276 }, { - "x": 292, - "y": 374.5 + "x": 268, + "y": 276 }, { - "x": 312, - "y": 374.5 + "x": 288, + "y": 276 }, { - "x": 327, - "y": 374.5 + "x": 303, + "y": 276 }, { - "x": 342, - "y": 374.5 + "x": 318, + "y": 276 }, { - "x": 414.20001220703125, - "y": 374.5 + "x": 395, + "y": 276 }, { "x": 463, - "y": 374.5 + "y": 276 } ], "isCurve": true, @@ -1223,55 +1223,55 @@ "route": [ { "x": 517, - "y": 477.5 + "y": 451 }, { "x": 565.7999877929688, - "y": 477.5 + "y": 451 }, { "x": 588, - "y": 477.5 + "y": 451 }, { "x": 603, - "y": 477.5 + "y": 451 }, { "x": 618, - "y": 477.5 + "y": 451 }, { "x": 638, - "y": 477.5 + "y": 451 }, { "x": 653, - "y": 477.5 + "y": 451 }, { "x": 668, - "y": 477.5 + "y": 451 }, { "x": 688, - "y": 477.5 + "y": 451 }, { "x": 703, - "y": 477.5 + "y": 451 }, { "x": 718, - "y": 477.5 + "y": 451 }, { - "x": 802.2000122070312, - "y": 681.7000122070312 + "x": 803.4000244140625, + "y": 582.5999755859375 }, { - "x": 899, - "y": 1498.5 + "x": 905, + "y": 1109 } ], "isCurve": true, @@ -1306,55 +1306,55 @@ "route": [ { "x": 516, - "y": 2919.5 + "y": 1974 }, { "x": 565.5999755859375, - "y": 2919.5 + "y": 1974 }, { "x": 588, - "y": 2919.5 + "y": 1974 }, { "x": 603, - "y": 2919.5 + "y": 1974 }, { "x": 618, - "y": 2919.5 + "y": 1974 }, { "x": 638, - "y": 2919.5 + "y": 1974 }, { "x": 653, - "y": 2919.5 + "y": 1974 }, { "x": 668, - "y": 2919.5 + "y": 1974 }, { "x": 688, - "y": 2919.5 + "y": 1974 }, { "x": 703, - "y": 2919.5 + "y": 1974 }, { "x": 718, - "y": 2919.5 + "y": 1974 }, { "x": 802.0999755859375, - "y": 2919.5 + "y": 1974 }, { "x": 898.5, - "y": 2919.5 + "y": 1974 } ], "isCurve": true, @@ -1388,56 +1388,56 @@ "labelPercentage": 0, "route": [ { - "x": 152, - "y": 2054.5 + "x": 128, + "y": 1208.5 }, { - "x": 192, - "y": 2054.5 + "x": 168, + "y": 1208.5 }, { - "x": 212, - "y": 2054.5 + "x": 188, + "y": 1208.5 }, { - "x": 227, - "y": 2054.5 + "x": 203, + "y": 1208.5 }, { - "x": 242, - "y": 2054.5 + "x": 218, + "y": 1208.5 }, { - "x": 262, - "y": 1740.9000244140625 + "x": 238, + "y": 1057 }, { - "x": 277, - "y": 1270.5 + "x": 253, + "y": 829.75 }, { - "x": 292, - "y": 800.0989990234375 + "x": 268, + "y": 602.5 }, { - "x": 312, - "y": 486.5 + "x": 288, + "y": 451 }, { - "x": 327, - "y": 486.5 + "x": 303, + "y": 451 }, { - "x": 342, - "y": 486.5 + "x": 318, + "y": 451 }, { - "x": 414.20001220703125, - "y": 486.5 + "x": 395, + "y": 451 }, { "x": 463, - "y": 486.5 + "y": 451 } ], "isCurve": true, @@ -1472,55 +1472,55 @@ "route": [ { "x": 528, - "y": 602 + "y": 621 }, { "x": 568, - "y": 602 + "y": 621 }, { "x": 588, - "y": 602 + "y": 621 }, { "x": 603, - "y": 602 + "y": 621 }, { "x": 618, - "y": 602 + "y": 621 }, { "x": 638, - "y": 602 + "y": 621 }, { "x": 653, - "y": 602 + "y": 621 }, { "x": 668, - "y": 602 + "y": 621 }, { "x": 688, - "y": 602 + "y": 621 }, { "x": 703, - "y": 602 + "y": 621 }, { "x": 718, - "y": 602 + "y": 621 }, { - "x": 807, - "y": 1001.2000122070312 + "x": 806, + "y": 801.7999877929688 }, { - "x": 923, - "y": 2598 + "x": 918, + "y": 1525 } ], "isCurve": true, @@ -1555,55 +1555,55 @@ "route": [ { "x": 1023, - "y": 2842.5 + "y": 1848 }, { "x": 1063, - "y": 2842.5 + "y": 1848 }, { - "x": 1083, - "y": 2842.5 + "x": 1095, + "y": 1848 }, { - "x": 1098, - "y": 2842.5 + "x": 1128, + "y": 1848 }, { - "x": 1113, - "y": 2842.5 + "x": 1161, + "y": 1848 }, { - "x": 1133, - "y": 2685.699951171875 + "x": 1193, + "y": 1739.5999755859375 }, { - "x": 1148, - "y": 2450.5 + "x": 1208, + "y": 1577 }, { - "x": 1163, - "y": 2215.300048828125 + "x": 1223, + "y": 1414.4000244140625 }, { - "x": 1183, - "y": 2058.5 + "x": 1243, + "y": 1306 }, { - "x": 1198, - "y": 2058.5 + "x": 1258, + "y": 1306 }, { - "x": 1213, - "y": 2058.5 + "x": 1273, + "y": 1306 }, { - "x": 1283, - "y": 2058.5 + "x": 1343, + "y": 1306 }, { - "x": 1323, - "y": 2058.5 + "x": 1383, + "y": 1306 } ], "isCurve": true, @@ -1637,44 +1637,44 @@ "labelPercentage": 0, "route": [ { - "x": 1073, - "y": 1713.5 + "x": 981, + "y": 1172 }, { - "x": 1113, - "y": 1713.5 + "x": 1142.5999755859375, + "y": 1172 }, { - "x": 1133, - "y": 1713.5 + "x": 1193, + "y": 1172 }, { - "x": 1148, - "y": 1713.5 + "x": 1208, + "y": 1172 }, { - "x": 1163, - "y": 1713.5 + "x": 1223, + "y": 1172 }, { - "x": 1183, - "y": 1713.5 + "x": 1243, + "y": 1172 }, { - "x": 1198, - "y": 1713.5 + "x": 1258, + "y": 1172 }, { - "x": 1213, - "y": 1713.5 + "x": 1273, + "y": 1172 }, { - "x": 1287.4000244140625, - "y": 1608.0999755859375 + "x": 1345.5999755859375, + "y": 1117.4000244140625 }, { - "x": 1345, - "y": 1186.5 + "x": 1396, + "y": 899 } ], "isCurve": true, @@ -1708,44 +1708,44 @@ "labelPercentage": 0, "route": [ { - "x": 1375, - "y": 1162.5 + "x": 1435, + "y": 866 }, { - "x": 1415.800048828125, - "y": 1162.5 + "x": 1475.800048828125, + "y": 866 }, { - "x": 1436, - "y": 1162.5 + "x": 1496, + "y": 866 }, { - "x": 1451, - "y": 1162.5 + "x": 1511, + "y": 866 }, { - "x": 1466, - "y": 1162.5 + "x": 1526, + "y": 866 }, { - "x": 1486.9000244140625, - "y": 1026.800048828125 + "x": 1546.9000244140625, + "y": 784 }, { - "x": 1503.25, - "y": 823.25 + "x": 1563.25, + "y": 661 }, { - "x": 1519.5999755859375, - "y": 619.698974609375 + "x": 1579.5999755859375, + "y": 538 }, { - "x": 1595, - "y": 484 + "x": 1655, + "y": 456 }, { - "x": 1635, - "y": 484 + "x": 1695, + "y": 456 } ], "isCurve": true, diff --git a/e2etests/testdata/stable/dagre_spacing_right/dagre/sketch.exp.svg b/e2etests/testdata/stable/dagre_spacing_right/dagre/sketch.exp.svg index a78e8ff11..ed3215288 100644 --- a/e2etests/testdata/stable/dagre_spacing_right/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/dagre_spacing_right/dagre/sketch.exp.svg @@ -1,23 +1,23 @@ -askuhykfnsomsssscccccccccccccccccccczrgtiiigsjjcfi 1234 - - - - - - - - - - - - - - - - - - - - - - - - - - - - + .d2-4237444760 .fill-N1{fill:#0A0F25;} + .d2-4237444760 .fill-N2{fill:#676C7E;} + .d2-4237444760 .fill-N3{fill:#9499AB;} + .d2-4237444760 .fill-N4{fill:#CFD2DD;} + .d2-4237444760 .fill-N5{fill:#DEE1EB;} + .d2-4237444760 .fill-N6{fill:#EEF1F8;} + .d2-4237444760 .fill-N7{fill:#FFFFFF;} + .d2-4237444760 .fill-B1{fill:#0D32B2;} + .d2-4237444760 .fill-B2{fill:#0D32B2;} + .d2-4237444760 .fill-B3{fill:#E3E9FD;} + .d2-4237444760 .fill-B4{fill:#E3E9FD;} + .d2-4237444760 .fill-B5{fill:#EDF0FD;} + .d2-4237444760 .fill-B6{fill:#F7F8FE;} + .d2-4237444760 .fill-AA2{fill:#4A6FF3;} + .d2-4237444760 .fill-AA4{fill:#EDF0FD;} + .d2-4237444760 .fill-AA5{fill:#F7F8FE;} + .d2-4237444760 .fill-AB4{fill:#EDF0FD;} + .d2-4237444760 .fill-AB5{fill:#F7F8FE;} + .d2-4237444760 .stroke-N1{stroke:#0A0F25;} + .d2-4237444760 .stroke-N2{stroke:#676C7E;} + .d2-4237444760 .stroke-N3{stroke:#9499AB;} + .d2-4237444760 .stroke-N4{stroke:#CFD2DD;} + .d2-4237444760 .stroke-N5{stroke:#DEE1EB;} + .d2-4237444760 .stroke-N6{stroke:#EEF1F8;} + .d2-4237444760 .stroke-N7{stroke:#FFFFFF;} + .d2-4237444760 .stroke-B1{stroke:#0D32B2;} + .d2-4237444760 .stroke-B2{stroke:#0D32B2;} + .d2-4237444760 .stroke-B3{stroke:#E3E9FD;} + .d2-4237444760 .stroke-B4{stroke:#E3E9FD;} + .d2-4237444760 .stroke-B5{stroke:#EDF0FD;} + .d2-4237444760 .stroke-B6{stroke:#F7F8FE;} + .d2-4237444760 .stroke-AA2{stroke:#4A6FF3;} + .d2-4237444760 .stroke-AA4{stroke:#EDF0FD;} + .d2-4237444760 .stroke-AA5{stroke:#F7F8FE;} + .d2-4237444760 .stroke-AB4{stroke:#EDF0FD;} + .d2-4237444760 .stroke-AB5{stroke:#F7F8FE;} + .d2-4237444760 .background-color-N1{background-color:#0A0F25;} + .d2-4237444760 .background-color-N2{background-color:#676C7E;} + .d2-4237444760 .background-color-N3{background-color:#9499AB;} + .d2-4237444760 .background-color-N4{background-color:#CFD2DD;} + .d2-4237444760 .background-color-N5{background-color:#DEE1EB;} + .d2-4237444760 .background-color-N6{background-color:#EEF1F8;} + .d2-4237444760 .background-color-N7{background-color:#FFFFFF;} + .d2-4237444760 .background-color-B1{background-color:#0D32B2;} + .d2-4237444760 .background-color-B2{background-color:#0D32B2;} + .d2-4237444760 .background-color-B3{background-color:#E3E9FD;} + .d2-4237444760 .background-color-B4{background-color:#E3E9FD;} + .d2-4237444760 .background-color-B5{background-color:#EDF0FD;} + .d2-4237444760 .background-color-B6{background-color:#F7F8FE;} + .d2-4237444760 .background-color-AA2{background-color:#4A6FF3;} + .d2-4237444760 .background-color-AA4{background-color:#EDF0FD;} + .d2-4237444760 .background-color-AA5{background-color:#F7F8FE;} + .d2-4237444760 .background-color-AB4{background-color:#EDF0FD;} + .d2-4237444760 .background-color-AB5{background-color:#F7F8FE;} + .d2-4237444760 .color-N1{color:#0A0F25;} + .d2-4237444760 .color-N2{color:#676C7E;} + .d2-4237444760 .color-N3{color:#9499AB;} + .d2-4237444760 .color-N4{color:#CFD2DD;} + .d2-4237444760 .color-N5{color:#DEE1EB;} + .d2-4237444760 .color-N6{color:#EEF1F8;} + .d2-4237444760 .color-N7{color:#FFFFFF;} + .d2-4237444760 .color-B1{color:#0D32B2;} + .d2-4237444760 .color-B2{color:#0D32B2;} + .d2-4237444760 .color-B3{color:#E3E9FD;} + .d2-4237444760 .color-B4{color:#E3E9FD;} + .d2-4237444760 .color-B5{color:#EDF0FD;} + .d2-4237444760 .color-B6{color:#F7F8FE;} + .d2-4237444760 .color-AA2{color:#4A6FF3;} + .d2-4237444760 .color-AA4{color:#EDF0FD;} + .d2-4237444760 .color-AA5{color:#F7F8FE;} + .d2-4237444760 .color-AB4{color:#EDF0FD;} + .d2-4237444760 .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}]]>askuhykfnsomsssscccccccccccccccccccczrgtiiigsjjcfi 1234 + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/dagre_spacing_right/elk/board.exp.json b/e2etests/testdata/stable/dagre_spacing_right/elk/board.exp.json index 635647da1..3cb0c0cf7 100644 --- a/e2etests/testdata/stable/dagre_spacing_right/elk/board.exp.json +++ b/e2etests/testdata/stable/dagre_spacing_right/elk/board.exp.json @@ -1177,7 +1177,7 @@ "labelPercentage": 0, "route": [ { - "x": 799.5, + "x": 799, "y": 439.5 }, { @@ -1197,7 +1197,7 @@ "y": 464.5 }, { - "x": 1683.5, + "x": 1684, "y": 464.5 } ], @@ -1289,7 +1289,7 @@ "y": 439.5 }, { - "x": 745.5, + "x": 746, "y": 439.5 } ], @@ -1407,7 +1407,7 @@ "labelPercentage": 0, "route": [ { - "x": 1834.5, + "x": 1834, "y": 464.5 }, { diff --git a/e2etests/testdata/stable/dagre_spacing_right/elk/sketch.exp.svg b/e2etests/testdata/stable/dagre_spacing_right/elk/sketch.exp.svg index 074572c31..328f70ce5 100644 --- a/e2etests/testdata/stable/dagre_spacing_right/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/dagre_spacing_right/elk/sketch.exp.svg @@ -1,23 +1,23 @@ -askuhykfnsomsssscccccccccccccccccccczrgtiiigsjjcfi 1234 + .d2-2275681348 .fill-N1{fill:#0A0F25;} + .d2-2275681348 .fill-N2{fill:#676C7E;} + .d2-2275681348 .fill-N3{fill:#9499AB;} + .d2-2275681348 .fill-N4{fill:#CFD2DD;} + .d2-2275681348 .fill-N5{fill:#DEE1EB;} + .d2-2275681348 .fill-N6{fill:#EEF1F8;} + .d2-2275681348 .fill-N7{fill:#FFFFFF;} + .d2-2275681348 .fill-B1{fill:#0D32B2;} + .d2-2275681348 .fill-B2{fill:#0D32B2;} + .d2-2275681348 .fill-B3{fill:#E3E9FD;} + .d2-2275681348 .fill-B4{fill:#E3E9FD;} + .d2-2275681348 .fill-B5{fill:#EDF0FD;} + .d2-2275681348 .fill-B6{fill:#F7F8FE;} + .d2-2275681348 .fill-AA2{fill:#4A6FF3;} + .d2-2275681348 .fill-AA4{fill:#EDF0FD;} + .d2-2275681348 .fill-AA5{fill:#F7F8FE;} + .d2-2275681348 .fill-AB4{fill:#EDF0FD;} + .d2-2275681348 .fill-AB5{fill:#F7F8FE;} + .d2-2275681348 .stroke-N1{stroke:#0A0F25;} + .d2-2275681348 .stroke-N2{stroke:#676C7E;} + .d2-2275681348 .stroke-N3{stroke:#9499AB;} + .d2-2275681348 .stroke-N4{stroke:#CFD2DD;} + .d2-2275681348 .stroke-N5{stroke:#DEE1EB;} + .d2-2275681348 .stroke-N6{stroke:#EEF1F8;} + .d2-2275681348 .stroke-N7{stroke:#FFFFFF;} + .d2-2275681348 .stroke-B1{stroke:#0D32B2;} + .d2-2275681348 .stroke-B2{stroke:#0D32B2;} + .d2-2275681348 .stroke-B3{stroke:#E3E9FD;} + .d2-2275681348 .stroke-B4{stroke:#E3E9FD;} + .d2-2275681348 .stroke-B5{stroke:#EDF0FD;} + .d2-2275681348 .stroke-B6{stroke:#F7F8FE;} + .d2-2275681348 .stroke-AA2{stroke:#4A6FF3;} + .d2-2275681348 .stroke-AA4{stroke:#EDF0FD;} + .d2-2275681348 .stroke-AA5{stroke:#F7F8FE;} + .d2-2275681348 .stroke-AB4{stroke:#EDF0FD;} + .d2-2275681348 .stroke-AB5{stroke:#F7F8FE;} + .d2-2275681348 .background-color-N1{background-color:#0A0F25;} + .d2-2275681348 .background-color-N2{background-color:#676C7E;} + .d2-2275681348 .background-color-N3{background-color:#9499AB;} + .d2-2275681348 .background-color-N4{background-color:#CFD2DD;} + .d2-2275681348 .background-color-N5{background-color:#DEE1EB;} + .d2-2275681348 .background-color-N6{background-color:#EEF1F8;} + .d2-2275681348 .background-color-N7{background-color:#FFFFFF;} + .d2-2275681348 .background-color-B1{background-color:#0D32B2;} + .d2-2275681348 .background-color-B2{background-color:#0D32B2;} + .d2-2275681348 .background-color-B3{background-color:#E3E9FD;} + .d2-2275681348 .background-color-B4{background-color:#E3E9FD;} + .d2-2275681348 .background-color-B5{background-color:#EDF0FD;} + .d2-2275681348 .background-color-B6{background-color:#F7F8FE;} + .d2-2275681348 .background-color-AA2{background-color:#4A6FF3;} + .d2-2275681348 .background-color-AA4{background-color:#EDF0FD;} + .d2-2275681348 .background-color-AA5{background-color:#F7F8FE;} + .d2-2275681348 .background-color-AB4{background-color:#EDF0FD;} + .d2-2275681348 .background-color-AB5{background-color:#F7F8FE;} + .d2-2275681348 .color-N1{color:#0A0F25;} + .d2-2275681348 .color-N2{color:#676C7E;} + .d2-2275681348 .color-N3{color:#9499AB;} + .d2-2275681348 .color-N4{color:#CFD2DD;} + .d2-2275681348 .color-N5{color:#DEE1EB;} + .d2-2275681348 .color-N6{color:#EEF1F8;} + .d2-2275681348 .color-N7{color:#FFFFFF;} + .d2-2275681348 .color-B1{color:#0D32B2;} + .d2-2275681348 .color-B2{color:#0D32B2;} + .d2-2275681348 .color-B3{color:#E3E9FD;} + .d2-2275681348 .color-B4{color:#E3E9FD;} + .d2-2275681348 .color-B5{color:#EDF0FD;} + .d2-2275681348 .color-B6{color:#F7F8FE;} + .d2-2275681348 .color-AA2{color:#4A6FF3;} + .d2-2275681348 .color-AA4{color:#EDF0FD;} + .d2-2275681348 .color-AA5{color:#F7F8FE;} + .d2-2275681348 .color-AB4{color:#EDF0FD;} + .d2-2275681348 .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}]]>askuhykfnsomsssscccccccccccccccccccczrgtiiigsjjcfi 1234 diff --git a/e2etests/testdata/stable/dense/dagre/board.exp.json b/e2etests/testdata/stable/dense/dagre/board.exp.json index a38d85848..1e0ce8804 100644 --- a/e2etests/testdata/stable/dense/dagre/board.exp.json +++ b/e2etests/testdata/stable/dense/dagre/board.exp.json @@ -775,11 +775,11 @@ "route": [ { "x": 117, - "y": 511.447998046875 + "y": 511 }, { "x": 185.8000030517578, - "y": 460.6889953613281 + "y": 460.6000061035156 }, { "x": 203, @@ -951,12 +951,12 @@ "labelPercentage": 0, "route": [ { - "x": 340, - "y": 210.01100158691406 + "x": 340.25, + "y": 210 }, { - "x": 478.6000061035156, - "y": 267.60198974609375 + "x": 478.6499938964844, + "y": 267.6000061035156 }, { "x": 513.25, @@ -1010,12 +1010,12 @@ "labelPercentage": 0, "route": [ { - "x": 340, - "y": 206.61000061035156 + "x": 339.5, + "y": 207 }, { - "x": 550, - "y": 266.9219970703125 + "x": 549.9000244140625, + "y": 267 }, { "x": 602.5, @@ -1104,12 +1104,12 @@ "labelPercentage": 0, "route": [ { - "x": 287, - "y": 211.42599487304688 + "x": 287.5, + "y": 211 }, { - "x": 166.60000610351562, - "y": 267.885009765625 + "x": 166.6999969482422, + "y": 267.79998779296875 }, { "x": 136.5, @@ -1151,11 +1151,11 @@ "labelPercentage": 0, "route": [ { - "x": 322.8429870605469, + "x": 323, "y": 232 }, { - "x": 334.1679992675781, + "x": 334.20001220703125, "y": 272 }, { @@ -1259,11 +1259,11 @@ "route": [ { "x": 340, - "y": 212.2100067138672 + "y": 212 }, { "x": 452, - "y": 268.0419921875 + "y": 268 }, { "x": 480, @@ -1364,11 +1364,11 @@ "labelPercentage": 0, "route": [ { - "x": 37.92100143432617, + "x": 37.5, "y": 332 }, { - "x": 53.58399963378906, + "x": 53.5, "y": 292 }, { @@ -1424,11 +1424,11 @@ "route": [ { "x": 287, - "y": 206.6230010986328 + "y": 207 }, { "x": 77.39900207519531, - "y": 266.92401123046875 + "y": 267 }, { "x": 25, @@ -1517,12 +1517,12 @@ "labelPercentage": 0, "route": [ { - "x": 507, - "y": 544.2210083007812 + "x": 506.5, + "y": 544 }, { - "x": 621, - "y": 600.0440063476562 + "x": 620.9000244140625, + "y": 600 }, { "x": 666.5, @@ -1611,11 +1611,11 @@ "labelPercentage": 0, "route": [ { - "x": 710.4749755859375, + "x": 710.5, "y": 564 }, { - "x": 715.2949829101562, + "x": 715.2999877929688, "y": 604 }, { @@ -1658,12 +1658,12 @@ "labelPercentage": 0, "route": [ { - "x": 678, - "y": 538.47900390625 + "x": 678.25, + "y": 538 }, { - "x": 447.79901123046875, - "y": 598.89501953125 + "x": 447.8500061035156, + "y": 598.7999877929688 }, { "x": 393.04998779296875, @@ -1752,11 +1752,11 @@ "labelPercentage": 0, "route": [ { - "x": 453.55999755859375, + "x": 453.5, "y": 564 }, { - "x": 421.5119934082031, + "x": 421.5, "y": 604 }, { @@ -1799,12 +1799,12 @@ "labelPercentage": 0, "route": [ { - "x": 567, - "y": 544.5889892578125 + "x": 566.75, + "y": 545 }, { - "x": 462.79998779296875, - "y": 600.1170043945312 + "x": 462.75, + "y": 600.2000122070312 }, { "x": 433.95001220703125, @@ -1846,11 +1846,11 @@ "labelPercentage": 0, "route": [ { - "x": 296.2040100097656, + "x": 296, "y": 232 }, { - "x": 275.239990234375, + "x": 275.20001220703125, "y": 272 }, { @@ -1902,11 +1902,11 @@ }, { "x": 817.9000244140625, - "y": 624.4000244140625 + "y": 624.2000122070312 }, { "x": 783.5, - "y": 666 + "y": 665 } ], "isCurve": true, diff --git a/e2etests/testdata/stable/dense/dagre/sketch.exp.svg b/e2etests/testdata/stable/dense/dagre/sketch.exp.svg index 6aedcc551..9fe3aa58f 100644 --- a/e2etests/testdata/stable/dense/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/dense/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -abcdefghijklmnopq + .d2-1170671173 .fill-N1{fill:#0A0F25;} + .d2-1170671173 .fill-N2{fill:#676C7E;} + .d2-1170671173 .fill-N3{fill:#9499AB;} + .d2-1170671173 .fill-N4{fill:#CFD2DD;} + .d2-1170671173 .fill-N5{fill:#DEE1EB;} + .d2-1170671173 .fill-N6{fill:#EEF1F8;} + .d2-1170671173 .fill-N7{fill:#FFFFFF;} + .d2-1170671173 .fill-B1{fill:#0D32B2;} + .d2-1170671173 .fill-B2{fill:#0D32B2;} + .d2-1170671173 .fill-B3{fill:#E3E9FD;} + .d2-1170671173 .fill-B4{fill:#E3E9FD;} + .d2-1170671173 .fill-B5{fill:#EDF0FD;} + .d2-1170671173 .fill-B6{fill:#F7F8FE;} + .d2-1170671173 .fill-AA2{fill:#4A6FF3;} + .d2-1170671173 .fill-AA4{fill:#EDF0FD;} + .d2-1170671173 .fill-AA5{fill:#F7F8FE;} + .d2-1170671173 .fill-AB4{fill:#EDF0FD;} + .d2-1170671173 .fill-AB5{fill:#F7F8FE;} + .d2-1170671173 .stroke-N1{stroke:#0A0F25;} + .d2-1170671173 .stroke-N2{stroke:#676C7E;} + .d2-1170671173 .stroke-N3{stroke:#9499AB;} + .d2-1170671173 .stroke-N4{stroke:#CFD2DD;} + .d2-1170671173 .stroke-N5{stroke:#DEE1EB;} + .d2-1170671173 .stroke-N6{stroke:#EEF1F8;} + .d2-1170671173 .stroke-N7{stroke:#FFFFFF;} + .d2-1170671173 .stroke-B1{stroke:#0D32B2;} + .d2-1170671173 .stroke-B2{stroke:#0D32B2;} + .d2-1170671173 .stroke-B3{stroke:#E3E9FD;} + .d2-1170671173 .stroke-B4{stroke:#E3E9FD;} + .d2-1170671173 .stroke-B5{stroke:#EDF0FD;} + .d2-1170671173 .stroke-B6{stroke:#F7F8FE;} + .d2-1170671173 .stroke-AA2{stroke:#4A6FF3;} + .d2-1170671173 .stroke-AA4{stroke:#EDF0FD;} + .d2-1170671173 .stroke-AA5{stroke:#F7F8FE;} + .d2-1170671173 .stroke-AB4{stroke:#EDF0FD;} + .d2-1170671173 .stroke-AB5{stroke:#F7F8FE;} + .d2-1170671173 .background-color-N1{background-color:#0A0F25;} + .d2-1170671173 .background-color-N2{background-color:#676C7E;} + .d2-1170671173 .background-color-N3{background-color:#9499AB;} + .d2-1170671173 .background-color-N4{background-color:#CFD2DD;} + .d2-1170671173 .background-color-N5{background-color:#DEE1EB;} + .d2-1170671173 .background-color-N6{background-color:#EEF1F8;} + .d2-1170671173 .background-color-N7{background-color:#FFFFFF;} + .d2-1170671173 .background-color-B1{background-color:#0D32B2;} + .d2-1170671173 .background-color-B2{background-color:#0D32B2;} + .d2-1170671173 .background-color-B3{background-color:#E3E9FD;} + .d2-1170671173 .background-color-B4{background-color:#E3E9FD;} + .d2-1170671173 .background-color-B5{background-color:#EDF0FD;} + .d2-1170671173 .background-color-B6{background-color:#F7F8FE;} + .d2-1170671173 .background-color-AA2{background-color:#4A6FF3;} + .d2-1170671173 .background-color-AA4{background-color:#EDF0FD;} + .d2-1170671173 .background-color-AA5{background-color:#F7F8FE;} + .d2-1170671173 .background-color-AB4{background-color:#EDF0FD;} + .d2-1170671173 .background-color-AB5{background-color:#F7F8FE;} + .d2-1170671173 .color-N1{color:#0A0F25;} + .d2-1170671173 .color-N2{color:#676C7E;} + .d2-1170671173 .color-N3{color:#9499AB;} + .d2-1170671173 .color-N4{color:#CFD2DD;} + .d2-1170671173 .color-N5{color:#DEE1EB;} + .d2-1170671173 .color-N6{color:#EEF1F8;} + .d2-1170671173 .color-N7{color:#FFFFFF;} + .d2-1170671173 .color-B1{color:#0D32B2;} + .d2-1170671173 .color-B2{color:#0D32B2;} + .d2-1170671173 .color-B3{color:#E3E9FD;} + .d2-1170671173 .color-B4{color:#E3E9FD;} + .d2-1170671173 .color-B5{color:#EDF0FD;} + .d2-1170671173 .color-B6{color:#F7F8FE;} + .d2-1170671173 .color-AA2{color:#4A6FF3;} + .d2-1170671173 .color-AA4{color:#EDF0FD;} + .d2-1170671173 .color-AA5{color:#F7F8FE;} + .d2-1170671173 .color-AB4{color:#EDF0FD;} + .d2-1170671173 .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}]]>abcdefghijklmnopq diff --git a/e2etests/testdata/stable/different_subgraphs/dagre/board.exp.json b/e2etests/testdata/stable/different_subgraphs/dagre/board.exp.json index 6fd0f433d..641c7ddcd 100644 --- a/e2etests/testdata/stable/different_subgraphs/dagre/board.exp.json +++ b/e2etests/testdata/stable/different_subgraphs/dagre/board.exp.json @@ -499,11 +499,11 @@ "id": "finally", "type": "rectangle", "pos": { - "x": 863, - "y": 41 + "x": 873, + "y": 20 }, - "width": 312, - "height": 623, + "width": 288, + "height": 624, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -705,7 +705,7 @@ "type": "rectangle", "pos": { "x": 1000, - "y": 236 + "y": 216 }, "width": 53, "height": 66, @@ -746,7 +746,7 @@ "type": "rectangle", "pos": { "x": 922, - "y": 402 + "y": 382 }, "width": 74, "height": 66, @@ -787,7 +787,7 @@ "type": "rectangle", "pos": { "x": 982, - "y": 70 + "y": 50 }, "width": 88, "height": 66, @@ -828,7 +828,7 @@ "type": "rectangle", "pos": { "x": 903, - "y": 568 + "y": 548 }, "width": 113, "height": 66, @@ -869,7 +869,7 @@ "type": "rectangle", "pos": { "x": 1056, - "y": 402 + "y": 382 }, "width": 75, "height": 66, @@ -933,11 +933,11 @@ "route": [ { "x": 301, - "y": 93.20600128173828 + "y": 93 }, { "x": 149.7989959716797, - "y": 151.4409942626953 + "y": 151.39999389648438 }, { "x": 112, @@ -1027,11 +1027,11 @@ "route": [ { "x": 354, - "y": 98.76699829101562 + "y": 99 }, { "x": 444.3999938964844, - "y": 152.55299377441406 + "y": 152.60000610351562 }, { "x": 467, @@ -1120,11 +1120,11 @@ "labelPercentage": 0, "route": [ { - "x": 83.5719985961914, + "x": 83.5, "y": 282 }, { - "x": 49.11399841308594, + "x": 49.099998474121094, "y": 322 }, { @@ -1167,11 +1167,11 @@ "labelPercentage": 0, "route": [ { - "x": 140.427001953125, + "x": 140.5, "y": 282 }, { - "x": 174.88499450683594, + "x": 174.89999389648438, "y": 322 }, { @@ -1214,11 +1214,11 @@ "labelPercentage": 0, "route": [ { - "x": 614.5239868164062, + "x": 614.5, "y": 116 }, { - "x": 609.7039794921875, + "x": 609.7000122070312, "y": 156 }, { @@ -1355,11 +1355,11 @@ "labelPercentage": 0, "route": [ { - "x": 649.2130126953125, + "x": 648.75, "y": 116 }, { - "x": 686.4420166015625, + "x": 686.3499755859375, "y": 156 }, { @@ -1403,11 +1403,11 @@ "route": [ { "x": 930.75, - "y": 664 + "y": 644 }, { "x": 930.75, - "y": 704 + "y": 700 }, { "x": 930.75, @@ -1544,11 +1544,11 @@ "route": [ { "x": 1055, - "y": 664 + "y": 644 }, { "x": 1055, - "y": 704 + "y": 700 }, { "x": 1077.550048828125, @@ -1591,19 +1591,19 @@ "route": [ { "x": 999.75, - "y": 302.20599365234375 + "y": 281.70599365234375 }, { "x": 967.1500244140625, - "y": 342.4410095214844 + "y": 321.9410095214844 }, { "x": 959, - "y": 362.5 + "y": 342 }, { "x": 959, - "y": 402.5 + "y": 382 } ], "isCurve": true, @@ -1638,19 +1638,19 @@ "route": [ { "x": 1026.25, - "y": 136.5 + "y": 116 }, { "x": 1026.25, - "y": 176.5 + "y": 156 }, { "x": 1026.25, - "y": 196.5 + "y": 176 }, { "x": 1026.25, - "y": 236.5 + "y": 216 } ], "isCurve": true, @@ -1685,19 +1685,19 @@ "route": [ { "x": 959, - "y": 468.5 + "y": 448 }, { "x": 959, - "y": 508.5 + "y": 488 }, { "x": 959, - "y": 528.5 + "y": 508 }, { "x": 959, - "y": 568.5 + "y": 548 } ], "isCurve": true, @@ -1731,20 +1731,20 @@ "labelPercentage": 0, "route": [ { - "x": 1052.75, - "y": 302.20599365234375 + "x": 1052.5, + "y": 282 }, { - "x": 1085.3499755859375, - "y": 342.4410095214844 + "x": 1085.300048828125, + "y": 322 }, { "x": 1093.5, - "y": 362.5 + "y": 342 }, { "x": 1093.5, - "y": 402.5 + "y": 382 } ], "isCurve": true, diff --git a/e2etests/testdata/stable/different_subgraphs/dagre/sketch.exp.svg b/e2etests/testdata/stable/different_subgraphs/dagre/sketch.exp.svg index c555a97a2..adcda8c80 100644 --- a/e2etests/testdata/stable/different_subgraphs/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/different_subgraphs/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -atreeandnodessomemoremanythenhereyouhavehierarchyfinallyanotherofnestingtreesatreeinsidehierarchyroot - + .d2-2884768994 .fill-N1{fill:#0A0F25;} + .d2-2884768994 .fill-N2{fill:#676C7E;} + .d2-2884768994 .fill-N3{fill:#9499AB;} + .d2-2884768994 .fill-N4{fill:#CFD2DD;} + .d2-2884768994 .fill-N5{fill:#DEE1EB;} + .d2-2884768994 .fill-N6{fill:#EEF1F8;} + .d2-2884768994 .fill-N7{fill:#FFFFFF;} + .d2-2884768994 .fill-B1{fill:#0D32B2;} + .d2-2884768994 .fill-B2{fill:#0D32B2;} + .d2-2884768994 .fill-B3{fill:#E3E9FD;} + .d2-2884768994 .fill-B4{fill:#E3E9FD;} + .d2-2884768994 .fill-B5{fill:#EDF0FD;} + .d2-2884768994 .fill-B6{fill:#F7F8FE;} + .d2-2884768994 .fill-AA2{fill:#4A6FF3;} + .d2-2884768994 .fill-AA4{fill:#EDF0FD;} + .d2-2884768994 .fill-AA5{fill:#F7F8FE;} + .d2-2884768994 .fill-AB4{fill:#EDF0FD;} + .d2-2884768994 .fill-AB5{fill:#F7F8FE;} + .d2-2884768994 .stroke-N1{stroke:#0A0F25;} + .d2-2884768994 .stroke-N2{stroke:#676C7E;} + .d2-2884768994 .stroke-N3{stroke:#9499AB;} + .d2-2884768994 .stroke-N4{stroke:#CFD2DD;} + .d2-2884768994 .stroke-N5{stroke:#DEE1EB;} + .d2-2884768994 .stroke-N6{stroke:#EEF1F8;} + .d2-2884768994 .stroke-N7{stroke:#FFFFFF;} + .d2-2884768994 .stroke-B1{stroke:#0D32B2;} + .d2-2884768994 .stroke-B2{stroke:#0D32B2;} + .d2-2884768994 .stroke-B3{stroke:#E3E9FD;} + .d2-2884768994 .stroke-B4{stroke:#E3E9FD;} + .d2-2884768994 .stroke-B5{stroke:#EDF0FD;} + .d2-2884768994 .stroke-B6{stroke:#F7F8FE;} + .d2-2884768994 .stroke-AA2{stroke:#4A6FF3;} + .d2-2884768994 .stroke-AA4{stroke:#EDF0FD;} + .d2-2884768994 .stroke-AA5{stroke:#F7F8FE;} + .d2-2884768994 .stroke-AB4{stroke:#EDF0FD;} + .d2-2884768994 .stroke-AB5{stroke:#F7F8FE;} + .d2-2884768994 .background-color-N1{background-color:#0A0F25;} + .d2-2884768994 .background-color-N2{background-color:#676C7E;} + .d2-2884768994 .background-color-N3{background-color:#9499AB;} + .d2-2884768994 .background-color-N4{background-color:#CFD2DD;} + .d2-2884768994 .background-color-N5{background-color:#DEE1EB;} + .d2-2884768994 .background-color-N6{background-color:#EEF1F8;} + .d2-2884768994 .background-color-N7{background-color:#FFFFFF;} + .d2-2884768994 .background-color-B1{background-color:#0D32B2;} + .d2-2884768994 .background-color-B2{background-color:#0D32B2;} + .d2-2884768994 .background-color-B3{background-color:#E3E9FD;} + .d2-2884768994 .background-color-B4{background-color:#E3E9FD;} + .d2-2884768994 .background-color-B5{background-color:#EDF0FD;} + .d2-2884768994 .background-color-B6{background-color:#F7F8FE;} + .d2-2884768994 .background-color-AA2{background-color:#4A6FF3;} + .d2-2884768994 .background-color-AA4{background-color:#EDF0FD;} + .d2-2884768994 .background-color-AA5{background-color:#F7F8FE;} + .d2-2884768994 .background-color-AB4{background-color:#EDF0FD;} + .d2-2884768994 .background-color-AB5{background-color:#F7F8FE;} + .d2-2884768994 .color-N1{color:#0A0F25;} + .d2-2884768994 .color-N2{color:#676C7E;} + .d2-2884768994 .color-N3{color:#9499AB;} + .d2-2884768994 .color-N4{color:#CFD2DD;} + .d2-2884768994 .color-N5{color:#DEE1EB;} + .d2-2884768994 .color-N6{color:#EEF1F8;} + .d2-2884768994 .color-N7{color:#FFFFFF;} + .d2-2884768994 .color-B1{color:#0D32B2;} + .d2-2884768994 .color-B2{color:#0D32B2;} + .d2-2884768994 .color-B3{color:#E3E9FD;} + .d2-2884768994 .color-B4{color:#E3E9FD;} + .d2-2884768994 .color-B5{color:#EDF0FD;} + .d2-2884768994 .color-B6{color:#F7F8FE;} + .d2-2884768994 .color-AA2{color:#4A6FF3;} + .d2-2884768994 .color-AA4{color:#EDF0FD;} + .d2-2884768994 .color-AA5{color:#F7F8FE;} + .d2-2884768994 .color-AB4{color:#EDF0FD;} + .d2-2884768994 .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}]]>atreeandnodessomemoremanythenhereyouhavehierarchyfinallyanotherofnestingtreesatreeinsidehierarchyroot + @@ -110,14 +110,14 @@ - + - - - - - + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/direction/dagre/board.exp.json b/e2etests/testdata/stable/direction/dagre/board.exp.json index 26c15544e..51c75f9e1 100644 --- a/e2etests/testdata/stable/direction/dagre/board.exp.json +++ b/e2etests/testdata/stable/direction/dagre/board.exp.json @@ -49,10 +49,10 @@ "type": "rectangle", "pos": { "x": 0, - "y": 207 + "y": 186 }, "width": 174, - "height": 1553, + "height": 1554, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -213,7 +213,7 @@ "type": "rectangle", "pos": { "x": 61, - "y": 236 + "y": 216 }, "width": 52, "height": 66, @@ -253,11 +253,11 @@ "id": "b.2", "type": "rectangle", "pos": { - "x": 20, - "y": 438 + "x": 30, + "y": 402 }, - "width": 134, - "height": 794, + "width": 114, + "height": 790, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -295,7 +295,7 @@ "type": "rectangle", "pos": { "x": 61, - "y": 1332 + "y": 1312 }, "width": 53, "height": 66, @@ -336,7 +336,7 @@ "type": "rectangle", "pos": { "x": 60, - "y": 1498 + "y": 1478 }, "width": 54, "height": 66, @@ -377,7 +377,7 @@ "type": "rectangle", "pos": { "x": 61, - "y": 1664 + "y": 1644 }, "width": 53, "height": 66, @@ -418,7 +418,7 @@ "type": "rectangle", "pos": { "x": 61, - "y": 470 + "y": 432 }, "width": 53, "height": 66, @@ -459,7 +459,7 @@ "type": "rectangle", "pos": { "x": 61, - "y": 636 + "y": 598 }, "width": 53, "height": 66, @@ -500,7 +500,7 @@ "type": "rectangle", "pos": { "x": 61, - "y": 802 + "y": 764 }, "width": 53, "height": 66, @@ -541,7 +541,7 @@ "type": "rectangle", "pos": { "x": 60, - "y": 968 + "y": 930 }, "width": 54, "height": 66, @@ -582,7 +582,7 @@ "type": "rectangle", "pos": { "x": 61, - "y": 1134 + "y": 1096 }, "width": 53, "height": 66, @@ -654,11 +654,11 @@ }, { "x": 87, - "y": 126 + "y": 121.80000305175781 }, { "x": 87, - "y": 166 + "y": 145 } ], "isCurve": true, @@ -693,11 +693,11 @@ "route": [ { "x": 87, - "y": 1760 + "y": 1740 }, { "x": 87, - "y": 1800 + "y": 1796 }, { "x": 87, @@ -834,19 +834,19 @@ "route": [ { "x": 87, - "y": 302.5 + "y": 282 }, { "x": 87, - "y": 342.5 + "y": 322 }, { "x": 87, - "y": 362.5 + "y": 338.79998779296875 }, { "x": 87, - "y": 402.5 + "y": 366 } ], "isCurve": true, @@ -881,19 +881,19 @@ "route": [ { "x": 87, - "y": 1232.5 + "y": 1192 }, { "x": 87, - "y": 1272.5 + "y": 1248 }, { "x": 87, - "y": 1292.5 + "y": 1272 }, { "x": 87, - "y": 1332.5 + "y": 1312 } ], "isCurve": true, @@ -928,19 +928,19 @@ "route": [ { "x": 87, - "y": 1398.5 + "y": 1378 }, { "x": 87, - "y": 1438.5 + "y": 1418 }, { "x": 87, - "y": 1458.5 + "y": 1438 }, { "x": 87, - "y": 1498.5 + "y": 1478 } ], "isCurve": true, @@ -975,19 +975,19 @@ "route": [ { "x": 87, - "y": 1564.5 + "y": 1544 }, { "x": 87, - "y": 1604.5 + "y": 1584 }, { "x": 87, - "y": 1624.5 + "y": 1604 }, { "x": 87, - "y": 1664.5 + "y": 1644 } ], "isCurve": true, @@ -1022,19 +1022,19 @@ "route": [ { "x": 87, - "y": 536.5 + "y": 498 }, { "x": 87, - "y": 576.5 + "y": 538 }, { "x": 87, - "y": 596.5 + "y": 558 }, { "x": 87, - "y": 636.5 + "y": 598 } ], "isCurve": true, @@ -1069,19 +1069,19 @@ "route": [ { "x": 87, - "y": 702.5 + "y": 664 }, { "x": 87, - "y": 742.5 + "y": 704 }, { "x": 87, - "y": 762.5 + "y": 724 }, { "x": 87, - "y": 802.5 + "y": 764 } ], "isCurve": true, @@ -1116,19 +1116,19 @@ "route": [ { "x": 87, - "y": 868.5 + "y": 830 }, { "x": 87, - "y": 908.5 + "y": 870 }, { "x": 87, - "y": 928.5 + "y": 890 }, { "x": 87, - "y": 968.5 + "y": 930 } ], "isCurve": true, @@ -1163,19 +1163,19 @@ "route": [ { "x": 87, - "y": 1034.5 + "y": 996 }, { "x": 87, - "y": 1074.5 + "y": 1036 }, { "x": 87, - "y": 1094.5 + "y": 1056 }, { "x": 87, - "y": 1134.5 + "y": 1096 } ], "isCurve": true, diff --git a/e2etests/testdata/stable/direction/dagre/sketch.exp.svg b/e2etests/testdata/stable/direction/dagre/sketch.exp.svg index 40417f25e..353ba9373 100644 --- a/e2etests/testdata/stable/direction/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/direction/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -abcde12345abcde + .d2-2837767531 .fill-N1{fill:#0A0F25;} + .d2-2837767531 .fill-N2{fill:#676C7E;} + .d2-2837767531 .fill-N3{fill:#9499AB;} + .d2-2837767531 .fill-N4{fill:#CFD2DD;} + .d2-2837767531 .fill-N5{fill:#DEE1EB;} + .d2-2837767531 .fill-N6{fill:#EEF1F8;} + .d2-2837767531 .fill-N7{fill:#FFFFFF;} + .d2-2837767531 .fill-B1{fill:#0D32B2;} + .d2-2837767531 .fill-B2{fill:#0D32B2;} + .d2-2837767531 .fill-B3{fill:#E3E9FD;} + .d2-2837767531 .fill-B4{fill:#E3E9FD;} + .d2-2837767531 .fill-B5{fill:#EDF0FD;} + .d2-2837767531 .fill-B6{fill:#F7F8FE;} + .d2-2837767531 .fill-AA2{fill:#4A6FF3;} + .d2-2837767531 .fill-AA4{fill:#EDF0FD;} + .d2-2837767531 .fill-AA5{fill:#F7F8FE;} + .d2-2837767531 .fill-AB4{fill:#EDF0FD;} + .d2-2837767531 .fill-AB5{fill:#F7F8FE;} + .d2-2837767531 .stroke-N1{stroke:#0A0F25;} + .d2-2837767531 .stroke-N2{stroke:#676C7E;} + .d2-2837767531 .stroke-N3{stroke:#9499AB;} + .d2-2837767531 .stroke-N4{stroke:#CFD2DD;} + .d2-2837767531 .stroke-N5{stroke:#DEE1EB;} + .d2-2837767531 .stroke-N6{stroke:#EEF1F8;} + .d2-2837767531 .stroke-N7{stroke:#FFFFFF;} + .d2-2837767531 .stroke-B1{stroke:#0D32B2;} + .d2-2837767531 .stroke-B2{stroke:#0D32B2;} + .d2-2837767531 .stroke-B3{stroke:#E3E9FD;} + .d2-2837767531 .stroke-B4{stroke:#E3E9FD;} + .d2-2837767531 .stroke-B5{stroke:#EDF0FD;} + .d2-2837767531 .stroke-B6{stroke:#F7F8FE;} + .d2-2837767531 .stroke-AA2{stroke:#4A6FF3;} + .d2-2837767531 .stroke-AA4{stroke:#EDF0FD;} + .d2-2837767531 .stroke-AA5{stroke:#F7F8FE;} + .d2-2837767531 .stroke-AB4{stroke:#EDF0FD;} + .d2-2837767531 .stroke-AB5{stroke:#F7F8FE;} + .d2-2837767531 .background-color-N1{background-color:#0A0F25;} + .d2-2837767531 .background-color-N2{background-color:#676C7E;} + .d2-2837767531 .background-color-N3{background-color:#9499AB;} + .d2-2837767531 .background-color-N4{background-color:#CFD2DD;} + .d2-2837767531 .background-color-N5{background-color:#DEE1EB;} + .d2-2837767531 .background-color-N6{background-color:#EEF1F8;} + .d2-2837767531 .background-color-N7{background-color:#FFFFFF;} + .d2-2837767531 .background-color-B1{background-color:#0D32B2;} + .d2-2837767531 .background-color-B2{background-color:#0D32B2;} + .d2-2837767531 .background-color-B3{background-color:#E3E9FD;} + .d2-2837767531 .background-color-B4{background-color:#E3E9FD;} + .d2-2837767531 .background-color-B5{background-color:#EDF0FD;} + .d2-2837767531 .background-color-B6{background-color:#F7F8FE;} + .d2-2837767531 .background-color-AA2{background-color:#4A6FF3;} + .d2-2837767531 .background-color-AA4{background-color:#EDF0FD;} + .d2-2837767531 .background-color-AA5{background-color:#F7F8FE;} + .d2-2837767531 .background-color-AB4{background-color:#EDF0FD;} + .d2-2837767531 .background-color-AB5{background-color:#F7F8FE;} + .d2-2837767531 .color-N1{color:#0A0F25;} + .d2-2837767531 .color-N2{color:#676C7E;} + .d2-2837767531 .color-N3{color:#9499AB;} + .d2-2837767531 .color-N4{color:#CFD2DD;} + .d2-2837767531 .color-N5{color:#DEE1EB;} + .d2-2837767531 .color-N6{color:#EEF1F8;} + .d2-2837767531 .color-N7{color:#FFFFFF;} + .d2-2837767531 .color-B1{color:#0D32B2;} + .d2-2837767531 .color-B2{color:#0D32B2;} + .d2-2837767531 .color-B3{color:#E3E9FD;} + .d2-2837767531 .color-B4{color:#E3E9FD;} + .d2-2837767531 .color-B5{color:#EDF0FD;} + .d2-2837767531 .color-B6{color:#F7F8FE;} + .d2-2837767531 .color-AA2{color:#4A6FF3;} + .d2-2837767531 .color-AA4{color:#EDF0FD;} + .d2-2837767531 .color-AA5{color:#F7F8FE;} + .d2-2837767531 .color-AB4{color:#EDF0FD;} + .d2-2837767531 .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}]]>abcde12345abcde - + - - - - - - - - - - + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/edge-label-overflow/dagre/board.exp.json b/e2etests/testdata/stable/edge-label-overflow/dagre/board.exp.json index e813748fb..4b3264707 100644 --- a/e2etests/testdata/stable/edge-label-overflow/dagre/board.exp.json +++ b/e2etests/testdata/stable/edge-label-overflow/dagre/board.exp.json @@ -153,19 +153,19 @@ "labelPercentage": 0, "route": [ { - "x": 126.13200378417969, - "y": 66 - }, - { - "x": 76.82599639892578, - "y": 114.4000015258789 + "x": 126.5, + "y": 65.5 }, { "x": 76.9000015258789, + "y": 114.30000305175781 + }, + { + "x": 76.69999694824219, "y": 138.6999969482422 }, { - "x": 126.5, + "x": 125.5, "y": 187.5 } ], @@ -200,19 +200,19 @@ "labelPercentage": 0, "route": [ { - "x": 193.36700439453125, - "y": 66 - }, - { - "x": 242.67300415039062, - "y": 114.4000015258789 + "x": 193, + "y": 65.5 }, { "x": 242.60000610351562, + "y": 114.30000305175781 + }, + { + "x": 242.8000030517578, "y": 138.6999969482422 }, { - "x": 193, + "x": 194, "y": 187.5 } ], @@ -248,11 +248,11 @@ "route": [ { "x": 159.75, - "y": 253 + "y": 252.5 }, { "x": 159.75, - "y": 301.3999938964844 + "y": 301.29998779296875 }, { "x": 159.75, diff --git a/e2etests/testdata/stable/edge-label-overflow/dagre/sketch.exp.svg b/e2etests/testdata/stable/edge-label-overflow/dagre/sketch.exp.svg index ec8c7d7b3..83e3cf3c9 100644 --- a/e2etests/testdata/stable/edge-label-overflow/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/edge-label-overflow/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -studentcommittee chaircommittee Apply for appeal Deny. Need more informationAccept appeal + .d2-2039273444 .fill-N1{fill:#0A0F25;} + .d2-2039273444 .fill-N2{fill:#676C7E;} + .d2-2039273444 .fill-N3{fill:#9499AB;} + .d2-2039273444 .fill-N4{fill:#CFD2DD;} + .d2-2039273444 .fill-N5{fill:#DEE1EB;} + .d2-2039273444 .fill-N6{fill:#EEF1F8;} + .d2-2039273444 .fill-N7{fill:#FFFFFF;} + .d2-2039273444 .fill-B1{fill:#0D32B2;} + .d2-2039273444 .fill-B2{fill:#0D32B2;} + .d2-2039273444 .fill-B3{fill:#E3E9FD;} + .d2-2039273444 .fill-B4{fill:#E3E9FD;} + .d2-2039273444 .fill-B5{fill:#EDF0FD;} + .d2-2039273444 .fill-B6{fill:#F7F8FE;} + .d2-2039273444 .fill-AA2{fill:#4A6FF3;} + .d2-2039273444 .fill-AA4{fill:#EDF0FD;} + .d2-2039273444 .fill-AA5{fill:#F7F8FE;} + .d2-2039273444 .fill-AB4{fill:#EDF0FD;} + .d2-2039273444 .fill-AB5{fill:#F7F8FE;} + .d2-2039273444 .stroke-N1{stroke:#0A0F25;} + .d2-2039273444 .stroke-N2{stroke:#676C7E;} + .d2-2039273444 .stroke-N3{stroke:#9499AB;} + .d2-2039273444 .stroke-N4{stroke:#CFD2DD;} + .d2-2039273444 .stroke-N5{stroke:#DEE1EB;} + .d2-2039273444 .stroke-N6{stroke:#EEF1F8;} + .d2-2039273444 .stroke-N7{stroke:#FFFFFF;} + .d2-2039273444 .stroke-B1{stroke:#0D32B2;} + .d2-2039273444 .stroke-B2{stroke:#0D32B2;} + .d2-2039273444 .stroke-B3{stroke:#E3E9FD;} + .d2-2039273444 .stroke-B4{stroke:#E3E9FD;} + .d2-2039273444 .stroke-B5{stroke:#EDF0FD;} + .d2-2039273444 .stroke-B6{stroke:#F7F8FE;} + .d2-2039273444 .stroke-AA2{stroke:#4A6FF3;} + .d2-2039273444 .stroke-AA4{stroke:#EDF0FD;} + .d2-2039273444 .stroke-AA5{stroke:#F7F8FE;} + .d2-2039273444 .stroke-AB4{stroke:#EDF0FD;} + .d2-2039273444 .stroke-AB5{stroke:#F7F8FE;} + .d2-2039273444 .background-color-N1{background-color:#0A0F25;} + .d2-2039273444 .background-color-N2{background-color:#676C7E;} + .d2-2039273444 .background-color-N3{background-color:#9499AB;} + .d2-2039273444 .background-color-N4{background-color:#CFD2DD;} + .d2-2039273444 .background-color-N5{background-color:#DEE1EB;} + .d2-2039273444 .background-color-N6{background-color:#EEF1F8;} + .d2-2039273444 .background-color-N7{background-color:#FFFFFF;} + .d2-2039273444 .background-color-B1{background-color:#0D32B2;} + .d2-2039273444 .background-color-B2{background-color:#0D32B2;} + .d2-2039273444 .background-color-B3{background-color:#E3E9FD;} + .d2-2039273444 .background-color-B4{background-color:#E3E9FD;} + .d2-2039273444 .background-color-B5{background-color:#EDF0FD;} + .d2-2039273444 .background-color-B6{background-color:#F7F8FE;} + .d2-2039273444 .background-color-AA2{background-color:#4A6FF3;} + .d2-2039273444 .background-color-AA4{background-color:#EDF0FD;} + .d2-2039273444 .background-color-AA5{background-color:#F7F8FE;} + .d2-2039273444 .background-color-AB4{background-color:#EDF0FD;} + .d2-2039273444 .background-color-AB5{background-color:#F7F8FE;} + .d2-2039273444 .color-N1{color:#0A0F25;} + .d2-2039273444 .color-N2{color:#676C7E;} + .d2-2039273444 .color-N3{color:#9499AB;} + .d2-2039273444 .color-N4{color:#CFD2DD;} + .d2-2039273444 .color-N5{color:#DEE1EB;} + .d2-2039273444 .color-N6{color:#EEF1F8;} + .d2-2039273444 .color-N7{color:#FFFFFF;} + .d2-2039273444 .color-B1{color:#0D32B2;} + .d2-2039273444 .color-B2{color:#0D32B2;} + .d2-2039273444 .color-B3{color:#E3E9FD;} + .d2-2039273444 .color-B4{color:#E3E9FD;} + .d2-2039273444 .color-B5{color:#EDF0FD;} + .d2-2039273444 .color-B6{color:#F7F8FE;} + .d2-2039273444 .color-AA2{color:#4A6FF3;} + .d2-2039273444 .color-AA4{color:#EDF0FD;} + .d2-2039273444 .color-AA5{color:#F7F8FE;} + .d2-2039273444 .color-AB4{color:#EDF0FD;} + .d2-2039273444 .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}]]>studentcommittee chaircommittee Apply for appeal Deny. Need more informationAccept appeal diff --git a/e2etests/testdata/stable/elk_border_radius/dagre/board.exp.json b/e2etests/testdata/stable/elk_border_radius/dagre/board.exp.json index a37440eb6..8539ce287 100644 --- a/e2etests/testdata/stable/elk_border_radius/dagre/board.exp.json +++ b/e2etests/testdata/stable/elk_border_radius/dagre/board.exp.json @@ -276,12 +276,12 @@ "labelPercentage": 0, "route": [ { - "x": 226, - "y": 42.731998443603516 + "x": 226.5, + "y": 43 }, { - "x": 66.39900207519531, - "y": 101.34600067138672 + "x": 66.5, + "y": 101.4000015258789 }, { "x": 26.5, @@ -322,12 +322,12 @@ "labelPercentage": 0, "route": [ { - "x": 226, - "y": 52.4640007019043 + "x": 226.5, + "y": 52 }, { - "x": 156.8000030517578, - "y": 103.29199981689453 + "x": 156.8990020751953, + "y": 103.19999694824219 }, { "x": 139.5, @@ -416,12 +416,12 @@ "labelPercentage": 0, "route": [ { - "x": 279, - "y": 52.63800048828125 + "x": 278.5, + "y": 53 }, { - "x": 347.3999938964844, - "y": 103.3270034790039 + "x": 347.29998779296875, + "y": 103.4000015258789 }, { "x": 364.5, @@ -464,11 +464,11 @@ "route": [ { "x": 279, - "y": 42.797000885009766 + "y": 43 }, { "x": 437.3999938964844, - "y": 101.35900115966797 + "y": 101.4000015258789 }, { "x": 477, diff --git a/e2etests/testdata/stable/elk_border_radius/dagre/sketch.exp.svg b/e2etests/testdata/stable/elk_border_radius/dagre/sketch.exp.svg index d203f3c31..f775458a0 100644 --- a/e2etests/testdata/stable/elk_border_radius/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/elk_border_radius/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -abcefg + .d2-1096767771 .fill-N1{fill:#0A0F25;} + .d2-1096767771 .fill-N2{fill:#676C7E;} + .d2-1096767771 .fill-N3{fill:#9499AB;} + .d2-1096767771 .fill-N4{fill:#CFD2DD;} + .d2-1096767771 .fill-N5{fill:#DEE1EB;} + .d2-1096767771 .fill-N6{fill:#EEF1F8;} + .d2-1096767771 .fill-N7{fill:#FFFFFF;} + .d2-1096767771 .fill-B1{fill:#0D32B2;} + .d2-1096767771 .fill-B2{fill:#0D32B2;} + .d2-1096767771 .fill-B3{fill:#E3E9FD;} + .d2-1096767771 .fill-B4{fill:#E3E9FD;} + .d2-1096767771 .fill-B5{fill:#EDF0FD;} + .d2-1096767771 .fill-B6{fill:#F7F8FE;} + .d2-1096767771 .fill-AA2{fill:#4A6FF3;} + .d2-1096767771 .fill-AA4{fill:#EDF0FD;} + .d2-1096767771 .fill-AA5{fill:#F7F8FE;} + .d2-1096767771 .fill-AB4{fill:#EDF0FD;} + .d2-1096767771 .fill-AB5{fill:#F7F8FE;} + .d2-1096767771 .stroke-N1{stroke:#0A0F25;} + .d2-1096767771 .stroke-N2{stroke:#676C7E;} + .d2-1096767771 .stroke-N3{stroke:#9499AB;} + .d2-1096767771 .stroke-N4{stroke:#CFD2DD;} + .d2-1096767771 .stroke-N5{stroke:#DEE1EB;} + .d2-1096767771 .stroke-N6{stroke:#EEF1F8;} + .d2-1096767771 .stroke-N7{stroke:#FFFFFF;} + .d2-1096767771 .stroke-B1{stroke:#0D32B2;} + .d2-1096767771 .stroke-B2{stroke:#0D32B2;} + .d2-1096767771 .stroke-B3{stroke:#E3E9FD;} + .d2-1096767771 .stroke-B4{stroke:#E3E9FD;} + .d2-1096767771 .stroke-B5{stroke:#EDF0FD;} + .d2-1096767771 .stroke-B6{stroke:#F7F8FE;} + .d2-1096767771 .stroke-AA2{stroke:#4A6FF3;} + .d2-1096767771 .stroke-AA4{stroke:#EDF0FD;} + .d2-1096767771 .stroke-AA5{stroke:#F7F8FE;} + .d2-1096767771 .stroke-AB4{stroke:#EDF0FD;} + .d2-1096767771 .stroke-AB5{stroke:#F7F8FE;} + .d2-1096767771 .background-color-N1{background-color:#0A0F25;} + .d2-1096767771 .background-color-N2{background-color:#676C7E;} + .d2-1096767771 .background-color-N3{background-color:#9499AB;} + .d2-1096767771 .background-color-N4{background-color:#CFD2DD;} + .d2-1096767771 .background-color-N5{background-color:#DEE1EB;} + .d2-1096767771 .background-color-N6{background-color:#EEF1F8;} + .d2-1096767771 .background-color-N7{background-color:#FFFFFF;} + .d2-1096767771 .background-color-B1{background-color:#0D32B2;} + .d2-1096767771 .background-color-B2{background-color:#0D32B2;} + .d2-1096767771 .background-color-B3{background-color:#E3E9FD;} + .d2-1096767771 .background-color-B4{background-color:#E3E9FD;} + .d2-1096767771 .background-color-B5{background-color:#EDF0FD;} + .d2-1096767771 .background-color-B6{background-color:#F7F8FE;} + .d2-1096767771 .background-color-AA2{background-color:#4A6FF3;} + .d2-1096767771 .background-color-AA4{background-color:#EDF0FD;} + .d2-1096767771 .background-color-AA5{background-color:#F7F8FE;} + .d2-1096767771 .background-color-AB4{background-color:#EDF0FD;} + .d2-1096767771 .background-color-AB5{background-color:#F7F8FE;} + .d2-1096767771 .color-N1{color:#0A0F25;} + .d2-1096767771 .color-N2{color:#676C7E;} + .d2-1096767771 .color-N3{color:#9499AB;} + .d2-1096767771 .color-N4{color:#CFD2DD;} + .d2-1096767771 .color-N5{color:#DEE1EB;} + .d2-1096767771 .color-N6{color:#EEF1F8;} + .d2-1096767771 .color-N7{color:#FFFFFF;} + .d2-1096767771 .color-B1{color:#0D32B2;} + .d2-1096767771 .color-B2{color:#0D32B2;} + .d2-1096767771 .color-B3{color:#E3E9FD;} + .d2-1096767771 .color-B4{color:#E3E9FD;} + .d2-1096767771 .color-B5{color:#EDF0FD;} + .d2-1096767771 .color-B6{color:#F7F8FE;} + .d2-1096767771 .color-AA2{color:#4A6FF3;} + .d2-1096767771 .color-AA4{color:#EDF0FD;} + .d2-1096767771 .color-AA5{color:#F7F8FE;} + .d2-1096767771 .color-AB4{color:#EDF0FD;} + .d2-1096767771 .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}]]>abcefg diff --git a/e2etests/testdata/stable/elk_container_height/dagre/board.exp.json b/e2etests/testdata/stable/elk_container_height/dagre/board.exp.json index 864aefcf0..33cdbc41a 100644 --- a/e2etests/testdata/stable/elk_container_height/dagre/board.exp.json +++ b/e2etests/testdata/stable/elk_container_height/dagre/board.exp.json @@ -8,10 +8,10 @@ "type": "cylinder", "pos": { "x": 0, - "y": 41 + "y": 0 }, "width": 133, - "height": 125, + "height": 166, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -49,7 +49,7 @@ "type": "rectangle", "pos": { "x": 40, - "y": 70 + "y": 50 }, "width": 53, "height": 66, diff --git a/e2etests/testdata/stable/elk_container_height/dagre/sketch.exp.svg b/e2etests/testdata/stable/elk_container_height/dagre/sketch.exp.svg index 63f9fc52e..b75d9c311 100644 --- a/e2etests/testdata/stable/elk_container_height/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/elk_container_height/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -i can not see the titlex - - - + .d2-2887000715 .fill-N1{fill:#0A0F25;} + .d2-2887000715 .fill-N2{fill:#676C7E;} + .d2-2887000715 .fill-N3{fill:#9499AB;} + .d2-2887000715 .fill-N4{fill:#CFD2DD;} + .d2-2887000715 .fill-N5{fill:#DEE1EB;} + .d2-2887000715 .fill-N6{fill:#EEF1F8;} + .d2-2887000715 .fill-N7{fill:#FFFFFF;} + .d2-2887000715 .fill-B1{fill:#0D32B2;} + .d2-2887000715 .fill-B2{fill:#0D32B2;} + .d2-2887000715 .fill-B3{fill:#E3E9FD;} + .d2-2887000715 .fill-B4{fill:#E3E9FD;} + .d2-2887000715 .fill-B5{fill:#EDF0FD;} + .d2-2887000715 .fill-B6{fill:#F7F8FE;} + .d2-2887000715 .fill-AA2{fill:#4A6FF3;} + .d2-2887000715 .fill-AA4{fill:#EDF0FD;} + .d2-2887000715 .fill-AA5{fill:#F7F8FE;} + .d2-2887000715 .fill-AB4{fill:#EDF0FD;} + .d2-2887000715 .fill-AB5{fill:#F7F8FE;} + .d2-2887000715 .stroke-N1{stroke:#0A0F25;} + .d2-2887000715 .stroke-N2{stroke:#676C7E;} + .d2-2887000715 .stroke-N3{stroke:#9499AB;} + .d2-2887000715 .stroke-N4{stroke:#CFD2DD;} + .d2-2887000715 .stroke-N5{stroke:#DEE1EB;} + .d2-2887000715 .stroke-N6{stroke:#EEF1F8;} + .d2-2887000715 .stroke-N7{stroke:#FFFFFF;} + .d2-2887000715 .stroke-B1{stroke:#0D32B2;} + .d2-2887000715 .stroke-B2{stroke:#0D32B2;} + .d2-2887000715 .stroke-B3{stroke:#E3E9FD;} + .d2-2887000715 .stroke-B4{stroke:#E3E9FD;} + .d2-2887000715 .stroke-B5{stroke:#EDF0FD;} + .d2-2887000715 .stroke-B6{stroke:#F7F8FE;} + .d2-2887000715 .stroke-AA2{stroke:#4A6FF3;} + .d2-2887000715 .stroke-AA4{stroke:#EDF0FD;} + .d2-2887000715 .stroke-AA5{stroke:#F7F8FE;} + .d2-2887000715 .stroke-AB4{stroke:#EDF0FD;} + .d2-2887000715 .stroke-AB5{stroke:#F7F8FE;} + .d2-2887000715 .background-color-N1{background-color:#0A0F25;} + .d2-2887000715 .background-color-N2{background-color:#676C7E;} + .d2-2887000715 .background-color-N3{background-color:#9499AB;} + .d2-2887000715 .background-color-N4{background-color:#CFD2DD;} + .d2-2887000715 .background-color-N5{background-color:#DEE1EB;} + .d2-2887000715 .background-color-N6{background-color:#EEF1F8;} + .d2-2887000715 .background-color-N7{background-color:#FFFFFF;} + .d2-2887000715 .background-color-B1{background-color:#0D32B2;} + .d2-2887000715 .background-color-B2{background-color:#0D32B2;} + .d2-2887000715 .background-color-B3{background-color:#E3E9FD;} + .d2-2887000715 .background-color-B4{background-color:#E3E9FD;} + .d2-2887000715 .background-color-B5{background-color:#EDF0FD;} + .d2-2887000715 .background-color-B6{background-color:#F7F8FE;} + .d2-2887000715 .background-color-AA2{background-color:#4A6FF3;} + .d2-2887000715 .background-color-AA4{background-color:#EDF0FD;} + .d2-2887000715 .background-color-AA5{background-color:#F7F8FE;} + .d2-2887000715 .background-color-AB4{background-color:#EDF0FD;} + .d2-2887000715 .background-color-AB5{background-color:#F7F8FE;} + .d2-2887000715 .color-N1{color:#0A0F25;} + .d2-2887000715 .color-N2{color:#676C7E;} + .d2-2887000715 .color-N3{color:#9499AB;} + .d2-2887000715 .color-N4{color:#CFD2DD;} + .d2-2887000715 .color-N5{color:#DEE1EB;} + .d2-2887000715 .color-N6{color:#EEF1F8;} + .d2-2887000715 .color-N7{color:#FFFFFF;} + .d2-2887000715 .color-B1{color:#0D32B2;} + .d2-2887000715 .color-B2{color:#0D32B2;} + .d2-2887000715 .color-B3{color:#E3E9FD;} + .d2-2887000715 .color-B4{color:#E3E9FD;} + .d2-2887000715 .color-B5{color:#EDF0FD;} + .d2-2887000715 .color-B6{color:#F7F8FE;} + .d2-2887000715 .color-AA2{color:#4A6FF3;} + .d2-2887000715 .color-AA4{color:#EDF0FD;} + .d2-2887000715 .color-AA5{color:#F7F8FE;} + .d2-2887000715 .color-AB4{color:#EDF0FD;} + .d2-2887000715 .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}]]>i can not see the titlex + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/elk_shim/dagre/board.exp.json b/e2etests/testdata/stable/elk_shim/dagre/board.exp.json index ca89deedb..cd266dc7a 100644 --- a/e2etests/testdata/stable/elk_shim/dagre/board.exp.json +++ b/e2etests/testdata/stable/elk_shim/dagre/board.exp.json @@ -7,11 +7,11 @@ "id": "network", "type": "rectangle", "pos": { - "x": 0, - "y": 275 + "x": 7, + "y": 227 }, - "width": 418, - "height": 1245, + "width": 379, + "height": 1188, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -48,11 +48,11 @@ "id": "network.cell tower", "type": "rectangle", "pos": { - "x": 95, - "y": 340 + "x": 146, + "y": 268 }, - "width": 303, - "height": 317, + "width": 210, + "height": 313, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -89,8 +89,8 @@ "id": "network.cell tower.satellites", "type": "stored_data", "pos": { - "x": 171, - "y": 382 + "x": 176, + "y": 308 }, "width": 140, "height": 61, @@ -131,7 +131,7 @@ "type": "rectangle", "pos": { "x": 176, - "y": 564 + "y": 490 }, "width": 140, "height": 61, @@ -171,11 +171,11 @@ "id": "network.online portal", "type": "rectangle", "pos": { - "x": 20, - "y": 1329 + "x": 37, + "y": 1256 }, - "width": 144, - "height": 161, + "width": 119, + "height": 129, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -212,8 +212,8 @@ "id": "network.online portal.ui", "type": "hexagon", "pos": { - "x": 65, - "y": 1375 + "x": 67, + "y": 1286 }, "width": 59, "height": 69, @@ -253,11 +253,11 @@ "id": "network.data processor", "type": "rectangle", "pos": { - "x": 152, - "y": 814 + "x": 167, + "y": 732 }, - "width": 189, - "height": 192, + "width": 169, + "height": 188, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -294,8 +294,8 @@ "id": "network.data processor.storage", "type": "cylinder", "pos": { - "x": 192, - "y": 856 + "x": 197, + "y": 772 }, "width": 99, "height": 118, @@ -376,8 +376,8 @@ "id": "api server", "type": "rectangle", "pos": { - "x": 457, - "y": 1086 + "x": 477, + "y": 1040 }, "width": 116, "height": 66, @@ -417,8 +417,8 @@ "id": "logs", "type": "page", "pos": { - "x": 474, - "y": 1333 + "x": 499, + "y": 1277 }, "width": 73, "height": 87, @@ -481,20 +481,20 @@ "labelPercentage": 0, "route": [ { - "x": 219, - "y": 444 - }, - { - "x": 182.1999969482422, - "y": 492 + "x": 222, + "y": 369 }, { "x": 182.8000030517578, - "y": 516.2000122070312 + "y": 417.3999938964844 + }, + { + "x": 182.8000030517578, + "y": 441.70001220703125 }, { "x": 222, - "y": 565 + "y": 490.5 } ], "isCurve": true, @@ -529,19 +529,19 @@ "route": [ { "x": 246, - "y": 444 + "y": 369 }, { "x": 246, - "y": 492 + "y": 417.3999938964844 }, { "x": 246, - "y": 516.2000122070312 + "y": 441.70001220703125 }, { "x": 246, - "y": 565 + "y": 490.5 } ], "isCurve": true, @@ -575,20 +575,20 @@ "labelPercentage": 0, "route": [ { - "x": 273, - "y": 444 + "x": 270, + "y": 369 }, { - "x": 309.79998779296875, - "y": 492 + "x": 317.20001220703125, + "y": 417.3999938964844 }, { - "x": 309.20001220703125, - "y": 516.2000122070312 + "x": 317.20001220703125, + "y": 441.70001220703125 }, { "x": 270, - "y": 565 + "y": 490.5 } ], "isCurve": true, @@ -623,31 +623,31 @@ "route": [ { "x": 246, - "y": 625.5 + "y": 551 }, { "x": 246, - "y": 651.0999755859375 + "y": 591 }, { "x": 246, - "y": 669.5999755859375 + "y": 613.0999755859375 }, { "x": 246, - "y": 687.75 + "y": 631.25 }, { "x": 246, - "y": 705.9000244140625 + "y": 649.4000244140625 }, { "x": 246, - "y": 792.2000122070312 + "y": 730 }, { "x": 246, - "y": 847 + "y": 762 } ], "isCurve": true, @@ -681,20 +681,20 @@ "labelPercentage": 0, "route": [ { - "x": 171, + "x": 187, "y": 87 }, { - "x": 231, - "y": 156.1999969482422 + "x": 234.1999969482422, + "y": 135.39999389648438 }, { "x": 246, - "y": 248.1999969482422 + "y": 212.8000030517578 }, { "x": 246, - "y": 305 + "y": 232 } ], "isCurve": true, @@ -728,176 +728,176 @@ "labelPercentage": 0, "route": [ { - "x": 126, + "x": 115, "y": 87 }, { - "x": 85, - "y": 156.1999969482422 + "x": 82.80000305175781, + "y": 135.39999389648438 }, { "x": 74.75, - "y": 185.60000610351562 + "y": 159.60000610351562 }, { "x": 74.75, - "y": 203.75 + "y": 177.75 }, { "x": 74.75, - "y": 221.89999389648438 + "y": 195.89999389648438 }, { "x": 74.75, - "y": 244 + "y": 218 }, { "x": 74.75, - "y": 259 + "y": 233 }, { "x": 74.75, - "y": 274 + "y": 248 }, { "x": 74.75, - "y": 301.1000061035156 + "y": 274.1000061035156 }, { "x": 74.75, - "y": 326.75 + "y": 298.25 }, { "x": 74.75, - "y": 352.3999938964844 + "y": 322.3999938964844 }, { "x": 74.75, - "y": 388.70001220703125 + "y": 356.70001220703125 }, { "x": 74.75, - "y": 417.5 + "y": 384 }, { "x": 74.75, - "y": 446.29998779296875 + "y": 411.29998779296875 }, { "x": 74.75, - "y": 483.70001220703125 + "y": 447.70001220703125 }, { "x": 74.75, - "y": 511 + "y": 475 }, { "x": 74.75, - "y": 538.2999877929688 + "y": 502.29998779296875 }, { "x": 74.75, - "y": 572.5999755859375 + "y": 536.5999755859375 }, { "x": 74.75, - "y": 596.75 + "y": 560.75 }, { "x": 74.75, - "y": 620.9000244140625 + "y": 584.9000244140625 }, { "x": 74.75, - "y": 649.0999755859375 + "y": 613.0999755859375 }, { "x": 74.75, - "y": 667.25 + "y": 631.25 }, { "x": 74.75, - "y": 685.4000244140625 + "y": 649.4000244140625 }, { "x": 74.75, - "y": 709.5999755859375 + "y": 673.5999755859375 }, { "x": 74.75, - "y": 727.75 + "y": 691.75 }, { "x": 74.75, - "y": 745.9000244140625 + "y": 709.9000244140625 }, { "x": 74.75, - "y": 780.7999877929688 + "y": 743.7999877929688 }, { "x": 74.75, - "y": 815 + "y": 776.5 }, { "x": 74.75, - "y": 849.2000122070312 + "y": 809.2000122070312 }, { "x": 74.75, - "y": 894.7999877929688 + "y": 852.7999877929688 }, { "x": 74.75, - "y": 929 + "y": 885.5 }, { "x": 74.75, - "y": 963.2000122070312 + "y": 918.2000122070312 }, { "x": 74.75, - "y": 996 + "y": 950 }, { "x": 74.75, - "y": 1011 + "y": 965 }, { "x": 74.75, - "y": 1026 + "y": 980 }, { "x": 74.75, - "y": 1052.5999755859375 + "y": 1006.5999755859375 }, { "x": 74.75, - "y": 1077.5 + "y": 1031.5 }, { "x": 74.75, - "y": 1102.4000244140625 + "y": 1056.4000244140625 }, { "x": 74.75, - "y": 1137.699951171875 + "y": 1091.699951171875 }, { "x": 74.75, - "y": 1165.75 + "y": 1119.75 }, { "x": 74.75, - "y": 1193.800048828125 + "y": 1147.800048828125 }, { - "x": 77.4000015258789, - "y": 1293.5999755859375 + "x": 77.5999984741211, + "y": 1238.800048828125 }, { - "x": 88, - "y": 1376 + "x": 89, + "y": 1286 } ], "isCurve": true, @@ -931,20 +931,20 @@ "labelPercentage": 0, "route": [ { - "x": 457.25, - "y": 1132.77197265625 + "x": 477.5, + "y": 1086.5 }, { - "x": 188.6490020751953, - "y": 1196.553955078125 + "x": 192.6999969482422, + "y": 1150.5 }, { - "x": 117.80000305175781, - "y": 1293.5999755859375 + "x": 118.4000015258789, + "y": 1238.800048828125 }, { - "x": 103, - "y": 1376 + "x": 106, + "y": 1286 } ], "isCurve": true, @@ -978,20 +978,20 @@ "labelPercentage": 0, "route": [ { - "x": 515.25, - "y": 1152 + "x": 535.25, + "y": 1105.5 }, { - "x": 515.25, - "y": 1200.4000244140625 + "x": 535.25, + "y": 1154.300048828125 }, { - "x": 515.2000122070312, - "y": 1283 + "x": 535.2000122070312, + "y": 1235 }, { - "x": 515, - "y": 1323 + "x": 535, + "y": 1267 } ], "isCurve": true, @@ -1026,19 +1026,19 @@ "route": [ { "x": 246, - "y": 1006.5 + "y": 920 }, { "x": 246, - "y": 1030.0989990234375 + "y": 976 }, { - "x": 288.20001220703125, - "y": 1049 + "x": 292.20001220703125, + "y": 1003 }, { - "x": 457, - "y": 1101 + "x": 477, + "y": 1055 } ], "isCurve": true, diff --git a/e2etests/testdata/stable/elk_shim/dagre/sketch.exp.svg b/e2etests/testdata/stable/elk_shim/dagre/sketch.exp.svg index 74064c23d..a8a3410c3 100644 --- a/e2etests/testdata/stable/elk_shim/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/elk_shim/dagre/sketch.exp.svg @@ -1,23 +1,23 @@ -networkuserapi serverlogscell towerONLINE PORTALLLLdata processorsatellitestransmitteruistorage sendsendsendphone logsmake call accessdisplaypersist - - + .d2-2108133679 .fill-N1{fill:#0A0F25;} + .d2-2108133679 .fill-N2{fill:#676C7E;} + .d2-2108133679 .fill-N3{fill:#9499AB;} + .d2-2108133679 .fill-N4{fill:#CFD2DD;} + .d2-2108133679 .fill-N5{fill:#DEE1EB;} + .d2-2108133679 .fill-N6{fill:#EEF1F8;} + .d2-2108133679 .fill-N7{fill:#FFFFFF;} + .d2-2108133679 .fill-B1{fill:#0D32B2;} + .d2-2108133679 .fill-B2{fill:#0D32B2;} + .d2-2108133679 .fill-B3{fill:#E3E9FD;} + .d2-2108133679 .fill-B4{fill:#E3E9FD;} + .d2-2108133679 .fill-B5{fill:#EDF0FD;} + .d2-2108133679 .fill-B6{fill:#F7F8FE;} + .d2-2108133679 .fill-AA2{fill:#4A6FF3;} + .d2-2108133679 .fill-AA4{fill:#EDF0FD;} + .d2-2108133679 .fill-AA5{fill:#F7F8FE;} + .d2-2108133679 .fill-AB4{fill:#EDF0FD;} + .d2-2108133679 .fill-AB5{fill:#F7F8FE;} + .d2-2108133679 .stroke-N1{stroke:#0A0F25;} + .d2-2108133679 .stroke-N2{stroke:#676C7E;} + .d2-2108133679 .stroke-N3{stroke:#9499AB;} + .d2-2108133679 .stroke-N4{stroke:#CFD2DD;} + .d2-2108133679 .stroke-N5{stroke:#DEE1EB;} + .d2-2108133679 .stroke-N6{stroke:#EEF1F8;} + .d2-2108133679 .stroke-N7{stroke:#FFFFFF;} + .d2-2108133679 .stroke-B1{stroke:#0D32B2;} + .d2-2108133679 .stroke-B2{stroke:#0D32B2;} + .d2-2108133679 .stroke-B3{stroke:#E3E9FD;} + .d2-2108133679 .stroke-B4{stroke:#E3E9FD;} + .d2-2108133679 .stroke-B5{stroke:#EDF0FD;} + .d2-2108133679 .stroke-B6{stroke:#F7F8FE;} + .d2-2108133679 .stroke-AA2{stroke:#4A6FF3;} + .d2-2108133679 .stroke-AA4{stroke:#EDF0FD;} + .d2-2108133679 .stroke-AA5{stroke:#F7F8FE;} + .d2-2108133679 .stroke-AB4{stroke:#EDF0FD;} + .d2-2108133679 .stroke-AB5{stroke:#F7F8FE;} + .d2-2108133679 .background-color-N1{background-color:#0A0F25;} + .d2-2108133679 .background-color-N2{background-color:#676C7E;} + .d2-2108133679 .background-color-N3{background-color:#9499AB;} + .d2-2108133679 .background-color-N4{background-color:#CFD2DD;} + .d2-2108133679 .background-color-N5{background-color:#DEE1EB;} + .d2-2108133679 .background-color-N6{background-color:#EEF1F8;} + .d2-2108133679 .background-color-N7{background-color:#FFFFFF;} + .d2-2108133679 .background-color-B1{background-color:#0D32B2;} + .d2-2108133679 .background-color-B2{background-color:#0D32B2;} + .d2-2108133679 .background-color-B3{background-color:#E3E9FD;} + .d2-2108133679 .background-color-B4{background-color:#E3E9FD;} + .d2-2108133679 .background-color-B5{background-color:#EDF0FD;} + .d2-2108133679 .background-color-B6{background-color:#F7F8FE;} + .d2-2108133679 .background-color-AA2{background-color:#4A6FF3;} + .d2-2108133679 .background-color-AA4{background-color:#EDF0FD;} + .d2-2108133679 .background-color-AA5{background-color:#F7F8FE;} + .d2-2108133679 .background-color-AB4{background-color:#EDF0FD;} + .d2-2108133679 .background-color-AB5{background-color:#F7F8FE;} + .d2-2108133679 .color-N1{color:#0A0F25;} + .d2-2108133679 .color-N2{color:#676C7E;} + .d2-2108133679 .color-N3{color:#9499AB;} + .d2-2108133679 .color-N4{color:#CFD2DD;} + .d2-2108133679 .color-N5{color:#DEE1EB;} + .d2-2108133679 .color-N6{color:#EEF1F8;} + .d2-2108133679 .color-N7{color:#FFFFFF;} + .d2-2108133679 .color-B1{color:#0D32B2;} + .d2-2108133679 .color-B2{color:#0D32B2;} + .d2-2108133679 .color-B3{color:#E3E9FD;} + .d2-2108133679 .color-B4{color:#E3E9FD;} + .d2-2108133679 .color-B5{color:#EDF0FD;} + .d2-2108133679 .color-B6{color:#F7F8FE;} + .d2-2108133679 .color-AA2{color:#4A6FF3;} + .d2-2108133679 .color-AA4{color:#EDF0FD;} + .d2-2108133679 .color-AA5{color:#F7F8FE;} + .d2-2108133679 .color-AB4{color:#EDF0FD;} + .d2-2108133679 .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}]]>networkuserapi serverlogscell towerONLINE PORTALLLLdata processorsatellitestransmitteruistorage sendsendsendphone logsmake call accessdisplaypersist + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/ent2d2_basic/dagre/board.exp.json b/e2etests/testdata/stable/ent2d2_basic/dagre/board.exp.json index 24467c27a..50be0ee60 100644 --- a/e2etests/testdata/stable/ent2d2_basic/dagre/board.exp.json +++ b/e2etests/testdata/stable/ent2d2_basic/dagre/board.exp.json @@ -708,12 +708,12 @@ "labelPercentage": 0, "route": [ { - "x": 719.5, - "y": 23.70599937438965 + "x": 719.8330078125, + "y": 23 }, { - "x": 758.9660034179688, - "y": 4.741000175476074 + "x": 759.0330200195312, + "y": 4.598999977111816 }, { "x": 771.2999877929688, @@ -752,12 +752,12 @@ "y": 129.60000610351562 }, { - "x": 758.9660034179688, - "y": 139.25799560546875 + "x": 759.0330200195312, + "y": 139.39999389648438 }, { - "x": 719.5, - "y": 120.29299926757812 + "x": 719.8330078125, + "y": 121 } ], "isCurve": true, @@ -791,12 +791,12 @@ "labelPercentage": 0, "route": [ { - "x": 719.5, - "y": 42.84199905395508 + "x": 720.166015625, + "y": 43 }, { - "x": 837.6329956054688, - "y": 8.567999839782715 + "x": 837.7659912109375, + "y": 8.600000381469727 }, { "x": 874.5499877929688, @@ -835,12 +835,12 @@ "y": 129.60000610351562 }, { - "x": 837.6329956054688, - "y": 135.43099975585938 + "x": 837.7659912109375, + "y": 135.39999389648438 }, { - "x": 719.5, - "y": 101.15699768066406 + "x": 720.166015625, + "y": 101 } ], "isCurve": true, @@ -969,11 +969,11 @@ "route": [ { "x": 619, - "y": 144 + "y": 143.5 }, { "x": 619, - "y": 192.39999389648438 + "y": 192.3000030517578 }, { "x": 619, diff --git a/e2etests/testdata/stable/ent2d2_basic/dagre/sketch.exp.svg b/e2etests/testdata/stable/ent2d2_basic/dagre/sketch.exp.svg index 80984ab8e..6c17ecaec 100644 --- a/e2etests/testdata/stable/ent2d2_basic/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/ent2d2_basic/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -UseridintPKparent_idintFKspouse_idintFKPetidintPKowner_idintFKCardidintPKowner_idintFKPostidintPKtextstringauthor_idintFKMetadataidintPKageintInfoidintPKcontentjson.RawMessage spouse children/parent/ancestorpets/ownercard/ownerposts/authormetadata/userinfo/user + .d2-850790161 .fill-N1{fill:#0A0F25;} + .d2-850790161 .fill-N2{fill:#676C7E;} + .d2-850790161 .fill-N3{fill:#9499AB;} + .d2-850790161 .fill-N4{fill:#CFD2DD;} + .d2-850790161 .fill-N5{fill:#DEE1EB;} + .d2-850790161 .fill-N6{fill:#EEF1F8;} + .d2-850790161 .fill-N7{fill:#FFFFFF;} + .d2-850790161 .fill-B1{fill:#0D32B2;} + .d2-850790161 .fill-B2{fill:#0D32B2;} + .d2-850790161 .fill-B3{fill:#E3E9FD;} + .d2-850790161 .fill-B4{fill:#E3E9FD;} + .d2-850790161 .fill-B5{fill:#EDF0FD;} + .d2-850790161 .fill-B6{fill:#F7F8FE;} + .d2-850790161 .fill-AA2{fill:#4A6FF3;} + .d2-850790161 .fill-AA4{fill:#EDF0FD;} + .d2-850790161 .fill-AA5{fill:#F7F8FE;} + .d2-850790161 .fill-AB4{fill:#EDF0FD;} + .d2-850790161 .fill-AB5{fill:#F7F8FE;} + .d2-850790161 .stroke-N1{stroke:#0A0F25;} + .d2-850790161 .stroke-N2{stroke:#676C7E;} + .d2-850790161 .stroke-N3{stroke:#9499AB;} + .d2-850790161 .stroke-N4{stroke:#CFD2DD;} + .d2-850790161 .stroke-N5{stroke:#DEE1EB;} + .d2-850790161 .stroke-N6{stroke:#EEF1F8;} + .d2-850790161 .stroke-N7{stroke:#FFFFFF;} + .d2-850790161 .stroke-B1{stroke:#0D32B2;} + .d2-850790161 .stroke-B2{stroke:#0D32B2;} + .d2-850790161 .stroke-B3{stroke:#E3E9FD;} + .d2-850790161 .stroke-B4{stroke:#E3E9FD;} + .d2-850790161 .stroke-B5{stroke:#EDF0FD;} + .d2-850790161 .stroke-B6{stroke:#F7F8FE;} + .d2-850790161 .stroke-AA2{stroke:#4A6FF3;} + .d2-850790161 .stroke-AA4{stroke:#EDF0FD;} + .d2-850790161 .stroke-AA5{stroke:#F7F8FE;} + .d2-850790161 .stroke-AB4{stroke:#EDF0FD;} + .d2-850790161 .stroke-AB5{stroke:#F7F8FE;} + .d2-850790161 .background-color-N1{background-color:#0A0F25;} + .d2-850790161 .background-color-N2{background-color:#676C7E;} + .d2-850790161 .background-color-N3{background-color:#9499AB;} + .d2-850790161 .background-color-N4{background-color:#CFD2DD;} + .d2-850790161 .background-color-N5{background-color:#DEE1EB;} + .d2-850790161 .background-color-N6{background-color:#EEF1F8;} + .d2-850790161 .background-color-N7{background-color:#FFFFFF;} + .d2-850790161 .background-color-B1{background-color:#0D32B2;} + .d2-850790161 .background-color-B2{background-color:#0D32B2;} + .d2-850790161 .background-color-B3{background-color:#E3E9FD;} + .d2-850790161 .background-color-B4{background-color:#E3E9FD;} + .d2-850790161 .background-color-B5{background-color:#EDF0FD;} + .d2-850790161 .background-color-B6{background-color:#F7F8FE;} + .d2-850790161 .background-color-AA2{background-color:#4A6FF3;} + .d2-850790161 .background-color-AA4{background-color:#EDF0FD;} + .d2-850790161 .background-color-AA5{background-color:#F7F8FE;} + .d2-850790161 .background-color-AB4{background-color:#EDF0FD;} + .d2-850790161 .background-color-AB5{background-color:#F7F8FE;} + .d2-850790161 .color-N1{color:#0A0F25;} + .d2-850790161 .color-N2{color:#676C7E;} + .d2-850790161 .color-N3{color:#9499AB;} + .d2-850790161 .color-N4{color:#CFD2DD;} + .d2-850790161 .color-N5{color:#DEE1EB;} + .d2-850790161 .color-N6{color:#EEF1F8;} + .d2-850790161 .color-N7{color:#FFFFFF;} + .d2-850790161 .color-B1{color:#0D32B2;} + .d2-850790161 .color-B2{color:#0D32B2;} + .d2-850790161 .color-B3{color:#E3E9FD;} + .d2-850790161 .color-B4{color:#E3E9FD;} + .d2-850790161 .color-B5{color:#EDF0FD;} + .d2-850790161 .color-B6{color:#F7F8FE;} + .d2-850790161 .color-AA2{color:#4A6FF3;} + .d2-850790161 .color-AA4{color:#EDF0FD;} + .d2-850790161 .color-AA5{color:#F7F8FE;} + .d2-850790161 .color-AB4{color:#EDF0FD;} + .d2-850790161 .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}]]>UseridintPKparent_idintFKspouse_idintFKPetidintPKowner_idintFKCardidintPKowner_idintFKPostidintPKtextstringauthor_idintFKMetadataidintPKageintInfoidintPKcontentjson.RawMessage spouse children/parent/ancestorpets/ownercard/ownerposts/authormetadata/userinfo/user diff --git a/e2etests/testdata/stable/ent2d2_right/dagre/board.exp.json b/e2etests/testdata/stable/ent2d2_right/dagre/board.exp.json index 298ceb0cf..04c9f6208 100644 --- a/e2etests/testdata/stable/ent2d2_right/dagre/board.exp.json +++ b/e2etests/testdata/stable/ent2d2_right/dagre/board.exp.json @@ -8,7 +8,7 @@ "type": "sql_table", "pos": { "x": 0, - "y": 231 + "y": 336 }, "width": 201, "height": 144, @@ -246,7 +246,7 @@ "type": "sql_table", "pos": { "x": 500, - "y": 146 + "y": 168 }, "width": 194, "height": 108, @@ -350,7 +350,7 @@ "type": "sql_table", "pos": { "x": 486, - "y": 274 + "y": 336 }, "width": 222, "height": 144, @@ -482,7 +482,7 @@ "type": "sql_table", "pos": { "x": 524, - "y": 438 + "y": 540 }, "width": 146, "height": 108, @@ -584,7 +584,7 @@ "type": "sql_table", "pos": { "x": 443, - "y": 584 + "y": 708 }, "width": 308, "height": 108, @@ -708,56 +708,56 @@ "labelPercentage": 0, "route": [ { - "x": 48.566001892089844, - "y": 374.5 + "x": 39, + "y": 479.6659851074219 }, { - "x": 9.713000297546387, - "y": 428.3659973144531 + "x": 7.798999786376953, + "y": 516.4660034179688 }, { "x": 0, - "y": 445.20001220703125 + "y": 527.9500122070312 }, { "x": 0, - "y": 450.25 + "y": 531.375 }, { "x": 0, - "y": 455.29998779296875 + "y": 534.7999877929688 }, { "x": 20.100000381469727, - "y": 462.0329895019531 + "y": 539.3660278320312 }, { "x": 50.25, - "y": 467.0830078125 + "y": 542.791015625 }, { "x": 80.4000015258789, - "y": 472.13299560546875 + "y": 546.2160034179688 }, { "x": 120.5999984741211, - "y": 472.13299560546875 + "y": 546.2160034179688 }, { "x": 150.75, - "y": 467.0830078125 + "y": 542.791015625 }, { "x": 180.89999389648438, - "y": 462.0329895019531 + "y": 539.3660278320312 }, { - "x": 191.28599548339844, - "y": 428.3659973144531 + "x": 193.1999969482422, + "y": 516.4660034179688 }, { - "x": 152.43299865722656, - "y": 374.5 + "x": 162, + "y": 479.6659851074219 } ], "isCurve": true, @@ -791,56 +791,56 @@ "labelPercentage": 0, "route": [ { - "x": 74.34500122070312, - "y": 374.5 + "x": 61, + "y": 480 }, { - "x": 14.869000434875488, - "y": 538.2329711914062 + "x": 12.199000358581543, + "y": 570.4000244140625 }, { "x": 0, - "y": 589.4000244140625 + "y": 598.6500244140625 }, { "x": 0, - "y": 604.75 + "y": 607.125 }, { "x": 0, - "y": 620.0999755859375 + "y": 615.5999755859375 }, { "x": 20.100000381469727, - "y": 640.5659790039062 + "y": 626.9000244140625 }, { "x": 50.25, - "y": 655.916015625 + "y": 635.375 }, { "x": 80.4000015258789, - "y": 671.2659912109375 + "y": 643.8499755859375 }, { "x": 120.5999984741211, - "y": 671.2659912109375 + "y": 643.8499755859375 }, { "x": 150.75, - "y": 655.916015625 + "y": 635.375 }, { "x": 180.89999389648438, - "y": 640.5659790039062 + "y": 626.9000244140625 }, { - "x": 186.1300048828125, - "y": 538.2329711914062 + "x": 188.8000030517578, + "y": 570.4000244140625 }, { - "x": 126.65399932861328, - "y": 374.5 + "x": 140, + "y": 480 } ], "isCurve": true, @@ -874,12 +874,12 @@ "labelPercentage": 0, "route": [ { - "x": 164.677001953125, - "y": 230.5 + "x": 146, + "y": 336 }, { - "x": 290.5350036621094, - "y": 89.29900360107422 + "x": 286.79998779296875, + "y": 110.39900207519531 }, { "x": 357.6000061035156, @@ -921,20 +921,20 @@ "labelPercentage": 0, "route": [ { - "x": 201, - "y": 255.9929962158203 + "x": 186, + "y": 336 }, { - "x": 297.79998779296875, - "y": 211.197998046875 + "x": 294.79998779296875, + "y": 244.8000030517578 }, { "x": 357.6000061035156, - "y": 200 + "y": 222 }, { "x": 500, - "y": 200 + "y": 222 } ], "isCurve": true, @@ -969,19 +969,19 @@ "route": [ { "x": 201, - "y": 322.23699951171875 + "y": 408 }, { "x": 297.79998779296875, - "y": 341.24700927734375 + "y": 408 }, { "x": 354.79998779296875, - "y": 346 + "y": 408 }, { "x": 486, - "y": 346 + "y": 408 } ], "isCurve": true, @@ -1015,20 +1015,20 @@ "labelPercentage": 0, "route": [ { - "x": 185.6580047607422, - "y": 375.5 + "x": 186, + "y": 480 }, { - "x": 294.7309875488281, - "y": 468.70001220703125 + "x": 294.79998779296875, + "y": 571.2000122070312 }, { "x": 362.3999938964844, - "y": 492 + "y": 594 }, { "x": 524, - "y": 492 + "y": 594 } ], "isCurve": true, @@ -1062,20 +1062,20 @@ "labelPercentage": 0, "route": [ { - "x": 148.03500366210938, - "y": 375.5 + "x": 146, + "y": 480 }, { - "x": 287.2070007324219, - "y": 585.5 + "x": 286.79998779296875, + "y": 705.5999755859375 }, { "x": 346.20001220703125, - "y": 638 + "y": 762 }, { "x": 443, - "y": 638 + "y": 762 } ], "isCurve": true, diff --git a/e2etests/testdata/stable/ent2d2_right/dagre/sketch.exp.svg b/e2etests/testdata/stable/ent2d2_right/dagre/sketch.exp.svg index 177d8bb00..3172e1a35 100644 --- a/e2etests/testdata/stable/ent2d2_right/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/ent2d2_right/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -UseridintPKparent_idintFKspouse_idintFKPetidintPKowner_idintFKCardidintPKowner_idintFKPostidintPKtextstringauthor_idintFKMetadataidintPKageintInfoidintPKcontentjson.RawMessage spousespouse childrenparentyowhoaheypets/ownercard/ownerposts/authormetadata/userinfo/user - - - - - - - - + .d2-1210356354 .fill-N1{fill:#0A0F25;} + .d2-1210356354 .fill-N2{fill:#676C7E;} + .d2-1210356354 .fill-N3{fill:#9499AB;} + .d2-1210356354 .fill-N4{fill:#CFD2DD;} + .d2-1210356354 .fill-N5{fill:#DEE1EB;} + .d2-1210356354 .fill-N6{fill:#EEF1F8;} + .d2-1210356354 .fill-N7{fill:#FFFFFF;} + .d2-1210356354 .fill-B1{fill:#0D32B2;} + .d2-1210356354 .fill-B2{fill:#0D32B2;} + .d2-1210356354 .fill-B3{fill:#E3E9FD;} + .d2-1210356354 .fill-B4{fill:#E3E9FD;} + .d2-1210356354 .fill-B5{fill:#EDF0FD;} + .d2-1210356354 .fill-B6{fill:#F7F8FE;} + .d2-1210356354 .fill-AA2{fill:#4A6FF3;} + .d2-1210356354 .fill-AA4{fill:#EDF0FD;} + .d2-1210356354 .fill-AA5{fill:#F7F8FE;} + .d2-1210356354 .fill-AB4{fill:#EDF0FD;} + .d2-1210356354 .fill-AB5{fill:#F7F8FE;} + .d2-1210356354 .stroke-N1{stroke:#0A0F25;} + .d2-1210356354 .stroke-N2{stroke:#676C7E;} + .d2-1210356354 .stroke-N3{stroke:#9499AB;} + .d2-1210356354 .stroke-N4{stroke:#CFD2DD;} + .d2-1210356354 .stroke-N5{stroke:#DEE1EB;} + .d2-1210356354 .stroke-N6{stroke:#EEF1F8;} + .d2-1210356354 .stroke-N7{stroke:#FFFFFF;} + .d2-1210356354 .stroke-B1{stroke:#0D32B2;} + .d2-1210356354 .stroke-B2{stroke:#0D32B2;} + .d2-1210356354 .stroke-B3{stroke:#E3E9FD;} + .d2-1210356354 .stroke-B4{stroke:#E3E9FD;} + .d2-1210356354 .stroke-B5{stroke:#EDF0FD;} + .d2-1210356354 .stroke-B6{stroke:#F7F8FE;} + .d2-1210356354 .stroke-AA2{stroke:#4A6FF3;} + .d2-1210356354 .stroke-AA4{stroke:#EDF0FD;} + .d2-1210356354 .stroke-AA5{stroke:#F7F8FE;} + .d2-1210356354 .stroke-AB4{stroke:#EDF0FD;} + .d2-1210356354 .stroke-AB5{stroke:#F7F8FE;} + .d2-1210356354 .background-color-N1{background-color:#0A0F25;} + .d2-1210356354 .background-color-N2{background-color:#676C7E;} + .d2-1210356354 .background-color-N3{background-color:#9499AB;} + .d2-1210356354 .background-color-N4{background-color:#CFD2DD;} + .d2-1210356354 .background-color-N5{background-color:#DEE1EB;} + .d2-1210356354 .background-color-N6{background-color:#EEF1F8;} + .d2-1210356354 .background-color-N7{background-color:#FFFFFF;} + .d2-1210356354 .background-color-B1{background-color:#0D32B2;} + .d2-1210356354 .background-color-B2{background-color:#0D32B2;} + .d2-1210356354 .background-color-B3{background-color:#E3E9FD;} + .d2-1210356354 .background-color-B4{background-color:#E3E9FD;} + .d2-1210356354 .background-color-B5{background-color:#EDF0FD;} + .d2-1210356354 .background-color-B6{background-color:#F7F8FE;} + .d2-1210356354 .background-color-AA2{background-color:#4A6FF3;} + .d2-1210356354 .background-color-AA4{background-color:#EDF0FD;} + .d2-1210356354 .background-color-AA5{background-color:#F7F8FE;} + .d2-1210356354 .background-color-AB4{background-color:#EDF0FD;} + .d2-1210356354 .background-color-AB5{background-color:#F7F8FE;} + .d2-1210356354 .color-N1{color:#0A0F25;} + .d2-1210356354 .color-N2{color:#676C7E;} + .d2-1210356354 .color-N3{color:#9499AB;} + .d2-1210356354 .color-N4{color:#CFD2DD;} + .d2-1210356354 .color-N5{color:#DEE1EB;} + .d2-1210356354 .color-N6{color:#EEF1F8;} + .d2-1210356354 .color-N7{color:#FFFFFF;} + .d2-1210356354 .color-B1{color:#0D32B2;} + .d2-1210356354 .color-B2{color:#0D32B2;} + .d2-1210356354 .color-B3{color:#E3E9FD;} + .d2-1210356354 .color-B4{color:#E3E9FD;} + .d2-1210356354 .color-B5{color:#EDF0FD;} + .d2-1210356354 .color-B6{color:#F7F8FE;} + .d2-1210356354 .color-AA2{color:#4A6FF3;} + .d2-1210356354 .color-AA4{color:#EDF0FD;} + .d2-1210356354 .color-AA5{color:#F7F8FE;} + .d2-1210356354 .color-AB4{color:#EDF0FD;} + .d2-1210356354 .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}]]>UseridintPKparent_idintFKspouse_idintFKPetidintPKowner_idintFKCardidintPKowner_idintFKPostidintPKtextstringauthor_idintFKMetadataidintPKageintInfoidintPKcontentjson.RawMessage spousespouse childrenparentyowhoaheypets/ownercard/ownerposts/authormetadata/userinfo/user + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/font_colors/dagre/board.exp.json b/e2etests/testdata/stable/font_colors/dagre/board.exp.json index fd3b8c496..837aadec2 100644 --- a/e2etests/testdata/stable/font_colors/dagre/board.exp.json +++ b/e2etests/testdata/stable/font_colors/dagre/board.exp.json @@ -113,11 +113,11 @@ "route": [ { "x": 42.5, - "y": 66 + "y": 65.5 }, { "x": 42.5, - "y": 114.4000015258789 + "y": 114.30000305175781 }, { "x": 42.5, diff --git a/e2etests/testdata/stable/font_colors/dagre/sketch.exp.svg b/e2etests/testdata/stable/font_colors/dagre/sketch.exp.svg index 1cc9e0b00..24f6fbed3 100644 --- a/e2etests/testdata/stable/font_colors/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/font_colors/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -alphabeta gamma + .d2-3061220014 .fill-N1{fill:#0A0F25;} + .d2-3061220014 .fill-N2{fill:#676C7E;} + .d2-3061220014 .fill-N3{fill:#9499AB;} + .d2-3061220014 .fill-N4{fill:#CFD2DD;} + .d2-3061220014 .fill-N5{fill:#DEE1EB;} + .d2-3061220014 .fill-N6{fill:#EEF1F8;} + .d2-3061220014 .fill-N7{fill:#FFFFFF;} + .d2-3061220014 .fill-B1{fill:#0D32B2;} + .d2-3061220014 .fill-B2{fill:#0D32B2;} + .d2-3061220014 .fill-B3{fill:#E3E9FD;} + .d2-3061220014 .fill-B4{fill:#E3E9FD;} + .d2-3061220014 .fill-B5{fill:#EDF0FD;} + .d2-3061220014 .fill-B6{fill:#F7F8FE;} + .d2-3061220014 .fill-AA2{fill:#4A6FF3;} + .d2-3061220014 .fill-AA4{fill:#EDF0FD;} + .d2-3061220014 .fill-AA5{fill:#F7F8FE;} + .d2-3061220014 .fill-AB4{fill:#EDF0FD;} + .d2-3061220014 .fill-AB5{fill:#F7F8FE;} + .d2-3061220014 .stroke-N1{stroke:#0A0F25;} + .d2-3061220014 .stroke-N2{stroke:#676C7E;} + .d2-3061220014 .stroke-N3{stroke:#9499AB;} + .d2-3061220014 .stroke-N4{stroke:#CFD2DD;} + .d2-3061220014 .stroke-N5{stroke:#DEE1EB;} + .d2-3061220014 .stroke-N6{stroke:#EEF1F8;} + .d2-3061220014 .stroke-N7{stroke:#FFFFFF;} + .d2-3061220014 .stroke-B1{stroke:#0D32B2;} + .d2-3061220014 .stroke-B2{stroke:#0D32B2;} + .d2-3061220014 .stroke-B3{stroke:#E3E9FD;} + .d2-3061220014 .stroke-B4{stroke:#E3E9FD;} + .d2-3061220014 .stroke-B5{stroke:#EDF0FD;} + .d2-3061220014 .stroke-B6{stroke:#F7F8FE;} + .d2-3061220014 .stroke-AA2{stroke:#4A6FF3;} + .d2-3061220014 .stroke-AA4{stroke:#EDF0FD;} + .d2-3061220014 .stroke-AA5{stroke:#F7F8FE;} + .d2-3061220014 .stroke-AB4{stroke:#EDF0FD;} + .d2-3061220014 .stroke-AB5{stroke:#F7F8FE;} + .d2-3061220014 .background-color-N1{background-color:#0A0F25;} + .d2-3061220014 .background-color-N2{background-color:#676C7E;} + .d2-3061220014 .background-color-N3{background-color:#9499AB;} + .d2-3061220014 .background-color-N4{background-color:#CFD2DD;} + .d2-3061220014 .background-color-N5{background-color:#DEE1EB;} + .d2-3061220014 .background-color-N6{background-color:#EEF1F8;} + .d2-3061220014 .background-color-N7{background-color:#FFFFFF;} + .d2-3061220014 .background-color-B1{background-color:#0D32B2;} + .d2-3061220014 .background-color-B2{background-color:#0D32B2;} + .d2-3061220014 .background-color-B3{background-color:#E3E9FD;} + .d2-3061220014 .background-color-B4{background-color:#E3E9FD;} + .d2-3061220014 .background-color-B5{background-color:#EDF0FD;} + .d2-3061220014 .background-color-B6{background-color:#F7F8FE;} + .d2-3061220014 .background-color-AA2{background-color:#4A6FF3;} + .d2-3061220014 .background-color-AA4{background-color:#EDF0FD;} + .d2-3061220014 .background-color-AA5{background-color:#F7F8FE;} + .d2-3061220014 .background-color-AB4{background-color:#EDF0FD;} + .d2-3061220014 .background-color-AB5{background-color:#F7F8FE;} + .d2-3061220014 .color-N1{color:#0A0F25;} + .d2-3061220014 .color-N2{color:#676C7E;} + .d2-3061220014 .color-N3{color:#9499AB;} + .d2-3061220014 .color-N4{color:#CFD2DD;} + .d2-3061220014 .color-N5{color:#DEE1EB;} + .d2-3061220014 .color-N6{color:#EEF1F8;} + .d2-3061220014 .color-N7{color:#FFFFFF;} + .d2-3061220014 .color-B1{color:#0D32B2;} + .d2-3061220014 .color-B2{color:#0D32B2;} + .d2-3061220014 .color-B3{color:#E3E9FD;} + .d2-3061220014 .color-B4{color:#E3E9FD;} + .d2-3061220014 .color-B5{color:#EDF0FD;} + .d2-3061220014 .color-B6{color:#F7F8FE;} + .d2-3061220014 .color-AA2{color:#4A6FF3;} + .d2-3061220014 .color-AA4{color:#EDF0FD;} + .d2-3061220014 .color-AA5{color:#F7F8FE;} + .d2-3061220014 .color-AB4{color:#EDF0FD;} + .d2-3061220014 .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}]]>alphabeta gamma diff --git a/e2etests/testdata/stable/font_sizes_containers_large/dagre/board.exp.json b/e2etests/testdata/stable/font_sizes_containers_large/dagre/board.exp.json index ddc9702b0..20ed6b86e 100644 --- a/e2etests/testdata/stable/font_sizes_containers_large/dagre/board.exp.json +++ b/e2etests/testdata/stable/font_sizes_containers_large/dagre/board.exp.json @@ -8,10 +8,10 @@ "type": "rectangle", "pos": { "x": 0, - "y": 50 + "y": -3 }, "width": 264, - "height": 406, + "height": 379, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -49,10 +49,10 @@ "type": "rectangle", "pos": { "x": 20, - "y": 125 + "y": 88 }, "width": 224, - "height": 306, + "height": 258, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -90,10 +90,10 @@ "type": "rectangle", "pos": { "x": 40, - "y": 196 + "y": 139 }, "width": 184, - "height": 210, + "height": 177, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -130,11 +130,11 @@ "id": "ninety nine.sixty four.thirty two.sixteen", "type": "rectangle", "pos": { - "x": 60, - "y": 249 + "x": 70, + "y": 170 }, - "width": 144, - "height": 130, + "width": 124, + "height": 116, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -172,7 +172,7 @@ "type": "rectangle", "pos": { "x": 100, - "y": 286 + "y": 200 }, "width": 64, "height": 56, diff --git a/e2etests/testdata/stable/font_sizes_containers_large/dagre/sketch.exp.svg b/e2etests/testdata/stable/font_sizes_containers_large/dagre/sketch.exp.svg index f0e77a7ad..851de605f 100644 --- a/e2etests/testdata/stable/font_sizes_containers_large/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/font_sizes_containers_large/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -ninety ninesixty fourthirty twosixteeneight - - - - - - + .d2-2302067261 .fill-N1{fill:#0A0F25;} + .d2-2302067261 .fill-N2{fill:#676C7E;} + .d2-2302067261 .fill-N3{fill:#9499AB;} + .d2-2302067261 .fill-N4{fill:#CFD2DD;} + .d2-2302067261 .fill-N5{fill:#DEE1EB;} + .d2-2302067261 .fill-N6{fill:#EEF1F8;} + .d2-2302067261 .fill-N7{fill:#FFFFFF;} + .d2-2302067261 .fill-B1{fill:#0D32B2;} + .d2-2302067261 .fill-B2{fill:#0D32B2;} + .d2-2302067261 .fill-B3{fill:#E3E9FD;} + .d2-2302067261 .fill-B4{fill:#E3E9FD;} + .d2-2302067261 .fill-B5{fill:#EDF0FD;} + .d2-2302067261 .fill-B6{fill:#F7F8FE;} + .d2-2302067261 .fill-AA2{fill:#4A6FF3;} + .d2-2302067261 .fill-AA4{fill:#EDF0FD;} + .d2-2302067261 .fill-AA5{fill:#F7F8FE;} + .d2-2302067261 .fill-AB4{fill:#EDF0FD;} + .d2-2302067261 .fill-AB5{fill:#F7F8FE;} + .d2-2302067261 .stroke-N1{stroke:#0A0F25;} + .d2-2302067261 .stroke-N2{stroke:#676C7E;} + .d2-2302067261 .stroke-N3{stroke:#9499AB;} + .d2-2302067261 .stroke-N4{stroke:#CFD2DD;} + .d2-2302067261 .stroke-N5{stroke:#DEE1EB;} + .d2-2302067261 .stroke-N6{stroke:#EEF1F8;} + .d2-2302067261 .stroke-N7{stroke:#FFFFFF;} + .d2-2302067261 .stroke-B1{stroke:#0D32B2;} + .d2-2302067261 .stroke-B2{stroke:#0D32B2;} + .d2-2302067261 .stroke-B3{stroke:#E3E9FD;} + .d2-2302067261 .stroke-B4{stroke:#E3E9FD;} + .d2-2302067261 .stroke-B5{stroke:#EDF0FD;} + .d2-2302067261 .stroke-B6{stroke:#F7F8FE;} + .d2-2302067261 .stroke-AA2{stroke:#4A6FF3;} + .d2-2302067261 .stroke-AA4{stroke:#EDF0FD;} + .d2-2302067261 .stroke-AA5{stroke:#F7F8FE;} + .d2-2302067261 .stroke-AB4{stroke:#EDF0FD;} + .d2-2302067261 .stroke-AB5{stroke:#F7F8FE;} + .d2-2302067261 .background-color-N1{background-color:#0A0F25;} + .d2-2302067261 .background-color-N2{background-color:#676C7E;} + .d2-2302067261 .background-color-N3{background-color:#9499AB;} + .d2-2302067261 .background-color-N4{background-color:#CFD2DD;} + .d2-2302067261 .background-color-N5{background-color:#DEE1EB;} + .d2-2302067261 .background-color-N6{background-color:#EEF1F8;} + .d2-2302067261 .background-color-N7{background-color:#FFFFFF;} + .d2-2302067261 .background-color-B1{background-color:#0D32B2;} + .d2-2302067261 .background-color-B2{background-color:#0D32B2;} + .d2-2302067261 .background-color-B3{background-color:#E3E9FD;} + .d2-2302067261 .background-color-B4{background-color:#E3E9FD;} + .d2-2302067261 .background-color-B5{background-color:#EDF0FD;} + .d2-2302067261 .background-color-B6{background-color:#F7F8FE;} + .d2-2302067261 .background-color-AA2{background-color:#4A6FF3;} + .d2-2302067261 .background-color-AA4{background-color:#EDF0FD;} + .d2-2302067261 .background-color-AA5{background-color:#F7F8FE;} + .d2-2302067261 .background-color-AB4{background-color:#EDF0FD;} + .d2-2302067261 .background-color-AB5{background-color:#F7F8FE;} + .d2-2302067261 .color-N1{color:#0A0F25;} + .d2-2302067261 .color-N2{color:#676C7E;} + .d2-2302067261 .color-N3{color:#9499AB;} + .d2-2302067261 .color-N4{color:#CFD2DD;} + .d2-2302067261 .color-N5{color:#DEE1EB;} + .d2-2302067261 .color-N6{color:#EEF1F8;} + .d2-2302067261 .color-N7{color:#FFFFFF;} + .d2-2302067261 .color-B1{color:#0D32B2;} + .d2-2302067261 .color-B2{color:#0D32B2;} + .d2-2302067261 .color-B3{color:#E3E9FD;} + .d2-2302067261 .color-B4{color:#E3E9FD;} + .d2-2302067261 .color-B5{color:#EDF0FD;} + .d2-2302067261 .color-B6{color:#F7F8FE;} + .d2-2302067261 .color-AA2{color:#4A6FF3;} + .d2-2302067261 .color-AA4{color:#EDF0FD;} + .d2-2302067261 .color-AA5{color:#F7F8FE;} + .d2-2302067261 .color-AB4{color:#EDF0FD;} + .d2-2302067261 .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}]]>ninety ninesixty fourthirty twosixteeneight + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/font_sizes_containers_large_right/dagre/board.exp.json b/e2etests/testdata/stable/font_sizes_containers_large_right/dagre/board.exp.json index 59d5c73b6..dadeae729 100644 --- a/e2etests/testdata/stable/font_sizes_containers_large_right/dagre/board.exp.json +++ b/e2etests/testdata/stable/font_sizes_containers_large_right/dagre/board.exp.json @@ -7,11 +7,11 @@ "id": "ninety nine", "type": "rectangle", "pos": { - "x": 0, - "y": 50 + "x": 80, + "y": 205 }, - "width": 464, - "height": 638, + "width": 304, + "height": 359, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -48,11 +48,11 @@ "id": "ninety nine.sixty four", "type": "rectangle", "pos": { - "x": 50, - "y": 161 + "x": 110, + "y": 296 }, - "width": 364, - "height": 466, + "width": 244, + "height": 248, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -89,11 +89,11 @@ "id": "ninety nine.sixty four.thirty two", "type": "rectangle", "pos": { - "x": 100, - "y": 268 + "x": 140, + "y": 347 }, - "width": 264, - "height": 298, + "width": 184, + "height": 177, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -130,11 +130,11 @@ "id": "ninety nine.sixty four.thirty two.sixteen", "type": "rectangle", "pos": { - "x": 150, - "y": 357 + "x": 170, + "y": 378 }, - "width": 164, - "height": 146, + "width": 124, + "height": 116, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -172,7 +172,7 @@ "type": "rectangle", "pos": { "x": 200, - "y": 402 + "y": 408 }, "width": 64, "height": 56, diff --git a/e2etests/testdata/stable/font_sizes_containers_large_right/dagre/sketch.exp.svg b/e2etests/testdata/stable/font_sizes_containers_large_right/dagre/sketch.exp.svg index aab74ad41..d742b2075 100644 --- a/e2etests/testdata/stable/font_sizes_containers_large_right/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/font_sizes_containers_large_right/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -ninety ninesixty fourthirty twosixteeneight - - - - - - + .d2-1522392309 .fill-N1{fill:#0A0F25;} + .d2-1522392309 .fill-N2{fill:#676C7E;} + .d2-1522392309 .fill-N3{fill:#9499AB;} + .d2-1522392309 .fill-N4{fill:#CFD2DD;} + .d2-1522392309 .fill-N5{fill:#DEE1EB;} + .d2-1522392309 .fill-N6{fill:#EEF1F8;} + .d2-1522392309 .fill-N7{fill:#FFFFFF;} + .d2-1522392309 .fill-B1{fill:#0D32B2;} + .d2-1522392309 .fill-B2{fill:#0D32B2;} + .d2-1522392309 .fill-B3{fill:#E3E9FD;} + .d2-1522392309 .fill-B4{fill:#E3E9FD;} + .d2-1522392309 .fill-B5{fill:#EDF0FD;} + .d2-1522392309 .fill-B6{fill:#F7F8FE;} + .d2-1522392309 .fill-AA2{fill:#4A6FF3;} + .d2-1522392309 .fill-AA4{fill:#EDF0FD;} + .d2-1522392309 .fill-AA5{fill:#F7F8FE;} + .d2-1522392309 .fill-AB4{fill:#EDF0FD;} + .d2-1522392309 .fill-AB5{fill:#F7F8FE;} + .d2-1522392309 .stroke-N1{stroke:#0A0F25;} + .d2-1522392309 .stroke-N2{stroke:#676C7E;} + .d2-1522392309 .stroke-N3{stroke:#9499AB;} + .d2-1522392309 .stroke-N4{stroke:#CFD2DD;} + .d2-1522392309 .stroke-N5{stroke:#DEE1EB;} + .d2-1522392309 .stroke-N6{stroke:#EEF1F8;} + .d2-1522392309 .stroke-N7{stroke:#FFFFFF;} + .d2-1522392309 .stroke-B1{stroke:#0D32B2;} + .d2-1522392309 .stroke-B2{stroke:#0D32B2;} + .d2-1522392309 .stroke-B3{stroke:#E3E9FD;} + .d2-1522392309 .stroke-B4{stroke:#E3E9FD;} + .d2-1522392309 .stroke-B5{stroke:#EDF0FD;} + .d2-1522392309 .stroke-B6{stroke:#F7F8FE;} + .d2-1522392309 .stroke-AA2{stroke:#4A6FF3;} + .d2-1522392309 .stroke-AA4{stroke:#EDF0FD;} + .d2-1522392309 .stroke-AA5{stroke:#F7F8FE;} + .d2-1522392309 .stroke-AB4{stroke:#EDF0FD;} + .d2-1522392309 .stroke-AB5{stroke:#F7F8FE;} + .d2-1522392309 .background-color-N1{background-color:#0A0F25;} + .d2-1522392309 .background-color-N2{background-color:#676C7E;} + .d2-1522392309 .background-color-N3{background-color:#9499AB;} + .d2-1522392309 .background-color-N4{background-color:#CFD2DD;} + .d2-1522392309 .background-color-N5{background-color:#DEE1EB;} + .d2-1522392309 .background-color-N6{background-color:#EEF1F8;} + .d2-1522392309 .background-color-N7{background-color:#FFFFFF;} + .d2-1522392309 .background-color-B1{background-color:#0D32B2;} + .d2-1522392309 .background-color-B2{background-color:#0D32B2;} + .d2-1522392309 .background-color-B3{background-color:#E3E9FD;} + .d2-1522392309 .background-color-B4{background-color:#E3E9FD;} + .d2-1522392309 .background-color-B5{background-color:#EDF0FD;} + .d2-1522392309 .background-color-B6{background-color:#F7F8FE;} + .d2-1522392309 .background-color-AA2{background-color:#4A6FF3;} + .d2-1522392309 .background-color-AA4{background-color:#EDF0FD;} + .d2-1522392309 .background-color-AA5{background-color:#F7F8FE;} + .d2-1522392309 .background-color-AB4{background-color:#EDF0FD;} + .d2-1522392309 .background-color-AB5{background-color:#F7F8FE;} + .d2-1522392309 .color-N1{color:#0A0F25;} + .d2-1522392309 .color-N2{color:#676C7E;} + .d2-1522392309 .color-N3{color:#9499AB;} + .d2-1522392309 .color-N4{color:#CFD2DD;} + .d2-1522392309 .color-N5{color:#DEE1EB;} + .d2-1522392309 .color-N6{color:#EEF1F8;} + .d2-1522392309 .color-N7{color:#FFFFFF;} + .d2-1522392309 .color-B1{color:#0D32B2;} + .d2-1522392309 .color-B2{color:#0D32B2;} + .d2-1522392309 .color-B3{color:#E3E9FD;} + .d2-1522392309 .color-B4{color:#E3E9FD;} + .d2-1522392309 .color-B5{color:#EDF0FD;} + .d2-1522392309 .color-B6{color:#F7F8FE;} + .d2-1522392309 .color-AA2{color:#4A6FF3;} + .d2-1522392309 .color-AA4{color:#EDF0FD;} + .d2-1522392309 .color-AA5{color:#F7F8FE;} + .d2-1522392309 .color-AB4{color:#EDF0FD;} + .d2-1522392309 .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}]]>ninety ninesixty fourthirty twosixteeneight + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/grid_icon/dagre/board.exp.json b/e2etests/testdata/stable/grid_icon/dagre/board.exp.json index 4ad3f73ef..e8b5da641 100644 --- a/e2etests/testdata/stable/grid_icon/dagre/board.exp.json +++ b/e2etests/testdata/stable/grid_icon/dagre/board.exp.json @@ -11,10 +11,10 @@ ], "pos": { "x": 0, - "y": 18 + "y": 0 }, - "width": 384, - "height": 421, + "width": 364, + "height": 417, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -52,10 +52,10 @@ "type": "rectangle", "pos": { "x": 60, - "y": 143 + "y": 125 }, "width": 53, - "height": 130, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -93,10 +93,10 @@ "type": "rectangle", "pos": { "x": 153, - "y": 143 + "y": 125 }, - "width": 171, - "height": 130, + "width": 151, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -145,8 +145,8 @@ "id": "grid w/ container + icon.b.b child", "type": "rectangle", "pos": { - "x": 193, - "y": 175 + "x": 183, + "y": 155 }, "width": 91, "height": 66, @@ -187,7 +187,7 @@ "type": "rectangle", "pos": { "x": 60, - "y": 313 + "y": 291 }, "width": 53, "height": 66, @@ -228,9 +228,9 @@ "type": "rectangle", "pos": { "x": 153, - "y": 313 + "y": 291 }, - "width": 171, + "width": 151, "height": 66, "opacity": 1, "strokeDash": 0, @@ -271,11 +271,11 @@ "2x2" ], "pos": { - "x": 444, - "y": 55 + "x": 424, + "y": 56 }, "width": 278, - "height": 347, + "height": 306, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -324,8 +324,8 @@ "id": "grid + icon.a", "type": "rectangle", "pos": { - "x": 509, - "y": 129 + "x": 489, + "y": 130 }, "width": 53, "height": 66, @@ -365,8 +365,8 @@ "id": "grid + icon.b", "type": "rectangle", "pos": { - "x": 602, - "y": 129 + "x": 582, + "y": 130 }, "width": 54, "height": 66, @@ -406,8 +406,8 @@ "id": "grid + icon.c", "type": "rectangle", "pos": { - "x": 509, - "y": 235 + "x": 489, + "y": 236 }, "width": 53, "height": 66, @@ -447,8 +447,8 @@ "id": "grid + icon.d", "type": "rectangle", "pos": { - "x": 602, - "y": 235 + "x": 582, + "y": 236 }, "width": 54, "height": 66, @@ -491,11 +491,11 @@ "2x2" ], "pos": { - "x": 782, - "y": 0 + "x": 762, + "y": 3 }, "width": 433, - "height": 457, + "height": 412, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -544,11 +544,11 @@ "id": "grid + icon w/ container.a", "type": "rectangle", "pos": { - "x": 866, - "y": 120 + "x": 856, + "y": 123 }, "width": 53, - "height": 130, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -585,11 +585,11 @@ "id": "grid + icon w/ container.b", "type": "rectangle", "pos": { - "x": 959, - "y": 120 + "x": 949, + "y": 123 }, - "width": 171, - "height": 130, + "width": 151, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -626,8 +626,8 @@ "id": "grid + icon w/ container.b.b child", "type": "rectangle", "pos": { - "x": 999, - "y": 152 + "x": 979, + "y": 153 }, "width": 91, "height": 66, @@ -667,8 +667,8 @@ "id": "grid + icon w/ container.c", "type": "rectangle", "pos": { - "x": 866, - "y": 290 + "x": 856, + "y": 289 }, "width": 53, "height": 66, @@ -708,10 +708,10 @@ "id": "grid + icon w/ container.d", "type": "rectangle", "pos": { - "x": 959, - "y": 290 + "x": 949, + "y": 289 }, - "width": 171, + "width": 151, "height": 66, "opacity": 1, "strokeDash": 0, @@ -752,11 +752,11 @@ "2x2" ], "pos": { - "x": 1275, - "y": 41 + "x": 1255, + "y": 23 }, - "width": 384, - "height": 375, + "width": 364, + "height": 371, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -793,11 +793,11 @@ "id": "no label grid w/ container + icon.a", "type": "rectangle", "pos": { - "x": 1335, - "y": 120 + "x": 1315, + "y": 102 }, "width": 53, - "height": 130, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -834,11 +834,11 @@ "id": "no label grid w/ container + icon.b", "type": "rectangle", "pos": { - "x": 1428, - "y": 120 + "x": 1408, + "y": 102 }, - "width": 171, - "height": 130, + "width": 151, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -887,8 +887,8 @@ "id": "no label grid w/ container + icon.b.b child", "type": "rectangle", "pos": { - "x": 1468, - "y": 152 + "x": 1438, + "y": 132 }, "width": 91, "height": 66, @@ -928,8 +928,8 @@ "id": "no label grid w/ container + icon.c", "type": "rectangle", "pos": { - "x": 1335, - "y": 290 + "x": 1315, + "y": 268 }, "width": 53, "height": 66, @@ -969,10 +969,10 @@ "id": "no label grid w/ container + icon.d", "type": "rectangle", "pos": { - "x": 1428, - "y": 290 + "x": 1408, + "y": 268 }, - "width": 171, + "width": 151, "height": 66, "opacity": 1, "strokeDash": 0, @@ -1013,8 +1013,8 @@ "2x2" ], "pos": { - "x": 1719, - "y": 76 + "x": 1679, + "y": 56 }, "width": 267, "height": 306, @@ -1066,8 +1066,8 @@ "id": "no label grid + icon.a", "type": "rectangle", "pos": { - "x": 1779, - "y": 150 + "x": 1739, + "y": 130 }, "width": 53, "height": 66, @@ -1107,8 +1107,8 @@ "id": "no label grid + icon.b", "type": "rectangle", "pos": { - "x": 1872, - "y": 150 + "x": 1832, + "y": 130 }, "width": 54, "height": 66, @@ -1148,8 +1148,8 @@ "id": "no label grid + icon.c", "type": "rectangle", "pos": { - "x": 1779, - "y": 256 + "x": 1739, + "y": 236 }, "width": 53, "height": 66, @@ -1189,8 +1189,8 @@ "id": "no label grid + icon.d", "type": "rectangle", "pos": { - "x": 1872, - "y": 256 + "x": 1832, + "y": 236 }, "width": 54, "height": 66, diff --git a/e2etests/testdata/stable/grid_icon/dagre/sketch.exp.svg b/e2etests/testdata/stable/grid_icon/dagre/sketch.exp.svg index b99a5e2d2..08b554136 100644 --- a/e2etests/testdata/stable/grid_icon/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/grid_icon/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -grid w/ container + icongrid + icongrid + icon w/ containerabcdabcdabcdabcdabcdb childb childb child - - - - - - - - - - - - - - - - - - - - - - - - - - - + .d2-3851636847 .fill-N1{fill:#0A0F25;} + .d2-3851636847 .fill-N2{fill:#676C7E;} + .d2-3851636847 .fill-N3{fill:#9499AB;} + .d2-3851636847 .fill-N4{fill:#CFD2DD;} + .d2-3851636847 .fill-N5{fill:#DEE1EB;} + .d2-3851636847 .fill-N6{fill:#EEF1F8;} + .d2-3851636847 .fill-N7{fill:#FFFFFF;} + .d2-3851636847 .fill-B1{fill:#0D32B2;} + .d2-3851636847 .fill-B2{fill:#0D32B2;} + .d2-3851636847 .fill-B3{fill:#E3E9FD;} + .d2-3851636847 .fill-B4{fill:#E3E9FD;} + .d2-3851636847 .fill-B5{fill:#EDF0FD;} + .d2-3851636847 .fill-B6{fill:#F7F8FE;} + .d2-3851636847 .fill-AA2{fill:#4A6FF3;} + .d2-3851636847 .fill-AA4{fill:#EDF0FD;} + .d2-3851636847 .fill-AA5{fill:#F7F8FE;} + .d2-3851636847 .fill-AB4{fill:#EDF0FD;} + .d2-3851636847 .fill-AB5{fill:#F7F8FE;} + .d2-3851636847 .stroke-N1{stroke:#0A0F25;} + .d2-3851636847 .stroke-N2{stroke:#676C7E;} + .d2-3851636847 .stroke-N3{stroke:#9499AB;} + .d2-3851636847 .stroke-N4{stroke:#CFD2DD;} + .d2-3851636847 .stroke-N5{stroke:#DEE1EB;} + .d2-3851636847 .stroke-N6{stroke:#EEF1F8;} + .d2-3851636847 .stroke-N7{stroke:#FFFFFF;} + .d2-3851636847 .stroke-B1{stroke:#0D32B2;} + .d2-3851636847 .stroke-B2{stroke:#0D32B2;} + .d2-3851636847 .stroke-B3{stroke:#E3E9FD;} + .d2-3851636847 .stroke-B4{stroke:#E3E9FD;} + .d2-3851636847 .stroke-B5{stroke:#EDF0FD;} + .d2-3851636847 .stroke-B6{stroke:#F7F8FE;} + .d2-3851636847 .stroke-AA2{stroke:#4A6FF3;} + .d2-3851636847 .stroke-AA4{stroke:#EDF0FD;} + .d2-3851636847 .stroke-AA5{stroke:#F7F8FE;} + .d2-3851636847 .stroke-AB4{stroke:#EDF0FD;} + .d2-3851636847 .stroke-AB5{stroke:#F7F8FE;} + .d2-3851636847 .background-color-N1{background-color:#0A0F25;} + .d2-3851636847 .background-color-N2{background-color:#676C7E;} + .d2-3851636847 .background-color-N3{background-color:#9499AB;} + .d2-3851636847 .background-color-N4{background-color:#CFD2DD;} + .d2-3851636847 .background-color-N5{background-color:#DEE1EB;} + .d2-3851636847 .background-color-N6{background-color:#EEF1F8;} + .d2-3851636847 .background-color-N7{background-color:#FFFFFF;} + .d2-3851636847 .background-color-B1{background-color:#0D32B2;} + .d2-3851636847 .background-color-B2{background-color:#0D32B2;} + .d2-3851636847 .background-color-B3{background-color:#E3E9FD;} + .d2-3851636847 .background-color-B4{background-color:#E3E9FD;} + .d2-3851636847 .background-color-B5{background-color:#EDF0FD;} + .d2-3851636847 .background-color-B6{background-color:#F7F8FE;} + .d2-3851636847 .background-color-AA2{background-color:#4A6FF3;} + .d2-3851636847 .background-color-AA4{background-color:#EDF0FD;} + .d2-3851636847 .background-color-AA5{background-color:#F7F8FE;} + .d2-3851636847 .background-color-AB4{background-color:#EDF0FD;} + .d2-3851636847 .background-color-AB5{background-color:#F7F8FE;} + .d2-3851636847 .color-N1{color:#0A0F25;} + .d2-3851636847 .color-N2{color:#676C7E;} + .d2-3851636847 .color-N3{color:#9499AB;} + .d2-3851636847 .color-N4{color:#CFD2DD;} + .d2-3851636847 .color-N5{color:#DEE1EB;} + .d2-3851636847 .color-N6{color:#EEF1F8;} + .d2-3851636847 .color-N7{color:#FFFFFF;} + .d2-3851636847 .color-B1{color:#0D32B2;} + .d2-3851636847 .color-B2{color:#0D32B2;} + .d2-3851636847 .color-B3{color:#E3E9FD;} + .d2-3851636847 .color-B4{color:#E3E9FD;} + .d2-3851636847 .color-B5{color:#EDF0FD;} + .d2-3851636847 .color-B6{color:#F7F8FE;} + .d2-3851636847 .color-AA2{color:#4A6FF3;} + .d2-3851636847 .color-AA4{color:#EDF0FD;} + .d2-3851636847 .color-AA5{color:#F7F8FE;} + .d2-3851636847 .color-AB4{color:#EDF0FD;} + .d2-3851636847 .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}]]>grid w/ container + icongrid + icongrid + icon w/ containerabcdabcdabcdabcdabcdb childb childb child + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/grid_nested/dagre/board.exp.json b/e2etests/testdata/stable/grid_nested/dagre/board.exp.json index fd1b4b77b..4d4abbc98 100644 --- a/e2etests/testdata/stable/grid_nested/dagre/board.exp.json +++ b/e2etests/testdata/stable/grid_nested/dagre/board.exp.json @@ -11,10 +11,10 @@ ], "pos": { "x": 0, - "y": 150 + "y": 99 }, - "width": 384, - "height": 388, + "width": 364, + "height": 384, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -52,10 +52,10 @@ "type": "rectangle", "pos": { "x": 60, - "y": 242 + "y": 191 }, "width": 53, - "height": 130, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -93,10 +93,10 @@ "type": "rectangle", "pos": { "x": 153, - "y": 242 + "y": 191 }, - "width": 171, - "height": 130, + "width": 151, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -133,8 +133,8 @@ "id": "grid w/ container.b.b child", "type": "rectangle", "pos": { - "x": 193, - "y": 274 + "x": 183, + "y": 221 }, "width": 91, "height": 66, @@ -175,7 +175,7 @@ "type": "rectangle", "pos": { "x": 60, - "y": 412 + "y": 357 }, "width": 53, "height": 66, @@ -216,9 +216,9 @@ "type": "rectangle", "pos": { "x": 153, - "y": 412 + "y": 357 }, - "width": 171, + "width": 151, "height": 66, "opacity": 1, "strokeDash": 0, @@ -259,11 +259,11 @@ "2x2" ], "pos": { - "x": 444, - "y": 0 + "x": 424, + "y": 5 }, "width": 692, - "height": 688, + "height": 572, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -300,11 +300,11 @@ "id": "grid w/ nested containers.a", "type": "rectangle", "pos": { - "x": 504, - "y": 92 + "x": 484, + "y": 97 }, "width": 53, - "height": 430, + "height": 314, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -341,11 +341,11 @@ "id": "grid w/ nested containers.b", "type": "rectangle", "pos": { - "x": 597, - "y": 92 + "x": 577, + "y": 97 }, "width": 479, - "height": 430, + "height": 314, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -382,11 +382,11 @@ "id": "grid w/ nested containers.b.b 1", "type": "rectangle", "pos": { - "x": 617, - "y": 155 + "x": 597, + "y": 133 }, "width": 439, - "height": 335, + "height": 248, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -423,11 +423,11 @@ "id": "grid w/ nested containers.b.b 1.b 2", "type": "rectangle", "pos": { - "x": 637, - "y": 215 + "x": 617, + "y": 164 }, "width": 186, - "height": 240, + "height": 187, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -464,11 +464,11 @@ "id": "grid w/ nested containers.b.b 1.b 2.b 3", "type": "rectangle", "pos": { - "x": 657, - "y": 278 + "x": 647, + "y": 195 }, - "width": 146, - "height": 140, + "width": 126, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -505,8 +505,8 @@ "id": "grid w/ nested containers.b.b 1.b 2.b 3.b 4", "type": "rectangle", "pos": { - "x": 697, - "y": 315 + "x": 677, + "y": 225 }, "width": 66, "height": 66, @@ -546,11 +546,11 @@ "id": "grid w/ nested containers.b.b 1.b 2a", "type": "rectangle", "pos": { - "x": 843, - "y": 215 + "x": 823, + "y": 164 }, "width": 193, - "height": 240, + "height": 187, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -587,11 +587,11 @@ "id": "grid w/ nested containers.b.b 1.b 2a.b 3a", "type": "rectangle", "pos": { - "x": 863, - "y": 278 + "x": 853, + "y": 195 }, - "width": 153, - "height": 140, + "width": 133, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -628,8 +628,8 @@ "id": "grid w/ nested containers.b.b 1.b 2a.b 3a.b 3a", "type": "rectangle", "pos": { - "x": 903, - "y": 315 + "x": 883, + "y": 225 }, "width": 73, "height": 66, @@ -669,8 +669,8 @@ "id": "grid w/ nested containers.c", "type": "rectangle", "pos": { - "x": 504, - "y": 562 + "x": 484, + "y": 451 }, "width": 53, "height": 66, @@ -710,8 +710,8 @@ "id": "grid w/ nested containers.d", "type": "rectangle", "pos": { - "x": 597, - "y": 562 + "x": 577, + "y": 451 }, "width": 479, "height": 66, @@ -754,8 +754,8 @@ "2x2" ], "pos": { - "x": 1196, - "y": 85 + "x": 1176, + "y": 32 }, "width": 480, "height": 518, @@ -795,8 +795,8 @@ "id": "grid in grid.a", "type": "rectangle", "pos": { - "x": 1256, - "y": 145 + "x": 1236, + "y": 92 }, "width": 53, "height": 292, @@ -839,8 +839,8 @@ "2x2" ], "pos": { - "x": 1349, - "y": 145 + "x": 1329, + "y": 92 }, "width": 267, "height": 292, @@ -880,8 +880,8 @@ "id": "grid in grid.b.a", "type": "rectangle", "pos": { - "x": 1409, - "y": 205 + "x": 1389, + "y": 152 }, "width": 53, "height": 66, @@ -921,8 +921,8 @@ "id": "grid in grid.b.b", "type": "rectangle", "pos": { - "x": 1502, - "y": 205 + "x": 1482, + "y": 152 }, "width": 54, "height": 66, @@ -962,8 +962,8 @@ "id": "grid in grid.b.c", "type": "rectangle", "pos": { - "x": 1409, - "y": 311 + "x": 1389, + "y": 258 }, "width": 53, "height": 66, @@ -1003,8 +1003,8 @@ "id": "grid in grid.b.d", "type": "rectangle", "pos": { - "x": 1502, - "y": 311 + "x": 1482, + "y": 258 }, "width": 54, "height": 66, @@ -1044,8 +1044,8 @@ "id": "grid in grid.c", "type": "rectangle", "pos": { - "x": 1256, - "y": 477 + "x": 1236, + "y": 424 }, "width": 53, "height": 66, @@ -1085,8 +1085,8 @@ "id": "grid in grid.d", "type": "rectangle", "pos": { - "x": 1349, - "y": 477 + "x": 1329, + "y": 424 }, "width": 267, "height": 66, @@ -1130,8 +1130,8 @@ "gap0" ], "pos": { - "x": 1736, - "y": 54 + "x": 1716, + "y": 0 }, "width": 321, "height": 581, @@ -1171,8 +1171,8 @@ "id": "grid w/ grid w/ grid.a", "type": "rectangle", "pos": { - "x": 1736, - "y": 100 + "x": 1716, + "y": 46 }, "width": 53, "height": 469, @@ -1216,8 +1216,8 @@ "gap0" ], "pos": { - "x": 1789, - "y": 100 + "x": 1769, + "y": 46 }, "width": 268, "height": 469, @@ -1257,8 +1257,8 @@ "id": "grid w/ grid w/ grid.b.a", "type": "rectangle", "pos": { - "x": 1789, - "y": 141 + "x": 1769, + "y": 87 }, "width": 214, "height": 66, @@ -1298,8 +1298,8 @@ "id": "grid w/ grid w/ grid.b.b", "type": "rectangle", "pos": { - "x": 2003, - "y": 141 + "x": 1983, + "y": 87 }, "width": 54, "height": 66, @@ -1343,8 +1343,8 @@ "gap0" ], "pos": { - "x": 1789, - "y": 207 + "x": 1769, + "y": 153 }, "width": 214, "height": 362, @@ -1384,8 +1384,8 @@ "id": "grid w/ grid w/ grid.b.c.a", "type": "rectangle", "pos": { - "x": 1789, - "y": 243 + "x": 1769, + "y": 189 }, "width": 53, "height": 66, @@ -1425,8 +1425,8 @@ "id": "grid w/ grid w/ grid.b.c.b", "type": "rectangle", "pos": { - "x": 1842, - "y": 243 + "x": 1822, + "y": 189 }, "width": 161, "height": 66, @@ -1466,8 +1466,8 @@ "id": "grid w/ grid w/ grid.b.c.c", "type": "rectangle", "pos": { - "x": 1789, - "y": 309 + "x": 1769, + "y": 255 }, "width": 53, "height": 260, @@ -1511,8 +1511,8 @@ "gap0" ], "pos": { - "x": 1842, - "y": 309 + "x": 1822, + "y": 255 }, "width": 161, "height": 260, @@ -1556,8 +1556,8 @@ "gap0" ], "pos": { - "x": 1842, - "y": 340 + "x": 1822, + "y": 286 }, "width": 107, "height": 163, @@ -1597,8 +1597,8 @@ "id": "grid w/ grid w/ grid.b.c.d.a.a", "type": "rectangle", "pos": { - "x": 1842, - "y": 371 + "x": 1822, + "y": 317 }, "width": 53, "height": 66, @@ -1638,8 +1638,8 @@ "id": "grid w/ grid w/ grid.b.c.d.a.b", "type": "rectangle", "pos": { - "x": 1895, - "y": 371 + "x": 1875, + "y": 317 }, "width": 54, "height": 66, @@ -1679,8 +1679,8 @@ "id": "grid w/ grid w/ grid.b.c.d.a.c", "type": "rectangle", "pos": { - "x": 1842, - "y": 437 + "x": 1822, + "y": 383 }, "width": 53, "height": 66, @@ -1720,8 +1720,8 @@ "id": "grid w/ grid w/ grid.b.c.d.a.d", "type": "rectangle", "pos": { - "x": 1895, - "y": 437 + "x": 1875, + "y": 383 }, "width": 54, "height": 66, @@ -1761,8 +1761,8 @@ "id": "grid w/ grid w/ grid.b.c.d.b", "type": "rectangle", "pos": { - "x": 1949, - "y": 340 + "x": 1929, + "y": 286 }, "width": 54, "height": 163, @@ -1802,8 +1802,8 @@ "id": "grid w/ grid w/ grid.b.c.d.c", "type": "rectangle", "pos": { - "x": 1842, - "y": 503 + "x": 1822, + "y": 449 }, "width": 107, "height": 66, @@ -1843,8 +1843,8 @@ "id": "grid w/ grid w/ grid.b.c.d.d", "type": "rectangle", "pos": { - "x": 1949, - "y": 503 + "x": 1929, + "y": 449 }, "width": 54, "height": 66, @@ -1884,8 +1884,8 @@ "id": "grid w/ grid w/ grid.b.d", "type": "rectangle", "pos": { - "x": 2003, - "y": 207 + "x": 1983, + "y": 153 }, "width": 54, "height": 362, @@ -1925,8 +1925,8 @@ "id": "grid w/ grid w/ grid.c", "type": "rectangle", "pos": { - "x": 1736, - "y": 569 + "x": 1716, + "y": 515 }, "width": 53, "height": 66, @@ -1966,8 +1966,8 @@ "id": "grid w/ grid w/ grid.d", "type": "rectangle", "pos": { - "x": 1789, - "y": 569 + "x": 1769, + "y": 515 }, "width": 268, "height": 66, diff --git a/e2etests/testdata/stable/grid_nested/dagre/sketch.exp.svg b/e2etests/testdata/stable/grid_nested/dagre/sketch.exp.svg index 9e3b4d904..85cdee992 100644 --- a/e2etests/testdata/stable/grid_nested/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/grid_nested/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -grid w/ containergrid w/ nested containersgrid in gridgrid w/ grid w/ gridabcdabcdabcdabcdb childb 1abcdabcdb 2b 2aabcdb 3b 3aabcdb 4b 3aabcd - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + .d2-475147087 .fill-N1{fill:#0A0F25;} + .d2-475147087 .fill-N2{fill:#676C7E;} + .d2-475147087 .fill-N3{fill:#9499AB;} + .d2-475147087 .fill-N4{fill:#CFD2DD;} + .d2-475147087 .fill-N5{fill:#DEE1EB;} + .d2-475147087 .fill-N6{fill:#EEF1F8;} + .d2-475147087 .fill-N7{fill:#FFFFFF;} + .d2-475147087 .fill-B1{fill:#0D32B2;} + .d2-475147087 .fill-B2{fill:#0D32B2;} + .d2-475147087 .fill-B3{fill:#E3E9FD;} + .d2-475147087 .fill-B4{fill:#E3E9FD;} + .d2-475147087 .fill-B5{fill:#EDF0FD;} + .d2-475147087 .fill-B6{fill:#F7F8FE;} + .d2-475147087 .fill-AA2{fill:#4A6FF3;} + .d2-475147087 .fill-AA4{fill:#EDF0FD;} + .d2-475147087 .fill-AA5{fill:#F7F8FE;} + .d2-475147087 .fill-AB4{fill:#EDF0FD;} + .d2-475147087 .fill-AB5{fill:#F7F8FE;} + .d2-475147087 .stroke-N1{stroke:#0A0F25;} + .d2-475147087 .stroke-N2{stroke:#676C7E;} + .d2-475147087 .stroke-N3{stroke:#9499AB;} + .d2-475147087 .stroke-N4{stroke:#CFD2DD;} + .d2-475147087 .stroke-N5{stroke:#DEE1EB;} + .d2-475147087 .stroke-N6{stroke:#EEF1F8;} + .d2-475147087 .stroke-N7{stroke:#FFFFFF;} + .d2-475147087 .stroke-B1{stroke:#0D32B2;} + .d2-475147087 .stroke-B2{stroke:#0D32B2;} + .d2-475147087 .stroke-B3{stroke:#E3E9FD;} + .d2-475147087 .stroke-B4{stroke:#E3E9FD;} + .d2-475147087 .stroke-B5{stroke:#EDF0FD;} + .d2-475147087 .stroke-B6{stroke:#F7F8FE;} + .d2-475147087 .stroke-AA2{stroke:#4A6FF3;} + .d2-475147087 .stroke-AA4{stroke:#EDF0FD;} + .d2-475147087 .stroke-AA5{stroke:#F7F8FE;} + .d2-475147087 .stroke-AB4{stroke:#EDF0FD;} + .d2-475147087 .stroke-AB5{stroke:#F7F8FE;} + .d2-475147087 .background-color-N1{background-color:#0A0F25;} + .d2-475147087 .background-color-N2{background-color:#676C7E;} + .d2-475147087 .background-color-N3{background-color:#9499AB;} + .d2-475147087 .background-color-N4{background-color:#CFD2DD;} + .d2-475147087 .background-color-N5{background-color:#DEE1EB;} + .d2-475147087 .background-color-N6{background-color:#EEF1F8;} + .d2-475147087 .background-color-N7{background-color:#FFFFFF;} + .d2-475147087 .background-color-B1{background-color:#0D32B2;} + .d2-475147087 .background-color-B2{background-color:#0D32B2;} + .d2-475147087 .background-color-B3{background-color:#E3E9FD;} + .d2-475147087 .background-color-B4{background-color:#E3E9FD;} + .d2-475147087 .background-color-B5{background-color:#EDF0FD;} + .d2-475147087 .background-color-B6{background-color:#F7F8FE;} + .d2-475147087 .background-color-AA2{background-color:#4A6FF3;} + .d2-475147087 .background-color-AA4{background-color:#EDF0FD;} + .d2-475147087 .background-color-AA5{background-color:#F7F8FE;} + .d2-475147087 .background-color-AB4{background-color:#EDF0FD;} + .d2-475147087 .background-color-AB5{background-color:#F7F8FE;} + .d2-475147087 .color-N1{color:#0A0F25;} + .d2-475147087 .color-N2{color:#676C7E;} + .d2-475147087 .color-N3{color:#9499AB;} + .d2-475147087 .color-N4{color:#CFD2DD;} + .d2-475147087 .color-N5{color:#DEE1EB;} + .d2-475147087 .color-N6{color:#EEF1F8;} + .d2-475147087 .color-N7{color:#FFFFFF;} + .d2-475147087 .color-B1{color:#0D32B2;} + .d2-475147087 .color-B2{color:#0D32B2;} + .d2-475147087 .color-B3{color:#E3E9FD;} + .d2-475147087 .color-B4{color:#E3E9FD;} + .d2-475147087 .color-B5{color:#EDF0FD;} + .d2-475147087 .color-B6{color:#F7F8FE;} + .d2-475147087 .color-AA2{color:#4A6FF3;} + .d2-475147087 .color-AA4{color:#EDF0FD;} + .d2-475147087 .color-AA5{color:#F7F8FE;} + .d2-475147087 .color-AB4{color:#EDF0FD;} + .d2-475147087 .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}]]>grid w/ containergrid w/ nested containersgrid in gridgrid w/ grid w/ gridabcdabcdabcdabcdb childb 1abcdabcdb 2b 2aabcdb 3b 3aabcdb 4b 3aabcd + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/hexagon_3d/dagre/board.exp.json b/e2etests/testdata/stable/hexagon_3d/dagre/board.exp.json index 7c7767d43..2cfd1d39c 100644 --- a/e2etests/testdata/stable/hexagon_3d/dagre/board.exp.json +++ b/e2etests/testdata/stable/hexagon_3d/dagre/board.exp.json @@ -8,7 +8,7 @@ "type": "hexagon", "pos": { "x": 0, - "y": 7 + "y": 0 }, "width": 128, "height": 69, diff --git a/e2etests/testdata/stable/hexagon_3d/dagre/sketch.exp.svg b/e2etests/testdata/stable/hexagon_3d/dagre/sketch.exp.svg index f51ab8728..f2fdac93d 100644 --- a/e2etests/testdata/stable/hexagon_3d/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/hexagon_3d/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ - - -hexagon - - + .d2-593352307 .fill-N1{fill:#0A0F25;} + .d2-593352307 .fill-N2{fill:#676C7E;} + .d2-593352307 .fill-N3{fill:#9499AB;} + .d2-593352307 .fill-N4{fill:#CFD2DD;} + .d2-593352307 .fill-N5{fill:#DEE1EB;} + .d2-593352307 .fill-N6{fill:#EEF1F8;} + .d2-593352307 .fill-N7{fill:#FFFFFF;} + .d2-593352307 .fill-B1{fill:#0D32B2;} + .d2-593352307 .fill-B2{fill:#0D32B2;} + .d2-593352307 .fill-B3{fill:#E3E9FD;} + .d2-593352307 .fill-B4{fill:#E3E9FD;} + .d2-593352307 .fill-B5{fill:#EDF0FD;} + .d2-593352307 .fill-B6{fill:#F7F8FE;} + .d2-593352307 .fill-AA2{fill:#4A6FF3;} + .d2-593352307 .fill-AA4{fill:#EDF0FD;} + .d2-593352307 .fill-AA5{fill:#F7F8FE;} + .d2-593352307 .fill-AB4{fill:#EDF0FD;} + .d2-593352307 .fill-AB5{fill:#F7F8FE;} + .d2-593352307 .stroke-N1{stroke:#0A0F25;} + .d2-593352307 .stroke-N2{stroke:#676C7E;} + .d2-593352307 .stroke-N3{stroke:#9499AB;} + .d2-593352307 .stroke-N4{stroke:#CFD2DD;} + .d2-593352307 .stroke-N5{stroke:#DEE1EB;} + .d2-593352307 .stroke-N6{stroke:#EEF1F8;} + .d2-593352307 .stroke-N7{stroke:#FFFFFF;} + .d2-593352307 .stroke-B1{stroke:#0D32B2;} + .d2-593352307 .stroke-B2{stroke:#0D32B2;} + .d2-593352307 .stroke-B3{stroke:#E3E9FD;} + .d2-593352307 .stroke-B4{stroke:#E3E9FD;} + .d2-593352307 .stroke-B5{stroke:#EDF0FD;} + .d2-593352307 .stroke-B6{stroke:#F7F8FE;} + .d2-593352307 .stroke-AA2{stroke:#4A6FF3;} + .d2-593352307 .stroke-AA4{stroke:#EDF0FD;} + .d2-593352307 .stroke-AA5{stroke:#F7F8FE;} + .d2-593352307 .stroke-AB4{stroke:#EDF0FD;} + .d2-593352307 .stroke-AB5{stroke:#F7F8FE;} + .d2-593352307 .background-color-N1{background-color:#0A0F25;} + .d2-593352307 .background-color-N2{background-color:#676C7E;} + .d2-593352307 .background-color-N3{background-color:#9499AB;} + .d2-593352307 .background-color-N4{background-color:#CFD2DD;} + .d2-593352307 .background-color-N5{background-color:#DEE1EB;} + .d2-593352307 .background-color-N6{background-color:#EEF1F8;} + .d2-593352307 .background-color-N7{background-color:#FFFFFF;} + .d2-593352307 .background-color-B1{background-color:#0D32B2;} + .d2-593352307 .background-color-B2{background-color:#0D32B2;} + .d2-593352307 .background-color-B3{background-color:#E3E9FD;} + .d2-593352307 .background-color-B4{background-color:#E3E9FD;} + .d2-593352307 .background-color-B5{background-color:#EDF0FD;} + .d2-593352307 .background-color-B6{background-color:#F7F8FE;} + .d2-593352307 .background-color-AA2{background-color:#4A6FF3;} + .d2-593352307 .background-color-AA4{background-color:#EDF0FD;} + .d2-593352307 .background-color-AA5{background-color:#F7F8FE;} + .d2-593352307 .background-color-AB4{background-color:#EDF0FD;} + .d2-593352307 .background-color-AB5{background-color:#F7F8FE;} + .d2-593352307 .color-N1{color:#0A0F25;} + .d2-593352307 .color-N2{color:#676C7E;} + .d2-593352307 .color-N3{color:#9499AB;} + .d2-593352307 .color-N4{color:#CFD2DD;} + .d2-593352307 .color-N5{color:#DEE1EB;} + .d2-593352307 .color-N6{color:#EEF1F8;} + .d2-593352307 .color-N7{color:#FFFFFF;} + .d2-593352307 .color-B1{color:#0D32B2;} + .d2-593352307 .color-B2{color:#0D32B2;} + .d2-593352307 .color-B3{color:#E3E9FD;} + .d2-593352307 .color-B4{color:#E3E9FD;} + .d2-593352307 .color-B5{color:#EDF0FD;} + .d2-593352307 .color-B6{color:#F7F8FE;} + .d2-593352307 .color-AA2{color:#4A6FF3;} + .d2-593352307 .color-AA4{color:#EDF0FD;} + .d2-593352307 .color-AA5{color:#F7F8FE;} + .d2-593352307 .color-AB4{color:#EDF0FD;} + .d2-593352307 .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}]]> + +hexagon + + \ No newline at end of file diff --git a/e2etests/testdata/stable/icon-containers/dagre/board.exp.json b/e2etests/testdata/stable/icon-containers/dagre/board.exp.json index d80b1065f..0ea754bd6 100644 --- a/e2etests/testdata/stable/icon-containers/dagre/board.exp.json +++ b/e2etests/testdata/stable/icon-containers/dagre/board.exp.json @@ -8,10 +8,10 @@ "type": "rectangle", "pos": { "x": 0, - "y": 41 + "y": 5 }, "width": 320, - "height": 443, + "height": 327, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -61,10 +61,10 @@ "type": "rectangle", "pos": { "x": 20, - "y": 117 + "y": 46 }, "width": 280, - "height": 326, + "height": 256, "opacity": 1, "strokeDash": 3, "strokeWidth": 2, @@ -101,11 +101,11 @@ "id": "vpc.az.firewall", "type": "rectangle", "pos": { - "x": 40, - "y": 191 + "x": 50, + "y": 120 }, - "width": 240, - "height": 209, + "width": 220, + "height": 152, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -155,10 +155,10 @@ "type": "rectangle", "pos": { "x": 80, - "y": 237 + "y": 150 }, "width": 160, - "height": 118, + "height": 92, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, diff --git a/e2etests/testdata/stable/icon-containers/dagre/sketch.exp.svg b/e2etests/testdata/stable/icon-containers/dagre/sketch.exp.svg index 9293bde9d..9b1ea5646 100644 --- a/e2etests/testdata/stable/icon-containers/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/icon-containers/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -VPC 1 10.1.0.0./16Availability Zone AFirewall Subnet AEC2 Instance - - - - - + .d2-807654184 .fill-N1{fill:#0A0F25;} + .d2-807654184 .fill-N2{fill:#676C7E;} + .d2-807654184 .fill-N3{fill:#9499AB;} + .d2-807654184 .fill-N4{fill:#CFD2DD;} + .d2-807654184 .fill-N5{fill:#DEE1EB;} + .d2-807654184 .fill-N6{fill:#EEF1F8;} + .d2-807654184 .fill-N7{fill:#FFFFFF;} + .d2-807654184 .fill-B1{fill:#0D32B2;} + .d2-807654184 .fill-B2{fill:#0D32B2;} + .d2-807654184 .fill-B3{fill:#E3E9FD;} + .d2-807654184 .fill-B4{fill:#E3E9FD;} + .d2-807654184 .fill-B5{fill:#EDF0FD;} + .d2-807654184 .fill-B6{fill:#F7F8FE;} + .d2-807654184 .fill-AA2{fill:#4A6FF3;} + .d2-807654184 .fill-AA4{fill:#EDF0FD;} + .d2-807654184 .fill-AA5{fill:#F7F8FE;} + .d2-807654184 .fill-AB4{fill:#EDF0FD;} + .d2-807654184 .fill-AB5{fill:#F7F8FE;} + .d2-807654184 .stroke-N1{stroke:#0A0F25;} + .d2-807654184 .stroke-N2{stroke:#676C7E;} + .d2-807654184 .stroke-N3{stroke:#9499AB;} + .d2-807654184 .stroke-N4{stroke:#CFD2DD;} + .d2-807654184 .stroke-N5{stroke:#DEE1EB;} + .d2-807654184 .stroke-N6{stroke:#EEF1F8;} + .d2-807654184 .stroke-N7{stroke:#FFFFFF;} + .d2-807654184 .stroke-B1{stroke:#0D32B2;} + .d2-807654184 .stroke-B2{stroke:#0D32B2;} + .d2-807654184 .stroke-B3{stroke:#E3E9FD;} + .d2-807654184 .stroke-B4{stroke:#E3E9FD;} + .d2-807654184 .stroke-B5{stroke:#EDF0FD;} + .d2-807654184 .stroke-B6{stroke:#F7F8FE;} + .d2-807654184 .stroke-AA2{stroke:#4A6FF3;} + .d2-807654184 .stroke-AA4{stroke:#EDF0FD;} + .d2-807654184 .stroke-AA5{stroke:#F7F8FE;} + .d2-807654184 .stroke-AB4{stroke:#EDF0FD;} + .d2-807654184 .stroke-AB5{stroke:#F7F8FE;} + .d2-807654184 .background-color-N1{background-color:#0A0F25;} + .d2-807654184 .background-color-N2{background-color:#676C7E;} + .d2-807654184 .background-color-N3{background-color:#9499AB;} + .d2-807654184 .background-color-N4{background-color:#CFD2DD;} + .d2-807654184 .background-color-N5{background-color:#DEE1EB;} + .d2-807654184 .background-color-N6{background-color:#EEF1F8;} + .d2-807654184 .background-color-N7{background-color:#FFFFFF;} + .d2-807654184 .background-color-B1{background-color:#0D32B2;} + .d2-807654184 .background-color-B2{background-color:#0D32B2;} + .d2-807654184 .background-color-B3{background-color:#E3E9FD;} + .d2-807654184 .background-color-B4{background-color:#E3E9FD;} + .d2-807654184 .background-color-B5{background-color:#EDF0FD;} + .d2-807654184 .background-color-B6{background-color:#F7F8FE;} + .d2-807654184 .background-color-AA2{background-color:#4A6FF3;} + .d2-807654184 .background-color-AA4{background-color:#EDF0FD;} + .d2-807654184 .background-color-AA5{background-color:#F7F8FE;} + .d2-807654184 .background-color-AB4{background-color:#EDF0FD;} + .d2-807654184 .background-color-AB5{background-color:#F7F8FE;} + .d2-807654184 .color-N1{color:#0A0F25;} + .d2-807654184 .color-N2{color:#676C7E;} + .d2-807654184 .color-N3{color:#9499AB;} + .d2-807654184 .color-N4{color:#CFD2DD;} + .d2-807654184 .color-N5{color:#DEE1EB;} + .d2-807654184 .color-N6{color:#EEF1F8;} + .d2-807654184 .color-N7{color:#FFFFFF;} + .d2-807654184 .color-B1{color:#0D32B2;} + .d2-807654184 .color-B2{color:#0D32B2;} + .d2-807654184 .color-B3{color:#E3E9FD;} + .d2-807654184 .color-B4{color:#E3E9FD;} + .d2-807654184 .color-B5{color:#EDF0FD;} + .d2-807654184 .color-B6{color:#F7F8FE;} + .d2-807654184 .color-AA2{color:#4A6FF3;} + .d2-807654184 .color-AA4{color:#EDF0FD;} + .d2-807654184 .color-AA5{color:#F7F8FE;} + .d2-807654184 .color-AB4{color:#EDF0FD;} + .d2-807654184 .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}]]>VPC 1 10.1.0.0./16Availability Zone AFirewall Subnet AEC2 Instance + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/icon-label/dagre/board.exp.json b/e2etests/testdata/stable/icon-label/dagre/board.exp.json index 45663531c..7592012a6 100644 --- a/e2etests/testdata/stable/icon-label/dagre/board.exp.json +++ b/e2etests/testdata/stable/icon-label/dagre/board.exp.json @@ -11,7 +11,7 @@ "y": 0 }, "width": 106, - "height": 118, + "height": 92, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, diff --git a/e2etests/testdata/stable/icon-label/dagre/sketch.exp.svg b/e2etests/testdata/stable/icon-label/dagre/sketch.exp.svg index 31b45f743..bc32ef22e 100644 --- a/e2etests/testdata/stable/icon-label/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/icon-label/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -hello - + .d2-3196172804 .fill-N1{fill:#0A0F25;} + .d2-3196172804 .fill-N2{fill:#676C7E;} + .d2-3196172804 .fill-N3{fill:#9499AB;} + .d2-3196172804 .fill-N4{fill:#CFD2DD;} + .d2-3196172804 .fill-N5{fill:#DEE1EB;} + .d2-3196172804 .fill-N6{fill:#EEF1F8;} + .d2-3196172804 .fill-N7{fill:#FFFFFF;} + .d2-3196172804 .fill-B1{fill:#0D32B2;} + .d2-3196172804 .fill-B2{fill:#0D32B2;} + .d2-3196172804 .fill-B3{fill:#E3E9FD;} + .d2-3196172804 .fill-B4{fill:#E3E9FD;} + .d2-3196172804 .fill-B5{fill:#EDF0FD;} + .d2-3196172804 .fill-B6{fill:#F7F8FE;} + .d2-3196172804 .fill-AA2{fill:#4A6FF3;} + .d2-3196172804 .fill-AA4{fill:#EDF0FD;} + .d2-3196172804 .fill-AA5{fill:#F7F8FE;} + .d2-3196172804 .fill-AB4{fill:#EDF0FD;} + .d2-3196172804 .fill-AB5{fill:#F7F8FE;} + .d2-3196172804 .stroke-N1{stroke:#0A0F25;} + .d2-3196172804 .stroke-N2{stroke:#676C7E;} + .d2-3196172804 .stroke-N3{stroke:#9499AB;} + .d2-3196172804 .stroke-N4{stroke:#CFD2DD;} + .d2-3196172804 .stroke-N5{stroke:#DEE1EB;} + .d2-3196172804 .stroke-N6{stroke:#EEF1F8;} + .d2-3196172804 .stroke-N7{stroke:#FFFFFF;} + .d2-3196172804 .stroke-B1{stroke:#0D32B2;} + .d2-3196172804 .stroke-B2{stroke:#0D32B2;} + .d2-3196172804 .stroke-B3{stroke:#E3E9FD;} + .d2-3196172804 .stroke-B4{stroke:#E3E9FD;} + .d2-3196172804 .stroke-B5{stroke:#EDF0FD;} + .d2-3196172804 .stroke-B6{stroke:#F7F8FE;} + .d2-3196172804 .stroke-AA2{stroke:#4A6FF3;} + .d2-3196172804 .stroke-AA4{stroke:#EDF0FD;} + .d2-3196172804 .stroke-AA5{stroke:#F7F8FE;} + .d2-3196172804 .stroke-AB4{stroke:#EDF0FD;} + .d2-3196172804 .stroke-AB5{stroke:#F7F8FE;} + .d2-3196172804 .background-color-N1{background-color:#0A0F25;} + .d2-3196172804 .background-color-N2{background-color:#676C7E;} + .d2-3196172804 .background-color-N3{background-color:#9499AB;} + .d2-3196172804 .background-color-N4{background-color:#CFD2DD;} + .d2-3196172804 .background-color-N5{background-color:#DEE1EB;} + .d2-3196172804 .background-color-N6{background-color:#EEF1F8;} + .d2-3196172804 .background-color-N7{background-color:#FFFFFF;} + .d2-3196172804 .background-color-B1{background-color:#0D32B2;} + .d2-3196172804 .background-color-B2{background-color:#0D32B2;} + .d2-3196172804 .background-color-B3{background-color:#E3E9FD;} + .d2-3196172804 .background-color-B4{background-color:#E3E9FD;} + .d2-3196172804 .background-color-B5{background-color:#EDF0FD;} + .d2-3196172804 .background-color-B6{background-color:#F7F8FE;} + .d2-3196172804 .background-color-AA2{background-color:#4A6FF3;} + .d2-3196172804 .background-color-AA4{background-color:#EDF0FD;} + .d2-3196172804 .background-color-AA5{background-color:#F7F8FE;} + .d2-3196172804 .background-color-AB4{background-color:#EDF0FD;} + .d2-3196172804 .background-color-AB5{background-color:#F7F8FE;} + .d2-3196172804 .color-N1{color:#0A0F25;} + .d2-3196172804 .color-N2{color:#676C7E;} + .d2-3196172804 .color-N3{color:#9499AB;} + .d2-3196172804 .color-N4{color:#CFD2DD;} + .d2-3196172804 .color-N5{color:#DEE1EB;} + .d2-3196172804 .color-N6{color:#EEF1F8;} + .d2-3196172804 .color-N7{color:#FFFFFF;} + .d2-3196172804 .color-B1{color:#0D32B2;} + .d2-3196172804 .color-B2{color:#0D32B2;} + .d2-3196172804 .color-B3{color:#E3E9FD;} + .d2-3196172804 .color-B4{color:#E3E9FD;} + .d2-3196172804 .color-B5{color:#EDF0FD;} + .d2-3196172804 .color-B6{color:#F7F8FE;} + .d2-3196172804 .color-AA2{color:#4A6FF3;} + .d2-3196172804 .color-AA4{color:#EDF0FD;} + .d2-3196172804 .color-AA5{color:#F7F8FE;} + .d2-3196172804 .color-AB4{color:#EDF0FD;} + .d2-3196172804 .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}]]>hello + \ No newline at end of file diff --git a/e2etests/testdata/stable/icon_positions/dagre/board.exp.json b/e2etests/testdata/stable/icon_positions/dagre/board.exp.json index 818345637..a2eecb56f 100644 --- a/e2etests/testdata/stable/icon_positions/dagre/board.exp.json +++ b/e2etests/testdata/stable/icon_positions/dagre/board.exp.json @@ -7,11 +7,11 @@ "id": "non container", "type": "rectangle", "pos": { - "x": 161, - "y": 41 + "x": 171, + "y": -72 }, - "width": 5649, - "height": 209, + "width": 6221, + "height": 240, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -52,10 +52,10 @@ ], "pos": { "x": 201, - "y": 86 + "y": 2 }, "width": 122, - "height": 118, + "height": 92, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -109,10 +109,10 @@ ], "pos": { "x": 383, - "y": 86 + "y": 2 }, "width": 182, - "height": 118, + "height": 92, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -166,10 +166,10 @@ ], "pos": { "x": 625, - "y": 86 + "y": 2 }, "width": 202, - "height": 118, + "height": 92, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -223,10 +223,10 @@ ], "pos": { "x": 887, - "y": 86 + "y": 2 }, "width": 191, - "height": 118, + "height": 92, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -279,11 +279,11 @@ "OutsideLeftTop" ], "pos": { - "x": 1138, - "y": 86 + "x": 1212, + "y": 2 }, "width": 182, - "height": 118, + "height": 92, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -336,11 +336,11 @@ "OutsideLeftMiddle" ], "pos": { - "x": 1380, - "y": 86 + "x": 1528, + "y": 2 }, "width": 202, - "height": 118, + "height": 92, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -393,11 +393,11 @@ "OutsideLeftBottom" ], "pos": { - "x": 1642, - "y": 86 + "x": 1864, + "y": 2 }, "width": 207, - "height": 118, + "height": 92, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -450,11 +450,11 @@ "OutsideRightTop" ], "pos": { - "x": 1909, - "y": 86 + "x": 2131, + "y": 2 }, "width": 191, - "height": 118, + "height": 92, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -507,11 +507,11 @@ "OutsideRightMiddle" ], "pos": { - "x": 2160, - "y": 86 + "x": 2456, + "y": 2 }, "width": 212, - "height": 118, + "height": 92, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -564,11 +564,11 @@ "OutsideRightBottom" ], "pos": { - "x": 2432, - "y": 86 + "x": 2802, + "y": 2 }, "width": 217, - "height": 118, + "height": 92, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -621,11 +621,11 @@ "OutsideBottomLeft" ], "pos": { - "x": 2709, - "y": 86 + "x": 3153, + "y": 2 }, "width": 208, - "height": 118, + "height": 92, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -678,11 +678,11 @@ "OutsideBottomCenter" ], "pos": { - "x": 2977, - "y": 86 + "x": 3421, + "y": 2 }, "width": 228, - "height": 118, + "height": 92, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -735,11 +735,11 @@ "OutsideBottomRight" ], "pos": { - "x": 3265, - "y": 86 + "x": 3709, + "y": 2 }, "width": 218, - "height": 118, + "height": 92, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -792,11 +792,11 @@ "InsideTopLeft" ], "pos": { - "x": 3543, - "y": 86 + "x": 3987, + "y": 2 }, "width": 168, - "height": 118, + "height": 92, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -849,11 +849,11 @@ "InsideTopCenter" ], "pos": { - "x": 3771, - "y": 86 + "x": 4215, + "y": 2 }, "width": 189, - "height": 118, + "height": 92, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -906,11 +906,11 @@ "InsideTopRight" ], "pos": { - "x": 4020, - "y": 86 + "x": 4464, + "y": 2 }, "width": 178, - "height": 118, + "height": 92, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -963,11 +963,11 @@ "InsideMiddleLeft" ], "pos": { - "x": 4258, - "y": 86 + "x": 4702, + "y": 2 }, - "width": 189, - "height": 118, + "width": 263, + "height": 92, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1020,11 +1020,11 @@ "InsideMiddleCenter" ], "pos": { - "x": 4507, - "y": 86 + "x": 5025, + "y": 2 }, "width": 209, - "height": 118, + "height": 92, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1077,11 +1077,11 @@ "InsideMiddleRight" ], "pos": { - "x": 4776, - "y": 86 + "x": 5294, + "y": 2 }, - "width": 199, - "height": 118, + "width": 273, + "height": 92, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1134,11 +1134,11 @@ "InsideBottomLeft" ], "pos": { - "x": 5035, - "y": 86 + "x": 5627, + "y": 2 }, "width": 195, - "height": 118, + "height": 92, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1191,11 +1191,11 @@ "InsideBottomCenter" ], "pos": { - "x": 5290, - "y": 86 + "x": 5882, + "y": 2 }, "width": 215, - "height": 118, + "height": 92, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1248,11 +1248,11 @@ "InsideBottomRight" ], "pos": { - "x": 5565, - "y": 86 + "x": 6157, + "y": 2 }, "width": 205, - "height": 118, + "height": 92, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1302,10 +1302,10 @@ "type": "rectangle", "pos": { "x": 0, - "y": 423 + "y": 301 }, - "width": 5957, - "height": 289, + "width": 6549, + "height": 285, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1345,11 +1345,11 @@ "icon" ], "pos": { - "x": 20, - "y": 504 + "x": 30, + "y": 386 }, - "width": 176, - "height": 162, + "width": 156, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1399,7 +1399,7 @@ "type": "rectangle", "pos": { "x": 60, - "y": 552 + "y": 416 }, "width": 96, "height": 66, @@ -1443,11 +1443,11 @@ "OutsideTopLeft" ], "pos": { - "x": 216, - "y": 504 + "x": 226, + "y": 386 }, - "width": 236, - "height": 162, + "width": 216, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1500,11 +1500,11 @@ "OutsideTopCenter" ], "pos": { - "x": 472, - "y": 504 + "x": 482, + "y": 386 }, - "width": 256, - "height": 162, + "width": 236, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1557,11 +1557,11 @@ "OutsideTopRight" ], "pos": { - "x": 748, - "y": 504 + "x": 758, + "y": 386 }, - "width": 245, - "height": 162, + "width": 225, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1614,11 +1614,11 @@ "OutsideLeftTop" ], "pos": { - "x": 1013, - "y": 504 + "x": 1097, + "y": 386 }, - "width": 236, - "height": 162, + "width": 216, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1671,11 +1671,11 @@ "OutsideLeftMiddle" ], "pos": { - "x": 1269, - "y": 504 + "x": 1427, + "y": 386 }, - "width": 256, - "height": 162, + "width": 236, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1728,11 +1728,11 @@ "OutsideLeftBottom" ], "pos": { - "x": 1545, - "y": 504 + "x": 1777, + "y": 386 }, - "width": 261, - "height": 162, + "width": 241, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1785,11 +1785,11 @@ "OutsideRightTop" ], "pos": { - "x": 1826, - "y": 504 + "x": 2058, + "y": 386 }, - "width": 245, - "height": 162, + "width": 225, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1842,11 +1842,11 @@ "OutsideRightMiddle" ], "pos": { - "x": 2091, - "y": 504 + "x": 2397, + "y": 386 }, - "width": 266, - "height": 162, + "width": 246, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1899,11 +1899,11 @@ "OutsideRightBottom" ], "pos": { - "x": 2377, - "y": 504 + "x": 2757, + "y": 386 }, - "width": 271, - "height": 162, + "width": 251, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1956,11 +1956,11 @@ "OutsideBottomLeft" ], "pos": { - "x": 2668, - "y": 504 + "x": 3122, + "y": 386 }, - "width": 262, - "height": 162, + "width": 242, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -2013,11 +2013,11 @@ "OutsideBottomCenter" ], "pos": { - "x": 2950, - "y": 504 + "x": 3404, + "y": 386 }, - "width": 282, - "height": 162, + "width": 262, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -2070,11 +2070,11 @@ "OutsideBottomRight" ], "pos": { - "x": 3252, - "y": 504 + "x": 3706, + "y": 386 }, - "width": 272, - "height": 162, + "width": 252, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -2127,11 +2127,11 @@ "InsideTopLeft" ], "pos": { - "x": 3544, - "y": 504 + "x": 3998, + "y": 342 }, - "width": 222, - "height": 162, + "width": 202, + "height": 170, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -2184,11 +2184,11 @@ "InsideTopCenter" ], "pos": { - "x": 3786, - "y": 504 + "x": 4240, + "y": 342 }, - "width": 243, - "height": 162, + "width": 223, + "height": 170, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -2241,11 +2241,11 @@ "InsideTopRight" ], "pos": { - "x": 4049, - "y": 504 + "x": 4503, + "y": 342 }, - "width": 232, - "height": 162, + "width": 212, + "height": 170, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -2298,11 +2298,11 @@ "InsideMiddleLeft" ], "pos": { - "x": 4301, - "y": 504 + "x": 4785, + "y": 386 }, - "width": 243, - "height": 162, + "width": 267, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -2355,11 +2355,11 @@ "InsideMiddleCenter" ], "pos": { - "x": 4564, - "y": 504 + "x": 5092, + "y": 386 }, - "width": 263, - "height": 162, + "width": 243, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -2412,11 +2412,11 @@ "InsideMiddleRight" ], "pos": { - "x": 4847, - "y": 504 + "x": 5375, + "y": 386 }, - "width": 253, - "height": 162, + "width": 277, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -2469,11 +2469,11 @@ "InsideBottomLeft" ], "pos": { - "x": 5120, - "y": 504 + "x": 5722, + "y": 386 }, - "width": 249, - "height": 162, + "width": 229, + "height": 170, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -2526,11 +2526,11 @@ "InsideBottomCenter" ], "pos": { - "x": 5389, - "y": 504 + "x": 5991, + "y": 386 }, - "width": 269, - "height": 162, + "width": 249, + "height": 170, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -2583,11 +2583,11 @@ "InsideBottomRight" ], "pos": { - "x": 5678, - "y": 504 + "x": 6280, + "y": 386 }, - "width": 259, - "height": 162, + "width": 239, + "height": 170, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -2637,7 +2637,7 @@ "type": "rectangle", "pos": { "x": 256, - "y": 552 + "y": 416 }, "width": 156, "height": 66, @@ -2678,7 +2678,7 @@ "type": "rectangle", "pos": { "x": 512, - "y": 552 + "y": 416 }, "width": 176, "height": 66, @@ -2719,7 +2719,7 @@ "type": "rectangle", "pos": { "x": 788, - "y": 552 + "y": 416 }, "width": 165, "height": 66, @@ -2759,8 +2759,8 @@ "id": "container.OutsideLeftTop.OutsideLeftTop", "type": "rectangle", "pos": { - "x": 1053, - "y": 552 + "x": 1127, + "y": 416 }, "width": 156, "height": 66, @@ -2800,8 +2800,8 @@ "id": "container.OutsideLeftMiddle.OutsideLeftMiddle", "type": "rectangle", "pos": { - "x": 1309, - "y": 552 + "x": 1457, + "y": 416 }, "width": 176, "height": 66, @@ -2841,8 +2841,8 @@ "id": "container.OutsideLeftBottom.OutsideLeftBottom", "type": "rectangle", "pos": { - "x": 1585, - "y": 552 + "x": 1807, + "y": 416 }, "width": 181, "height": 66, @@ -2882,8 +2882,8 @@ "id": "container.OutsideRightTop.OutsideRightTop", "type": "rectangle", "pos": { - "x": 1866, - "y": 552 + "x": 2088, + "y": 416 }, "width": 165, "height": 66, @@ -2923,8 +2923,8 @@ "id": "container.OutsideRightMiddle.OutsideRightMiddle", "type": "rectangle", "pos": { - "x": 2131, - "y": 552 + "x": 2427, + "y": 416 }, "width": 186, "height": 66, @@ -2964,8 +2964,8 @@ "id": "container.OutsideRightBottom.OutsideRightBottom", "type": "rectangle", "pos": { - "x": 2417, - "y": 552 + "x": 2787, + "y": 416 }, "width": 191, "height": 66, @@ -3005,8 +3005,8 @@ "id": "container.OutsideBottomLeft.OutsideBottomLeft", "type": "rectangle", "pos": { - "x": 2708, - "y": 552 + "x": 3152, + "y": 416 }, "width": 182, "height": 66, @@ -3046,8 +3046,8 @@ "id": "container.OutsideBottomCenter.OutsideBottomCenter", "type": "rectangle", "pos": { - "x": 2990, - "y": 552 + "x": 3434, + "y": 416 }, "width": 202, "height": 66, @@ -3087,8 +3087,8 @@ "id": "container.OutsideBottomRight.OutsideBottomRight", "type": "rectangle", "pos": { - "x": 3292, - "y": 552 + "x": 3736, + "y": 416 }, "width": 192, "height": 66, @@ -3128,8 +3128,8 @@ "id": "container.InsideTopLeft.InsideTopLeft", "type": "rectangle", "pos": { - "x": 3584, - "y": 552 + "x": 4028, + "y": 416 }, "width": 142, "height": 66, @@ -3169,8 +3169,8 @@ "id": "container.InsideTopCenter.InsideTopCenter", "type": "rectangle", "pos": { - "x": 3826, - "y": 552 + "x": 4270, + "y": 416 }, "width": 163, "height": 66, @@ -3210,8 +3210,8 @@ "id": "container.InsideTopRight.InsideTopRight", "type": "rectangle", "pos": { - "x": 4089, - "y": 552 + "x": 4533, + "y": 416 }, "width": 152, "height": 66, @@ -3251,8 +3251,8 @@ "id": "container.InsideMiddleLeft.InsideMiddleLeft", "type": "rectangle", "pos": { - "x": 4341, - "y": 552 + "x": 4859, + "y": 416 }, "width": 163, "height": 66, @@ -3292,8 +3292,8 @@ "id": "container.InsideMiddleCenter.InsideMiddleCenter", "type": "rectangle", "pos": { - "x": 4604, - "y": 552 + "x": 5122, + "y": 416 }, "width": 183, "height": 66, @@ -3333,8 +3333,8 @@ "id": "container.InsideMiddleRight.InsideMiddleRight", "type": "rectangle", "pos": { - "x": 4887, - "y": 552 + "x": 5405, + "y": 416 }, "width": 173, "height": 66, @@ -3374,8 +3374,8 @@ "id": "container.InsideBottomLeft.InsideBottomLeft", "type": "rectangle", "pos": { - "x": 5160, - "y": 552 + "x": 5752, + "y": 416 }, "width": 169, "height": 66, @@ -3415,8 +3415,8 @@ "id": "container.InsideBottomCenter.InsideBottomCenter", "type": "rectangle", "pos": { - "x": 5429, - "y": 552 + "x": 6021, + "y": 416 }, "width": 189, "height": 66, @@ -3456,8 +3456,8 @@ "id": "container.InsideBottomRight.InsideBottomRight", "type": "rectangle", "pos": { - "x": 5718, - "y": 552 + "x": 6310, + "y": 416 }, "width": 179, "height": 66, @@ -3497,11 +3497,11 @@ "id": "image", "type": "rectangle", "pos": { - "x": 919, - "y": 885 + "x": 929, + "y": 750 }, - "width": 4156, - "height": 245, + "width": 4136, + "height": 189, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -3543,7 +3543,7 @@ ], "pos": { "x": 959, - "y": 930 + "y": 780 }, "width": 128, "height": 128, @@ -3601,7 +3601,7 @@ ], "pos": { "x": 1147, - "y": 930 + "y": 780 }, "width": 128, "height": 128, @@ -3659,7 +3659,7 @@ ], "pos": { "x": 1335, - "y": 930 + "y": 780 }, "width": 128, "height": 128, @@ -3717,7 +3717,7 @@ ], "pos": { "x": 1523, - "y": 930 + "y": 780 }, "width": 128, "height": 128, @@ -3775,7 +3775,7 @@ ], "pos": { "x": 1711, - "y": 930 + "y": 780 }, "width": 128, "height": 128, @@ -3833,7 +3833,7 @@ ], "pos": { "x": 1899, - "y": 930 + "y": 780 }, "width": 128, "height": 128, @@ -3891,7 +3891,7 @@ ], "pos": { "x": 2087, - "y": 930 + "y": 780 }, "width": 128, "height": 128, @@ -3949,7 +3949,7 @@ ], "pos": { "x": 2275, - "y": 930 + "y": 780 }, "width": 128, "height": 128, @@ -4007,7 +4007,7 @@ ], "pos": { "x": 2463, - "y": 930 + "y": 780 }, "width": 128, "height": 128, @@ -4065,7 +4065,7 @@ ], "pos": { "x": 2651, - "y": 930 + "y": 780 }, "width": 128, "height": 128, @@ -4123,7 +4123,7 @@ ], "pos": { "x": 2839, - "y": 930 + "y": 780 }, "width": 128, "height": 128, @@ -4181,7 +4181,7 @@ ], "pos": { "x": 3027, - "y": 930 + "y": 780 }, "width": 128, "height": 128, @@ -4239,7 +4239,7 @@ ], "pos": { "x": 3215, - "y": 930 + "y": 780 }, "width": 128, "height": 128, @@ -4297,7 +4297,7 @@ ], "pos": { "x": 3403, - "y": 930 + "y": 780 }, "width": 128, "height": 128, @@ -4355,7 +4355,7 @@ ], "pos": { "x": 3591, - "y": 930 + "y": 780 }, "width": 128, "height": 128, @@ -4413,7 +4413,7 @@ ], "pos": { "x": 3779, - "y": 930 + "y": 780 }, "width": 128, "height": 128, @@ -4471,7 +4471,7 @@ ], "pos": { "x": 3967, - "y": 930 + "y": 780 }, "width": 128, "height": 128, @@ -4529,7 +4529,7 @@ ], "pos": { "x": 4155, - "y": 930 + "y": 780 }, "width": 128, "height": 128, @@ -4587,7 +4587,7 @@ ], "pos": { "x": 4343, - "y": 930 + "y": 780 }, "width": 128, "height": 128, @@ -4645,7 +4645,7 @@ ], "pos": { "x": 4531, - "y": 930 + "y": 780 }, "width": 128, "height": 128, @@ -4703,7 +4703,7 @@ ], "pos": { "x": 4719, - "y": 930 + "y": 780 }, "width": 128, "height": 128, @@ -4761,7 +4761,7 @@ ], "pos": { "x": 4907, - "y": 930 + "y": 780 }, "width": 128, "height": 128, @@ -4837,19 +4837,19 @@ "route": [ { "x": 3091, - "y": 250 + "y": 168 }, { "x": 3091, - "y": 302.79998779296875 + "y": 208 }, { "x": 3091, - "y": 337.3999938964844 + "y": 234.60000610351562 }, { "x": 3091, - "y": 423 + "y": 301 } ], "isCurve": true, @@ -4884,19 +4884,19 @@ "route": [ { "x": 3091, - "y": 712 + "y": 586 }, { "x": 3091, - "y": 764.7999877929688 + "y": 661.2000122070312 }, { "x": 3091, - "y": 799.4000244140625 + "y": 694 }, { "x": 3091, - "y": 885 + "y": 750 } ], "isCurve": true, diff --git a/e2etests/testdata/stable/icon_positions/dagre/sketch.exp.svg b/e2etests/testdata/stable/icon_positions/dagre/sketch.exp.svg index ce2fbc65e..19bde0b9c 100644 --- a/e2etests/testdata/stable/icon_positions/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/icon_positions/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -non containercontainerimageDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRight - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + .d2-2106678569 .fill-N1{fill:#0A0F25;} + .d2-2106678569 .fill-N2{fill:#676C7E;} + .d2-2106678569 .fill-N3{fill:#9499AB;} + .d2-2106678569 .fill-N4{fill:#CFD2DD;} + .d2-2106678569 .fill-N5{fill:#DEE1EB;} + .d2-2106678569 .fill-N6{fill:#EEF1F8;} + .d2-2106678569 .fill-N7{fill:#FFFFFF;} + .d2-2106678569 .fill-B1{fill:#0D32B2;} + .d2-2106678569 .fill-B2{fill:#0D32B2;} + .d2-2106678569 .fill-B3{fill:#E3E9FD;} + .d2-2106678569 .fill-B4{fill:#E3E9FD;} + .d2-2106678569 .fill-B5{fill:#EDF0FD;} + .d2-2106678569 .fill-B6{fill:#F7F8FE;} + .d2-2106678569 .fill-AA2{fill:#4A6FF3;} + .d2-2106678569 .fill-AA4{fill:#EDF0FD;} + .d2-2106678569 .fill-AA5{fill:#F7F8FE;} + .d2-2106678569 .fill-AB4{fill:#EDF0FD;} + .d2-2106678569 .fill-AB5{fill:#F7F8FE;} + .d2-2106678569 .stroke-N1{stroke:#0A0F25;} + .d2-2106678569 .stroke-N2{stroke:#676C7E;} + .d2-2106678569 .stroke-N3{stroke:#9499AB;} + .d2-2106678569 .stroke-N4{stroke:#CFD2DD;} + .d2-2106678569 .stroke-N5{stroke:#DEE1EB;} + .d2-2106678569 .stroke-N6{stroke:#EEF1F8;} + .d2-2106678569 .stroke-N7{stroke:#FFFFFF;} + .d2-2106678569 .stroke-B1{stroke:#0D32B2;} + .d2-2106678569 .stroke-B2{stroke:#0D32B2;} + .d2-2106678569 .stroke-B3{stroke:#E3E9FD;} + .d2-2106678569 .stroke-B4{stroke:#E3E9FD;} + .d2-2106678569 .stroke-B5{stroke:#EDF0FD;} + .d2-2106678569 .stroke-B6{stroke:#F7F8FE;} + .d2-2106678569 .stroke-AA2{stroke:#4A6FF3;} + .d2-2106678569 .stroke-AA4{stroke:#EDF0FD;} + .d2-2106678569 .stroke-AA5{stroke:#F7F8FE;} + .d2-2106678569 .stroke-AB4{stroke:#EDF0FD;} + .d2-2106678569 .stroke-AB5{stroke:#F7F8FE;} + .d2-2106678569 .background-color-N1{background-color:#0A0F25;} + .d2-2106678569 .background-color-N2{background-color:#676C7E;} + .d2-2106678569 .background-color-N3{background-color:#9499AB;} + .d2-2106678569 .background-color-N4{background-color:#CFD2DD;} + .d2-2106678569 .background-color-N5{background-color:#DEE1EB;} + .d2-2106678569 .background-color-N6{background-color:#EEF1F8;} + .d2-2106678569 .background-color-N7{background-color:#FFFFFF;} + .d2-2106678569 .background-color-B1{background-color:#0D32B2;} + .d2-2106678569 .background-color-B2{background-color:#0D32B2;} + .d2-2106678569 .background-color-B3{background-color:#E3E9FD;} + .d2-2106678569 .background-color-B4{background-color:#E3E9FD;} + .d2-2106678569 .background-color-B5{background-color:#EDF0FD;} + .d2-2106678569 .background-color-B6{background-color:#F7F8FE;} + .d2-2106678569 .background-color-AA2{background-color:#4A6FF3;} + .d2-2106678569 .background-color-AA4{background-color:#EDF0FD;} + .d2-2106678569 .background-color-AA5{background-color:#F7F8FE;} + .d2-2106678569 .background-color-AB4{background-color:#EDF0FD;} + .d2-2106678569 .background-color-AB5{background-color:#F7F8FE;} + .d2-2106678569 .color-N1{color:#0A0F25;} + .d2-2106678569 .color-N2{color:#676C7E;} + .d2-2106678569 .color-N3{color:#9499AB;} + .d2-2106678569 .color-N4{color:#CFD2DD;} + .d2-2106678569 .color-N5{color:#DEE1EB;} + .d2-2106678569 .color-N6{color:#EEF1F8;} + .d2-2106678569 .color-N7{color:#FFFFFF;} + .d2-2106678569 .color-B1{color:#0D32B2;} + .d2-2106678569 .color-B2{color:#0D32B2;} + .d2-2106678569 .color-B3{color:#E3E9FD;} + .d2-2106678569 .color-B4{color:#E3E9FD;} + .d2-2106678569 .color-B5{color:#EDF0FD;} + .d2-2106678569 .color-B6{color:#F7F8FE;} + .d2-2106678569 .color-AA2{color:#4A6FF3;} + .d2-2106678569 .color-AA4{color:#EDF0FD;} + .d2-2106678569 .color-AA5{color:#F7F8FE;} + .d2-2106678569 .color-AB4{color:#EDF0FD;} + .d2-2106678569 .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}]]>non containercontainerimageDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRight + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/images/dagre/board.exp.json b/e2etests/testdata/stable/images/dagre/board.exp.json index c4639550b..0bff6ddbc 100644 --- a/e2etests/testdata/stable/images/dagre/board.exp.json +++ b/e2etests/testdata/stable/images/dagre/board.exp.json @@ -61,7 +61,7 @@ "type": "image", "pos": { "x": 0, - "y": 254 + "y": 228 }, "width": 128, "height": 128, @@ -141,15 +141,15 @@ }, { "x": 64, - "y": 194 + "y": 173.1999969482422 }, { "x": 64, - "y": 214 + "y": 188 }, { "x": 64, - "y": 254 + "y": 228 } ], "isCurve": true, diff --git a/e2etests/testdata/stable/images/dagre/sketch.exp.svg b/e2etests/testdata/stable/images/dagre/sketch.exp.svg index 6893f5c9d..3a49f6053 100644 --- a/e2etests/testdata/stable/images/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/images/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -ab - + .d2-2741023511 .fill-N1{fill:#0A0F25;} + .d2-2741023511 .fill-N2{fill:#676C7E;} + .d2-2741023511 .fill-N3{fill:#9499AB;} + .d2-2741023511 .fill-N4{fill:#CFD2DD;} + .d2-2741023511 .fill-N5{fill:#DEE1EB;} + .d2-2741023511 .fill-N6{fill:#EEF1F8;} + .d2-2741023511 .fill-N7{fill:#FFFFFF;} + .d2-2741023511 .fill-B1{fill:#0D32B2;} + .d2-2741023511 .fill-B2{fill:#0D32B2;} + .d2-2741023511 .fill-B3{fill:#E3E9FD;} + .d2-2741023511 .fill-B4{fill:#E3E9FD;} + .d2-2741023511 .fill-B5{fill:#EDF0FD;} + .d2-2741023511 .fill-B6{fill:#F7F8FE;} + .d2-2741023511 .fill-AA2{fill:#4A6FF3;} + .d2-2741023511 .fill-AA4{fill:#EDF0FD;} + .d2-2741023511 .fill-AA5{fill:#F7F8FE;} + .d2-2741023511 .fill-AB4{fill:#EDF0FD;} + .d2-2741023511 .fill-AB5{fill:#F7F8FE;} + .d2-2741023511 .stroke-N1{stroke:#0A0F25;} + .d2-2741023511 .stroke-N2{stroke:#676C7E;} + .d2-2741023511 .stroke-N3{stroke:#9499AB;} + .d2-2741023511 .stroke-N4{stroke:#CFD2DD;} + .d2-2741023511 .stroke-N5{stroke:#DEE1EB;} + .d2-2741023511 .stroke-N6{stroke:#EEF1F8;} + .d2-2741023511 .stroke-N7{stroke:#FFFFFF;} + .d2-2741023511 .stroke-B1{stroke:#0D32B2;} + .d2-2741023511 .stroke-B2{stroke:#0D32B2;} + .d2-2741023511 .stroke-B3{stroke:#E3E9FD;} + .d2-2741023511 .stroke-B4{stroke:#E3E9FD;} + .d2-2741023511 .stroke-B5{stroke:#EDF0FD;} + .d2-2741023511 .stroke-B6{stroke:#F7F8FE;} + .d2-2741023511 .stroke-AA2{stroke:#4A6FF3;} + .d2-2741023511 .stroke-AA4{stroke:#EDF0FD;} + .d2-2741023511 .stroke-AA5{stroke:#F7F8FE;} + .d2-2741023511 .stroke-AB4{stroke:#EDF0FD;} + .d2-2741023511 .stroke-AB5{stroke:#F7F8FE;} + .d2-2741023511 .background-color-N1{background-color:#0A0F25;} + .d2-2741023511 .background-color-N2{background-color:#676C7E;} + .d2-2741023511 .background-color-N3{background-color:#9499AB;} + .d2-2741023511 .background-color-N4{background-color:#CFD2DD;} + .d2-2741023511 .background-color-N5{background-color:#DEE1EB;} + .d2-2741023511 .background-color-N6{background-color:#EEF1F8;} + .d2-2741023511 .background-color-N7{background-color:#FFFFFF;} + .d2-2741023511 .background-color-B1{background-color:#0D32B2;} + .d2-2741023511 .background-color-B2{background-color:#0D32B2;} + .d2-2741023511 .background-color-B3{background-color:#E3E9FD;} + .d2-2741023511 .background-color-B4{background-color:#E3E9FD;} + .d2-2741023511 .background-color-B5{background-color:#EDF0FD;} + .d2-2741023511 .background-color-B6{background-color:#F7F8FE;} + .d2-2741023511 .background-color-AA2{background-color:#4A6FF3;} + .d2-2741023511 .background-color-AA4{background-color:#EDF0FD;} + .d2-2741023511 .background-color-AA5{background-color:#F7F8FE;} + .d2-2741023511 .background-color-AB4{background-color:#EDF0FD;} + .d2-2741023511 .background-color-AB5{background-color:#F7F8FE;} + .d2-2741023511 .color-N1{color:#0A0F25;} + .d2-2741023511 .color-N2{color:#676C7E;} + .d2-2741023511 .color-N3{color:#9499AB;} + .d2-2741023511 .color-N4{color:#CFD2DD;} + .d2-2741023511 .color-N5{color:#DEE1EB;} + .d2-2741023511 .color-N6{color:#EEF1F8;} + .d2-2741023511 .color-N7{color:#FFFFFF;} + .d2-2741023511 .color-B1{color:#0D32B2;} + .d2-2741023511 .color-B2{color:#0D32B2;} + .d2-2741023511 .color-B3{color:#E3E9FD;} + .d2-2741023511 .color-B4{color:#E3E9FD;} + .d2-2741023511 .color-B5{color:#EDF0FD;} + .d2-2741023511 .color-B6{color:#F7F8FE;} + .d2-2741023511 .color-AA2{color:#4A6FF3;} + .d2-2741023511 .color-AA4{color:#EDF0FD;} + .d2-2741023511 .color-AA5{color:#F7F8FE;} + .d2-2741023511 .color-AB4{color:#EDF0FD;} + .d2-2741023511 .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}]]>ab + - + \ No newline at end of file diff --git a/e2etests/testdata/stable/investigate/dagre/board.exp.json b/e2etests/testdata/stable/investigate/dagre/board.exp.json index a7fde78ea..763339562 100644 --- a/e2etests/testdata/stable/investigate/dagre/board.exp.json +++ b/e2etests/testdata/stable/investigate/dagre/board.exp.json @@ -130,11 +130,11 @@ "id": "dd", "type": "rectangle", "pos": { - "x": 9, - "y": 686 + "x": 19, + "y": 665 }, - "width": 371, - "height": 151, + "width": 350, + "height": 152, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -172,7 +172,7 @@ "type": "diamond", "pos": { "x": 49, - "y": 715 + "y": 695 }, "width": 64, "height": 92, @@ -212,11 +212,11 @@ "id": "ff", "type": "rectangle", "pos": { - "x": 0, - "y": 1936 + "x": 10, + "y": 1889 }, - "width": 385, - "height": 332, + "width": 334, + "height": 333, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -254,7 +254,7 @@ "type": "diamond", "pos": { "x": 248, - "y": 1965 + "y": 1919 }, "width": 66, "height": 92, @@ -295,7 +295,7 @@ "type": "diamond", "pos": { "x": 273, - "y": 715 + "y": 695 }, "width": 66, "height": 92, @@ -458,11 +458,11 @@ "id": "ll", "type": "rectangle", "pos": { - "x": 0, - "y": 2409 + "x": 10, + "y": 2362 }, - "width": 353, - "height": 306, + "width": 333, + "height": 307, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -500,7 +500,7 @@ "type": "oval", "pos": { "x": 40, - "y": 2604 + "y": 2558 }, "width": 81, "height": 81, @@ -541,7 +541,7 @@ "type": "oval", "pos": { "x": 40, - "y": 2157 + "y": 2111 }, "width": 81, "height": 81, @@ -582,10 +582,10 @@ "type": "cylinder", "pos": { "x": 9, - "y": 3361 + "y": 3268 }, "width": 469, - "height": 125, + "height": 166, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -623,7 +623,7 @@ "type": "rectangle", "pos": { "x": 49, - "y": 3390 + "y": 3318 }, "width": 63, "height": 66, @@ -664,7 +664,7 @@ "type": "rectangle", "pos": { "x": 249, - "y": 2165 + "y": 2119 }, "width": 63, "height": 66, @@ -705,7 +705,7 @@ "type": "rectangle", "pos": { "x": 249, - "y": 2438 + "y": 2392 }, "width": 64, "height": 66, @@ -746,7 +746,7 @@ "type": "rectangle", "pos": { "x": 252, - "y": 2612 + "y": 2566 }, "width": 58, "height": 66, @@ -786,11 +786,11 @@ "id": "ss", "type": "rectangle", "pos": { - "x": 387, - "y": 1165 + "x": 397, + "y": 1144 }, - "width": 138, - "height": 125, + "width": 118, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -828,7 +828,7 @@ "type": "rectangle", "pos": { "x": 427, - "y": 1194 + "y": 1174 }, "width": 58, "height": 66, @@ -868,11 +868,11 @@ "id": "uu", "type": "rectangle", "pos": { - "x": 384, - "y": 1431 + "x": 394, + "y": 1410 }, - "width": 143, - "height": 125, + "width": 123, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -910,7 +910,7 @@ "type": "rectangle", "pos": { "x": 424, - "y": 1460 + "y": 1440 }, "width": 63, "height": 66, @@ -954,7 +954,7 @@ "y": 1656 }, "width": 149, - "height": 118, + "height": 92, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1004,7 +1004,7 @@ "type": "rectangle", "pos": { "x": 398, - "y": 2592 + "y": 2566 }, "width": 64, "height": 66, @@ -1045,7 +1045,7 @@ "type": "rectangle", "pos": { "x": 210, - "y": 3390 + "y": 3318 }, "width": 62, "height": 66, @@ -1085,11 +1085,11 @@ "id": "yy", "type": "rectangle", "pos": { - "x": 261, - "y": 2856 + "x": 308, + "y": 2809 }, - "width": 261, - "height": 364, + "width": 198, + "height": 339, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1127,10 +1127,10 @@ "type": "queue", "pos": { "x": 338, - "y": 2885 + "y": 2839 }, "width": 138, - "height": 118, + "height": 92, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1180,7 +1180,7 @@ "type": "rectangle", "pos": { "x": 376, - "y": 3124 + "y": 3052 }, "width": 63, "height": 66, @@ -1221,7 +1221,7 @@ "type": "rectangle", "pos": { "x": 376, - "y": 3390 + "y": 3318 }, "width": 62, "height": 66, @@ -1262,7 +1262,7 @@ "type": "parallelogram", "pos": { "x": 350, - "y": 3586 + "y": 3534 }, "width": 115, "height": 66, @@ -1372,11 +1372,11 @@ "labelPercentage": 0, "route": [ { - "x": 332, + "x": 331, "y": 302 }, { - "x": 311.3999938964844, + "x": 311.20001220703125, "y": 350.3999938964844 }, { @@ -1419,11 +1419,11 @@ "labelPercentage": 0, "route": [ { - "x": 102, + "x": 101, "y": 101 }, { - "x": 84.80000305175781, + "x": 84.5999984741211, "y": 141 }, { @@ -1476,11 +1476,11 @@ }, { "x": 80.5999984741211, - "y": 659.2000122070312 + "y": 655 }, { "x": 81, - "y": 716 + "y": 695 } ], "isCurve": true, @@ -1515,11 +1515,11 @@ "route": [ { "x": 372, - "y": 298 + "y": 297 }, { "x": 393.79998779296875, - "y": 349.6000061035156 + "y": 349.3999938964844 }, { "x": 399.25, @@ -1715,35 +1715,35 @@ }, { "x": 232.25, - "y": 1627.800048828125 + "y": 1625.199951171875 }, { "x": 232.25, - "y": 1660.5 + "y": 1654 }, { "x": 232.25, - "y": 1693.199951171875 + "y": 1682.800048828125 }, { "x": 232.25, - "y": 1738.9000244140625 + "y": 1723.300048828125 }, { "x": 232.25, - "y": 1774.75 + "y": 1755.25 }, { "x": 232.25, - "y": 1810.5999755859375 + "y": 1787.199951171875 }, { - "x": 238.8000030517578, - "y": 1913.4000244140625 + "x": 239.1999969482422, + "y": 1882.800048828125 }, { - "x": 265, - "y": 1987 + "x": 267, + "y": 1938 } ], "isCurve": true, @@ -1786,11 +1786,11 @@ }, { "x": 306.20001220703125, - "y": 659.2000122070312 + "y": 655 }, { "x": 306, - "y": 716 + "y": 695 } ], "isCurve": true, @@ -1825,11 +1825,11 @@ "route": [ { "x": 81, - "y": 808 + "y": 787 }, { "x": 80.5999984741211, - "y": 831.2000122070312 + "y": 827 }, { "x": 80.5, @@ -1872,11 +1872,11 @@ "route": [ { "x": 80.5, - "y": 1003 + "y": 1002.5 }, { "x": 80.5, - "y": 1051.4000244140625 + "y": 1051.300048828125 }, { "x": 80.5, @@ -1998,59 +1998,59 @@ }, { "x": 80.5, - "y": 1627.800048828125 + "y": 1625.199951171875 }, { "x": 80.5, - "y": 1660.5 + "y": 1654 }, { "x": 80.5, - "y": 1693.199951171875 + "y": 1682.800048828125 }, { "x": 80.5, - "y": 1738.9000244140625 + "y": 1723.300048828125 }, { "x": 80.5, - "y": 1774.75 + "y": 1755.25 }, { "x": 80.5, - "y": 1810.5999755859375 + "y": 1787.199951171875 }, { "x": 80.5, - "y": 1846.5999755859375 + "y": 1820.5999755859375 }, { "x": 80.5, - "y": 1864.75 + "y": 1838.75 }, { "x": 80.5, - "y": 1882.9000244140625 + "y": 1856.9000244140625 }, { "x": 80.5, - "y": 1914.199951171875 + "y": 1888.199951171875 }, { "x": 80.5, - "y": 1943 + "y": 1917 }, { "x": 80.5, - "y": 1971.800048828125 + "y": 1945.800048828125 }, { "x": 80.5999984741211, - "y": 2101.199951171875 + "y": 2071 }, { "x": 81, - "y": 2158 + "y": 2111 } ], "isCurve": true, @@ -2085,55 +2085,55 @@ "route": [ { "x": 81, - "y": 2239 + "y": 2192 }, { "x": 80.5999984741211, - "y": 2262.199951171875 + "y": 2232 }, { "x": 80.5, - "y": 2278 + "y": 2252 }, { "x": 80.5, - "y": 2293 + "y": 2267 }, { "x": 80.5, - "y": 2308 + "y": 2282 }, { "x": 80.5, - "y": 2328 + "y": 2302 }, { "x": 80.5, - "y": 2343 + "y": 2317 }, { "x": 80.5, - "y": 2358 + "y": 2332 }, { "x": 80.5, - "y": 2384.60009765625 + "y": 2358.60009765625 }, { "x": 80.5, - "y": 2409.5 + "y": 2383.5 }, { "x": 80.5, - "y": 2434.39990234375 + "y": 2408.39990234375 }, { "x": 80.5999984741211, - "y": 2548.199951171875 + "y": 2518 }, { "x": 81, - "y": 2605 + "y": 2558 } ], "isCurve": true, @@ -2168,103 +2168,103 @@ "route": [ { "x": 81, - "y": 2686 + "y": 2639 }, { "x": 80.5999984741211, - "y": 2709.199951171875 + "y": 2679 }, { "x": 80.5, - "y": 2725 + "y": 2699 }, { "x": 80.5, - "y": 2740 + "y": 2714 }, { "x": 80.5, - "y": 2755 + "y": 2729 }, { "x": 80.5, - "y": 2775 + "y": 2749 }, { "x": 80.5, - "y": 2790 + "y": 2764 }, { "x": 80.5, - "y": 2805 + "y": 2779 }, { "x": 80.5, - "y": 2836.800048828125 + "y": 2808.199951171875 }, { "x": 80.5, - "y": 2869.5 + "y": 2837 }, { "x": 80.5, - "y": 2902.199951171875 + "y": 2865.800048828125 }, { "x": 80.5, - "y": 2947.89990234375 + "y": 2906.300048828125 }, { "x": 80.5, - "y": 2983.75 + "y": 2938.25 }, { "x": 80.5, - "y": 3019.60009765625 + "y": 2970.199951171875 }, { "x": 80.5, - "y": 3062.199951171875 + "y": 3010.199951171875 }, { "x": 80.5, - "y": 3090.25 + "y": 3038.25 }, { "x": 80.5, - "y": 3118.300048828125 + "y": 3066.300048828125 }, { "x": 80.5, - "y": 3153.60009765625 + "y": 3101.60009765625 }, { "x": 80.5, - "y": 3178.5 + "y": 3126.5 }, { "x": 80.5, - "y": 3203.39990234375 + "y": 3151.39990234375 }, { "x": 80.5, - "y": 3230 + "y": 3178 }, { "x": 80.5, - "y": 3245 + "y": 3193 }, { "x": 80.5, - "y": 3260 + "y": 3208 }, { "x": 80.5, - "y": 3334.10009765625 + "y": 3278 }, { "x": 80.5, - "y": 3390.5 + "y": 3318 } ], "isCurve": true, @@ -2299,19 +2299,19 @@ "route": [ { "x": 281, - "y": 2058 + "y": 2011 }, { "x": 280.79998779296875, - "y": 2097.60009765625 + "y": 2051 }, { "x": 280.75, - "y": 2119 + "y": 2072.5 }, { "x": 280.75, - "y": 2165 + "y": 2118.5 } ], "isCurve": true, @@ -2346,31 +2346,31 @@ "route": [ { "x": 280.75, - "y": 2232 + "y": 2185.5 }, { "x": 280.75, - "y": 2260.800048828125 + "y": 2230.699951171875 }, { "x": 280.75, - "y": 2278 + "y": 2252 }, { "x": 280.75, - "y": 2293 + "y": 2267 }, { "x": 280.75, - "y": 2308 + "y": 2282 }, { "x": 280.75, - "y": 2382.10009765625 + "y": 2352 }, { "x": 280.75, - "y": 2438.5 + "y": 2392 } ], "isCurve": true, @@ -2405,19 +2405,19 @@ "route": [ { "x": 280.75, - "y": 2504.5 + "y": 2458 }, { "x": 280.75, - "y": 2544.5 + "y": 2498 }, { "x": 280.75, - "y": 2566 + "y": 2519.5 }, { "x": 280.75, - "y": 2612 + "y": 2565.5 } ], "isCurve": true, @@ -2452,11 +2452,11 @@ "route": [ { "x": 306, - "y": 807 + "y": 787 }, { "x": 306.20001220703125, - "y": 831 + "y": 827 }, { "x": 336.1499938964844, @@ -2496,11 +2496,11 @@ }, { "x": 455.75, - "y": 1138.0999755859375 + "y": 1134 }, { "x": 455.75, - "y": 1194.5 + "y": 1174 } ], "isCurve": true, @@ -2535,11 +2535,11 @@ "route": [ { "x": 455.75, - "y": 1260.5 + "y": 1240 }, { "x": 455.75, - "y": 1284.0999755859375 + "y": 1280 }, { "x": 455.75, @@ -2555,11 +2555,11 @@ }, { "x": 455.75, - "y": 1404.0999755859375 + "y": 1400 }, { "x": 455.75, - "y": 1460.5 + "y": 1440 } ], "isCurve": true, @@ -2601,12 +2601,12 @@ "y": 1541.7490234375 }, { - "x": 310.20001220703125, - "y": 1616.4000244140625 + "x": 311.20001220703125, + "y": 1616 }, { - "x": 353, - "y": 1658 + "x": 358, + "y": 1656 } ], "isCurve": true, @@ -2641,18 +2641,18 @@ "route": [ { "x": 455.75, - "y": 1526.5 + "y": 1506 }, { "x": 455.75, - "y": 1550.0999755859375 + "y": 1546 }, { - "x": 451.6000061035156, + "x": 451, "y": 1616 }, { - "x": 435, + "x": 432, "y": 1656 } ], @@ -2687,116 +2687,116 @@ "labelPercentage": 0, "route": [ { - "x": 420, - "y": 1774 + "x": 419, + "y": 1748 }, { - "x": 428, - "y": 1822.4000244140625 + "x": 427.79998779296875, + "y": 1796.4000244140625 }, { "x": 430, - "y": 1846.5999755859375 + "y": 1820.5999755859375 }, { "x": 430, - "y": 1864.75 + "y": 1838.75 }, { "x": 430, - "y": 1882.9000244140625 + "y": 1856.9000244140625 }, { "x": 430, - "y": 1914.199951171875 + "y": 1888.199951171875 }, { "x": 430, - "y": 1943 + "y": 1917 }, { "x": 430, - "y": 1971.800048828125 + "y": 1945.800048828125 }, { "x": 430, - "y": 2010.199951171875 + "y": 1984.199951171875 }, { "x": 430, - "y": 2039 + "y": 2013 }, { "x": 430, - "y": 2067.800048828125 + "y": 2041.800048828125 }, { "x": 430, - "y": 2105.10009765625 + "y": 2079.10009765625 }, { "x": 430, - "y": 2132.25 + "y": 2106.25 }, { "x": 430, - "y": 2159.39990234375 + "y": 2133.39990234375 }, { "x": 430, - "y": 2195.60009765625 + "y": 2169.60009765625 }, { "x": 430, - "y": 2222.75 + "y": 2196.75 }, { "x": 430, - "y": 2249.89990234375 + "y": 2223.89990234375 }, { "x": 430, - "y": 2278 + "y": 2252 }, { "x": 430, - "y": 2293 + "y": 2267 }, { "x": 430, - "y": 2308 + "y": 2282 }, { "x": 430, - "y": 2328 + "y": 2302 }, { "x": 430, - "y": 2343 + "y": 2317 }, { "x": 430, - "y": 2358 + "y": 2332 }, { "x": 430, - "y": 2384.60009765625 + "y": 2358.60009765625 }, { "x": 430, - "y": 2409.5 + "y": 2383.5 }, { "x": 430, - "y": 2434.39990234375 + "y": 2408.39990234375 }, { "x": 430, - "y": 2545.5 + "y": 2519.5 }, { "x": 430, - "y": 2591.5 + "y": 2565.5 } ], "isCurve": true, @@ -2831,103 +2831,103 @@ "route": [ { "x": 420.5190124511719, - "y": 2658.5 + "y": 2632.5 }, { "x": 407.3030090332031, - "y": 2703.699951171875 + "y": 2677.699951171875 }, { "x": 371.29998779296875, - "y": 2725 + "y": 2699 }, { "x": 322.25, - "y": 2740 + "y": 2714 }, { "x": 273.20001220703125, - "y": 2755 + "y": 2729 }, { "x": 240.5, - "y": 2775 + "y": 2749 }, { "x": 240.5, - "y": 2790 + "y": 2764 }, { "x": 240.5, - "y": 2805 + "y": 2779 }, { "x": 240.5, - "y": 2836.800048828125 + "y": 2808.199951171875 }, { "x": 240.5, - "y": 2869.5 + "y": 2837 }, { "x": 240.5, - "y": 2902.199951171875 + "y": 2865.800048828125 }, { "x": 240.5, - "y": 2947.89990234375 + "y": 2906.300048828125 }, { "x": 240.5, - "y": 2983.75 + "y": 2938.25 }, { "x": 240.5, - "y": 3019.60009765625 + "y": 2970.199951171875 }, { "x": 240.5, - "y": 3062.199951171875 + "y": 3010.199951171875 }, { "x": 240.5, - "y": 3090.25 + "y": 3038.25 }, { "x": 240.5, - "y": 3118.300048828125 + "y": 3066.300048828125 }, { "x": 240.5, - "y": 3153.60009765625 + "y": 3101.60009765625 }, { "x": 240.5, - "y": 3178.5 + "y": 3126.5 }, { "x": 240.5, - "y": 3203.39990234375 + "y": 3151.39990234375 }, { "x": 240.5, - "y": 3230 + "y": 3178 }, { "x": 240.5, - "y": 3245 + "y": 3193 }, { "x": 240.5, - "y": 3260 + "y": 3208 }, { "x": 240.5, - "y": 3334.10009765625 + "y": 3278 }, { "x": 240.5, - "y": 3390.5 + "y": 3318 } ], "isCurve": true, @@ -2962,31 +2962,31 @@ "route": [ { "x": 280.75, - "y": 2679 + "y": 2632.5 }, { "x": 280.75, - "y": 2707.800048828125 + "y": 2677.699951171875 }, { "x": 291.6000061035156, - "y": 2725 + "y": 2699 }, { "x": 307.875, - "y": 2740 + "y": 2714 }, { "x": 324.1499938964844, - "y": 2755 + "y": 2729 }, { - "x": 341.6000061035156, - "y": 2829.199951171875 + "x": 342.6000061035156, + "y": 2799 }, { - "x": 368, - "y": 2886 + "x": 373, + "y": 2839 } ], "isCurve": true, @@ -3021,31 +3021,31 @@ "route": [ { "x": 439.7539978027344, - "y": 2658.5 + "y": 2632.5 }, { "x": 453.3500061035156, - "y": 2703.699951171875 + "y": 2677.699951171875 }, { "x": 456.75, - "y": 2725 + "y": 2699 }, { "x": 456.75, - "y": 2740 + "y": 2714 }, { "x": 456.75, - "y": 2755 + "y": 2729 }, { - "x": 452.20001220703125, - "y": 2829.199951171875 + "x": 451.6000061035156, + "y": 2799 }, { - "x": 434, - "y": 2886 + "x": 431, + "y": 2839 } ], "isCurve": true, @@ -3080,19 +3080,19 @@ "route": [ { "x": 407, - "y": 3004 + "y": 2931 }, { "x": 407, - "y": 3052 + "y": 2979.39990234375 }, { "x": 407, - "y": 3076.199951171875 + "y": 3003.699951171875 }, { "x": 407, - "y": 3125 + "y": 3052.5 } ], "isCurve": true, @@ -3127,31 +3127,31 @@ "route": [ { "x": 407, - "y": 3190.5 + "y": 3118 }, { "x": 407, - "y": 3214.10009765625 + "y": 3158 }, { "x": 407, - "y": 3230 + "y": 3178 }, { "x": 407, - "y": 3245 + "y": 3193 }, { "x": 407, - "y": 3260 + "y": 3208 }, { "x": 407, - "y": 3334.10009765625 + "y": 3278 }, { "x": 407, - "y": 3390.5 + "y": 3318 } ], "isCurve": true, @@ -3186,19 +3186,19 @@ "route": [ { "x": 407, - "y": 3456.5 + "y": 3384 }, { "x": 407, - "y": 3480.10009765625 + "y": 3424 }, { "x": 407, - "y": 3546 + "y": 3494 }, { "x": 407, - "y": 3586 + "y": 3534 } ], "isCurve": true, @@ -3232,20 +3232,20 @@ "labelPercentage": 0, "route": [ { - "x": 374, - "y": 1774 + "x": 379, + "y": 1748 }, { - "x": 345.20001220703125, - "y": 1822.4000244140625 + "x": 346.20001220703125, + "y": 1796.4000244140625 }, { - "x": 330, - "y": 1914 + "x": 329.6000061035156, + "y": 1883.199951171875 }, { - "x": 298, - "y": 1990 + "x": 296, + "y": 1940 } ], "isCurve": true, diff --git a/e2etests/testdata/stable/investigate/dagre/sketch.exp.svg b/e2etests/testdata/stable/investigate/dagre/sketch.exp.svg index 2dc194b2f..c92f69459 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-1277959562 .fill-N1{fill:#0A0F25;} + .d2-1277959562 .fill-N2{fill:#676C7E;} + .d2-1277959562 .fill-N3{fill:#9499AB;} + .d2-1277959562 .fill-N4{fill:#CFD2DD;} + .d2-1277959562 .fill-N5{fill:#DEE1EB;} + .d2-1277959562 .fill-N6{fill:#EEF1F8;} + .d2-1277959562 .fill-N7{fill:#FFFFFF;} + .d2-1277959562 .fill-B1{fill:#0D32B2;} + .d2-1277959562 .fill-B2{fill:#0D32B2;} + .d2-1277959562 .fill-B3{fill:#E3E9FD;} + .d2-1277959562 .fill-B4{fill:#E3E9FD;} + .d2-1277959562 .fill-B5{fill:#EDF0FD;} + .d2-1277959562 .fill-B6{fill:#F7F8FE;} + .d2-1277959562 .fill-AA2{fill:#4A6FF3;} + .d2-1277959562 .fill-AA4{fill:#EDF0FD;} + .d2-1277959562 .fill-AA5{fill:#F7F8FE;} + .d2-1277959562 .fill-AB4{fill:#EDF0FD;} + .d2-1277959562 .fill-AB5{fill:#F7F8FE;} + .d2-1277959562 .stroke-N1{stroke:#0A0F25;} + .d2-1277959562 .stroke-N2{stroke:#676C7E;} + .d2-1277959562 .stroke-N3{stroke:#9499AB;} + .d2-1277959562 .stroke-N4{stroke:#CFD2DD;} + .d2-1277959562 .stroke-N5{stroke:#DEE1EB;} + .d2-1277959562 .stroke-N6{stroke:#EEF1F8;} + .d2-1277959562 .stroke-N7{stroke:#FFFFFF;} + .d2-1277959562 .stroke-B1{stroke:#0D32B2;} + .d2-1277959562 .stroke-B2{stroke:#0D32B2;} + .d2-1277959562 .stroke-B3{stroke:#E3E9FD;} + .d2-1277959562 .stroke-B4{stroke:#E3E9FD;} + .d2-1277959562 .stroke-B5{stroke:#EDF0FD;} + .d2-1277959562 .stroke-B6{stroke:#F7F8FE;} + .d2-1277959562 .stroke-AA2{stroke:#4A6FF3;} + .d2-1277959562 .stroke-AA4{stroke:#EDF0FD;} + .d2-1277959562 .stroke-AA5{stroke:#F7F8FE;} + .d2-1277959562 .stroke-AB4{stroke:#EDF0FD;} + .d2-1277959562 .stroke-AB5{stroke:#F7F8FE;} + .d2-1277959562 .background-color-N1{background-color:#0A0F25;} + .d2-1277959562 .background-color-N2{background-color:#676C7E;} + .d2-1277959562 .background-color-N3{background-color:#9499AB;} + .d2-1277959562 .background-color-N4{background-color:#CFD2DD;} + .d2-1277959562 .background-color-N5{background-color:#DEE1EB;} + .d2-1277959562 .background-color-N6{background-color:#EEF1F8;} + .d2-1277959562 .background-color-N7{background-color:#FFFFFF;} + .d2-1277959562 .background-color-B1{background-color:#0D32B2;} + .d2-1277959562 .background-color-B2{background-color:#0D32B2;} + .d2-1277959562 .background-color-B3{background-color:#E3E9FD;} + .d2-1277959562 .background-color-B4{background-color:#E3E9FD;} + .d2-1277959562 .background-color-B5{background-color:#EDF0FD;} + .d2-1277959562 .background-color-B6{background-color:#F7F8FE;} + .d2-1277959562 .background-color-AA2{background-color:#4A6FF3;} + .d2-1277959562 .background-color-AA4{background-color:#EDF0FD;} + .d2-1277959562 .background-color-AA5{background-color:#F7F8FE;} + .d2-1277959562 .background-color-AB4{background-color:#EDF0FD;} + .d2-1277959562 .background-color-AB5{background-color:#F7F8FE;} + .d2-1277959562 .color-N1{color:#0A0F25;} + .d2-1277959562 .color-N2{color:#676C7E;} + .d2-1277959562 .color-N3{color:#9499AB;} + .d2-1277959562 .color-N4{color:#CFD2DD;} + .d2-1277959562 .color-N5{color:#DEE1EB;} + .d2-1277959562 .color-N6{color:#EEF1F8;} + .d2-1277959562 .color-N7{color:#FFFFFF;} + .d2-1277959562 .color-B1{color:#0D32B2;} + .d2-1277959562 .color-B2{color:#0D32B2;} + .d2-1277959562 .color-B3{color:#E3E9FD;} + .d2-1277959562 .color-B4{color:#E3E9FD;} + .d2-1277959562 .color-B5{color:#EDF0FD;} + .d2-1277959562 .color-B6{color:#F7F8FE;} + .d2-1277959562 .color-AA2{color:#4A6FF3;} + .d2-1277959562 .color-AA4{color:#EDF0FD;} + .d2-1277959562 .color-AA5{color:#F7F8FE;} + .d2-1277959562 .color-AB4{color:#EDF0FD;} + .d2-1277959562 .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 7b1a53c12..a8b89a72a 100644 --- a/e2etests/testdata/stable/investigate/elk/board.exp.json +++ b/e2etests/testdata/stable/investigate/elk/board.exp.json @@ -1624,7 +1624,7 @@ "route": [ { "x": 235, - "y": 1305 + "y": 1304.666015625 }, { "x": 235, @@ -1662,7 +1662,7 @@ "route": [ { "x": 248.33299255371094, - "y": 1567.666015625 + "y": 1568 }, { "x": 248.33299255371094, @@ -1854,7 +1854,7 @@ "route": [ { "x": 434.1659851074219, - "y": 2227 + "y": 2226.5 }, { "x": 434.1659851074219, @@ -1892,7 +1892,7 @@ "route": [ { "x": 434.1659851074219, - "y": 2591.5 + "y": 2591 }, { "x": 434.1659851074219, @@ -1941,7 +1941,7 @@ "y": 823 }, { - "x": 93.5, + "x": 93.4990005493164, "y": 1239 } ], @@ -2014,7 +2014,7 @@ "route": [ { "x": 221.66600036621094, - "y": 1567.666015625 + "y": 1568 }, { "x": 222, @@ -2102,7 +2102,7 @@ }, { "x": 153, - "y": 2635.3330078125 + "y": 2635 } ], "animated": false, @@ -2136,7 +2136,7 @@ "route": [ { "x": 139.66600036621094, - "y": 2701.3330078125 + "y": 2701 }, { "x": 139.66600036621094, @@ -2220,7 +2220,7 @@ "route": [ { "x": 166.33299255371094, - "y": 2701.3330078125 + "y": 2701 }, { "x": 166.33299255371094, @@ -2269,7 +2269,7 @@ "y": 3143 }, { - "x": 428.8330078125, + "x": 429, "y": 3213 } ], diff --git a/e2etests/testdata/stable/investigate/elk/sketch.exp.svg b/e2etests/testdata/stable/investigate/elk/sketch.exp.svg index c6cf1b4af..216b4533b 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-1074953283 .fill-N1{fill:#0A0F25;} + .d2-1074953283 .fill-N2{fill:#676C7E;} + .d2-1074953283 .fill-N3{fill:#9499AB;} + .d2-1074953283 .fill-N4{fill:#CFD2DD;} + .d2-1074953283 .fill-N5{fill:#DEE1EB;} + .d2-1074953283 .fill-N6{fill:#EEF1F8;} + .d2-1074953283 .fill-N7{fill:#FFFFFF;} + .d2-1074953283 .fill-B1{fill:#0D32B2;} + .d2-1074953283 .fill-B2{fill:#0D32B2;} + .d2-1074953283 .fill-B3{fill:#E3E9FD;} + .d2-1074953283 .fill-B4{fill:#E3E9FD;} + .d2-1074953283 .fill-B5{fill:#EDF0FD;} + .d2-1074953283 .fill-B6{fill:#F7F8FE;} + .d2-1074953283 .fill-AA2{fill:#4A6FF3;} + .d2-1074953283 .fill-AA4{fill:#EDF0FD;} + .d2-1074953283 .fill-AA5{fill:#F7F8FE;} + .d2-1074953283 .fill-AB4{fill:#EDF0FD;} + .d2-1074953283 .fill-AB5{fill:#F7F8FE;} + .d2-1074953283 .stroke-N1{stroke:#0A0F25;} + .d2-1074953283 .stroke-N2{stroke:#676C7E;} + .d2-1074953283 .stroke-N3{stroke:#9499AB;} + .d2-1074953283 .stroke-N4{stroke:#CFD2DD;} + .d2-1074953283 .stroke-N5{stroke:#DEE1EB;} + .d2-1074953283 .stroke-N6{stroke:#EEF1F8;} + .d2-1074953283 .stroke-N7{stroke:#FFFFFF;} + .d2-1074953283 .stroke-B1{stroke:#0D32B2;} + .d2-1074953283 .stroke-B2{stroke:#0D32B2;} + .d2-1074953283 .stroke-B3{stroke:#E3E9FD;} + .d2-1074953283 .stroke-B4{stroke:#E3E9FD;} + .d2-1074953283 .stroke-B5{stroke:#EDF0FD;} + .d2-1074953283 .stroke-B6{stroke:#F7F8FE;} + .d2-1074953283 .stroke-AA2{stroke:#4A6FF3;} + .d2-1074953283 .stroke-AA4{stroke:#EDF0FD;} + .d2-1074953283 .stroke-AA5{stroke:#F7F8FE;} + .d2-1074953283 .stroke-AB4{stroke:#EDF0FD;} + .d2-1074953283 .stroke-AB5{stroke:#F7F8FE;} + .d2-1074953283 .background-color-N1{background-color:#0A0F25;} + .d2-1074953283 .background-color-N2{background-color:#676C7E;} + .d2-1074953283 .background-color-N3{background-color:#9499AB;} + .d2-1074953283 .background-color-N4{background-color:#CFD2DD;} + .d2-1074953283 .background-color-N5{background-color:#DEE1EB;} + .d2-1074953283 .background-color-N6{background-color:#EEF1F8;} + .d2-1074953283 .background-color-N7{background-color:#FFFFFF;} + .d2-1074953283 .background-color-B1{background-color:#0D32B2;} + .d2-1074953283 .background-color-B2{background-color:#0D32B2;} + .d2-1074953283 .background-color-B3{background-color:#E3E9FD;} + .d2-1074953283 .background-color-B4{background-color:#E3E9FD;} + .d2-1074953283 .background-color-B5{background-color:#EDF0FD;} + .d2-1074953283 .background-color-B6{background-color:#F7F8FE;} + .d2-1074953283 .background-color-AA2{background-color:#4A6FF3;} + .d2-1074953283 .background-color-AA4{background-color:#EDF0FD;} + .d2-1074953283 .background-color-AA5{background-color:#F7F8FE;} + .d2-1074953283 .background-color-AB4{background-color:#EDF0FD;} + .d2-1074953283 .background-color-AB5{background-color:#F7F8FE;} + .d2-1074953283 .color-N1{color:#0A0F25;} + .d2-1074953283 .color-N2{color:#676C7E;} + .d2-1074953283 .color-N3{color:#9499AB;} + .d2-1074953283 .color-N4{color:#CFD2DD;} + .d2-1074953283 .color-N5{color:#DEE1EB;} + .d2-1074953283 .color-N6{color:#EEF1F8;} + .d2-1074953283 .color-N7{color:#FFFFFF;} + .d2-1074953283 .color-B1{color:#0D32B2;} + .d2-1074953283 .color-B2{color:#0D32B2;} + .d2-1074953283 .color-B3{color:#E3E9FD;} + .d2-1074953283 .color-B4{color:#E3E9FD;} + .d2-1074953283 .color-B5{color:#EDF0FD;} + .d2-1074953283 .color-B6{color:#F7F8FE;} + .d2-1074953283 .color-AA2{color:#4A6FF3;} + .d2-1074953283 .color-AA4{color:#EDF0FD;} + .d2-1074953283 .color-AA5{color:#F7F8FE;} + .d2-1074953283 .color-AB4{color:#EDF0FD;} + .d2-1074953283 .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 diff --git a/e2etests/testdata/stable/label_positions/dagre/board.exp.json b/e2etests/testdata/stable/label_positions/dagre/board.exp.json index ddce16a8c..2e5f24e9e 100644 --- a/e2etests/testdata/stable/label_positions/dagre/board.exp.json +++ b/e2etests/testdata/stable/label_positions/dagre/board.exp.json @@ -7,11 +7,11 @@ "id": "non container", "type": "rectangle", "pos": { - "x": 460, - "y": 41 + "x": 470, + "y": -5 }, - "width": 5077, - "height": 157, + "width": 6168, + "height": 128, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -49,7 +49,7 @@ "type": "rectangle", "pos": { "x": 500, - "y": 86 + "y": 26 }, "width": 96, "height": 66, @@ -93,7 +93,7 @@ ], "pos": { "x": 656, - "y": 86 + "y": 26 }, "width": 156, "height": 66, @@ -137,7 +137,7 @@ ], "pos": { "x": 872, - "y": 86 + "y": 26 }, "width": 176, "height": 66, @@ -181,7 +181,7 @@ ], "pos": { "x": 1108, - "y": 86 + "y": 26 }, "width": 165, "height": 66, @@ -224,8 +224,8 @@ "OutsideLeftTop" ], "pos": { - "x": 1333, - "y": 86 + "x": 1454, + "y": 26 }, "width": 156, "height": 66, @@ -268,8 +268,8 @@ "OutsideLeftMiddle" ], "pos": { - "x": 1549, - "y": 86 + "x": 1811, + "y": 26 }, "width": 176, "height": 66, @@ -312,8 +312,8 @@ "OutsideLeftBottom" ], "pos": { - "x": 1785, - "y": 86 + "x": 2193, + "y": 26 }, "width": 181, "height": 66, @@ -356,8 +356,8 @@ "OutsideRightTop" ], "pos": { - "x": 2026, - "y": 86 + "x": 2434, + "y": 26 }, "width": 165, "height": 66, @@ -400,8 +400,8 @@ "OutsideRightMiddle" ], "pos": { - "x": 2251, - "y": 86 + "x": 2789, + "y": 26 }, "width": 186, "height": 66, @@ -444,8 +444,8 @@ "OutsideRightBottom" ], "pos": { - "x": 2497, - "y": 86 + "x": 3186, + "y": 26 }, "width": 191, "height": 66, @@ -488,8 +488,8 @@ "OutsideBottomLeft" ], "pos": { - "x": 2748, - "y": 86 + "x": 3593, + "y": 26 }, "width": 182, "height": 66, @@ -532,8 +532,8 @@ "OutsideBottomCenter" ], "pos": { - "x": 2990, - "y": 86 + "x": 3835, + "y": 26 }, "width": 202, "height": 66, @@ -576,8 +576,8 @@ "OutsideBottomRight" ], "pos": { - "x": 3252, - "y": 86 + "x": 4097, + "y": 26 }, "width": 192, "height": 66, @@ -620,8 +620,8 @@ "InsideTopLeft" ], "pos": { - "x": 3504, - "y": 86 + "x": 4349, + "y": 26 }, "width": 142, "height": 66, @@ -664,8 +664,8 @@ "InsideTopCenter" ], "pos": { - "x": 3706, - "y": 86 + "x": 4551, + "y": 26 }, "width": 163, "height": 66, @@ -708,8 +708,8 @@ "InsideTopRight" ], "pos": { - "x": 3929, - "y": 86 + "x": 4774, + "y": 26 }, "width": 152, "height": 66, @@ -752,10 +752,10 @@ "InsideMiddleLeft" ], "pos": { - "x": 4141, - "y": 86 + "x": 4986, + "y": 26 }, - "width": 163, + "width": 291, "height": 66, "opacity": 1, "strokeDash": 0, @@ -796,8 +796,8 @@ "InsideMiddleCenter" ], "pos": { - "x": 4364, - "y": 86 + "x": 5337, + "y": 26 }, "width": 183, "height": 66, @@ -840,10 +840,10 @@ "InsideMiddleRight" ], "pos": { - "x": 4607, - "y": 86 + "x": 5580, + "y": 26 }, - "width": 173, + "width": 311, "height": 66, "opacity": 1, "strokeDash": 0, @@ -884,8 +884,8 @@ "InsideBottomLeft" ], "pos": { - "x": 4840, - "y": 86 + "x": 5951, + "y": 26 }, "width": 169, "height": 66, @@ -928,8 +928,8 @@ "InsideBottomCenter" ], "pos": { - "x": 5069, - "y": 86 + "x": 6180, + "y": 26 }, "width": 189, "height": 66, @@ -972,8 +972,8 @@ "InsideBottomRight" ], "pos": { - "x": 5318, - "y": 86 + "x": 6429, + "y": 26 }, "width": 179, "height": 66, @@ -1014,10 +1014,10 @@ "type": "rectangle", "pos": { "x": 0, - "y": 371 + "y": 271 }, - "width": 5967, - "height": 289, + "width": 7497, + "height": 208, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1054,11 +1054,11 @@ "id": "container.Default", "type": "rectangle", "pos": { - "x": 20, - "y": 452 + "x": 30, + "y": 312 }, - "width": 176, - "height": 162, + "width": 156, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1096,7 +1096,7 @@ "type": "rectangle", "pos": { "x": 60, - "y": 500 + "y": 342 }, "width": 96, "height": 66, @@ -1139,11 +1139,11 @@ "OutsideTopLeft" ], "pos": { - "x": 216, - "y": 452 + "x": 226, + "y": 312 }, - "width": 236, - "height": 162, + "width": 216, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1183,11 +1183,11 @@ "OutsideTopCenter" ], "pos": { - "x": 472, - "y": 452 + "x": 482, + "y": 312 }, - "width": 256, - "height": 162, + "width": 236, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1227,11 +1227,11 @@ "OutsideTopRight" ], "pos": { - "x": 748, - "y": 452 + "x": 758, + "y": 312 }, - "width": 245, - "height": 162, + "width": 225, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1271,11 +1271,11 @@ "OutsideLeftTop" ], "pos": { - "x": 1013, - "y": 452 + "x": 1188, + "y": 312 }, - "width": 236, - "height": 162, + "width": 216, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1315,11 +1315,11 @@ "OutsideLeftMiddle" ], "pos": { - "x": 1269, - "y": 452 + "x": 1638, + "y": 312 }, - "width": 256, - "height": 162, + "width": 236, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1359,11 +1359,11 @@ "OutsideLeftBottom" ], "pos": { - "x": 1545, - "y": 452 + "x": 2116, + "y": 312 }, - "width": 261, - "height": 162, + "width": 241, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1403,11 +1403,11 @@ "OutsideRightTop" ], "pos": { - "x": 1826, - "y": 452 + "x": 2397, + "y": 312 }, - "width": 245, - "height": 162, + "width": 225, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1447,11 +1447,11 @@ "OutsideRightMiddle" ], "pos": { - "x": 2091, - "y": 452 + "x": 2841, + "y": 312 }, - "width": 266, - "height": 162, + "width": 246, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1491,11 +1491,11 @@ "OutsideRightBottom" ], "pos": { - "x": 2377, - "y": 452 + "x": 3335, + "y": 312 }, - "width": 271, - "height": 162, + "width": 251, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1535,11 +1535,11 @@ "OutsideBottomLeft" ], "pos": { - "x": 2668, - "y": 452 + "x": 3842, + "y": 312 }, - "width": 262, - "height": 162, + "width": 242, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1579,11 +1579,11 @@ "OutsideBottomCenter" ], "pos": { - "x": 2950, - "y": 452 + "x": 4124, + "y": 312 }, - "width": 282, - "height": 162, + "width": 262, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1623,11 +1623,11 @@ "OutsideBottomRight" ], "pos": { - "x": 3262, - "y": 452 + "x": 4436, + "y": 312 }, - "width": 272, - "height": 162, + "width": 252, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1667,11 +1667,11 @@ "InsideTopLeft" ], "pos": { - "x": 3554, - "y": 452 + "x": 4728, + "y": 301 }, - "width": 222, - "height": 162, + "width": 202, + "height": 137, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1711,11 +1711,11 @@ "InsideTopCenter" ], "pos": { - "x": 3796, - "y": 452 + "x": 4970, + "y": 301 }, - "width": 243, - "height": 162, + "width": 223, + "height": 137, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1755,11 +1755,11 @@ "InsideTopRight" ], "pos": { - "x": 4059, - "y": 452 + "x": 5233, + "y": 301 }, - "width": 232, - "height": 162, + "width": 212, + "height": 137, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1799,11 +1799,11 @@ "InsideMiddleLeft" ], "pos": { - "x": 4311, - "y": 452 + "x": 5515, + "y": 312 }, - "width": 243, - "height": 162, + "width": 369, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1843,11 +1843,11 @@ "InsideMiddleCenter" ], "pos": { - "x": 4574, - "y": 452 + "x": 5924, + "y": 312 }, - "width": 263, - "height": 162, + "width": 243, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1887,11 +1887,11 @@ "InsideMiddleRight" ], "pos": { - "x": 4857, - "y": 452 + "x": 6207, + "y": 312 }, - "width": 253, - "height": 162, + "width": 393, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1931,11 +1931,11 @@ "InsideBottomLeft" ], "pos": { - "x": 5130, - "y": 452 + "x": 6670, + "y": 312 }, - "width": 249, - "height": 162, + "width": 229, + "height": 137, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1975,11 +1975,11 @@ "InsideBottomCenter" ], "pos": { - "x": 5399, - "y": 452 + "x": 6939, + "y": 312 }, - "width": 269, - "height": 162, + "width": 249, + "height": 137, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -2019,11 +2019,11 @@ "InsideBottomRight" ], "pos": { - "x": 5688, - "y": 452 + "x": 7228, + "y": 312 }, - "width": 259, - "height": 162, + "width": 239, + "height": 137, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -2061,7 +2061,7 @@ "type": "rectangle", "pos": { "x": 256, - "y": 500 + "y": 342 }, "width": 156, "height": 66, @@ -2102,7 +2102,7 @@ "type": "rectangle", "pos": { "x": 512, - "y": 500 + "y": 342 }, "width": 176, "height": 66, @@ -2143,7 +2143,7 @@ "type": "rectangle", "pos": { "x": 788, - "y": 500 + "y": 342 }, "width": 165, "height": 66, @@ -2183,8 +2183,8 @@ "id": "container.OutsideLeftTop.OutsideLeftTop", "type": "rectangle", "pos": { - "x": 1053, - "y": 500 + "x": 1218, + "y": 342 }, "width": 156, "height": 66, @@ -2224,8 +2224,8 @@ "id": "container.OutsideLeftMiddle.OutsideLeftMiddle", "type": "rectangle", "pos": { - "x": 1309, - "y": 500 + "x": 1668, + "y": 342 }, "width": 176, "height": 66, @@ -2265,8 +2265,8 @@ "id": "container.OutsideLeftBottom.OutsideLeftBottom", "type": "rectangle", "pos": { - "x": 1585, - "y": 500 + "x": 2146, + "y": 342 }, "width": 181, "height": 66, @@ -2306,8 +2306,8 @@ "id": "container.OutsideRightTop.OutsideRightTop", "type": "rectangle", "pos": { - "x": 1866, - "y": 500 + "x": 2427, + "y": 342 }, "width": 165, "height": 66, @@ -2347,8 +2347,8 @@ "id": "container.OutsideRightMiddle.OutsideRightMiddle", "type": "rectangle", "pos": { - "x": 2131, - "y": 500 + "x": 2871, + "y": 342 }, "width": 186, "height": 66, @@ -2388,8 +2388,8 @@ "id": "container.OutsideRightBottom.OutsideRightBottom", "type": "rectangle", "pos": { - "x": 2417, - "y": 500 + "x": 3365, + "y": 342 }, "width": 191, "height": 66, @@ -2429,8 +2429,8 @@ "id": "container.OutsideBottomLeft.OutsideBottomLeft", "type": "rectangle", "pos": { - "x": 2708, - "y": 500 + "x": 3872, + "y": 342 }, "width": 182, "height": 66, @@ -2470,8 +2470,8 @@ "id": "container.OutsideBottomCenter.OutsideBottomCenter", "type": "rectangle", "pos": { - "x": 2990, - "y": 500 + "x": 4154, + "y": 342 }, "width": 202, "height": 66, @@ -2511,8 +2511,8 @@ "id": "container.OutsideBottomRight.OutsideBottomRight", "type": "rectangle", "pos": { - "x": 3302, - "y": 500 + "x": 4466, + "y": 342 }, "width": 192, "height": 66, @@ -2552,8 +2552,8 @@ "id": "container.InsideTopLeft.InsideTopLeft", "type": "rectangle", "pos": { - "x": 3594, - "y": 500 + "x": 4758, + "y": 342 }, "width": 142, "height": 66, @@ -2593,8 +2593,8 @@ "id": "container.InsideTopCenter.InsideTopCenter", "type": "rectangle", "pos": { - "x": 3836, - "y": 500 + "x": 5000, + "y": 342 }, "width": 163, "height": 66, @@ -2634,8 +2634,8 @@ "id": "container.InsideTopRight.InsideTopRight", "type": "rectangle", "pos": { - "x": 4099, - "y": 500 + "x": 5263, + "y": 342 }, "width": 152, "height": 66, @@ -2675,8 +2675,8 @@ "id": "container.InsideMiddleLeft.InsideMiddleLeft", "type": "rectangle", "pos": { - "x": 4351, - "y": 500 + "x": 5691, + "y": 342 }, "width": 163, "height": 66, @@ -2716,8 +2716,8 @@ "id": "container.InsideMiddleCenter.InsideMiddleCenter", "type": "rectangle", "pos": { - "x": 4614, - "y": 500 + "x": 5954, + "y": 342 }, "width": 183, "height": 66, @@ -2757,8 +2757,8 @@ "id": "container.InsideMiddleRight.InsideMiddleRight", "type": "rectangle", "pos": { - "x": 4897, - "y": 500 + "x": 6237, + "y": 342 }, "width": 173, "height": 66, @@ -2798,8 +2798,8 @@ "id": "container.InsideBottomLeft.InsideBottomLeft", "type": "rectangle", "pos": { - "x": 5170, - "y": 500 + "x": 6700, + "y": 342 }, "width": 169, "height": 66, @@ -2839,8 +2839,8 @@ "id": "container.InsideBottomCenter.InsideBottomCenter", "type": "rectangle", "pos": { - "x": 5439, - "y": 500 + "x": 6969, + "y": 342 }, "width": 189, "height": 66, @@ -2880,8 +2880,8 @@ "id": "container.InsideBottomRight.InsideBottomRight", "type": "rectangle", "pos": { - "x": 5728, - "y": 500 + "x": 7258, + "y": 342 }, "width": 179, "height": 66, @@ -2921,11 +2921,11 @@ "id": "with icon", "type": "rectangle", "pos": { - "x": 161, - "y": 833 + "x": 171, + "y": 627 }, - "width": 5649, - "height": 209, + "width": 6740, + "height": 154, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -2966,10 +2966,10 @@ ], "pos": { "x": 201, - "y": 878 + "y": 658 }, "width": 122, - "height": 118, + "height": 92, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -3023,10 +3023,10 @@ ], "pos": { "x": 383, - "y": 878 + "y": 658 }, "width": 182, - "height": 118, + "height": 92, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -3080,10 +3080,10 @@ ], "pos": { "x": 625, - "y": 878 + "y": 658 }, "width": 202, - "height": 118, + "height": 92, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -3137,10 +3137,10 @@ ], "pos": { "x": 887, - "y": 878 + "y": 658 }, "width": 191, - "height": 118, + "height": 92, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -3193,11 +3193,11 @@ "OutsideLeftTop" ], "pos": { - "x": 1138, - "y": 878 + "x": 1259, + "y": 658 }, "width": 182, - "height": 118, + "height": 92, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -3250,11 +3250,11 @@ "OutsideLeftMiddle" ], "pos": { - "x": 1380, - "y": 878 + "x": 1642, + "y": 658 }, "width": 202, - "height": 118, + "height": 92, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -3307,11 +3307,11 @@ "OutsideLeftBottom" ], "pos": { - "x": 1642, - "y": 878 + "x": 2050, + "y": 658 }, "width": 207, - "height": 118, + "height": 92, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -3364,11 +3364,11 @@ "OutsideRightTop" ], "pos": { - "x": 1909, - "y": 878 + "x": 2317, + "y": 658 }, "width": 191, - "height": 118, + "height": 92, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -3421,11 +3421,11 @@ "OutsideRightMiddle" ], "pos": { - "x": 2160, - "y": 878 + "x": 2698, + "y": 658 }, "width": 212, - "height": 118, + "height": 92, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -3478,11 +3478,11 @@ "OutsideRightBottom" ], "pos": { - "x": 2432, - "y": 878 + "x": 3121, + "y": 658 }, "width": 217, - "height": 118, + "height": 92, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -3535,11 +3535,11 @@ "OutsideBottomLeft" ], "pos": { - "x": 2709, - "y": 878 + "x": 3554, + "y": 658 }, "width": 208, - "height": 118, + "height": 92, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -3592,11 +3592,11 @@ "OutsideBottomCenter" ], "pos": { - "x": 2977, - "y": 878 + "x": 3822, + "y": 658 }, "width": 228, - "height": 118, + "height": 92, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -3649,11 +3649,11 @@ "OutsideBottomRight" ], "pos": { - "x": 3265, - "y": 878 + "x": 4110, + "y": 658 }, "width": 218, - "height": 118, + "height": 92, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -3706,11 +3706,11 @@ "InsideTopLeft" ], "pos": { - "x": 3543, - "y": 878 + "x": 4388, + "y": 658 }, "width": 168, - "height": 118, + "height": 92, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -3763,11 +3763,11 @@ "InsideTopCenter" ], "pos": { - "x": 3771, - "y": 878 + "x": 4616, + "y": 658 }, "width": 189, - "height": 118, + "height": 92, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -3820,11 +3820,11 @@ "InsideTopRight" ], "pos": { - "x": 4020, - "y": 878 + "x": 4865, + "y": 658 }, "width": 178, - "height": 118, + "height": 92, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -3877,11 +3877,11 @@ "InsideMiddleLeft" ], "pos": { - "x": 4258, - "y": 878 + "x": 5103, + "y": 658 }, - "width": 189, - "height": 118, + "width": 317, + "height": 92, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -3934,11 +3934,11 @@ "InsideMiddleCenter" ], "pos": { - "x": 4507, - "y": 878 + "x": 5480, + "y": 658 }, "width": 209, - "height": 118, + "height": 92, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -3991,11 +3991,11 @@ "InsideMiddleRight" ], "pos": { - "x": 4776, - "y": 878 + "x": 5749, + "y": 658 }, - "width": 199, - "height": 118, + "width": 337, + "height": 92, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -4048,11 +4048,11 @@ "InsideBottomLeft" ], "pos": { - "x": 5035, - "y": 878 + "x": 6146, + "y": 658 }, "width": 195, - "height": 118, + "height": 92, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -4105,11 +4105,11 @@ "InsideBottomCenter" ], "pos": { - "x": 5290, - "y": 878 + "x": 6401, + "y": 658 }, "width": 215, - "height": 118, + "height": 92, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -4162,11 +4162,11 @@ "InsideBottomRight" ], "pos": { - "x": 5565, - "y": 878 + "x": 6676, + "y": 658 }, "width": 205, - "height": 118, + "height": 92, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -4216,10 +4216,10 @@ "type": "rectangle", "pos": { "x": 0, - "y": 1215 + "y": 909 }, - "width": 5957, - "height": 289, + "width": 7487, + "height": 252, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -4259,11 +4259,11 @@ "icon" ], "pos": { - "x": 20, - "y": 1296 + "x": 30, + "y": 994 }, - "width": 176, - "height": 162, + "width": 156, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -4313,7 +4313,7 @@ "type": "rectangle", "pos": { "x": 60, - "y": 1344 + "y": 1024 }, "width": 96, "height": 66, @@ -4357,11 +4357,11 @@ "OutsideTopLeft" ], "pos": { - "x": 216, - "y": 1296 + "x": 226, + "y": 994 }, - "width": 236, - "height": 162, + "width": 216, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -4411,7 +4411,7 @@ "type": "rectangle", "pos": { "x": 256, - "y": 1344 + "y": 1024 }, "width": 156, "height": 66, @@ -4455,11 +4455,11 @@ "OutsideTopCenter" ], "pos": { - "x": 472, - "y": 1296 + "x": 482, + "y": 994 }, - "width": 256, - "height": 162, + "width": 236, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -4509,7 +4509,7 @@ "type": "rectangle", "pos": { "x": 512, - "y": 1344 + "y": 1024 }, "width": 176, "height": 66, @@ -4553,11 +4553,11 @@ "OutsideTopRight" ], "pos": { - "x": 748, - "y": 1296 + "x": 758, + "y": 994 }, - "width": 245, - "height": 162, + "width": 225, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -4607,7 +4607,7 @@ "type": "rectangle", "pos": { "x": 788, - "y": 1344 + "y": 1024 }, "width": 165, "height": 66, @@ -4651,11 +4651,11 @@ "OutsideLeftTop" ], "pos": { - "x": 1013, - "y": 1296 + "x": 1188, + "y": 994 }, - "width": 236, - "height": 162, + "width": 216, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -4704,8 +4704,8 @@ "id": "container with icon.OutsideLeftTop.OutsideLeftTop", "type": "rectangle", "pos": { - "x": 1053, - "y": 1344 + "x": 1218, + "y": 1024 }, "width": 156, "height": 66, @@ -4749,11 +4749,11 @@ "OutsideLeftMiddle" ], "pos": { - "x": 1269, - "y": 1296 + "x": 1638, + "y": 994 }, - "width": 256, - "height": 162, + "width": 236, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -4802,8 +4802,8 @@ "id": "container with icon.OutsideLeftMiddle.OutsideLeftMiddle", "type": "rectangle", "pos": { - "x": 1309, - "y": 1344 + "x": 1668, + "y": 1024 }, "width": 176, "height": 66, @@ -4847,11 +4847,11 @@ "OutsideLeftBottom" ], "pos": { - "x": 1545, - "y": 1296 + "x": 2116, + "y": 994 }, - "width": 261, - "height": 162, + "width": 241, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -4900,8 +4900,8 @@ "id": "container with icon.OutsideLeftBottom.OutsideLeftBottom", "type": "rectangle", "pos": { - "x": 1585, - "y": 1344 + "x": 2146, + "y": 1024 }, "width": 181, "height": 66, @@ -4945,11 +4945,11 @@ "OutsideRightTop" ], "pos": { - "x": 1826, - "y": 1296 + "x": 2397, + "y": 994 }, - "width": 245, - "height": 162, + "width": 225, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -4998,8 +4998,8 @@ "id": "container with icon.OutsideRightTop.OutsideRightTop", "type": "rectangle", "pos": { - "x": 1866, - "y": 1344 + "x": 2427, + "y": 1024 }, "width": 165, "height": 66, @@ -5043,11 +5043,11 @@ "OutsideRightMiddle" ], "pos": { - "x": 2091, - "y": 1296 + "x": 2841, + "y": 994 }, - "width": 266, - "height": 162, + "width": 246, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -5096,8 +5096,8 @@ "id": "container with icon.OutsideRightMiddle.OutsideRightMiddle", "type": "rectangle", "pos": { - "x": 2131, - "y": 1344 + "x": 2871, + "y": 1024 }, "width": 186, "height": 66, @@ -5141,11 +5141,11 @@ "OutsideRightBottom" ], "pos": { - "x": 2377, - "y": 1296 + "x": 3335, + "y": 994 }, - "width": 271, - "height": 162, + "width": 251, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -5194,8 +5194,8 @@ "id": "container with icon.OutsideRightBottom.OutsideRightBottom", "type": "rectangle", "pos": { - "x": 2417, - "y": 1344 + "x": 3365, + "y": 1024 }, "width": 191, "height": 66, @@ -5239,11 +5239,11 @@ "OutsideBottomLeft" ], "pos": { - "x": 2668, - "y": 1296 + "x": 3842, + "y": 994 }, - "width": 262, - "height": 162, + "width": 242, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -5292,8 +5292,8 @@ "id": "container with icon.OutsideBottomLeft.OutsideBottomLeft", "type": "rectangle", "pos": { - "x": 2708, - "y": 1344 + "x": 3872, + "y": 1024 }, "width": 182, "height": 66, @@ -5337,11 +5337,11 @@ "OutsideBottomCenter" ], "pos": { - "x": 2950, - "y": 1296 + "x": 4124, + "y": 994 }, - "width": 282, - "height": 162, + "width": 262, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -5390,8 +5390,8 @@ "id": "container with icon.OutsideBottomCenter.OutsideBottomCenter", "type": "rectangle", "pos": { - "x": 2990, - "y": 1344 + "x": 4154, + "y": 1024 }, "width": 202, "height": 66, @@ -5435,11 +5435,11 @@ "OutsideBottomRight" ], "pos": { - "x": 3252, - "y": 1296 + "x": 4426, + "y": 994 }, - "width": 272, - "height": 162, + "width": 252, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -5488,8 +5488,8 @@ "id": "container with icon.OutsideBottomRight.OutsideBottomRight", "type": "rectangle", "pos": { - "x": 3292, - "y": 1344 + "x": 4456, + "y": 1024 }, "width": 192, "height": 66, @@ -5533,11 +5533,11 @@ "InsideTopLeft" ], "pos": { - "x": 3544, - "y": 1296 + "x": 4718, + "y": 983 }, - "width": 222, - "height": 162, + "width": 202, + "height": 137, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -5586,8 +5586,8 @@ "id": "container with icon.InsideTopLeft.InsideTopLeft", "type": "rectangle", "pos": { - "x": 3584, - "y": 1344 + "x": 4748, + "y": 1024 }, "width": 142, "height": 66, @@ -5631,11 +5631,11 @@ "InsideTopCenter" ], "pos": { - "x": 3786, - "y": 1296 + "x": 4960, + "y": 983 }, - "width": 243, - "height": 162, + "width": 223, + "height": 137, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -5684,8 +5684,8 @@ "id": "container with icon.InsideTopCenter.InsideTopCenter", "type": "rectangle", "pos": { - "x": 3826, - "y": 1344 + "x": 4990, + "y": 1024 }, "width": 163, "height": 66, @@ -5729,11 +5729,11 @@ "InsideTopRight" ], "pos": { - "x": 4049, - "y": 1296 + "x": 5223, + "y": 983 }, - "width": 232, - "height": 162, + "width": 212, + "height": 137, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -5782,8 +5782,8 @@ "id": "container with icon.InsideTopRight.InsideTopRight", "type": "rectangle", "pos": { - "x": 4089, - "y": 1344 + "x": 5253, + "y": 1024 }, "width": 152, "height": 66, @@ -5827,11 +5827,11 @@ "InsideMiddleLeft" ], "pos": { - "x": 4301, - "y": 1296 + "x": 5505, + "y": 994 }, - "width": 243, - "height": 162, + "width": 369, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -5880,8 +5880,8 @@ "id": "container with icon.InsideMiddleLeft.InsideMiddleLeft", "type": "rectangle", "pos": { - "x": 4341, - "y": 1344 + "x": 5681, + "y": 1024 }, "width": 163, "height": 66, @@ -5925,11 +5925,11 @@ "InsideMiddleCenter" ], "pos": { - "x": 4564, - "y": 1296 + "x": 5914, + "y": 994 }, - "width": 263, - "height": 162, + "width": 243, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -5978,8 +5978,8 @@ "id": "container with icon.InsideMiddleCenter.InsideMiddleCenter", "type": "rectangle", "pos": { - "x": 4604, - "y": 1344 + "x": 5944, + "y": 1024 }, "width": 183, "height": 66, @@ -6023,11 +6023,11 @@ "InsideMiddleRight" ], "pos": { - "x": 4847, - "y": 1296 + "x": 6197, + "y": 994 }, - "width": 253, - "height": 162, + "width": 393, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -6076,8 +6076,8 @@ "id": "container with icon.InsideMiddleRight.InsideMiddleRight", "type": "rectangle", "pos": { - "x": 4887, - "y": 1344 + "x": 6227, + "y": 1024 }, "width": 173, "height": 66, @@ -6121,11 +6121,11 @@ "InsideBottomLeft" ], "pos": { - "x": 5120, - "y": 1296 + "x": 6660, + "y": 994 }, - "width": 249, - "height": 162, + "width": 229, + "height": 137, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -6174,8 +6174,8 @@ "id": "container with icon.InsideBottomLeft.InsideBottomLeft", "type": "rectangle", "pos": { - "x": 5160, - "y": 1344 + "x": 6690, + "y": 1024 }, "width": 169, "height": 66, @@ -6219,11 +6219,11 @@ "InsideBottomCenter" ], "pos": { - "x": 5389, - "y": 1296 + "x": 6929, + "y": 994 }, - "width": 269, - "height": 162, + "width": 249, + "height": 137, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -6272,8 +6272,8 @@ "id": "container with icon.InsideBottomCenter.InsideBottomCenter", "type": "rectangle", "pos": { - "x": 5429, - "y": 1344 + "x": 6959, + "y": 1024 }, "width": 189, "height": 66, @@ -6317,11 +6317,11 @@ "InsideBottomRight" ], "pos": { - "x": 5678, - "y": 1296 + "x": 7218, + "y": 994 }, - "width": 259, - "height": 162, + "width": 239, + "height": 137, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -6370,8 +6370,8 @@ "id": "container with icon.InsideBottomRight.InsideBottomRight", "type": "rectangle", "pos": { - "x": 5718, - "y": 1344 + "x": 7248, + "y": 1024 }, "width": 179, "height": 66, @@ -6435,19 +6435,19 @@ "route": [ { "x": 3091, - "y": 198 + "y": 123 }, { "x": 3091, - "y": 250.8000030517578 + "y": 178.1999969482422 }, { "x": 3091, - "y": 285.3999938964844 + "y": 207.8000030517578 }, { "x": 3091, - "y": 371 + "y": 271 } ], "isCurve": true, @@ -6482,19 +6482,19 @@ "route": [ { "x": 3091, - "y": 660 + "y": 479 }, { "x": 3091, - "y": 712.7999877929688 + "y": 542.2000122070312 }, { "x": 3091, - "y": 747.4000244140625 + "y": 571.7999877929688 }, { "x": 3091, - "y": 833 + "y": 627 } ], "isCurve": true, @@ -6529,19 +6529,19 @@ "route": [ { "x": 3091, - "y": 1042 + "y": 781 }, { "x": 3091, - "y": 1094.800048828125 + "y": 836.2000122070312 }, { "x": 3091, - "y": 1121.199951171875 + "y": 861.7999877929688 }, { "x": 3091, - "y": 1174 + "y": 909 } ], "isCurve": true, diff --git a/e2etests/testdata/stable/label_positions/dagre/sketch.exp.svg b/e2etests/testdata/stable/label_positions/dagre/sketch.exp.svg index 7de240b2d..691215bfb 100644 --- a/e2etests/testdata/stable/label_positions/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/label_positions/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -non containercontainerwith iconcontainer with iconDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRight - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + .d2-476545484 .fill-N1{fill:#0A0F25;} + .d2-476545484 .fill-N2{fill:#676C7E;} + .d2-476545484 .fill-N3{fill:#9499AB;} + .d2-476545484 .fill-N4{fill:#CFD2DD;} + .d2-476545484 .fill-N5{fill:#DEE1EB;} + .d2-476545484 .fill-N6{fill:#EEF1F8;} + .d2-476545484 .fill-N7{fill:#FFFFFF;} + .d2-476545484 .fill-B1{fill:#0D32B2;} + .d2-476545484 .fill-B2{fill:#0D32B2;} + .d2-476545484 .fill-B3{fill:#E3E9FD;} + .d2-476545484 .fill-B4{fill:#E3E9FD;} + .d2-476545484 .fill-B5{fill:#EDF0FD;} + .d2-476545484 .fill-B6{fill:#F7F8FE;} + .d2-476545484 .fill-AA2{fill:#4A6FF3;} + .d2-476545484 .fill-AA4{fill:#EDF0FD;} + .d2-476545484 .fill-AA5{fill:#F7F8FE;} + .d2-476545484 .fill-AB4{fill:#EDF0FD;} + .d2-476545484 .fill-AB5{fill:#F7F8FE;} + .d2-476545484 .stroke-N1{stroke:#0A0F25;} + .d2-476545484 .stroke-N2{stroke:#676C7E;} + .d2-476545484 .stroke-N3{stroke:#9499AB;} + .d2-476545484 .stroke-N4{stroke:#CFD2DD;} + .d2-476545484 .stroke-N5{stroke:#DEE1EB;} + .d2-476545484 .stroke-N6{stroke:#EEF1F8;} + .d2-476545484 .stroke-N7{stroke:#FFFFFF;} + .d2-476545484 .stroke-B1{stroke:#0D32B2;} + .d2-476545484 .stroke-B2{stroke:#0D32B2;} + .d2-476545484 .stroke-B3{stroke:#E3E9FD;} + .d2-476545484 .stroke-B4{stroke:#E3E9FD;} + .d2-476545484 .stroke-B5{stroke:#EDF0FD;} + .d2-476545484 .stroke-B6{stroke:#F7F8FE;} + .d2-476545484 .stroke-AA2{stroke:#4A6FF3;} + .d2-476545484 .stroke-AA4{stroke:#EDF0FD;} + .d2-476545484 .stroke-AA5{stroke:#F7F8FE;} + .d2-476545484 .stroke-AB4{stroke:#EDF0FD;} + .d2-476545484 .stroke-AB5{stroke:#F7F8FE;} + .d2-476545484 .background-color-N1{background-color:#0A0F25;} + .d2-476545484 .background-color-N2{background-color:#676C7E;} + .d2-476545484 .background-color-N3{background-color:#9499AB;} + .d2-476545484 .background-color-N4{background-color:#CFD2DD;} + .d2-476545484 .background-color-N5{background-color:#DEE1EB;} + .d2-476545484 .background-color-N6{background-color:#EEF1F8;} + .d2-476545484 .background-color-N7{background-color:#FFFFFF;} + .d2-476545484 .background-color-B1{background-color:#0D32B2;} + .d2-476545484 .background-color-B2{background-color:#0D32B2;} + .d2-476545484 .background-color-B3{background-color:#E3E9FD;} + .d2-476545484 .background-color-B4{background-color:#E3E9FD;} + .d2-476545484 .background-color-B5{background-color:#EDF0FD;} + .d2-476545484 .background-color-B6{background-color:#F7F8FE;} + .d2-476545484 .background-color-AA2{background-color:#4A6FF3;} + .d2-476545484 .background-color-AA4{background-color:#EDF0FD;} + .d2-476545484 .background-color-AA5{background-color:#F7F8FE;} + .d2-476545484 .background-color-AB4{background-color:#EDF0FD;} + .d2-476545484 .background-color-AB5{background-color:#F7F8FE;} + .d2-476545484 .color-N1{color:#0A0F25;} + .d2-476545484 .color-N2{color:#676C7E;} + .d2-476545484 .color-N3{color:#9499AB;} + .d2-476545484 .color-N4{color:#CFD2DD;} + .d2-476545484 .color-N5{color:#DEE1EB;} + .d2-476545484 .color-N6{color:#EEF1F8;} + .d2-476545484 .color-N7{color:#FFFFFF;} + .d2-476545484 .color-B1{color:#0D32B2;} + .d2-476545484 .color-B2{color:#0D32B2;} + .d2-476545484 .color-B3{color:#E3E9FD;} + .d2-476545484 .color-B4{color:#E3E9FD;} + .d2-476545484 .color-B5{color:#EDF0FD;} + .d2-476545484 .color-B6{color:#F7F8FE;} + .d2-476545484 .color-AA2{color:#4A6FF3;} + .d2-476545484 .color-AA4{color:#EDF0FD;} + .d2-476545484 .color-AA5{color:#F7F8FE;} + .d2-476545484 .color-AB4{color:#EDF0FD;} + .d2-476545484 .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}]]>non containercontainerwith iconcontainer with iconDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRight + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/large_arch/dagre/board.exp.json b/e2etests/testdata/stable/large_arch/dagre/board.exp.json index cd06318bf..28358af13 100644 --- a/e2etests/testdata/stable/large_arch/dagre/board.exp.json +++ b/e2etests/testdata/stable/large_arch/dagre/board.exp.json @@ -336,10 +336,10 @@ "type": "rectangle", "pos": { "x": 1427, - "y": 407 + "y": 395 }, - "width": 476, - "height": 541, + "width": 466, + "height": 513, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -376,11 +376,11 @@ "id": "i.j", "type": "rectangle", "pos": { - "x": 1449, - "y": 472 + "x": 1459, + "y": 436 }, - "width": 349, - "height": 130, + "width": 329, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -418,7 +418,7 @@ "type": "rectangle", "pos": { "x": 1705, - "y": 504 + "y": 466 }, "width": 53, "height": 66, @@ -459,7 +459,7 @@ "type": "rectangle", "pos": { "x": 1489, - "y": 504 + "y": 466 }, "width": 49, "height": 66, @@ -500,7 +500,7 @@ "type": "rectangle", "pos": { "x": 1693, - "y": 802 + "y": 782 }, "width": 57, "height": 66, @@ -541,7 +541,7 @@ "type": "rectangle", "pos": { "x": 1810, - "y": 802 + "y": 782 }, "width": 53, "height": 66, @@ -581,11 +581,11 @@ "id": "i.o", "type": "rectangle", "pos": { - "x": 1447, - "y": 788 + "x": 1457, + "y": 752 }, - "width": 133, - "height": 130, + "width": 113, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -623,7 +623,7 @@ "type": "rectangle", "pos": { "x": 1487, - "y": 820 + "y": 782 }, "width": 53, "height": 66, @@ -704,11 +704,11 @@ "id": "r", "type": "rectangle", "pos": { - "x": 206, - "y": 41 + "x": 216, + "y": 43 }, - "width": 1202, - "height": 591, + "width": 1191, + "height": 549, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -745,11 +745,11 @@ "id": "r.s", "type": "rectangle", "pos": { - "x": 471, - "y": 106 + "x": 502, + "y": 84 }, - "width": 403, - "height": 496, + "width": 367, + "height": 478, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -787,7 +787,7 @@ "type": "rectangle", "pos": { "x": 532, - "y": 504 + "y": 466 }, "width": 51, "height": 66, @@ -827,11 +827,11 @@ "id": "r.s.u", "type": "rectangle", "pos": { - "x": 715, - "y": 169 + "x": 725, + "y": 120 }, - "width": 134, - "height": 135, + "width": 114, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -869,7 +869,7 @@ "type": "rectangle", "pos": { "x": 755, - "y": 204 + "y": 150 }, "width": 54, "height": 66, @@ -910,7 +910,7 @@ "type": "rectangle", "pos": { "x": 643, - "y": 504 + "y": 466 }, "width": 58, "height": 66, @@ -951,7 +951,7 @@ "type": "rectangle", "pos": { "x": 622, - "y": 188 + "y": 150 }, "width": 53, "height": 66, @@ -992,7 +992,7 @@ "type": "rectangle", "pos": { "x": 761, - "y": 504 + "y": 466 }, "width": 54, "height": 66, @@ -1033,7 +1033,7 @@ "type": "rectangle", "pos": { "x": 913, - "y": 486 + "y": 466 }, "width": 52, "height": 66, @@ -1074,7 +1074,7 @@ "type": "rectangle", "pos": { "x": 246, - "y": 170 + "y": 150 }, "width": 62, "height": 66, @@ -1114,11 +1114,11 @@ "id": "r.bb", "type": "rectangle", "pos": { - "x": 1122, - "y": 472 + "x": 1132, + "y": 436 }, - "width": 265, - "height": 130, + "width": 245, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1156,7 +1156,7 @@ "type": "rectangle", "pos": { "x": 1162, - "y": 504 + "y": 466 }, "width": 61, "height": 66, @@ -1197,7 +1197,7 @@ "type": "rectangle", "pos": { "x": 1283, - "y": 504 + "y": 466 }, "width": 64, "height": 66, @@ -1238,7 +1238,7 @@ "type": "rectangle", "pos": { "x": 1023, - "y": 170 + "y": 150 }, "width": 62, "height": 66, @@ -1279,7 +1279,7 @@ "type": "rectangle", "pos": { "x": 1025, - "y": 486 + "y": 466 }, "width": 57, "height": 66, @@ -1320,7 +1320,7 @@ "type": "rectangle", "pos": { "x": 368, - "y": 170 + "y": 150 }, "width": 63, "height": 66, @@ -1384,43 +1384,43 @@ "route": [ { "x": 1731.5, - "y": 570.5 + "y": 532 }, { "x": 1731.5, - "y": 596.0999755859375 + "y": 572 }, { "x": 1731.5, - "y": 612.5 + "y": 592 }, { "x": 1731.5, - "y": 627.5 + "y": 607 }, { "x": 1731.5, - "y": 642.5 + "y": 622 }, { "x": 1731.5, - "y": 662.5 + "y": 642 }, { "x": 1731.5, - "y": 677.5 + "y": 657 }, { "x": 1731.5, - "y": 692.5 + "y": 672 }, { "x": 1730.300048828125, - "y": 762.5 + "y": 742 }, { "x": 1725.5, - "y": 802.5 + "y": 782 } ], "isCurve": true, @@ -1455,43 +1455,43 @@ "route": [ { "x": 1513.75, - "y": 570.5 + "y": 532 }, { "x": 1513.75, - "y": 596.0999755859375 + "y": 572 }, { "x": 1513.75, - "y": 612.5 + "y": 592 }, { "x": 1513.75, - "y": 627.5 + "y": 607 }, { "x": 1513.75, - "y": 642.5 + "y": 622 }, { "x": 1513.75, - "y": 662.5 + "y": 642 }, { "x": 1513.75, - "y": 677.5 + "y": 657 }, { "x": 1513.75, - "y": 692.5 + "y": 672 }, { "x": 1513.75, - "y": 766.0999755859375 + "y": 742 }, { "x": 1513.75, - "y": 820.5 + "y": 782 } ], "isCurve": true, @@ -1525,11 +1525,11 @@ "labelPercentage": 0, "route": [ { - "x": 1813.637939453125, + "x": 1814, "y": 1048 }, { - "x": 1785.927001953125, + "x": 1786, "y": 1008 }, { @@ -1546,11 +1546,11 @@ }, { "x": 1772, - "y": 892.0999755859375 + "y": 888 }, { "x": 1744, - "y": 868.5 + "y": 848 } ], "isCurve": true, @@ -1584,12 +1584,12 @@ "labelPercentage": 0, "route": [ { - "x": 1750, - "y": 851.4559936523438 + "x": 1749.75, + "y": 831 }, { - "x": 1845.800048828125, - "y": 888.6909790039062 + "x": 1845.75, + "y": 884.5999755859375 }, { "x": 1869.75, @@ -1644,11 +1644,11 @@ "route": [ { "x": 1836.5, - "y": 868.5 + "y": 848 }, { "x": 1836.5, - "y": 892.0999755859375 + "y": 888 }, { "x": 1836.5, @@ -1702,12 +1702,12 @@ "labelPercentage": 0, "route": [ { - "x": 1693, - "y": 855.7169799804688 + "x": 1693.5, + "y": 835 }, { - "x": 1622.199951171875, - "y": 889.5430297851562 + "x": 1622.300048828125, + "y": 885.4000244140625 }, { "x": 1604.5, @@ -1761,12 +1761,12 @@ "labelPercentage": 0, "route": [ { - "x": 1693, - "y": 859.885986328125 + "x": 1693.5, + "y": 839 }, { - "x": 1638.199951171875, - "y": 890.3770141601562 + "x": 1638.300048828125, + "y": 886.2000122070312 }, { "x": 1624.5, @@ -1820,12 +1820,12 @@ "labelPercentage": 0, "route": [ { - "x": 1736.4090576171875, - "y": 868.5 + "x": 1736, + "y": 848 }, { - "x": 1754.48095703125, - "y": 892.0999755859375 + "x": 1754.4000244140625, + "y": 888 }, { "x": 1759, @@ -1879,12 +1879,12 @@ "labelPercentage": 0, "route": [ { - "x": 1699.135009765625, - "y": 868.5 + "x": 1699.25, + "y": 848 }, { - "x": 1672.0269775390625, - "y": 892.0999755859375 + "x": 1672.050048828125, + "y": 888 }, { "x": 1665.25, @@ -1985,44 +1985,44 @@ "labelPercentage": 0, "route": [ { - "x": 629.4630126953125, - "y": 254.5 + "x": 629, + "y": 216 }, { - "x": 606.6920166015625, - "y": 294.5 + "x": 606.5999755859375, + "y": 256 }, { "x": 601, - "y": 314.5 + "y": 276 }, { "x": 601, - "y": 329.5 + "y": 291 }, { "x": 601, - "y": 344.5 + "y": 306 }, { "x": 601, - "y": 364.5 + "y": 326 }, { "x": 601, - "y": 379.5 + "y": 341 }, { "x": 601, - "y": 394.5 + "y": 356 }, { "x": 595.5999755859375, - "y": 464.5 + "y": 426 }, { "x": 574, - "y": 504.5 + "y": 466 } ], "isCurve": true, @@ -2056,44 +2056,44 @@ "labelPercentage": 0, "route": [ { - "x": 657.4929809570312, - "y": 254.5 + "x": 657.5, + "y": 216 }, { - "x": 668.697998046875, - "y": 294.5 + "x": 668.7000122070312, + "y": 256 }, { "x": 671.5, - "y": 314.5 + "y": 276 }, { "x": 671.5, - "y": 329.5 + "y": 291 }, { "x": 671.5, - "y": 344.5 + "y": 306 }, { "x": 671.5, - "y": 364.5 + "y": 326 }, { "x": 671.5, - "y": 379.5 + "y": 341 }, { "x": 671.5, - "y": 394.5 + "y": 356 }, { "x": 671.5, - "y": 464.5 + "y": 426 }, { "x": 671.5, - "y": 504.5 + "y": 466 } ], "isCurve": true, @@ -2128,43 +2128,43 @@ "route": [ { "x": 431, - "y": 220.10000610351562 + "y": 200 }, { "x": 531.7999877929688, - "y": 273.2200012207031 + "y": 252.8000030517578 }, { "x": 557, - "y": 296.5 + "y": 276 }, { "x": 557, - "y": 311.5 + "y": 291 }, { "x": 557, - "y": 326.5 + "y": 306 }, { "x": 557, - "y": 346.5 + "y": 326 }, { "x": 557, - "y": 361.5 + "y": 341 }, { "x": 557, - "y": 376.5 + "y": 356 }, { "x": 557, - "y": 450.1000061035156 + "y": 426 }, { "x": 557, - "y": 504.5 + "y": 466 } ], "isCurve": true, @@ -2199,43 +2199,43 @@ "route": [ { "x": 781.75, - "y": 270 + "y": 216 }, { "x": 781.75, - "y": 283.20001220703125 + "y": 256 }, { "x": 781.75, - "y": 296.5 + "y": 276 }, { "x": 781.75, - "y": 311.5 + "y": 291 }, { "x": 781.75, - "y": 326.5 + "y": 306 }, { "x": 781.75, - "y": 346.5 + "y": 326 }, { "x": 781.75, - "y": 361.5 + "y": 341 }, { "x": 781.75, - "y": 376.5 + "y": 356 }, { "x": 807.9500122070312, - "y": 450.29998779296875 + "y": 429.79998779296875 }, { "x": 912.75, - "y": 505.5 + "y": 485 } ], "isCurve": true, @@ -2269,44 +2269,44 @@ "labelPercentage": 0, "route": [ { - "x": 308, - "y": 214.8470001220703 + "x": 307.75, + "y": 194 }, { - "x": 464.6000061035156, - "y": 272.16900634765625 + "x": 464.54998779296875, + "y": 251.60000610351562 }, { "x": 503.75, - "y": 296.5 + "y": 276 }, { "x": 503.75, - "y": 311.5 + "y": 291 }, { "x": 503.75, - "y": 326.5 + "y": 306 }, { "x": 503.75, - "y": 346.5 + "y": 326 }, { "x": 503.75, - "y": 361.5 + "y": 341 }, { "x": 503.75, - "y": 376.5 + "y": 356 }, { "x": 510.1499938964844, - "y": 450.1000061035156 + "y": 426 }, { "x": 535.75, - "y": 504.5 + "y": 466 } ], "isCurve": true, @@ -2341,11 +2341,11 @@ "route": [ { "x": 671.5, - "y": 570.5 + "y": 532 }, { "x": 671.5, - "y": 579.7000122070312 + "y": 572 }, { "x": 671.5, @@ -2373,11 +2373,11 @@ }, { "x": 1638.300048828125, - "y": 747.9000244140625 + "y": 743.7999877929688 }, { "x": 1693.5, - "y": 811.5 + "y": 791 } ], "isCurve": true, @@ -2411,12 +2411,12 @@ "labelPercentage": 0, "route": [ { - "x": 575.7860107421875, - "y": 570.5 + "x": 576.25, + "y": 532 }, { - "x": 598.5570068359375, - "y": 579.7000122070312 + "x": 598.6500244140625, + "y": 572 }, { "x": 604.25, @@ -2530,12 +2530,12 @@ "labelPercentage": 0, "route": [ { - "x": 543.780029296875, - "y": 570.5 + "x": 543.75, + "y": 532 }, { - "x": 527.7559814453125, - "y": 579.7000122070312 + "x": 527.75, + "y": 572 }, { "x": 523.75, @@ -2602,43 +2602,43 @@ "route": [ { "x": 1053.75, - "y": 236.5 + "y": 216 }, { "x": 1053.75, - "y": 276.5 + "y": 256 }, { "x": 1053.75, - "y": 296.5 + "y": 276 }, { "x": 1053.75, - "y": 311.5 + "y": 291 }, { "x": 1053.75, - "y": 326.5 + "y": 306 }, { "x": 1053.75, - "y": 346.5 + "y": 326 }, { "x": 1053.75, - "y": 361.5 + "y": 341 }, { "x": 1053.75, - "y": 376.5 + "y": 356 }, { "x": 1053.75, - "y": 446.5 + "y": 426 }, { "x": 1053.75, - "y": 486.5 + "y": 466 } ], "isCurve": true, diff --git a/e2etests/testdata/stable/large_arch/dagre/sketch.exp.svg b/e2etests/testdata/stable/large_arch/dagre/sketch.exp.svg index e323340fd..3199e1c68 100644 --- a/e2etests/testdata/stable/large_arch/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/large_arch/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -abcdefghiqrjmnoszaabbeeffggklptuwxyccddv - + .d2-2093711639 .fill-N1{fill:#0A0F25;} + .d2-2093711639 .fill-N2{fill:#676C7E;} + .d2-2093711639 .fill-N3{fill:#9499AB;} + .d2-2093711639 .fill-N4{fill:#CFD2DD;} + .d2-2093711639 .fill-N5{fill:#DEE1EB;} + .d2-2093711639 .fill-N6{fill:#EEF1F8;} + .d2-2093711639 .fill-N7{fill:#FFFFFF;} + .d2-2093711639 .fill-B1{fill:#0D32B2;} + .d2-2093711639 .fill-B2{fill:#0D32B2;} + .d2-2093711639 .fill-B3{fill:#E3E9FD;} + .d2-2093711639 .fill-B4{fill:#E3E9FD;} + .d2-2093711639 .fill-B5{fill:#EDF0FD;} + .d2-2093711639 .fill-B6{fill:#F7F8FE;} + .d2-2093711639 .fill-AA2{fill:#4A6FF3;} + .d2-2093711639 .fill-AA4{fill:#EDF0FD;} + .d2-2093711639 .fill-AA5{fill:#F7F8FE;} + .d2-2093711639 .fill-AB4{fill:#EDF0FD;} + .d2-2093711639 .fill-AB5{fill:#F7F8FE;} + .d2-2093711639 .stroke-N1{stroke:#0A0F25;} + .d2-2093711639 .stroke-N2{stroke:#676C7E;} + .d2-2093711639 .stroke-N3{stroke:#9499AB;} + .d2-2093711639 .stroke-N4{stroke:#CFD2DD;} + .d2-2093711639 .stroke-N5{stroke:#DEE1EB;} + .d2-2093711639 .stroke-N6{stroke:#EEF1F8;} + .d2-2093711639 .stroke-N7{stroke:#FFFFFF;} + .d2-2093711639 .stroke-B1{stroke:#0D32B2;} + .d2-2093711639 .stroke-B2{stroke:#0D32B2;} + .d2-2093711639 .stroke-B3{stroke:#E3E9FD;} + .d2-2093711639 .stroke-B4{stroke:#E3E9FD;} + .d2-2093711639 .stroke-B5{stroke:#EDF0FD;} + .d2-2093711639 .stroke-B6{stroke:#F7F8FE;} + .d2-2093711639 .stroke-AA2{stroke:#4A6FF3;} + .d2-2093711639 .stroke-AA4{stroke:#EDF0FD;} + .d2-2093711639 .stroke-AA5{stroke:#F7F8FE;} + .d2-2093711639 .stroke-AB4{stroke:#EDF0FD;} + .d2-2093711639 .stroke-AB5{stroke:#F7F8FE;} + .d2-2093711639 .background-color-N1{background-color:#0A0F25;} + .d2-2093711639 .background-color-N2{background-color:#676C7E;} + .d2-2093711639 .background-color-N3{background-color:#9499AB;} + .d2-2093711639 .background-color-N4{background-color:#CFD2DD;} + .d2-2093711639 .background-color-N5{background-color:#DEE1EB;} + .d2-2093711639 .background-color-N6{background-color:#EEF1F8;} + .d2-2093711639 .background-color-N7{background-color:#FFFFFF;} + .d2-2093711639 .background-color-B1{background-color:#0D32B2;} + .d2-2093711639 .background-color-B2{background-color:#0D32B2;} + .d2-2093711639 .background-color-B3{background-color:#E3E9FD;} + .d2-2093711639 .background-color-B4{background-color:#E3E9FD;} + .d2-2093711639 .background-color-B5{background-color:#EDF0FD;} + .d2-2093711639 .background-color-B6{background-color:#F7F8FE;} + .d2-2093711639 .background-color-AA2{background-color:#4A6FF3;} + .d2-2093711639 .background-color-AA4{background-color:#EDF0FD;} + .d2-2093711639 .background-color-AA5{background-color:#F7F8FE;} + .d2-2093711639 .background-color-AB4{background-color:#EDF0FD;} + .d2-2093711639 .background-color-AB5{background-color:#F7F8FE;} + .d2-2093711639 .color-N1{color:#0A0F25;} + .d2-2093711639 .color-N2{color:#676C7E;} + .d2-2093711639 .color-N3{color:#9499AB;} + .d2-2093711639 .color-N4{color:#CFD2DD;} + .d2-2093711639 .color-N5{color:#DEE1EB;} + .d2-2093711639 .color-N6{color:#EEF1F8;} + .d2-2093711639 .color-N7{color:#FFFFFF;} + .d2-2093711639 .color-B1{color:#0D32B2;} + .d2-2093711639 .color-B2{color:#0D32B2;} + .d2-2093711639 .color-B3{color:#E3E9FD;} + .d2-2093711639 .color-B4{color:#E3E9FD;} + .d2-2093711639 .color-B5{color:#EDF0FD;} + .d2-2093711639 .color-B6{color:#F7F8FE;} + .d2-2093711639 .color-AA2{color:#4A6FF3;} + .d2-2093711639 .color-AA4{color:#EDF0FD;} + .d2-2093711639 .color-AA5{color:#F7F8FE;} + .d2-2093711639 .color-AB4{color:#EDF0FD;} + .d2-2093711639 .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}]]>abcdefghiqrjmnoszaabbeeffggklptuwxyccddv + @@ -106,29 +106,29 @@ - + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/large_arch/elk/board.exp.json b/e2etests/testdata/stable/large_arch/elk/board.exp.json index 47b3df074..331db4ae7 100644 --- a/e2etests/testdata/stable/large_arch/elk/board.exp.json +++ b/e2etests/testdata/stable/large_arch/elk/board.exp.json @@ -1396,7 +1396,7 @@ }, { "x": 652.75, - "y": 1427.625 + "y": 1428 } ], "animated": false, @@ -1488,7 +1488,7 @@ }, { "x": 602.75, - "y": 1427.625 + "y": 1428 } ], "animated": false, @@ -1522,7 +1522,7 @@ "route": [ { "x": 669.416015625, - "y": 1493.625 + "y": 1494 }, { "x": 669.416015625, @@ -1614,7 +1614,7 @@ "route": [ { "x": 646.166015625, - "y": 1493.625 + "y": 1494 }, { "x": 646.166015625, @@ -1652,7 +1652,7 @@ "route": [ { "x": 602.75, - "y": 1493.625 + "y": 1494 }, { "x": 602.75, @@ -1698,7 +1698,7 @@ "route": [ { "x": 536.0830078125, - "y": 1493.625 + "y": 1494 }, { "x": 536.0830078125, @@ -1744,7 +1744,7 @@ "route": [ { "x": 569.416015625, - "y": 1493.625 + "y": 1494 }, { "x": 569.416015625, @@ -1874,7 +1874,7 @@ "route": [ { "x": 601, - "y": 429 + "y": 428.5 }, { "x": 601, @@ -2034,7 +2034,7 @@ "route": [ { "x": 601, - "y": 627.5 + "y": 627 }, { "x": 601, @@ -2046,7 +2046,7 @@ }, { "x": 552.75, - "y": 1427.625 + "y": 1428 } ], "animated": false, @@ -2083,7 +2083,7 @@ "y": 617 }, { - "x": 270.4989929199219, + "x": 270.5, "y": 1768 } ], diff --git a/e2etests/testdata/stable/large_arch/elk/sketch.exp.svg b/e2etests/testdata/stable/large_arch/elk/sketch.exp.svg index 11a3bd0bd..0048bc5e4 100644 --- a/e2etests/testdata/stable/large_arch/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/large_arch/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -abcdefghiqrjmnoszaabbeeffggklptuwxyccddv + .d2-3217305317 .fill-N1{fill:#0A0F25;} + .d2-3217305317 .fill-N2{fill:#676C7E;} + .d2-3217305317 .fill-N3{fill:#9499AB;} + .d2-3217305317 .fill-N4{fill:#CFD2DD;} + .d2-3217305317 .fill-N5{fill:#DEE1EB;} + .d2-3217305317 .fill-N6{fill:#EEF1F8;} + .d2-3217305317 .fill-N7{fill:#FFFFFF;} + .d2-3217305317 .fill-B1{fill:#0D32B2;} + .d2-3217305317 .fill-B2{fill:#0D32B2;} + .d2-3217305317 .fill-B3{fill:#E3E9FD;} + .d2-3217305317 .fill-B4{fill:#E3E9FD;} + .d2-3217305317 .fill-B5{fill:#EDF0FD;} + .d2-3217305317 .fill-B6{fill:#F7F8FE;} + .d2-3217305317 .fill-AA2{fill:#4A6FF3;} + .d2-3217305317 .fill-AA4{fill:#EDF0FD;} + .d2-3217305317 .fill-AA5{fill:#F7F8FE;} + .d2-3217305317 .fill-AB4{fill:#EDF0FD;} + .d2-3217305317 .fill-AB5{fill:#F7F8FE;} + .d2-3217305317 .stroke-N1{stroke:#0A0F25;} + .d2-3217305317 .stroke-N2{stroke:#676C7E;} + .d2-3217305317 .stroke-N3{stroke:#9499AB;} + .d2-3217305317 .stroke-N4{stroke:#CFD2DD;} + .d2-3217305317 .stroke-N5{stroke:#DEE1EB;} + .d2-3217305317 .stroke-N6{stroke:#EEF1F8;} + .d2-3217305317 .stroke-N7{stroke:#FFFFFF;} + .d2-3217305317 .stroke-B1{stroke:#0D32B2;} + .d2-3217305317 .stroke-B2{stroke:#0D32B2;} + .d2-3217305317 .stroke-B3{stroke:#E3E9FD;} + .d2-3217305317 .stroke-B4{stroke:#E3E9FD;} + .d2-3217305317 .stroke-B5{stroke:#EDF0FD;} + .d2-3217305317 .stroke-B6{stroke:#F7F8FE;} + .d2-3217305317 .stroke-AA2{stroke:#4A6FF3;} + .d2-3217305317 .stroke-AA4{stroke:#EDF0FD;} + .d2-3217305317 .stroke-AA5{stroke:#F7F8FE;} + .d2-3217305317 .stroke-AB4{stroke:#EDF0FD;} + .d2-3217305317 .stroke-AB5{stroke:#F7F8FE;} + .d2-3217305317 .background-color-N1{background-color:#0A0F25;} + .d2-3217305317 .background-color-N2{background-color:#676C7E;} + .d2-3217305317 .background-color-N3{background-color:#9499AB;} + .d2-3217305317 .background-color-N4{background-color:#CFD2DD;} + .d2-3217305317 .background-color-N5{background-color:#DEE1EB;} + .d2-3217305317 .background-color-N6{background-color:#EEF1F8;} + .d2-3217305317 .background-color-N7{background-color:#FFFFFF;} + .d2-3217305317 .background-color-B1{background-color:#0D32B2;} + .d2-3217305317 .background-color-B2{background-color:#0D32B2;} + .d2-3217305317 .background-color-B3{background-color:#E3E9FD;} + .d2-3217305317 .background-color-B4{background-color:#E3E9FD;} + .d2-3217305317 .background-color-B5{background-color:#EDF0FD;} + .d2-3217305317 .background-color-B6{background-color:#F7F8FE;} + .d2-3217305317 .background-color-AA2{background-color:#4A6FF3;} + .d2-3217305317 .background-color-AA4{background-color:#EDF0FD;} + .d2-3217305317 .background-color-AA5{background-color:#F7F8FE;} + .d2-3217305317 .background-color-AB4{background-color:#EDF0FD;} + .d2-3217305317 .background-color-AB5{background-color:#F7F8FE;} + .d2-3217305317 .color-N1{color:#0A0F25;} + .d2-3217305317 .color-N2{color:#676C7E;} + .d2-3217305317 .color-N3{color:#9499AB;} + .d2-3217305317 .color-N4{color:#CFD2DD;} + .d2-3217305317 .color-N5{color:#DEE1EB;} + .d2-3217305317 .color-N6{color:#EEF1F8;} + .d2-3217305317 .color-N7{color:#FFFFFF;} + .d2-3217305317 .color-B1{color:#0D32B2;} + .d2-3217305317 .color-B2{color:#0D32B2;} + .d2-3217305317 .color-B3{color:#E3E9FD;} + .d2-3217305317 .color-B4{color:#E3E9FD;} + .d2-3217305317 .color-B5{color:#EDF0FD;} + .d2-3217305317 .color-B6{color:#F7F8FE;} + .d2-3217305317 .color-AA2{color:#4A6FF3;} + .d2-3217305317 .color-AA4{color:#EDF0FD;} + .d2-3217305317 .color-AA5{color:#F7F8FE;} + .d2-3217305317 .color-AB4{color:#EDF0FD;} + .d2-3217305317 .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}]]>abcdefghiqrjmnoszaabbeeffggklptuwxyccddv diff --git a/e2etests/testdata/stable/latex/dagre/board.exp.json b/e2etests/testdata/stable/latex/dagre/board.exp.json index 5760e319a..457430502 100644 --- a/e2etests/testdata/stable/latex/dagre/board.exp.json +++ b/e2etests/testdata/stable/latex/dagre/board.exp.json @@ -273,11 +273,11 @@ "labelPercentage": 0, "route": [ { - "x": 284.8739929199219, + "x": 285, "y": 51 }, { - "x": 209.7740020751953, + "x": 209.8000030517578, "y": 91 }, { @@ -320,11 +320,11 @@ "labelPercentage": 0, "route": [ { - "x": 380.625, + "x": 380.5, "y": 51 }, { - "x": 455.7250061035156, + "x": 455.70001220703125, "y": 91 }, { @@ -509,11 +509,11 @@ "route": [ { "x": 474.5, - "y": 418 + "y": 417.5 }, { "x": 474.5, - "y": 466.3999938964844 + "y": 466.29998779296875 }, { "x": 474.5, diff --git a/e2etests/testdata/stable/latex/dagre/sketch.exp.svg b/e2etests/testdata/stable/latex/dagre/sketch.exp.svg index 89f411bf3..31ef68f17 100644 --- a/e2etests/testdata/stable/latex/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/latex/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -mixed togethersugarsolution we get +mixed togethersugarsolution we get diff --git a/e2etests/testdata/stable/latex/elk/board.exp.json b/e2etests/testdata/stable/latex/elk/board.exp.json index ba49c3482..93483c57c 100644 --- a/e2etests/testdata/stable/latex/elk/board.exp.json +++ b/e2etests/testdata/stable/latex/elk/board.exp.json @@ -324,7 +324,7 @@ }, { "x": 446.5, - "y": 184.5 + "y": 185 } ], "animated": false, @@ -404,7 +404,7 @@ "route": [ { "x": 446.5, - "y": 202.5 + "y": 202 }, { "x": 446.5, diff --git a/e2etests/testdata/stable/latex/elk/sketch.exp.svg b/e2etests/testdata/stable/latex/elk/sketch.exp.svg index 780c480c2..3091e7471 100644 --- a/e2etests/testdata/stable/latex/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/latex/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -mixed togethersugarsolution we get +mixed togethersugarsolution we get diff --git a/e2etests/testdata/stable/legend_with_near_key/dagre/board.exp.json b/e2etests/testdata/stable/legend_with_near_key/dagre/board.exp.json index 0b5b99f6f..66f51a747 100644 --- a/e2etests/testdata/stable/legend_with_near_key/dagre/board.exp.json +++ b/e2etests/testdata/stable/legend_with_near_key/dagre/board.exp.json @@ -130,11 +130,11 @@ "id": "legend", "type": "rectangle", "pos": { - "x": 87, + "x": 97, "y": 122 }, - "width": 184, - "height": 80, + "width": 164, + "height": 81, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -172,7 +172,7 @@ "type": "text", "pos": { "x": 127, - "y": 151 + "y": 152 }, "width": 22, "height": 21, @@ -212,7 +212,7 @@ "type": "text", "pos": { "x": 209, - "y": 151 + "y": 152 }, "width": 22, "height": 21, diff --git a/e2etests/testdata/stable/legend_with_near_key/dagre/sketch.exp.svg b/e2etests/testdata/stable/legend_with_near_key/dagre/sketch.exp.svg index 2d89147db..171c287e4 100644 --- a/e2etests/testdata/stable/legend_with_near_key/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/legend_with_near_key/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -xyzlegendfoobar - +xyzlegendfoobar + - - + + \ No newline at end of file diff --git a/e2etests/testdata/stable/markdown_stroke_fill/dagre/board.exp.json b/e2etests/testdata/stable/markdown_stroke_fill/dagre/board.exp.json index 5096d0de9..93b639665 100644 --- a/e2etests/testdata/stable/markdown_stroke_fill/dagre/board.exp.json +++ b/e2etests/testdata/stable/markdown_stroke_fill/dagre/board.exp.json @@ -7,11 +7,11 @@ "id": "container", "type": "rectangle", "pos": { - "x": 0, - "y": 41 + "x": 10, + "y": 20 }, - "width": 292, - "height": 317, + "width": 272, + "height": 318, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -49,7 +49,7 @@ "type": "text", "pos": { "x": 40, - "y": 70 + "y": 50 }, "width": 212, "height": 258, @@ -152,11 +152,11 @@ "route": [ { "x": 146, - "y": 358 + "y": 338 }, { "x": 146, - "y": 398 + "y": 394 }, { "x": 146, diff --git a/e2etests/testdata/stable/markdown_stroke_fill/dagre/sketch.exp.svg b/e2etests/testdata/stable/markdown_stroke_fill/dagre/sketch.exp.svg index 456a9068a..7e9e94124 100644 --- a/e2etests/testdata/stable/markdown_stroke_fill/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/markdown_stroke_fill/dagre/sketch.exp.svg @@ -1,20 +1,20 @@ -container

they did it in style

-

a header

+container

they did it in style

+

a header

a line of text and an

{
 	indented: "block",
@@ -845,9 +845,9 @@
 }

walk into a bar.

-
 - - +
 + + - + \ No newline at end of file diff --git a/e2etests/testdata/stable/md_2space_newline/dagre/board.exp.json b/e2etests/testdata/stable/md_2space_newline/dagre/board.exp.json index 3d12b47d6..dd8959eb9 100644 --- a/e2etests/testdata/stable/md_2space_newline/dagre/board.exp.json +++ b/e2etests/testdata/stable/md_2space_newline/dagre/board.exp.json @@ -7,11 +7,11 @@ "id": "markdown", "type": "rectangle", "pos": { - "x": 0, - "y": 41 + "x": 10, + "y": 20 }, - "width": 539, - "height": 107, + "width": 519, + "height": 108, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -49,7 +49,7 @@ "type": "text", "pos": { "x": 40, - "y": 70 + "y": 50 }, "width": 459, "height": 48, diff --git a/e2etests/testdata/stable/md_2space_newline/dagre/sketch.exp.svg b/e2etests/testdata/stable/md_2space_newline/dagre/sketch.exp.svg index aedffcf7f..e40b1fcb7 100644 --- a/e2etests/testdata/stable/md_2space_newline/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/md_2space_newline/dagre/sketch.exp.svg @@ -1,13 +1,13 @@ -markdown

Lorem ipsum dolor sit amet, consectetur adipiscing elit,
+markdown

Lorem ipsum dolor sit amet, consectetur adipiscing elit,
sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.

-
- - - +
 + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/md_backslash_newline/dagre/board.exp.json b/e2etests/testdata/stable/md_backslash_newline/dagre/board.exp.json index 05dd96fcf..7a28b31e8 100644 --- a/e2etests/testdata/stable/md_backslash_newline/dagre/board.exp.json +++ b/e2etests/testdata/stable/md_backslash_newline/dagre/board.exp.json @@ -7,11 +7,11 @@ "id": "markdown", "type": "rectangle", "pos": { - "x": 0, - "y": 41 + "x": 10, + "y": 20 }, - "width": 539, - "height": 107, + "width": 519, + "height": 108, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -49,7 +49,7 @@ "type": "text", "pos": { "x": 40, - "y": 70 + "y": 50 }, "width": 459, "height": 48, diff --git a/e2etests/testdata/stable/md_backslash_newline/dagre/sketch.exp.svg b/e2etests/testdata/stable/md_backslash_newline/dagre/sketch.exp.svg index ba9d0deb7..275d48d8d 100644 --- a/e2etests/testdata/stable/md_backslash_newline/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/md_backslash_newline/dagre/sketch.exp.svg @@ -1,13 +1,13 @@ -markdown

Lorem ipsum dolor sit amet, consectetur adipiscing elit,
+markdown

Lorem ipsum dolor sit amet, consectetur adipiscing elit,
sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.

-
- - - +
 + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/mono-font/dagre/board.exp.json b/e2etests/testdata/stable/mono-font/dagre/board.exp.json index b7ee63c1d..35ed1a099 100644 --- a/e2etests/testdata/stable/mono-font/dagre/board.exp.json +++ b/e2etests/testdata/stable/mono-font/dagre/board.exp.json @@ -7,8 +7,8 @@ "id": "satellites", "type": "stored_data", "pos": { - "x": 22, - "y": 10 + "x": 27, + "y": 0 }, "width": 161, "height": 66, @@ -49,7 +49,7 @@ "type": "rectangle", "pos": { "x": 32, - "y": 197 + "y": 187 }, "width": 151, "height": 66, @@ -112,20 +112,20 @@ "labelPercentage": 0, "route": [ { - "x": 77, - "y": 76 - }, - { - "x": 38.5989990234375, - "y": 124.4000015258789 + "x": 79, + "y": 66 }, { "x": 39, - "y": 148.6999969482422 + "y": 114.4000015258789 + }, + { + "x": 39, + "y": 138.6999969482422 }, { "x": 79, - "y": 197.5 + "y": 187.5 } ], "isCurve": true, @@ -160,19 +160,19 @@ "route": [ { "x": 107, - "y": 76 + "y": 66 }, { "x": 107, - "y": 124.4000015258789 + "y": 114.4000015258789 }, { "x": 107, - "y": 148.6999969482422 + "y": 138.6999969482422 }, { "x": 107, - "y": 197.5 + "y": 187.5 } ], "isCurve": true, @@ -206,20 +206,20 @@ "labelPercentage": 0, "route": [ { - "x": 137, - "y": 76 - }, - { - "x": 175.39999389648438, - "y": 124.4000015258789 + "x": 135, + "y": 66 }, { "x": 175, - "y": 148.6999969482422 + "y": 114.4000015258789 + }, + { + "x": 175, + "y": 138.6999969482422 }, { "x": 135, - "y": 197.5 + "y": 187.5 } ], "isCurve": true, diff --git a/e2etests/testdata/stable/mono-font/dagre/sketch.exp.svg b/e2etests/testdata/stable/mono-font/dagre/sketch.exp.svg index 588fe473d..f15f4a05f 100644 --- a/e2etests/testdata/stable/mono-font/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/mono-font/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -SATELLITESTRANSMITTER SENDSENDSEND - - - - - - + .d2-1710037582 .fill-N1{fill:#0A0F25;} + .d2-1710037582 .fill-N2{fill:#676C7E;} + .d2-1710037582 .fill-N3{fill:#9499AB;} + .d2-1710037582 .fill-N4{fill:#CFD2DD;} + .d2-1710037582 .fill-N5{fill:#DEE1EB;} + .d2-1710037582 .fill-N6{fill:#EEF1F8;} + .d2-1710037582 .fill-N7{fill:#FFFFFF;} + .d2-1710037582 .fill-B1{fill:#0D32B2;} + .d2-1710037582 .fill-B2{fill:#0D32B2;} + .d2-1710037582 .fill-B3{fill:#E3E9FD;} + .d2-1710037582 .fill-B4{fill:#E3E9FD;} + .d2-1710037582 .fill-B5{fill:#EDF0FD;} + .d2-1710037582 .fill-B6{fill:#F7F8FE;} + .d2-1710037582 .fill-AA2{fill:#4A6FF3;} + .d2-1710037582 .fill-AA4{fill:#EDF0FD;} + .d2-1710037582 .fill-AA5{fill:#F7F8FE;} + .d2-1710037582 .fill-AB4{fill:#EDF0FD;} + .d2-1710037582 .fill-AB5{fill:#F7F8FE;} + .d2-1710037582 .stroke-N1{stroke:#0A0F25;} + .d2-1710037582 .stroke-N2{stroke:#676C7E;} + .d2-1710037582 .stroke-N3{stroke:#9499AB;} + .d2-1710037582 .stroke-N4{stroke:#CFD2DD;} + .d2-1710037582 .stroke-N5{stroke:#DEE1EB;} + .d2-1710037582 .stroke-N6{stroke:#EEF1F8;} + .d2-1710037582 .stroke-N7{stroke:#FFFFFF;} + .d2-1710037582 .stroke-B1{stroke:#0D32B2;} + .d2-1710037582 .stroke-B2{stroke:#0D32B2;} + .d2-1710037582 .stroke-B3{stroke:#E3E9FD;} + .d2-1710037582 .stroke-B4{stroke:#E3E9FD;} + .d2-1710037582 .stroke-B5{stroke:#EDF0FD;} + .d2-1710037582 .stroke-B6{stroke:#F7F8FE;} + .d2-1710037582 .stroke-AA2{stroke:#4A6FF3;} + .d2-1710037582 .stroke-AA4{stroke:#EDF0FD;} + .d2-1710037582 .stroke-AA5{stroke:#F7F8FE;} + .d2-1710037582 .stroke-AB4{stroke:#EDF0FD;} + .d2-1710037582 .stroke-AB5{stroke:#F7F8FE;} + .d2-1710037582 .background-color-N1{background-color:#0A0F25;} + .d2-1710037582 .background-color-N2{background-color:#676C7E;} + .d2-1710037582 .background-color-N3{background-color:#9499AB;} + .d2-1710037582 .background-color-N4{background-color:#CFD2DD;} + .d2-1710037582 .background-color-N5{background-color:#DEE1EB;} + .d2-1710037582 .background-color-N6{background-color:#EEF1F8;} + .d2-1710037582 .background-color-N7{background-color:#FFFFFF;} + .d2-1710037582 .background-color-B1{background-color:#0D32B2;} + .d2-1710037582 .background-color-B2{background-color:#0D32B2;} + .d2-1710037582 .background-color-B3{background-color:#E3E9FD;} + .d2-1710037582 .background-color-B4{background-color:#E3E9FD;} + .d2-1710037582 .background-color-B5{background-color:#EDF0FD;} + .d2-1710037582 .background-color-B6{background-color:#F7F8FE;} + .d2-1710037582 .background-color-AA2{background-color:#4A6FF3;} + .d2-1710037582 .background-color-AA4{background-color:#EDF0FD;} + .d2-1710037582 .background-color-AA5{background-color:#F7F8FE;} + .d2-1710037582 .background-color-AB4{background-color:#EDF0FD;} + .d2-1710037582 .background-color-AB5{background-color:#F7F8FE;} + .d2-1710037582 .color-N1{color:#0A0F25;} + .d2-1710037582 .color-N2{color:#676C7E;} + .d2-1710037582 .color-N3{color:#9499AB;} + .d2-1710037582 .color-N4{color:#CFD2DD;} + .d2-1710037582 .color-N5{color:#DEE1EB;} + .d2-1710037582 .color-N6{color:#EEF1F8;} + .d2-1710037582 .color-N7{color:#FFFFFF;} + .d2-1710037582 .color-B1{color:#0D32B2;} + .d2-1710037582 .color-B2{color:#0D32B2;} + .d2-1710037582 .color-B3{color:#E3E9FD;} + .d2-1710037582 .color-B4{color:#E3E9FD;} + .d2-1710037582 .color-B5{color:#EDF0FD;} + .d2-1710037582 .color-B6{color:#F7F8FE;} + .d2-1710037582 .color-AA2{color:#4A6FF3;} + .d2-1710037582 .color-AA4{color:#EDF0FD;} + .d2-1710037582 .color-AA5{color:#F7F8FE;} + .d2-1710037582 .color-AB4{color:#EDF0FD;} + .d2-1710037582 .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}]]>SATELLITESTRANSMITTER SENDSENDSEND + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/mono-font/elk/board.exp.json b/e2etests/testdata/stable/mono-font/elk/board.exp.json index 80cca418e..9609194e3 100644 --- a/e2etests/testdata/stable/mono-font/elk/board.exp.json +++ b/e2etests/testdata/stable/mono-font/elk/board.exp.json @@ -154,7 +154,7 @@ "y": 88 }, { - "x": 97.5, + "x": 98, "y": 269 } ], diff --git a/e2etests/testdata/stable/mono-font/elk/sketch.exp.svg b/e2etests/testdata/stable/mono-font/elk/sketch.exp.svg index 6db3a94cd..657a4943d 100644 --- a/e2etests/testdata/stable/mono-font/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/mono-font/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -SATELLITESTRANSMITTER SENDSENDSEND + .d2-1743257672 .fill-N1{fill:#0A0F25;} + .d2-1743257672 .fill-N2{fill:#676C7E;} + .d2-1743257672 .fill-N3{fill:#9499AB;} + .d2-1743257672 .fill-N4{fill:#CFD2DD;} + .d2-1743257672 .fill-N5{fill:#DEE1EB;} + .d2-1743257672 .fill-N6{fill:#EEF1F8;} + .d2-1743257672 .fill-N7{fill:#FFFFFF;} + .d2-1743257672 .fill-B1{fill:#0D32B2;} + .d2-1743257672 .fill-B2{fill:#0D32B2;} + .d2-1743257672 .fill-B3{fill:#E3E9FD;} + .d2-1743257672 .fill-B4{fill:#E3E9FD;} + .d2-1743257672 .fill-B5{fill:#EDF0FD;} + .d2-1743257672 .fill-B6{fill:#F7F8FE;} + .d2-1743257672 .fill-AA2{fill:#4A6FF3;} + .d2-1743257672 .fill-AA4{fill:#EDF0FD;} + .d2-1743257672 .fill-AA5{fill:#F7F8FE;} + .d2-1743257672 .fill-AB4{fill:#EDF0FD;} + .d2-1743257672 .fill-AB5{fill:#F7F8FE;} + .d2-1743257672 .stroke-N1{stroke:#0A0F25;} + .d2-1743257672 .stroke-N2{stroke:#676C7E;} + .d2-1743257672 .stroke-N3{stroke:#9499AB;} + .d2-1743257672 .stroke-N4{stroke:#CFD2DD;} + .d2-1743257672 .stroke-N5{stroke:#DEE1EB;} + .d2-1743257672 .stroke-N6{stroke:#EEF1F8;} + .d2-1743257672 .stroke-N7{stroke:#FFFFFF;} + .d2-1743257672 .stroke-B1{stroke:#0D32B2;} + .d2-1743257672 .stroke-B2{stroke:#0D32B2;} + .d2-1743257672 .stroke-B3{stroke:#E3E9FD;} + .d2-1743257672 .stroke-B4{stroke:#E3E9FD;} + .d2-1743257672 .stroke-B5{stroke:#EDF0FD;} + .d2-1743257672 .stroke-B6{stroke:#F7F8FE;} + .d2-1743257672 .stroke-AA2{stroke:#4A6FF3;} + .d2-1743257672 .stroke-AA4{stroke:#EDF0FD;} + .d2-1743257672 .stroke-AA5{stroke:#F7F8FE;} + .d2-1743257672 .stroke-AB4{stroke:#EDF0FD;} + .d2-1743257672 .stroke-AB5{stroke:#F7F8FE;} + .d2-1743257672 .background-color-N1{background-color:#0A0F25;} + .d2-1743257672 .background-color-N2{background-color:#676C7E;} + .d2-1743257672 .background-color-N3{background-color:#9499AB;} + .d2-1743257672 .background-color-N4{background-color:#CFD2DD;} + .d2-1743257672 .background-color-N5{background-color:#DEE1EB;} + .d2-1743257672 .background-color-N6{background-color:#EEF1F8;} + .d2-1743257672 .background-color-N7{background-color:#FFFFFF;} + .d2-1743257672 .background-color-B1{background-color:#0D32B2;} + .d2-1743257672 .background-color-B2{background-color:#0D32B2;} + .d2-1743257672 .background-color-B3{background-color:#E3E9FD;} + .d2-1743257672 .background-color-B4{background-color:#E3E9FD;} + .d2-1743257672 .background-color-B5{background-color:#EDF0FD;} + .d2-1743257672 .background-color-B6{background-color:#F7F8FE;} + .d2-1743257672 .background-color-AA2{background-color:#4A6FF3;} + .d2-1743257672 .background-color-AA4{background-color:#EDF0FD;} + .d2-1743257672 .background-color-AA5{background-color:#F7F8FE;} + .d2-1743257672 .background-color-AB4{background-color:#EDF0FD;} + .d2-1743257672 .background-color-AB5{background-color:#F7F8FE;} + .d2-1743257672 .color-N1{color:#0A0F25;} + .d2-1743257672 .color-N2{color:#676C7E;} + .d2-1743257672 .color-N3{color:#9499AB;} + .d2-1743257672 .color-N4{color:#CFD2DD;} + .d2-1743257672 .color-N5{color:#DEE1EB;} + .d2-1743257672 .color-N6{color:#EEF1F8;} + .d2-1743257672 .color-N7{color:#FFFFFF;} + .d2-1743257672 .color-B1{color:#0D32B2;} + .d2-1743257672 .color-B2{color:#0D32B2;} + .d2-1743257672 .color-B3{color:#E3E9FD;} + .d2-1743257672 .color-B4{color:#E3E9FD;} + .d2-1743257672 .color-B5{color:#EDF0FD;} + .d2-1743257672 .color-B6{color:#F7F8FE;} + .d2-1743257672 .color-AA2{color:#4A6FF3;} + .d2-1743257672 .color-AA4{color:#EDF0FD;} + .d2-1743257672 .color-AA5{color:#F7F8FE;} + .d2-1743257672 .color-AB4{color:#EDF0FD;} + .d2-1743257672 .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}]]>SATELLITESTRANSMITTER SENDSENDSEND - + \ No newline at end of file diff --git a/e2etests/testdata/stable/multiple_box_selection/dagre/board.exp.json b/e2etests/testdata/stable/multiple_box_selection/dagre/board.exp.json index defb282e2..65b1e9991 100644 --- a/e2etests/testdata/stable/multiple_box_selection/dagre/board.exp.json +++ b/e2etests/testdata/stable/multiple_box_selection/dagre/board.exp.json @@ -8,10 +8,10 @@ "type": "rectangle", "pos": { "x": 0, - "y": 207 + "y": 179 }, - "width": 268, - "height": 335, + "width": 278, + "height": 293, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -49,10 +49,10 @@ "type": "rectangle", "pos": { "x": 20, - "y": 272 + "y": 220 }, - "width": 228, - "height": 240, + "width": 238, + "height": 222, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -89,11 +89,11 @@ "id": "outer.vg.vd", "type": "rectangle", "pos": { - "x": 40, - "y": 345 + "x": 50, + "y": 276 }, - "width": 188, - "height": 145, + "width": 168, + "height": 136, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -131,7 +131,7 @@ "type": "rectangle", "pos": { "x": 80, - "y": 390 + "y": 316 }, "width": 98, "height": 66, @@ -171,7 +171,7 @@ "id": "start", "type": "rectangle", "pos": { - "x": 94, + "x": 89, "y": 0 }, "width": 80, @@ -212,8 +212,8 @@ "id": "end", "type": "rectangle", "pos": { - "x": 98, - "y": 642 + "x": 93, + "y": 632 }, "width": 72, "height": 66, @@ -276,44 +276,44 @@ "labelPercentage": 0, "route": [ { - "x": 134, + "x": 129, "y": 66 }, { - "x": 134, + "x": 129, "y": 106 }, { - "x": 134, + "x": 129, "y": 126 }, { - "x": 134, + "x": 129, "y": 141 }, { - "x": 134, + "x": 129, "y": 156 }, { - "x": 134, + "x": 129, "y": 176 }, { - "x": 134, + "x": 129, "y": 191 }, { - "x": 134, + "x": 129, "y": 206 }, { - "x": 134, - "y": 288.79998779296875 + "x": 129, + "y": 274 }, { - "x": 134, - "y": 380 + "x": 129, + "y": 306 } ], "isCurve": true, @@ -347,32 +347,44 @@ "labelPercentage": 0, "route": [ { - "x": 134, - "y": 456 + "x": 129, + "y": 382 }, { - "x": 134, - "y": 484.79998779296875 + "x": 129, + "y": 422 }, { - "x": 134, - "y": 502 + "x": 129, + "y": 442 }, { - "x": 134, - "y": 517 + "x": 129, + "y": 457 }, { - "x": 134, - "y": 532 + "x": 129, + "y": 472 }, { - "x": 134, - "y": 602 + "x": 129, + "y": 492 }, { - "x": 134, - "y": 642 + "x": 129, + "y": 507 + }, + { + "x": 129, + "y": 522 + }, + { + "x": 129, + "y": 592 + }, + { + "x": 129, + "y": 632 } ], "isCurve": true, diff --git a/e2etests/testdata/stable/multiple_box_selection/dagre/sketch.exp.svg b/e2etests/testdata/stable/multiple_box_selection/dagre/sketch.exp.svg index 39caa9bc5..434abd7f7 100644 --- a/e2etests/testdata/stable/multiple_box_selection/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/multiple_box_selection/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -outerstartendvolume groupvolume definitionvolume - - - - - - - + .d2-4203159145 .fill-N1{fill:#0A0F25;} + .d2-4203159145 .fill-N2{fill:#676C7E;} + .d2-4203159145 .fill-N3{fill:#9499AB;} + .d2-4203159145 .fill-N4{fill:#CFD2DD;} + .d2-4203159145 .fill-N5{fill:#DEE1EB;} + .d2-4203159145 .fill-N6{fill:#EEF1F8;} + .d2-4203159145 .fill-N7{fill:#FFFFFF;} + .d2-4203159145 .fill-B1{fill:#0D32B2;} + .d2-4203159145 .fill-B2{fill:#0D32B2;} + .d2-4203159145 .fill-B3{fill:#E3E9FD;} + .d2-4203159145 .fill-B4{fill:#E3E9FD;} + .d2-4203159145 .fill-B5{fill:#EDF0FD;} + .d2-4203159145 .fill-B6{fill:#F7F8FE;} + .d2-4203159145 .fill-AA2{fill:#4A6FF3;} + .d2-4203159145 .fill-AA4{fill:#EDF0FD;} + .d2-4203159145 .fill-AA5{fill:#F7F8FE;} + .d2-4203159145 .fill-AB4{fill:#EDF0FD;} + .d2-4203159145 .fill-AB5{fill:#F7F8FE;} + .d2-4203159145 .stroke-N1{stroke:#0A0F25;} + .d2-4203159145 .stroke-N2{stroke:#676C7E;} + .d2-4203159145 .stroke-N3{stroke:#9499AB;} + .d2-4203159145 .stroke-N4{stroke:#CFD2DD;} + .d2-4203159145 .stroke-N5{stroke:#DEE1EB;} + .d2-4203159145 .stroke-N6{stroke:#EEF1F8;} + .d2-4203159145 .stroke-N7{stroke:#FFFFFF;} + .d2-4203159145 .stroke-B1{stroke:#0D32B2;} + .d2-4203159145 .stroke-B2{stroke:#0D32B2;} + .d2-4203159145 .stroke-B3{stroke:#E3E9FD;} + .d2-4203159145 .stroke-B4{stroke:#E3E9FD;} + .d2-4203159145 .stroke-B5{stroke:#EDF0FD;} + .d2-4203159145 .stroke-B6{stroke:#F7F8FE;} + .d2-4203159145 .stroke-AA2{stroke:#4A6FF3;} + .d2-4203159145 .stroke-AA4{stroke:#EDF0FD;} + .d2-4203159145 .stroke-AA5{stroke:#F7F8FE;} + .d2-4203159145 .stroke-AB4{stroke:#EDF0FD;} + .d2-4203159145 .stroke-AB5{stroke:#F7F8FE;} + .d2-4203159145 .background-color-N1{background-color:#0A0F25;} + .d2-4203159145 .background-color-N2{background-color:#676C7E;} + .d2-4203159145 .background-color-N3{background-color:#9499AB;} + .d2-4203159145 .background-color-N4{background-color:#CFD2DD;} + .d2-4203159145 .background-color-N5{background-color:#DEE1EB;} + .d2-4203159145 .background-color-N6{background-color:#EEF1F8;} + .d2-4203159145 .background-color-N7{background-color:#FFFFFF;} + .d2-4203159145 .background-color-B1{background-color:#0D32B2;} + .d2-4203159145 .background-color-B2{background-color:#0D32B2;} + .d2-4203159145 .background-color-B3{background-color:#E3E9FD;} + .d2-4203159145 .background-color-B4{background-color:#E3E9FD;} + .d2-4203159145 .background-color-B5{background-color:#EDF0FD;} + .d2-4203159145 .background-color-B6{background-color:#F7F8FE;} + .d2-4203159145 .background-color-AA2{background-color:#4A6FF3;} + .d2-4203159145 .background-color-AA4{background-color:#EDF0FD;} + .d2-4203159145 .background-color-AA5{background-color:#F7F8FE;} + .d2-4203159145 .background-color-AB4{background-color:#EDF0FD;} + .d2-4203159145 .background-color-AB5{background-color:#F7F8FE;} + .d2-4203159145 .color-N1{color:#0A0F25;} + .d2-4203159145 .color-N2{color:#676C7E;} + .d2-4203159145 .color-N3{color:#9499AB;} + .d2-4203159145 .color-N4{color:#CFD2DD;} + .d2-4203159145 .color-N5{color:#DEE1EB;} + .d2-4203159145 .color-N6{color:#EEF1F8;} + .d2-4203159145 .color-N7{color:#FFFFFF;} + .d2-4203159145 .color-B1{color:#0D32B2;} + .d2-4203159145 .color-B2{color:#0D32B2;} + .d2-4203159145 .color-B3{color:#E3E9FD;} + .d2-4203159145 .color-B4{color:#E3E9FD;} + .d2-4203159145 .color-B5{color:#EDF0FD;} + .d2-4203159145 .color-B6{color:#F7F8FE;} + .d2-4203159145 .color-AA2{color:#4A6FF3;} + .d2-4203159145 .color-AA4{color:#EDF0FD;} + .d2-4203159145 .color-AA5{color:#F7F8FE;} + .d2-4203159145 .color-AB4{color:#EDF0FD;} + .d2-4203159145 .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}]]>outerstartendvolume groupvolume definitionvolume + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/multiple_offset/dagre/board.exp.json b/e2etests/testdata/stable/multiple_offset/dagre/board.exp.json index 3af11b9ef..33fe35aad 100644 --- a/e2etests/testdata/stable/multiple_offset/dagre/board.exp.json +++ b/e2etests/testdata/stable/multiple_offset/dagre/board.exp.json @@ -7,11 +7,11 @@ "id": "n1", "type": "rectangle", "pos": { - "x": 0, - "y": 41 + "x": 10, + "y": 20 }, - "width": 143, - "height": 321, + "width": 123, + "height": 292, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -48,8 +48,8 @@ "id": "n1.a", "type": "rectangle", "pos": { - "x": 45, - "y": 78 + "x": 40, + "y": 50 }, "width": 53, "height": 66, @@ -90,7 +90,7 @@ "type": "rectangle", "pos": { "x": 40, - "y": 264 + "y": 216 }, "width": 53, "height": 66, @@ -130,11 +130,11 @@ "id": "n2", "type": "rectangle", "pos": { - "x": 163, - "y": 41 + "x": 173, + "y": 20 }, - "width": 148, - "height": 321, + "width": 128, + "height": 292, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -171,8 +171,8 @@ "id": "n2.a", "type": "rectangle", "pos": { - "x": 211, - "y": 78 + "x": 203, + "y": 50 }, "width": 53, "height": 66, @@ -213,7 +213,7 @@ "type": "rectangle", "pos": { "x": 203, - "y": 266 + "y": 216 }, "width": 53, "height": 66, @@ -253,11 +253,11 @@ "id": "n3", "type": "rectangle", "pos": { - "x": 331, - "y": 51 + "x": 341, + "y": 20 }, - "width": 143, - "height": 321, + "width": 123, + "height": 292, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -294,8 +294,8 @@ "id": "n3.a", "type": "rectangle", "pos": { - "x": 376, - "y": 88 + "x": 371, + "y": 50 }, "width": 53, "height": 66, @@ -336,7 +336,7 @@ "type": "rectangle", "pos": { "x": 371, - "y": 274 + "y": 216 }, "width": 53, "height": 66, @@ -376,11 +376,11 @@ "id": "n4", "type": "rectangle", "pos": { - "x": 494, - "y": 56 + "x": 514, + "y": 20 }, - "width": 148, - "height": 321, + "width": 128, + "height": 292, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -417,8 +417,8 @@ "id": "n4.a", "type": "rectangle", "pos": { - "x": 542, - "y": 93 + "x": 544, + "y": 50 }, "width": 53, "height": 66, @@ -458,8 +458,8 @@ "id": "n4.b", "type": "rectangle", "pos": { - "x": 534, - "y": 281 + "x": 544, + "y": 216 }, "width": 53, "height": 66, @@ -499,11 +499,11 @@ "id": "n5", "type": "rectangle", "pos": { - "x": 662, - "y": 51 + "x": 687, + "y": 20 }, - "width": 133, - "height": 321, + "width": 113, + "height": 292, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -540,8 +540,8 @@ "id": "n5.a", "type": "rectangle", "pos": { - "x": 702, - "y": 88 + "x": 717, + "y": 50 }, "width": 53, "height": 66, @@ -581,8 +581,8 @@ "id": "n5.b", "type": "rectangle", "pos": { - "x": 702, - "y": 269 + "x": 717, + "y": 216 }, "width": 53, "height": 66, @@ -622,11 +622,11 @@ "id": "n6", "type": "rectangle", "pos": { - "x": 815, - "y": 56 + "x": 845, + "y": 20 }, - "width": 133, - "height": 321, + "width": 113, + "height": 292, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -663,8 +663,8 @@ "id": "n6.a", "type": "rectangle", "pos": { - "x": 855, - "y": 93 + "x": 875, + "y": 50 }, "width": 53, "height": 66, @@ -704,8 +704,8 @@ "id": "n6.b", "type": "rectangle", "pos": { - "x": 855, - "y": 274 + "x": 875, + "y": 216 }, "width": 53, "height": 66, @@ -745,11 +745,11 @@ "id": "n7", "type": "rectangle", "pos": { - "x": 968, - "y": 51 + "x": 1008, + "y": 10 }, - "width": 143, - "height": 321, + "width": 123, + "height": 302, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -786,8 +786,8 @@ "id": "n7.a", "type": "rectangle", "pos": { - "x": 1008, - "y": 93 + "x": 1038, + "y": 50 }, "width": 53, "height": 66, @@ -827,8 +827,8 @@ "id": "n7.b", "type": "rectangle", "pos": { - "x": 1013, - "y": 269 + "x": 1038, + "y": 216 }, "width": 53, "height": 66, @@ -868,11 +868,11 @@ "id": "n8", "type": "rectangle", "pos": { - "x": 1131, - "y": 56 + "x": 1171, + "y": 5 }, - "width": 148, - "height": 321, + "width": 128, + "height": 307, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -909,8 +909,8 @@ "id": "n8.a", "type": "rectangle", "pos": { - "x": 1171, - "y": 100 + "x": 1201, + "y": 50 }, "width": 53, "height": 66, @@ -950,8 +950,8 @@ "id": "n8.b", "type": "rectangle", "pos": { - "x": 1179, - "y": 274 + "x": 1201, + "y": 216 }, "width": 53, "height": 66, @@ -991,11 +991,11 @@ "id": "n9", "type": "rectangle", "pos": { - "x": 1299, - "y": 51 + "x": 1354, + "y": 10 }, - "width": 143, - "height": 321, + "width": 123, + "height": 302, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1032,8 +1032,8 @@ "id": "n9.a", "type": "rectangle", "pos": { - "x": 1339, - "y": 93 + "x": 1384, + "y": 50 }, "width": 53, "height": 66, @@ -1073,8 +1073,8 @@ "id": "n9.b", "type": "rectangle", "pos": { - "x": 1339, - "y": 274 + "x": 1384, + "y": 216 }, "width": 53, "height": 66, @@ -1114,11 +1114,11 @@ "id": "n10", "type": "rectangle", "pos": { - "x": 1462, - "y": 56 + "x": 1527, + "y": 5 }, - "width": 148, - "height": 321, + "width": 128, + "height": 307, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1155,8 +1155,8 @@ "id": "n10.a", "type": "rectangle", "pos": { - "x": 1502, - "y": 100 + "x": 1557, + "y": 50 }, "width": 53, "height": 66, @@ -1196,8 +1196,8 @@ "id": "n10.b", "type": "rectangle", "pos": { - "x": 1502, - "y": 281 + "x": 1557, + "y": 216 }, "width": 53, "height": 66, @@ -1260,20 +1260,20 @@ "labelPercentage": 0, "route": [ { - "x": 71.5, - "y": 145 + "x": 66.5, + "y": 116 }, { - "x": 71.5, - "y": 190.1999969482422 + "x": 66.5, + "y": 156 }, { - "x": 71.5, - "y": 212 + "x": 66.5, + "y": 174 }, { - "x": 71.5, - "y": 254 + "x": 66.5, + "y": 206 } ], "isCurve": true, @@ -1307,20 +1307,20 @@ "labelPercentage": 0, "route": [ { - "x": 237, - "y": 145 + "x": 229.5, + "y": 116 }, { - "x": 237, - "y": 190.1999969482422 + "x": 229.5, + "y": 156 }, { - "x": 237, - "y": 211.5 + "x": 229.5, + "y": 173 }, { - "x": 237, - "y": 251.5 + "x": 229.5, + "y": 201 } ], "isCurve": true, @@ -1354,20 +1354,20 @@ "labelPercentage": 0, "route": [ { - "x": 402.5, - "y": 155 + "x": 397.5, + "y": 116 }, { - "x": 402.5, - "y": 200.1999969482422 + "x": 397.5, + "y": 156 }, { - "x": 402.5, - "y": 222 + "x": 397.5, + "y": 174 }, { - "x": 402.5, - "y": 264 + "x": 397.5, + "y": 206 } ], "isCurve": true, @@ -1401,20 +1401,20 @@ "labelPercentage": 0, "route": [ { - "x": 568, - "y": 160 + "x": 570.5, + "y": 116 }, { - "x": 568, - "y": 205.1999969482422 + "x": 570.5, + "y": 156 }, { - "x": 568, - "y": 226.5 + "x": 570.5, + "y": 173 }, { - "x": 568, - "y": 266.5 + "x": 570.5, + "y": 201 } ], "isCurve": true, @@ -1448,20 +1448,20 @@ "labelPercentage": 0, "route": [ { - "x": 728.5, - "y": 155 + "x": 743.5, + "y": 116 }, { - "x": 728.5, - "y": 200.1999969482422 + "x": 743.5, + "y": 156 }, { - "x": 728.5, - "y": 223 + "x": 743.5, + "y": 176 }, { - "x": 728.5, - "y": 269 + "x": 743.5, + "y": 216 } ], "isCurve": true, @@ -1495,20 +1495,20 @@ "labelPercentage": 0, "route": [ { - "x": 881.5, - "y": 160 + "x": 901.5, + "y": 116 }, { - "x": 881.5, - "y": 205.1999969482422 + "x": 901.5, + "y": 156 }, { - "x": 881.5, - "y": 228 + "x": 901.5, + "y": 176 }, { - "x": 881.5, - "y": 274 + "x": 901.5, + "y": 216 } ], "isCurve": true, @@ -1542,20 +1542,20 @@ "labelPercentage": 0, "route": [ { - "x": 1039.5, - "y": 160 + "x": 1064.5, + "y": 116 }, { - "x": 1039.5, - "y": 201.1999969482422 + "x": 1064.5, + "y": 156 }, { - "x": 1039.5, - "y": 223 + "x": 1064.5, + "y": 176 }, { - "x": 1039.5, - "y": 269 + "x": 1064.5, + "y": 216 } ], "isCurve": true, @@ -1589,20 +1589,20 @@ "labelPercentage": 0, "route": [ { - "x": 1205, - "y": 166.5 + "x": 1227.5, + "y": 116 }, { - "x": 1205, - "y": 206.5 + "x": 1227.5, + "y": 156 }, { - "x": 1205, - "y": 228 + "x": 1227.5, + "y": 176 }, { - "x": 1205, - "y": 274 + "x": 1227.5, + "y": 216 } ], "isCurve": true, @@ -1636,20 +1636,20 @@ "labelPercentage": 0, "route": [ { - "x": 1370.5, - "y": 160 + "x": 1410.5, + "y": 116 }, { - "x": 1370.5, - "y": 201.1999969482422 + "x": 1410.5, + "y": 156 }, { - "x": 1370.5, - "y": 222 + "x": 1410.5, + "y": 174 }, { - "x": 1370.5, - "y": 264 + "x": 1410.5, + "y": 206 } ], "isCurve": true, @@ -1683,20 +1683,20 @@ "labelPercentage": 0, "route": [ { - "x": 1536, - "y": 166.5 + "x": 1583.5, + "y": 116 }, { - "x": 1536, - "y": 206.5 + "x": 1583.5, + "y": 156 }, { - "x": 1536, - "y": 226.5 + "x": 1583.5, + "y": 173 }, { - "x": 1536, - "y": 266.5 + "x": 1583.5, + "y": 201 } ], "isCurve": true, diff --git a/e2etests/testdata/stable/multiple_offset/dagre/sketch.exp.svg b/e2etests/testdata/stable/multiple_offset/dagre/sketch.exp.svg index 3eb8f462a..2ba028525 100644 --- a/e2etests/testdata/stable/multiple_offset/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/multiple_offset/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -n1n2n3 - -n4n5 - -n6n7 - -n8n9 - -n10aba - -baba - -bababab - -abab - -a - -b - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + .d2-1828306763 .fill-N1{fill:#0A0F25;} + .d2-1828306763 .fill-N2{fill:#676C7E;} + .d2-1828306763 .fill-N3{fill:#9499AB;} + .d2-1828306763 .fill-N4{fill:#CFD2DD;} + .d2-1828306763 .fill-N5{fill:#DEE1EB;} + .d2-1828306763 .fill-N6{fill:#EEF1F8;} + .d2-1828306763 .fill-N7{fill:#FFFFFF;} + .d2-1828306763 .fill-B1{fill:#0D32B2;} + .d2-1828306763 .fill-B2{fill:#0D32B2;} + .d2-1828306763 .fill-B3{fill:#E3E9FD;} + .d2-1828306763 .fill-B4{fill:#E3E9FD;} + .d2-1828306763 .fill-B5{fill:#EDF0FD;} + .d2-1828306763 .fill-B6{fill:#F7F8FE;} + .d2-1828306763 .fill-AA2{fill:#4A6FF3;} + .d2-1828306763 .fill-AA4{fill:#EDF0FD;} + .d2-1828306763 .fill-AA5{fill:#F7F8FE;} + .d2-1828306763 .fill-AB4{fill:#EDF0FD;} + .d2-1828306763 .fill-AB5{fill:#F7F8FE;} + .d2-1828306763 .stroke-N1{stroke:#0A0F25;} + .d2-1828306763 .stroke-N2{stroke:#676C7E;} + .d2-1828306763 .stroke-N3{stroke:#9499AB;} + .d2-1828306763 .stroke-N4{stroke:#CFD2DD;} + .d2-1828306763 .stroke-N5{stroke:#DEE1EB;} + .d2-1828306763 .stroke-N6{stroke:#EEF1F8;} + .d2-1828306763 .stroke-N7{stroke:#FFFFFF;} + .d2-1828306763 .stroke-B1{stroke:#0D32B2;} + .d2-1828306763 .stroke-B2{stroke:#0D32B2;} + .d2-1828306763 .stroke-B3{stroke:#E3E9FD;} + .d2-1828306763 .stroke-B4{stroke:#E3E9FD;} + .d2-1828306763 .stroke-B5{stroke:#EDF0FD;} + .d2-1828306763 .stroke-B6{stroke:#F7F8FE;} + .d2-1828306763 .stroke-AA2{stroke:#4A6FF3;} + .d2-1828306763 .stroke-AA4{stroke:#EDF0FD;} + .d2-1828306763 .stroke-AA5{stroke:#F7F8FE;} + .d2-1828306763 .stroke-AB4{stroke:#EDF0FD;} + .d2-1828306763 .stroke-AB5{stroke:#F7F8FE;} + .d2-1828306763 .background-color-N1{background-color:#0A0F25;} + .d2-1828306763 .background-color-N2{background-color:#676C7E;} + .d2-1828306763 .background-color-N3{background-color:#9499AB;} + .d2-1828306763 .background-color-N4{background-color:#CFD2DD;} + .d2-1828306763 .background-color-N5{background-color:#DEE1EB;} + .d2-1828306763 .background-color-N6{background-color:#EEF1F8;} + .d2-1828306763 .background-color-N7{background-color:#FFFFFF;} + .d2-1828306763 .background-color-B1{background-color:#0D32B2;} + .d2-1828306763 .background-color-B2{background-color:#0D32B2;} + .d2-1828306763 .background-color-B3{background-color:#E3E9FD;} + .d2-1828306763 .background-color-B4{background-color:#E3E9FD;} + .d2-1828306763 .background-color-B5{background-color:#EDF0FD;} + .d2-1828306763 .background-color-B6{background-color:#F7F8FE;} + .d2-1828306763 .background-color-AA2{background-color:#4A6FF3;} + .d2-1828306763 .background-color-AA4{background-color:#EDF0FD;} + .d2-1828306763 .background-color-AA5{background-color:#F7F8FE;} + .d2-1828306763 .background-color-AB4{background-color:#EDF0FD;} + .d2-1828306763 .background-color-AB5{background-color:#F7F8FE;} + .d2-1828306763 .color-N1{color:#0A0F25;} + .d2-1828306763 .color-N2{color:#676C7E;} + .d2-1828306763 .color-N3{color:#9499AB;} + .d2-1828306763 .color-N4{color:#CFD2DD;} + .d2-1828306763 .color-N5{color:#DEE1EB;} + .d2-1828306763 .color-N6{color:#EEF1F8;} + .d2-1828306763 .color-N7{color:#FFFFFF;} + .d2-1828306763 .color-B1{color:#0D32B2;} + .d2-1828306763 .color-B2{color:#0D32B2;} + .d2-1828306763 .color-B3{color:#E3E9FD;} + .d2-1828306763 .color-B4{color:#E3E9FD;} + .d2-1828306763 .color-B5{color:#EDF0FD;} + .d2-1828306763 .color-B6{color:#F7F8FE;} + .d2-1828306763 .color-AA2{color:#4A6FF3;} + .d2-1828306763 .color-AA4{color:#EDF0FD;} + .d2-1828306763 .color-AA5{color:#F7F8FE;} + .d2-1828306763 .color-AB4{color:#EDF0FD;} + .d2-1828306763 .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}]]>n1n2n3 + +n4n5 + +n6n7 + +n8n9 + +n10aba + +baba + +bababab + +abab + +a + +b + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/multiple_offset_left/dagre/board.exp.json b/e2etests/testdata/stable/multiple_offset_left/dagre/board.exp.json index a0bfacf2b..3d6c59d59 100644 --- a/e2etests/testdata/stable/multiple_offset_left/dagre/board.exp.json +++ b/e2etests/testdata/stable/multiple_offset_left/dagre/board.exp.json @@ -7,11 +7,11 @@ "id": "n1", "type": "rectangle", "pos": { - "x": 0, - "y": 41 + "x": 20, + "y": 56 }, - "width": 336, - "height": 95, + "width": 266, + "height": 136, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -48,8 +48,8 @@ "id": "n1.a", "type": "rectangle", "pos": { - "x": 226, - "y": 55 + "x": 203, + "y": 96 }, "width": 53, "height": 66, @@ -89,8 +89,8 @@ "id": "n1.b", "type": "rectangle", "pos": { - "x": 53, - "y": 60 + "x": 50, + "y": 96 }, "width": 53, "height": 66, @@ -130,11 +130,11 @@ "id": "n2", "type": "rectangle", "pos": { - "x": 0, - "y": 217 + "x": 20, + "y": 278 }, - "width": 336, - "height": 100, + "width": 266, + "height": 141, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -171,8 +171,8 @@ "id": "n2.a", "type": "rectangle", "pos": { - "x": 226, - "y": 234 + "x": 203, + "y": 323 }, "width": 53, "height": 66, @@ -213,7 +213,7 @@ "type": "rectangle", "pos": { "x": 50, - "y": 241 + "y": 323 }, "width": 53, "height": 66, @@ -253,11 +253,11 @@ "id": "n3", "type": "rectangle", "pos": { - "x": 0, - "y": 408 + "x": 20, + "y": 515 }, - "width": 336, - "height": 95, + "width": 266, + "height": 136, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -294,8 +294,8 @@ "id": "n3.a", "type": "rectangle", "pos": { - "x": 226, - "y": 422 + "x": 203, + "y": 555 }, "width": 53, "height": 66, @@ -335,8 +335,8 @@ "id": "n3.b", "type": "rectangle", "pos": { - "x": 53, - "y": 427 + "x": 50, + "y": 555 }, "width": 53, "height": 66, @@ -376,11 +376,11 @@ "id": "n4", "type": "rectangle", "pos": { - "x": 0, - "y": 589 + "x": 20, + "y": 752 }, - "width": 336, - "height": 100, + "width": 266, + "height": 141, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -417,8 +417,8 @@ "id": "n4.a", "type": "rectangle", "pos": { - "x": 226, - "y": 606 + "x": 203, + "y": 797 }, "width": 53, "height": 66, @@ -459,7 +459,7 @@ "type": "rectangle", "pos": { "x": 50, - "y": 613 + "y": 797 }, "width": 53, "height": 66, @@ -499,11 +499,11 @@ "id": "n5", "type": "rectangle", "pos": { - "x": 0, - "y": 765 + "x": 20, + "y": 989 }, - "width": 336, - "height": 85, + "width": 266, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -540,8 +540,8 @@ "id": "n5.a", "type": "rectangle", "pos": { - "x": 226, - "y": 774 + "x": 203, + "y": 1019 }, "width": 53, "height": 66, @@ -581,8 +581,8 @@ "id": "n5.b", "type": "rectangle", "pos": { - "x": 58, - "y": 774 + "x": 50, + "y": 1019 }, "width": 53, "height": 66, @@ -622,11 +622,11 @@ "id": "n6", "type": "rectangle", "pos": { - "x": 0, - "y": 936 + "x": 20, + "y": 1216 }, - "width": 336, - "height": 85, + "width": 266, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -663,8 +663,8 @@ "id": "n6.a", "type": "rectangle", "pos": { - "x": 226, - "y": 945 + "x": 203, + "y": 1246 }, "width": 53, "height": 66, @@ -704,8 +704,8 @@ "id": "n6.b", "type": "rectangle", "pos": { - "x": 58, - "y": 945 + "x": 50, + "y": 1246 }, "width": 53, "height": 66, @@ -745,11 +745,11 @@ "id": "n7", "type": "rectangle", "pos": { - "x": 0, - "y": 1097 + "x": 20, + "y": 1438 }, - "width": 336, - "height": 95, + "width": 276, + "height": 136, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -786,8 +786,8 @@ "id": "n7.a", "type": "rectangle", "pos": { - "x": 221, - "y": 1116 + "x": 203, + "y": 1478 }, "width": 53, "height": 66, @@ -827,8 +827,8 @@ "id": "n7.b", "type": "rectangle", "pos": { - "x": 58, - "y": 1111 + "x": 50, + "y": 1478 }, "width": 53, "height": 66, @@ -868,11 +868,11 @@ "id": "n8", "type": "rectangle", "pos": { - "x": 0, - "y": 1278 + "x": 20, + "y": 1675 }, - "width": 336, - "height": 100, + "width": 281, + "height": 141, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -909,8 +909,8 @@ "id": "n8.a", "type": "rectangle", "pos": { - "x": 218, - "y": 1302 + "x": 203, + "y": 1720 }, "width": 53, "height": 66, @@ -950,8 +950,8 @@ "id": "n8.b", "type": "rectangle", "pos": { - "x": 58, - "y": 1295 + "x": 50, + "y": 1720 }, "width": 53, "height": 66, @@ -991,11 +991,11 @@ "id": "n9", "type": "rectangle", "pos": { - "x": 0, - "y": 1454 + "x": 20, + "y": 1922 }, - "width": 336, - "height": 95, + "width": 276, + "height": 136, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1032,8 +1032,8 @@ "id": "n9.a", "type": "rectangle", "pos": { - "x": 221, - "y": 1473 + "x": 203, + "y": 1962 }, "width": 53, "height": 66, @@ -1073,8 +1073,8 @@ "id": "n9.b", "type": "rectangle", "pos": { - "x": 53, - "y": 1473 + "x": 50, + "y": 1962 }, "width": 53, "height": 66, @@ -1114,11 +1114,11 @@ "id": "n10", "type": "rectangle", "pos": { - "x": 0, - "y": 1635 + "x": 20, + "y": 2174 }, - "width": 336, - "height": 100, + "width": 281, + "height": 141, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1155,8 +1155,8 @@ "id": "n10.a", "type": "rectangle", "pos": { - "x": 218, - "y": 1659 + "x": 203, + "y": 2219 }, "width": 53, "height": 66, @@ -1197,7 +1197,7 @@ "type": "rectangle", "pos": { "x": 50, - "y": 1659 + "y": 2219 }, "width": 53, "height": 66, @@ -1260,20 +1260,20 @@ "labelPercentage": 0, "route": [ { - "x": 225.5, - "y": 88.5 + "x": 203, + "y": 129 }, { - "x": 179.5, - "y": 88.5 + "x": 163, + "y": 129 }, { - "x": 157.60000610351562, - "y": 88.5 + "x": 145, + "y": 129 }, { - "x": 116, - "y": 88.5 + "x": 113, + "y": 129 } ], "isCurve": true, @@ -1307,20 +1307,20 @@ "labelPercentage": 0, "route": [ { - "x": 225.5, - "y": 267 + "x": 203, + "y": 356 }, { - "x": 179.5, - "y": 267 + "x": 163, + "y": 356 }, { - "x": 158, - "y": 267 + "x": 146, + "y": 356 }, { "x": 118, - "y": 267 + "y": 356 } ], "isCurve": true, @@ -1354,20 +1354,20 @@ "labelPercentage": 0, "route": [ { - "x": 225.5, - "y": 455.5 + "x": 203, + "y": 588 }, { - "x": 179.5, - "y": 455.5 + "x": 163, + "y": 588 }, { - "x": 157.60000610351562, - "y": 455.5 + "x": 145, + "y": 588 }, { - "x": 116, - "y": 455.5 + "x": 113, + "y": 588 } ], "isCurve": true, @@ -1401,20 +1401,20 @@ "labelPercentage": 0, "route": [ { - "x": 225.5, - "y": 639 + "x": 203, + "y": 830 }, { - "x": 179.5, - "y": 639 + "x": 163, + "y": 830 }, { - "x": 158, - "y": 639 + "x": 146, + "y": 830 }, { "x": 118, - "y": 639 + "y": 830 } ], "isCurve": true, @@ -1448,20 +1448,20 @@ "labelPercentage": 0, "route": [ { - "x": 225.5, - "y": 807.5 + "x": 203, + "y": 1052 }, { - "x": 179.5, - "y": 807.5 + "x": 163, + "y": 1052 }, { - "x": 156.60000610351562, - "y": 807.5 + "x": 143, + "y": 1052 }, { - "x": 111, - "y": 807.5 + "x": 103, + "y": 1052 } ], "isCurve": true, @@ -1495,20 +1495,20 @@ "labelPercentage": 0, "route": [ { - "x": 225.5, - "y": 978.5 + "x": 203, + "y": 1279 }, { - "x": 179.5, - "y": 978.5 + "x": 163, + "y": 1279 }, { - "x": 156.60000610351562, - "y": 978.5 + "x": 143, + "y": 1279 }, { - "x": 111, - "y": 978.5 + "x": 103, + "y": 1279 } ], "isCurve": true, @@ -1542,20 +1542,20 @@ "labelPercentage": 0, "route": [ { - "x": 220.5, - "y": 1144.5 + "x": 203, + "y": 1511 }, { - "x": 178.5, - "y": 1144.5 + "x": 163, + "y": 1511 }, { - "x": 156.60000610351562, - "y": 1144.5 + "x": 143, + "y": 1511 }, { - "x": 111, - "y": 1144.5 + "x": 103, + "y": 1511 } ], "isCurve": true, @@ -1589,20 +1589,20 @@ "labelPercentage": 0, "route": [ { - "x": 218, - "y": 1328 + "x": 203, + "y": 1753 }, { - "x": 178, - "y": 1328 + "x": 163, + "y": 1753 }, { - "x": 156.60000610351562, - "y": 1328 + "x": 143, + "y": 1753 }, { - "x": 111, - "y": 1328 + "x": 103, + "y": 1753 } ], "isCurve": true, @@ -1636,20 +1636,20 @@ "labelPercentage": 0, "route": [ { - "x": 220.5, - "y": 1501.5 + "x": 203, + "y": 1995 }, { - "x": 178.5, - "y": 1501.5 + "x": 163, + "y": 1995 }, { - "x": 157.60000610351562, - "y": 1501.5 + "x": 145, + "y": 1995 }, { - "x": 116, - "y": 1501.5 + "x": 113, + "y": 1995 } ], "isCurve": true, @@ -1683,20 +1683,20 @@ "labelPercentage": 0, "route": [ { - "x": 218, - "y": 1685 + "x": 203, + "y": 2252 }, { - "x": 178, - "y": 1685 + "x": 163, + "y": 2252 }, { - "x": 158, - "y": 1685 + "x": 146, + "y": 2252 }, { "x": 118, - "y": 1685 + "y": 2252 } ], "isCurve": true, diff --git a/e2etests/testdata/stable/multiple_offset_left/dagre/sketch.exp.svg b/e2etests/testdata/stable/multiple_offset_left/dagre/sketch.exp.svg index 2e00fe0c9..997919e0b 100644 --- a/e2etests/testdata/stable/multiple_offset_left/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/multiple_offset_left/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -n1n2n3 - -n4n5 - -n6n7 - -n8n9 - -n10aba - -baba - -bababab - -abab - -a - -b - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + .d2-733541206 .fill-N1{fill:#0A0F25;} + .d2-733541206 .fill-N2{fill:#676C7E;} + .d2-733541206 .fill-N3{fill:#9499AB;} + .d2-733541206 .fill-N4{fill:#CFD2DD;} + .d2-733541206 .fill-N5{fill:#DEE1EB;} + .d2-733541206 .fill-N6{fill:#EEF1F8;} + .d2-733541206 .fill-N7{fill:#FFFFFF;} + .d2-733541206 .fill-B1{fill:#0D32B2;} + .d2-733541206 .fill-B2{fill:#0D32B2;} + .d2-733541206 .fill-B3{fill:#E3E9FD;} + .d2-733541206 .fill-B4{fill:#E3E9FD;} + .d2-733541206 .fill-B5{fill:#EDF0FD;} + .d2-733541206 .fill-B6{fill:#F7F8FE;} + .d2-733541206 .fill-AA2{fill:#4A6FF3;} + .d2-733541206 .fill-AA4{fill:#EDF0FD;} + .d2-733541206 .fill-AA5{fill:#F7F8FE;} + .d2-733541206 .fill-AB4{fill:#EDF0FD;} + .d2-733541206 .fill-AB5{fill:#F7F8FE;} + .d2-733541206 .stroke-N1{stroke:#0A0F25;} + .d2-733541206 .stroke-N2{stroke:#676C7E;} + .d2-733541206 .stroke-N3{stroke:#9499AB;} + .d2-733541206 .stroke-N4{stroke:#CFD2DD;} + .d2-733541206 .stroke-N5{stroke:#DEE1EB;} + .d2-733541206 .stroke-N6{stroke:#EEF1F8;} + .d2-733541206 .stroke-N7{stroke:#FFFFFF;} + .d2-733541206 .stroke-B1{stroke:#0D32B2;} + .d2-733541206 .stroke-B2{stroke:#0D32B2;} + .d2-733541206 .stroke-B3{stroke:#E3E9FD;} + .d2-733541206 .stroke-B4{stroke:#E3E9FD;} + .d2-733541206 .stroke-B5{stroke:#EDF0FD;} + .d2-733541206 .stroke-B6{stroke:#F7F8FE;} + .d2-733541206 .stroke-AA2{stroke:#4A6FF3;} + .d2-733541206 .stroke-AA4{stroke:#EDF0FD;} + .d2-733541206 .stroke-AA5{stroke:#F7F8FE;} + .d2-733541206 .stroke-AB4{stroke:#EDF0FD;} + .d2-733541206 .stroke-AB5{stroke:#F7F8FE;} + .d2-733541206 .background-color-N1{background-color:#0A0F25;} + .d2-733541206 .background-color-N2{background-color:#676C7E;} + .d2-733541206 .background-color-N3{background-color:#9499AB;} + .d2-733541206 .background-color-N4{background-color:#CFD2DD;} + .d2-733541206 .background-color-N5{background-color:#DEE1EB;} + .d2-733541206 .background-color-N6{background-color:#EEF1F8;} + .d2-733541206 .background-color-N7{background-color:#FFFFFF;} + .d2-733541206 .background-color-B1{background-color:#0D32B2;} + .d2-733541206 .background-color-B2{background-color:#0D32B2;} + .d2-733541206 .background-color-B3{background-color:#E3E9FD;} + .d2-733541206 .background-color-B4{background-color:#E3E9FD;} + .d2-733541206 .background-color-B5{background-color:#EDF0FD;} + .d2-733541206 .background-color-B6{background-color:#F7F8FE;} + .d2-733541206 .background-color-AA2{background-color:#4A6FF3;} + .d2-733541206 .background-color-AA4{background-color:#EDF0FD;} + .d2-733541206 .background-color-AA5{background-color:#F7F8FE;} + .d2-733541206 .background-color-AB4{background-color:#EDF0FD;} + .d2-733541206 .background-color-AB5{background-color:#F7F8FE;} + .d2-733541206 .color-N1{color:#0A0F25;} + .d2-733541206 .color-N2{color:#676C7E;} + .d2-733541206 .color-N3{color:#9499AB;} + .d2-733541206 .color-N4{color:#CFD2DD;} + .d2-733541206 .color-N5{color:#DEE1EB;} + .d2-733541206 .color-N6{color:#EEF1F8;} + .d2-733541206 .color-N7{color:#FFFFFF;} + .d2-733541206 .color-B1{color:#0D32B2;} + .d2-733541206 .color-B2{color:#0D32B2;} + .d2-733541206 .color-B3{color:#E3E9FD;} + .d2-733541206 .color-B4{color:#E3E9FD;} + .d2-733541206 .color-B5{color:#EDF0FD;} + .d2-733541206 .color-B6{color:#F7F8FE;} + .d2-733541206 .color-AA2{color:#4A6FF3;} + .d2-733541206 .color-AA4{color:#EDF0FD;} + .d2-733541206 .color-AA5{color:#F7F8FE;} + .d2-733541206 .color-AB4{color:#EDF0FD;} + .d2-733541206 .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}]]>n1n2n3 + +n4n5 + +n6n7 + +n8n9 + +n10aba + +baba + +bababab + +abab + +a + +b + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/multiple_person_label/dagre/board.exp.json b/e2etests/testdata/stable/multiple_person_label/dagre/board.exp.json index b56b4750b..35fb68f2f 100644 --- a/e2etests/testdata/stable/multiple_person_label/dagre/board.exp.json +++ b/e2etests/testdata/stable/multiple_person_label/dagre/board.exp.json @@ -8,7 +8,7 @@ "type": "person", "pos": { "x": 0, - "y": 10 + "y": 0 }, "width": 44, "height": 66, diff --git a/e2etests/testdata/stable/multiple_person_label/dagre/sketch.exp.svg b/e2etests/testdata/stable/multiple_person_label/dagre/sketch.exp.svg index 71ff8fe70..de7d00827 100644 --- a/e2etests/testdata/stable/multiple_person_label/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/multiple_person_label/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -あ - - + .d2-252721584 .fill-N1{fill:#0A0F25;} + .d2-252721584 .fill-N2{fill:#676C7E;} + .d2-252721584 .fill-N3{fill:#9499AB;} + .d2-252721584 .fill-N4{fill:#CFD2DD;} + .d2-252721584 .fill-N5{fill:#DEE1EB;} + .d2-252721584 .fill-N6{fill:#EEF1F8;} + .d2-252721584 .fill-N7{fill:#FFFFFF;} + .d2-252721584 .fill-B1{fill:#0D32B2;} + .d2-252721584 .fill-B2{fill:#0D32B2;} + .d2-252721584 .fill-B3{fill:#E3E9FD;} + .d2-252721584 .fill-B4{fill:#E3E9FD;} + .d2-252721584 .fill-B5{fill:#EDF0FD;} + .d2-252721584 .fill-B6{fill:#F7F8FE;} + .d2-252721584 .fill-AA2{fill:#4A6FF3;} + .d2-252721584 .fill-AA4{fill:#EDF0FD;} + .d2-252721584 .fill-AA5{fill:#F7F8FE;} + .d2-252721584 .fill-AB4{fill:#EDF0FD;} + .d2-252721584 .fill-AB5{fill:#F7F8FE;} + .d2-252721584 .stroke-N1{stroke:#0A0F25;} + .d2-252721584 .stroke-N2{stroke:#676C7E;} + .d2-252721584 .stroke-N3{stroke:#9499AB;} + .d2-252721584 .stroke-N4{stroke:#CFD2DD;} + .d2-252721584 .stroke-N5{stroke:#DEE1EB;} + .d2-252721584 .stroke-N6{stroke:#EEF1F8;} + .d2-252721584 .stroke-N7{stroke:#FFFFFF;} + .d2-252721584 .stroke-B1{stroke:#0D32B2;} + .d2-252721584 .stroke-B2{stroke:#0D32B2;} + .d2-252721584 .stroke-B3{stroke:#E3E9FD;} + .d2-252721584 .stroke-B4{stroke:#E3E9FD;} + .d2-252721584 .stroke-B5{stroke:#EDF0FD;} + .d2-252721584 .stroke-B6{stroke:#F7F8FE;} + .d2-252721584 .stroke-AA2{stroke:#4A6FF3;} + .d2-252721584 .stroke-AA4{stroke:#EDF0FD;} + .d2-252721584 .stroke-AA5{stroke:#F7F8FE;} + .d2-252721584 .stroke-AB4{stroke:#EDF0FD;} + .d2-252721584 .stroke-AB5{stroke:#F7F8FE;} + .d2-252721584 .background-color-N1{background-color:#0A0F25;} + .d2-252721584 .background-color-N2{background-color:#676C7E;} + .d2-252721584 .background-color-N3{background-color:#9499AB;} + .d2-252721584 .background-color-N4{background-color:#CFD2DD;} + .d2-252721584 .background-color-N5{background-color:#DEE1EB;} + .d2-252721584 .background-color-N6{background-color:#EEF1F8;} + .d2-252721584 .background-color-N7{background-color:#FFFFFF;} + .d2-252721584 .background-color-B1{background-color:#0D32B2;} + .d2-252721584 .background-color-B2{background-color:#0D32B2;} + .d2-252721584 .background-color-B3{background-color:#E3E9FD;} + .d2-252721584 .background-color-B4{background-color:#E3E9FD;} + .d2-252721584 .background-color-B5{background-color:#EDF0FD;} + .d2-252721584 .background-color-B6{background-color:#F7F8FE;} + .d2-252721584 .background-color-AA2{background-color:#4A6FF3;} + .d2-252721584 .background-color-AA4{background-color:#EDF0FD;} + .d2-252721584 .background-color-AA5{background-color:#F7F8FE;} + .d2-252721584 .background-color-AB4{background-color:#EDF0FD;} + .d2-252721584 .background-color-AB5{background-color:#F7F8FE;} + .d2-252721584 .color-N1{color:#0A0F25;} + .d2-252721584 .color-N2{color:#676C7E;} + .d2-252721584 .color-N3{color:#9499AB;} + .d2-252721584 .color-N4{color:#CFD2DD;} + .d2-252721584 .color-N5{color:#DEE1EB;} + .d2-252721584 .color-N6{color:#EEF1F8;} + .d2-252721584 .color-N7{color:#FFFFFF;} + .d2-252721584 .color-B1{color:#0D32B2;} + .d2-252721584 .color-B2{color:#0D32B2;} + .d2-252721584 .color-B3{color:#E3E9FD;} + .d2-252721584 .color-B4{color:#E3E9FD;} + .d2-252721584 .color-B5{color:#EDF0FD;} + .d2-252721584 .color-B6{color:#F7F8FE;} + .d2-252721584 .color-AA2{color:#4A6FF3;} + .d2-252721584 .color-AA4{color:#EDF0FD;} + .d2-252721584 .color-AA5{color:#F7F8FE;} + .d2-252721584 .color-AB4{color:#EDF0FD;} + .d2-252721584 .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}]]>あ + + \ No newline at end of file diff --git a/e2etests/testdata/stable/multiple_trees/dagre/board.exp.json b/e2etests/testdata/stable/multiple_trees/dagre/board.exp.json index d24969232..2140eaba0 100644 --- a/e2etests/testdata/stable/multiple_trees/dagre/board.exp.json +++ b/e2etests/testdata/stable/multiple_trees/dagre/board.exp.json @@ -973,12 +973,12 @@ "labelPercentage": 0, "route": [ { - "x": 515, - "y": 369.09698486328125 + "x": 514.75, + "y": 369 }, { - "x": 106.79900360107422, - "y": 432.218994140625 + "x": 106.75, + "y": 432.20001220703125 }, { "x": 14.350000381469727, @@ -1020,12 +1020,12 @@ "labelPercentage": 0, "route": [ { - "x": 515, - "y": 371.4540100097656 + "x": 514.75, + "y": 371 }, { - "x": 263.6000061035156, - "y": 432.69000244140625 + "x": 263.54901123046875, + "y": 432.6000061035156 }, { "x": 200.75, @@ -1067,12 +1067,12 @@ "labelPercentage": 0, "route": [ { - "x": 515, - "y": 384.4639892578125 + "x": 515.5, + "y": 384 }, { - "x": 445.79998779296875, - "y": 435.2919921875 + "x": 445.8999938964844, + "y": 435.20001220703125 }, { "x": 428.5, @@ -1115,11 +1115,11 @@ "route": [ { "x": 568, - "y": 384.37799072265625 + "y": 384 }, { "x": 637.5999755859375, - "y": 435.2749938964844 + "y": 435.20001220703125 }, { "x": 655, @@ -1161,12 +1161,12 @@ "labelPercentage": 0, "route": [ { - "x": 568, - "y": 371.5260009765625 + "x": 567.5, + "y": 372 }, { - "x": 816.4000244140625, - "y": 432.7049865722656 + "x": 816.2999877929688, + "y": 432.79998779296875 }, { "x": 878.5, @@ -1255,20 +1255,20 @@ "labelPercentage": 0, "route": [ { - "x": 568, - "y": 370.4570007324219 + "x": 567.5, + "y": 370 }, { - "x": 869.2000122070312, - "y": 432.4909973144531 + "x": 869.0999755859375, + "y": 432.3999938964844 }, { "x": 954.7000122070312, - "y": 458.79998779296875 + "y": 458.6000061035156 }, { "x": 995.5, - "y": 502 + "y": 501 } ], "isCurve": true, @@ -1302,11 +1302,11 @@ "labelPercentage": 0, "route": [ { - "x": 24.599000930786133, + "x": 24.75, "y": 398 }, { - "x": 24.7189998626709, + "x": 24.75, "y": 438 }, { @@ -1349,11 +1349,11 @@ "labelPercentage": 0, "route": [ { - "x": 134.0989990234375, + "x": 134.25, "y": 398 }, { - "x": 134.218994140625, + "x": 134.25, "y": 438 }, { @@ -1490,11 +1490,11 @@ "labelPercentage": 0, "route": [ { - "x": 177.88800048828125, + "x": 178.25, "y": 564 }, { - "x": 150.177001953125, + "x": 150.25, "y": 604 }, { @@ -1537,11 +1537,11 @@ "labelPercentage": 0, "route": [ { - "x": 223.61099243164062, + "x": 223.25, "y": 564 }, { - "x": 251.32200622558594, + "x": 251.25, "y": 604 }, { @@ -1584,11 +1584,11 @@ "labelPercentage": 0, "route": [ { - "x": 405.9360046386719, + "x": 405.75, "y": 564 }, { - "x": 378.5870056152344, + "x": 378.54998779296875, "y": 604 }, { @@ -1631,11 +1631,11 @@ "labelPercentage": 0, "route": [ { - "x": 451.06298828125, + "x": 451.25, "y": 564 }, { - "x": 478.4119873046875, + "x": 478.45001220703125, "y": 604 }, { @@ -1678,11 +1678,11 @@ "labelPercentage": 0, "route": [ { - "x": 632.635009765625, + "x": 632.75, "y": 564 }, { - "x": 605.5269775390625, + "x": 605.5499877929688, "y": 604 }, { @@ -1725,11 +1725,11 @@ "labelPercentage": 0, "route": [ { - "x": 677.364013671875, + "x": 677.25, "y": 564 }, { - "x": 704.4719848632812, + "x": 704.4500122070312, "y": 604 }, { @@ -1819,11 +1819,11 @@ "labelPercentage": 0, "route": [ { - "x": 856.135009765625, + "x": 856.25, "y": 564 }, { - "x": 829.0269775390625, + "x": 829.0499877929688, "y": 604 }, { @@ -1866,11 +1866,11 @@ "labelPercentage": 0, "route": [ { - "x": 900.864013671875, + "x": 900.75, "y": 564 }, { - "x": 927.9719848632812, + "x": 927.9500122070312, "y": 604 }, { diff --git a/e2etests/testdata/stable/multiple_trees/dagre/sketch.exp.svg b/e2etests/testdata/stable/multiple_trees/dagre/sketch.exp.svg index ff6f0b82f..45de65439 100644 --- a/e2etests/testdata/stable/multiple_trees/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/multiple_trees/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -abcdefghijklmnopqrstuvw + .d2-3148896759 .fill-N1{fill:#0A0F25;} + .d2-3148896759 .fill-N2{fill:#676C7E;} + .d2-3148896759 .fill-N3{fill:#9499AB;} + .d2-3148896759 .fill-N4{fill:#CFD2DD;} + .d2-3148896759 .fill-N5{fill:#DEE1EB;} + .d2-3148896759 .fill-N6{fill:#EEF1F8;} + .d2-3148896759 .fill-N7{fill:#FFFFFF;} + .d2-3148896759 .fill-B1{fill:#0D32B2;} + .d2-3148896759 .fill-B2{fill:#0D32B2;} + .d2-3148896759 .fill-B3{fill:#E3E9FD;} + .d2-3148896759 .fill-B4{fill:#E3E9FD;} + .d2-3148896759 .fill-B5{fill:#EDF0FD;} + .d2-3148896759 .fill-B6{fill:#F7F8FE;} + .d2-3148896759 .fill-AA2{fill:#4A6FF3;} + .d2-3148896759 .fill-AA4{fill:#EDF0FD;} + .d2-3148896759 .fill-AA5{fill:#F7F8FE;} + .d2-3148896759 .fill-AB4{fill:#EDF0FD;} + .d2-3148896759 .fill-AB5{fill:#F7F8FE;} + .d2-3148896759 .stroke-N1{stroke:#0A0F25;} + .d2-3148896759 .stroke-N2{stroke:#676C7E;} + .d2-3148896759 .stroke-N3{stroke:#9499AB;} + .d2-3148896759 .stroke-N4{stroke:#CFD2DD;} + .d2-3148896759 .stroke-N5{stroke:#DEE1EB;} + .d2-3148896759 .stroke-N6{stroke:#EEF1F8;} + .d2-3148896759 .stroke-N7{stroke:#FFFFFF;} + .d2-3148896759 .stroke-B1{stroke:#0D32B2;} + .d2-3148896759 .stroke-B2{stroke:#0D32B2;} + .d2-3148896759 .stroke-B3{stroke:#E3E9FD;} + .d2-3148896759 .stroke-B4{stroke:#E3E9FD;} + .d2-3148896759 .stroke-B5{stroke:#EDF0FD;} + .d2-3148896759 .stroke-B6{stroke:#F7F8FE;} + .d2-3148896759 .stroke-AA2{stroke:#4A6FF3;} + .d2-3148896759 .stroke-AA4{stroke:#EDF0FD;} + .d2-3148896759 .stroke-AA5{stroke:#F7F8FE;} + .d2-3148896759 .stroke-AB4{stroke:#EDF0FD;} + .d2-3148896759 .stroke-AB5{stroke:#F7F8FE;} + .d2-3148896759 .background-color-N1{background-color:#0A0F25;} + .d2-3148896759 .background-color-N2{background-color:#676C7E;} + .d2-3148896759 .background-color-N3{background-color:#9499AB;} + .d2-3148896759 .background-color-N4{background-color:#CFD2DD;} + .d2-3148896759 .background-color-N5{background-color:#DEE1EB;} + .d2-3148896759 .background-color-N6{background-color:#EEF1F8;} + .d2-3148896759 .background-color-N7{background-color:#FFFFFF;} + .d2-3148896759 .background-color-B1{background-color:#0D32B2;} + .d2-3148896759 .background-color-B2{background-color:#0D32B2;} + .d2-3148896759 .background-color-B3{background-color:#E3E9FD;} + .d2-3148896759 .background-color-B4{background-color:#E3E9FD;} + .d2-3148896759 .background-color-B5{background-color:#EDF0FD;} + .d2-3148896759 .background-color-B6{background-color:#F7F8FE;} + .d2-3148896759 .background-color-AA2{background-color:#4A6FF3;} + .d2-3148896759 .background-color-AA4{background-color:#EDF0FD;} + .d2-3148896759 .background-color-AA5{background-color:#F7F8FE;} + .d2-3148896759 .background-color-AB4{background-color:#EDF0FD;} + .d2-3148896759 .background-color-AB5{background-color:#F7F8FE;} + .d2-3148896759 .color-N1{color:#0A0F25;} + .d2-3148896759 .color-N2{color:#676C7E;} + .d2-3148896759 .color-N3{color:#9499AB;} + .d2-3148896759 .color-N4{color:#CFD2DD;} + .d2-3148896759 .color-N5{color:#DEE1EB;} + .d2-3148896759 .color-N6{color:#EEF1F8;} + .d2-3148896759 .color-N7{color:#FFFFFF;} + .d2-3148896759 .color-B1{color:#0D32B2;} + .d2-3148896759 .color-B2{color:#0D32B2;} + .d2-3148896759 .color-B3{color:#E3E9FD;} + .d2-3148896759 .color-B4{color:#E3E9FD;} + .d2-3148896759 .color-B5{color:#EDF0FD;} + .d2-3148896759 .color-B6{color:#F7F8FE;} + .d2-3148896759 .color-AA2{color:#4A6FF3;} + .d2-3148896759 .color-AA4{color:#EDF0FD;} + .d2-3148896759 .color-AA5{color:#F7F8FE;} + .d2-3148896759 .color-AB4{color:#EDF0FD;} + .d2-3148896759 .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}]]>abcdefghijklmnopqrstuvw diff --git a/e2etests/testdata/stable/n22_e32/dagre/board.exp.json b/e2etests/testdata/stable/n22_e32/dagre/board.exp.json index f0d1e96f5..82cc56b50 100644 --- a/e2etests/testdata/stable/n22_e32/dagre/board.exp.json +++ b/e2etests/testdata/stable/n22_e32/dagre/board.exp.json @@ -1163,11 +1163,11 @@ "labelPercentage": 0, "route": [ { - "x": 139.68600463867188, + "x": 139.5, "y": 730 }, { - "x": 112.33699798583984, + "x": 112.30000305175781, "y": 770 }, { @@ -1412,11 +1412,11 @@ "route": [ { "x": 186, - "y": 51.67499923706055 + "y": 52 }, { "x": 260.39898681640625, - "y": 103.13500213623047 + "y": 103.19999694824219 }, { "x": 279, @@ -1470,12 +1470,12 @@ "labelPercentage": 0, "route": [ { - "x": 132, - "y": 53.32600021362305 + "x": 131.75, + "y": 53 }, { - "x": 65.39900207519531, - "y": 103.46499633789062 + "x": 65.3489990234375, + "y": 103.4000015258789 }, { "x": 48.75, @@ -1847,11 +1847,11 @@ "labelPercentage": 0, "route": [ { - "x": 603.5479736328125, + "x": 603.5, "y": 730 }, { - "x": 633.9089965820312, + "x": 633.9000244140625, "y": 770 }, { @@ -1894,11 +1894,11 @@ "labelPercentage": 0, "route": [ { - "x": 590.7249755859375, + "x": 590.25, "y": 730 }, { - "x": 605.5449829101562, + "x": 605.4500122070312, "y": 770 }, { @@ -1941,11 +1941,11 @@ "labelPercentage": 0, "route": [ { - "x": 573.927001953125, + "x": 574, "y": 730 }, { - "x": 568.385009765625, + "x": 568.4000244140625, "y": 770 }, { @@ -2024,11 +2024,11 @@ "labelPercentage": 0, "route": [ { - "x": 556.6320190429688, + "x": 556.5, "y": 730 }, { - "x": 530.1259765625, + "x": 530.0999755859375, "y": 770 }, { @@ -2166,11 +2166,11 @@ "route": [ { "x": 552, - "y": 712.1160278320312 + "y": 712 }, { "x": 456.79998779296875, - "y": 766.4229736328125 + "y": 766.4000244140625 }, { "x": 433, @@ -2224,11 +2224,11 @@ "labelPercentage": 0, "route": [ { - "x": 551.6920166015625, + "x": 551.5, "y": 66 }, { - "x": 573.1380004882812, + "x": 573.0999755859375, "y": 106 }, { @@ -2331,12 +2331,12 @@ "labelPercentage": 0, "route": [ { - "x": 507, - "y": 50.138999938964844 + "x": 507.25, + "y": 50 }, { - "x": 424, - "y": 102.8270034790039 + "x": 424.04998779296875, + "y": 102.80000305175781 }, { "x": 403.25, @@ -2425,11 +2425,11 @@ "labelPercentage": 0, "route": [ { - "x": 424.6199951171875, + "x": 425, "y": 398 }, { - "x": 450.52398681640625, + "x": 450.6000061035156, "y": 438 }, { @@ -2472,11 +2472,11 @@ "labelPercentage": 0, "route": [ { - "x": 380.48699951171875, + "x": 380, "y": 564 }, { - "x": 352.8970031738281, + "x": 352.79998779296875, "y": 604 }, { @@ -2519,12 +2519,12 @@ "labelPercentage": 0, "route": [ { - "x": 373, - "y": 714.1719970703125 + "x": 372.5, + "y": 714 }, { - "x": 455.79998779296875, - "y": 766.833984375 + "x": 455.70001220703125, + "y": 766.7999877929688 }, { "x": 479.29998779296875, @@ -2566,11 +2566,11 @@ "labelPercentage": 0, "route": [ { - "x": 407.1260070800781, + "x": 407, "y": 564 }, { - "x": 411.82501220703125, + "x": 411.79998779296875, "y": 604 }, { @@ -2649,11 +2649,11 @@ "labelPercentage": 0, "route": [ { - "x": 296.2950134277344, + "x": 296.5, "y": 398 }, { - "x": 317.2590026855469, + "x": 317.29998779296875, "y": 438 }, { @@ -2696,12 +2696,12 @@ "labelPercentage": 0, "route": [ { - "x": 377.25, - "y": 378.13800048828125 + "x": 377, + "y": 378 }, { - "x": 266.6499938964844, - "y": 434.0270080566406 + "x": 266.6000061035156, + "y": 434 }, { "x": 239, @@ -2779,12 +2779,12 @@ "labelPercentage": 0, "route": [ { - "x": 319, - "y": 712.9500122070312 + "x": 319.5, + "y": 713 }, { - "x": 228.1999969482422, - "y": 766.5900268554688 + "x": 228.3000030517578, + "y": 766.5999755859375 }, { "x": 211.89999389648438, diff --git a/e2etests/testdata/stable/n22_e32/dagre/sketch.exp.svg b/e2etests/testdata/stable/n22_e32/dagre/sketch.exp.svg index 691347821..7489f1401 100644 --- a/e2etests/testdata/stable/n22_e32/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/n22_e32/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -abcdefghijklmnopqrstu + .d2-3313830298 .fill-N1{fill:#0A0F25;} + .d2-3313830298 .fill-N2{fill:#676C7E;} + .d2-3313830298 .fill-N3{fill:#9499AB;} + .d2-3313830298 .fill-N4{fill:#CFD2DD;} + .d2-3313830298 .fill-N5{fill:#DEE1EB;} + .d2-3313830298 .fill-N6{fill:#EEF1F8;} + .d2-3313830298 .fill-N7{fill:#FFFFFF;} + .d2-3313830298 .fill-B1{fill:#0D32B2;} + .d2-3313830298 .fill-B2{fill:#0D32B2;} + .d2-3313830298 .fill-B3{fill:#E3E9FD;} + .d2-3313830298 .fill-B4{fill:#E3E9FD;} + .d2-3313830298 .fill-B5{fill:#EDF0FD;} + .d2-3313830298 .fill-B6{fill:#F7F8FE;} + .d2-3313830298 .fill-AA2{fill:#4A6FF3;} + .d2-3313830298 .fill-AA4{fill:#EDF0FD;} + .d2-3313830298 .fill-AA5{fill:#F7F8FE;} + .d2-3313830298 .fill-AB4{fill:#EDF0FD;} + .d2-3313830298 .fill-AB5{fill:#F7F8FE;} + .d2-3313830298 .stroke-N1{stroke:#0A0F25;} + .d2-3313830298 .stroke-N2{stroke:#676C7E;} + .d2-3313830298 .stroke-N3{stroke:#9499AB;} + .d2-3313830298 .stroke-N4{stroke:#CFD2DD;} + .d2-3313830298 .stroke-N5{stroke:#DEE1EB;} + .d2-3313830298 .stroke-N6{stroke:#EEF1F8;} + .d2-3313830298 .stroke-N7{stroke:#FFFFFF;} + .d2-3313830298 .stroke-B1{stroke:#0D32B2;} + .d2-3313830298 .stroke-B2{stroke:#0D32B2;} + .d2-3313830298 .stroke-B3{stroke:#E3E9FD;} + .d2-3313830298 .stroke-B4{stroke:#E3E9FD;} + .d2-3313830298 .stroke-B5{stroke:#EDF0FD;} + .d2-3313830298 .stroke-B6{stroke:#F7F8FE;} + .d2-3313830298 .stroke-AA2{stroke:#4A6FF3;} + .d2-3313830298 .stroke-AA4{stroke:#EDF0FD;} + .d2-3313830298 .stroke-AA5{stroke:#F7F8FE;} + .d2-3313830298 .stroke-AB4{stroke:#EDF0FD;} + .d2-3313830298 .stroke-AB5{stroke:#F7F8FE;} + .d2-3313830298 .background-color-N1{background-color:#0A0F25;} + .d2-3313830298 .background-color-N2{background-color:#676C7E;} + .d2-3313830298 .background-color-N3{background-color:#9499AB;} + .d2-3313830298 .background-color-N4{background-color:#CFD2DD;} + .d2-3313830298 .background-color-N5{background-color:#DEE1EB;} + .d2-3313830298 .background-color-N6{background-color:#EEF1F8;} + .d2-3313830298 .background-color-N7{background-color:#FFFFFF;} + .d2-3313830298 .background-color-B1{background-color:#0D32B2;} + .d2-3313830298 .background-color-B2{background-color:#0D32B2;} + .d2-3313830298 .background-color-B3{background-color:#E3E9FD;} + .d2-3313830298 .background-color-B4{background-color:#E3E9FD;} + .d2-3313830298 .background-color-B5{background-color:#EDF0FD;} + .d2-3313830298 .background-color-B6{background-color:#F7F8FE;} + .d2-3313830298 .background-color-AA2{background-color:#4A6FF3;} + .d2-3313830298 .background-color-AA4{background-color:#EDF0FD;} + .d2-3313830298 .background-color-AA5{background-color:#F7F8FE;} + .d2-3313830298 .background-color-AB4{background-color:#EDF0FD;} + .d2-3313830298 .background-color-AB5{background-color:#F7F8FE;} + .d2-3313830298 .color-N1{color:#0A0F25;} + .d2-3313830298 .color-N2{color:#676C7E;} + .d2-3313830298 .color-N3{color:#9499AB;} + .d2-3313830298 .color-N4{color:#CFD2DD;} + .d2-3313830298 .color-N5{color:#DEE1EB;} + .d2-3313830298 .color-N6{color:#EEF1F8;} + .d2-3313830298 .color-N7{color:#FFFFFF;} + .d2-3313830298 .color-B1{color:#0D32B2;} + .d2-3313830298 .color-B2{color:#0D32B2;} + .d2-3313830298 .color-B3{color:#E3E9FD;} + .d2-3313830298 .color-B4{color:#E3E9FD;} + .d2-3313830298 .color-B5{color:#EDF0FD;} + .d2-3313830298 .color-B6{color:#F7F8FE;} + .d2-3313830298 .color-AA2{color:#4A6FF3;} + .d2-3313830298 .color-AA4{color:#EDF0FD;} + .d2-3313830298 .color-AA5{color:#F7F8FE;} + .d2-3313830298 .color-AB4{color:#EDF0FD;} + .d2-3313830298 .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}]]>abcdefghijklmnopqrstu diff --git a/e2etests/testdata/stable/near_keys_for_container#01/dagre/board.exp.json b/e2etests/testdata/stable/near_keys_for_container#01/dagre/board.exp.json index a7f22c5cc..0b3b174cd 100644 --- a/e2etests/testdata/stable/near_keys_for_container#01/dagre/board.exp.json +++ b/e2etests/testdata/stable/near_keys_for_container#01/dagre/board.exp.json @@ -7,11 +7,11 @@ "id": "z", "type": "rectangle", "pos": { - "x": -123, + "x": -113, "y": 56 }, - "width": 247, - "height": 291, + "width": 227, + "height": 292, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -49,7 +49,7 @@ "type": "rectangle", "pos": { "x": -83, - "y": 85 + "y": 86 }, "width": 53, "height": 66, @@ -90,7 +90,7 @@ "type": "rectangle", "pos": { "x": -83, - "y": 251 + "y": 252 }, "width": 53, "height": 66, @@ -131,7 +131,7 @@ "type": "rectangle", "pos": { "x": 30, - "y": 85 + "y": 86 }, "width": 53, "height": 66, @@ -172,7 +172,7 @@ "type": "rectangle", "pos": { "x": 29, - "y": 251 + "y": 252 }, "width": 54, "height": 66, @@ -213,10 +213,10 @@ "type": "rectangle", "pos": { "x": -86, - "y": -245 + "y": -217 }, "width": 173, - "height": 225, + "height": 197, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -253,11 +253,11 @@ "id": "a.b", "type": "rectangle", "pos": { - "x": -66, - "y": -179 + "x": -56, + "y": -176 }, - "width": 133, - "height": 130, + "width": 113, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -295,7 +295,7 @@ "type": "rectangle", "pos": { "x": -26, - "y": -147 + "y": -146 }, "width": 53, "height": 66, @@ -335,11 +335,11 @@ "id": "x", "type": "rectangle", "pos": { - "x": -390, - "y": -311 + "x": -360, + "y": -312 }, - "width": 247, - "height": 291, + "width": 227, + "height": 292, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -376,8 +376,8 @@ "id": "x.a", "type": "rectangle", "pos": { - "x": -350, - "y": -281 + "x": -330, + "y": -282 }, "width": 53, "height": 66, @@ -417,8 +417,8 @@ "id": "x.b", "type": "rectangle", "pos": { - "x": -350, - "y": -115 + "x": -330, + "y": -116 }, "width": 53, "height": 66, @@ -458,8 +458,8 @@ "id": "x.c", "type": "rectangle", "pos": { - "x": -236, - "y": -281 + "x": -216, + "y": -282 }, "width": 53, "height": 66, @@ -499,8 +499,8 @@ "id": "x.d", "type": "rectangle", "pos": { - "x": -237, - "y": -115 + "x": -217, + "y": -116 }, "width": 54, "height": 66, @@ -540,11 +540,11 @@ "id": "y", "type": "rectangle", "pos": { - "x": 143, - "y": -311 + "x": 133, + "y": -312 }, - "width": 247, - "height": 291, + "width": 227, + "height": 292, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -581,8 +581,8 @@ "id": "y.a", "type": "rectangle", "pos": { - "x": 183, - "y": -281 + "x": 163, + "y": -282 }, "width": 53, "height": 66, @@ -622,8 +622,8 @@ "id": "y.b", "type": "rectangle", "pos": { - "x": 183, - "y": -115 + "x": 163, + "y": -116 }, "width": 53, "height": 66, @@ -663,8 +663,8 @@ "id": "y.c", "type": "rectangle", "pos": { - "x": 297, - "y": -281 + "x": 277, + "y": -282 }, "width": 53, "height": 66, @@ -704,8 +704,8 @@ "id": "y.d", "type": "rectangle", "pos": { - "x": 296, - "y": -115 + "x": 276, + "y": -116 }, "width": 54, "height": 66, @@ -745,11 +745,11 @@ "id": "b", "type": "rectangle", "pos": { - "x": 143, + "x": 133, "y": 56 }, "width": 214, - "height": 325, + "height": 263, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -786,11 +786,11 @@ "id": "b.a", "type": "rectangle", "pos": { - "x": 163, - "y": 121 + "x": 153, + "y": 97 }, "width": 174, - "height": 230, + "height": 192, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -828,10 +828,10 @@ "type": "rectangle", "pos": { "x": 183, - "y": 184 + "y": 133 }, - "width": 134, - "height": 135, + "width": 114, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -868,8 +868,8 @@ "id": "b.a.c.d", "type": "rectangle", "pos": { - "x": 223, - "y": 219 + "x": 213, + "y": 163 }, "width": 54, "height": 66, @@ -933,19 +933,19 @@ "route": [ { "x": -57, - "y": 151.5 + "y": 152 }, { "x": -57, - "y": 191.5 + "y": 192 }, { "x": -57, - "y": 211.5 + "y": 212 }, { "x": -57, - "y": 251.5 + "y": 252 } ], "isCurve": true, @@ -980,19 +980,19 @@ "route": [ { "x": 56.5, - "y": 151.5 + "y": 152 }, { "x": 56.5, - "y": 191.5 + "y": 192 }, { "x": 56.5, - "y": 211.5 + "y": 212 }, { "x": 56.5, - "y": 251.5 + "y": 252 } ], "isCurve": true, @@ -1026,20 +1026,20 @@ "labelPercentage": 0, "route": [ { - "x": -324, - "y": -215.5 + "x": -304, + "y": -216 }, { - "x": -324, - "y": -175.5 + "x": -304, + "y": -176 }, { - "x": -324, - "y": -155.5 + "x": -304, + "y": -156 }, { - "x": -324, - "y": -115.5 + "x": -304, + "y": -116 } ], "isCurve": true, @@ -1073,20 +1073,20 @@ "labelPercentage": 0, "route": [ { - "x": -210.5, - "y": -215.5 + "x": -190.5, + "y": -216 }, { - "x": -210.5, - "y": -175.5 + "x": -190.5, + "y": -176 }, { - "x": -210.5, - "y": -155.5 + "x": -190.5, + "y": -156 }, { - "x": -210.5, - "y": -115.5 + "x": -190.5, + "y": -116 } ], "isCurve": true, @@ -1120,20 +1120,20 @@ "labelPercentage": 0, "route": [ { - "x": 210, - "y": -215.5 + "x": 190, + "y": -216 }, { - "x": 210, - "y": -175.5 + "x": 190, + "y": -176 }, { - "x": 210, - "y": -155.5 + "x": 190, + "y": -156 }, { - "x": 210, - "y": -115.5 + "x": 190, + "y": -116 } ], "isCurve": true, @@ -1167,20 +1167,20 @@ "labelPercentage": 0, "route": [ { - "x": 323.5, - "y": -215.5 + "x": 303.5, + "y": -216 }, { - "x": 323.5, - "y": -175.5 + "x": 303.5, + "y": -176 }, { - "x": 323.5, - "y": -155.5 + "x": 303.5, + "y": -156 }, { - "x": 323.5, - "y": -115.5 + "x": 303.5, + "y": -116 } ], "isCurve": true, diff --git a/e2etests/testdata/stable/near_keys_for_container#01/dagre/sketch.exp.svg b/e2etests/testdata/stable/near_keys_for_container#01/dagre/sketch.exp.svg index 02835b148..e685aa867 100644 --- a/e2etests/testdata/stable/near_keys_for_container#01/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/near_keys_for_container#01/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -zaxybabcdbabcdabcdaccd - + .d2-1796086373 .fill-N1{fill:#0A0F25;} + .d2-1796086373 .fill-N2{fill:#676C7E;} + .d2-1796086373 .fill-N3{fill:#9499AB;} + .d2-1796086373 .fill-N4{fill:#CFD2DD;} + .d2-1796086373 .fill-N5{fill:#DEE1EB;} + .d2-1796086373 .fill-N6{fill:#EEF1F8;} + .d2-1796086373 .fill-N7{fill:#FFFFFF;} + .d2-1796086373 .fill-B1{fill:#0D32B2;} + .d2-1796086373 .fill-B2{fill:#0D32B2;} + .d2-1796086373 .fill-B3{fill:#E3E9FD;} + .d2-1796086373 .fill-B4{fill:#E3E9FD;} + .d2-1796086373 .fill-B5{fill:#EDF0FD;} + .d2-1796086373 .fill-B6{fill:#F7F8FE;} + .d2-1796086373 .fill-AA2{fill:#4A6FF3;} + .d2-1796086373 .fill-AA4{fill:#EDF0FD;} + .d2-1796086373 .fill-AA5{fill:#F7F8FE;} + .d2-1796086373 .fill-AB4{fill:#EDF0FD;} + .d2-1796086373 .fill-AB5{fill:#F7F8FE;} + .d2-1796086373 .stroke-N1{stroke:#0A0F25;} + .d2-1796086373 .stroke-N2{stroke:#676C7E;} + .d2-1796086373 .stroke-N3{stroke:#9499AB;} + .d2-1796086373 .stroke-N4{stroke:#CFD2DD;} + .d2-1796086373 .stroke-N5{stroke:#DEE1EB;} + .d2-1796086373 .stroke-N6{stroke:#EEF1F8;} + .d2-1796086373 .stroke-N7{stroke:#FFFFFF;} + .d2-1796086373 .stroke-B1{stroke:#0D32B2;} + .d2-1796086373 .stroke-B2{stroke:#0D32B2;} + .d2-1796086373 .stroke-B3{stroke:#E3E9FD;} + .d2-1796086373 .stroke-B4{stroke:#E3E9FD;} + .d2-1796086373 .stroke-B5{stroke:#EDF0FD;} + .d2-1796086373 .stroke-B6{stroke:#F7F8FE;} + .d2-1796086373 .stroke-AA2{stroke:#4A6FF3;} + .d2-1796086373 .stroke-AA4{stroke:#EDF0FD;} + .d2-1796086373 .stroke-AA5{stroke:#F7F8FE;} + .d2-1796086373 .stroke-AB4{stroke:#EDF0FD;} + .d2-1796086373 .stroke-AB5{stroke:#F7F8FE;} + .d2-1796086373 .background-color-N1{background-color:#0A0F25;} + .d2-1796086373 .background-color-N2{background-color:#676C7E;} + .d2-1796086373 .background-color-N3{background-color:#9499AB;} + .d2-1796086373 .background-color-N4{background-color:#CFD2DD;} + .d2-1796086373 .background-color-N5{background-color:#DEE1EB;} + .d2-1796086373 .background-color-N6{background-color:#EEF1F8;} + .d2-1796086373 .background-color-N7{background-color:#FFFFFF;} + .d2-1796086373 .background-color-B1{background-color:#0D32B2;} + .d2-1796086373 .background-color-B2{background-color:#0D32B2;} + .d2-1796086373 .background-color-B3{background-color:#E3E9FD;} + .d2-1796086373 .background-color-B4{background-color:#E3E9FD;} + .d2-1796086373 .background-color-B5{background-color:#EDF0FD;} + .d2-1796086373 .background-color-B6{background-color:#F7F8FE;} + .d2-1796086373 .background-color-AA2{background-color:#4A6FF3;} + .d2-1796086373 .background-color-AA4{background-color:#EDF0FD;} + .d2-1796086373 .background-color-AA5{background-color:#F7F8FE;} + .d2-1796086373 .background-color-AB4{background-color:#EDF0FD;} + .d2-1796086373 .background-color-AB5{background-color:#F7F8FE;} + .d2-1796086373 .color-N1{color:#0A0F25;} + .d2-1796086373 .color-N2{color:#676C7E;} + .d2-1796086373 .color-N3{color:#9499AB;} + .d2-1796086373 .color-N4{color:#CFD2DD;} + .d2-1796086373 .color-N5{color:#DEE1EB;} + .d2-1796086373 .color-N6{color:#EEF1F8;} + .d2-1796086373 .color-N7{color:#FFFFFF;} + .d2-1796086373 .color-B1{color:#0D32B2;} + .d2-1796086373 .color-B2{color:#0D32B2;} + .d2-1796086373 .color-B3{color:#E3E9FD;} + .d2-1796086373 .color-B4{color:#E3E9FD;} + .d2-1796086373 .color-B5{color:#EDF0FD;} + .d2-1796086373 .color-B6{color:#F7F8FE;} + .d2-1796086373 .color-AA2{color:#4A6FF3;} + .d2-1796086373 .color-AA4{color:#EDF0FD;} + .d2-1796086373 .color-AA5{color:#F7F8FE;} + .d2-1796086373 .color-AB4{color:#EDF0FD;} + .d2-1796086373 .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}]]>zaxybabcdbabcdabcdaccd + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + \ 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 e3002fd3e..80fede376 100644 --- a/e2etests/testdata/stable/nested_shape_labels/dagre/board.exp.json +++ b/e2etests/testdata/stable/nested_shape_labels/dagre/board.exp.json @@ -8,10 +8,10 @@ "type": "package", "pos": { "x": 0, - "y": 41 + "y": 0 }, "width": 146, - "height": 151, + "height": 192, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -49,7 +49,7 @@ "type": "diamond", "pos": { "x": 40, - "y": 70 + "y": 50 }, "width": 66, "height": 92, @@ -90,10 +90,10 @@ "type": "diamond", "pos": { "x": 166, - "y": 41 + "y": 0 }, "width": 156, - "height": 151, + "height": 192, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -131,7 +131,7 @@ "type": "oval", "pos": { "x": 206, - "y": 78 + "y": 58 }, "width": 76, "height": 76, 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 22ec7c748..7cc71e3c1 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-989314006 .fill-N1{fill:#0A0F25;} + .d2-989314006 .fill-N2{fill:#676C7E;} + .d2-989314006 .fill-N3{fill:#9499AB;} + .d2-989314006 .fill-N4{fill:#CFD2DD;} + .d2-989314006 .fill-N5{fill:#DEE1EB;} + .d2-989314006 .fill-N6{fill:#EEF1F8;} + .d2-989314006 .fill-N7{fill:#FFFFFF;} + .d2-989314006 .fill-B1{fill:#0D32B2;} + .d2-989314006 .fill-B2{fill:#0D32B2;} + .d2-989314006 .fill-B3{fill:#E3E9FD;} + .d2-989314006 .fill-B4{fill:#E3E9FD;} + .d2-989314006 .fill-B5{fill:#EDF0FD;} + .d2-989314006 .fill-B6{fill:#F7F8FE;} + .d2-989314006 .fill-AA2{fill:#4A6FF3;} + .d2-989314006 .fill-AA4{fill:#EDF0FD;} + .d2-989314006 .fill-AA5{fill:#F7F8FE;} + .d2-989314006 .fill-AB4{fill:#EDF0FD;} + .d2-989314006 .fill-AB5{fill:#F7F8FE;} + .d2-989314006 .stroke-N1{stroke:#0A0F25;} + .d2-989314006 .stroke-N2{stroke:#676C7E;} + .d2-989314006 .stroke-N3{stroke:#9499AB;} + .d2-989314006 .stroke-N4{stroke:#CFD2DD;} + .d2-989314006 .stroke-N5{stroke:#DEE1EB;} + .d2-989314006 .stroke-N6{stroke:#EEF1F8;} + .d2-989314006 .stroke-N7{stroke:#FFFFFF;} + .d2-989314006 .stroke-B1{stroke:#0D32B2;} + .d2-989314006 .stroke-B2{stroke:#0D32B2;} + .d2-989314006 .stroke-B3{stroke:#E3E9FD;} + .d2-989314006 .stroke-B4{stroke:#E3E9FD;} + .d2-989314006 .stroke-B5{stroke:#EDF0FD;} + .d2-989314006 .stroke-B6{stroke:#F7F8FE;} + .d2-989314006 .stroke-AA2{stroke:#4A6FF3;} + .d2-989314006 .stroke-AA4{stroke:#EDF0FD;} + .d2-989314006 .stroke-AA5{stroke:#F7F8FE;} + .d2-989314006 .stroke-AB4{stroke:#EDF0FD;} + .d2-989314006 .stroke-AB5{stroke:#F7F8FE;} + .d2-989314006 .background-color-N1{background-color:#0A0F25;} + .d2-989314006 .background-color-N2{background-color:#676C7E;} + .d2-989314006 .background-color-N3{background-color:#9499AB;} + .d2-989314006 .background-color-N4{background-color:#CFD2DD;} + .d2-989314006 .background-color-N5{background-color:#DEE1EB;} + .d2-989314006 .background-color-N6{background-color:#EEF1F8;} + .d2-989314006 .background-color-N7{background-color:#FFFFFF;} + .d2-989314006 .background-color-B1{background-color:#0D32B2;} + .d2-989314006 .background-color-B2{background-color:#0D32B2;} + .d2-989314006 .background-color-B3{background-color:#E3E9FD;} + .d2-989314006 .background-color-B4{background-color:#E3E9FD;} + .d2-989314006 .background-color-B5{background-color:#EDF0FD;} + .d2-989314006 .background-color-B6{background-color:#F7F8FE;} + .d2-989314006 .background-color-AA2{background-color:#4A6FF3;} + .d2-989314006 .background-color-AA4{background-color:#EDF0FD;} + .d2-989314006 .background-color-AA5{background-color:#F7F8FE;} + .d2-989314006 .background-color-AB4{background-color:#EDF0FD;} + .d2-989314006 .background-color-AB5{background-color:#F7F8FE;} + .d2-989314006 .color-N1{color:#0A0F25;} + .d2-989314006 .color-N2{color:#676C7E;} + .d2-989314006 .color-N3{color:#9499AB;} + .d2-989314006 .color-N4{color:#CFD2DD;} + .d2-989314006 .color-N5{color:#DEE1EB;} + .d2-989314006 .color-N6{color:#EEF1F8;} + .d2-989314006 .color-N7{color:#FFFFFF;} + .d2-989314006 .color-B1{color:#0D32B2;} + .d2-989314006 .color-B2{color:#0D32B2;} + .d2-989314006 .color-B3{color:#E3E9FD;} + .d2-989314006 .color-B4{color:#E3E9FD;} + .d2-989314006 .color-B5{color:#EDF0FD;} + .d2-989314006 .color-B6{color:#F7F8FE;} + .d2-989314006 .color-AA2{color:#4A6FF3;} + .d2-989314006 .color-AA4{color:#EDF0FD;} + .d2-989314006 .color-AA5{color:#F7F8FE;} + .d2-989314006 .color-AB4{color:#EDF0FD;} + .d2-989314006 .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/one_container_loop/dagre/board.exp.json b/e2etests/testdata/stable/one_container_loop/dagre/board.exp.json index 1984f19b4..dbf5c7046 100644 --- a/e2etests/testdata/stable/one_container_loop/dagre/board.exp.json +++ b/e2etests/testdata/stable/one_container_loop/dagre/board.exp.json @@ -7,11 +7,11 @@ "id": "a", "type": "rectangle", "pos": { - "x": 0, - "y": 41 + "x": 10, + "y": 20 }, - "width": 314, - "height": 125, + "width": 260, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -49,7 +49,7 @@ "type": "rectangle", "pos": { "x": 40, - "y": 70 + "y": 50 }, "width": 53, "height": 66, @@ -295,7 +295,7 @@ "type": "rectangle", "pos": { "x": 187, - "y": 70 + "y": 50 }, "width": 53, "height": 66, @@ -359,11 +359,11 @@ "route": [ { "x": 66.5, - "y": 136.5 + "y": 116 }, { "x": 66.5, - "y": 160.10000610351562 + "y": 156 }, { "x": 66.5, @@ -619,11 +619,11 @@ "route": [ { "x": 270, - "y": 166 + "y": 146 }, { "x": 270, - "y": 206 + "y": 202 }, { "x": 270, @@ -748,12 +748,12 @@ "labelPercentage": 0, "route": [ { - "x": 190.68600463867188, - "y": 136.5 + "x": 190.5, + "y": 116 }, { - "x": 163.33700561523438, - "y": 160.10000610351562 + "x": 163.3000030517578, + "y": 156 }, { "x": 156.5, diff --git a/e2etests/testdata/stable/one_container_loop/dagre/sketch.exp.svg b/e2etests/testdata/stable/one_container_loop/dagre/sketch.exp.svg index 67750d9d0..4e044b490 100644 --- a/e2etests/testdata/stable/one_container_loop/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/one_container_loop/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -acdefgbh - - + .d2-2332751097 .fill-N1{fill:#0A0F25;} + .d2-2332751097 .fill-N2{fill:#676C7E;} + .d2-2332751097 .fill-N3{fill:#9499AB;} + .d2-2332751097 .fill-N4{fill:#CFD2DD;} + .d2-2332751097 .fill-N5{fill:#DEE1EB;} + .d2-2332751097 .fill-N6{fill:#EEF1F8;} + .d2-2332751097 .fill-N7{fill:#FFFFFF;} + .d2-2332751097 .fill-B1{fill:#0D32B2;} + .d2-2332751097 .fill-B2{fill:#0D32B2;} + .d2-2332751097 .fill-B3{fill:#E3E9FD;} + .d2-2332751097 .fill-B4{fill:#E3E9FD;} + .d2-2332751097 .fill-B5{fill:#EDF0FD;} + .d2-2332751097 .fill-B6{fill:#F7F8FE;} + .d2-2332751097 .fill-AA2{fill:#4A6FF3;} + .d2-2332751097 .fill-AA4{fill:#EDF0FD;} + .d2-2332751097 .fill-AA5{fill:#F7F8FE;} + .d2-2332751097 .fill-AB4{fill:#EDF0FD;} + .d2-2332751097 .fill-AB5{fill:#F7F8FE;} + .d2-2332751097 .stroke-N1{stroke:#0A0F25;} + .d2-2332751097 .stroke-N2{stroke:#676C7E;} + .d2-2332751097 .stroke-N3{stroke:#9499AB;} + .d2-2332751097 .stroke-N4{stroke:#CFD2DD;} + .d2-2332751097 .stroke-N5{stroke:#DEE1EB;} + .d2-2332751097 .stroke-N6{stroke:#EEF1F8;} + .d2-2332751097 .stroke-N7{stroke:#FFFFFF;} + .d2-2332751097 .stroke-B1{stroke:#0D32B2;} + .d2-2332751097 .stroke-B2{stroke:#0D32B2;} + .d2-2332751097 .stroke-B3{stroke:#E3E9FD;} + .d2-2332751097 .stroke-B4{stroke:#E3E9FD;} + .d2-2332751097 .stroke-B5{stroke:#EDF0FD;} + .d2-2332751097 .stroke-B6{stroke:#F7F8FE;} + .d2-2332751097 .stroke-AA2{stroke:#4A6FF3;} + .d2-2332751097 .stroke-AA4{stroke:#EDF0FD;} + .d2-2332751097 .stroke-AA5{stroke:#F7F8FE;} + .d2-2332751097 .stroke-AB4{stroke:#EDF0FD;} + .d2-2332751097 .stroke-AB5{stroke:#F7F8FE;} + .d2-2332751097 .background-color-N1{background-color:#0A0F25;} + .d2-2332751097 .background-color-N2{background-color:#676C7E;} + .d2-2332751097 .background-color-N3{background-color:#9499AB;} + .d2-2332751097 .background-color-N4{background-color:#CFD2DD;} + .d2-2332751097 .background-color-N5{background-color:#DEE1EB;} + .d2-2332751097 .background-color-N6{background-color:#EEF1F8;} + .d2-2332751097 .background-color-N7{background-color:#FFFFFF;} + .d2-2332751097 .background-color-B1{background-color:#0D32B2;} + .d2-2332751097 .background-color-B2{background-color:#0D32B2;} + .d2-2332751097 .background-color-B3{background-color:#E3E9FD;} + .d2-2332751097 .background-color-B4{background-color:#E3E9FD;} + .d2-2332751097 .background-color-B5{background-color:#EDF0FD;} + .d2-2332751097 .background-color-B6{background-color:#F7F8FE;} + .d2-2332751097 .background-color-AA2{background-color:#4A6FF3;} + .d2-2332751097 .background-color-AA4{background-color:#EDF0FD;} + .d2-2332751097 .background-color-AA5{background-color:#F7F8FE;} + .d2-2332751097 .background-color-AB4{background-color:#EDF0FD;} + .d2-2332751097 .background-color-AB5{background-color:#F7F8FE;} + .d2-2332751097 .color-N1{color:#0A0F25;} + .d2-2332751097 .color-N2{color:#676C7E;} + .d2-2332751097 .color-N3{color:#9499AB;} + .d2-2332751097 .color-N4{color:#CFD2DD;} + .d2-2332751097 .color-N5{color:#DEE1EB;} + .d2-2332751097 .color-N6{color:#EEF1F8;} + .d2-2332751097 .color-N7{color:#FFFFFF;} + .d2-2332751097 .color-B1{color:#0D32B2;} + .d2-2332751097 .color-B2{color:#0D32B2;} + .d2-2332751097 .color-B3{color:#E3E9FD;} + .d2-2332751097 .color-B4{color:#E3E9FD;} + .d2-2332751097 .color-B5{color:#EDF0FD;} + .d2-2332751097 .color-B6{color:#F7F8FE;} + .d2-2332751097 .color-AA2{color:#4A6FF3;} + .d2-2332751097 .color-AA4{color:#EDF0FD;} + .d2-2332751097 .color-AA5{color:#F7F8FE;} + .d2-2332751097 .color-AB4{color:#EDF0FD;} + .d2-2332751097 .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}]]>acdefgbh + + - - + + \ No newline at end of file diff --git a/e2etests/testdata/stable/one_three_one_container/dagre/board.exp.json b/e2etests/testdata/stable/one_three_one_container/dagre/board.exp.json index 643fd62b5..a853f9265 100644 --- a/e2etests/testdata/stable/one_three_one_container/dagre/board.exp.json +++ b/e2etests/testdata/stable/one_three_one_container/dagre/board.exp.json @@ -7,11 +7,11 @@ "id": "top2", "type": "rectangle", "pos": { - "x": 0, - "y": 41 + "x": 93, + "y": 20 }, - "width": 326, - "height": 125, + "width": 140, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -49,7 +49,7 @@ "type": "rectangle", "pos": { "x": 123, - "y": 70 + "y": 50 }, "width": 80, "height": 66, @@ -212,11 +212,11 @@ "id": "bottom", "type": "rectangle", "pos": { - "x": 0, - "y": 473 + "x": 107, + "y": 452 }, - "width": 324, - "height": 125, + "width": 132, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -254,7 +254,7 @@ "type": "rectangle", "pos": { "x": 137, - "y": 502 + "y": 482 }, "width": 72, "height": 66, @@ -318,11 +318,11 @@ "route": [ { "x": 123, - "y": 135.11900329589844 + "y": 115 }, { "x": 71, - "y": 159.822998046875 + "y": 155.8000030517578 }, { "x": 58, @@ -364,12 +364,12 @@ "labelPercentage": 0, "route": [ { - "x": 166.17999267578125, - "y": 136.5 + "x": 166, + "y": 116 }, { - "x": 170.03599548339844, - "y": 160.10000610351562 + "x": 170, + "y": 156 }, { "x": 171, @@ -412,11 +412,11 @@ "route": [ { "x": 203, - "y": 130.93800354003906 + "y": 110 }, { "x": 267.79998779296875, - "y": 158.98699951171875 + "y": 154.8000030517578 }, { "x": 284, @@ -467,11 +467,11 @@ }, { "x": 73.80000305175781, - "y": 447.5 + "y": 443.3999938964844 }, { "x": 137, - "y": 509.5 + "y": 489 } ], "isCurve": true, @@ -514,11 +514,11 @@ }, { "x": 171.1999969482422, - "y": 446.1000061035156 + "y": 442 }, { "x": 172, - "y": 502.5 + "y": 482 } ], "isCurve": true, @@ -561,11 +561,11 @@ }, { "x": 269, - "y": 447.29998779296875 + "y": 443.20001220703125 }, { "x": 209, - "y": 508.5 + "y": 488 } ], "isCurve": true, diff --git a/e2etests/testdata/stable/one_three_one_container/dagre/sketch.exp.svg b/e2etests/testdata/stable/one_three_one_container/dagre/sketch.exp.svg index b8f3dd184..ea8bc4ca6 100644 --- a/e2etests/testdata/stable/one_three_one_container/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/one_three_one_container/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -top2abcbottomstartend - - + .d2-1100252641 .fill-N1{fill:#0A0F25;} + .d2-1100252641 .fill-N2{fill:#676C7E;} + .d2-1100252641 .fill-N3{fill:#9499AB;} + .d2-1100252641 .fill-N4{fill:#CFD2DD;} + .d2-1100252641 .fill-N5{fill:#DEE1EB;} + .d2-1100252641 .fill-N6{fill:#EEF1F8;} + .d2-1100252641 .fill-N7{fill:#FFFFFF;} + .d2-1100252641 .fill-B1{fill:#0D32B2;} + .d2-1100252641 .fill-B2{fill:#0D32B2;} + .d2-1100252641 .fill-B3{fill:#E3E9FD;} + .d2-1100252641 .fill-B4{fill:#E3E9FD;} + .d2-1100252641 .fill-B5{fill:#EDF0FD;} + .d2-1100252641 .fill-B6{fill:#F7F8FE;} + .d2-1100252641 .fill-AA2{fill:#4A6FF3;} + .d2-1100252641 .fill-AA4{fill:#EDF0FD;} + .d2-1100252641 .fill-AA5{fill:#F7F8FE;} + .d2-1100252641 .fill-AB4{fill:#EDF0FD;} + .d2-1100252641 .fill-AB5{fill:#F7F8FE;} + .d2-1100252641 .stroke-N1{stroke:#0A0F25;} + .d2-1100252641 .stroke-N2{stroke:#676C7E;} + .d2-1100252641 .stroke-N3{stroke:#9499AB;} + .d2-1100252641 .stroke-N4{stroke:#CFD2DD;} + .d2-1100252641 .stroke-N5{stroke:#DEE1EB;} + .d2-1100252641 .stroke-N6{stroke:#EEF1F8;} + .d2-1100252641 .stroke-N7{stroke:#FFFFFF;} + .d2-1100252641 .stroke-B1{stroke:#0D32B2;} + .d2-1100252641 .stroke-B2{stroke:#0D32B2;} + .d2-1100252641 .stroke-B3{stroke:#E3E9FD;} + .d2-1100252641 .stroke-B4{stroke:#E3E9FD;} + .d2-1100252641 .stroke-B5{stroke:#EDF0FD;} + .d2-1100252641 .stroke-B6{stroke:#F7F8FE;} + .d2-1100252641 .stroke-AA2{stroke:#4A6FF3;} + .d2-1100252641 .stroke-AA4{stroke:#EDF0FD;} + .d2-1100252641 .stroke-AA5{stroke:#F7F8FE;} + .d2-1100252641 .stroke-AB4{stroke:#EDF0FD;} + .d2-1100252641 .stroke-AB5{stroke:#F7F8FE;} + .d2-1100252641 .background-color-N1{background-color:#0A0F25;} + .d2-1100252641 .background-color-N2{background-color:#676C7E;} + .d2-1100252641 .background-color-N3{background-color:#9499AB;} + .d2-1100252641 .background-color-N4{background-color:#CFD2DD;} + .d2-1100252641 .background-color-N5{background-color:#DEE1EB;} + .d2-1100252641 .background-color-N6{background-color:#EEF1F8;} + .d2-1100252641 .background-color-N7{background-color:#FFFFFF;} + .d2-1100252641 .background-color-B1{background-color:#0D32B2;} + .d2-1100252641 .background-color-B2{background-color:#0D32B2;} + .d2-1100252641 .background-color-B3{background-color:#E3E9FD;} + .d2-1100252641 .background-color-B4{background-color:#E3E9FD;} + .d2-1100252641 .background-color-B5{background-color:#EDF0FD;} + .d2-1100252641 .background-color-B6{background-color:#F7F8FE;} + .d2-1100252641 .background-color-AA2{background-color:#4A6FF3;} + .d2-1100252641 .background-color-AA4{background-color:#EDF0FD;} + .d2-1100252641 .background-color-AA5{background-color:#F7F8FE;} + .d2-1100252641 .background-color-AB4{background-color:#EDF0FD;} + .d2-1100252641 .background-color-AB5{background-color:#F7F8FE;} + .d2-1100252641 .color-N1{color:#0A0F25;} + .d2-1100252641 .color-N2{color:#676C7E;} + .d2-1100252641 .color-N3{color:#9499AB;} + .d2-1100252641 .color-N4{color:#CFD2DD;} + .d2-1100252641 .color-N5{color:#DEE1EB;} + .d2-1100252641 .color-N6{color:#EEF1F8;} + .d2-1100252641 .color-N7{color:#FFFFFF;} + .d2-1100252641 .color-B1{color:#0D32B2;} + .d2-1100252641 .color-B2{color:#0D32B2;} + .d2-1100252641 .color-B3{color:#E3E9FD;} + .d2-1100252641 .color-B4{color:#E3E9FD;} + .d2-1100252641 .color-B5{color:#EDF0FD;} + .d2-1100252641 .color-B6{color:#F7F8FE;} + .d2-1100252641 .color-AA2{color:#4A6FF3;} + .d2-1100252641 .color-AA4{color:#EDF0FD;} + .d2-1100252641 .color-AA5{color:#F7F8FE;} + .d2-1100252641 .color-AB4{color:#EDF0FD;} + .d2-1100252641 .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}]]>top2abcbottomstartend + + - - - + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/outside_bottom_labels/dagre/board.exp.json b/e2etests/testdata/stable/outside_bottom_labels/dagre/board.exp.json index 0b07ba894..f424c7cf9 100644 --- a/e2etests/testdata/stable/outside_bottom_labels/dagre/board.exp.json +++ b/e2etests/testdata/stable/outside_bottom_labels/dagre/board.exp.json @@ -49,7 +49,7 @@ "type": "person", "pos": { "x": 9, - "y": 447 + "y": 395 }, "width": 157, "height": 105, @@ -90,7 +90,7 @@ "type": "person", "pos": { "x": 28, - "y": 242 + "y": 216 }, "width": 118, "height": 79, @@ -153,20 +153,20 @@ "labelPercentage": 0, "route": [ { - "x": 75, + "x": 71, "y": 142 }, { - "x": 68.5999984741211, - "y": 182 + "x": 67.80000305175781, + "y": 161.1999969482422 }, { - "x": 69, - "y": 202.1999969482422 + "x": 69.19999694824219, + "y": 176.1999969482422 }, { - "x": 77, - "y": 243 + "x": 78, + "y": 217 } ], "isCurve": true, @@ -201,19 +201,19 @@ "route": [ { "x": 87, - "y": 447 + "y": 395 }, { "x": 87, - "y": 407 + "y": 355 }, { "x": 87, - "y": 387 + "y": 340.20001220703125 }, { "x": 87, - "y": 347 + "y": 321 } ], "isCurve": true, @@ -252,15 +252,15 @@ }, { "x": 87, - "y": 182 + "y": 161.1999969482422 }, { "x": 87, - "y": 202 + "y": 176 }, { "x": 87, - "y": 242 + "y": 216 } ], "isCurve": true, @@ -294,20 +294,20 @@ "labelPercentage": 0, "route": [ { - "x": 98, - "y": 448 - }, - { - "x": 105.19999694824219, - "y": 407.20001220703125 + "x": 97, + "y": 395 }, { "x": 105, - "y": 387 + "y": 355 }, { - "x": 97, - "y": 347 + "x": 106, + "y": 340.20001220703125 + }, + { + "x": 102, + "y": 321 } ], "isCurve": true, @@ -341,20 +341,20 @@ "labelPercentage": 0, "route": [ { - "x": 77, - "y": 347 + "x": 72, + "y": 321 + }, + { + "x": 68, + "y": 340.20001220703125 }, { "x": 69, - "y": 387 + "y": 355 }, { - "x": 68.80000305175781, - "y": 407.20001220703125 - }, - { - "x": 76, - "y": 448 + "x": 77, + "y": 395 } ], "isCurve": true, @@ -388,19 +388,19 @@ "labelPercentage": 0, "route": [ { - "x": 97, - "y": 243 + "x": 96, + "y": 217 }, { - "x": 105, - "y": 202.1999969482422 + "x": 104.80000305175781, + "y": 176.1999969482422 }, { - "x": 105.4000015258789, - "y": 182 + "x": 106.19999694824219, + "y": 161.1999969482422 }, { - "x": 99, + "x": 103, "y": 142 } ], diff --git a/e2etests/testdata/stable/outside_bottom_labels/dagre/sketch.exp.svg b/e2etests/testdata/stable/outside_bottom_labels/dagre/sketch.exp.svg index bf848899a..99939528b 100644 --- a/e2etests/testdata/stable/outside_bottom_labels/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/outside_bottom_labels/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -Daphne SnickerdoodlePrudence McSnortlePolly Pizzazzle - + .d2-3305683316 .fill-N1{fill:#0A0F25;} + .d2-3305683316 .fill-N2{fill:#676C7E;} + .d2-3305683316 .fill-N3{fill:#9499AB;} + .d2-3305683316 .fill-N4{fill:#CFD2DD;} + .d2-3305683316 .fill-N5{fill:#DEE1EB;} + .d2-3305683316 .fill-N6{fill:#EEF1F8;} + .d2-3305683316 .fill-N7{fill:#FFFFFF;} + .d2-3305683316 .fill-B1{fill:#0D32B2;} + .d2-3305683316 .fill-B2{fill:#0D32B2;} + .d2-3305683316 .fill-B3{fill:#E3E9FD;} + .d2-3305683316 .fill-B4{fill:#E3E9FD;} + .d2-3305683316 .fill-B5{fill:#EDF0FD;} + .d2-3305683316 .fill-B6{fill:#F7F8FE;} + .d2-3305683316 .fill-AA2{fill:#4A6FF3;} + .d2-3305683316 .fill-AA4{fill:#EDF0FD;} + .d2-3305683316 .fill-AA5{fill:#F7F8FE;} + .d2-3305683316 .fill-AB4{fill:#EDF0FD;} + .d2-3305683316 .fill-AB5{fill:#F7F8FE;} + .d2-3305683316 .stroke-N1{stroke:#0A0F25;} + .d2-3305683316 .stroke-N2{stroke:#676C7E;} + .d2-3305683316 .stroke-N3{stroke:#9499AB;} + .d2-3305683316 .stroke-N4{stroke:#CFD2DD;} + .d2-3305683316 .stroke-N5{stroke:#DEE1EB;} + .d2-3305683316 .stroke-N6{stroke:#EEF1F8;} + .d2-3305683316 .stroke-N7{stroke:#FFFFFF;} + .d2-3305683316 .stroke-B1{stroke:#0D32B2;} + .d2-3305683316 .stroke-B2{stroke:#0D32B2;} + .d2-3305683316 .stroke-B3{stroke:#E3E9FD;} + .d2-3305683316 .stroke-B4{stroke:#E3E9FD;} + .d2-3305683316 .stroke-B5{stroke:#EDF0FD;} + .d2-3305683316 .stroke-B6{stroke:#F7F8FE;} + .d2-3305683316 .stroke-AA2{stroke:#4A6FF3;} + .d2-3305683316 .stroke-AA4{stroke:#EDF0FD;} + .d2-3305683316 .stroke-AA5{stroke:#F7F8FE;} + .d2-3305683316 .stroke-AB4{stroke:#EDF0FD;} + .d2-3305683316 .stroke-AB5{stroke:#F7F8FE;} + .d2-3305683316 .background-color-N1{background-color:#0A0F25;} + .d2-3305683316 .background-color-N2{background-color:#676C7E;} + .d2-3305683316 .background-color-N3{background-color:#9499AB;} + .d2-3305683316 .background-color-N4{background-color:#CFD2DD;} + .d2-3305683316 .background-color-N5{background-color:#DEE1EB;} + .d2-3305683316 .background-color-N6{background-color:#EEF1F8;} + .d2-3305683316 .background-color-N7{background-color:#FFFFFF;} + .d2-3305683316 .background-color-B1{background-color:#0D32B2;} + .d2-3305683316 .background-color-B2{background-color:#0D32B2;} + .d2-3305683316 .background-color-B3{background-color:#E3E9FD;} + .d2-3305683316 .background-color-B4{background-color:#E3E9FD;} + .d2-3305683316 .background-color-B5{background-color:#EDF0FD;} + .d2-3305683316 .background-color-B6{background-color:#F7F8FE;} + .d2-3305683316 .background-color-AA2{background-color:#4A6FF3;} + .d2-3305683316 .background-color-AA4{background-color:#EDF0FD;} + .d2-3305683316 .background-color-AA5{background-color:#F7F8FE;} + .d2-3305683316 .background-color-AB4{background-color:#EDF0FD;} + .d2-3305683316 .background-color-AB5{background-color:#F7F8FE;} + .d2-3305683316 .color-N1{color:#0A0F25;} + .d2-3305683316 .color-N2{color:#676C7E;} + .d2-3305683316 .color-N3{color:#9499AB;} + .d2-3305683316 .color-N4{color:#CFD2DD;} + .d2-3305683316 .color-N5{color:#DEE1EB;} + .d2-3305683316 .color-N6{color:#EEF1F8;} + .d2-3305683316 .color-N7{color:#FFFFFF;} + .d2-3305683316 .color-B1{color:#0D32B2;} + .d2-3305683316 .color-B2{color:#0D32B2;} + .d2-3305683316 .color-B3{color:#E3E9FD;} + .d2-3305683316 .color-B4{color:#E3E9FD;} + .d2-3305683316 .color-B5{color:#EDF0FD;} + .d2-3305683316 .color-B6{color:#F7F8FE;} + .d2-3305683316 .color-AA2{color:#4A6FF3;} + .d2-3305683316 .color-AA4{color:#EDF0FD;} + .d2-3305683316 .color-AA5{color:#F7F8FE;} + .d2-3305683316 .color-AB4{color:#EDF0FD;} + .d2-3305683316 .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}]]>Daphne SnickerdoodlePrudence McSnortlePolly Pizzazzle + - - + + \ No newline at end of file diff --git a/e2etests/testdata/stable/overlapping_image_container_labels/dagre/board.exp.json b/e2etests/testdata/stable/overlapping_image_container_labels/dagre/board.exp.json index 7f980921e..8241c4499 100644 --- a/e2etests/testdata/stable/overlapping_image_container_labels/dagre/board.exp.json +++ b/e2etests/testdata/stable/overlapping_image_container_labels/dagre/board.exp.json @@ -61,10 +61,10 @@ "type": "rectangle", "pos": { "x": 0, - "y": 295 + "y": 248 }, "width": 932, - "height": 963, + "height": 847, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -102,7 +102,7 @@ "type": "image", "pos": { "x": 402, - "y": 324 + "y": 278 }, "width": 128, "height": 128, @@ -155,10 +155,10 @@ "type": "rectangle", "pos": { "x": 20, - "y": 635 + "y": 547 }, "width": 436, - "height": 593, + "height": 518, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -196,7 +196,7 @@ "type": "image", "pos": { "x": 174, - "y": 667 + "y": 577 }, "width": 128, "height": 128, @@ -248,11 +248,11 @@ "id": "container.left2.inner", "type": "rectangle", "pos": { - "x": 40, - "y": 973 + "x": 50, + "y": 846 }, - "width": 396, - "height": 223, + "width": 376, + "height": 189, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -290,7 +290,7 @@ "type": "image", "pos": { "x": 80, - "y": 1008 + "y": 876 }, "width": 128, "height": 128, @@ -343,7 +343,7 @@ "type": "image", "pos": { "x": 268, - "y": 1008 + "y": 876 }, "width": 128, "height": 128, @@ -396,10 +396,10 @@ "type": "rectangle", "pos": { "x": 476, - "y": 635 + "y": 547 }, "width": 436, - "height": 593, + "height": 518, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -437,7 +437,7 @@ "type": "image", "pos": { "x": 630, - "y": 667 + "y": 577 }, "width": 128, "height": 128, @@ -489,11 +489,11 @@ "id": "container.right.inner", "type": "rectangle", "pos": { - "x": 496, - "y": 973 + "x": 506, + "y": 846 }, - "width": 396, - "height": 223, + "width": 376, + "height": 189, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -531,7 +531,7 @@ "type": "image", "pos": { "x": 536, - "y": 1008 + "y": 876 }, "width": 128, "height": 128, @@ -584,7 +584,7 @@ "type": "image", "pos": { "x": 724, - "y": 1008 + "y": 876 }, "width": 128, "height": 128, @@ -664,15 +664,15 @@ }, { "x": 466, - "y": 194 + "y": 173.1999969482422 }, { "x": 466, - "y": 268.1000061035156 + "y": 238 }, { "x": 466, - "y": 324.5 + "y": 278 } ], "isCurve": true, @@ -706,20 +706,20 @@ "labelPercentage": 0, "route": [ { - "x": 185.36000061035156, - "y": 821.5 + "x": 190, + "y": 704.5 }, { - "x": 152.27200317382812, - "y": 869.9000244140625 + "x": 153.1999969482422, + "y": 753.2999877929688 }, { "x": 144, - "y": 955.5999755859375 + "y": 836 }, { "x": 144, - "y": 1008 + "y": 876 } ], "isCurve": true, @@ -753,20 +753,20 @@ "labelPercentage": 0, "route": [ { - "x": 290.6400146484375, - "y": 821.5 + "x": 286, + "y": 704.5 }, { - "x": 323.7279968261719, - "y": 869.9000244140625 + "x": 322.79998779296875, + "y": 753.2999877929688 }, { "x": 332, - "y": 955.5999755859375 + "y": 836 }, { "x": 332, - "y": 1008 + "y": 876 } ], "isCurve": true, @@ -800,20 +800,20 @@ "labelPercentage": 0, "route": [ { - "x": 641.3599853515625, - "y": 821.5 + "x": 646, + "y": 704.5 }, { - "x": 608.27197265625, - "y": 869.9000244140625 + "x": 609.2000122070312, + "y": 753.2999877929688 }, { "x": 600, - "y": 955.5999755859375 + "y": 836 }, { "x": 600, - "y": 1008 + "y": 876 } ], "isCurve": true, @@ -847,20 +847,20 @@ "labelPercentage": 0, "route": [ { - "x": 746.6400146484375, - "y": 821.5 + "x": 742, + "y": 704.5 }, { - "x": 779.72802734375, - "y": 869.9000244140625 + "x": 778.7999877929688, + "y": 753.2999877929688 }, { "x": 788, - "y": 955.5999755859375 + "y": 836 }, { "x": 788, - "y": 1008 + "y": 876 } ], "isCurve": true, @@ -895,19 +895,19 @@ "route": [ { "x": 402, - "y": 440.09600830078125 + "y": 376.5 }, { "x": 270.79901123046875, - "y": 519.218994140625 + "y": 448.5 }, { "x": 238, - "y": 613.0999755859375 + "y": 537 }, { "x": 238, - "y": 667.5 + "y": 577 } ], "isCurve": true, @@ -942,19 +942,19 @@ "route": [ { "x": 530, - "y": 440.09600830078125 + "y": 376.5 }, { "x": 661.2000122070312, - "y": 519.218994140625 + "y": 448.5 }, { "x": 694, - "y": 613.0999755859375 + "y": 537 }, { "x": 694, - "y": 667.5 + "y": 577 } ], "isCurve": true, diff --git a/e2etests/testdata/stable/overlapping_image_container_labels/dagre/sketch.exp.svg b/e2etests/testdata/stable/overlapping_image_container_labels/dagre/sketch.exp.svg index 3bf1bc2fc..2a99b35e3 100644 --- a/e2etests/testdata/stable/overlapping_image_container_labels/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/overlapping_image_container_labels/dagre/sketch.exp.svg @@ -1,23 +1,23 @@ -rootcontainerrootleft2rightrootinnerrootinnerleft2rightleft2right to inner left2to inner rightto inner left2to inner rightto left2 container rootto right container root - + .d2-2980654810 .fill-N1{fill:#0A0F25;} + .d2-2980654810 .fill-N2{fill:#676C7E;} + .d2-2980654810 .fill-N3{fill:#9499AB;} + .d2-2980654810 .fill-N4{fill:#CFD2DD;} + .d2-2980654810 .fill-N5{fill:#DEE1EB;} + .d2-2980654810 .fill-N6{fill:#EEF1F8;} + .d2-2980654810 .fill-N7{fill:#FFFFFF;} + .d2-2980654810 .fill-B1{fill:#0D32B2;} + .d2-2980654810 .fill-B2{fill:#0D32B2;} + .d2-2980654810 .fill-B3{fill:#E3E9FD;} + .d2-2980654810 .fill-B4{fill:#E3E9FD;} + .d2-2980654810 .fill-B5{fill:#EDF0FD;} + .d2-2980654810 .fill-B6{fill:#F7F8FE;} + .d2-2980654810 .fill-AA2{fill:#4A6FF3;} + .d2-2980654810 .fill-AA4{fill:#EDF0FD;} + .d2-2980654810 .fill-AA5{fill:#F7F8FE;} + .d2-2980654810 .fill-AB4{fill:#EDF0FD;} + .d2-2980654810 .fill-AB5{fill:#F7F8FE;} + .d2-2980654810 .stroke-N1{stroke:#0A0F25;} + .d2-2980654810 .stroke-N2{stroke:#676C7E;} + .d2-2980654810 .stroke-N3{stroke:#9499AB;} + .d2-2980654810 .stroke-N4{stroke:#CFD2DD;} + .d2-2980654810 .stroke-N5{stroke:#DEE1EB;} + .d2-2980654810 .stroke-N6{stroke:#EEF1F8;} + .d2-2980654810 .stroke-N7{stroke:#FFFFFF;} + .d2-2980654810 .stroke-B1{stroke:#0D32B2;} + .d2-2980654810 .stroke-B2{stroke:#0D32B2;} + .d2-2980654810 .stroke-B3{stroke:#E3E9FD;} + .d2-2980654810 .stroke-B4{stroke:#E3E9FD;} + .d2-2980654810 .stroke-B5{stroke:#EDF0FD;} + .d2-2980654810 .stroke-B6{stroke:#F7F8FE;} + .d2-2980654810 .stroke-AA2{stroke:#4A6FF3;} + .d2-2980654810 .stroke-AA4{stroke:#EDF0FD;} + .d2-2980654810 .stroke-AA5{stroke:#F7F8FE;} + .d2-2980654810 .stroke-AB4{stroke:#EDF0FD;} + .d2-2980654810 .stroke-AB5{stroke:#F7F8FE;} + .d2-2980654810 .background-color-N1{background-color:#0A0F25;} + .d2-2980654810 .background-color-N2{background-color:#676C7E;} + .d2-2980654810 .background-color-N3{background-color:#9499AB;} + .d2-2980654810 .background-color-N4{background-color:#CFD2DD;} + .d2-2980654810 .background-color-N5{background-color:#DEE1EB;} + .d2-2980654810 .background-color-N6{background-color:#EEF1F8;} + .d2-2980654810 .background-color-N7{background-color:#FFFFFF;} + .d2-2980654810 .background-color-B1{background-color:#0D32B2;} + .d2-2980654810 .background-color-B2{background-color:#0D32B2;} + .d2-2980654810 .background-color-B3{background-color:#E3E9FD;} + .d2-2980654810 .background-color-B4{background-color:#E3E9FD;} + .d2-2980654810 .background-color-B5{background-color:#EDF0FD;} + .d2-2980654810 .background-color-B6{background-color:#F7F8FE;} + .d2-2980654810 .background-color-AA2{background-color:#4A6FF3;} + .d2-2980654810 .background-color-AA4{background-color:#EDF0FD;} + .d2-2980654810 .background-color-AA5{background-color:#F7F8FE;} + .d2-2980654810 .background-color-AB4{background-color:#EDF0FD;} + .d2-2980654810 .background-color-AB5{background-color:#F7F8FE;} + .d2-2980654810 .color-N1{color:#0A0F25;} + .d2-2980654810 .color-N2{color:#676C7E;} + .d2-2980654810 .color-N3{color:#9499AB;} + .d2-2980654810 .color-N4{color:#CFD2DD;} + .d2-2980654810 .color-N5{color:#DEE1EB;} + .d2-2980654810 .color-N6{color:#EEF1F8;} + .d2-2980654810 .color-N7{color:#FFFFFF;} + .d2-2980654810 .color-B1{color:#0D32B2;} + .d2-2980654810 .color-B2{color:#0D32B2;} + .d2-2980654810 .color-B3{color:#E3E9FD;} + .d2-2980654810 .color-B4{color:#E3E9FD;} + .d2-2980654810 .color-B5{color:#EDF0FD;} + .d2-2980654810 .color-B6{color:#F7F8FE;} + .d2-2980654810 .color-AA2{color:#4A6FF3;} + .d2-2980654810 .color-AA4{color:#EDF0FD;} + .d2-2980654810 .color-AA5{color:#F7F8FE;} + .d2-2980654810 .color-AB4{color:#EDF0FD;} + .d2-2980654810 .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}]]>rootcontainerrootleft2rightrootinnerrootinnerleft2rightleft2right to inner left2to inner rightto inner left2to inner rightto left2 container rootto right container root + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/self-referencing/dagre/board.exp.json b/e2etests/testdata/stable/self-referencing/dagre/board.exp.json index b6cff33a9..504fa726a 100644 --- a/e2etests/testdata/stable/self-referencing/dagre/board.exp.json +++ b/e2etests/testdata/stable/self-referencing/dagre/board.exp.json @@ -153,12 +153,12 @@ "labelPercentage": 0, "route": [ { - "x": 53, - "y": 18.384000778198242 + "x": 53.33300018310547, + "y": 18 }, { - "x": 79.66600036621094, - "y": 3.6760001182556152 + "x": 79.73300170898438, + "y": 3.5989999771118164 }, { "x": 88, @@ -197,12 +197,12 @@ "y": 59.400001525878906 }, { - "x": 79.66600036621094, - "y": 62.323001861572266 + "x": 79.73300170898438, + "y": 62.400001525878906 }, { - "x": 53, - "y": 47.6150016784668 + "x": 53.33300018310547, + "y": 48 } ], "isCurve": true, @@ -237,11 +237,11 @@ "route": [ { "x": 53, - "y": 22.889999389648438 + "y": 23 }, { "x": 101, - "y": 4.578000068664551 + "y": 4.598999977111816 }, { "x": 116, @@ -281,11 +281,11 @@ }, { "x": 101, - "y": 61.42100143432617 + "y": 61.400001525878906 }, { "x": 53, - "y": 43.10900115966797 + "y": 43 } ], "isCurve": true, @@ -413,12 +413,12 @@ "labelPercentage": 0, "route": [ { - "x": 245, - "y": 19.523000717163086 + "x": 244.66600036621094, + "y": 20 }, { - "x": 275.13299560546875, - "y": 3.9040000438690186 + "x": 275.0660095214844, + "y": 4 }, { "x": 284.54998779296875, @@ -457,12 +457,12 @@ "y": 59.400001525878906 }, { - "x": 275.13299560546875, - "y": 62.095001220703125 + "x": 275.0660095214844, + "y": 62 }, { - "x": 245, - "y": 46.47600173950195 + "x": 244.66600036621094, + "y": 46 } ], "isCurve": true, diff --git a/e2etests/testdata/stable/self-referencing/dagre/sketch.exp.svg b/e2etests/testdata/stable/self-referencing/dagre/sketch.exp.svg index b2cb11f9b..9d8e8a8f5 100644 --- a/e2etests/testdata/stable/self-referencing/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/self-referencing/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -xyz hello + .d2-741425355 .fill-N1{fill:#0A0F25;} + .d2-741425355 .fill-N2{fill:#676C7E;} + .d2-741425355 .fill-N3{fill:#9499AB;} + .d2-741425355 .fill-N4{fill:#CFD2DD;} + .d2-741425355 .fill-N5{fill:#DEE1EB;} + .d2-741425355 .fill-N6{fill:#EEF1F8;} + .d2-741425355 .fill-N7{fill:#FFFFFF;} + .d2-741425355 .fill-B1{fill:#0D32B2;} + .d2-741425355 .fill-B2{fill:#0D32B2;} + .d2-741425355 .fill-B3{fill:#E3E9FD;} + .d2-741425355 .fill-B4{fill:#E3E9FD;} + .d2-741425355 .fill-B5{fill:#EDF0FD;} + .d2-741425355 .fill-B6{fill:#F7F8FE;} + .d2-741425355 .fill-AA2{fill:#4A6FF3;} + .d2-741425355 .fill-AA4{fill:#EDF0FD;} + .d2-741425355 .fill-AA5{fill:#F7F8FE;} + .d2-741425355 .fill-AB4{fill:#EDF0FD;} + .d2-741425355 .fill-AB5{fill:#F7F8FE;} + .d2-741425355 .stroke-N1{stroke:#0A0F25;} + .d2-741425355 .stroke-N2{stroke:#676C7E;} + .d2-741425355 .stroke-N3{stroke:#9499AB;} + .d2-741425355 .stroke-N4{stroke:#CFD2DD;} + .d2-741425355 .stroke-N5{stroke:#DEE1EB;} + .d2-741425355 .stroke-N6{stroke:#EEF1F8;} + .d2-741425355 .stroke-N7{stroke:#FFFFFF;} + .d2-741425355 .stroke-B1{stroke:#0D32B2;} + .d2-741425355 .stroke-B2{stroke:#0D32B2;} + .d2-741425355 .stroke-B3{stroke:#E3E9FD;} + .d2-741425355 .stroke-B4{stroke:#E3E9FD;} + .d2-741425355 .stroke-B5{stroke:#EDF0FD;} + .d2-741425355 .stroke-B6{stroke:#F7F8FE;} + .d2-741425355 .stroke-AA2{stroke:#4A6FF3;} + .d2-741425355 .stroke-AA4{stroke:#EDF0FD;} + .d2-741425355 .stroke-AA5{stroke:#F7F8FE;} + .d2-741425355 .stroke-AB4{stroke:#EDF0FD;} + .d2-741425355 .stroke-AB5{stroke:#F7F8FE;} + .d2-741425355 .background-color-N1{background-color:#0A0F25;} + .d2-741425355 .background-color-N2{background-color:#676C7E;} + .d2-741425355 .background-color-N3{background-color:#9499AB;} + .d2-741425355 .background-color-N4{background-color:#CFD2DD;} + .d2-741425355 .background-color-N5{background-color:#DEE1EB;} + .d2-741425355 .background-color-N6{background-color:#EEF1F8;} + .d2-741425355 .background-color-N7{background-color:#FFFFFF;} + .d2-741425355 .background-color-B1{background-color:#0D32B2;} + .d2-741425355 .background-color-B2{background-color:#0D32B2;} + .d2-741425355 .background-color-B3{background-color:#E3E9FD;} + .d2-741425355 .background-color-B4{background-color:#E3E9FD;} + .d2-741425355 .background-color-B5{background-color:#EDF0FD;} + .d2-741425355 .background-color-B6{background-color:#F7F8FE;} + .d2-741425355 .background-color-AA2{background-color:#4A6FF3;} + .d2-741425355 .background-color-AA4{background-color:#EDF0FD;} + .d2-741425355 .background-color-AA5{background-color:#F7F8FE;} + .d2-741425355 .background-color-AB4{background-color:#EDF0FD;} + .d2-741425355 .background-color-AB5{background-color:#F7F8FE;} + .d2-741425355 .color-N1{color:#0A0F25;} + .d2-741425355 .color-N2{color:#676C7E;} + .d2-741425355 .color-N3{color:#9499AB;} + .d2-741425355 .color-N4{color:#CFD2DD;} + .d2-741425355 .color-N5{color:#DEE1EB;} + .d2-741425355 .color-N6{color:#EEF1F8;} + .d2-741425355 .color-N7{color:#FFFFFF;} + .d2-741425355 .color-B1{color:#0D32B2;} + .d2-741425355 .color-B2{color:#0D32B2;} + .d2-741425355 .color-B3{color:#E3E9FD;} + .d2-741425355 .color-B4{color:#E3E9FD;} + .d2-741425355 .color-B5{color:#EDF0FD;} + .d2-741425355 .color-B6{color:#F7F8FE;} + .d2-741425355 .color-AA2{color:#4A6FF3;} + .d2-741425355 .color-AA4{color:#EDF0FD;} + .d2-741425355 .color-AA5{color:#F7F8FE;} + .d2-741425355 .color-AB4{color:#EDF0FD;} + .d2-741425355 .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}]]>xyz hello diff --git a/e2etests/testdata/stable/sequence_diagrams/dagre/board.exp.json b/e2etests/testdata/stable/sequence_diagrams/dagre/board.exp.json index 4cf556290..baa755aa5 100644 --- a/e2etests/testdata/stable/sequence_diagrams/dagre/board.exp.json +++ b/e2etests/testdata/stable/sequence_diagrams/dagre/board.exp.json @@ -775,11 +775,11 @@ "id": "another", "type": "rectangle", "pos": { - "x": 994, - "y": 249 + "x": 1004, + "y": 231 }, - "width": 1034, - "height": 1205, + "width": 1014, + "height": 1201, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -817,7 +817,7 @@ "type": "sequence_diagram", "pos": { "x": 1034, - "y": 281 + "y": 261 }, "width": 954, "height": 1141, @@ -858,7 +858,7 @@ "type": "rectangle", "pos": { "x": 1046, - "y": 364 + "y": 344 }, "width": 100, "height": 66, @@ -899,7 +899,7 @@ "type": "rectangle", "pos": { "x": 1090, - "y": 490 + "y": 470 }, "width": 12, "height": 860, @@ -939,7 +939,7 @@ "type": "rectangle", "pos": { "x": 1186, - "y": 364 + "y": 344 }, "width": 140, "height": 66, @@ -980,7 +980,7 @@ "type": "rectangle", "pos": { "x": 1250, - "y": 490 + "y": 470 }, "width": 12, "height": 90, @@ -1020,7 +1020,7 @@ "type": "rectangle", "pos": { "x": 1356, - "y": 364 + "y": 344 }, "width": 100, "height": 66, @@ -1061,7 +1061,7 @@ "type": "rectangle", "pos": { "x": 1400, - "y": 630 + "y": 610 }, "width": 12, "height": 90, @@ -1101,7 +1101,7 @@ "type": "rectangle", "pos": { "x": 1496, - "y": 364 + "y": 344 }, "width": 126, "height": 66, @@ -1142,7 +1142,7 @@ "type": "rectangle", "pos": { "x": 1553, - "y": 770 + "y": 750 }, "width": 12, "height": 230, @@ -1182,7 +1182,7 @@ "type": "rectangle", "pos": { "x": 1549, - "y": 840 + "y": 820 }, "width": 20, "height": 90, @@ -1222,7 +1222,7 @@ "type": "rectangle", "pos": { "x": 1699, - "y": 364 + "y": 344 }, "width": 100, "height": 66, @@ -1263,7 +1263,7 @@ "type": "rectangle", "pos": { "x": 1743, - "y": 910 + "y": 890 }, "width": 12, "height": 30, @@ -1303,7 +1303,7 @@ "type": "rectangle", "pos": { "x": 1839, - "y": 364 + "y": 344 }, "width": 137, "height": 66, @@ -1344,7 +1344,7 @@ "type": "rectangle", "pos": { "x": 1901, - "y": 1050 + "y": 1030 }, "width": 12, "height": 30, @@ -1384,7 +1384,7 @@ "type": "rectangle", "pos": { "x": 1400, - "y": 1120 + "y": 1100 }, "width": 12, "height": 30, @@ -1424,7 +1424,7 @@ "type": "rectangle", "pos": { "x": 1400, - "y": 1190 + "y": 1170 }, "width": 12, "height": 30, @@ -1464,7 +1464,7 @@ "type": "rectangle", "pos": { "x": 1901, - "y": 1260 + "y": 1240 }, "width": 12, "height": 30, @@ -1504,7 +1504,7 @@ "type": "rectangle", "pos": { "x": 1901, - "y": 1330 + "y": 1310 }, "width": 12, "height": 30, @@ -1585,10 +1585,10 @@ "type": "queue", "pos": { "x": 1238, - "y": 1595 + "y": 1554 }, "width": 1074, - "height": 850, + "height": 891, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1626,7 +1626,7 @@ "type": "sequence_diagram", "pos": { "x": 1313, - "y": 1624 + "y": 1604 }, "width": 934, "height": 791, @@ -1667,7 +1667,7 @@ "type": "rectangle", "pos": { "x": 1325, - "y": 1707 + "y": 1687 }, "width": 100, "height": 66, @@ -1708,7 +1708,7 @@ "type": "rectangle", "pos": { "x": 1475, - "y": 1707 + "y": 1687 }, "width": 100, "height": 66, @@ -1749,7 +1749,7 @@ "type": "rectangle", "pos": { "x": 1615, - "y": 1707 + "y": 1687 }, "width": 126, "height": 66, @@ -1790,7 +1790,7 @@ "type": "rectangle", "pos": { "x": 1778, - "y": 1707 + "y": 1687 }, "width": 100, "height": 66, @@ -1831,7 +1831,7 @@ "type": "rectangle", "pos": { "x": 1918, - "y": 1707 + "y": 1687 }, "width": 137, "height": 66, @@ -1872,7 +1872,7 @@ "type": "rectangle", "pos": { "x": 2095, - "y": 1707 + "y": 1687 }, "width": 140, "height": 66, @@ -1913,7 +1913,7 @@ "type": "rectangle", "pos": { "x": 2159, - "y": 1833 + "y": 1813 }, "width": 12, "height": 30, @@ -1953,7 +1953,7 @@ "type": "rectangle", "pos": { "x": 1822, - "y": 1823 + "y": 1803 }, "width": 12, "height": 380, @@ -1993,7 +1993,7 @@ "type": "rectangle", "pos": { "x": 1818, - "y": 1833 + "y": 1813 }, "width": 20, "height": 90, @@ -2033,7 +2033,7 @@ "type": "rectangle", "pos": { "x": 1672, - "y": 1883 + "y": 1863 }, "width": 12, "height": 190, @@ -2073,7 +2073,7 @@ "type": "rectangle", "pos": { "x": 1668, - "y": 1893 + "y": 1873 }, "width": 20, "height": 170, @@ -2113,7 +2113,7 @@ "type": "rectangle", "pos": { "x": 1664, - "y": 1903 + "y": 1883 }, "width": 28, "height": 90, @@ -2153,7 +2153,7 @@ "type": "rectangle", "pos": { "x": 1519, - "y": 1943 + "y": 1923 }, "width": 12, "height": 220, @@ -2193,7 +2193,7 @@ "type": "rectangle", "pos": { "x": 1515, - "y": 1953 + "y": 1933 }, "width": 20, "height": 200, @@ -2233,7 +2233,7 @@ "type": "rectangle", "pos": { "x": 1511, - "y": 1963 + "y": 1943 }, "width": 28, "height": 180, @@ -2273,7 +2273,7 @@ "type": "rectangle", "pos": { "x": 1507, - "y": 1973 + "y": 1953 }, "width": 36, "height": 160, @@ -2313,7 +2313,7 @@ "type": "rectangle", "pos": { "x": 1980, - "y": 2073 + "y": 2053 }, "width": 12, "height": 240, @@ -2353,7 +2353,7 @@ "type": "rectangle", "pos": { "x": 1976, - "y": 2083 + "y": 2063 }, "width": 20, "height": 220, @@ -2393,7 +2393,7 @@ "type": "rectangle", "pos": { "x": 1972, - "y": 2093 + "y": 2073 }, "width": 28, "height": 200, @@ -2433,7 +2433,7 @@ "type": "rectangle", "pos": { "x": 1968, - "y": 2103 + "y": 2083 }, "width": 36, "height": 180, @@ -2473,7 +2473,7 @@ "type": "rectangle", "pos": { "x": 1964, - "y": 2113 + "y": 2093 }, "width": 44, "height": 160, @@ -2513,7 +2513,7 @@ "type": "rectangle", "pos": { "x": 1369, - "y": 2183 + "y": 2163 }, "width": 12, "height": 30, @@ -2553,7 +2553,7 @@ "type": "rectangle", "pos": { "x": 2159, - "y": 2323 + "y": 2303 }, "width": 12, "height": 30, @@ -3110,11 +3110,11 @@ "route": [ { "x": 1102, - "y": 500.5 + "y": 480 }, { "x": 1250, - "y": 500.5 + "y": 480 } ], "animated": false, @@ -3148,11 +3148,11 @@ "route": [ { "x": 1102, - "y": 570.5 + "y": 550 }, { "x": 1250, - "y": 570.5 + "y": 550 } ], "animated": false, @@ -3186,11 +3186,11 @@ "route": [ { "x": 1102, - "y": 640.5 + "y": 620 }, { "x": 1400, - "y": 640.5 + "y": 620 } ], "animated": false, @@ -3224,11 +3224,11 @@ "route": [ { "x": 1102, - "y": 710.5 + "y": 690 }, { "x": 1400, - "y": 710.5 + "y": 690 } ], "animated": false, @@ -3262,11 +3262,11 @@ "route": [ { "x": 1102, - "y": 780.5 + "y": 760 }, { "x": 1553, - "y": 780.5 + "y": 760 } ], "animated": false, @@ -3300,11 +3300,11 @@ "route": [ { "x": 1256, - "y": 850.5 + "y": 830 }, { "x": 1549, - "y": 850.5 + "y": 830 } ], "animated": false, @@ -3338,11 +3338,11 @@ "route": [ { "x": 1569, - "y": 920.5 + "y": 900 }, { "x": 1743, - "y": 920.5 + "y": 900 } ], "animated": false, @@ -3376,11 +3376,11 @@ "route": [ { "x": 1096, - "y": 990.5 + "y": 970 }, { "x": 1553, - "y": 990.5 + "y": 970 } ], "animated": false, @@ -3414,11 +3414,11 @@ "route": [ { "x": 1102, - "y": 1060.5 + "y": 1040 }, { "x": 1901.5, - "y": 1060.5 + "y": 1040 } ], "animated": false, @@ -3452,11 +3452,11 @@ "route": [ { "x": 1102, - "y": 1130.5 + "y": 1110 }, { "x": 1400, - "y": 1130.5 + "y": 1110 } ], "animated": false, @@ -3490,11 +3490,11 @@ "route": [ { "x": 1102, - "y": 1200.5 + "y": 1180 }, { "x": 1400, - "y": 1200.5 + "y": 1180 } ], "animated": false, @@ -3528,11 +3528,11 @@ "route": [ { "x": 1102, - "y": 1270.5 + "y": 1250 }, { "x": 1901.5, - "y": 1270.5 + "y": 1250 } ], "animated": false, @@ -3566,11 +3566,11 @@ "route": [ { "x": 1102, - "y": 1340.5 + "y": 1320 }, { "x": 1901.5, - "y": 1340.5 + "y": 1320 } ], "animated": false, @@ -3659,11 +3659,11 @@ }, { "x": 1511, - "y": 222.60000610351562 + "y": 218.5 }, { "x": 1511, - "y": 281 + "y": 260.5 } ], "isCurve": true, @@ -3757,11 +3757,11 @@ "route": [ { "x": 1511, - "y": 1423 + "y": 1402.5 }, { "x": 1511, - "y": 1447.800048828125 + "y": 1443.699951171875 }, { "x": 1511, @@ -3777,11 +3777,11 @@ }, { "x": 1517, - "y": 1568.0999755859375 + "y": 1564 }, { "x": 1541, - "y": 1624.5 + "y": 1604 } ], "isCurve": true, @@ -3860,11 +3860,11 @@ }, { "x": 2048, - "y": 1522.199951171875 + "y": 1514 }, { "x": 2048, - "y": 1595 + "y": 1554 } ], "isCurve": true, @@ -3899,11 +3899,11 @@ "route": [ { "x": 2159, - "y": 1843.5 + "y": 1823 }, { "x": 1838, - "y": 1843.5 + "y": 1823 } ], "animated": false, @@ -3937,11 +3937,11 @@ "route": [ { "x": 1818, - "y": 1913.5 + "y": 1893 }, { "x": 1692, - "y": 1913.5 + "y": 1893 } ], "animated": false, @@ -3975,11 +3975,11 @@ "route": [ { "x": 1664, - "y": 1983.5 + "y": 1963 }, { "x": 1543, - "y": 1983.5 + "y": 1963 } ], "animated": false, @@ -4013,11 +4013,11 @@ "route": [ { "x": 1822, - "y": 2053.5 + "y": 2033 }, { "x": 1688, - "y": 2053.5 + "y": 2033 } ], "animated": false, @@ -4051,11 +4051,11 @@ "route": [ { "x": 1543, - "y": 2123.5 + "y": 2103 }, { "x": 1964.5, - "y": 2123.5 + "y": 2103 } ], "animated": false, @@ -4089,11 +4089,11 @@ "route": [ { "x": 1381, - "y": 2193.5 + "y": 2173 }, { "x": 1822, - "y": 2193.5 + "y": 2173 } ], "animated": false, @@ -4127,11 +4127,11 @@ "route": [ { "x": 1964.5, - "y": 2263.5 + "y": 2243 }, { "x": 1375, - "y": 2263.5 + "y": 2243 } ], "animated": false, @@ -4165,11 +4165,11 @@ "route": [ { "x": 1375, - "y": 2333.5 + "y": 2313 }, { "x": 2159, - "y": 2333.5 + "y": 2313 } ], "animated": false, @@ -4431,11 +4431,11 @@ "route": [ { "x": 1096, - "y": 430.5 + "y": 410 }, { "x": 1096, - "y": 1410.5 + "y": 1390 } ], "animated": false, @@ -4469,11 +4469,11 @@ "route": [ { "x": 1256, - "y": 430.5 + "y": 410 }, { "x": 1256, - "y": 1410.5 + "y": 1390 } ], "animated": false, @@ -4507,11 +4507,11 @@ "route": [ { "x": 1406, - "y": 430.5 + "y": 410 }, { "x": 1406, - "y": 1410.5 + "y": 1390 } ], "animated": false, @@ -4545,11 +4545,11 @@ "route": [ { "x": 1559, - "y": 430.5 + "y": 410 }, { "x": 1559, - "y": 1410.5 + "y": 1390 } ], "animated": false, @@ -4583,11 +4583,11 @@ "route": [ { "x": 1749, - "y": 430.5 + "y": 410 }, { "x": 1749, - "y": 1410.5 + "y": 1390 } ], "animated": false, @@ -4621,11 +4621,11 @@ "route": [ { "x": 1907.5, - "y": 430.5 + "y": 410 }, { "x": 1907.5, - "y": 1410.5 + "y": 1390 } ], "animated": false, @@ -4659,11 +4659,11 @@ "route": [ { "x": 1375, - "y": 1773.5 + "y": 1753 }, { "x": 1375, - "y": 2403.5 + "y": 2383 } ], "animated": false, @@ -4697,11 +4697,11 @@ "route": [ { "x": 1525, - "y": 1773.5 + "y": 1753 }, { "x": 1525, - "y": 2403.5 + "y": 2383 } ], "animated": false, @@ -4735,11 +4735,11 @@ "route": [ { "x": 1678, - "y": 1773.5 + "y": 1753 }, { "x": 1678, - "y": 2403.5 + "y": 2383 } ], "animated": false, @@ -4773,11 +4773,11 @@ "route": [ { "x": 1828, - "y": 1773.5 + "y": 1753 }, { "x": 1828, - "y": 2403.5 + "y": 2383 } ], "animated": false, @@ -4811,11 +4811,11 @@ "route": [ { "x": 1986.5, - "y": 1773.5 + "y": 1753 }, { "x": 1986.5, - "y": 2403.5 + "y": 2383 } ], "animated": false, @@ -4849,11 +4849,11 @@ "route": [ { "x": 2165, - "y": 1773.5 + "y": 1753 }, { "x": 2165, - "y": 2403.5 + "y": 2383 } ], "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 d079a9325..87c97ade9 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-255106218 .fill-N1{fill:#0A0F25;} + .d2-255106218 .fill-N2{fill:#676C7E;} + .d2-255106218 .fill-N3{fill:#9499AB;} + .d2-255106218 .fill-N4{fill:#CFD2DD;} + .d2-255106218 .fill-N5{fill:#DEE1EB;} + .d2-255106218 .fill-N6{fill:#EEF1F8;} + .d2-255106218 .fill-N7{fill:#FFFFFF;} + .d2-255106218 .fill-B1{fill:#0D32B2;} + .d2-255106218 .fill-B2{fill:#0D32B2;} + .d2-255106218 .fill-B3{fill:#E3E9FD;} + .d2-255106218 .fill-B4{fill:#E3E9FD;} + .d2-255106218 .fill-B5{fill:#EDF0FD;} + .d2-255106218 .fill-B6{fill:#F7F8FE;} + .d2-255106218 .fill-AA2{fill:#4A6FF3;} + .d2-255106218 .fill-AA4{fill:#EDF0FD;} + .d2-255106218 .fill-AA5{fill:#F7F8FE;} + .d2-255106218 .fill-AB4{fill:#EDF0FD;} + .d2-255106218 .fill-AB5{fill:#F7F8FE;} + .d2-255106218 .stroke-N1{stroke:#0A0F25;} + .d2-255106218 .stroke-N2{stroke:#676C7E;} + .d2-255106218 .stroke-N3{stroke:#9499AB;} + .d2-255106218 .stroke-N4{stroke:#CFD2DD;} + .d2-255106218 .stroke-N5{stroke:#DEE1EB;} + .d2-255106218 .stroke-N6{stroke:#EEF1F8;} + .d2-255106218 .stroke-N7{stroke:#FFFFFF;} + .d2-255106218 .stroke-B1{stroke:#0D32B2;} + .d2-255106218 .stroke-B2{stroke:#0D32B2;} + .d2-255106218 .stroke-B3{stroke:#E3E9FD;} + .d2-255106218 .stroke-B4{stroke:#E3E9FD;} + .d2-255106218 .stroke-B5{stroke:#EDF0FD;} + .d2-255106218 .stroke-B6{stroke:#F7F8FE;} + .d2-255106218 .stroke-AA2{stroke:#4A6FF3;} + .d2-255106218 .stroke-AA4{stroke:#EDF0FD;} + .d2-255106218 .stroke-AA5{stroke:#F7F8FE;} + .d2-255106218 .stroke-AB4{stroke:#EDF0FD;} + .d2-255106218 .stroke-AB5{stroke:#F7F8FE;} + .d2-255106218 .background-color-N1{background-color:#0A0F25;} + .d2-255106218 .background-color-N2{background-color:#676C7E;} + .d2-255106218 .background-color-N3{background-color:#9499AB;} + .d2-255106218 .background-color-N4{background-color:#CFD2DD;} + .d2-255106218 .background-color-N5{background-color:#DEE1EB;} + .d2-255106218 .background-color-N6{background-color:#EEF1F8;} + .d2-255106218 .background-color-N7{background-color:#FFFFFF;} + .d2-255106218 .background-color-B1{background-color:#0D32B2;} + .d2-255106218 .background-color-B2{background-color:#0D32B2;} + .d2-255106218 .background-color-B3{background-color:#E3E9FD;} + .d2-255106218 .background-color-B4{background-color:#E3E9FD;} + .d2-255106218 .background-color-B5{background-color:#EDF0FD;} + .d2-255106218 .background-color-B6{background-color:#F7F8FE;} + .d2-255106218 .background-color-AA2{background-color:#4A6FF3;} + .d2-255106218 .background-color-AA4{background-color:#EDF0FD;} + .d2-255106218 .background-color-AA5{background-color:#F7F8FE;} + .d2-255106218 .background-color-AB4{background-color:#EDF0FD;} + .d2-255106218 .background-color-AB5{background-color:#F7F8FE;} + .d2-255106218 .color-N1{color:#0A0F25;} + .d2-255106218 .color-N2{color:#676C7E;} + .d2-255106218 .color-N3{color:#9499AB;} + .d2-255106218 .color-N4{color:#CFD2DD;} + .d2-255106218 .color-N5{color:#DEE1EB;} + .d2-255106218 .color-N6{color:#EEF1F8;} + .d2-255106218 .color-N7{color:#FFFFFF;} + .d2-255106218 .color-B1{color:#0D32B2;} + .d2-255106218 .color-B2{color:#0D32B2;} + .d2-255106218 .color-B3{color:#E3E9FD;} + .d2-255106218 .color-B4{color:#E3E9FD;} + .d2-255106218 .color-B5{color:#EDF0FD;} + .d2-255106218 .color-B6{color:#F7F8FE;} + .d2-255106218 .color-AA2{color:#4A6FF3;} + .d2-255106218 .color-AA4{color:#EDF0FD;} + .d2-255106218 .color-AA5{color:#F7F8FE;} + .d2-255106218 .color-AB4{color:#EDF0FD;} + .d2-255106218 .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) - + - + - - - - - - - - - - - - - - + + + + + + + + + + + + + + @@ -142,16 +142,16 @@ - - - - - - - - - - - - + + + + + + + + + + + + \ 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 12b8ca096..f9b1fbdbc 100644 --- a/e2etests/testdata/stable/sequence_diagrams/elk/board.exp.json +++ b/e2etests/testdata/stable/sequence_diagrams/elk/board.exp.json @@ -3616,7 +3616,7 @@ }, { "x": 489, - "y": 252.5 + "y": 253 } ], "animated": false, @@ -3688,7 +3688,7 @@ "route": [ { "x": 489, - "y": 1398.5 + "y": 1398 }, { "x": 489, diff --git a/e2etests/testdata/stable/sequence_diagrams/elk/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagrams/elk/sketch.exp.svg index 62057a24d..47693e83e 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-2497879949 .fill-N1{fill:#0A0F25;} + .d2-2497879949 .fill-N2{fill:#676C7E;} + .d2-2497879949 .fill-N3{fill:#9499AB;} + .d2-2497879949 .fill-N4{fill:#CFD2DD;} + .d2-2497879949 .fill-N5{fill:#DEE1EB;} + .d2-2497879949 .fill-N6{fill:#EEF1F8;} + .d2-2497879949 .fill-N7{fill:#FFFFFF;} + .d2-2497879949 .fill-B1{fill:#0D32B2;} + .d2-2497879949 .fill-B2{fill:#0D32B2;} + .d2-2497879949 .fill-B3{fill:#E3E9FD;} + .d2-2497879949 .fill-B4{fill:#E3E9FD;} + .d2-2497879949 .fill-B5{fill:#EDF0FD;} + .d2-2497879949 .fill-B6{fill:#F7F8FE;} + .d2-2497879949 .fill-AA2{fill:#4A6FF3;} + .d2-2497879949 .fill-AA4{fill:#EDF0FD;} + .d2-2497879949 .fill-AA5{fill:#F7F8FE;} + .d2-2497879949 .fill-AB4{fill:#EDF0FD;} + .d2-2497879949 .fill-AB5{fill:#F7F8FE;} + .d2-2497879949 .stroke-N1{stroke:#0A0F25;} + .d2-2497879949 .stroke-N2{stroke:#676C7E;} + .d2-2497879949 .stroke-N3{stroke:#9499AB;} + .d2-2497879949 .stroke-N4{stroke:#CFD2DD;} + .d2-2497879949 .stroke-N5{stroke:#DEE1EB;} + .d2-2497879949 .stroke-N6{stroke:#EEF1F8;} + .d2-2497879949 .stroke-N7{stroke:#FFFFFF;} + .d2-2497879949 .stroke-B1{stroke:#0D32B2;} + .d2-2497879949 .stroke-B2{stroke:#0D32B2;} + .d2-2497879949 .stroke-B3{stroke:#E3E9FD;} + .d2-2497879949 .stroke-B4{stroke:#E3E9FD;} + .d2-2497879949 .stroke-B5{stroke:#EDF0FD;} + .d2-2497879949 .stroke-B6{stroke:#F7F8FE;} + .d2-2497879949 .stroke-AA2{stroke:#4A6FF3;} + .d2-2497879949 .stroke-AA4{stroke:#EDF0FD;} + .d2-2497879949 .stroke-AA5{stroke:#F7F8FE;} + .d2-2497879949 .stroke-AB4{stroke:#EDF0FD;} + .d2-2497879949 .stroke-AB5{stroke:#F7F8FE;} + .d2-2497879949 .background-color-N1{background-color:#0A0F25;} + .d2-2497879949 .background-color-N2{background-color:#676C7E;} + .d2-2497879949 .background-color-N3{background-color:#9499AB;} + .d2-2497879949 .background-color-N4{background-color:#CFD2DD;} + .d2-2497879949 .background-color-N5{background-color:#DEE1EB;} + .d2-2497879949 .background-color-N6{background-color:#EEF1F8;} + .d2-2497879949 .background-color-N7{background-color:#FFFFFF;} + .d2-2497879949 .background-color-B1{background-color:#0D32B2;} + .d2-2497879949 .background-color-B2{background-color:#0D32B2;} + .d2-2497879949 .background-color-B3{background-color:#E3E9FD;} + .d2-2497879949 .background-color-B4{background-color:#E3E9FD;} + .d2-2497879949 .background-color-B5{background-color:#EDF0FD;} + .d2-2497879949 .background-color-B6{background-color:#F7F8FE;} + .d2-2497879949 .background-color-AA2{background-color:#4A6FF3;} + .d2-2497879949 .background-color-AA4{background-color:#EDF0FD;} + .d2-2497879949 .background-color-AA5{background-color:#F7F8FE;} + .d2-2497879949 .background-color-AB4{background-color:#EDF0FD;} + .d2-2497879949 .background-color-AB5{background-color:#F7F8FE;} + .d2-2497879949 .color-N1{color:#0A0F25;} + .d2-2497879949 .color-N2{color:#676C7E;} + .d2-2497879949 .color-N3{color:#9499AB;} + .d2-2497879949 .color-N4{color:#CFD2DD;} + .d2-2497879949 .color-N5{color:#DEE1EB;} + .d2-2497879949 .color-N6{color:#EEF1F8;} + .d2-2497879949 .color-N7{color:#FFFFFF;} + .d2-2497879949 .color-B1{color:#0D32B2;} + .d2-2497879949 .color-B2{color:#0D32B2;} + .d2-2497879949 .color-B3{color:#E3E9FD;} + .d2-2497879949 .color-B4{color:#E3E9FD;} + .d2-2497879949 .color-B5{color:#EDF0FD;} + .d2-2497879949 .color-B6{color:#F7F8FE;} + .d2-2497879949 .color-AA2{color:#4A6FF3;} + .d2-2497879949 .color-AA4{color:#EDF0FD;} + .d2-2497879949 .color-AA5{color:#F7F8FE;} + .d2-2497879949 .color-AB4{color:#EDF0FD;} + .d2-2497879949 .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) diff --git a/e2etests/testdata/stable/square_3d/dagre/board.exp.json b/e2etests/testdata/stable/square_3d/dagre/board.exp.json index 97b6ad726..d5c0c9def 100644 --- a/e2etests/testdata/stable/square_3d/dagre/board.exp.json +++ b/e2etests/testdata/stable/square_3d/dagre/board.exp.json @@ -8,7 +8,7 @@ "type": "rectangle", "pos": { "x": 0, - "y": 15 + "y": 0 }, "width": 111, "height": 66, @@ -49,7 +49,7 @@ "type": "rectangle", "pos": { "x": 9, - "y": 196 + "y": 166 }, "width": 94, "height": 94, @@ -112,20 +112,20 @@ "labelPercentage": 0, "route": [ { - "x": 63, - "y": 81 + "x": 55.5, + "y": 66 }, { - "x": 63, - "y": 121 + "x": 55.5, + "y": 106 }, { - "x": 63, - "y": 141 + "x": 55.5, + "y": 123 }, { - "x": 63, - "y": 181 + "x": 55.5, + "y": 151 } ], "isCurve": true, diff --git a/e2etests/testdata/stable/square_3d/dagre/sketch.exp.svg b/e2etests/testdata/stable/square_3d/dagre/sketch.exp.svg index 2a6778bd9..58f8bc375 100644 --- a/e2etests/testdata/stable/square_3d/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/square_3d/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ - - -rectangle - -square - - - + .d2-3271298053 .fill-N1{fill:#0A0F25;} + .d2-3271298053 .fill-N2{fill:#676C7E;} + .d2-3271298053 .fill-N3{fill:#9499AB;} + .d2-3271298053 .fill-N4{fill:#CFD2DD;} + .d2-3271298053 .fill-N5{fill:#DEE1EB;} + .d2-3271298053 .fill-N6{fill:#EEF1F8;} + .d2-3271298053 .fill-N7{fill:#FFFFFF;} + .d2-3271298053 .fill-B1{fill:#0D32B2;} + .d2-3271298053 .fill-B2{fill:#0D32B2;} + .d2-3271298053 .fill-B3{fill:#E3E9FD;} + .d2-3271298053 .fill-B4{fill:#E3E9FD;} + .d2-3271298053 .fill-B5{fill:#EDF0FD;} + .d2-3271298053 .fill-B6{fill:#F7F8FE;} + .d2-3271298053 .fill-AA2{fill:#4A6FF3;} + .d2-3271298053 .fill-AA4{fill:#EDF0FD;} + .d2-3271298053 .fill-AA5{fill:#F7F8FE;} + .d2-3271298053 .fill-AB4{fill:#EDF0FD;} + .d2-3271298053 .fill-AB5{fill:#F7F8FE;} + .d2-3271298053 .stroke-N1{stroke:#0A0F25;} + .d2-3271298053 .stroke-N2{stroke:#676C7E;} + .d2-3271298053 .stroke-N3{stroke:#9499AB;} + .d2-3271298053 .stroke-N4{stroke:#CFD2DD;} + .d2-3271298053 .stroke-N5{stroke:#DEE1EB;} + .d2-3271298053 .stroke-N6{stroke:#EEF1F8;} + .d2-3271298053 .stroke-N7{stroke:#FFFFFF;} + .d2-3271298053 .stroke-B1{stroke:#0D32B2;} + .d2-3271298053 .stroke-B2{stroke:#0D32B2;} + .d2-3271298053 .stroke-B3{stroke:#E3E9FD;} + .d2-3271298053 .stroke-B4{stroke:#E3E9FD;} + .d2-3271298053 .stroke-B5{stroke:#EDF0FD;} + .d2-3271298053 .stroke-B6{stroke:#F7F8FE;} + .d2-3271298053 .stroke-AA2{stroke:#4A6FF3;} + .d2-3271298053 .stroke-AA4{stroke:#EDF0FD;} + .d2-3271298053 .stroke-AA5{stroke:#F7F8FE;} + .d2-3271298053 .stroke-AB4{stroke:#EDF0FD;} + .d2-3271298053 .stroke-AB5{stroke:#F7F8FE;} + .d2-3271298053 .background-color-N1{background-color:#0A0F25;} + .d2-3271298053 .background-color-N2{background-color:#676C7E;} + .d2-3271298053 .background-color-N3{background-color:#9499AB;} + .d2-3271298053 .background-color-N4{background-color:#CFD2DD;} + .d2-3271298053 .background-color-N5{background-color:#DEE1EB;} + .d2-3271298053 .background-color-N6{background-color:#EEF1F8;} + .d2-3271298053 .background-color-N7{background-color:#FFFFFF;} + .d2-3271298053 .background-color-B1{background-color:#0D32B2;} + .d2-3271298053 .background-color-B2{background-color:#0D32B2;} + .d2-3271298053 .background-color-B3{background-color:#E3E9FD;} + .d2-3271298053 .background-color-B4{background-color:#E3E9FD;} + .d2-3271298053 .background-color-B5{background-color:#EDF0FD;} + .d2-3271298053 .background-color-B6{background-color:#F7F8FE;} + .d2-3271298053 .background-color-AA2{background-color:#4A6FF3;} + .d2-3271298053 .background-color-AA4{background-color:#EDF0FD;} + .d2-3271298053 .background-color-AA5{background-color:#F7F8FE;} + .d2-3271298053 .background-color-AB4{background-color:#EDF0FD;} + .d2-3271298053 .background-color-AB5{background-color:#F7F8FE;} + .d2-3271298053 .color-N1{color:#0A0F25;} + .d2-3271298053 .color-N2{color:#676C7E;} + .d2-3271298053 .color-N3{color:#9499AB;} + .d2-3271298053 .color-N4{color:#CFD2DD;} + .d2-3271298053 .color-N5{color:#DEE1EB;} + .d2-3271298053 .color-N6{color:#EEF1F8;} + .d2-3271298053 .color-N7{color:#FFFFFF;} + .d2-3271298053 .color-B1{color:#0D32B2;} + .d2-3271298053 .color-B2{color:#0D32B2;} + .d2-3271298053 .color-B3{color:#E3E9FD;} + .d2-3271298053 .color-B4{color:#E3E9FD;} + .d2-3271298053 .color-B5{color:#EDF0FD;} + .d2-3271298053 .color-B6{color:#F7F8FE;} + .d2-3271298053 .color-AA2{color:#4A6FF3;} + .d2-3271298053 .color-AA4{color:#EDF0FD;} + .d2-3271298053 .color-AA5{color:#F7F8FE;} + .d2-3271298053 .color-AB4{color:#EDF0FD;} + .d2-3271298053 .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}]]> + +rectangle + +square + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/straight_hierarchy_container/dagre/board.exp.json b/e2etests/testdata/stable/straight_hierarchy_container/dagre/board.exp.json index 69a24f07e..2589ae801 100644 --- a/e2etests/testdata/stable/straight_hierarchy_container/dagre/board.exp.json +++ b/e2etests/testdata/stable/straight_hierarchy_container/dagre/board.exp.json @@ -130,11 +130,11 @@ "id": "l1", "type": "rectangle", "pos": { - "x": 20, - "y": 207 + "x": 30, + "y": 186 }, - "width": 439, - "height": 125, + "width": 419, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -172,7 +172,7 @@ "type": "rectangle", "pos": { "x": 213, - "y": 236 + "y": 216 }, "width": 53, "height": 66, @@ -213,7 +213,7 @@ "type": "rectangle", "pos": { "x": 60, - "y": 236 + "y": 216 }, "width": 53, "height": 66, @@ -254,7 +254,7 @@ "type": "rectangle", "pos": { "x": 366, - "y": 236 + "y": 216 }, "width": 53, "height": 66, @@ -294,11 +294,11 @@ "id": "l2c1", "type": "rectangle", "pos": { - "x": 20, - "y": 473 + "x": 30, + "y": 452 }, - "width": 133, - "height": 125, + "width": 113, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -336,7 +336,7 @@ "type": "rectangle", "pos": { "x": 60, - "y": 502 + "y": 482 }, "width": 53, "height": 66, @@ -376,11 +376,11 @@ "id": "l2c3", "type": "rectangle", "pos": { - "x": 326, - "y": 473 + "x": 336, + "y": 452 }, - "width": 133, - "height": 125, + "width": 113, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -418,7 +418,7 @@ "type": "rectangle", "pos": { "x": 366, - "y": 502 + "y": 482 }, "width": 53, "height": 66, @@ -458,11 +458,11 @@ "id": "l2c2", "type": "rectangle", "pos": { - "x": 173, - "y": 473 + "x": 183, + "y": 452 }, - "width": 133, - "height": 125, + "width": 113, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -500,7 +500,7 @@ "type": "rectangle", "pos": { "x": 213, - "y": 502 + "y": 482 }, "width": 53, "height": 66, @@ -540,11 +540,11 @@ "id": "l3c1", "type": "rectangle", "pos": { - "x": 20, - "y": 739 + "x": 30, + "y": 718 }, - "width": 286, - "height": 125, + "width": 266, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -582,7 +582,7 @@ "type": "rectangle", "pos": { "x": 60, - "y": 768 + "y": 748 }, "width": 53, "height": 66, @@ -623,7 +623,7 @@ "type": "rectangle", "pos": { "x": 213, - "y": 768 + "y": 748 }, "width": 53, "height": 66, @@ -663,11 +663,11 @@ "id": "l3c2", "type": "rectangle", "pos": { - "x": 326, - "y": 739 + "x": 336, + "y": 718 }, - "width": 133, - "height": 125, + "width": 113, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -705,7 +705,7 @@ "type": "rectangle", "pos": { "x": 366, - "y": 768 + "y": 748 }, "width": 53, "height": 66, @@ -746,10 +746,10 @@ "type": "rectangle", "pos": { "x": 0, - "y": 1005 + "y": 993 }, "width": 479, - "height": 225, + "height": 197, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -786,11 +786,11 @@ "id": "l4.c1", "type": "rectangle", "pos": { - "x": 20, - "y": 1070 + "x": 30, + "y": 1034 }, - "width": 133, - "height": 130, + "width": 113, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -828,7 +828,7 @@ "type": "rectangle", "pos": { "x": 60, - "y": 1102 + "y": 1064 }, "width": 53, "height": 66, @@ -868,11 +868,11 @@ "id": "l4.c2", "type": "rectangle", "pos": { - "x": 173, - "y": 1070 + "x": 183, + "y": 1034 }, - "width": 133, - "height": 130, + "width": 113, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -910,7 +910,7 @@ "type": "rectangle", "pos": { "x": 213, - "y": 1102 + "y": 1064 }, "width": 53, "height": 66, @@ -950,11 +950,11 @@ "id": "l4.c3", "type": "rectangle", "pos": { - "x": 326, - "y": 1070 + "x": 336, + "y": 1034 }, - "width": 133, - "height": 130, + "width": 113, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -992,7 +992,7 @@ "type": "rectangle", "pos": { "x": 366, - "y": 1102 + "y": 1064 }, "width": 53, "height": 66, @@ -1064,11 +1064,11 @@ }, { "x": 239.5, - "y": 180.10000610351562 + "y": 176 }, { "x": 239.5, - "y": 236.5 + "y": 216 } ], "isCurve": true, @@ -1111,11 +1111,11 @@ }, { "x": 86.5, - "y": 180.10000610351562 + "y": 176 }, { "x": 86.5, - "y": 236.5 + "y": 216 } ], "isCurve": true, @@ -1158,11 +1158,11 @@ }, { "x": 392.5, - "y": 180.10000610351562 + "y": 176 }, { "x": 392.5, - "y": 236.5 + "y": 216 } ], "isCurve": true, @@ -1197,11 +1197,11 @@ "route": [ { "x": 86.5, - "y": 302.5 + "y": 282 }, { "x": 86.5, - "y": 326.1000061035156 + "y": 322 }, { "x": 86.5, @@ -1217,11 +1217,11 @@ }, { "x": 86.5, - "y": 446.1000061035156 + "y": 442 }, { "x": 86.5, - "y": 502.5 + "y": 482 } ], "isCurve": true, @@ -1256,11 +1256,11 @@ "route": [ { "x": 392.5, - "y": 302.5 + "y": 282 }, { "x": 392.5, - "y": 326.1000061035156 + "y": 322 }, { "x": 392.5, @@ -1276,11 +1276,11 @@ }, { "x": 392.5, - "y": 446.1000061035156 + "y": 442 }, { "x": 392.5, - "y": 502.5 + "y": 482 } ], "isCurve": true, @@ -1315,11 +1315,11 @@ "route": [ { "x": 239.5, - "y": 302.5 + "y": 282 }, { "x": 239.5, - "y": 326.1000061035156 + "y": 322 }, { "x": 239.5, @@ -1335,11 +1335,11 @@ }, { "x": 239.5, - "y": 446.1000061035156 + "y": 442 }, { "x": 239.5, - "y": 502.5 + "y": 482 } ], "isCurve": true, @@ -1374,11 +1374,11 @@ "route": [ { "x": 86.5, - "y": 568.5 + "y": 548 }, { "x": 86.5, - "y": 592.0999755859375 + "y": 588 }, { "x": 86.5, @@ -1394,11 +1394,11 @@ }, { "x": 86.5, - "y": 712.0999755859375 + "y": 708 }, { "x": 86.5, - "y": 768.5 + "y": 748 } ], "isCurve": true, @@ -1433,11 +1433,11 @@ "route": [ { "x": 239.5, - "y": 568.5 + "y": 548 }, { "x": 239.5, - "y": 592.0999755859375 + "y": 588 }, { "x": 239.5, @@ -1453,11 +1453,11 @@ }, { "x": 239.5, - "y": 712.0999755859375 + "y": 708 }, { "x": 239.5, - "y": 768.5 + "y": 748 } ], "isCurve": true, @@ -1492,11 +1492,11 @@ "route": [ { "x": 392.5, - "y": 568.5 + "y": 548 }, { "x": 392.5, - "y": 592.0999755859375 + "y": 588 }, { "x": 392.5, @@ -1512,11 +1512,11 @@ }, { "x": 392.5, - "y": 712.0999755859375 + "y": 708 }, { "x": 392.5, - "y": 768.5 + "y": 748 } ], "isCurve": true, @@ -1551,11 +1551,11 @@ "route": [ { "x": 86.5, - "y": 834.5 + "y": 814 }, { "x": 86.5, - "y": 858.0999755859375 + "y": 854 }, { "x": 86.5, @@ -1583,11 +1583,11 @@ }, { "x": 86.5, - "y": 1031.699951171875 + "y": 1024 }, { "x": 86.5, - "y": 1102.5 + "y": 1064 } ], "isCurve": true, @@ -1622,11 +1622,11 @@ "route": [ { "x": 239.5, - "y": 834.5 + "y": 814 }, { "x": 239.5, - "y": 858.0999755859375 + "y": 854 }, { "x": 239.5, @@ -1654,11 +1654,11 @@ }, { "x": 239.5, - "y": 1031.699951171875 + "y": 1024 }, { "x": 239.5, - "y": 1102.5 + "y": 1064 } ], "isCurve": true, @@ -1693,11 +1693,11 @@ "route": [ { "x": 392.5, - "y": 834.5 + "y": 814 }, { "x": 392.5, - "y": 858.0999755859375 + "y": 854 }, { "x": 392.5, @@ -1725,11 +1725,11 @@ }, { "x": 392.5, - "y": 1031.699951171875 + "y": 1024 }, { "x": 392.5, - "y": 1102.5 + "y": 1064 } ], "isCurve": true, diff --git a/e2etests/testdata/stable/straight_hierarchy_container/dagre/sketch.exp.svg b/e2etests/testdata/stable/straight_hierarchy_container/dagre/sketch.exp.svg index f8688891d..8e7abee2c 100644 --- a/e2etests/testdata/stable/straight_hierarchy_container/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/straight_hierarchy_container/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -acbl1l2c1l2c3l2c2l3c1l3c2l4bacacbabcc1c2c3abc - + .d2-3275392116 .fill-N1{fill:#0A0F25;} + .d2-3275392116 .fill-N2{fill:#676C7E;} + .d2-3275392116 .fill-N3{fill:#9499AB;} + .d2-3275392116 .fill-N4{fill:#CFD2DD;} + .d2-3275392116 .fill-N5{fill:#DEE1EB;} + .d2-3275392116 .fill-N6{fill:#EEF1F8;} + .d2-3275392116 .fill-N7{fill:#FFFFFF;} + .d2-3275392116 .fill-B1{fill:#0D32B2;} + .d2-3275392116 .fill-B2{fill:#0D32B2;} + .d2-3275392116 .fill-B3{fill:#E3E9FD;} + .d2-3275392116 .fill-B4{fill:#E3E9FD;} + .d2-3275392116 .fill-B5{fill:#EDF0FD;} + .d2-3275392116 .fill-B6{fill:#F7F8FE;} + .d2-3275392116 .fill-AA2{fill:#4A6FF3;} + .d2-3275392116 .fill-AA4{fill:#EDF0FD;} + .d2-3275392116 .fill-AA5{fill:#F7F8FE;} + .d2-3275392116 .fill-AB4{fill:#EDF0FD;} + .d2-3275392116 .fill-AB5{fill:#F7F8FE;} + .d2-3275392116 .stroke-N1{stroke:#0A0F25;} + .d2-3275392116 .stroke-N2{stroke:#676C7E;} + .d2-3275392116 .stroke-N3{stroke:#9499AB;} + .d2-3275392116 .stroke-N4{stroke:#CFD2DD;} + .d2-3275392116 .stroke-N5{stroke:#DEE1EB;} + .d2-3275392116 .stroke-N6{stroke:#EEF1F8;} + .d2-3275392116 .stroke-N7{stroke:#FFFFFF;} + .d2-3275392116 .stroke-B1{stroke:#0D32B2;} + .d2-3275392116 .stroke-B2{stroke:#0D32B2;} + .d2-3275392116 .stroke-B3{stroke:#E3E9FD;} + .d2-3275392116 .stroke-B4{stroke:#E3E9FD;} + .d2-3275392116 .stroke-B5{stroke:#EDF0FD;} + .d2-3275392116 .stroke-B6{stroke:#F7F8FE;} + .d2-3275392116 .stroke-AA2{stroke:#4A6FF3;} + .d2-3275392116 .stroke-AA4{stroke:#EDF0FD;} + .d2-3275392116 .stroke-AA5{stroke:#F7F8FE;} + .d2-3275392116 .stroke-AB4{stroke:#EDF0FD;} + .d2-3275392116 .stroke-AB5{stroke:#F7F8FE;} + .d2-3275392116 .background-color-N1{background-color:#0A0F25;} + .d2-3275392116 .background-color-N2{background-color:#676C7E;} + .d2-3275392116 .background-color-N3{background-color:#9499AB;} + .d2-3275392116 .background-color-N4{background-color:#CFD2DD;} + .d2-3275392116 .background-color-N5{background-color:#DEE1EB;} + .d2-3275392116 .background-color-N6{background-color:#EEF1F8;} + .d2-3275392116 .background-color-N7{background-color:#FFFFFF;} + .d2-3275392116 .background-color-B1{background-color:#0D32B2;} + .d2-3275392116 .background-color-B2{background-color:#0D32B2;} + .d2-3275392116 .background-color-B3{background-color:#E3E9FD;} + .d2-3275392116 .background-color-B4{background-color:#E3E9FD;} + .d2-3275392116 .background-color-B5{background-color:#EDF0FD;} + .d2-3275392116 .background-color-B6{background-color:#F7F8FE;} + .d2-3275392116 .background-color-AA2{background-color:#4A6FF3;} + .d2-3275392116 .background-color-AA4{background-color:#EDF0FD;} + .d2-3275392116 .background-color-AA5{background-color:#F7F8FE;} + .d2-3275392116 .background-color-AB4{background-color:#EDF0FD;} + .d2-3275392116 .background-color-AB5{background-color:#F7F8FE;} + .d2-3275392116 .color-N1{color:#0A0F25;} + .d2-3275392116 .color-N2{color:#676C7E;} + .d2-3275392116 .color-N3{color:#9499AB;} + .d2-3275392116 .color-N4{color:#CFD2DD;} + .d2-3275392116 .color-N5{color:#DEE1EB;} + .d2-3275392116 .color-N6{color:#EEF1F8;} + .d2-3275392116 .color-N7{color:#FFFFFF;} + .d2-3275392116 .color-B1{color:#0D32B2;} + .d2-3275392116 .color-B2{color:#0D32B2;} + .d2-3275392116 .color-B3{color:#E3E9FD;} + .d2-3275392116 .color-B4{color:#E3E9FD;} + .d2-3275392116 .color-B5{color:#EDF0FD;} + .d2-3275392116 .color-B6{color:#F7F8FE;} + .d2-3275392116 .color-AA2{color:#4A6FF3;} + .d2-3275392116 .color-AA4{color:#EDF0FD;} + .d2-3275392116 .color-AA5{color:#F7F8FE;} + .d2-3275392116 .color-AB4{color:#EDF0FD;} + .d2-3275392116 .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}]]>acbl1l2c1l2c3l2c2l3c1l3c2l4bacacbabcc1c2c3abc + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/stylish/dagre/board.exp.json b/e2etests/testdata/stable/stylish/dagre/board.exp.json index c0df7856c..49405db61 100644 --- a/e2etests/testdata/stable/stylish/dagre/board.exp.json +++ b/e2etests/testdata/stable/stylish/dagre/board.exp.json @@ -7,7 +7,7 @@ "id": "x", "type": "rectangle", "pos": { - "x": 8, + "x": 1, "y": 0 }, "width": 53, @@ -49,7 +49,7 @@ "type": "rectangle", "pos": { "x": 0, - "y": 202 + "y": 187 }, "width": 54, "height": 66, @@ -113,20 +113,20 @@ "labelPercentage": 0, "route": [ { - "x": 34.5, - "y": 66 + "x": 27, + "y": 65.5 }, { - "x": 34.5, - "y": 114.4000015258789 + "x": 27, + "y": 114.30000305175781 }, { - "x": 34.5, - "y": 138.6999969482422 + "x": 27, + "y": 135.6999969482422 }, { - "x": 34.5, - "y": 187.5 + "x": 27, + "y": 172.5 } ], "isCurve": true, diff --git a/e2etests/testdata/stable/stylish/dagre/sketch.exp.svg b/e2etests/testdata/stable/stylish/dagre/sketch.exp.svg index 1d06a16d9..6280886e4 100644 --- a/e2etests/testdata/stable/stylish/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/stylish/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ - + .d2-663732822 .fill-N1{fill:#0A0F25;} + .d2-663732822 .fill-N2{fill:#676C7E;} + .d2-663732822 .fill-N3{fill:#9499AB;} + .d2-663732822 .fill-N4{fill:#CFD2DD;} + .d2-663732822 .fill-N5{fill:#DEE1EB;} + .d2-663732822 .fill-N6{fill:#EEF1F8;} + .d2-663732822 .fill-N7{fill:#FFFFFF;} + .d2-663732822 .fill-B1{fill:#0D32B2;} + .d2-663732822 .fill-B2{fill:#0D32B2;} + .d2-663732822 .fill-B3{fill:#E3E9FD;} + .d2-663732822 .fill-B4{fill:#E3E9FD;} + .d2-663732822 .fill-B5{fill:#EDF0FD;} + .d2-663732822 .fill-B6{fill:#F7F8FE;} + .d2-663732822 .fill-AA2{fill:#4A6FF3;} + .d2-663732822 .fill-AA4{fill:#EDF0FD;} + .d2-663732822 .fill-AA5{fill:#F7F8FE;} + .d2-663732822 .fill-AB4{fill:#EDF0FD;} + .d2-663732822 .fill-AB5{fill:#F7F8FE;} + .d2-663732822 .stroke-N1{stroke:#0A0F25;} + .d2-663732822 .stroke-N2{stroke:#676C7E;} + .d2-663732822 .stroke-N3{stroke:#9499AB;} + .d2-663732822 .stroke-N4{stroke:#CFD2DD;} + .d2-663732822 .stroke-N5{stroke:#DEE1EB;} + .d2-663732822 .stroke-N6{stroke:#EEF1F8;} + .d2-663732822 .stroke-N7{stroke:#FFFFFF;} + .d2-663732822 .stroke-B1{stroke:#0D32B2;} + .d2-663732822 .stroke-B2{stroke:#0D32B2;} + .d2-663732822 .stroke-B3{stroke:#E3E9FD;} + .d2-663732822 .stroke-B4{stroke:#E3E9FD;} + .d2-663732822 .stroke-B5{stroke:#EDF0FD;} + .d2-663732822 .stroke-B6{stroke:#F7F8FE;} + .d2-663732822 .stroke-AA2{stroke:#4A6FF3;} + .d2-663732822 .stroke-AA4{stroke:#EDF0FD;} + .d2-663732822 .stroke-AA5{stroke:#F7F8FE;} + .d2-663732822 .stroke-AB4{stroke:#EDF0FD;} + .d2-663732822 .stroke-AB5{stroke:#F7F8FE;} + .d2-663732822 .background-color-N1{background-color:#0A0F25;} + .d2-663732822 .background-color-N2{background-color:#676C7E;} + .d2-663732822 .background-color-N3{background-color:#9499AB;} + .d2-663732822 .background-color-N4{background-color:#CFD2DD;} + .d2-663732822 .background-color-N5{background-color:#DEE1EB;} + .d2-663732822 .background-color-N6{background-color:#EEF1F8;} + .d2-663732822 .background-color-N7{background-color:#FFFFFF;} + .d2-663732822 .background-color-B1{background-color:#0D32B2;} + .d2-663732822 .background-color-B2{background-color:#0D32B2;} + .d2-663732822 .background-color-B3{background-color:#E3E9FD;} + .d2-663732822 .background-color-B4{background-color:#E3E9FD;} + .d2-663732822 .background-color-B5{background-color:#EDF0FD;} + .d2-663732822 .background-color-B6{background-color:#F7F8FE;} + .d2-663732822 .background-color-AA2{background-color:#4A6FF3;} + .d2-663732822 .background-color-AA4{background-color:#EDF0FD;} + .d2-663732822 .background-color-AA5{background-color:#F7F8FE;} + .d2-663732822 .background-color-AB4{background-color:#EDF0FD;} + .d2-663732822 .background-color-AB5{background-color:#F7F8FE;} + .d2-663732822 .color-N1{color:#0A0F25;} + .d2-663732822 .color-N2{color:#676C7E;} + .d2-663732822 .color-N3{color:#9499AB;} + .d2-663732822 .color-N4{color:#CFD2DD;} + .d2-663732822 .color-N5{color:#DEE1EB;} + .d2-663732822 .color-N6{color:#EEF1F8;} + .d2-663732822 .color-N7{color:#FFFFFF;} + .d2-663732822 .color-B1{color:#0D32B2;} + .d2-663732822 .color-B2{color:#0D32B2;} + .d2-663732822 .color-B3{color:#E3E9FD;} + .d2-663732822 .color-B4{color:#E3E9FD;} + .d2-663732822 .color-B5{color:#EDF0FD;} + .d2-663732822 .color-B6{color:#F7F8FE;} + .d2-663732822 .color-AA2{color:#4A6FF3;} + .d2-663732822 .color-AA4{color:#EDF0FD;} + .d2-663732822 .color-AA5{color:#F7F8FE;} + .d2-663732822 .color-AB4{color:#EDF0FD;} + .d2-663732822 .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}]]> @@ -104,11 +104,11 @@ -x - -y in style - - - - +x + +y in style + + + + \ 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 aef37e591..49dd731ac 100644 --- a/e2etests/testdata/stable/teleport_grid/dagre/board.exp.json +++ b/e2etests/testdata/stable/teleport_grid/dagre/board.exp.json @@ -8,7 +8,7 @@ "type": "rectangle", "pos": { "x": 0, - "y": 204 + "y": 224 }, "width": 272, "height": 461, @@ -49,7 +49,7 @@ "type": "rectangle", "pos": { "x": 543, - "y": 130 + "y": 149 }, "width": 236, "height": 610, @@ -90,7 +90,7 @@ "type": "rectangle", "pos": { "x": 1050, - "y": 283 + "y": 303 }, "width": 473, "height": 303, @@ -172,7 +172,7 @@ "type": "rectangle", "pos": { "x": 2144, - "y": 232 + "y": 272 }, "width": 582, "height": 344, @@ -213,10 +213,10 @@ "type": "rectangle", "pos": { "x": 2335, - "y": 596 + "y": 676 }, "width": 201, - "height": 118, + "height": 123, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -266,7 +266,7 @@ "type": "oval", "pos": { "x": 60, - "y": 264 + "y": 284 }, "width": 152, "height": 152, @@ -319,7 +319,7 @@ "type": "oval", "pos": { "x": 60, - "y": 456 + "y": 476 }, "width": 152, "height": 149, @@ -372,7 +372,7 @@ "type": "rectangle", "pos": { "x": 603, - "y": 190 + "y": 209 }, "width": 116, "height": 66, @@ -413,7 +413,7 @@ "type": "rectangle", "pos": { "x": 603, - "y": 296 + "y": 315 }, "width": 116, "height": 66, @@ -454,7 +454,7 @@ "type": "rectangle", "pos": { "x": 603, - "y": 402 + "y": 421 }, "width": 116, "height": 66, @@ -495,7 +495,7 @@ "type": "rectangle", "pos": { "x": 603, - "y": 508 + "y": 527 }, "width": 116, "height": 66, @@ -536,7 +536,7 @@ "type": "rectangle", "pos": { "x": 603, - "y": 614 + "y": 633 }, "width": 116, "height": 66, @@ -577,7 +577,7 @@ "type": "text", "pos": { "x": 1110, - "y": 343 + "y": 363 }, "width": 353, "height": 51, @@ -618,7 +618,7 @@ "type": "rectangle", "pos": { "x": 1110, - "y": 434 + "y": 454 }, "width": 140, "height": 92, @@ -671,7 +671,7 @@ "type": "rectangle", "pos": { "x": 1290, - "y": 434 + "y": 454 }, "width": 173, "height": 92, @@ -953,7 +953,7 @@ "type": "rectangle", "pos": { "x": 2204, - "y": 292 + "y": 332 }, "width": 103, "height": 92, @@ -1006,7 +1006,7 @@ "type": "rectangle", "pos": { "x": 2347, - "y": 292 + "y": 332 }, "width": 152, "height": 92, @@ -1059,7 +1059,7 @@ "type": "rectangle", "pos": { "x": 2539, - "y": 292 + "y": 332 }, "width": 126, "height": 92, @@ -1112,7 +1112,7 @@ "type": "rectangle", "pos": { "x": 2204, - "y": 424 + "y": 464 }, "width": 138, "height": 92, @@ -1165,7 +1165,7 @@ "type": "rectangle", "pos": { "x": 2382, - "y": 424 + "y": 464 }, "width": 108, "height": 92, @@ -1218,7 +1218,7 @@ "type": "rectangle", "pos": { "x": 2530, - "y": 424 + "y": 464 }, "width": 136, "height": 92, @@ -1293,20 +1293,20 @@ "labelPercentage": 0, "route": [ { - "x": 272, - "y": 434.5 + "x": 271.5, + "y": 454 }, { - "x": 380.3999938964844, - "y": 434.5 + "x": 380.29998779296875, + "y": 454 }, { "x": 434.70001220703125, - "y": 434.5 + "y": 454 }, { "x": 543.5, - "y": 434.5 + "y": 454 } ], "isCurve": true, @@ -1340,20 +1340,20 @@ "labelPercentage": 0, "route": [ { - "x": 779, - "y": 434.5 + "x": 778.5, + "y": 454 }, { - "x": 887.4000244140625, - "y": 434.5 + "x": 887.2999877929688, + "y": 454 }, { "x": 941.7000122070312, - "y": 434.5 + "y": 454 }, { "x": 1050.5, - "y": 434.5 + "y": 454 } ], "isCurve": true, @@ -1387,12 +1387,12 @@ "labelPercentage": 0, "route": [ { - "x": 1511.3280029296875, - "y": 283 + "x": 1498.72998046875, + "y": 302.5 }, { - "x": 1721.4649658203125, - "y": 141.39999389648438 + "x": 1718.946044921875, + "y": 145.2989959716797 }, { "x": 1824.199951171875, @@ -1435,19 +1435,19 @@ "route": [ { "x": 1523, - "y": 419.7030029296875 + "y": 449 }, { "x": 1723.800048828125, - "y": 407.1400146484375 + "y": 445 }, { "x": 1848, - "y": 404 + "y": 444 }, { "x": 2144, - "y": 404 + "y": 444 } ], "isCurve": true, @@ -1482,19 +1482,19 @@ "route": [ { "x": 1523, - "y": 495.38299560546875 + "y": 521 }, { "x": 1723.800048828125, - "y": 547.0759887695312 + "y": 578.5999755859375 }, { "x": 1886.0999755859375, - "y": 576.1110229492188 + "y": 621.0770263671875 }, { "x": 2334.5, - "y": 640.5549926757812 + "y": 733.385986328125 } ], "isCurve": true, @@ -1529,19 +1529,19 @@ "route": [ { "x": 1523, - "y": 556.2670288085938 + "y": 589 }, { "x": 1723.800048828125, - "y": 659.6530151367188 + "y": 728.2000122070312 }, { "x": 1886.0999755859375, - "y": 680.3270263671875 + "y": 761.3040161132812 }, { "x": 2334.5, - "y": 659.6370239257812 + "y": 754.52001953125 } ], "isCurve": true, diff --git a/e2etests/testdata/stable/teleport_grid/dagre/sketch.exp.svg b/e2etests/testdata/stable/teleport_grid/dagre/sketch.exp.svg index 722085853..67eb38f57 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/transparent_3d/dagre/board.exp.json b/e2etests/testdata/stable/transparent_3d/dagre/board.exp.json index efb10bc96..9610888ec 100644 --- a/e2etests/testdata/stable/transparent_3d/dagre/board.exp.json +++ b/e2etests/testdata/stable/transparent_3d/dagre/board.exp.json @@ -8,7 +8,7 @@ "type": "rectangle", "pos": { "x": 0, - "y": 15 + "y": 0 }, "width": 79, "height": 66, diff --git a/e2etests/testdata/stable/transparent_3d/dagre/sketch.exp.svg b/e2etests/testdata/stable/transparent_3d/dagre/sketch.exp.svg index 2052701bc..fe1b1537d 100644 --- a/e2etests/testdata/stable/transparent_3d/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/transparent_3d/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ - - -cube - - + .d2-285423310 .fill-N1{fill:#0A0F25;} + .d2-285423310 .fill-N2{fill:#676C7E;} + .d2-285423310 .fill-N3{fill:#9499AB;} + .d2-285423310 .fill-N4{fill:#CFD2DD;} + .d2-285423310 .fill-N5{fill:#DEE1EB;} + .d2-285423310 .fill-N6{fill:#EEF1F8;} + .d2-285423310 .fill-N7{fill:#FFFFFF;} + .d2-285423310 .fill-B1{fill:#0D32B2;} + .d2-285423310 .fill-B2{fill:#0D32B2;} + .d2-285423310 .fill-B3{fill:#E3E9FD;} + .d2-285423310 .fill-B4{fill:#E3E9FD;} + .d2-285423310 .fill-B5{fill:#EDF0FD;} + .d2-285423310 .fill-B6{fill:#F7F8FE;} + .d2-285423310 .fill-AA2{fill:#4A6FF3;} + .d2-285423310 .fill-AA4{fill:#EDF0FD;} + .d2-285423310 .fill-AA5{fill:#F7F8FE;} + .d2-285423310 .fill-AB4{fill:#EDF0FD;} + .d2-285423310 .fill-AB5{fill:#F7F8FE;} + .d2-285423310 .stroke-N1{stroke:#0A0F25;} + .d2-285423310 .stroke-N2{stroke:#676C7E;} + .d2-285423310 .stroke-N3{stroke:#9499AB;} + .d2-285423310 .stroke-N4{stroke:#CFD2DD;} + .d2-285423310 .stroke-N5{stroke:#DEE1EB;} + .d2-285423310 .stroke-N6{stroke:#EEF1F8;} + .d2-285423310 .stroke-N7{stroke:#FFFFFF;} + .d2-285423310 .stroke-B1{stroke:#0D32B2;} + .d2-285423310 .stroke-B2{stroke:#0D32B2;} + .d2-285423310 .stroke-B3{stroke:#E3E9FD;} + .d2-285423310 .stroke-B4{stroke:#E3E9FD;} + .d2-285423310 .stroke-B5{stroke:#EDF0FD;} + .d2-285423310 .stroke-B6{stroke:#F7F8FE;} + .d2-285423310 .stroke-AA2{stroke:#4A6FF3;} + .d2-285423310 .stroke-AA4{stroke:#EDF0FD;} + .d2-285423310 .stroke-AA5{stroke:#F7F8FE;} + .d2-285423310 .stroke-AB4{stroke:#EDF0FD;} + .d2-285423310 .stroke-AB5{stroke:#F7F8FE;} + .d2-285423310 .background-color-N1{background-color:#0A0F25;} + .d2-285423310 .background-color-N2{background-color:#676C7E;} + .d2-285423310 .background-color-N3{background-color:#9499AB;} + .d2-285423310 .background-color-N4{background-color:#CFD2DD;} + .d2-285423310 .background-color-N5{background-color:#DEE1EB;} + .d2-285423310 .background-color-N6{background-color:#EEF1F8;} + .d2-285423310 .background-color-N7{background-color:#FFFFFF;} + .d2-285423310 .background-color-B1{background-color:#0D32B2;} + .d2-285423310 .background-color-B2{background-color:#0D32B2;} + .d2-285423310 .background-color-B3{background-color:#E3E9FD;} + .d2-285423310 .background-color-B4{background-color:#E3E9FD;} + .d2-285423310 .background-color-B5{background-color:#EDF0FD;} + .d2-285423310 .background-color-B6{background-color:#F7F8FE;} + .d2-285423310 .background-color-AA2{background-color:#4A6FF3;} + .d2-285423310 .background-color-AA4{background-color:#EDF0FD;} + .d2-285423310 .background-color-AA5{background-color:#F7F8FE;} + .d2-285423310 .background-color-AB4{background-color:#EDF0FD;} + .d2-285423310 .background-color-AB5{background-color:#F7F8FE;} + .d2-285423310 .color-N1{color:#0A0F25;} + .d2-285423310 .color-N2{color:#676C7E;} + .d2-285423310 .color-N3{color:#9499AB;} + .d2-285423310 .color-N4{color:#CFD2DD;} + .d2-285423310 .color-N5{color:#DEE1EB;} + .d2-285423310 .color-N6{color:#EEF1F8;} + .d2-285423310 .color-N7{color:#FFFFFF;} + .d2-285423310 .color-B1{color:#0D32B2;} + .d2-285423310 .color-B2{color:#0D32B2;} + .d2-285423310 .color-B3{color:#E3E9FD;} + .d2-285423310 .color-B4{color:#E3E9FD;} + .d2-285423310 .color-B5{color:#EDF0FD;} + .d2-285423310 .color-B6{color:#F7F8FE;} + .d2-285423310 .color-AA2{color:#4A6FF3;} + .d2-285423310 .color-AA4{color:#EDF0FD;} + .d2-285423310 .color-AA5{color:#F7F8FE;} + .d2-285423310 .color-AB4{color:#EDF0FD;} + .d2-285423310 .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}]]> + +cube + + \ No newline at end of file diff --git a/e2etests/testdata/stable/us_map/dagre/board.exp.json b/e2etests/testdata/stable/us_map/dagre/board.exp.json index 0be51c4cc..3526ab0f8 100644 --- a/e2etests/testdata/stable/us_map/dagre/board.exp.json +++ b/e2etests/testdata/stable/us_map/dagre/board.exp.json @@ -2127,11 +2127,11 @@ "labelPercentage": 0, "route": [ { - "x": 29.02400016784668, + "x": 29, "y": 398 }, { - "x": 24.20400047302246, + "x": 24.200000762939453, "y": 438 }, { @@ -2174,11 +2174,11 @@ "labelPercentage": 0, "route": [ { - "x": 29.02400016784668, + "x": 29, "y": 564 }, { - "x": 24.20400047302246, + "x": 24.200000762939453, "y": 604 }, { @@ -2221,11 +2221,11 @@ "labelPercentage": 0, "route": [ { - "x": 1025.009033203125, + "x": 1025.25, "y": 730 }, { - "x": 993.2009887695312, + "x": 993.25, "y": 770 }, { @@ -2399,12 +2399,12 @@ "labelPercentage": 0, "route": [ { - "x": 261, - "y": 876.2059936523438 + "x": 261.25, + "y": 876 }, { - "x": 123.5999984741211, - "y": 932.041015625 + "x": 123.6500015258789, + "y": 932 }, { "x": 148.64999389648438, @@ -2446,12 +2446,12 @@ "labelPercentage": 0, "route": [ { - "x": 386.25, - "y": 1054.508056640625 + "x": 386, + "y": 1055 }, { - "x": 327.6499938964844, - "y": 1100.5009765625 + "x": 327.6000061035156, + "y": 1100.5999755859375 }, { "x": 419.3999938964844, @@ -2493,11 +2493,11 @@ "labelPercentage": 0, "route": [ { - "x": 863.4869995117188, + "x": 863.5, "y": 1228 }, { - "x": 845.89697265625, + "x": 845.9000244140625, "y": 1268 }, { @@ -2599,11 +2599,11 @@ "labelPercentage": 0, "route": [ { - "x": 1040.3759765625, + "x": 1040.75, "y": 564 }, { - "x": 1015.0750122070312, + "x": 1015.1500244140625, "y": 604 }, { @@ -2646,11 +2646,11 @@ "labelPercentage": 0, "route": [ { - "x": 1034.2530517578125, + "x": 1034.5, "y": 730 }, { - "x": 1013.6500244140625, + "x": 1013.7000122070312, "y": 770 }, { @@ -2823,12 +2823,12 @@ "labelPercentage": 0, "route": [ { - "x": 945.25, - "y": 1556.759033203125 + "x": 945, + "y": 1557 }, { - "x": 899.4500122070312, - "y": 1599.3509521484375 + "x": 899.4000244140625, + "y": 1599.4000244140625 }, { "x": 939, @@ -2870,12 +2870,12 @@ "labelPercentage": 0, "route": [ { - "x": 326, - "y": 893.2239990234375 + "x": 325.75, + "y": 893 }, { - "x": 371.3999938964844, - "y": 935.4439697265625 + "x": 371.3500061035156, + "y": 935.4000244140625 }, { "x": 387.1499938964844, @@ -2917,12 +2917,12 @@ "labelPercentage": 0, "route": [ { - "x": 386.25, - "y": 1060.45703125 + "x": 386, + "y": 1061 }, { - "x": 343.6499938964844, - "y": 1101.6910400390625 + "x": 343.6000061035156, + "y": 1101.800048828125 }, { "x": 333, @@ -3023,11 +3023,11 @@ "labelPercentage": 0, "route": [ { - "x": 1297.6739501953125, + "x": 1298, "y": 730 }, { - "x": 1262.7340087890625, + "x": 1262.800048828125, "y": 770 }, { @@ -3082,11 +3082,11 @@ "labelPercentage": 0, "route": [ { - "x": 1399.56005859375, + "x": 1400, "y": 1062 }, { - "x": 1377.511962890625, + "x": 1377.5999755859375, "y": 1102 }, { @@ -3223,11 +3223,11 @@ "labelPercentage": 0, "route": [ { - "x": 476.197998046875, + "x": 476, "y": 1560 }, { - "x": 446.4389953613281, + "x": 446.3999938964844, "y": 1600 }, { @@ -3329,11 +3329,11 @@ "labelPercentage": 0, "route": [ { - "x": 215.14999389648438, + "x": 215.5, "y": 1062 }, { - "x": 185.02999877929688, + "x": 185.10000610351562, "y": 1102 }, { @@ -3388,11 +3388,11 @@ "labelPercentage": 0, "route": [ { - "x": 370.8760070800781, + "x": 371.25, "y": 1394 }, { - "x": 345.57501220703125, + "x": 345.6499938964844, "y": 1434 }, { @@ -3494,11 +3494,11 @@ "labelPercentage": 0, "route": [ { - "x": 757.9240112304688, + "x": 758.25, "y": 1062 }, { - "x": 722.9840087890625, + "x": 723.0499877929688, "y": 1102 }, { @@ -3541,11 +3541,11 @@ "labelPercentage": 0, "route": [ { - "x": 704.1110229492188, + "x": 703.75, "y": 1228 }, { - "x": 691.822021484375, + "x": 691.75, "y": 1268 }, { @@ -3647,11 +3647,11 @@ "labelPercentage": 0, "route": [ { - "x": 36.974998474121094, + "x": 37, "y": 564 }, { - "x": 41.79499816894531, + "x": 41.79999923706055, "y": 604 }, { @@ -3754,11 +3754,11 @@ "labelPercentage": 0, "route": [ { - "x": 39.02399826049805, + "x": 39, "y": 1228 }, { - "x": 34.20399856567383, + "x": 34.20000076293945, "y": 1268 }, { @@ -3801,11 +3801,11 @@ "labelPercentage": 0, "route": [ { - "x": 39.02399826049805, + "x": 39, "y": 1394 }, { - "x": 34.20399856567383, + "x": 34.20000076293945, "y": 1434 }, { @@ -3895,11 +3895,11 @@ "labelPercentage": 0, "route": [ { - "x": 1150.68896484375, + "x": 1150.75, "y": 896 }, { - "x": 1122.737060546875, + "x": 1122.75, "y": 936 }, { @@ -3942,11 +3942,11 @@ "labelPercentage": 0, "route": [ { - "x": 405.7279968261719, + "x": 406, "y": 1062 }, { - "x": 389.94500732421875, + "x": 390, "y": 1102 }, { @@ -4189,11 +4189,11 @@ "labelPercentage": 0, "route": [ { - "x": 1829.4329833984375, + "x": 1829.5, "y": 232 }, { - "x": 1812.68603515625, + "x": 1812.699951171875, "y": 272 }, { @@ -4236,11 +4236,11 @@ "labelPercentage": 0, "route": [ { - "x": 1781.0660400390625, + "x": 1781.5, "y": 398 }, { - "x": 1747.81298828125, + "x": 1747.9000244140625, "y": 438 }, { @@ -4283,12 +4283,12 @@ "labelPercentage": 0, "route": [ { - "x": 1709, - "y": 544.0989990234375 + "x": 1709.25, + "y": 544 }, { - "x": 1578.800048828125, - "y": 600.0189819335938 + "x": 1578.8499755859375, + "y": 600 }, { "x": 1590.699951171875, @@ -4330,11 +4330,11 @@ "labelPercentage": 0, "route": [ { - "x": 1779.9210205078125, + "x": 1779.5, "y": 730 }, { - "x": 1755.583984375, + "x": 1755.5, "y": 770 }, { @@ -4460,12 +4460,12 @@ "labelPercentage": 0, "route": [ { - "x": 1872.75, - "y": 219.11000061035156 + "x": 1873, + "y": 219 }, { - "x": 1946.550048828125, - "y": 269.4219970703125 + "x": 1946.5999755859375, + "y": 269.3999938964844 }, { "x": 1965, @@ -4543,11 +4543,11 @@ "labelPercentage": 0, "route": [ { - "x": 1818.9840087890625, + "x": 1818.75, "y": 664 }, { - "x": 1841.9959716796875, + "x": 1841.949951171875, "y": 624 }, { @@ -4590,11 +4590,11 @@ "labelPercentage": 0, "route": [ { - "x": 1725.2860107421875, + "x": 1725.75, "y": 564 }, { - "x": 1708.0570068359375, + "x": 1708.1500244140625, "y": 604 }, { @@ -4697,12 +4697,12 @@ "labelPercentage": 0, "route": [ { - "x": 1838, - "y": 386.9100036621094 + "x": 1838.25, + "y": 387 }, { - "x": 1903.800048828125, - "y": 435.7820129394531 + "x": 1903.8499755859375, + "y": 435.79998779296875 }, { "x": 1920.25, @@ -4756,11 +4756,11 @@ "labelPercentage": 0, "route": [ { - "x": 1900.1500244140625, + "x": 1900.5, "y": 730 }, { - "x": 1870.030029296875, + "x": 1870.0999755859375, "y": 770 }, { @@ -4850,11 +4850,11 @@ "labelPercentage": 0, "route": [ { - "x": 1407.511962890625, + "x": 1408, "y": 1062 }, { - "x": 1395.10205078125, + "x": 1395.199951171875, "y": 1102 }, { @@ -4944,12 +4944,12 @@ "labelPercentage": 0, "route": [ { - "x": 1358, - "y": 725.6519775390625 + "x": 1357.75, + "y": 726 }, { - "x": 1405.800048828125, - "y": 769.1300048828125 + "x": 1405.75, + "y": 769.2000122070312 }, { "x": 1426.550048828125, @@ -4991,11 +4991,11 @@ "labelPercentage": 0, "route": [ { - "x": 1501.3399658203125, + "x": 1501.25, "y": 896 }, { - "x": 1513.2679443359375, + "x": 1513.25, "y": 936 }, { @@ -5097,11 +5097,11 @@ "labelPercentage": 0, "route": [ { - "x": 1816.89697265625, + "x": 1816.5, "y": 730 }, { - "x": 1837.3790283203125, + "x": 1837.300048828125, "y": 770 }, { @@ -5262,11 +5262,11 @@ "labelPercentage": 0, "route": [ { - "x": 949.7160034179688, + "x": 950, "y": 1560 }, { - "x": 916.343017578125, + "x": 916.4000244140625, "y": 1600 }, { @@ -5356,12 +5356,12 @@ "labelPercentage": 0, "route": [ { - "x": 1092.75, - "y": 561.7579956054688 + "x": 1093.25, + "y": 562 }, { - "x": 1135.550048828125, - "y": 603.551025390625 + "x": 1135.6500244140625, + "y": 603.5999755859375 }, { "x": 1133.8499755859375, @@ -5403,11 +5403,11 @@ "labelPercentage": 0, "route": [ { - "x": 1050.4539794921875, + "x": 1050.25, "y": 730 }, { - "x": 1049.489990234375, + "x": 1049.449951171875, "y": 770 }, { @@ -5605,11 +5605,11 @@ "labelPercentage": 0, "route": [ { - "x": 794.0059814453125, + "x": 794, "y": 1062 }, { - "x": 802.801025390625, + "x": 802.7999877929688, "y": 1102 }, { @@ -5782,11 +5782,11 @@ "labelPercentage": 0, "route": [ { - "x": 261.0719909667969, + "x": 261, "y": 1062 }, { - "x": 286.614013671875, + "x": 286.6000061035156, "y": 1102 }, { @@ -5829,11 +5829,11 @@ "labelPercentage": 0, "route": [ { - "x": 535.0120239257812, + "x": 535, "y": 1228 }, { - "x": 512.6019897460938, + "x": 512.5999755859375, "y": 1268 }, { @@ -5876,11 +5876,11 @@ "labelPercentage": 0, "route": [ { - "x": 378.8280029296875, + "x": 379.25, "y": 1394 }, { - "x": 363.1650085449219, + "x": 363.25, "y": 1434 }, { @@ -5935,11 +5935,11 @@ "labelPercentage": 0, "route": [ { - "x": 498.2590026855469, + "x": 498.5, "y": 1726 }, { - "x": 486.45098876953125, + "x": 486.5, "y": 1766 }, { @@ -5982,11 +5982,11 @@ "labelPercentage": 0, "route": [ { - "x": 1768.324951171875, + "x": 1768, "y": 564 }, { - "x": 1803.2650146484375, + "x": 1803.199951171875, "y": 604 }, { @@ -6112,11 +6112,11 @@ "labelPercentage": 0, "route": [ { - "x": 1790.6619873046875, + "x": 1790.5, "y": 1228 }, { - "x": 1788.1319580078125, + "x": 1788.0999755859375, "y": 1268 }, { @@ -6159,11 +6159,11 @@ "labelPercentage": 0, "route": [ { - "x": 1932.9510498046875, + "x": 1933, "y": 730 }, { - "x": 1942.5899658203125, + "x": 1942.5999755859375, "y": 770 }, { @@ -6218,11 +6218,11 @@ "labelPercentage": 0, "route": [ { - "x": 1552.322021484375, + "x": 1552.25, "y": 1062 }, { - "x": 1537.864013671875, + "x": 1537.8499755859375, "y": 1102 }, { @@ -6265,11 +6265,11 @@ "labelPercentage": 0, "route": [ { - "x": 1553.56005859375, + "x": 1554, "y": 1228 }, { - "x": 1531.511962890625, + "x": 1531.5999755859375, "y": 1268 }, { @@ -6312,11 +6312,11 @@ "labelPercentage": 0, "route": [ { - "x": 1058.406005859375, + "x": 1058.25, "y": 730 }, { - "x": 1067.0810546875, + "x": 1067.050048828125, "y": 770 }, { @@ -6490,11 +6490,11 @@ "labelPercentage": 0, "route": [ { - "x": 1425.7010498046875, + "x": 1425.75, "y": 1062 }, { - "x": 1435.3399658203125, + "x": 1435.3499755859375, "y": 1102 }, { @@ -6596,11 +6596,11 @@ "labelPercentage": 0, "route": [ { - "x": 1187.16796875, + "x": 1187.5, "y": 896 }, { - "x": 1203.4329833984375, + "x": 1203.5, "y": 936 }, { @@ -6643,11 +6643,11 @@ "labelPercentage": 0, "route": [ { - "x": 1560.2740478515625, + "x": 1560.25, "y": 1062 }, { - "x": 1555.4539794921875, + "x": 1555.449951171875, "y": 1102 }, { @@ -6797,11 +6797,11 @@ "labelPercentage": 0, "route": [ { - "x": 1443.989990234375, + "x": 1443.75, "y": 1062 }, { - "x": 1475.7979736328125, + "x": 1475.75, "y": 1102 }, { @@ -6844,11 +6844,11 @@ "labelPercentage": 0, "route": [ { - "x": 1588.64697265625, + "x": 1588.25, "y": 1228 }, { - "x": 1609.1290283203125, + "x": 1609.050048828125, "y": 1268 }, { @@ -7057,11 +7057,11 @@ "labelPercentage": 0, "route": [ { - "x": 570.7949829101562, + "x": 571, "y": 1228 }, { - "x": 591.7589721679688, + "x": 591.7999877929688, "y": 1268 }, { @@ -7164,11 +7164,11 @@ "labelPercentage": 0, "route": [ { - "x": 732.239990234375, + "x": 732.5, "y": 1228 }, { - "x": 754.0479736328125, + "x": 754.0999755859375, "y": 1268 }, { @@ -7211,12 +7211,12 @@ "labelPercentage": 0, "route": [ { - "x": 423.75, - "y": 1382.8599853515625 + "x": 424.25, + "y": 1383 }, { - "x": 495.3500061035156, - "y": 1431.77197265625 + "x": 495.45001220703125, + "y": 1431.800048828125 }, { "x": 554.1500244140625, @@ -7258,11 +7258,11 @@ "labelPercentage": 0, "route": [ { - "x": 892.5120239257812, + "x": 892.5, "y": 1228 }, { - "x": 910.1019897460938, + "x": 910.0999755859375, "y": 1268 }, { @@ -7306,11 +7306,11 @@ "route": [ { "x": 1362.75, - "y": 1381.43994140625 + "y": 1382 }, { "x": 1443.550048828125, - "y": 1431.488037109375 + "y": 1431.5999755859375 }, { "x": 1463.75, @@ -7364,12 +7364,12 @@ "labelPercentage": 0, "route": [ { - "x": 423.75, - "y": 1379.77001953125 + "x": 424.25, + "y": 1380 }, { - "x": 511.3500061035156, - "y": 1431.154052734375 + "x": 511.45001220703125, + "y": 1431.199951171875 }, { "x": 570.1500244140625, @@ -7458,11 +7458,11 @@ "labelPercentage": 0, "route": [ { - "x": 517.739990234375, + "x": 517.5, "y": 1726 }, { - "x": 529.5479736328125, + "x": 529.5, "y": 1766 }, { @@ -7505,12 +7505,12 @@ "labelPercentage": 0, "route": [ { - "x": 75, - "y": 1225.010986328125 + "x": 74.5, + "y": 1225 }, { - "x": 120.19999694824219, - "y": 1267.4019775390625 + "x": 120.0999984741211, + "y": 1267.4000244140625 }, { "x": 120.0999984741211, @@ -7552,11 +7552,11 @@ "labelPercentage": 0, "route": [ { - "x": 59.79800033569336, + "x": 60.25, "y": 1394 }, { - "x": 80.15899658203125, + "x": 80.25, "y": 1434 }, { @@ -7599,11 +7599,11 @@ "labelPercentage": 0, "route": [ { - "x": 983.6110229492188, + "x": 983.25, "y": 1560 }, { - "x": 991.322021484375, + "x": 991.25, "y": 1600 }, { @@ -7646,11 +7646,11 @@ "labelPercentage": 0, "route": [ { - "x": 1588.10498046875, + "x": 1588.25, "y": 1062 }, { - "x": 1617.02099609375, + "x": 1617.050048828125, "y": 1102 }, { @@ -7693,11 +7693,11 @@ "labelPercentage": 0, "route": [ { - "x": 1800.7010498046875, + "x": 1800.75, "y": 1228 }, { - "x": 1810.3399658203125, + "x": 1810.3499755859375, "y": 1268 }, { @@ -7752,11 +7752,11 @@ "labelPercentage": 0, "route": [ { - "x": 753.7249755859375, + "x": 753.75, "y": 1560 }, { - "x": 758.5449829101562, + "x": 758.5499877929688, "y": 1600 }, { @@ -7812,11 +7812,11 @@ "route": [ { "x": 1362.75, - "y": 1378.7850341796875 + "y": 1379 }, { "x": 1459.550048828125, - "y": 1430.95703125 + "y": 1431 }, { "x": 1483.75, @@ -7870,11 +7870,11 @@ "labelPercentage": 0, "route": [ { - "x": 287.62298583984375, + "x": 287.25, "y": 1394 }, { - "x": 312.92401123046875, + "x": 312.8500061035156, "y": 1434 }, { @@ -7929,11 +7929,11 @@ "labelPercentage": 0, "route": [ { - "x": 761.677001953125, + "x": 761.75, "y": 1560 }, { - "x": 776.135009765625, + "x": 776.1500244140625, "y": 1600 }, { @@ -7988,11 +7988,11 @@ "labelPercentage": 0, "route": [ { - "x": 1596.5989990234375, + "x": 1596.25, "y": 1228 }, { - "x": 1626.718994140625, + "x": 1626.6500244140625, "y": 1268 }, { @@ -8095,11 +8095,11 @@ "labelPercentage": 0, "route": [ { - "x": 991.56298828125, + "x": 991.25, "y": 1560 }, { - "x": 1008.9119873046875, + "x": 1008.8499755859375, "y": 1600 }, { @@ -8142,11 +8142,11 @@ "labelPercentage": 0, "route": [ { - "x": 531.0659790039062, + "x": 531, "y": 1560 }, { - "x": 567.81298828125, + "x": 567.7999877929688, "y": 1600 }, { @@ -8201,12 +8201,12 @@ "labelPercentage": 0, "route": [ { - "x": 947.75, - "y": 1700.31005859375 + "x": 948.25, + "y": 1700 }, { - "x": 1216.949951171875, - "y": 1760.862060546875 + "x": 1217.050048828125, + "y": 1760.800048828125 }, { "x": 1217.6500244140625, diff --git a/e2etests/testdata/stable/us_map/dagre/sketch.exp.svg b/e2etests/testdata/stable/us_map/dagre/sketch.exp.svg index 84f55ae99..932580745 100644 --- a/e2etests/testdata/stable/us_map/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/us_map/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -ALFLGAMSTNAKAZCANVNMUTARLAMOOKTXORCOKSNEWYCTMANYRIDEMDNJPANCSCHIIDMTWAILINIAMIKYWIOHMNSDVAWVMENHVTND + .d2-2937976607 .fill-N1{fill:#0A0F25;} + .d2-2937976607 .fill-N2{fill:#676C7E;} + .d2-2937976607 .fill-N3{fill:#9499AB;} + .d2-2937976607 .fill-N4{fill:#CFD2DD;} + .d2-2937976607 .fill-N5{fill:#DEE1EB;} + .d2-2937976607 .fill-N6{fill:#EEF1F8;} + .d2-2937976607 .fill-N7{fill:#FFFFFF;} + .d2-2937976607 .fill-B1{fill:#0D32B2;} + .d2-2937976607 .fill-B2{fill:#0D32B2;} + .d2-2937976607 .fill-B3{fill:#E3E9FD;} + .d2-2937976607 .fill-B4{fill:#E3E9FD;} + .d2-2937976607 .fill-B5{fill:#EDF0FD;} + .d2-2937976607 .fill-B6{fill:#F7F8FE;} + .d2-2937976607 .fill-AA2{fill:#4A6FF3;} + .d2-2937976607 .fill-AA4{fill:#EDF0FD;} + .d2-2937976607 .fill-AA5{fill:#F7F8FE;} + .d2-2937976607 .fill-AB4{fill:#EDF0FD;} + .d2-2937976607 .fill-AB5{fill:#F7F8FE;} + .d2-2937976607 .stroke-N1{stroke:#0A0F25;} + .d2-2937976607 .stroke-N2{stroke:#676C7E;} + .d2-2937976607 .stroke-N3{stroke:#9499AB;} + .d2-2937976607 .stroke-N4{stroke:#CFD2DD;} + .d2-2937976607 .stroke-N5{stroke:#DEE1EB;} + .d2-2937976607 .stroke-N6{stroke:#EEF1F8;} + .d2-2937976607 .stroke-N7{stroke:#FFFFFF;} + .d2-2937976607 .stroke-B1{stroke:#0D32B2;} + .d2-2937976607 .stroke-B2{stroke:#0D32B2;} + .d2-2937976607 .stroke-B3{stroke:#E3E9FD;} + .d2-2937976607 .stroke-B4{stroke:#E3E9FD;} + .d2-2937976607 .stroke-B5{stroke:#EDF0FD;} + .d2-2937976607 .stroke-B6{stroke:#F7F8FE;} + .d2-2937976607 .stroke-AA2{stroke:#4A6FF3;} + .d2-2937976607 .stroke-AA4{stroke:#EDF0FD;} + .d2-2937976607 .stroke-AA5{stroke:#F7F8FE;} + .d2-2937976607 .stroke-AB4{stroke:#EDF0FD;} + .d2-2937976607 .stroke-AB5{stroke:#F7F8FE;} + .d2-2937976607 .background-color-N1{background-color:#0A0F25;} + .d2-2937976607 .background-color-N2{background-color:#676C7E;} + .d2-2937976607 .background-color-N3{background-color:#9499AB;} + .d2-2937976607 .background-color-N4{background-color:#CFD2DD;} + .d2-2937976607 .background-color-N5{background-color:#DEE1EB;} + .d2-2937976607 .background-color-N6{background-color:#EEF1F8;} + .d2-2937976607 .background-color-N7{background-color:#FFFFFF;} + .d2-2937976607 .background-color-B1{background-color:#0D32B2;} + .d2-2937976607 .background-color-B2{background-color:#0D32B2;} + .d2-2937976607 .background-color-B3{background-color:#E3E9FD;} + .d2-2937976607 .background-color-B4{background-color:#E3E9FD;} + .d2-2937976607 .background-color-B5{background-color:#EDF0FD;} + .d2-2937976607 .background-color-B6{background-color:#F7F8FE;} + .d2-2937976607 .background-color-AA2{background-color:#4A6FF3;} + .d2-2937976607 .background-color-AA4{background-color:#EDF0FD;} + .d2-2937976607 .background-color-AA5{background-color:#F7F8FE;} + .d2-2937976607 .background-color-AB4{background-color:#EDF0FD;} + .d2-2937976607 .background-color-AB5{background-color:#F7F8FE;} + .d2-2937976607 .color-N1{color:#0A0F25;} + .d2-2937976607 .color-N2{color:#676C7E;} + .d2-2937976607 .color-N3{color:#9499AB;} + .d2-2937976607 .color-N4{color:#CFD2DD;} + .d2-2937976607 .color-N5{color:#DEE1EB;} + .d2-2937976607 .color-N6{color:#EEF1F8;} + .d2-2937976607 .color-N7{color:#FFFFFF;} + .d2-2937976607 .color-B1{color:#0D32B2;} + .d2-2937976607 .color-B2{color:#0D32B2;} + .d2-2937976607 .color-B3{color:#E3E9FD;} + .d2-2937976607 .color-B4{color:#E3E9FD;} + .d2-2937976607 .color-B5{color:#EDF0FD;} + .d2-2937976607 .color-B6{color:#F7F8FE;} + .d2-2937976607 .color-AA2{color:#4A6FF3;} + .d2-2937976607 .color-AA4{color:#EDF0FD;} + .d2-2937976607 .color-AA5{color:#F7F8FE;} + .d2-2937976607 .color-AB4{color:#EDF0FD;} + .d2-2937976607 .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}]]>ALFLGAMSTNAKAZCANVNMUTARLAMOOKTXORCOKSNEWYCTMANYRIDEMDNJPANCSCHIIDMTWAILINIAMIKYWIOHMNSDVAWVMENHVTND diff --git a/e2etests/testdata/themes/dark_terrastruct_flagship/dagre/board.exp.json b/e2etests/testdata/themes/dark_terrastruct_flagship/dagre/board.exp.json index 5c8ddbdef..9516c93f5 100644 --- a/e2etests/testdata/themes/dark_terrastruct_flagship/dagre/board.exp.json +++ b/e2etests/testdata/themes/dark_terrastruct_flagship/dagre/board.exp.json @@ -7,11 +7,11 @@ "id": "network", "type": "rectangle", "pos": { - "x": 0, - "y": 438 + "x": 7, + "y": 641 }, - "width": 450, - "height": 1694, + "width": 402, + "height": 1422, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -48,11 +48,11 @@ "id": "network.cell tower", "type": "rectangle", "pos": { - "x": 95, - "y": 503 + "x": 112, + "y": 682 }, - "width": 336, - "height": 766, + "width": 267, + "height": 547, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -89,8 +89,8 @@ "id": "network.cell tower.satellites", "type": "stored_data", "pos": { - "x": 140, - "y": 765 + "x": 142, + "y": 722 }, "width": 130, "height": 66, @@ -131,7 +131,7 @@ "type": "rectangle", "pos": { "x": 203, - "y": 1171 + "y": 1133 }, "width": 146, "height": 66, @@ -171,11 +171,11 @@ "id": "network.online portal", "type": "rectangle", "pos": { - "x": 20, - "y": 1941 + "x": 37, + "y": 1904 }, - "width": 147, - "height": 161, + "width": 119, + "height": 129, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -213,7 +213,7 @@ "type": "hexagon", "pos": { "x": 67, - "y": 1987 + "y": 1934 }, "width": 59, "height": 69, @@ -253,11 +253,11 @@ "id": "network.data processor", "type": "rectangle", "pos": { - "x": 181, - "y": 1426 + "x": 196, + "y": 1380 }, - "width": 189, - "height": 192, + "width": 169, + "height": 188, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -294,8 +294,8 @@ "id": "network.data processor.storage", "type": "cylinder", "pos": { - "x": 221, - "y": 1468 + "x": 226, + "y": 1420 }, "width": 99, "height": 118, @@ -336,7 +336,7 @@ "type": "person", "pos": { "x": 80, - "y": 82 + "y": 95 }, "width": 130, "height": 87, @@ -376,8 +376,8 @@ "id": "api server", "type": "rectangle", "pos": { - "x": 490, - "y": 1698 + "x": 508, + "y": 1688 }, "width": 116, "height": 66, @@ -417,8 +417,8 @@ "id": "logs", "type": "page", "pos": { - "x": 507, - "y": 1945 + "x": 529, + "y": 1925 }, "width": 73, "height": 87, @@ -458,7 +458,7 @@ "id": "users", "type": "sql_table", "pos": { - "x": 307, + "x": 304, "y": 30 }, "width": 208, @@ -642,7 +642,7 @@ "id": "products", "type": "class", "pos": { - "x": 575, + "x": 572, "y": 0 }, "width": 242, @@ -706,7 +706,7 @@ "id": "markdown", "type": "text", "pos": { - "x": 877, + "x": 894, "y": 79 }, "width": 97, @@ -746,7 +746,7 @@ "id": "code", "type": "code", "pos": { - "x": 490, + "x": 508, "y": 497 }, "width": 870, @@ -786,7 +786,7 @@ "id": "ex", "type": "text", "pos": { - "x": 723, + "x": 741, "y": 1140 }, "width": 404, @@ -849,20 +849,20 @@ "labelPercentage": 0, "route": [ { - "x": 205, - "y": 832 + "x": 203, + "y": 788 }, { - "x": 179.39999389648438, - "y": 1055.199951171875 + "x": 177, + "y": 1015.5999755859375 }, { - "x": 186.1999969482422, - "y": 1123.199951171875 + "x": 183.89999389648438, + "y": 1084.699951171875 }, { - "x": 239, - "y": 1172 + "x": 237.5, + "y": 1133.5 } ], "isCurve": true, @@ -896,20 +896,20 @@ "labelPercentage": 0, "route": [ { - "x": 214, - "y": 832 + "x": 211, + "y": 788 }, { - "x": 239.60000610351562, - "y": 1055.199951171875 + "x": 237, + "y": 1015.5999755859375 }, { - "x": 249.8000030517578, - "y": 1123.199951171875 + "x": 247.6999969482422, + "y": 1084.699951171875 }, { - "x": 265, - "y": 1172 + "x": 264.5, + "y": 1133.5 } ], "isCurve": true, @@ -943,20 +943,20 @@ "labelPercentage": 0, "route": [ { - "x": 226, - "y": 832 + "x": 221, + "y": 788 }, { - "x": 325.3999938964844, - "y": 1055.199951171875 + "x": 330.3999938964844, + "y": 1015.5999755859375 }, { - "x": 340.6499938964844, - "y": 1123.199951171875 + "x": 348.3500061035156, + "y": 1084.699951171875 }, { - "x": 302.25, - "y": 1172 + "x": 310.75, + "y": 1133.5 } ], "isCurve": true, @@ -991,31 +991,31 @@ "route": [ { "x": 275.5, - "y": 1237.5 + "y": 1199 }, { "x": 275.5, - "y": 1263.0999755859375 + "y": 1239 }, { "x": 275.5, - "y": 1281.5999755859375 + "y": 1261.0999755859375 }, { "x": 275.5, - "y": 1299.75 + "y": 1279.25 }, { "x": 275.5, - "y": 1317.9000244140625 + "y": 1297.4000244140625 }, { "x": 275.6000061035156, - "y": 1404.199951171875 + "y": 1378 }, { "x": 276, - "y": 1459 + "y": 1410 } ], "isCurve": true, @@ -1049,20 +1049,20 @@ "labelPercentage": 0, "route": [ { - "x": 163.5, - "y": 194.5 + "x": 166, + "y": 207.5 }, { - "x": 200.3000030517578, - "y": 308.1000061035156 + "x": 198.8000030517578, + "y": 310.70001220703125 }, { - "x": 209.5, - "y": 411.20001220703125 + "x": 207, + "y": 446.79998779296875 }, { - "x": 209.5, - "y": 468 + "x": 207, + "y": 646 } ], "isCurve": true, @@ -1096,12 +1096,12 @@ "labelPercentage": 0, "route": [ { - "x": 124.75, - "y": 194.5 + "x": 123.75, + "y": 197.5 }, { - "x": 84.75, - "y": 308.1000061035156 + "x": 84.55000305175781, + "y": 308.70001220703125 }, { "x": 74.75, @@ -1201,71 +1201,71 @@ }, { "x": 74.75, - "y": 1392.800048828125 + "y": 1391.800048828125 }, { "x": 74.75, - "y": 1427 + "y": 1424.5 }, { "x": 74.75, - "y": 1461.199951171875 + "y": 1457.199951171875 }, { "x": 74.75, - "y": 1506.800048828125 + "y": 1500.800048828125 }, { "x": 74.75, - "y": 1541 + "y": 1533.5 }, { "x": 74.75, - "y": 1575.199951171875 + "y": 1566.199951171875 }, { "x": 74.75, - "y": 1608 + "y": 1598 }, { "x": 74.75, - "y": 1623 + "y": 1613 }, { "x": 74.75, - "y": 1638 + "y": 1628 }, { "x": 74.75, - "y": 1664.5999755859375 + "y": 1654.5999755859375 }, { "x": 74.75, - "y": 1689.5 + "y": 1679.5 }, { "x": 74.75, - "y": 1714.4000244140625 + "y": 1704.4000244140625 }, { "x": 74.75, - "y": 1749.699951171875 + "y": 1739.699951171875 }, { "x": 74.75, - "y": 1777.75 + "y": 1767.75 }, { "x": 74.75, - "y": 1805.800048828125 + "y": 1795.800048828125 }, { "x": 77.5999984741211, - "y": 1905.5999755859375 + "y": 1886.800048828125 }, { "x": 89, - "y": 1988 + "y": 1934 } ], "isCurve": true, @@ -1299,20 +1299,20 @@ "labelPercentage": 0, "route": [ { - "x": 490, - "y": 1743.7149658203125 + "x": 507.5, + "y": 1733.7900390625 }, { - "x": 195.1999969482422, - "y": 1808.343017578125 + "x": 198.6999969482422, + "y": 1798.3580322265625 }, { - "x": 118.19999694824219, - "y": 1905.5999755859375 + "x": 118.4000015258789, + "y": 1886.800048828125 }, { - "x": 105, - "y": 1988 + "x": 106, + "y": 1934 } ], "isCurve": true, @@ -1346,20 +1346,20 @@ "labelPercentage": 0, "route": [ { - "x": 548, - "y": 1764 + "x": 565.5, + "y": 1753.5 }, { - "x": 548, - "y": 1812.4000244140625 + "x": 565.5, + "y": 1802.300048828125 }, { - "x": 548, - "y": 1895 + "x": 565.5999755859375, + "y": 1883 }, { - "x": 548, - "y": 1935 + "x": 566, + "y": 1915 } ], "isCurve": true, @@ -1393,20 +1393,20 @@ "labelPercentage": 0, "route": [ { - "x": 275.5, - "y": 1618.5 + "x": 285.5, + "y": 1568 }, { - "x": 275.5, - "y": 1642.0999755859375 + "x": 285.5, + "y": 1624 }, { - "x": 318.5, - "y": 1661 + "x": 329.8999938964844, + "y": 1651.0340576171875 }, { - "x": 490.5, - "y": 1713 + "x": 507.5, + "y": 1703.1700439453125 } ], "isCurve": true, @@ -1440,31 +1440,31 @@ "labelPercentage": 0, "route": [ { - "x": 925, + "x": 942.5, "y": 198.5 }, { - "x": 925, + "x": 942.5, "y": 308.8999938964844 }, { - "x": 925, + "x": 942.5, "y": 348.6000061035156 }, { - "x": 925, + "x": 942.5, "y": 366.75 }, { - "x": 925, + "x": 942.5, "y": 384.8999938964844 }, { - "x": 925, + "x": 942.5, "y": 457 }, { - "x": 925, + "x": 942.5, "y": 497 } ], @@ -1499,19 +1499,19 @@ "labelPercentage": 0, "route": [ { - "x": 925, - "y": 1012 + "x": 942.5, + "y": 1011.5 }, { - "x": 925, - "y": 1060.4000244140625 + "x": 942.5, + "y": 1060.300048828125 }, { - "x": 925, + "x": 942.5, "y": 1086.0999755859375 }, { - "x": 925, + "x": 942.5, "y": 1140.5 } ], diff --git a/e2etests/testdata/themes/dark_terrastruct_flagship/dagre/sketch.exp.svg b/e2etests/testdata/themes/dark_terrastruct_flagship/dagre/sketch.exp.svg index debe001a7..2ef133183 100644 --- a/e2etests/testdata/themes/dark_terrastruct_flagship/dagre/sketch.exp.svg +++ b/e2etests/testdata/themes/dark_terrastruct_flagship/dagre/sketch.exp.svg @@ -1,41 +1,41 @@ -networkuserapi serverlogsusersidintnamestringemailstringpasswordstringlast_logindatetimeproducts+idint+pricedecimal+skustring+namestring

A tale

+networkuserapi serverlogsusersidintnamestringemailstringpasswordstringlast_logindatetimeproducts+idint+pricedecimal+skustring+namestring

A tale

  • of
  • two cities
-
package main +
package main import (     "fmt" @@ -885,7 +885,7 @@     city2 := City{Name: "CityB", Population: 1200000}     tellTale(city1, city2) -}package main +}package main import (     "fmt" @@ -908,28 +908,28 @@     city2 := City{Name: "CityB", Population: 1200000}     tellTale(city1, city2) -}Cell Toweronline portaldata processorsatellitesTRANSMITTERuistorage sendsendsendphone logsmake call accessdisplaypersist - - - - - - - - - - - - - - - - - - - - - - - +}Cell Toweronline portaldata processorsatellitesTRANSMITTERuistorage sendsendsendphone logsmake call accessdisplaypersist + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/themes/origami/dagre/board.exp.json b/e2etests/testdata/themes/origami/dagre/board.exp.json index 00460a587..6bc8d05cb 100644 --- a/e2etests/testdata/themes/origami/dagre/board.exp.json +++ b/e2etests/testdata/themes/origami/dagre/board.exp.json @@ -7,11 +7,11 @@ "id": "network", "type": "rectangle", "pos": { - "x": 0, - "y": 275 + "x": 5, + "y": 227 }, - "width": 409, - "height": 1255, + "width": 356, + "height": 1198, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -49,11 +49,11 @@ "id": "network.cell tower", "type": "rectangle", "pos": { - "x": 95, - "y": 340 + "x": 157, + "y": 268 }, - "width": 294, - "height": 327, + "width": 174, + "height": 323, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -91,8 +91,8 @@ "id": "network.cell tower.satellites", "type": "stored_data", "pos": { - "x": 185, - "y": 382 + "x": 187, + "y": 308 }, "width": 104, "height": 66, @@ -133,8 +133,8 @@ "id": "network.cell tower.transmitter", "type": "rectangle", "pos": { - "x": 190, - "y": 569 + "x": 187, + "y": 495 }, "width": 104, "height": 66, @@ -175,11 +175,11 @@ "id": "network.online portal", "type": "rectangle", "pos": { - "x": 20, - "y": 1339 + "x": 35, + "y": 1266 }, - "width": 144, - "height": 161, + "width": 119, + "height": 129, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -218,7 +218,7 @@ "type": "hexagon", "pos": { "x": 65, - "y": 1385 + "y": 1296 }, "width": 59, "height": 69, @@ -259,11 +259,11 @@ "id": "network.data processor", "type": "rectangle", "pos": { - "x": 145, - "y": 824 + "x": 157, + "y": 742 }, - "width": 194, - "height": 192, + "width": 174, + "height": 188, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -301,8 +301,8 @@ "id": "network.data processor.storage", "type": "cylinder", "pos": { - "x": 185, - "y": 866 + "x": 187, + "y": 782 }, "width": 104, "height": 118, @@ -427,8 +427,8 @@ "id": "api server", "type": "rectangle", "pos": { - "x": 448, - "y": 1096 + "x": 463, + "y": 1050 }, "width": 151, "height": 66, @@ -469,8 +469,8 @@ "id": "logs", "type": "page", "pos": { - "x": 477, - "y": 1343 + "x": 497, + "y": 1287 }, "width": 84, "height": 87, @@ -533,20 +533,20 @@ "labelPercentage": 0, "route": [ { - "x": 212, - "y": 449 + "x": 213, + "y": 374 }, { - "x": 175.60000610351562, - "y": 497 + "x": 173.8000030517578, + "y": 422.3999938964844 }, { - "x": 176.3000030517578, - "y": 521.2000122070312 + "x": 173.8000030517578, + "y": 446.70001220703125 }, { - "x": 215.5, - "y": 570 + "x": 213, + "y": 495.5 } ], "isCurve": true, @@ -579,20 +579,20 @@ "labelPercentage": 0, "route": [ { - "x": 241, - "y": 449 + "x": 239, + "y": 374 }, { - "x": 241.39999389648438, - "y": 497 + "x": 239, + "y": 422.3999938964844 }, { - "x": 241.5, - "y": 521.2000122070312 + "x": 239, + "y": 446.70001220703125 }, { - "x": 241.5, - "y": 570 + "x": 239, + "y": 495.5 } ], "isCurve": true, @@ -625,20 +625,20 @@ "labelPercentage": 0, "route": [ { - "x": 271, - "y": 449 + "x": 265, + "y": 374 }, { - "x": 307.3999938964844, - "y": 497 + "x": 312.20001220703125, + "y": 422.3999938964844 }, { - "x": 306.70001220703125, - "y": 521.2000122070312 + "x": 312.20001220703125, + "y": 446.70001220703125 }, { - "x": 267.5, - "y": 570 + "x": 265, + "y": 495.5 } ], "isCurve": true, @@ -671,32 +671,32 @@ "labelPercentage": 0, "route": [ { - "x": 241.5, - "y": 635.5 + "x": 239, + "y": 561 }, { - "x": 241.5, - "y": 661.0999755859375 + "x": 239, + "y": 601 }, { - "x": 241.5, - "y": 679.5999755859375 + "x": 239, + "y": 623.0999755859375 }, { - "x": 241.5, - "y": 697.75 + "x": 239, + "y": 641.25 }, { - "x": 241.5, - "y": 715.9000244140625 + "x": 239, + "y": 659.4000244140625 }, { - "x": 241.60000610351562, - "y": 802.2000122070312 + "x": 239, + "y": 740 }, { - "x": 242, - "y": 857 + "x": 239, + "y": 772 } ], "isCurve": true, @@ -729,20 +729,20 @@ "labelPercentage": 0, "route": [ { - "x": 171, - "y": 87 + "x": 190, + "y": 93.5 }, { - "x": 227.39999389648438, - "y": 156.1999969482422 + "x": 229.1999969482422, + "y": 136.6999969482422 }, { - "x": 241.5, - "y": 248.1999969482422 + "x": 239, + "y": 212.8000030517578 }, { - "x": 241.5, - "y": 305 + "x": 239, + "y": 232 } ], "isCurve": true, @@ -775,176 +775,176 @@ "labelPercentage": 0, "route": [ { - "x": 111.75, - "y": 112.5 + "x": 101.75, + "y": 108.5 }, { - "x": 82.1500015258789, - "y": 161.3000030517578 + "x": 80.1500015258789, + "y": 139.6999969482422 }, { "x": 74.75, - "y": 185.60000610351562 + "y": 159.60000610351562 }, { "x": 74.75, - "y": 203.75 + "y": 177.75 }, { "x": 74.75, - "y": 221.89999389648438 + "y": 195.89999389648438 }, { "x": 74.75, - "y": 244 + "y": 218 }, { "x": 74.75, - "y": 259 + "y": 233 }, { "x": 74.75, - "y": 274 + "y": 248 }, { "x": 74.75, - "y": 301.6000061035156 + "y": 274.6000061035156 }, { "x": 74.75, - "y": 328 + "y": 299.5 }, { "x": 74.75, - "y": 354.3999938964844 + "y": 324.3999938964844 }, { "x": 74.75, - "y": 391.70001220703125 + "y": 359.70001220703125 }, { "x": 74.75, - "y": 421.25 + "y": 387.75 }, { "x": 74.75, - "y": 450.79998779296875 + "y": 415.79998779296875 }, { "x": 74.75, - "y": 489.20001220703125 + "y": 453.20001220703125 }, { "x": 74.75, - "y": 517.25 + "y": 481.25 }, { "x": 74.75, - "y": 545.2999877929688 + "y": 509.29998779296875 }, { "x": 74.75, - "y": 580.5999755859375 + "y": 544.5999755859375 }, { "x": 74.75, - "y": 605.5 + "y": 569.5 }, { "x": 74.75, - "y": 630.4000244140625 + "y": 594.4000244140625 }, { "x": 74.75, - "y": 659.0999755859375 + "y": 623.0999755859375 }, { "x": 74.75, - "y": 677.25 + "y": 641.25 }, { "x": 74.75, - "y": 695.4000244140625 + "y": 659.4000244140625 }, { "x": 74.75, - "y": 719.5999755859375 + "y": 683.5999755859375 }, { "x": 74.75, - "y": 737.75 + "y": 701.75 }, { "x": 74.75, - "y": 755.9000244140625 + "y": 719.9000244140625 }, { "x": 74.75, - "y": 790.7999877929688 + "y": 753.7999877929688 }, { "x": 74.75, - "y": 825 + "y": 786.5 }, { "x": 74.75, - "y": 859.2000122070312 + "y": 819.2000122070312 }, { "x": 74.75, - "y": 904.7999877929688 + "y": 862.7999877929688 }, { "x": 74.75, - "y": 939 + "y": 895.5 }, { "x": 74.75, - "y": 973.2000122070312 + "y": 928.2000122070312 }, { "x": 74.75, - "y": 1006 + "y": 960 }, { "x": 74.75, - "y": 1021 + "y": 975 }, { "x": 74.75, - "y": 1036 + "y": 990 }, { "x": 74.75, - "y": 1062.5999755859375 + "y": 1016.5999755859375 }, { "x": 74.75, - "y": 1087.5 + "y": 1041.5 }, { "x": 74.75, - "y": 1112.4000244140625 + "y": 1066.4000244140625 }, { "x": 74.75, - "y": 1147.699951171875 + "y": 1101.699951171875 }, { "x": 74.75, - "y": 1175.75 + "y": 1129.75 }, { "x": 74.75, - "y": 1203.800048828125 + "y": 1157.800048828125 }, { - "x": 77.4000015258789, - "y": 1303.5999755859375 + "x": 77.19999694824219, + "y": 1248.800048828125 }, { - "x": 88, - "y": 1386 + "x": 87, + "y": 1296 } ], "isCurve": true, @@ -977,20 +977,20 @@ "labelPercentage": 0, "route": [ { - "x": 448.25, - "y": 1146.4510498046875 + "x": 463.25, + "y": 1100.5 }, { - "x": 185.0500030517578, - "y": 1207.2900390625 + "x": 188.0500030517578, + "y": 1161.300048828125 }, { "x": 116, - "y": 1303.5999755859375 + "y": 1248.800048828125 }, { "x": 103, - "y": 1386 + "y": 1296 } ], "isCurve": true, @@ -1023,20 +1023,20 @@ "labelPercentage": 0, "route": [ { - "x": 523.75, - "y": 1162 + "x": 538.75, + "y": 1115.5 }, { - "x": 523.75, - "y": 1210.4000244140625 + "x": 538.75, + "y": 1164.300048828125 }, { - "x": 523.7990112304688, - "y": 1293 + "x": 538.7999877929688, + "y": 1245 }, { - "x": 524, - "y": 1333 + "x": 539, + "y": 1277 } ], "isCurve": true, @@ -1069,20 +1069,20 @@ "labelPercentage": 0, "route": [ { - "x": 241.5, - "y": 1016.5 + "x": 239, + "y": 930 }, { - "x": 241.5, - "y": 1040.0989990234375 + "x": 239, + "y": 986 }, { - "x": 282.8999938964844, - "y": 1058.199951171875 + "x": 283.79998779296875, + "y": 1012.2000122070312 }, { - "x": 448.5, - "y": 1107 + "x": 463, + "y": 1061 } ], "isCurve": true, diff --git a/e2etests/testdata/themes/origami/dagre/sketch.exp.svg b/e2etests/testdata/themes/origami/dagre/sketch.exp.svg index 95b6a1f75..de7c68203 100644 --- a/e2etests/testdata/themes/origami/dagre/sketch.exp.svg +++ b/e2etests/testdata/themes/origami/dagre/sketch.exp.svg @@ -1,23 +1,23 @@ -Big fontabca - - - - - - + .d2-1307947579 .fill-N1{fill:#0A0F25;} + .d2-1307947579 .fill-N2{fill:#676C7E;} + .d2-1307947579 .fill-N3{fill:#9499AB;} + .d2-1307947579 .fill-N4{fill:#CFD2DD;} + .d2-1307947579 .fill-N5{fill:#DEE1EB;} + .d2-1307947579 .fill-N6{fill:#EEF1F8;} + .d2-1307947579 .fill-N7{fill:#FFFFFF;} + .d2-1307947579 .fill-B1{fill:#0D32B2;} + .d2-1307947579 .fill-B2{fill:#0D32B2;} + .d2-1307947579 .fill-B3{fill:#E3E9FD;} + .d2-1307947579 .fill-B4{fill:#E3E9FD;} + .d2-1307947579 .fill-B5{fill:#EDF0FD;} + .d2-1307947579 .fill-B6{fill:#F7F8FE;} + .d2-1307947579 .fill-AA2{fill:#4A6FF3;} + .d2-1307947579 .fill-AA4{fill:#EDF0FD;} + .d2-1307947579 .fill-AA5{fill:#F7F8FE;} + .d2-1307947579 .fill-AB4{fill:#EDF0FD;} + .d2-1307947579 .fill-AB5{fill:#F7F8FE;} + .d2-1307947579 .stroke-N1{stroke:#0A0F25;} + .d2-1307947579 .stroke-N2{stroke:#676C7E;} + .d2-1307947579 .stroke-N3{stroke:#9499AB;} + .d2-1307947579 .stroke-N4{stroke:#CFD2DD;} + .d2-1307947579 .stroke-N5{stroke:#DEE1EB;} + .d2-1307947579 .stroke-N6{stroke:#EEF1F8;} + .d2-1307947579 .stroke-N7{stroke:#FFFFFF;} + .d2-1307947579 .stroke-B1{stroke:#0D32B2;} + .d2-1307947579 .stroke-B2{stroke:#0D32B2;} + .d2-1307947579 .stroke-B3{stroke:#E3E9FD;} + .d2-1307947579 .stroke-B4{stroke:#E3E9FD;} + .d2-1307947579 .stroke-B5{stroke:#EDF0FD;} + .d2-1307947579 .stroke-B6{stroke:#F7F8FE;} + .d2-1307947579 .stroke-AA2{stroke:#4A6FF3;} + .d2-1307947579 .stroke-AA4{stroke:#EDF0FD;} + .d2-1307947579 .stroke-AA5{stroke:#F7F8FE;} + .d2-1307947579 .stroke-AB4{stroke:#EDF0FD;} + .d2-1307947579 .stroke-AB5{stroke:#F7F8FE;} + .d2-1307947579 .background-color-N1{background-color:#0A0F25;} + .d2-1307947579 .background-color-N2{background-color:#676C7E;} + .d2-1307947579 .background-color-N3{background-color:#9499AB;} + .d2-1307947579 .background-color-N4{background-color:#CFD2DD;} + .d2-1307947579 .background-color-N5{background-color:#DEE1EB;} + .d2-1307947579 .background-color-N6{background-color:#EEF1F8;} + .d2-1307947579 .background-color-N7{background-color:#FFFFFF;} + .d2-1307947579 .background-color-B1{background-color:#0D32B2;} + .d2-1307947579 .background-color-B2{background-color:#0D32B2;} + .d2-1307947579 .background-color-B3{background-color:#E3E9FD;} + .d2-1307947579 .background-color-B4{background-color:#E3E9FD;} + .d2-1307947579 .background-color-B5{background-color:#EDF0FD;} + .d2-1307947579 .background-color-B6{background-color:#F7F8FE;} + .d2-1307947579 .background-color-AA2{background-color:#4A6FF3;} + .d2-1307947579 .background-color-AA4{background-color:#EDF0FD;} + .d2-1307947579 .background-color-AA5{background-color:#F7F8FE;} + .d2-1307947579 .background-color-AB4{background-color:#EDF0FD;} + .d2-1307947579 .background-color-AB5{background-color:#F7F8FE;} + .d2-1307947579 .color-N1{color:#0A0F25;} + .d2-1307947579 .color-N2{color:#676C7E;} + .d2-1307947579 .color-N3{color:#9499AB;} + .d2-1307947579 .color-N4{color:#CFD2DD;} + .d2-1307947579 .color-N5{color:#DEE1EB;} + .d2-1307947579 .color-N6{color:#EEF1F8;} + .d2-1307947579 .color-N7{color:#FFFFFF;} + .d2-1307947579 .color-B1{color:#0D32B2;} + .d2-1307947579 .color-B2{color:#0D32B2;} + .d2-1307947579 .color-B3{color:#E3E9FD;} + .d2-1307947579 .color-B4{color:#E3E9FD;} + .d2-1307947579 .color-B5{color:#EDF0FD;} + .d2-1307947579 .color-B6{color:#F7F8FE;} + .d2-1307947579 .color-AA2{color:#4A6FF3;} + .d2-1307947579 .color-AA4{color:#EDF0FD;} + .d2-1307947579 .color-AA5{color:#F7F8FE;} + .d2-1307947579 .color-AB4{color:#EDF0FD;} + .d2-1307947579 .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}]]>Big fontabca + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/todo/container_label_edge_adjustment/dagre/board.exp.json b/e2etests/testdata/todo/container_label_edge_adjustment/dagre/board.exp.json index 5ba9d5b05..94c8bbff0 100644 --- a/e2etests/testdata/todo/container_label_edge_adjustment/dagre/board.exp.json +++ b/e2etests/testdata/todo/container_label_edge_adjustment/dagre/board.exp.json @@ -49,10 +49,10 @@ "type": "cloud", "pos": { "x": 0, - "y": 207 + "y": 166 }, "width": 398, - "height": 125, + "height": 166, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -90,7 +90,7 @@ "type": "rectangle", "pos": { "x": 183, - "y": 236 + "y": 216 }, "width": 53, "height": 66, @@ -326,11 +326,11 @@ }, { "x": 68.5, - "y": 184.0970001220703 + "y": 179.9969940185547 }, { "x": 182.5, - "y": 256.4849853515625 + "y": 235.98500061035156 } ], "isCurve": true, @@ -365,11 +365,11 @@ "route": [ { "x": 209, - "y": 302.5 + "y": 282 }, { "x": 209, - "y": 326.1000061035156 + "y": 322 }, { "x": 209, @@ -420,11 +420,11 @@ }, { "x": 159.8000030517578, - "y": 180.10000610351562 + "y": 176 }, { "x": 187, - "y": 236.5 + "y": 216 } ], "isCurve": true, @@ -463,18 +463,9 @@ }, { "x": 265, - "y": 106 - }, - { - "x": 265, - "y": 126 - }, - { - "x": 265, - "y": 166 + "y": 125 } ], - "isCurve": true, "animated": false, "tooltip": "", "icon": null, @@ -514,11 +505,11 @@ }, { "x": 377.6000061035156, - "y": 145 + "y": 140 }, { "x": 378, - "y": 261 + "y": 236 } ], "isCurve": true, diff --git a/e2etests/testdata/todo/container_label_edge_adjustment/dagre/sketch.exp.svg b/e2etests/testdata/todo/container_label_edge_adjustment/dagre/sketch.exp.svg index d4ee0b98c..03d379a64 100644 --- a/e2etests/testdata/todo/container_label_edge_adjustment/dagre/sketch.exp.svg +++ b/e2etests/testdata/todo/container_label_edge_adjustment/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -aa container labeldefgc + .d2-1836296818 .fill-N1{fill:#0A0F25;} + .d2-1836296818 .fill-N2{fill:#676C7E;} + .d2-1836296818 .fill-N3{fill:#9499AB;} + .d2-1836296818 .fill-N4{fill:#CFD2DD;} + .d2-1836296818 .fill-N5{fill:#DEE1EB;} + .d2-1836296818 .fill-N6{fill:#EEF1F8;} + .d2-1836296818 .fill-N7{fill:#FFFFFF;} + .d2-1836296818 .fill-B1{fill:#0D32B2;} + .d2-1836296818 .fill-B2{fill:#0D32B2;} + .d2-1836296818 .fill-B3{fill:#E3E9FD;} + .d2-1836296818 .fill-B4{fill:#E3E9FD;} + .d2-1836296818 .fill-B5{fill:#EDF0FD;} + .d2-1836296818 .fill-B6{fill:#F7F8FE;} + .d2-1836296818 .fill-AA2{fill:#4A6FF3;} + .d2-1836296818 .fill-AA4{fill:#EDF0FD;} + .d2-1836296818 .fill-AA5{fill:#F7F8FE;} + .d2-1836296818 .fill-AB4{fill:#EDF0FD;} + .d2-1836296818 .fill-AB5{fill:#F7F8FE;} + .d2-1836296818 .stroke-N1{stroke:#0A0F25;} + .d2-1836296818 .stroke-N2{stroke:#676C7E;} + .d2-1836296818 .stroke-N3{stroke:#9499AB;} + .d2-1836296818 .stroke-N4{stroke:#CFD2DD;} + .d2-1836296818 .stroke-N5{stroke:#DEE1EB;} + .d2-1836296818 .stroke-N6{stroke:#EEF1F8;} + .d2-1836296818 .stroke-N7{stroke:#FFFFFF;} + .d2-1836296818 .stroke-B1{stroke:#0D32B2;} + .d2-1836296818 .stroke-B2{stroke:#0D32B2;} + .d2-1836296818 .stroke-B3{stroke:#E3E9FD;} + .d2-1836296818 .stroke-B4{stroke:#E3E9FD;} + .d2-1836296818 .stroke-B5{stroke:#EDF0FD;} + .d2-1836296818 .stroke-B6{stroke:#F7F8FE;} + .d2-1836296818 .stroke-AA2{stroke:#4A6FF3;} + .d2-1836296818 .stroke-AA4{stroke:#EDF0FD;} + .d2-1836296818 .stroke-AA5{stroke:#F7F8FE;} + .d2-1836296818 .stroke-AB4{stroke:#EDF0FD;} + .d2-1836296818 .stroke-AB5{stroke:#F7F8FE;} + .d2-1836296818 .background-color-N1{background-color:#0A0F25;} + .d2-1836296818 .background-color-N2{background-color:#676C7E;} + .d2-1836296818 .background-color-N3{background-color:#9499AB;} + .d2-1836296818 .background-color-N4{background-color:#CFD2DD;} + .d2-1836296818 .background-color-N5{background-color:#DEE1EB;} + .d2-1836296818 .background-color-N6{background-color:#EEF1F8;} + .d2-1836296818 .background-color-N7{background-color:#FFFFFF;} + .d2-1836296818 .background-color-B1{background-color:#0D32B2;} + .d2-1836296818 .background-color-B2{background-color:#0D32B2;} + .d2-1836296818 .background-color-B3{background-color:#E3E9FD;} + .d2-1836296818 .background-color-B4{background-color:#E3E9FD;} + .d2-1836296818 .background-color-B5{background-color:#EDF0FD;} + .d2-1836296818 .background-color-B6{background-color:#F7F8FE;} + .d2-1836296818 .background-color-AA2{background-color:#4A6FF3;} + .d2-1836296818 .background-color-AA4{background-color:#EDF0FD;} + .d2-1836296818 .background-color-AA5{background-color:#F7F8FE;} + .d2-1836296818 .background-color-AB4{background-color:#EDF0FD;} + .d2-1836296818 .background-color-AB5{background-color:#F7F8FE;} + .d2-1836296818 .color-N1{color:#0A0F25;} + .d2-1836296818 .color-N2{color:#676C7E;} + .d2-1836296818 .color-N3{color:#9499AB;} + .d2-1836296818 .color-N4{color:#CFD2DD;} + .d2-1836296818 .color-N5{color:#DEE1EB;} + .d2-1836296818 .color-N6{color:#EEF1F8;} + .d2-1836296818 .color-N7{color:#FFFFFF;} + .d2-1836296818 .color-B1{color:#0D32B2;} + .d2-1836296818 .color-B2{color:#0D32B2;} + .d2-1836296818 .color-B3{color:#E3E9FD;} + .d2-1836296818 .color-B4{color:#E3E9FD;} + .d2-1836296818 .color-B5{color:#EDF0FD;} + .d2-1836296818 .color-B6{color:#F7F8FE;} + .d2-1836296818 .color-AA2{color:#4A6FF3;} + .d2-1836296818 .color-AA4{color:#EDF0FD;} + .d2-1836296818 .color-AA5{color:#F7F8FE;} + .d2-1836296818 .color-AB4{color:#EDF0FD;} + .d2-1836296818 .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}]]>aa container labeldefgc - + - + \ No newline at end of file diff --git a/e2etests/testdata/todo/container_label_edge_adjustment2/dagre/board.exp.json b/e2etests/testdata/todo/container_label_edge_adjustment2/dagre/board.exp.json index 3dc98d2b0..d503bd825 100644 --- a/e2etests/testdata/todo/container_label_edge_adjustment2/dagre/board.exp.json +++ b/e2etests/testdata/todo/container_label_edge_adjustment2/dagre/board.exp.json @@ -48,11 +48,11 @@ "id": "y", "type": "rectangle", "pos": { - "x": 0, - "y": 207 + "x": 10, + "y": 186 }, - "width": 132, - "height": 125, + "width": 112, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -90,7 +90,7 @@ "type": "rectangle", "pos": { "x": 40, - "y": 236 + "y": 216 }, "width": 52, "height": 66, @@ -174,11 +174,11 @@ }, { "x": 66, - "y": 126 + "y": 121.80000305175781 }, { "x": 66, - "y": 166 + "y": 145 } ], "isCurve": true, diff --git a/e2etests/testdata/todo/container_label_edge_adjustment2/dagre/sketch.exp.svg b/e2etests/testdata/todo/container_label_edge_adjustment2/dagre/sketch.exp.svg index 688f602e3..ea705106c 100644 --- a/e2etests/testdata/todo/container_label_edge_adjustment2/dagre/sketch.exp.svg +++ b/e2etests/testdata/todo/container_label_edge_adjustment2/dagre/sketch.exp.svg @@ -1,23 +1,23 @@ -xbarz foo - + .d2-2250240028 .fill-N1{fill:#0A0F25;} + .d2-2250240028 .fill-N2{fill:#676C7E;} + .d2-2250240028 .fill-N3{fill:#9499AB;} + .d2-2250240028 .fill-N4{fill:#CFD2DD;} + .d2-2250240028 .fill-N5{fill:#DEE1EB;} + .d2-2250240028 .fill-N6{fill:#EEF1F8;} + .d2-2250240028 .fill-N7{fill:#FFFFFF;} + .d2-2250240028 .fill-B1{fill:#0D32B2;} + .d2-2250240028 .fill-B2{fill:#0D32B2;} + .d2-2250240028 .fill-B3{fill:#E3E9FD;} + .d2-2250240028 .fill-B4{fill:#E3E9FD;} + .d2-2250240028 .fill-B5{fill:#EDF0FD;} + .d2-2250240028 .fill-B6{fill:#F7F8FE;} + .d2-2250240028 .fill-AA2{fill:#4A6FF3;} + .d2-2250240028 .fill-AA4{fill:#EDF0FD;} + .d2-2250240028 .fill-AA5{fill:#F7F8FE;} + .d2-2250240028 .fill-AB4{fill:#EDF0FD;} + .d2-2250240028 .fill-AB5{fill:#F7F8FE;} + .d2-2250240028 .stroke-N1{stroke:#0A0F25;} + .d2-2250240028 .stroke-N2{stroke:#676C7E;} + .d2-2250240028 .stroke-N3{stroke:#9499AB;} + .d2-2250240028 .stroke-N4{stroke:#CFD2DD;} + .d2-2250240028 .stroke-N5{stroke:#DEE1EB;} + .d2-2250240028 .stroke-N6{stroke:#EEF1F8;} + .d2-2250240028 .stroke-N7{stroke:#FFFFFF;} + .d2-2250240028 .stroke-B1{stroke:#0D32B2;} + .d2-2250240028 .stroke-B2{stroke:#0D32B2;} + .d2-2250240028 .stroke-B3{stroke:#E3E9FD;} + .d2-2250240028 .stroke-B4{stroke:#E3E9FD;} + .d2-2250240028 .stroke-B5{stroke:#EDF0FD;} + .d2-2250240028 .stroke-B6{stroke:#F7F8FE;} + .d2-2250240028 .stroke-AA2{stroke:#4A6FF3;} + .d2-2250240028 .stroke-AA4{stroke:#EDF0FD;} + .d2-2250240028 .stroke-AA5{stroke:#F7F8FE;} + .d2-2250240028 .stroke-AB4{stroke:#EDF0FD;} + .d2-2250240028 .stroke-AB5{stroke:#F7F8FE;} + .d2-2250240028 .background-color-N1{background-color:#0A0F25;} + .d2-2250240028 .background-color-N2{background-color:#676C7E;} + .d2-2250240028 .background-color-N3{background-color:#9499AB;} + .d2-2250240028 .background-color-N4{background-color:#CFD2DD;} + .d2-2250240028 .background-color-N5{background-color:#DEE1EB;} + .d2-2250240028 .background-color-N6{background-color:#EEF1F8;} + .d2-2250240028 .background-color-N7{background-color:#FFFFFF;} + .d2-2250240028 .background-color-B1{background-color:#0D32B2;} + .d2-2250240028 .background-color-B2{background-color:#0D32B2;} + .d2-2250240028 .background-color-B3{background-color:#E3E9FD;} + .d2-2250240028 .background-color-B4{background-color:#E3E9FD;} + .d2-2250240028 .background-color-B5{background-color:#EDF0FD;} + .d2-2250240028 .background-color-B6{background-color:#F7F8FE;} + .d2-2250240028 .background-color-AA2{background-color:#4A6FF3;} + .d2-2250240028 .background-color-AA4{background-color:#EDF0FD;} + .d2-2250240028 .background-color-AA5{background-color:#F7F8FE;} + .d2-2250240028 .background-color-AB4{background-color:#EDF0FD;} + .d2-2250240028 .background-color-AB5{background-color:#F7F8FE;} + .d2-2250240028 .color-N1{color:#0A0F25;} + .d2-2250240028 .color-N2{color:#676C7E;} + .d2-2250240028 .color-N3{color:#9499AB;} + .d2-2250240028 .color-N4{color:#CFD2DD;} + .d2-2250240028 .color-N5{color:#DEE1EB;} + .d2-2250240028 .color-N6{color:#EEF1F8;} + .d2-2250240028 .color-N7{color:#FFFFFF;} + .d2-2250240028 .color-B1{color:#0D32B2;} + .d2-2250240028 .color-B2{color:#0D32B2;} + .d2-2250240028 .color-B3{color:#E3E9FD;} + .d2-2250240028 .color-B4{color:#E3E9FD;} + .d2-2250240028 .color-B5{color:#EDF0FD;} + .d2-2250240028 .color-B6{color:#F7F8FE;} + .d2-2250240028 .color-AA2{color:#4A6FF3;} + .d2-2250240028 .color-AA4{color:#EDF0FD;} + .d2-2250240028 .color-AA5{color:#F7F8FE;} + .d2-2250240028 .color-AB4{color:#EDF0FD;} + .d2-2250240028 .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}]]>xbarz foo + - - + + \ No newline at end of file diff --git a/e2etests/testdata/todo/dagre_container_md_label_panic/dagre/board.exp.json b/e2etests/testdata/todo/dagre_container_md_label_panic/dagre/board.exp.json index 35dde90d3..c2a5b5cf4 100644 --- a/e2etests/testdata/todo/dagre_container_md_label_panic/dagre/board.exp.json +++ b/e2etests/testdata/todo/dagre_container_md_label_panic/dagre/board.exp.json @@ -322,11 +322,11 @@ "labelPercentage": 0, "route": [ { - "x": 187.53599548339844, + "x": 187.5, "y": 282 }, { - "x": 240.3070068359375, + "x": 240.3000030517578, "y": 322 }, { @@ -369,11 +369,11 @@ "labelPercentage": 0, "route": [ { - "x": 141.01800537109375, + "x": 141.5, "y": 282 }, { - "x": 137.4029998779297, + "x": 137.5, "y": 322 }, { @@ -428,11 +428,11 @@ "labelPercentage": 0, "route": [ { - "x": 108.01799774169922, + "x": 108.5, "y": 282 }, { - "x": 64.40299987792969, + "x": 64.5, "y": 322 }, { @@ -511,11 +511,11 @@ "labelPercentage": 0, "route": [ { - "x": 233.6199951171875, + "x": 233.5, "y": 448 }, { - "x": 209.5240020751953, + "x": 209.5, "y": 488 }, { @@ -605,11 +605,11 @@ "labelPercentage": 0, "route": [ { - "x": 209.16200256347656, + "x": 209.5, "y": 714 }, { - "x": 276.6319885253906, + "x": 276.70001220703125, "y": 674 }, { diff --git a/e2etests/testdata/todo/dagre_container_md_label_panic/dagre/sketch.exp.svg b/e2etests/testdata/todo/dagre_container_md_label_panic/dagre/sketch.exp.svg index 478eba267..1515ae07e 100644 --- a/e2etests/testdata/todo/dagre_container_md_label_panic/dagre/sketch.exp.svg +++ b/e2etests/testdata/todo/dagre_container_md_label_panic/dagre/sketch.exp.svg @@ -1,20 +1,20 @@ -OEM Factory

company Warehouse

@@ -843,7 +843,7 @@
  • Staging
  • Dispatch to Site
    • -
    MasterRegional-1Regional-2Regional-N +MasterRegional-1Regional-2Regional-N diff --git a/e2etests/testdata/todo/shape_set_width_height/dagre/board.exp.json b/e2etests/testdata/todo/shape_set_width_height/dagre/board.exp.json index 54dd7728f..8b613b932 100644 --- a/e2etests/testdata/todo/shape_set_width_height/dagre/board.exp.json +++ b/e2etests/testdata/todo/shape_set_width_height/dagre/board.exp.json @@ -8,10 +8,10 @@ "type": "rectangle", "pos": { "x": 0, - "y": 41 + "y": 9 }, "width": 932, - "height": 415, + "height": 427, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -49,10 +49,10 @@ "type": "oval", "pos": { "x": 20, - "y": 106 + "y": 50 }, "width": 208, - "height": 320, + "height": 356, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -90,7 +90,7 @@ "type": "diamond", "pos": { "x": 60, - "y": 234 + "y": 196 }, "width": 128, "height": 64, @@ -131,10 +131,10 @@ "type": "diamond", "pos": { "x": 248, - "y": 106 + "y": 50 }, "width": 208, - "height": 320, + "height": 356, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -172,7 +172,7 @@ "type": "oval", "pos": { "x": 288, - "y": 202 + "y": 164 }, "width": 128, "height": 128, @@ -213,10 +213,10 @@ "type": "oval", "pos": { "x": 476, - "y": 106 + "y": 50 }, "width": 208, - "height": 320, + "height": 356, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -254,7 +254,7 @@ "type": "hexagon", "pos": { "x": 516, - "y": 234 + "y": 196 }, "width": 128, "height": 64, @@ -295,10 +295,10 @@ "type": "hexagon", "pos": { "x": 704, - "y": 106 + "y": 50 }, "width": 208, - "height": 320, + "height": 356, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -336,7 +336,7 @@ "type": "oval", "pos": { "x": 744, - "y": 234 + "y": 196 }, "width": 128, "height": 64, diff --git a/e2etests/testdata/todo/shape_set_width_height/dagre/sketch.exp.svg b/e2etests/testdata/todo/shape_set_width_height/dagre/sketch.exp.svg index 252b9a04b..ef900bd7c 100644 --- a/e2etests/testdata/todo/shape_set_width_height/dagre/sketch.exp.svg +++ b/e2etests/testdata/todo/shape_set_width_height/dagre/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

    +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 @@ -859,21 +859,21 @@ b := a + 7 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 diff --git a/e2etests/testdata/unicode/japanese-full/dagre/board.exp.json b/e2etests/testdata/unicode/japanese-full/dagre/board.exp.json index dae5f577e..e7ba2a978 100644 --- a/e2etests/testdata/unicode/japanese-full/dagre/board.exp.json +++ b/e2etests/testdata/unicode/japanese-full/dagre/board.exp.json @@ -113,11 +113,11 @@ "route": [ { "x": 691, - "y": 98 + "y": 97.5 }, { "x": 691, - "y": 146.39999389648438 + "y": 146.3000030517578 }, { "x": 691, diff --git a/e2etests/testdata/unicode/japanese-full/dagre/sketch.exp.svg b/e2etests/testdata/unicode/japanese-full/dagre/sketch.exp.svg index d508b9dcc..c4dd9af2e 100644 --- a/e2etests/testdata/unicode/japanese-full/dagre/sketch.exp.svg +++ b/e2etests/testdata/unicode/japanese-full/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -ある日、トマトが道を歩いていたら、道路の向こうからキュウリがやって来ました。トマトは驚いて尋ねました。「キュウリさん、どうしてあなたはここにいるのですか？」 キュウリは答えました。「あなたと同じ理由でここにいます。サラダになるために。」「バナナは皮を剥いて食べるものです。」 「バカは死ななきゃ治らない。」 + .d2-1036466245 .fill-N1{fill:#0A0F25;} + .d2-1036466245 .fill-N2{fill:#676C7E;} + .d2-1036466245 .fill-N3{fill:#9499AB;} + .d2-1036466245 .fill-N4{fill:#CFD2DD;} + .d2-1036466245 .fill-N5{fill:#DEE1EB;} + .d2-1036466245 .fill-N6{fill:#EEF1F8;} + .d2-1036466245 .fill-N7{fill:#FFFFFF;} + .d2-1036466245 .fill-B1{fill:#0D32B2;} + .d2-1036466245 .fill-B2{fill:#0D32B2;} + .d2-1036466245 .fill-B3{fill:#E3E9FD;} + .d2-1036466245 .fill-B4{fill:#E3E9FD;} + .d2-1036466245 .fill-B5{fill:#EDF0FD;} + .d2-1036466245 .fill-B6{fill:#F7F8FE;} + .d2-1036466245 .fill-AA2{fill:#4A6FF3;} + .d2-1036466245 .fill-AA4{fill:#EDF0FD;} + .d2-1036466245 .fill-AA5{fill:#F7F8FE;} + .d2-1036466245 .fill-AB4{fill:#EDF0FD;} + .d2-1036466245 .fill-AB5{fill:#F7F8FE;} + .d2-1036466245 .stroke-N1{stroke:#0A0F25;} + .d2-1036466245 .stroke-N2{stroke:#676C7E;} + .d2-1036466245 .stroke-N3{stroke:#9499AB;} + .d2-1036466245 .stroke-N4{stroke:#CFD2DD;} + .d2-1036466245 .stroke-N5{stroke:#DEE1EB;} + .d2-1036466245 .stroke-N6{stroke:#EEF1F8;} + .d2-1036466245 .stroke-N7{stroke:#FFFFFF;} + .d2-1036466245 .stroke-B1{stroke:#0D32B2;} + .d2-1036466245 .stroke-B2{stroke:#0D32B2;} + .d2-1036466245 .stroke-B3{stroke:#E3E9FD;} + .d2-1036466245 .stroke-B4{stroke:#E3E9FD;} + .d2-1036466245 .stroke-B5{stroke:#EDF0FD;} + .d2-1036466245 .stroke-B6{stroke:#F7F8FE;} + .d2-1036466245 .stroke-AA2{stroke:#4A6FF3;} + .d2-1036466245 .stroke-AA4{stroke:#EDF0FD;} + .d2-1036466245 .stroke-AA5{stroke:#F7F8FE;} + .d2-1036466245 .stroke-AB4{stroke:#EDF0FD;} + .d2-1036466245 .stroke-AB5{stroke:#F7F8FE;} + .d2-1036466245 .background-color-N1{background-color:#0A0F25;} + .d2-1036466245 .background-color-N2{background-color:#676C7E;} + .d2-1036466245 .background-color-N3{background-color:#9499AB;} + .d2-1036466245 .background-color-N4{background-color:#CFD2DD;} + .d2-1036466245 .background-color-N5{background-color:#DEE1EB;} + .d2-1036466245 .background-color-N6{background-color:#EEF1F8;} + .d2-1036466245 .background-color-N7{background-color:#FFFFFF;} + .d2-1036466245 .background-color-B1{background-color:#0D32B2;} + .d2-1036466245 .background-color-B2{background-color:#0D32B2;} + .d2-1036466245 .background-color-B3{background-color:#E3E9FD;} + .d2-1036466245 .background-color-B4{background-color:#E3E9FD;} + .d2-1036466245 .background-color-B5{background-color:#EDF0FD;} + .d2-1036466245 .background-color-B6{background-color:#F7F8FE;} + .d2-1036466245 .background-color-AA2{background-color:#4A6FF3;} + .d2-1036466245 .background-color-AA4{background-color:#EDF0FD;} + .d2-1036466245 .background-color-AA5{background-color:#F7F8FE;} + .d2-1036466245 .background-color-AB4{background-color:#EDF0FD;} + .d2-1036466245 .background-color-AB5{background-color:#F7F8FE;} + .d2-1036466245 .color-N1{color:#0A0F25;} + .d2-1036466245 .color-N2{color:#676C7E;} + .d2-1036466245 .color-N3{color:#9499AB;} + .d2-1036466245 .color-N4{color:#CFD2DD;} + .d2-1036466245 .color-N5{color:#DEE1EB;} + .d2-1036466245 .color-N6{color:#EEF1F8;} + .d2-1036466245 .color-N7{color:#FFFFFF;} + .d2-1036466245 .color-B1{color:#0D32B2;} + .d2-1036466245 .color-B2{color:#0D32B2;} + .d2-1036466245 .color-B3{color:#E3E9FD;} + .d2-1036466245 .color-B4{color:#E3E9FD;} + .d2-1036466245 .color-B5{color:#EDF0FD;} + .d2-1036466245 .color-B6{color:#F7F8FE;} + .d2-1036466245 .color-AA2{color:#4A6FF3;} + .d2-1036466245 .color-AA4{color:#EDF0FD;} + .d2-1036466245 .color-AA5{color:#F7F8FE;} + .d2-1036466245 .color-AB4{color:#EDF0FD;} + .d2-1036466245 .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}]]>ある日、トマトが道を歩いていたら、道路の向こうからキュウリがやって来ました。トマトは驚いて尋ねました。「キュウリさん、どうしてあなたはここにいるのですか？」 キュウリは答えました。「あなたと同じ理由でここにいます。サラダになるために。」「バナナは皮を剥いて食べるものです。」 「バカは死ななきゃ治らない。」 diff --git a/e2etests/testdata/unicode/mixed-language/dagre/board.exp.json b/e2etests/testdata/unicode/mixed-language/dagre/board.exp.json index 1fa81de41..421ffcdfe 100644 --- a/e2etests/testdata/unicode/mixed-language/dagre/board.exp.json +++ b/e2etests/testdata/unicode/mixed-language/dagre/board.exp.json @@ -152,11 +152,11 @@ "labelPercentage": 0, "route": [ { - "x": 357.8380126953125, + "x": 358, "y": 98 }, { - "x": 250.76699829101562, + "x": 250.8000030517578, "y": 138 }, { @@ -199,11 +199,11 @@ "labelPercentage": 0, "route": [ { - "x": 620.1610107421875, + "x": 620, "y": 98 }, { - "x": 727.2319946289062, + "x": 727.2000122070312, "y": 138 }, { diff --git a/e2etests/testdata/unicode/mixed-language/dagre/sketch.exp.svg b/e2etests/testdata/unicode/mixed-language/dagre/sketch.exp.svg index f8b63e9f9..93f07a86c 100644 --- a/e2etests/testdata/unicode/mixed-language/dagre/sketch.exp.svg +++ b/e2etests/testdata/unicode/mixed-language/dagre/sketch.exp.svg @@ -1,20 +1,20 @@ -有一个叫做夏天的季节。 ある季節、夏という名前がついています。한 계절, 여름이란 이름이 있습니다.夏天的时候，天气非常热，人们总是流着汗。

    夏になると、とても暑くて、人々は汗を流しています。

    여름에는 매우 더워서 사람들은 땀을 흘립니다.

    -
     +
     From 92b8c2c877ba11bfb85bcc687e0a50ea6309aac0 Mon Sep 17 00:00:00 2001 From: Gavin Nishizawa Date: Mon, 17 Jul 2023 15:11:38 -0700 Subject: [PATCH 22/31] check for internal edges and their labels --- d2layouts/d2dagrelayout/layout.go | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/d2layouts/d2dagrelayout/layout.go b/d2layouts/d2dagrelayout/layout.go index 5a2ff9145..62efe1a53 100644 --- a/d2layouts/d2dagrelayout/layout.go +++ b/d2layouts/d2dagrelayout/layout.go @@ -1403,6 +1403,32 @@ func fitPadding(obj *d2graph.Object) { innerLeft = math.Min(innerLeft, child.TopLeft.X-math.Max(margin.left, padding.left)) innerRight = math.Max(innerRight, child.TopLeft.X+child.Width+dx+math.Max(margin.right, padding.right)) } + for _, edge := range obj.Graph.Edges { + if !edge.Src.IsDescendantOf(obj) || !edge.Dst.IsDescendantOf(obj) { + continue + } + // check internal edge + their labels + if edge.Label.Value != "" { + labelPosition := label.InsideMiddleCenter + if edge.LabelPosition != nil { + labelPosition = label.Position(*edge.LabelPosition) + } + labelWidth := float64(edge.LabelDimensions.Width) + labelHeight := float64(edge.LabelDimensions.Height) + point, _ := labelPosition.GetPointOnRoute(edge.Route, 2, 0, labelWidth, labelHeight) + + innerTop = math.Min(innerTop, point.Y-padding.top) + innerBottom = math.Max(innerBottom, point.Y+labelHeight+padding.bottom) + innerLeft = math.Min(innerLeft, point.X-padding.left) + innerRight = math.Max(innerRight, point.X+labelWidth+padding.right) + } + for _, point := range edge.Route { + innerTop = math.Min(innerTop, point.Y-padding.top) + innerBottom = math.Max(innerBottom, point.Y+padding.bottom) + innerLeft = math.Min(innerLeft, point.X-padding.left) + innerRight = math.Max(innerRight, point.X+padding.right) + } + } currentTop := obj.TopLeft.Y currentBottom := obj.TopLeft.Y + obj.Height From 2d518a6cfd42a2c12ab99711a26c867313fbc623 Mon Sep 17 00:00:00 2001 From: Gavin Nishizawa Date: Mon, 17 Jul 2023 15:17:00 -0700 Subject: [PATCH 23/31] update tests --- .../testdata/paper-real/sketch.exp.svg | 166 ++--- .../d2sketch/testdata/terminal/sketch.exp.svg | 164 ++--- .../patterns/real-lines/dagre/board.exp.json | 8 +- .../patterns/real-lines/dagre/sketch.exp.svg | 172 +++--- .../patterns/real/dagre/board.exp.json | 8 +- .../patterns/real/dagre/sketch.exp.svg | 166 ++--- .../elk_alignment/dagre/board.exp.json | 4 +- .../elk_alignment/dagre/sketch.exp.svg | 166 ++--- .../unconnected/dagre/board.exp.json | 4 +- .../unconnected/dagre/sketch.exp.svg | 558 ++++++++--------- .../stable/elk_shim/dagre/board.exp.json | 6 +- .../stable/elk_shim/dagre/sketch.exp.svg | 166 ++--- .../dagre/board.exp.json | 4 +- .../dagre/sketch.exp.svg | 578 +++++++++--------- .../themes/origami/dagre/board.exp.json | 6 +- .../themes/origami/dagre/sketch.exp.svg | 168 ++--- .../themes/terminal/dagre/board.exp.json | 4 +- .../themes/terminal/dagre/sketch.exp.svg | 572 ++++++++--------- .../terminal_grayscale/dagre/board.exp.json | 6 +- .../terminal_grayscale/dagre/sketch.exp.svg | 164 ++--- 20 files changed, 1545 insertions(+), 1545 deletions(-) diff --git a/d2renderers/d2sketch/testdata/paper-real/sketch.exp.svg b/d2renderers/d2sketch/testdata/paper-real/sketch.exp.svg index 575f38b74..cef9800de 100644 --- a/d2renderers/d2sketch/testdata/paper-real/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/paper-real/sketch.exp.svg @@ -1,16 +1,16 @@ - + .d2-1635834384 .fill-N1{fill:#0A0F25;} + .d2-1635834384 .fill-N2{fill:#676C7E;} + .d2-1635834384 .fill-N3{fill:#9499AB;} + .d2-1635834384 .fill-N4{fill:#CFD2DD;} + .d2-1635834384 .fill-N5{fill:#DEE1EB;} + .d2-1635834384 .fill-N6{fill:#EEF1F8;} + .d2-1635834384 .fill-N7{fill:#FFFFFF;} + .d2-1635834384 .fill-B1{fill:#0D32B2;} + .d2-1635834384 .fill-B2{fill:#0D32B2;} + .d2-1635834384 .fill-B3{fill:#E3E9FD;} + .d2-1635834384 .fill-B4{fill:#E3E9FD;} + .d2-1635834384 .fill-B5{fill:#EDF0FD;} + .d2-1635834384 .fill-B6{fill:#F7F8FE;} + .d2-1635834384 .fill-AA2{fill:#4A6FF3;} + .d2-1635834384 .fill-AA4{fill:#EDF0FD;} + .d2-1635834384 .fill-AA5{fill:#F7F8FE;} + .d2-1635834384 .fill-AB4{fill:#EDF0FD;} + .d2-1635834384 .fill-AB5{fill:#F7F8FE;} + .d2-1635834384 .stroke-N1{stroke:#0A0F25;} + .d2-1635834384 .stroke-N2{stroke:#676C7E;} + .d2-1635834384 .stroke-N3{stroke:#9499AB;} + .d2-1635834384 .stroke-N4{stroke:#CFD2DD;} + .d2-1635834384 .stroke-N5{stroke:#DEE1EB;} + .d2-1635834384 .stroke-N6{stroke:#EEF1F8;} + .d2-1635834384 .stroke-N7{stroke:#FFFFFF;} + .d2-1635834384 .stroke-B1{stroke:#0D32B2;} + .d2-1635834384 .stroke-B2{stroke:#0D32B2;} + .d2-1635834384 .stroke-B3{stroke:#E3E9FD;} + .d2-1635834384 .stroke-B4{stroke:#E3E9FD;} + .d2-1635834384 .stroke-B5{stroke:#EDF0FD;} + .d2-1635834384 .stroke-B6{stroke:#F7F8FE;} + .d2-1635834384 .stroke-AA2{stroke:#4A6FF3;} + .d2-1635834384 .stroke-AA4{stroke:#EDF0FD;} + .d2-1635834384 .stroke-AA5{stroke:#F7F8FE;} + .d2-1635834384 .stroke-AB4{stroke:#EDF0FD;} + .d2-1635834384 .stroke-AB5{stroke:#F7F8FE;} + .d2-1635834384 .background-color-N1{background-color:#0A0F25;} + .d2-1635834384 .background-color-N2{background-color:#676C7E;} + .d2-1635834384 .background-color-N3{background-color:#9499AB;} + .d2-1635834384 .background-color-N4{background-color:#CFD2DD;} + .d2-1635834384 .background-color-N5{background-color:#DEE1EB;} + .d2-1635834384 .background-color-N6{background-color:#EEF1F8;} + .d2-1635834384 .background-color-N7{background-color:#FFFFFF;} + .d2-1635834384 .background-color-B1{background-color:#0D32B2;} + .d2-1635834384 .background-color-B2{background-color:#0D32B2;} + .d2-1635834384 .background-color-B3{background-color:#E3E9FD;} + .d2-1635834384 .background-color-B4{background-color:#E3E9FD;} + .d2-1635834384 .background-color-B5{background-color:#EDF0FD;} + .d2-1635834384 .background-color-B6{background-color:#F7F8FE;} + .d2-1635834384 .background-color-AA2{background-color:#4A6FF3;} + .d2-1635834384 .background-color-AA4{background-color:#EDF0FD;} + .d2-1635834384 .background-color-AA5{background-color:#F7F8FE;} + .d2-1635834384 .background-color-AB4{background-color:#EDF0FD;} + .d2-1635834384 .background-color-AB5{background-color:#F7F8FE;} + .d2-1635834384 .color-N1{color:#0A0F25;} + .d2-1635834384 .color-N2{color:#676C7E;} + .d2-1635834384 .color-N3{color:#9499AB;} + .d2-1635834384 .color-N4{color:#CFD2DD;} + .d2-1635834384 .color-N5{color:#DEE1EB;} + .d2-1635834384 .color-N6{color:#EEF1F8;} + .d2-1635834384 .color-N7{color:#FFFFFF;} + .d2-1635834384 .color-B1{color:#0D32B2;} + .d2-1635834384 .color-B2{color:#0D32B2;} + .d2-1635834384 .color-B3{color:#E3E9FD;} + .d2-1635834384 .color-B4{color:#E3E9FD;} + .d2-1635834384 .color-B5{color:#EDF0FD;} + .d2-1635834384 .color-B6{color:#F7F8FE;} + .d2-1635834384 .color-AA2{color:#4A6FF3;} + .d2-1635834384 .color-AA4{color:#EDF0FD;} + .d2-1635834384 .color-AA5{color:#F7F8FE;} + .d2-1635834384 .color-AB4{color:#EDF0FD;} + .d2-1635834384 .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}]]> @@ -1205,10 +1205,10 @@ -NETWORKCELL TOWERSATELLITESTRANSMITTER SEND SEND SEND - - - +NETWORKCELL TOWERSATELLITESTRANSMITTER SEND SEND SEND + + + diff --git a/d2renderers/d2sketch/testdata/terminal/sketch.exp.svg b/d2renderers/d2sketch/testdata/terminal/sketch.exp.svg index 7f5ade5d5..2a6fd361f 100644 --- a/d2renderers/d2sketch/testdata/terminal/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/terminal/sketch.exp.svg @@ -1,16 +1,16 @@ - + .d2-4175782703 .fill-N1{fill:#000410;} + .d2-4175782703 .fill-N2{fill:#0000B8;} + .d2-4175782703 .fill-N3{fill:#9499AB;} + .d2-4175782703 .fill-N4{fill:#CFD2DD;} + .d2-4175782703 .fill-N5{fill:#C3DEF3;} + .d2-4175782703 .fill-N6{fill:#EEF1F8;} + .d2-4175782703 .fill-N7{fill:#FFFFFF;} + .d2-4175782703 .fill-B1{fill:#000410;} + .d2-4175782703 .fill-B2{fill:#0000E4;} + .d2-4175782703 .fill-B3{fill:#5AA4DC;} + .d2-4175782703 .fill-B4{fill:#E7E9EE;} + .d2-4175782703 .fill-B5{fill:#F5F6F9;} + .d2-4175782703 .fill-B6{fill:#FFFFFF;} + .d2-4175782703 .fill-AA2{fill:#008566;} + .d2-4175782703 .fill-AA4{fill:#45BBA5;} + .d2-4175782703 .fill-AA5{fill:#7ACCBD;} + .d2-4175782703 .fill-AB4{fill:#F1C759;} + .d2-4175782703 .fill-AB5{fill:#F9E088;} + .d2-4175782703 .stroke-N1{stroke:#000410;} + .d2-4175782703 .stroke-N2{stroke:#0000B8;} + .d2-4175782703 .stroke-N3{stroke:#9499AB;} + .d2-4175782703 .stroke-N4{stroke:#CFD2DD;} + .d2-4175782703 .stroke-N5{stroke:#C3DEF3;} + .d2-4175782703 .stroke-N6{stroke:#EEF1F8;} + .d2-4175782703 .stroke-N7{stroke:#FFFFFF;} + .d2-4175782703 .stroke-B1{stroke:#000410;} + .d2-4175782703 .stroke-B2{stroke:#0000E4;} + .d2-4175782703 .stroke-B3{stroke:#5AA4DC;} + .d2-4175782703 .stroke-B4{stroke:#E7E9EE;} + .d2-4175782703 .stroke-B5{stroke:#F5F6F9;} + .d2-4175782703 .stroke-B6{stroke:#FFFFFF;} + .d2-4175782703 .stroke-AA2{stroke:#008566;} + .d2-4175782703 .stroke-AA4{stroke:#45BBA5;} + .d2-4175782703 .stroke-AA5{stroke:#7ACCBD;} + .d2-4175782703 .stroke-AB4{stroke:#F1C759;} + .d2-4175782703 .stroke-AB5{stroke:#F9E088;} + .d2-4175782703 .background-color-N1{background-color:#000410;} + .d2-4175782703 .background-color-N2{background-color:#0000B8;} + .d2-4175782703 .background-color-N3{background-color:#9499AB;} + .d2-4175782703 .background-color-N4{background-color:#CFD2DD;} + .d2-4175782703 .background-color-N5{background-color:#C3DEF3;} + .d2-4175782703 .background-color-N6{background-color:#EEF1F8;} + .d2-4175782703 .background-color-N7{background-color:#FFFFFF;} + .d2-4175782703 .background-color-B1{background-color:#000410;} + .d2-4175782703 .background-color-B2{background-color:#0000E4;} + .d2-4175782703 .background-color-B3{background-color:#5AA4DC;} + .d2-4175782703 .background-color-B4{background-color:#E7E9EE;} + .d2-4175782703 .background-color-B5{background-color:#F5F6F9;} + .d2-4175782703 .background-color-B6{background-color:#FFFFFF;} + .d2-4175782703 .background-color-AA2{background-color:#008566;} + .d2-4175782703 .background-color-AA4{background-color:#45BBA5;} + .d2-4175782703 .background-color-AA5{background-color:#7ACCBD;} + .d2-4175782703 .background-color-AB4{background-color:#F1C759;} + .d2-4175782703 .background-color-AB5{background-color:#F9E088;} + .d2-4175782703 .color-N1{color:#000410;} + .d2-4175782703 .color-N2{color:#0000B8;} + .d2-4175782703 .color-N3{color:#9499AB;} + .d2-4175782703 .color-N4{color:#CFD2DD;} + .d2-4175782703 .color-N5{color:#C3DEF3;} + .d2-4175782703 .color-N6{color:#EEF1F8;} + .d2-4175782703 .color-N7{color:#FFFFFF;} + .d2-4175782703 .color-B1{color:#000410;} + .d2-4175782703 .color-B2{color:#0000E4;} + .d2-4175782703 .color-B3{color:#5AA4DC;} + .d2-4175782703 .color-B4{color:#E7E9EE;} + .d2-4175782703 .color-B5{color:#F5F6F9;} + .d2-4175782703 .color-B6{color:#FFFFFF;} + .d2-4175782703 .color-AA2{color:#008566;} + .d2-4175782703 .color-AA4{color:#45BBA5;} + .d2-4175782703 .color-AA5{color:#7ACCBD;} + .d2-4175782703 .color-AB4{color:#F1C759;} + .d2-4175782703 .color-AB5{color:#F9E088;}.appendix text.text{fill:#000410}.md{--color-fg-default:#000410;--color-fg-muted:#0000B8;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#000410;--color-border-muted:#0000E4;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0000E4;--color-accent-emphasis:#0000E4;--color-attention-subtle:#0000B8;--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-normal);mix-blend-mode:color-burn}.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-normal);mix-blend-mode:color-burn}.sketch-overlay-AA5{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-AB4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-AB5{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-darker);mix-blend-mode:lighten}.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-normal);mix-blend-mode:color-burn}.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}]]> @@ -137,13 +137,13 @@ -NETWORKUSERAPI SERVERLOGSCELL TOWERONLINE PORTALDATA PROCESSORSATELLITESTRANSMITTERUISTORAGE SEND SEND SEND PHONE LOGS MAKE CALL ACCESS DISPLAY PERSIST +NETWORKUSERAPI SERVERLOGSCELL TOWERONLINE PORTALDATA PROCESSORSATELLITESTRANSMITTERUISTORAGE SEND SEND SEND PHONE LOGS MAKE CALL ACCESS DISPLAY PERSIST - + - + diff --git a/e2etests/testdata/patterns/real-lines/dagre/board.exp.json b/e2etests/testdata/patterns/real-lines/dagre/board.exp.json index 673bbd71d..2adadd4fd 100644 --- a/e2etests/testdata/patterns/real-lines/dagre/board.exp.json +++ b/e2etests/testdata/patterns/real-lines/dagre/board.exp.json @@ -7,10 +7,10 @@ "id": "NETWORK", "type": "rectangle", "pos": { - "x": 40, + "x": 23, "y": 76 }, - "width": 291, + "width": 314, "height": 508, "opacity": 1, "strokeDash": 0, @@ -49,10 +49,10 @@ "id": "NETWORK.CELL TOWER", "type": "rectangle", "pos": { - "x": 70, + "x": 53, "y": 117 }, - "width": 231, + "width": 254, "height": 437, "opacity": 1, "strokeDash": 0, diff --git a/e2etests/testdata/patterns/real-lines/dagre/sketch.exp.svg b/e2etests/testdata/patterns/real-lines/dagre/sketch.exp.svg index 4ac5aadef..a6e6641a8 100644 --- a/e2etests/testdata/patterns/real-lines/dagre/sketch.exp.svg +++ b/e2etests/testdata/patterns/real-lines/dagre/sketch.exp.svg @@ -1,23 +1,23 @@ -lambda-build.yamllambda-deploy.yamlapollo-deploy.yamlPush to main branchGitHub ActionsS3TerraformAWSManual TriggerGitHub ActionsAWSApollo RepoGitHub ActionsAWS TriggersBuilds zip and pushes it Pulls zip to deployChanges live lambdasLaunchesBuilds zippushes them to S3. Deploys lambdasusing TerraformTriggered manually/push to master test test test test test test testtest - + .d2-1793236246 .fill-N1{fill:#0A0F25;} + .d2-1793236246 .fill-N2{fill:#676C7E;} + .d2-1793236246 .fill-N3{fill:#9499AB;} + .d2-1793236246 .fill-N4{fill:#CFD2DD;} + .d2-1793236246 .fill-N5{fill:#DEE1EB;} + .d2-1793236246 .fill-N6{fill:#EEF1F8;} + .d2-1793236246 .fill-N7{fill:#FFFFFF;} + .d2-1793236246 .fill-B1{fill:#0D32B2;} + .d2-1793236246 .fill-B2{fill:#0D32B2;} + .d2-1793236246 .fill-B3{fill:#E3E9FD;} + .d2-1793236246 .fill-B4{fill:#E3E9FD;} + .d2-1793236246 .fill-B5{fill:#EDF0FD;} + .d2-1793236246 .fill-B6{fill:#F7F8FE;} + .d2-1793236246 .fill-AA2{fill:#4A6FF3;} + .d2-1793236246 .fill-AA4{fill:#EDF0FD;} + .d2-1793236246 .fill-AA5{fill:#F7F8FE;} + .d2-1793236246 .fill-AB4{fill:#EDF0FD;} + .d2-1793236246 .fill-AB5{fill:#F7F8FE;} + .d2-1793236246 .stroke-N1{stroke:#0A0F25;} + .d2-1793236246 .stroke-N2{stroke:#676C7E;} + .d2-1793236246 .stroke-N3{stroke:#9499AB;} + .d2-1793236246 .stroke-N4{stroke:#CFD2DD;} + .d2-1793236246 .stroke-N5{stroke:#DEE1EB;} + .d2-1793236246 .stroke-N6{stroke:#EEF1F8;} + .d2-1793236246 .stroke-N7{stroke:#FFFFFF;} + .d2-1793236246 .stroke-B1{stroke:#0D32B2;} + .d2-1793236246 .stroke-B2{stroke:#0D32B2;} + .d2-1793236246 .stroke-B3{stroke:#E3E9FD;} + .d2-1793236246 .stroke-B4{stroke:#E3E9FD;} + .d2-1793236246 .stroke-B5{stroke:#EDF0FD;} + .d2-1793236246 .stroke-B6{stroke:#F7F8FE;} + .d2-1793236246 .stroke-AA2{stroke:#4A6FF3;} + .d2-1793236246 .stroke-AA4{stroke:#EDF0FD;} + .d2-1793236246 .stroke-AA5{stroke:#F7F8FE;} + .d2-1793236246 .stroke-AB4{stroke:#EDF0FD;} + .d2-1793236246 .stroke-AB5{stroke:#F7F8FE;} + .d2-1793236246 .background-color-N1{background-color:#0A0F25;} + .d2-1793236246 .background-color-N2{background-color:#676C7E;} + .d2-1793236246 .background-color-N3{background-color:#9499AB;} + .d2-1793236246 .background-color-N4{background-color:#CFD2DD;} + .d2-1793236246 .background-color-N5{background-color:#DEE1EB;} + .d2-1793236246 .background-color-N6{background-color:#EEF1F8;} + .d2-1793236246 .background-color-N7{background-color:#FFFFFF;} + .d2-1793236246 .background-color-B1{background-color:#0D32B2;} + .d2-1793236246 .background-color-B2{background-color:#0D32B2;} + .d2-1793236246 .background-color-B3{background-color:#E3E9FD;} + .d2-1793236246 .background-color-B4{background-color:#E3E9FD;} + .d2-1793236246 .background-color-B5{background-color:#EDF0FD;} + .d2-1793236246 .background-color-B6{background-color:#F7F8FE;} + .d2-1793236246 .background-color-AA2{background-color:#4A6FF3;} + .d2-1793236246 .background-color-AA4{background-color:#EDF0FD;} + .d2-1793236246 .background-color-AA5{background-color:#F7F8FE;} + .d2-1793236246 .background-color-AB4{background-color:#EDF0FD;} + .d2-1793236246 .background-color-AB5{background-color:#F7F8FE;} + .d2-1793236246 .color-N1{color:#0A0F25;} + .d2-1793236246 .color-N2{color:#676C7E;} + .d2-1793236246 .color-N3{color:#9499AB;} + .d2-1793236246 .color-N4{color:#CFD2DD;} + .d2-1793236246 .color-N5{color:#DEE1EB;} + .d2-1793236246 .color-N6{color:#EEF1F8;} + .d2-1793236246 .color-N7{color:#FFFFFF;} + .d2-1793236246 .color-B1{color:#0D32B2;} + .d2-1793236246 .color-B2{color:#0D32B2;} + .d2-1793236246 .color-B3{color:#E3E9FD;} + .d2-1793236246 .color-B4{color:#E3E9FD;} + .d2-1793236246 .color-B5{color:#EDF0FD;} + .d2-1793236246 .color-B6{color:#F7F8FE;} + .d2-1793236246 .color-AA2{color:#4A6FF3;} + .d2-1793236246 .color-AA4{color:#EDF0FD;} + .d2-1793236246 .color-AA5{color:#F7F8FE;} + .d2-1793236246 .color-AB4{color:#EDF0FD;} + .d2-1793236246 .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}]]>lambda-build.yamllambda-deploy.yamlapollo-deploy.yamlPush to main branchGitHub ActionsS3TerraformAWSManual TriggerGitHub ActionsAWSApollo RepoGitHub ActionsAWS TriggersBuilds zip and pushes it Pulls zip to deployChanges live lambdasLaunchesBuilds zippushes them to S3. Deploys lambdasusing TerraformTriggered manually/push to master test test test test test test testtest + diff --git a/e2etests/testdata/regression/unconnected/dagre/board.exp.json b/e2etests/testdata/regression/unconnected/dagre/board.exp.json index eef3f08fe..1b1935538 100644 --- a/e2etests/testdata/regression/unconnected/dagre/board.exp.json +++ b/e2etests/testdata/regression/unconnected/dagre/board.exp.json @@ -131,10 +131,10 @@ "type": "rectangle", "pos": { "x": 659, - "y": 299 + "y": 270 }, "width": 832, - "height": 294, + "height": 323, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, diff --git a/e2etests/testdata/regression/unconnected/dagre/sketch.exp.svg b/e2etests/testdata/regression/unconnected/dagre/sketch.exp.svg index a27d41448..44f9695e1 100644 --- a/e2etests/testdata/regression/unconnected/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/unconnected/dagre/sketch.exp.svg @@ -1,20 +1,20 @@ -OEM FactoryOEM WarehouseDistributor WarehouseGos WarehouseCustomer SiteWorkflow-I (Warehousing, Installation)MasterRegional-1Regional-2Regional-N
      +OEM FactoryOEM WarehouseDistributor WarehouseGos WarehouseCustomer SiteWorkflow-I (Warehousing, Installation)MasterRegional-1Regional-2Regional-N
      • Asset Tagging
      • Inventory
      • Staging
      • Dispatch to Site
      -
      InstallationSupport +
    InstallationSupport - + diff --git a/e2etests/testdata/stable/elk_shim/dagre/board.exp.json b/e2etests/testdata/stable/elk_shim/dagre/board.exp.json index cd266dc7a..cbad13b6e 100644 --- a/e2etests/testdata/stable/elk_shim/dagre/board.exp.json +++ b/e2etests/testdata/stable/elk_shim/dagre/board.exp.json @@ -10,7 +10,7 @@ "x": 7, "y": 227 }, - "width": 379, + "width": 398, "height": 1188, "opacity": 1, "strokeDash": 0, @@ -48,10 +48,10 @@ "id": "network.cell tower", "type": "rectangle", "pos": { - "x": 146, + "x": 127, "y": 268 }, - "width": 210, + "width": 248, "height": 313, "opacity": 1, "strokeDash": 0, diff --git a/e2etests/testdata/stable/elk_shim/dagre/sketch.exp.svg b/e2etests/testdata/stable/elk_shim/dagre/sketch.exp.svg index a8a3410c3..debe7ea82 100644 --- a/e2etests/testdata/stable/elk_shim/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/elk_shim/dagre/sketch.exp.svg @@ -1,23 +1,23 @@ -networkuserapi serverlogscell towerONLINE PORTALLLLdata processorsatellitestransmitteruistorage sendsendsendphone logsmake call accessdisplaypersist + .d2-2944963252 .fill-N1{fill:#0A0F25;} + .d2-2944963252 .fill-N2{fill:#676C7E;} + .d2-2944963252 .fill-N3{fill:#9499AB;} + .d2-2944963252 .fill-N4{fill:#CFD2DD;} + .d2-2944963252 .fill-N5{fill:#DEE1EB;} + .d2-2944963252 .fill-N6{fill:#EEF1F8;} + .d2-2944963252 .fill-N7{fill:#FFFFFF;} + .d2-2944963252 .fill-B1{fill:#0D32B2;} + .d2-2944963252 .fill-B2{fill:#0D32B2;} + .d2-2944963252 .fill-B3{fill:#E3E9FD;} + .d2-2944963252 .fill-B4{fill:#E3E9FD;} + .d2-2944963252 .fill-B5{fill:#EDF0FD;} + .d2-2944963252 .fill-B6{fill:#F7F8FE;} + .d2-2944963252 .fill-AA2{fill:#4A6FF3;} + .d2-2944963252 .fill-AA4{fill:#EDF0FD;} + .d2-2944963252 .fill-AA5{fill:#F7F8FE;} + .d2-2944963252 .fill-AB4{fill:#EDF0FD;} + .d2-2944963252 .fill-AB5{fill:#F7F8FE;} + .d2-2944963252 .stroke-N1{stroke:#0A0F25;} + .d2-2944963252 .stroke-N2{stroke:#676C7E;} + .d2-2944963252 .stroke-N3{stroke:#9499AB;} + .d2-2944963252 .stroke-N4{stroke:#CFD2DD;} + .d2-2944963252 .stroke-N5{stroke:#DEE1EB;} + .d2-2944963252 .stroke-N6{stroke:#EEF1F8;} + .d2-2944963252 .stroke-N7{stroke:#FFFFFF;} + .d2-2944963252 .stroke-B1{stroke:#0D32B2;} + .d2-2944963252 .stroke-B2{stroke:#0D32B2;} + .d2-2944963252 .stroke-B3{stroke:#E3E9FD;} + .d2-2944963252 .stroke-B4{stroke:#E3E9FD;} + .d2-2944963252 .stroke-B5{stroke:#EDF0FD;} + .d2-2944963252 .stroke-B6{stroke:#F7F8FE;} + .d2-2944963252 .stroke-AA2{stroke:#4A6FF3;} + .d2-2944963252 .stroke-AA4{stroke:#EDF0FD;} + .d2-2944963252 .stroke-AA5{stroke:#F7F8FE;} + .d2-2944963252 .stroke-AB4{stroke:#EDF0FD;} + .d2-2944963252 .stroke-AB5{stroke:#F7F8FE;} + .d2-2944963252 .background-color-N1{background-color:#0A0F25;} + .d2-2944963252 .background-color-N2{background-color:#676C7E;} + .d2-2944963252 .background-color-N3{background-color:#9499AB;} + .d2-2944963252 .background-color-N4{background-color:#CFD2DD;} + .d2-2944963252 .background-color-N5{background-color:#DEE1EB;} + .d2-2944963252 .background-color-N6{background-color:#EEF1F8;} + .d2-2944963252 .background-color-N7{background-color:#FFFFFF;} + .d2-2944963252 .background-color-B1{background-color:#0D32B2;} + .d2-2944963252 .background-color-B2{background-color:#0D32B2;} + .d2-2944963252 .background-color-B3{background-color:#E3E9FD;} + .d2-2944963252 .background-color-B4{background-color:#E3E9FD;} + .d2-2944963252 .background-color-B5{background-color:#EDF0FD;} + .d2-2944963252 .background-color-B6{background-color:#F7F8FE;} + .d2-2944963252 .background-color-AA2{background-color:#4A6FF3;} + .d2-2944963252 .background-color-AA4{background-color:#EDF0FD;} + .d2-2944963252 .background-color-AA5{background-color:#F7F8FE;} + .d2-2944963252 .background-color-AB4{background-color:#EDF0FD;} + .d2-2944963252 .background-color-AB5{background-color:#F7F8FE;} + .d2-2944963252 .color-N1{color:#0A0F25;} + .d2-2944963252 .color-N2{color:#676C7E;} + .d2-2944963252 .color-N3{color:#9499AB;} + .d2-2944963252 .color-N4{color:#CFD2DD;} + .d2-2944963252 .color-N5{color:#DEE1EB;} + .d2-2944963252 .color-N6{color:#EEF1F8;} + .d2-2944963252 .color-N7{color:#FFFFFF;} + .d2-2944963252 .color-B1{color:#0D32B2;} + .d2-2944963252 .color-B2{color:#0D32B2;} + .d2-2944963252 .color-B3{color:#E3E9FD;} + .d2-2944963252 .color-B4{color:#E3E9FD;} + .d2-2944963252 .color-B5{color:#EDF0FD;} + .d2-2944963252 .color-B6{color:#F7F8FE;} + .d2-2944963252 .color-AA2{color:#4A6FF3;} + .d2-2944963252 .color-AA4{color:#EDF0FD;} + .d2-2944963252 .color-AA5{color:#F7F8FE;} + .d2-2944963252 .color-AB4{color:#EDF0FD;} + .d2-2944963252 .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}]]>networkuserapi serverlogscell towerONLINE PORTALLLLdata processorsatellitestransmitteruistorage sendsendsendphone logsmake call accessdisplaypersist - + diff --git a/e2etests/testdata/themes/dark_terrastruct_flagship/dagre/board.exp.json b/e2etests/testdata/themes/dark_terrastruct_flagship/dagre/board.exp.json index 9516c93f5..4945204b4 100644 --- a/e2etests/testdata/themes/dark_terrastruct_flagship/dagre/board.exp.json +++ b/e2etests/testdata/themes/dark_terrastruct_flagship/dagre/board.exp.json @@ -10,7 +10,7 @@ "x": 7, "y": 641 }, - "width": 402, + "width": 410, "height": 1422, "opacity": 1, "strokeDash": 0, @@ -51,7 +51,7 @@ "x": 112, "y": 682 }, - "width": 267, + "width": 275, "height": 547, "opacity": 1, "strokeDash": 0, diff --git a/e2etests/testdata/themes/dark_terrastruct_flagship/dagre/sketch.exp.svg b/e2etests/testdata/themes/dark_terrastruct_flagship/dagre/sketch.exp.svg index 2ef133183..fa4fa320d 100644 --- a/e2etests/testdata/themes/dark_terrastruct_flagship/dagre/sketch.exp.svg +++ b/e2etests/testdata/themes/dark_terrastruct_flagship/dagre/sketch.exp.svg @@ -1,41 +1,41 @@ -networkuserapi serverlogsusersidintnamestringemailstringpasswordstringlast_logindatetimeproducts+idint+pricedecimal+skustring+namestring

    A tale

    +networkuserapi serverlogsusersidintnamestringemailstringpasswordstringlast_logindatetimeproducts+idint+pricedecimal+skustring+namestring

    A tale

    • of
    • two cities
      • @@ -908,16 +908,16 @@     city2 := City{Name: "CityB", Population: 1200000}     tellTale(city1, city2) -}Cell Toweronline portaldata processorsatellitesTRANSMITTERuistorage sendsendsendphone logsmake call accessdisplaypersist +}Cell Toweronline portaldata processorsatellitesTRANSMITTERuistorage sendsendsendphone logsmake call accessdisplaypersist - + - + diff --git a/e2etests/testdata/themes/origami/dagre/board.exp.json b/e2etests/testdata/themes/origami/dagre/board.exp.json index 6bc8d05cb..0112af344 100644 --- a/e2etests/testdata/themes/origami/dagre/board.exp.json +++ b/e2etests/testdata/themes/origami/dagre/board.exp.json @@ -10,7 +10,7 @@ "x": 5, "y": 227 }, - "width": 356, + "width": 395, "height": 1198, "opacity": 1, "strokeDash": 0, @@ -49,10 +49,10 @@ "id": "network.cell tower", "type": "rectangle", "pos": { - "x": 157, + "x": 118, "y": 268 }, - "width": 174, + "width": 252, "height": 323, "opacity": 1, "strokeDash": 0, diff --git a/e2etests/testdata/themes/origami/dagre/sketch.exp.svg b/e2etests/testdata/themes/origami/dagre/sketch.exp.svg index de7c68203..38c59ed49 100644 --- a/e2etests/testdata/themes/origami/dagre/sketch.exp.svg +++ b/e2etests/testdata/themes/origami/dagre/sketch.exp.svg @@ -1,23 +1,23 @@ -heyyayyyceeeyoheybeeedeee + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/overlapping_child_label/elk/board.exp.json b/e2etests/testdata/stable/overlapping_child_label/elk/board.exp.json new file mode 100644 index 000000000..9b2579ba4 --- /dev/null +++ b/e2etests/testdata/stable/overlapping_child_label/elk/board.exp.json @@ -0,0 +1,434 @@ +{ + "name": "", + "isFolderOnly": false, + "fontFamily": "SourceSansPro", + "shapes": [ + { + "id": "heyy", + "type": "rectangle", + "pos": { + "x": 12, + "y": 12 + }, + "width": 171, + "height": 302, + "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": "heyy", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 54, + "labelHeight": 36, + "labelPosition": "INSIDE_BOTTOM_RIGHT", + "zIndex": 0, + "level": 1 + }, + { + "id": "heyy.yo", + "type": "rectangle", + "pos": { + "x": 66, + "y": 62 + }, + "width": 63, + "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": "yo", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 18, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "heyy.hey", + "type": "rectangle", + "pos": { + "x": 62, + "y": 198 + }, + "width": 71, + "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": "hey", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 26, + "labelHeight": 21, + "labelPosition": "OUTSIDE_BOTTOM_RIGHT", + "zIndex": 0, + "level": 2 + }, + { + "id": "ayyy", + "type": "rectangle", + "classes": [ + "icon" + ], + "pos": { + "x": 203, + "y": 42 + }, + "width": 204, + "height": 242, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B4", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": { + "Scheme": "https", + "Opaque": "", + "User": null, + "Host": "icons.terrastruct.com", + "Path": "/essentials/time.svg", + "RawPath": "", + "OmitHost": false, + "ForceQuery": false, + "RawQuery": "", + "Fragment": "", + "RawFragment": "" + }, + "iconPosition": "INSIDE_TOP_LEFT", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "ayyy", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 53, + "labelHeight": 36, + "labelPosition": "INSIDE_TOP_RIGHT", + "zIndex": 0, + "level": 1 + }, + { + "id": "ayyy.beee", + "type": "rectangle", + "classes": [ + "icon" + ], + "pos": { + "x": 253, + "y": 116 + }, + "width": 104, + "height": 118, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": { + "Scheme": "https", + "Opaque": "", + "User": null, + "Host": "icons.terrastruct.com", + "Path": "/essentials/time.svg", + "RawPath": "", + "OmitHost": false, + "ForceQuery": false, + "RawQuery": "", + "Fragment": "", + "RawFragment": "" + }, + "iconPosition": "OUTSIDE_TOP_RIGHT", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "beee", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 33, + "labelHeight": 21, + "labelPosition": "OUTSIDE_TOP_LEFT", + "zIndex": 0, + "level": 2 + }, + { + "id": "ceee", + "type": "rectangle", + "classes": [ + "icon" + ], + "pos": { + "x": 427, + "y": 42 + }, + "width": 205, + "height": 242, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B4", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": { + "Scheme": "https", + "Opaque": "", + "User": null, + "Host": "icons.terrastruct.com", + "Path": "/essentials/time.svg", + "RawPath": "", + "OmitHost": false, + "ForceQuery": false, + "RawQuery": "", + "Fragment": "", + "RawFragment": "" + }, + "iconPosition": "INSIDE_BOTTOM_LEFT", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "ceee", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 53, + "labelHeight": 36, + "labelPosition": "INSIDE_TOP_RIGHT", + "zIndex": 0, + "level": 1 + }, + { + "id": "ceee.deee", + "type": "rectangle", + "classes": [ + "icon" + ], + "pos": { + "x": 477, + "y": 92 + }, + "width": 105, + "height": 118, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": { + "Scheme": "https", + "Opaque": "", + "User": null, + "Host": "icons.terrastruct.com", + "Path": "/essentials/time.svg", + "RawPath": "", + "OmitHost": false, + "ForceQuery": false, + "RawQuery": "", + "Fragment": "", + "RawFragment": "" + }, + "iconPosition": "OUTSIDE_BOTTOM_LEFT", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "deee", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 34, + "labelHeight": 21, + "labelPosition": "OUTSIDE_TOP_RIGHT", + "zIndex": 0, + "level": 2 + } + ], + "connections": [ + { + "id": "heyy.(yo -> hey)[0]", + "src": "heyy.yo", + "srcArrow": "none", + "dst": "heyy.hey", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "route": [ + { + "x": 97.5, + "y": 128 + }, + { + "x": 97.5, + "y": 198 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + } + ], + "root": { + "id": "", + "type": "", + "pos": { + "x": 0, + "y": 0 + }, + "width": 0, + "height": 0, + "opacity": 0, + "strokeDash": 0, + "strokeWidth": 0, + "borderRadius": 0, + "fill": "N7", + "stroke": "", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "zIndex": 0, + "level": 0 + } +} diff --git a/e2etests/testdata/stable/overlapping_child_label/elk/sketch.exp.svg b/e2etests/testdata/stable/overlapping_child_label/elk/sketch.exp.svg new file mode 100644 index 000000000..a96791eb4 --- /dev/null +++ b/e2etests/testdata/stable/overlapping_child_label/elk/sketch.exp.svg @@ -0,0 +1,108 @@ +heyyayyyceeeyoheybeeedeee + + + + + + + + + \ No newline at end of file From a8cc241c2219109a04a1ff9170ba63e5724a6498 Mon Sep 17 00:00:00 2001 From: Gavin Nishizawa Date: Tue, 18 Jul 2023 19:24:32 -0700 Subject: [PATCH 25/31] move overlaps func to d2 --- lib/geo/box.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lib/geo/box.go b/lib/geo/box.go index de9b36cff..de9f3af0a 100644 --- a/lib/geo/box.go +++ b/lib/geo/box.go @@ -83,3 +83,9 @@ func (b *Box) Contains(p *Point) bool { return !(p.X < b.TopLeft.X || b.TopLeft.X+b.Width < p.X || p.Y < b.TopLeft.Y || b.TopLeft.Y+b.Height < p.Y) } + +func (b1 Box) Overlaps(b2 Box) bool { + // https://silentmatt.com/rectangle-intersection/ + return (b1.TopLeft.X < (b2.TopLeft.X + b2.Width)) && ((b1.TopLeft.X + b1.Width) > b2.TopLeft.X) && + (b1.TopLeft.Y < (b2.TopLeft.Y + b2.Height)) && ((b1.TopLeft.Y + b1.Height) > b2.TopLeft.Y) +} From 09174c17b81b8149663ab0dee6b472f4904a1afa Mon Sep 17 00:00:00 2001 From: Gavin Nishizawa Date: Wed, 19 Jul 2023 17:31:52 -0700 Subject: [PATCH 26/31] check for overlaps with children --- d2graph/layout.go | 18 +++ d2layouts/d2dagrelayout/layout.go | 254 ++++++++++++++++++++++++++++-- 2 files changed, 257 insertions(+), 15 deletions(-) diff --git a/d2graph/layout.go b/d2graph/layout.go index 358a95934..4d50efc1d 100644 --- a/d2graph/layout.go +++ b/d2graph/layout.go @@ -317,6 +317,24 @@ func (obj *Object) GetLabelTopLeft() *geo.Point { return labelTL } +func (obj *Object) GetIconTopLeft() *geo.Point { + if obj.IconPosition == nil { + return nil + } + + s := obj.ToShape() + iconPosition := label.Position(*obj.IconPosition) + + var box *geo.Box + if iconPosition.IsOutside() { + box = s.GetBox() + } else { + box = s.GetInnerBox() + } + + return iconPosition.GetPointOnBox(box, label.PADDING, d2target.MAX_ICON_SIZE, d2target.MAX_ICON_SIZE) +} + func (edge *Edge) TraceToShape(points []*geo.Point, startIndex, endIndex int) (newStart, newEnd int) { srcShape := edge.Src.ToShape() dstShape := edge.Dst.ToShape() diff --git a/d2layouts/d2dagrelayout/layout.go b/d2layouts/d2dagrelayout/layout.go index 62efe1a53..e3ded9ec0 100644 --- a/d2layouts/d2dagrelayout/layout.go +++ b/d2layouts/d2dagrelayout/layout.go @@ -1150,17 +1150,15 @@ func adjustRankSpacing(g *d2graph.Graph, rankSep float64, isHorizontal bool) { continue } } else { - startingRank := startingParentRanks[child] - endingRank := endingParentRanks[child] - if startingRank != rank && endingRank != rank { + if startingParentRanks[child] != rank { continue } } margin, _ := getSpacing(child) if isHorizontal { - startPosition = child.TopLeft.X - margin.left + startPosition = child.TopLeft.X - margin.left - padding.left } else { - startPosition = child.TopLeft.Y - margin.top + startPosition = child.TopLeft.Y - margin.top - padding.top } startingAncestorPositions[parent] = math.Min(startingAncestorPositions[parent], startPosition) } @@ -1185,6 +1183,7 @@ func adjustRankSpacing(g *d2graph.Graph, rankSep float64, isHorizontal bool) { } else { endPosition = parent.TopLeft.Y + parent.Height + padding.bottom - rankSep/2. } + endingAncestorPositions[parent] = math.Max(endingAncestorPositions[parent], endPosition) for _, child := range parent.ChildrenArray { if r, has := objectRanks[child]; has { @@ -1192,18 +1191,16 @@ func adjustRankSpacing(g *d2graph.Graph, rankSep float64, isHorizontal bool) { continue } } else { - startingRank := startingParentRanks[child] - endingRank := endingParentRanks[child] - if startingRank != rank && endingRank != rank { + if endingParentRanks[child] != rank { continue } } margin, _ := getSpacing(child) if isHorizontal { - endPosition = child.TopLeft.X + child.Width + margin.right + endPosition = child.TopLeft.X + child.Width + margin.right + padding.right } else { - endPosition = child.TopLeft.Y + child.Height + margin.bottom + endPosition = child.TopLeft.Y + child.Height + margin.bottom + padding.bottom } endingAncestorPositions[parent] = math.Max(endingAncestorPositions[parent], endPosition) } @@ -1383,26 +1380,93 @@ func fitPadding(obj *d2graph.Object) { fitPadding(child) } + // we will compute a perfectly fit innerBox merging our padding with children's margin, + // but we need to add padding and margin together if an outside child label will overlap with our inside label _, padding := getSpacing(obj) padding.top = math.Max(padding.top, DEFAULT_PADDING) padding.bottom = math.Max(padding.bottom, DEFAULT_PADDING) padding.left = math.Max(padding.left, DEFAULT_PADDING) padding.right = math.Max(padding.right, DEFAULT_PADDING) + // where we are (current*) vs where we want to fit each side to (inner*) + currentTop := obj.TopLeft.Y + currentBottom := obj.TopLeft.Y + obj.Height + currentLeft := obj.TopLeft.X + currentRight := obj.TopLeft.X + obj.Width + innerTop := math.Inf(1) innerBottom := math.Inf(-1) innerLeft := math.Inf(1) innerRight := math.Inf(-1) + // we create boxes for our inside label and icon, and will check against overlaps with any internal boxes + var labelPosition, iconPosition label.Position + var labelBox, iconBox *geo.Box + if obj.HasLabel() && obj.LabelPosition != nil { + labelPosition = label.Position(*obj.LabelPosition) + switch labelPosition { + case label.InsideTopLeft, label.InsideTopCenter, label.InsideTopRight, + label.InsideBottomLeft, label.InsideBottomCenter, label.InsideBottomRight, + label.InsideMiddleLeft, label.InsideMiddleRight: + labelTL := obj.GetLabelTopLeft() + if labelTL != nil { + labelBox = geo.NewBox(labelTL, float64(obj.LabelDimensions.Width)+2*label.PADDING, float64(obj.LabelDimensions.Height)) + } + } + } + if obj.Icon != nil && shapeType != shape.IMAGE_TYPE && obj.IconPosition != nil { + iconPosition = label.Position(*obj.IconPosition) + switch iconPosition { + case label.InsideTopLeft, label.InsideTopCenter, label.InsideTopRight, + label.InsideBottomLeft, label.InsideBottomCenter, label.InsideBottomRight, + label.InsideMiddleLeft, label.InsideMiddleRight: + iconTL := obj.GetIconTopLeft() + if iconTL != nil { + iconBox = geo.NewBox(iconTL, d2target.MAX_ICON_SIZE, d2target.MAX_ICON_SIZE) + } + } + } + + // update the inner positions for children's margin and collect the outside boxes that we cannot overlap with + var innerBoxes []geo.Box for _, child := range obj.ChildrenArray { margin, _ := getSpacing(child) dx, dy := child.GetModifierElementAdjustments() + if labelBox != nil || iconBox != nil { + var childLabelBox *geo.Box + var childLabelPosition, childIconPosition label.Position + if child.HasLabel() && child.LabelPosition != nil { + childLabelPosition = label.Position(*child.LabelPosition) + if childLabelPosition.IsOutside() { + childLabelTL := child.GetLabelTopLeft() + + childLabelBox = geo.NewBox( + childLabelTL, + float64(child.LabelDimensions.Width), + float64(child.LabelDimensions.Height), + ) + innerBoxes = append(innerBoxes, *childLabelBox) + } + } + if child.Icon != nil && child.Shape.Value != d2target.ShapeImage && child.IconPosition != nil { + childIconPosition = label.Position(*child.IconPosition) + if childIconPosition.IsOutside() { + childIconTL := child.GetIconTopLeft() + + childIconBox := geo.NewBox(childIconTL, d2target.MAX_ICON_SIZE, d2target.MAX_ICON_SIZE) + innerBoxes = append(innerBoxes, *childIconBox) + } + } + } + innerTop = math.Min(innerTop, child.TopLeft.Y-dy-math.Max(margin.top, padding.top)) innerBottom = math.Max(innerBottom, child.TopLeft.Y+child.Height+math.Max(margin.bottom, padding.bottom)) innerLeft = math.Min(innerLeft, child.TopLeft.X-math.Max(margin.left, padding.left)) innerRight = math.Max(innerRight, child.TopLeft.X+child.Width+dx+math.Max(margin.right, padding.right)) } + + // collect edge label boxes and update inner box for internal edges for _, edge := range obj.Graph.Edges { if !edge.Src.IsDescendantOf(obj) || !edge.Dst.IsDescendantOf(obj) { continue @@ -1417,6 +1481,10 @@ func fitPadding(obj *d2graph.Object) { labelHeight := float64(edge.LabelDimensions.Height) point, _ := labelPosition.GetPointOnRoute(edge.Route, 2, 0, labelWidth, labelHeight) + if labelBox != nil || iconBox != nil { + innerBoxes = append(innerBoxes, geo.Box{TopLeft: point, Width: labelWidth, Height: labelHeight}) + } + innerTop = math.Min(innerTop, point.Y-padding.top) innerBottom = math.Max(innerBottom, point.Y+labelHeight+padding.bottom) innerLeft = math.Min(innerLeft, point.X-padding.left) @@ -1430,16 +1498,172 @@ func fitPadding(obj *d2graph.Object) { } } - currentTop := obj.TopLeft.Y - currentBottom := obj.TopLeft.Y + obj.Height - currentLeft := obj.TopLeft.X - currentRight := obj.TopLeft.X + obj.Width - + // how much do we need to shrink each side topDelta := innerTop - currentTop bottomDelta := currentBottom - innerBottom leftDelta := innerLeft - currentLeft rightDelta := currentRight - innerRight + if topDelta > 0 || bottomDelta > 0 || leftDelta > 0 || rightDelta > 0 { + var leftOverlap, rightOverlap, topOverlap, bottomOverlap float64 + var labelSide, iconSide geo.Orientation + if labelBox != nil { + switch labelPosition { + case label.InsideTopLeft, label.InsideTopCenter, label.InsideTopRight: + labelSide = geo.Top + case label.InsideBottomLeft, label.InsideBottomCenter, label.InsideBottomRight: + labelSide = geo.Bottom + case label.InsideMiddleLeft: + labelSide = geo.Left + case label.InsideMiddleRight: + labelSide = geo.Right + default: + labelSide = geo.NONE + } + // move labelBox to its position with the merged delta and check for overlaps + switch labelSide { + case geo.Top: + if topDelta > 0 { + labelBox.TopLeft.Y += topDelta + } + case geo.Bottom: + if bottomDelta > 0 { + labelBox.TopLeft.Y -= bottomDelta + } + case geo.Left: + if leftDelta > 0 { + labelBox.TopLeft.X += leftDelta + } + case geo.Right: + if rightDelta > 0 { + labelBox.TopLeft.X -= rightDelta + } + } + switch labelSide { + case geo.Top: + if topDelta > 0 { + for _, box := range innerBoxes { + if labelBox.Overlaps(box) { + dy := labelBox.TopLeft.Y + labelBox.Height - box.TopLeft.Y + topOverlap = go2.Max(topOverlap, dy) + } + } + } + case geo.Bottom: + if bottomDelta > 0 { + for _, box := range innerBoxes { + if labelBox.Overlaps(box) { + dy := box.TopLeft.Y + box.Height - labelBox.TopLeft.Y + bottomOverlap = go2.Max(bottomOverlap, dy) + } + } + } + case geo.Left: + if leftDelta > 0 { + for _, box := range innerBoxes { + if labelBox.Overlaps(box) { + dx := labelBox.TopLeft.X + labelBox.Width - box.TopLeft.X + leftOverlap = go2.Max(leftOverlap, dx) + } + } + } + case geo.Right: + if rightDelta > 0 { + for _, box := range innerBoxes { + if labelBox.Overlaps(box) { + dx := box.TopLeft.X + box.Width - labelBox.TopLeft.X + rightOverlap = go2.Max(rightOverlap, dx) + } + } + } + } + } + if iconBox != nil { + switch iconPosition { + case label.InsideTopLeft, label.InsideTopCenter, label.InsideTopRight: + iconSide = geo.Top + case label.InsideBottomLeft, label.InsideBottomCenter, label.InsideBottomRight: + iconSide = geo.Bottom + case label.InsideMiddleLeft: + iconSide = geo.Left + case label.InsideMiddleRight: + iconSide = geo.Right + default: + iconSide = geo.NONE + } + // move iconBox to its position with the merged delta and check for overlaps + switch iconSide { + case geo.Top: + if topDelta > 0 { + iconBox.TopLeft.Y += topDelta + } + case geo.Bottom: + if bottomDelta > 0 { + iconBox.TopLeft.Y -= bottomDelta + } + case geo.Left: + if leftDelta > 0 { + iconBox.TopLeft.X += leftDelta + } + case geo.Right: + if rightDelta > 0 { + iconBox.TopLeft.X -= rightDelta + } + } + switch iconSide { + case geo.Top: + if topDelta > 0 { + for _, box := range innerBoxes { + if iconBox.Overlaps(box) { + dy := iconBox.TopLeft.Y + iconBox.Height - box.TopLeft.Y + topOverlap = go2.Max(topOverlap, dy) + } + } + } + case geo.Bottom: + if bottomDelta > 0 { + for _, box := range innerBoxes { + if iconBox.Overlaps(box) { + dy := box.TopLeft.Y + box.Height - iconBox.TopLeft.Y + bottomOverlap = go2.Max(bottomOverlap, dy) + } + } + } + case geo.Left: + if leftDelta > 0 { + for _, box := range innerBoxes { + if iconBox.Overlaps(box) { + dx := iconBox.TopLeft.X + iconBox.Width - box.TopLeft.X + leftOverlap = go2.Max(leftOverlap, dx) + } + } + } + case geo.Right: + if rightDelta > 0 { + for _, box := range innerBoxes { + if iconBox.Overlaps(box) { + dx := box.TopLeft.X + box.Width - iconBox.TopLeft.X + rightOverlap = go2.Max(rightOverlap, dx) + } + } + } + } + } + + if leftOverlap > 0 { + leftDelta -= leftOverlap + } + if rightOverlap > 0 { + rightDelta -= rightOverlap + } + if topOverlap > 0 { + topDelta -= topOverlap + } + if bottomOverlap > 0 { + bottomDelta -= bottomOverlap + } + } + if 0 < topDelta { topDelta = adjustDeltaForEdges(obj, currentTop, topDelta, false) if 0 < topDelta { From 1eb3999c9994dae5327dd5bbf23661cf69fd2748 Mon Sep 17 00:00:00 2001 From: Gavin Nishizawa Date: Wed, 19 Jul 2023 17:32:59 -0700 Subject: [PATCH 27/31] update test --- .../dagre/board.exp.json | 18 +- .../dagre/sketch.exp.svg | 168 +++++++++--------- 2 files changed, 93 insertions(+), 93 deletions(-) diff --git a/e2etests/testdata/stable/overlapping_child_label/dagre/board.exp.json b/e2etests/testdata/stable/overlapping_child_label/dagre/board.exp.json index 533dfa432..d4b5af472 100644 --- a/e2etests/testdata/stable/overlapping_child_label/dagre/board.exp.json +++ b/e2etests/testdata/stable/overlapping_child_label/dagre/board.exp.json @@ -11,7 +11,7 @@ "y": 33 }, "width": 131, - "height": 395, + "height": 490, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -90,7 +90,7 @@ "type": "rectangle", "pos": { "x": 40, - "y": 316 + "y": 390 }, "width": 71, "height": 66, @@ -134,10 +134,10 @@ ], "pos": { "x": 181, - "y": -24 + "y": -60 }, "width": 164, - "height": 196, + "height": 232, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -246,10 +246,10 @@ ], "pos": { "x": 385, - "y": 4 + "y": -17 }, "width": 165, - "height": 212, + "height": 297, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -382,15 +382,15 @@ }, { "x": 75.5, - "y": 198.60000610351562 + "y": 257.79998779296875 }, { "x": 75.5, - "y": 276 + "y": 350 }, { "x": 75.5, - "y": 316 + "y": 390 } ], "isCurve": true, diff --git a/e2etests/testdata/stable/overlapping_child_label/dagre/sketch.exp.svg b/e2etests/testdata/stable/overlapping_child_label/dagre/sketch.exp.svg index 466525352..1d315a75d 100644 --- a/e2etests/testdata/stable/overlapping_child_label/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/overlapping_child_label/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -heyyayyyceeeyoheybeeedeee - - - - + .d2-1499565599 .fill-N1{fill:#0A0F25;} + .d2-1499565599 .fill-N2{fill:#676C7E;} + .d2-1499565599 .fill-N3{fill:#9499AB;} + .d2-1499565599 .fill-N4{fill:#CFD2DD;} + .d2-1499565599 .fill-N5{fill:#DEE1EB;} + .d2-1499565599 .fill-N6{fill:#EEF1F8;} + .d2-1499565599 .fill-N7{fill:#FFFFFF;} + .d2-1499565599 .fill-B1{fill:#0D32B2;} + .d2-1499565599 .fill-B2{fill:#0D32B2;} + .d2-1499565599 .fill-B3{fill:#E3E9FD;} + .d2-1499565599 .fill-B4{fill:#E3E9FD;} + .d2-1499565599 .fill-B5{fill:#EDF0FD;} + .d2-1499565599 .fill-B6{fill:#F7F8FE;} + .d2-1499565599 .fill-AA2{fill:#4A6FF3;} + .d2-1499565599 .fill-AA4{fill:#EDF0FD;} + .d2-1499565599 .fill-AA5{fill:#F7F8FE;} + .d2-1499565599 .fill-AB4{fill:#EDF0FD;} + .d2-1499565599 .fill-AB5{fill:#F7F8FE;} + .d2-1499565599 .stroke-N1{stroke:#0A0F25;} + .d2-1499565599 .stroke-N2{stroke:#676C7E;} + .d2-1499565599 .stroke-N3{stroke:#9499AB;} + .d2-1499565599 .stroke-N4{stroke:#CFD2DD;} + .d2-1499565599 .stroke-N5{stroke:#DEE1EB;} + .d2-1499565599 .stroke-N6{stroke:#EEF1F8;} + .d2-1499565599 .stroke-N7{stroke:#FFFFFF;} + .d2-1499565599 .stroke-B1{stroke:#0D32B2;} + .d2-1499565599 .stroke-B2{stroke:#0D32B2;} + .d2-1499565599 .stroke-B3{stroke:#E3E9FD;} + .d2-1499565599 .stroke-B4{stroke:#E3E9FD;} + .d2-1499565599 .stroke-B5{stroke:#EDF0FD;} + .d2-1499565599 .stroke-B6{stroke:#F7F8FE;} + .d2-1499565599 .stroke-AA2{stroke:#4A6FF3;} + .d2-1499565599 .stroke-AA4{stroke:#EDF0FD;} + .d2-1499565599 .stroke-AA5{stroke:#F7F8FE;} + .d2-1499565599 .stroke-AB4{stroke:#EDF0FD;} + .d2-1499565599 .stroke-AB5{stroke:#F7F8FE;} + .d2-1499565599 .background-color-N1{background-color:#0A0F25;} + .d2-1499565599 .background-color-N2{background-color:#676C7E;} + .d2-1499565599 .background-color-N3{background-color:#9499AB;} + .d2-1499565599 .background-color-N4{background-color:#CFD2DD;} + .d2-1499565599 .background-color-N5{background-color:#DEE1EB;} + .d2-1499565599 .background-color-N6{background-color:#EEF1F8;} + .d2-1499565599 .background-color-N7{background-color:#FFFFFF;} + .d2-1499565599 .background-color-B1{background-color:#0D32B2;} + .d2-1499565599 .background-color-B2{background-color:#0D32B2;} + .d2-1499565599 .background-color-B3{background-color:#E3E9FD;} + .d2-1499565599 .background-color-B4{background-color:#E3E9FD;} + .d2-1499565599 .background-color-B5{background-color:#EDF0FD;} + .d2-1499565599 .background-color-B6{background-color:#F7F8FE;} + .d2-1499565599 .background-color-AA2{background-color:#4A6FF3;} + .d2-1499565599 .background-color-AA4{background-color:#EDF0FD;} + .d2-1499565599 .background-color-AA5{background-color:#F7F8FE;} + .d2-1499565599 .background-color-AB4{background-color:#EDF0FD;} + .d2-1499565599 .background-color-AB5{background-color:#F7F8FE;} + .d2-1499565599 .color-N1{color:#0A0F25;} + .d2-1499565599 .color-N2{color:#676C7E;} + .d2-1499565599 .color-N3{color:#9499AB;} + .d2-1499565599 .color-N4{color:#CFD2DD;} + .d2-1499565599 .color-N5{color:#DEE1EB;} + .d2-1499565599 .color-N6{color:#EEF1F8;} + .d2-1499565599 .color-N7{color:#FFFFFF;} + .d2-1499565599 .color-B1{color:#0D32B2;} + .d2-1499565599 .color-B2{color:#0D32B2;} + .d2-1499565599 .color-B3{color:#E3E9FD;} + .d2-1499565599 .color-B4{color:#E3E9FD;} + .d2-1499565599 .color-B5{color:#EDF0FD;} + .d2-1499565599 .color-B6{color:#F7F8FE;} + .d2-1499565599 .color-AA2{color:#4A6FF3;} + .d2-1499565599 .color-AA4{color:#EDF0FD;} + .d2-1499565599 .color-AA5{color:#F7F8FE;} + .d2-1499565599 .color-AB4{color:#EDF0FD;} + .d2-1499565599 .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}]]>heyyayyyceeeyoheybeeedeee + + + + - + \ No newline at end of file From a18eae7158aa3fbd4765538d49c146344a94dc13 Mon Sep 17 00:00:00 2001 From: Gavin Nishizawa Date: Wed, 19 Jul 2023 19:22:37 -0700 Subject: [PATCH 28/31] consider edges close to collapsing edge as being on it --- d2layouts/d2dagrelayout/layout.go | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/d2layouts/d2dagrelayout/layout.go b/d2layouts/d2dagrelayout/layout.go index e3ded9ec0..b6019da36 100644 --- a/d2layouts/d2dagrelayout/layout.go +++ b/d2layouts/d2dagrelayout/layout.go @@ -1723,30 +1723,26 @@ func adjustDeltaForEdges(obj *d2graph.Object, objPosition, delta float64, isHori if !isOnSide { return false } + buffer := 10. var isInRange bool if delta > 0 { - if objPosition < position && position < objPosition+delta { + if objPosition <= position && position <= objPosition+delta+buffer { isInRange = true } } else { - if objPosition+delta < position && position < objPosition { + if objPosition+delta-buffer <= position && position <= objPosition { isInRange = true } } - if !isInRange { - if isHorizontal { - return false - } else { - return false - } - } - return true + return isInRange } + hasEdgeOnCollapsingSide := false outermost := objPosition + delta for _, edge := range obj.Graph.Edges { if edge.Src == obj { p := edge.Route[0] if isOnCollapsingSide(p) { + hasEdgeOnCollapsingSide = true var position float64 if isHorizontal { position = p.X @@ -1763,6 +1759,7 @@ func adjustDeltaForEdges(obj *d2graph.Object, objPosition, delta float64, isHori if edge.Dst == obj { p := edge.Route[len(edge.Route)-1] if isOnCollapsingSide(p) { + hasEdgeOnCollapsingSide = true var position float64 if isHorizontal { position = p.X @@ -1778,7 +1775,7 @@ func adjustDeltaForEdges(obj *d2graph.Object, objPosition, delta float64, isHori } } newMagnitude = math.Abs(delta) - if outermost != objPosition+delta { + if hasEdgeOnCollapsingSide { // only reduce to outermost + DEFAULT_PADDING if delta < 0 { newMagnitude = math.Max(0, objPosition-(outermost+DEFAULT_PADDING)) From 77acbdcfa1b8bf1354b059b325cc75b6ad9828cb Mon Sep 17 00:00:00 2001 From: Gavin Nishizawa Date: Wed, 19 Jul 2023 19:22:51 -0700 Subject: [PATCH 29/31] update tests --- .../unconnected/dagre/board.exp.json | 2 +- .../unconnected/dagre/sketch.exp.svg | 556 +++++++++--------- .../one_container_loop/dagre/board.exp.json | 2 +- .../one_container_loop/dagre/sketch.exp.svg | 162 ++--- 4 files changed, 361 insertions(+), 361 deletions(-) diff --git a/e2etests/testdata/regression/unconnected/dagre/board.exp.json b/e2etests/testdata/regression/unconnected/dagre/board.exp.json index 1b1935538..c247f0d23 100644 --- a/e2etests/testdata/regression/unconnected/dagre/board.exp.json +++ b/e2etests/testdata/regression/unconnected/dagre/board.exp.json @@ -134,7 +134,7 @@ "y": 270 }, "width": 832, - "height": 323, + "height": 334, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, diff --git a/e2etests/testdata/regression/unconnected/dagre/sketch.exp.svg b/e2etests/testdata/regression/unconnected/dagre/sketch.exp.svg index 44f9695e1..cf7896a76 100644 --- a/e2etests/testdata/regression/unconnected/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/unconnected/dagre/sketch.exp.svg @@ -1,20 +1,20 @@ -OEM FactoryOEM WarehouseDistributor WarehouseGos WarehouseCustomer SiteWorkflow-I (Warehousing, Installation)MasterRegional-1Regional-2Regional-N
        +OEM FactoryOEM WarehouseDistributor WarehouseGos WarehouseCustomer SiteWorkflow-I (Warehousing, Installation)MasterRegional-1Regional-2Regional-N
        • Asset Tagging
        • Inventory
        • Staging
        • Dispatch to Site
        -
        InstallationSupport +
      InstallationSupport diff --git a/e2etests/testdata/stable/one_container_loop/dagre/board.exp.json b/e2etests/testdata/stable/one_container_loop/dagre/board.exp.json index dbf5c7046..16ddc4df3 100644 --- a/e2etests/testdata/stable/one_container_loop/dagre/board.exp.json +++ b/e2etests/testdata/stable/one_container_loop/dagre/board.exp.json @@ -10,7 +10,7 @@ "x": 10, "y": 20 }, - "width": 260, + "width": 290, "height": 126, "opacity": 1, "strokeDash": 0, diff --git a/e2etests/testdata/stable/one_container_loop/dagre/sketch.exp.svg b/e2etests/testdata/stable/one_container_loop/dagre/sketch.exp.svg index 4e044b490..01a0c4752 100644 --- a/e2etests/testdata/stable/one_container_loop/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/one_container_loop/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -acdefgbh - - + .d2-3661473330 .fill-N1{fill:#0A0F25;} + .d2-3661473330 .fill-N2{fill:#676C7E;} + .d2-3661473330 .fill-N3{fill:#9499AB;} + .d2-3661473330 .fill-N4{fill:#CFD2DD;} + .d2-3661473330 .fill-N5{fill:#DEE1EB;} + .d2-3661473330 .fill-N6{fill:#EEF1F8;} + .d2-3661473330 .fill-N7{fill:#FFFFFF;} + .d2-3661473330 .fill-B1{fill:#0D32B2;} + .d2-3661473330 .fill-B2{fill:#0D32B2;} + .d2-3661473330 .fill-B3{fill:#E3E9FD;} + .d2-3661473330 .fill-B4{fill:#E3E9FD;} + .d2-3661473330 .fill-B5{fill:#EDF0FD;} + .d2-3661473330 .fill-B6{fill:#F7F8FE;} + .d2-3661473330 .fill-AA2{fill:#4A6FF3;} + .d2-3661473330 .fill-AA4{fill:#EDF0FD;} + .d2-3661473330 .fill-AA5{fill:#F7F8FE;} + .d2-3661473330 .fill-AB4{fill:#EDF0FD;} + .d2-3661473330 .fill-AB5{fill:#F7F8FE;} + .d2-3661473330 .stroke-N1{stroke:#0A0F25;} + .d2-3661473330 .stroke-N2{stroke:#676C7E;} + .d2-3661473330 .stroke-N3{stroke:#9499AB;} + .d2-3661473330 .stroke-N4{stroke:#CFD2DD;} + .d2-3661473330 .stroke-N5{stroke:#DEE1EB;} + .d2-3661473330 .stroke-N6{stroke:#EEF1F8;} + .d2-3661473330 .stroke-N7{stroke:#FFFFFF;} + .d2-3661473330 .stroke-B1{stroke:#0D32B2;} + .d2-3661473330 .stroke-B2{stroke:#0D32B2;} + .d2-3661473330 .stroke-B3{stroke:#E3E9FD;} + .d2-3661473330 .stroke-B4{stroke:#E3E9FD;} + .d2-3661473330 .stroke-B5{stroke:#EDF0FD;} + .d2-3661473330 .stroke-B6{stroke:#F7F8FE;} + .d2-3661473330 .stroke-AA2{stroke:#4A6FF3;} + .d2-3661473330 .stroke-AA4{stroke:#EDF0FD;} + .d2-3661473330 .stroke-AA5{stroke:#F7F8FE;} + .d2-3661473330 .stroke-AB4{stroke:#EDF0FD;} + .d2-3661473330 .stroke-AB5{stroke:#F7F8FE;} + .d2-3661473330 .background-color-N1{background-color:#0A0F25;} + .d2-3661473330 .background-color-N2{background-color:#676C7E;} + .d2-3661473330 .background-color-N3{background-color:#9499AB;} + .d2-3661473330 .background-color-N4{background-color:#CFD2DD;} + .d2-3661473330 .background-color-N5{background-color:#DEE1EB;} + .d2-3661473330 .background-color-N6{background-color:#EEF1F8;} + .d2-3661473330 .background-color-N7{background-color:#FFFFFF;} + .d2-3661473330 .background-color-B1{background-color:#0D32B2;} + .d2-3661473330 .background-color-B2{background-color:#0D32B2;} + .d2-3661473330 .background-color-B3{background-color:#E3E9FD;} + .d2-3661473330 .background-color-B4{background-color:#E3E9FD;} + .d2-3661473330 .background-color-B5{background-color:#EDF0FD;} + .d2-3661473330 .background-color-B6{background-color:#F7F8FE;} + .d2-3661473330 .background-color-AA2{background-color:#4A6FF3;} + .d2-3661473330 .background-color-AA4{background-color:#EDF0FD;} + .d2-3661473330 .background-color-AA5{background-color:#F7F8FE;} + .d2-3661473330 .background-color-AB4{background-color:#EDF0FD;} + .d2-3661473330 .background-color-AB5{background-color:#F7F8FE;} + .d2-3661473330 .color-N1{color:#0A0F25;} + .d2-3661473330 .color-N2{color:#676C7E;} + .d2-3661473330 .color-N3{color:#9499AB;} + .d2-3661473330 .color-N4{color:#CFD2DD;} + .d2-3661473330 .color-N5{color:#DEE1EB;} + .d2-3661473330 .color-N6{color:#EEF1F8;} + .d2-3661473330 .color-N7{color:#FFFFFF;} + .d2-3661473330 .color-B1{color:#0D32B2;} + .d2-3661473330 .color-B2{color:#0D32B2;} + .d2-3661473330 .color-B3{color:#E3E9FD;} + .d2-3661473330 .color-B4{color:#E3E9FD;} + .d2-3661473330 .color-B5{color:#EDF0FD;} + .d2-3661473330 .color-B6{color:#F7F8FE;} + .d2-3661473330 .color-AA2{color:#4A6FF3;} + .d2-3661473330 .color-AA4{color:#EDF0FD;} + .d2-3661473330 .color-AA5{color:#F7F8FE;} + .d2-3661473330 .color-AB4{color:#EDF0FD;} + .d2-3661473330 .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}]]>acdefgbh + + From fbda3e88739a8d048601ff27054dc015369babfe Mon Sep 17 00:00:00 2001 From: Gavin Nishizawa Date: Thu, 20 Jul 2023 11:31:40 -0700 Subject: [PATCH 30/31] add some extra space between overlapping --- d2layouts/d2dagrelayout/layout.go | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/d2layouts/d2dagrelayout/layout.go b/d2layouts/d2dagrelayout/layout.go index b6019da36..ebab1e73e 100644 --- a/d2layouts/d2dagrelayout/layout.go +++ b/d2layouts/d2dagrelayout/layout.go @@ -35,6 +35,7 @@ const ( MIN_RANK_SEP = 60 EDGE_LABEL_GAP = 20 DEFAULT_PADDING = 30. + MIN_SPACING = 10. ) type ConfigurableOpts struct { @@ -1651,16 +1652,16 @@ func fitPadding(obj *d2graph.Object) { } if leftOverlap > 0 { - leftDelta -= leftOverlap + leftDelta -= leftOverlap + MIN_SPACING } if rightOverlap > 0 { - rightDelta -= rightOverlap + rightDelta -= rightOverlap + MIN_SPACING } if topOverlap > 0 { - topDelta -= topOverlap + topDelta -= topOverlap + MIN_SPACING } if bottomOverlap > 0 { - bottomDelta -= bottomOverlap + bottomDelta -= bottomOverlap + MIN_SPACING } } @@ -1723,7 +1724,7 @@ func adjustDeltaForEdges(obj *d2graph.Object, objPosition, delta float64, isHori if !isOnSide { return false } - buffer := 10. + buffer := MIN_SPACING var isInRange bool if delta > 0 { if objPosition <= position && position <= objPosition+delta+buffer { From 10c94c08cd26ff82243fcc600bb19a11eb8eddb9 Mon Sep 17 00:00:00 2001 From: Gavin Nishizawa Date: Thu, 20 Jul 2023 11:31:59 -0700 Subject: [PATCH 31/31] update test --- .../testdata/files/overlapping_child_label.d2 | 20 +- .../dagre/board.exp.json | 158 +++++++++++++--- .../dagre/sketch.exp.svg | 176 +++++++++--------- .../elk/board.exp.json | 148 +++++++++++++-- .../elk/sketch.exp.svg | 174 ++++++++--------- 5 files changed, 458 insertions(+), 218 deletions(-) diff --git a/e2etests/testdata/files/overlapping_child_label.d2 b/e2etests/testdata/files/overlapping_child_label.d2 index 8af560505..c8e945e91 100644 --- a/e2etests/testdata/files/overlapping_child_label.d2 +++ b/e2etests/testdata/files/overlapping_child_label.d2 @@ -4,30 +4,42 @@ heyy: { hey.label.near: outside-bottom-right } -ayyy: { +aaaa: { label.near: top-right icon.near: top-left class: icon - beee: { + bbbb: { label.near: outside-top-left icon.near: outside-top-right class: icon } } -ceee: { +cccc: { label.near: top-right icon.near: bottom-left class: icon - deee: { + dddd: { label.near: outside-top-right icon.near: outside-bottom-left class: icon } } +eeeeeeeeeeeeeeeeeee: { + label.near: center-right + icon.near: center-left + class: icon + + fffffffffff: { + label.near: outside-right-center + icon.near: outside-left-center + class: icon + } +} + classes: { icon.icon: https://icons.terrastruct.com/essentials/time.svg } diff --git a/e2etests/testdata/stable/overlapping_child_label/dagre/board.exp.json b/e2etests/testdata/stable/overlapping_child_label/dagre/board.exp.json index d4b5af472..68e4a89c8 100644 --- a/e2etests/testdata/stable/overlapping_child_label/dagre/board.exp.json +++ b/e2etests/testdata/stable/overlapping_child_label/dagre/board.exp.json @@ -11,7 +11,7 @@ "y": 33 }, "width": 131, - "height": 490, + "height": 500, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -127,17 +127,17 @@ "level": 2 }, { - "id": "ayyy", + "id": "aaaa", "type": "rectangle", "classes": [ "icon" ], "pos": { "x": 181, - "y": -60 + "y": -70 }, - "width": 164, - "height": 232, + "width": 167, + "height": 242, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -168,7 +168,7 @@ "fields": null, "methods": null, "columns": null, - "label": "ayyy", + "label": "aaaa", "fontSize": 28, "fontFamily": "DEFAULT", "language": "", @@ -176,14 +176,14 @@ "italic": false, "bold": false, "underline": false, - "labelWidth": 53, + "labelWidth": 55, "labelHeight": 36, "labelPosition": "INSIDE_TOP_RIGHT", "zIndex": 0, "level": 1 }, { - "id": "ayyy.beee", + "id": "aaaa.bbbb", "type": "rectangle", "classes": [ "icon" @@ -192,7 +192,7 @@ "x": 211, "y": 50 }, - "width": 104, + "width": 107, "height": 92, "opacity": 1, "strokeDash": 0, @@ -224,7 +224,7 @@ "fields": null, "methods": null, "columns": null, - "label": "beee", + "label": "bbbb", "fontSize": 16, "fontFamily": "DEFAULT", "language": "", @@ -232,24 +232,24 @@ "italic": false, "bold": true, "underline": false, - "labelWidth": 33, + "labelWidth": 36, "labelHeight": 21, "labelPosition": "OUTSIDE_TOP_LEFT", "zIndex": 0, "level": 2 }, { - "id": "ceee", + "id": "cccc", "type": "rectangle", "classes": [ "icon" ], "pos": { - "x": 385, - "y": -17 + "x": 388, + "y": -27 }, - "width": 165, - "height": 297, + "width": 168, + "height": 317, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -280,7 +280,7 @@ "fields": null, "methods": null, "columns": null, - "label": "ceee", + "label": "cccc", "fontSize": 28, "fontFamily": "DEFAULT", "language": "", @@ -288,23 +288,23 @@ "italic": false, "bold": false, "underline": false, - "labelWidth": 53, + "labelWidth": 51, "labelHeight": 36, "labelPosition": "INSIDE_TOP_RIGHT", "zIndex": 0, "level": 1 }, { - "id": "ceee.deee", + "id": "cccc.dddd", "type": "rectangle", "classes": [ "icon" ], "pos": { - "x": 415, + "x": 418, "y": 50 }, - "width": 105, + "width": 108, "height": 92, "opacity": 1, "strokeDash": 0, @@ -336,7 +336,7 @@ "fields": null, "methods": null, "columns": null, - "label": "deee", + "label": "dddd", "fontSize": 16, "fontFamily": "DEFAULT", "language": "", @@ -344,11 +344,123 @@ "italic": false, "bold": true, "underline": false, - "labelWidth": 34, + "labelWidth": 37, "labelHeight": 21, "labelPosition": "OUTSIDE_TOP_RIGHT", "zIndex": 0, "level": 2 + }, + { + "id": "eeeeeeeeeeeeeeeeeee", + "type": "rectangle", + "classes": [ + "icon" + ], + "pos": { + "x": 626, + "y": 20 + }, + "width": 624, + "height": 152, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B4", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": { + "Scheme": "https", + "Opaque": "", + "User": null, + "Host": "icons.terrastruct.com", + "Path": "/essentials/time.svg", + "RawPath": "", + "OmitHost": false, + "ForceQuery": false, + "RawQuery": "", + "Fragment": "", + "RawFragment": "" + }, + "iconPosition": "INSIDE_MIDDLE_LEFT", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "eeeeeeeeeeeeeeeeeee", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 263, + "labelHeight": 36, + "labelPosition": "INSIDE_MIDDLE_RIGHT", + "zIndex": 0, + "level": 1 + }, + { + "id": "eeeeeeeeeeeeeeeeeee.fffffffffff", + "type": "rectangle", + "classes": [ + "icon" + ], + "pos": { + "x": 774, + "y": 50 + }, + "width": 132, + "height": 92, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": { + "Scheme": "https", + "Opaque": "", + "User": null, + "Host": "icons.terrastruct.com", + "Path": "/essentials/time.svg", + "RawPath": "", + "OmitHost": false, + "ForceQuery": false, + "RawQuery": "", + "Fragment": "", + "RawFragment": "" + }, + "iconPosition": "OUTSIDE_LEFT_MIDDLE", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "fffffffffff", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 61, + "labelHeight": 21, + "labelPosition": "OUTSIDE_RIGHT_MIDDLE", + "zIndex": 0, + "level": 2 } ], "connections": [ diff --git a/e2etests/testdata/stable/overlapping_child_label/dagre/sketch.exp.svg b/e2etests/testdata/stable/overlapping_child_label/dagre/sketch.exp.svg index 1d315a75d..a18fd9f65 100644 --- a/e2etests/testdata/stable/overlapping_child_label/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/overlapping_child_label/dagre/sketch.exp.svg @@ -1,17 +1,17 @@ -heyyayyyceeeyoheybeeedeee - - - - + .d2-2221498878 .fill-N1{fill:#0A0F25;} + .d2-2221498878 .fill-N2{fill:#676C7E;} + .d2-2221498878 .fill-N3{fill:#9499AB;} + .d2-2221498878 .fill-N4{fill:#CFD2DD;} + .d2-2221498878 .fill-N5{fill:#DEE1EB;} + .d2-2221498878 .fill-N6{fill:#EEF1F8;} + .d2-2221498878 .fill-N7{fill:#FFFFFF;} + .d2-2221498878 .fill-B1{fill:#0D32B2;} + .d2-2221498878 .fill-B2{fill:#0D32B2;} + .d2-2221498878 .fill-B3{fill:#E3E9FD;} + .d2-2221498878 .fill-B4{fill:#E3E9FD;} + .d2-2221498878 .fill-B5{fill:#EDF0FD;} + .d2-2221498878 .fill-B6{fill:#F7F8FE;} + .d2-2221498878 .fill-AA2{fill:#4A6FF3;} + .d2-2221498878 .fill-AA4{fill:#EDF0FD;} + .d2-2221498878 .fill-AA5{fill:#F7F8FE;} + .d2-2221498878 .fill-AB4{fill:#EDF0FD;} + .d2-2221498878 .fill-AB5{fill:#F7F8FE;} + .d2-2221498878 .stroke-N1{stroke:#0A0F25;} + .d2-2221498878 .stroke-N2{stroke:#676C7E;} + .d2-2221498878 .stroke-N3{stroke:#9499AB;} + .d2-2221498878 .stroke-N4{stroke:#CFD2DD;} + .d2-2221498878 .stroke-N5{stroke:#DEE1EB;} + .d2-2221498878 .stroke-N6{stroke:#EEF1F8;} + .d2-2221498878 .stroke-N7{stroke:#FFFFFF;} + .d2-2221498878 .stroke-B1{stroke:#0D32B2;} + .d2-2221498878 .stroke-B2{stroke:#0D32B2;} + .d2-2221498878 .stroke-B3{stroke:#E3E9FD;} + .d2-2221498878 .stroke-B4{stroke:#E3E9FD;} + .d2-2221498878 .stroke-B5{stroke:#EDF0FD;} + .d2-2221498878 .stroke-B6{stroke:#F7F8FE;} + .d2-2221498878 .stroke-AA2{stroke:#4A6FF3;} + .d2-2221498878 .stroke-AA4{stroke:#EDF0FD;} + .d2-2221498878 .stroke-AA5{stroke:#F7F8FE;} + .d2-2221498878 .stroke-AB4{stroke:#EDF0FD;} + .d2-2221498878 .stroke-AB5{stroke:#F7F8FE;} + .d2-2221498878 .background-color-N1{background-color:#0A0F25;} + .d2-2221498878 .background-color-N2{background-color:#676C7E;} + .d2-2221498878 .background-color-N3{background-color:#9499AB;} + .d2-2221498878 .background-color-N4{background-color:#CFD2DD;} + .d2-2221498878 .background-color-N5{background-color:#DEE1EB;} + .d2-2221498878 .background-color-N6{background-color:#EEF1F8;} + .d2-2221498878 .background-color-N7{background-color:#FFFFFF;} + .d2-2221498878 .background-color-B1{background-color:#0D32B2;} + .d2-2221498878 .background-color-B2{background-color:#0D32B2;} + .d2-2221498878 .background-color-B3{background-color:#E3E9FD;} + .d2-2221498878 .background-color-B4{background-color:#E3E9FD;} + .d2-2221498878 .background-color-B5{background-color:#EDF0FD;} + .d2-2221498878 .background-color-B6{background-color:#F7F8FE;} + .d2-2221498878 .background-color-AA2{background-color:#4A6FF3;} + .d2-2221498878 .background-color-AA4{background-color:#EDF0FD;} + .d2-2221498878 .background-color-AA5{background-color:#F7F8FE;} + .d2-2221498878 .background-color-AB4{background-color:#EDF0FD;} + .d2-2221498878 .background-color-AB5{background-color:#F7F8FE;} + .d2-2221498878 .color-N1{color:#0A0F25;} + .d2-2221498878 .color-N2{color:#676C7E;} + .d2-2221498878 .color-N3{color:#9499AB;} + .d2-2221498878 .color-N4{color:#CFD2DD;} + .d2-2221498878 .color-N5{color:#DEE1EB;} + .d2-2221498878 .color-N6{color:#EEF1F8;} + .d2-2221498878 .color-N7{color:#FFFFFF;} + .d2-2221498878 .color-B1{color:#0D32B2;} + .d2-2221498878 .color-B2{color:#0D32B2;} + .d2-2221498878 .color-B3{color:#E3E9FD;} + .d2-2221498878 .color-B4{color:#E3E9FD;} + .d2-2221498878 .color-B5{color:#EDF0FD;} + .d2-2221498878 .color-B6{color:#F7F8FE;} + .d2-2221498878 .color-AA2{color:#4A6FF3;} + .d2-2221498878 .color-AA4{color:#EDF0FD;} + .d2-2221498878 .color-AA5{color:#F7F8FE;} + .d2-2221498878 .color-AB4{color:#EDF0FD;} + .d2-2221498878 .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}]]>heyyaaaacccceeeeeeeeeeeeeeeeeeeyoheybbbbddddfffffffffff + + + + + - - + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/overlapping_child_label/elk/board.exp.json b/e2etests/testdata/stable/overlapping_child_label/elk/board.exp.json index 9b2579ba4..f7d744bab 100644 --- a/e2etests/testdata/stable/overlapping_child_label/elk/board.exp.json +++ b/e2etests/testdata/stable/overlapping_child_label/elk/board.exp.json @@ -127,7 +127,7 @@ "level": 2 }, { - "id": "ayyy", + "id": "aaaa", "type": "rectangle", "classes": [ "icon" @@ -136,7 +136,7 @@ "x": 203, "y": 42 }, - "width": 204, + "width": 207, "height": 242, "opacity": 1, "strokeDash": 0, @@ -168,7 +168,7 @@ "fields": null, "methods": null, "columns": null, - "label": "ayyy", + "label": "aaaa", "fontSize": 28, "fontFamily": "DEFAULT", "language": "", @@ -176,14 +176,14 @@ "italic": false, "bold": false, "underline": false, - "labelWidth": 53, + "labelWidth": 55, "labelHeight": 36, "labelPosition": "INSIDE_TOP_RIGHT", "zIndex": 0, "level": 1 }, { - "id": "ayyy.beee", + "id": "aaaa.bbbb", "type": "rectangle", "classes": [ "icon" @@ -192,7 +192,7 @@ "x": 253, "y": 116 }, - "width": 104, + "width": 107, "height": 118, "opacity": 1, "strokeDash": 0, @@ -224,7 +224,7 @@ "fields": null, "methods": null, "columns": null, - "label": "beee", + "label": "bbbb", "fontSize": 16, "fontFamily": "DEFAULT", "language": "", @@ -232,23 +232,23 @@ "italic": false, "bold": true, "underline": false, - "labelWidth": 33, + "labelWidth": 36, "labelHeight": 21, "labelPosition": "OUTSIDE_TOP_LEFT", "zIndex": 0, "level": 2 }, { - "id": "ceee", + "id": "cccc", "type": "rectangle", "classes": [ "icon" ], "pos": { - "x": 427, + "x": 430, "y": 42 }, - "width": 205, + "width": 208, "height": 242, "opacity": 1, "strokeDash": 0, @@ -280,7 +280,7 @@ "fields": null, "methods": null, "columns": null, - "label": "ceee", + "label": "cccc", "fontSize": 28, "fontFamily": "DEFAULT", "language": "", @@ -288,23 +288,23 @@ "italic": false, "bold": false, "underline": false, - "labelWidth": 53, + "labelWidth": 51, "labelHeight": 36, "labelPosition": "INSIDE_TOP_RIGHT", "zIndex": 0, "level": 1 }, { - "id": "ceee.deee", + "id": "cccc.dddd", "type": "rectangle", "classes": [ "icon" ], "pos": { - "x": 477, + "x": 480, "y": 92 }, - "width": 105, + "width": 108, "height": 118, "opacity": 1, "strokeDash": 0, @@ -336,7 +336,7 @@ "fields": null, "methods": null, "columns": null, - "label": "deee", + "label": "dddd", "fontSize": 16, "fontFamily": "DEFAULT", "language": "", @@ -344,11 +344,123 @@ "italic": false, "bold": true, "underline": false, - "labelWidth": 34, + "labelWidth": 37, "labelHeight": 21, "labelPosition": "OUTSIDE_TOP_RIGHT", "zIndex": 0, "level": 2 + }, + { + "id": "eeeeeeeeeeeeeeeeeee", + "type": "rectangle", + "classes": [ + "icon" + ], + "pos": { + "x": 658, + "y": 54 + }, + "width": 614, + "height": 218, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B4", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": { + "Scheme": "https", + "Opaque": "", + "User": null, + "Host": "icons.terrastruct.com", + "Path": "/essentials/time.svg", + "RawPath": "", + "OmitHost": false, + "ForceQuery": false, + "RawQuery": "", + "Fragment": "", + "RawFragment": "" + }, + "iconPosition": "INSIDE_MIDDLE_LEFT", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "eeeeeeeeeeeeeeeeeee", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 263, + "labelHeight": 36, + "labelPosition": "INSIDE_MIDDLE_RIGHT", + "zIndex": 0, + "level": 1 + }, + { + "id": "eeeeeeeeeeeeeeeeeee.fffffffffff", + "type": "rectangle", + "classes": [ + "icon" + ], + "pos": { + "x": 801, + "y": 104 + }, + "width": 132, + "height": 118, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": { + "Scheme": "https", + "Opaque": "", + "User": null, + "Host": "icons.terrastruct.com", + "Path": "/essentials/time.svg", + "RawPath": "", + "OmitHost": false, + "ForceQuery": false, + "RawQuery": "", + "Fragment": "", + "RawFragment": "" + }, + "iconPosition": "OUTSIDE_LEFT_MIDDLE", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "fffffffffff", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 61, + "labelHeight": 21, + "labelPosition": "OUTSIDE_RIGHT_MIDDLE", + "zIndex": 0, + "level": 2 } ], "connections": [ diff --git a/e2etests/testdata/stable/overlapping_child_label/elk/sketch.exp.svg b/e2etests/testdata/stable/overlapping_child_label/elk/sketch.exp.svg index a96791eb4..701afc1a0 100644 --- a/e2etests/testdata/stable/overlapping_child_label/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/overlapping_child_label/elk/sketch.exp.svg @@ -1,17 +1,17 @@ -heyyayyyceeeyoheybeeedeee - + .d2-1602067992 .fill-N1{fill:#0A0F25;} + .d2-1602067992 .fill-N2{fill:#676C7E;} + .d2-1602067992 .fill-N3{fill:#9499AB;} + .d2-1602067992 .fill-N4{fill:#CFD2DD;} + .d2-1602067992 .fill-N5{fill:#DEE1EB;} + .d2-1602067992 .fill-N6{fill:#EEF1F8;} + .d2-1602067992 .fill-N7{fill:#FFFFFF;} + .d2-1602067992 .fill-B1{fill:#0D32B2;} + .d2-1602067992 .fill-B2{fill:#0D32B2;} + .d2-1602067992 .fill-B3{fill:#E3E9FD;} + .d2-1602067992 .fill-B4{fill:#E3E9FD;} + .d2-1602067992 .fill-B5{fill:#EDF0FD;} + .d2-1602067992 .fill-B6{fill:#F7F8FE;} + .d2-1602067992 .fill-AA2{fill:#4A6FF3;} + .d2-1602067992 .fill-AA4{fill:#EDF0FD;} + .d2-1602067992 .fill-AA5{fill:#F7F8FE;} + .d2-1602067992 .fill-AB4{fill:#EDF0FD;} + .d2-1602067992 .fill-AB5{fill:#F7F8FE;} + .d2-1602067992 .stroke-N1{stroke:#0A0F25;} + .d2-1602067992 .stroke-N2{stroke:#676C7E;} + .d2-1602067992 .stroke-N3{stroke:#9499AB;} + .d2-1602067992 .stroke-N4{stroke:#CFD2DD;} + .d2-1602067992 .stroke-N5{stroke:#DEE1EB;} + .d2-1602067992 .stroke-N6{stroke:#EEF1F8;} + .d2-1602067992 .stroke-N7{stroke:#FFFFFF;} + .d2-1602067992 .stroke-B1{stroke:#0D32B2;} + .d2-1602067992 .stroke-B2{stroke:#0D32B2;} + .d2-1602067992 .stroke-B3{stroke:#E3E9FD;} + .d2-1602067992 .stroke-B4{stroke:#E3E9FD;} + .d2-1602067992 .stroke-B5{stroke:#EDF0FD;} + .d2-1602067992 .stroke-B6{stroke:#F7F8FE;} + .d2-1602067992 .stroke-AA2{stroke:#4A6FF3;} + .d2-1602067992 .stroke-AA4{stroke:#EDF0FD;} + .d2-1602067992 .stroke-AA5{stroke:#F7F8FE;} + .d2-1602067992 .stroke-AB4{stroke:#EDF0FD;} + .d2-1602067992 .stroke-AB5{stroke:#F7F8FE;} + .d2-1602067992 .background-color-N1{background-color:#0A0F25;} + .d2-1602067992 .background-color-N2{background-color:#676C7E;} + .d2-1602067992 .background-color-N3{background-color:#9499AB;} + .d2-1602067992 .background-color-N4{background-color:#CFD2DD;} + .d2-1602067992 .background-color-N5{background-color:#DEE1EB;} + .d2-1602067992 .background-color-N6{background-color:#EEF1F8;} + .d2-1602067992 .background-color-N7{background-color:#FFFFFF;} + .d2-1602067992 .background-color-B1{background-color:#0D32B2;} + .d2-1602067992 .background-color-B2{background-color:#0D32B2;} + .d2-1602067992 .background-color-B3{background-color:#E3E9FD;} + .d2-1602067992 .background-color-B4{background-color:#E3E9FD;} + .d2-1602067992 .background-color-B5{background-color:#EDF0FD;} + .d2-1602067992 .background-color-B6{background-color:#F7F8FE;} + .d2-1602067992 .background-color-AA2{background-color:#4A6FF3;} + .d2-1602067992 .background-color-AA4{background-color:#EDF0FD;} + .d2-1602067992 .background-color-AA5{background-color:#F7F8FE;} + .d2-1602067992 .background-color-AB4{background-color:#EDF0FD;} + .d2-1602067992 .background-color-AB5{background-color:#F7F8FE;} + .d2-1602067992 .color-N1{color:#0A0F25;} + .d2-1602067992 .color-N2{color:#676C7E;} + .d2-1602067992 .color-N3{color:#9499AB;} + .d2-1602067992 .color-N4{color:#CFD2DD;} + .d2-1602067992 .color-N5{color:#DEE1EB;} + .d2-1602067992 .color-N6{color:#EEF1F8;} + .d2-1602067992 .color-N7{color:#FFFFFF;} + .d2-1602067992 .color-B1{color:#0D32B2;} + .d2-1602067992 .color-B2{color:#0D32B2;} + .d2-1602067992 .color-B3{color:#E3E9FD;} + .d2-1602067992 .color-B4{color:#E3E9FD;} + .d2-1602067992 .color-B5{color:#EDF0FD;} + .d2-1602067992 .color-B6{color:#F7F8FE;} + .d2-1602067992 .color-AA2{color:#4A6FF3;} + .d2-1602067992 .color-AA4{color:#EDF0FD;} + .d2-1602067992 .color-AA5{color:#F7F8FE;} + .d2-1602067992 .color-AB4{color:#EDF0FD;} + .d2-1602067992 .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}]]>heyyaaaacccceeeeeeeeeeeeeeeeeeeyoheybbbbddddfffffffffff + - - + + + - - + + + \ No newline at end of file