From 378ee71907f964e6f7d0bdb874d97afd91c77f5c Mon Sep 17 00:00:00 2001 From: Gavin Nishizawa Date: Wed, 10 May 2023 15:24:53 -0700 Subject: [PATCH] update tests --- .../stable/grid_gap/dagre/board.exp.json | 168 ++++++++--------- .../stable/grid_gap/dagre/sketch.exp.svg | 160 ++++++++-------- .../stable/grid_gap/elk/board.exp.json | 168 ++++++++--------- .../stable/grid_gap/elk/sketch.exp.svg | 160 ++++++++-------- .../stable/grid_nested/dagre/board.exp.json | 172 +++++++++--------- .../stable/grid_nested/dagre/sketch.exp.svg | 160 ++++++++-------- .../stable/grid_nested/elk/board.exp.json | 172 +++++++++--------- .../stable/grid_nested/elk/sketch.exp.svg | 160 ++++++++-------- 8 files changed, 660 insertions(+), 660 deletions(-) diff --git a/e2etests/testdata/stable/grid_gap/dagre/board.exp.json b/e2etests/testdata/stable/grid_gap/dagre/board.exp.json index 3b198f9f0..635617683 100644 --- a/e2etests/testdata/stable/grid_gap/dagre/board.exp.json +++ b/e2etests/testdata/stable/grid_gap/dagre/board.exp.json @@ -8,10 +8,10 @@ "type": "rectangle", "pos": { "x": 0, - "y": 70 + "y": 132 }, - "width": 480, - "height": 378, + "width": 560, + "height": 334, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -48,8 +48,8 @@ "id": "vertical-gap 30 horizontal-gap 100.a", "type": "rectangle", "pos": { - "x": 60, - "y": 130 + "x": 100, + "y": 178 }, "width": 54, "height": 66, @@ -89,8 +89,8 @@ "id": "vertical-gap 30 horizontal-gap 100.b", "type": "rectangle", "pos": { - "x": 214, - "y": 130 + "x": 254, + "y": 178 }, "width": 53, "height": 66, @@ -130,8 +130,8 @@ "id": "vertical-gap 30 horizontal-gap 100.c", "type": "rectangle", "pos": { - "x": 367, - "y": 130 + "x": 407, + "y": 178 }, "width": 53, "height": 66, @@ -171,8 +171,8 @@ "id": "vertical-gap 30 horizontal-gap 100.d", "type": "rectangle", "pos": { - "x": 60, - "y": 226 + "x": 100, + "y": 274 }, "width": 54, "height": 66, @@ -212,8 +212,8 @@ "id": "vertical-gap 30 horizontal-gap 100.e", "type": "rectangle", "pos": { - "x": 214, - "y": 226 + "x": 254, + "y": 274 }, "width": 53, "height": 66, @@ -253,8 +253,8 @@ "id": "vertical-gap 30 horizontal-gap 100.f", "type": "rectangle", "pos": { - "x": 367, - "y": 226 + "x": 407, + "y": 274 }, "width": 53, "height": 66, @@ -294,8 +294,8 @@ "id": "vertical-gap 30 horizontal-gap 100.g", "type": "rectangle", "pos": { - "x": 60, - "y": 322 + "x": 100, + "y": 370 }, "width": 54, "height": 66, @@ -335,8 +335,8 @@ "id": "vertical-gap 30 horizontal-gap 100.h", "type": "rectangle", "pos": { - "x": 214, - "y": 322 + "x": 254, + "y": 370 }, "width": 53, "height": 66, @@ -376,8 +376,8 @@ "id": "vertical-gap 30 horizontal-gap 100.i", "type": "rectangle", "pos": { - "x": 367, - "y": 322 + "x": 407, + "y": 370 }, "width": 53, "height": 66, @@ -417,11 +417,11 @@ "id": "vertical-gap 100 horizontal-gap 30", "type": "rectangle", "pos": { - "x": 540, + "x": 620, "y": 0 }, "width": 408, - "height": 518, + "height": 598, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -458,8 +458,8 @@ "id": "vertical-gap 100 horizontal-gap 30.a", "type": "rectangle", "pos": { - "x": 634, - "y": 60 + "x": 714, + "y": 100 }, "width": 54, "height": 66, @@ -499,8 +499,8 @@ "id": "vertical-gap 100 horizontal-gap 30.b", "type": "rectangle", "pos": { - "x": 718, - "y": 60 + "x": 798, + "y": 100 }, "width": 53, "height": 66, @@ -540,8 +540,8 @@ "id": "vertical-gap 100 horizontal-gap 30.c", "type": "rectangle", "pos": { - "x": 801, - "y": 60 + "x": 881, + "y": 100 }, "width": 53, "height": 66, @@ -581,8 +581,8 @@ "id": "vertical-gap 100 horizontal-gap 30.d", "type": "rectangle", "pos": { - "x": 634, - "y": 226 + "x": 714, + "y": 266 }, "width": 54, "height": 66, @@ -622,8 +622,8 @@ "id": "vertical-gap 100 horizontal-gap 30.e", "type": "rectangle", "pos": { - "x": 718, - "y": 226 + "x": 798, + "y": 266 }, "width": 53, "height": 66, @@ -663,8 +663,8 @@ "id": "vertical-gap 100 horizontal-gap 30.f", "type": "rectangle", "pos": { - "x": 801, - "y": 226 + "x": 881, + "y": 266 }, "width": 53, "height": 66, @@ -704,8 +704,8 @@ "id": "vertical-gap 100 horizontal-gap 30.g", "type": "rectangle", "pos": { - "x": 634, - "y": 392 + "x": 714, + "y": 432 }, "width": 54, "height": 66, @@ -745,8 +745,8 @@ "id": "vertical-gap 100 horizontal-gap 30.h", "type": "rectangle", "pos": { - "x": 718, - "y": 392 + "x": 798, + "y": 432 }, "width": 53, "height": 66, @@ -786,8 +786,8 @@ "id": "vertical-gap 100 horizontal-gap 30.i", "type": "rectangle", "pos": { - "x": 801, - "y": 392 + "x": 881, + "y": 432 }, "width": 53, "height": 66, @@ -827,11 +827,11 @@ "id": "gap 0", "type": "rectangle", "pos": { - "x": 1008, - "y": 100 + "x": 1088, + "y": 177 }, - "width": 280, - "height": 318, + "width": 160, + "height": 244, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -868,8 +868,8 @@ "id": "gap 0.a", "type": "rectangle", "pos": { - "x": 1068, - "y": 160 + "x": 1088, + "y": 223 }, "width": 54, "height": 66, @@ -909,8 +909,8 @@ "id": "gap 0.b", "type": "rectangle", "pos": { - "x": 1122, - "y": 160 + "x": 1142, + "y": 223 }, "width": 53, "height": 66, @@ -950,8 +950,8 @@ "id": "gap 0.c", "type": "rectangle", "pos": { - "x": 1175, - "y": 160 + "x": 1195, + "y": 223 }, "width": 53, "height": 66, @@ -991,8 +991,8 @@ "id": "gap 0.d", "type": "rectangle", "pos": { - "x": 1068, - "y": 226 + "x": 1088, + "y": 289 }, "width": 54, "height": 66, @@ -1032,8 +1032,8 @@ "id": "gap 0.e", "type": "rectangle", "pos": { - "x": 1122, - "y": 226 + "x": 1142, + "y": 289 }, "width": 53, "height": 66, @@ -1073,8 +1073,8 @@ "id": "gap 0.f", "type": "rectangle", "pos": { - "x": 1175, - "y": 226 + "x": 1195, + "y": 289 }, "width": 53, "height": 66, @@ -1114,8 +1114,8 @@ "id": "gap 0.g", "type": "rectangle", "pos": { - "x": 1068, - "y": 292 + "x": 1088, + "y": 355 }, "width": 54, "height": 66, @@ -1155,8 +1155,8 @@ "id": "gap 0.h", "type": "rectangle", "pos": { - "x": 1122, - "y": 292 + "x": 1142, + "y": 355 }, "width": 53, "height": 66, @@ -1196,8 +1196,8 @@ "id": "gap 0.i", "type": "rectangle", "pos": { - "x": 1175, - "y": 292 + "x": 1195, + "y": 355 }, "width": 53, "height": 66, @@ -1237,11 +1237,11 @@ "id": "gap 10 vertical-gap 100", "type": "rectangle", "pos": { - "x": 1348, + "x": 1308, "y": 0 }, - "width": 300, - "height": 518, + "width": 278, + "height": 598, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1278,8 +1278,8 @@ "id": "gap 10 vertical-gap 100.a", "type": "rectangle", "pos": { - "x": 1408, - "y": 60 + "x": 1357, + "y": 100 }, "width": 54, "height": 66, @@ -1319,8 +1319,8 @@ "id": "gap 10 vertical-gap 100.b", "type": "rectangle", "pos": { - "x": 1472, - "y": 60 + "x": 1421, + "y": 100 }, "width": 53, "height": 66, @@ -1360,8 +1360,8 @@ "id": "gap 10 vertical-gap 100.c", "type": "rectangle", "pos": { - "x": 1535, - "y": 60 + "x": 1484, + "y": 100 }, "width": 53, "height": 66, @@ -1401,8 +1401,8 @@ "id": "gap 10 vertical-gap 100.d", "type": "rectangle", "pos": { - "x": 1408, - "y": 226 + "x": 1357, + "y": 266 }, "width": 54, "height": 66, @@ -1442,8 +1442,8 @@ "id": "gap 10 vertical-gap 100.e", "type": "rectangle", "pos": { - "x": 1472, - "y": 226 + "x": 1421, + "y": 266 }, "width": 53, "height": 66, @@ -1483,8 +1483,8 @@ "id": "gap 10 vertical-gap 100.f", "type": "rectangle", "pos": { - "x": 1535, - "y": 226 + "x": 1484, + "y": 266 }, "width": 53, "height": 66, @@ -1524,8 +1524,8 @@ "id": "gap 10 vertical-gap 100.g", "type": "rectangle", "pos": { - "x": 1408, - "y": 392 + "x": 1357, + "y": 432 }, "width": 54, "height": 66, @@ -1565,8 +1565,8 @@ "id": "gap 10 vertical-gap 100.h", "type": "rectangle", "pos": { - "x": 1472, - "y": 392 + "x": 1421, + "y": 432 }, "width": 53, "height": 66, @@ -1606,8 +1606,8 @@ "id": "gap 10 vertical-gap 100.i", "type": "rectangle", "pos": { - "x": 1535, - "y": 392 + "x": 1484, + "y": 432 }, "width": 53, "height": 66, diff --git a/e2etests/testdata/stable/grid_gap/dagre/sketch.exp.svg b/e2etests/testdata/stable/grid_gap/dagre/sketch.exp.svg index 1fca800b5..b59a3f102 100644 --- a/e2etests/testdata/stable/grid_gap/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/grid_gap/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -vertical-gap 30 horizontal-gap 100vertical-gap 100 horizontal-gap 30gap 0gap 10 vertical-gap 100abcdefghiabcdefghiabcdefghiabcdefghi - + .d2-1828154335 .fill-N1{fill:#0A0F25;} + .d2-1828154335 .fill-N2{fill:#676C7E;} + .d2-1828154335 .fill-N3{fill:#9499AB;} + .d2-1828154335 .fill-N4{fill:#CFD2DD;} + .d2-1828154335 .fill-N5{fill:#DEE1EB;} + .d2-1828154335 .fill-N6{fill:#EEF1F8;} + .d2-1828154335 .fill-N7{fill:#FFFFFF;} + .d2-1828154335 .fill-B1{fill:#0D32B2;} + .d2-1828154335 .fill-B2{fill:#0D32B2;} + .d2-1828154335 .fill-B3{fill:#E3E9FD;} + .d2-1828154335 .fill-B4{fill:#E3E9FD;} + .d2-1828154335 .fill-B5{fill:#EDF0FD;} + .d2-1828154335 .fill-B6{fill:#F7F8FE;} + .d2-1828154335 .fill-AA2{fill:#4A6FF3;} + .d2-1828154335 .fill-AA4{fill:#EDF0FD;} + .d2-1828154335 .fill-AA5{fill:#F7F8FE;} + .d2-1828154335 .fill-AB4{fill:#EDF0FD;} + .d2-1828154335 .fill-AB5{fill:#F7F8FE;} + .d2-1828154335 .stroke-N1{stroke:#0A0F25;} + .d2-1828154335 .stroke-N2{stroke:#676C7E;} + .d2-1828154335 .stroke-N3{stroke:#9499AB;} + .d2-1828154335 .stroke-N4{stroke:#CFD2DD;} + .d2-1828154335 .stroke-N5{stroke:#DEE1EB;} + .d2-1828154335 .stroke-N6{stroke:#EEF1F8;} + .d2-1828154335 .stroke-N7{stroke:#FFFFFF;} + .d2-1828154335 .stroke-B1{stroke:#0D32B2;} + .d2-1828154335 .stroke-B2{stroke:#0D32B2;} + .d2-1828154335 .stroke-B3{stroke:#E3E9FD;} + .d2-1828154335 .stroke-B4{stroke:#E3E9FD;} + .d2-1828154335 .stroke-B5{stroke:#EDF0FD;} + .d2-1828154335 .stroke-B6{stroke:#F7F8FE;} + .d2-1828154335 .stroke-AA2{stroke:#4A6FF3;} + .d2-1828154335 .stroke-AA4{stroke:#EDF0FD;} + .d2-1828154335 .stroke-AA5{stroke:#F7F8FE;} + .d2-1828154335 .stroke-AB4{stroke:#EDF0FD;} + .d2-1828154335 .stroke-AB5{stroke:#F7F8FE;} + .d2-1828154335 .background-color-N1{background-color:#0A0F25;} + .d2-1828154335 .background-color-N2{background-color:#676C7E;} + .d2-1828154335 .background-color-N3{background-color:#9499AB;} + .d2-1828154335 .background-color-N4{background-color:#CFD2DD;} + .d2-1828154335 .background-color-N5{background-color:#DEE1EB;} + .d2-1828154335 .background-color-N6{background-color:#EEF1F8;} + .d2-1828154335 .background-color-N7{background-color:#FFFFFF;} + .d2-1828154335 .background-color-B1{background-color:#0D32B2;} + .d2-1828154335 .background-color-B2{background-color:#0D32B2;} + .d2-1828154335 .background-color-B3{background-color:#E3E9FD;} + .d2-1828154335 .background-color-B4{background-color:#E3E9FD;} + .d2-1828154335 .background-color-B5{background-color:#EDF0FD;} + .d2-1828154335 .background-color-B6{background-color:#F7F8FE;} + .d2-1828154335 .background-color-AA2{background-color:#4A6FF3;} + .d2-1828154335 .background-color-AA4{background-color:#EDF0FD;} + .d2-1828154335 .background-color-AA5{background-color:#F7F8FE;} + .d2-1828154335 .background-color-AB4{background-color:#EDF0FD;} + .d2-1828154335 .background-color-AB5{background-color:#F7F8FE;} + .d2-1828154335 .color-N1{color:#0A0F25;} + .d2-1828154335 .color-N2{color:#676C7E;} + .d2-1828154335 .color-N3{color:#9499AB;} + .d2-1828154335 .color-N4{color:#CFD2DD;} + .d2-1828154335 .color-N5{color:#DEE1EB;} + .d2-1828154335 .color-N6{color:#EEF1F8;} + .d2-1828154335 .color-N7{color:#FFFFFF;} + .d2-1828154335 .color-B1{color:#0D32B2;} + .d2-1828154335 .color-B2{color:#0D32B2;} + .d2-1828154335 .color-B3{color:#E3E9FD;} + .d2-1828154335 .color-B4{color:#E3E9FD;} + .d2-1828154335 .color-B5{color:#EDF0FD;} + .d2-1828154335 .color-B6{color:#F7F8FE;} + .d2-1828154335 .color-AA2{color:#4A6FF3;} + .d2-1828154335 .color-AA4{color:#EDF0FD;} + .d2-1828154335 .color-AA5{color:#F7F8FE;} + .d2-1828154335 .color-AB4{color:#EDF0FD;} + .d2-1828154335 .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}]]>vertical-gap 30 horizontal-gap 100vertical-gap 100 horizontal-gap 30gap 0gap 10 vertical-gap 100abcdefghiabcdefghiabcdefghiabcdefghi + \ No newline at end of file diff --git a/e2etests/testdata/stable/grid_gap/elk/board.exp.json b/e2etests/testdata/stable/grid_gap/elk/board.exp.json index 97349cc99..74816850f 100644 --- a/e2etests/testdata/stable/grid_gap/elk/board.exp.json +++ b/e2etests/testdata/stable/grid_gap/elk/board.exp.json @@ -8,10 +8,10 @@ "type": "rectangle", "pos": { "x": 12, - "y": 82 + "y": 144 }, - "width": 480, - "height": 378, + "width": 560, + "height": 334, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -48,8 +48,8 @@ "id": "vertical-gap 30 horizontal-gap 100.a", "type": "rectangle", "pos": { - "x": 72, - "y": 142 + "x": 112, + "y": 190 }, "width": 54, "height": 66, @@ -89,8 +89,8 @@ "id": "vertical-gap 30 horizontal-gap 100.b", "type": "rectangle", "pos": { - "x": 226, - "y": 142 + "x": 266, + "y": 190 }, "width": 53, "height": 66, @@ -130,8 +130,8 @@ "id": "vertical-gap 30 horizontal-gap 100.c", "type": "rectangle", "pos": { - "x": 379, - "y": 142 + "x": 419, + "y": 190 }, "width": 53, "height": 66, @@ -171,8 +171,8 @@ "id": "vertical-gap 30 horizontal-gap 100.d", "type": "rectangle", "pos": { - "x": 72, - "y": 238 + "x": 112, + "y": 286 }, "width": 54, "height": 66, @@ -212,8 +212,8 @@ "id": "vertical-gap 30 horizontal-gap 100.e", "type": "rectangle", "pos": { - "x": 226, - "y": 238 + "x": 266, + "y": 286 }, "width": 53, "height": 66, @@ -253,8 +253,8 @@ "id": "vertical-gap 30 horizontal-gap 100.f", "type": "rectangle", "pos": { - "x": 379, - "y": 238 + "x": 419, + "y": 286 }, "width": 53, "height": 66, @@ -294,8 +294,8 @@ "id": "vertical-gap 30 horizontal-gap 100.g", "type": "rectangle", "pos": { - "x": 72, - "y": 334 + "x": 112, + "y": 382 }, "width": 54, "height": 66, @@ -335,8 +335,8 @@ "id": "vertical-gap 30 horizontal-gap 100.h", "type": "rectangle", "pos": { - "x": 226, - "y": 334 + "x": 266, + "y": 382 }, "width": 53, "height": 66, @@ -376,8 +376,8 @@ "id": "vertical-gap 30 horizontal-gap 100.i", "type": "rectangle", "pos": { - "x": 379, - "y": 334 + "x": 419, + "y": 382 }, "width": 53, "height": 66, @@ -417,11 +417,11 @@ "id": "vertical-gap 100 horizontal-gap 30", "type": "rectangle", "pos": { - "x": 512, + "x": 592, "y": 12 }, "width": 408, - "height": 518, + "height": 598, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -458,8 +458,8 @@ "id": "vertical-gap 100 horizontal-gap 30.a", "type": "rectangle", "pos": { - "x": 606, - "y": 72 + "x": 686, + "y": 112 }, "width": 54, "height": 66, @@ -499,8 +499,8 @@ "id": "vertical-gap 100 horizontal-gap 30.b", "type": "rectangle", "pos": { - "x": 690, - "y": 72 + "x": 770, + "y": 112 }, "width": 53, "height": 66, @@ -540,8 +540,8 @@ "id": "vertical-gap 100 horizontal-gap 30.c", "type": "rectangle", "pos": { - "x": 773, - "y": 72 + "x": 853, + "y": 112 }, "width": 53, "height": 66, @@ -581,8 +581,8 @@ "id": "vertical-gap 100 horizontal-gap 30.d", "type": "rectangle", "pos": { - "x": 606, - "y": 238 + "x": 686, + "y": 278 }, "width": 54, "height": 66, @@ -622,8 +622,8 @@ "id": "vertical-gap 100 horizontal-gap 30.e", "type": "rectangle", "pos": { - "x": 690, - "y": 238 + "x": 770, + "y": 278 }, "width": 53, "height": 66, @@ -663,8 +663,8 @@ "id": "vertical-gap 100 horizontal-gap 30.f", "type": "rectangle", "pos": { - "x": 773, - "y": 238 + "x": 853, + "y": 278 }, "width": 53, "height": 66, @@ -704,8 +704,8 @@ "id": "vertical-gap 100 horizontal-gap 30.g", "type": "rectangle", "pos": { - "x": 606, - "y": 404 + "x": 686, + "y": 444 }, "width": 54, "height": 66, @@ -745,8 +745,8 @@ "id": "vertical-gap 100 horizontal-gap 30.h", "type": "rectangle", "pos": { - "x": 690, - "y": 404 + "x": 770, + "y": 444 }, "width": 53, "height": 66, @@ -786,8 +786,8 @@ "id": "vertical-gap 100 horizontal-gap 30.i", "type": "rectangle", "pos": { - "x": 773, - "y": 404 + "x": 853, + "y": 444 }, "width": 53, "height": 66, @@ -827,11 +827,11 @@ "id": "gap 0", "type": "rectangle", "pos": { - "x": 940, - "y": 112 + "x": 1020, + "y": 189 }, - "width": 280, - "height": 318, + "width": 160, + "height": 244, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -868,8 +868,8 @@ "id": "gap 0.a", "type": "rectangle", "pos": { - "x": 1000, - "y": 172 + "x": 1020, + "y": 235 }, "width": 54, "height": 66, @@ -909,8 +909,8 @@ "id": "gap 0.b", "type": "rectangle", "pos": { - "x": 1054, - "y": 172 + "x": 1074, + "y": 235 }, "width": 53, "height": 66, @@ -950,8 +950,8 @@ "id": "gap 0.c", "type": "rectangle", "pos": { - "x": 1107, - "y": 172 + "x": 1127, + "y": 235 }, "width": 53, "height": 66, @@ -991,8 +991,8 @@ "id": "gap 0.d", "type": "rectangle", "pos": { - "x": 1000, - "y": 238 + "x": 1020, + "y": 301 }, "width": 54, "height": 66, @@ -1032,8 +1032,8 @@ "id": "gap 0.e", "type": "rectangle", "pos": { - "x": 1054, - "y": 238 + "x": 1074, + "y": 301 }, "width": 53, "height": 66, @@ -1073,8 +1073,8 @@ "id": "gap 0.f", "type": "rectangle", "pos": { - "x": 1107, - "y": 238 + "x": 1127, + "y": 301 }, "width": 53, "height": 66, @@ -1114,8 +1114,8 @@ "id": "gap 0.g", "type": "rectangle", "pos": { - "x": 1000, - "y": 304 + "x": 1020, + "y": 367 }, "width": 54, "height": 66, @@ -1155,8 +1155,8 @@ "id": "gap 0.h", "type": "rectangle", "pos": { - "x": 1054, - "y": 304 + "x": 1074, + "y": 367 }, "width": 53, "height": 66, @@ -1196,8 +1196,8 @@ "id": "gap 0.i", "type": "rectangle", "pos": { - "x": 1107, - "y": 304 + "x": 1127, + "y": 367 }, "width": 53, "height": 66, @@ -1237,11 +1237,11 @@ "id": "gap 10 vertical-gap 100", "type": "rectangle", "pos": { - "x": 1240, + "x": 1200, "y": 12 }, - "width": 300, - "height": 518, + "width": 278, + "height": 598, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1278,8 +1278,8 @@ "id": "gap 10 vertical-gap 100.a", "type": "rectangle", "pos": { - "x": 1300, - "y": 72 + "x": 1249, + "y": 112 }, "width": 54, "height": 66, @@ -1319,8 +1319,8 @@ "id": "gap 10 vertical-gap 100.b", "type": "rectangle", "pos": { - "x": 1364, - "y": 72 + "x": 1313, + "y": 112 }, "width": 53, "height": 66, @@ -1360,8 +1360,8 @@ "id": "gap 10 vertical-gap 100.c", "type": "rectangle", "pos": { - "x": 1427, - "y": 72 + "x": 1376, + "y": 112 }, "width": 53, "height": 66, @@ -1401,8 +1401,8 @@ "id": "gap 10 vertical-gap 100.d", "type": "rectangle", "pos": { - "x": 1300, - "y": 238 + "x": 1249, + "y": 278 }, "width": 54, "height": 66, @@ -1442,8 +1442,8 @@ "id": "gap 10 vertical-gap 100.e", "type": "rectangle", "pos": { - "x": 1364, - "y": 238 + "x": 1313, + "y": 278 }, "width": 53, "height": 66, @@ -1483,8 +1483,8 @@ "id": "gap 10 vertical-gap 100.f", "type": "rectangle", "pos": { - "x": 1427, - "y": 238 + "x": 1376, + "y": 278 }, "width": 53, "height": 66, @@ -1524,8 +1524,8 @@ "id": "gap 10 vertical-gap 100.g", "type": "rectangle", "pos": { - "x": 1300, - "y": 404 + "x": 1249, + "y": 444 }, "width": 54, "height": 66, @@ -1565,8 +1565,8 @@ "id": "gap 10 vertical-gap 100.h", "type": "rectangle", "pos": { - "x": 1364, - "y": 404 + "x": 1313, + "y": 444 }, "width": 53, "height": 66, @@ -1606,8 +1606,8 @@ "id": "gap 10 vertical-gap 100.i", "type": "rectangle", "pos": { - "x": 1427, - "y": 404 + "x": 1376, + "y": 444 }, "width": 53, "height": 66, diff --git a/e2etests/testdata/stable/grid_gap/elk/sketch.exp.svg b/e2etests/testdata/stable/grid_gap/elk/sketch.exp.svg index 1fe9003c7..4339e2344 100644 --- a/e2etests/testdata/stable/grid_gap/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/grid_gap/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -vertical-gap 30 horizontal-gap 100vertical-gap 100 horizontal-gap 30gap 0gap 10 vertical-gap 100abcdefghiabcdefghiabcdefghiabcdefghi - + .d2-2169342647 .fill-N1{fill:#0A0F25;} + .d2-2169342647 .fill-N2{fill:#676C7E;} + .d2-2169342647 .fill-N3{fill:#9499AB;} + .d2-2169342647 .fill-N4{fill:#CFD2DD;} + .d2-2169342647 .fill-N5{fill:#DEE1EB;} + .d2-2169342647 .fill-N6{fill:#EEF1F8;} + .d2-2169342647 .fill-N7{fill:#FFFFFF;} + .d2-2169342647 .fill-B1{fill:#0D32B2;} + .d2-2169342647 .fill-B2{fill:#0D32B2;} + .d2-2169342647 .fill-B3{fill:#E3E9FD;} + .d2-2169342647 .fill-B4{fill:#E3E9FD;} + .d2-2169342647 .fill-B5{fill:#EDF0FD;} + .d2-2169342647 .fill-B6{fill:#F7F8FE;} + .d2-2169342647 .fill-AA2{fill:#4A6FF3;} + .d2-2169342647 .fill-AA4{fill:#EDF0FD;} + .d2-2169342647 .fill-AA5{fill:#F7F8FE;} + .d2-2169342647 .fill-AB4{fill:#EDF0FD;} + .d2-2169342647 .fill-AB5{fill:#F7F8FE;} + .d2-2169342647 .stroke-N1{stroke:#0A0F25;} + .d2-2169342647 .stroke-N2{stroke:#676C7E;} + .d2-2169342647 .stroke-N3{stroke:#9499AB;} + .d2-2169342647 .stroke-N4{stroke:#CFD2DD;} + .d2-2169342647 .stroke-N5{stroke:#DEE1EB;} + .d2-2169342647 .stroke-N6{stroke:#EEF1F8;} + .d2-2169342647 .stroke-N7{stroke:#FFFFFF;} + .d2-2169342647 .stroke-B1{stroke:#0D32B2;} + .d2-2169342647 .stroke-B2{stroke:#0D32B2;} + .d2-2169342647 .stroke-B3{stroke:#E3E9FD;} + .d2-2169342647 .stroke-B4{stroke:#E3E9FD;} + .d2-2169342647 .stroke-B5{stroke:#EDF0FD;} + .d2-2169342647 .stroke-B6{stroke:#F7F8FE;} + .d2-2169342647 .stroke-AA2{stroke:#4A6FF3;} + .d2-2169342647 .stroke-AA4{stroke:#EDF0FD;} + .d2-2169342647 .stroke-AA5{stroke:#F7F8FE;} + .d2-2169342647 .stroke-AB4{stroke:#EDF0FD;} + .d2-2169342647 .stroke-AB5{stroke:#F7F8FE;} + .d2-2169342647 .background-color-N1{background-color:#0A0F25;} + .d2-2169342647 .background-color-N2{background-color:#676C7E;} + .d2-2169342647 .background-color-N3{background-color:#9499AB;} + .d2-2169342647 .background-color-N4{background-color:#CFD2DD;} + .d2-2169342647 .background-color-N5{background-color:#DEE1EB;} + .d2-2169342647 .background-color-N6{background-color:#EEF1F8;} + .d2-2169342647 .background-color-N7{background-color:#FFFFFF;} + .d2-2169342647 .background-color-B1{background-color:#0D32B2;} + .d2-2169342647 .background-color-B2{background-color:#0D32B2;} + .d2-2169342647 .background-color-B3{background-color:#E3E9FD;} + .d2-2169342647 .background-color-B4{background-color:#E3E9FD;} + .d2-2169342647 .background-color-B5{background-color:#EDF0FD;} + .d2-2169342647 .background-color-B6{background-color:#F7F8FE;} + .d2-2169342647 .background-color-AA2{background-color:#4A6FF3;} + .d2-2169342647 .background-color-AA4{background-color:#EDF0FD;} + .d2-2169342647 .background-color-AA5{background-color:#F7F8FE;} + .d2-2169342647 .background-color-AB4{background-color:#EDF0FD;} + .d2-2169342647 .background-color-AB5{background-color:#F7F8FE;} + .d2-2169342647 .color-N1{color:#0A0F25;} + .d2-2169342647 .color-N2{color:#676C7E;} + .d2-2169342647 .color-N3{color:#9499AB;} + .d2-2169342647 .color-N4{color:#CFD2DD;} + .d2-2169342647 .color-N5{color:#DEE1EB;} + .d2-2169342647 .color-N6{color:#EEF1F8;} + .d2-2169342647 .color-N7{color:#FFFFFF;} + .d2-2169342647 .color-B1{color:#0D32B2;} + .d2-2169342647 .color-B2{color:#0D32B2;} + .d2-2169342647 .color-B3{color:#E3E9FD;} + .d2-2169342647 .color-B4{color:#E3E9FD;} + .d2-2169342647 .color-B5{color:#EDF0FD;} + .d2-2169342647 .color-B6{color:#F7F8FE;} + .d2-2169342647 .color-AA2{color:#4A6FF3;} + .d2-2169342647 .color-AA4{color:#EDF0FD;} + .d2-2169342647 .color-AA5{color:#F7F8FE;} + .d2-2169342647 .color-AB4{color:#EDF0FD;} + .d2-2169342647 .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}]]>vertical-gap 30 horizontal-gap 100vertical-gap 100 horizontal-gap 30gap 0gap 10 vertical-gap 100abcdefghiabcdefghiabcdefghiabcdefghi + \ 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 253741371..7a47434c9 100644 --- a/e2etests/testdata/stable/grid_nested/dagre/board.exp.json +++ b/e2etests/testdata/stable/grid_nested/dagre/board.exp.json @@ -11,7 +11,7 @@ ], "pos": { "x": 0, - "y": 320 + "y": 150 }, "width": 384, "height": 356, @@ -52,7 +52,7 @@ "type": "rectangle", "pos": { "x": 60, - "y": 380 + "y": 210 }, "width": 53, "height": 130, @@ -93,7 +93,7 @@ "type": "rectangle", "pos": { "x": 153, - "y": 380 + "y": 210 }, "width": 171, "height": 130, @@ -134,7 +134,7 @@ "type": "rectangle", "pos": { "x": 193, - "y": 412 + "y": 242 }, "width": 91, "height": 66, @@ -175,7 +175,7 @@ "type": "rectangle", "pos": { "x": 60, - "y": 550 + "y": 380 }, "width": 53, "height": 66, @@ -216,7 +216,7 @@ "type": "rectangle", "pos": { "x": 153, - "y": 550 + "y": 380 }, "width": 171, "height": 66, @@ -260,7 +260,7 @@ ], "pos": { "x": 444, - "y": 170 + "y": 0 }, "width": 692, "height": 656, @@ -301,7 +301,7 @@ "type": "rectangle", "pos": { "x": 504, - "y": 230 + "y": 60 }, "width": 53, "height": 430, @@ -342,7 +342,7 @@ "type": "rectangle", "pos": { "x": 597, - "y": 230 + "y": 60 }, "width": 479, "height": 430, @@ -383,7 +383,7 @@ "type": "rectangle", "pos": { "x": 617, - "y": 293 + "y": 123 }, "width": 439, "height": 335, @@ -424,7 +424,7 @@ "type": "rectangle", "pos": { "x": 637, - "y": 353 + "y": 183 }, "width": 186, "height": 240, @@ -465,7 +465,7 @@ "type": "rectangle", "pos": { "x": 657, - "y": 416 + "y": 246 }, "width": 146, "height": 140, @@ -506,7 +506,7 @@ "type": "rectangle", "pos": { "x": 697, - "y": 453 + "y": 283 }, "width": 66, "height": 66, @@ -547,7 +547,7 @@ "type": "rectangle", "pos": { "x": 843, - "y": 353 + "y": 183 }, "width": 193, "height": 240, @@ -588,7 +588,7 @@ "type": "rectangle", "pos": { "x": 863, - "y": 416 + "y": 246 }, "width": 153, "height": 140, @@ -629,7 +629,7 @@ "type": "rectangle", "pos": { "x": 903, - "y": 453 + "y": 283 }, "width": 73, "height": 66, @@ -670,7 +670,7 @@ "type": "rectangle", "pos": { "x": 504, - "y": 700 + "y": 530 }, "width": 53, "height": 66, @@ -711,7 +711,7 @@ "type": "rectangle", "pos": { "x": 597, - "y": 700 + "y": 530 }, "width": 479, "height": 66, @@ -755,7 +755,7 @@ ], "pos": { "x": 1196, - "y": 239 + "y": 69 }, "width": 480, "height": 518, @@ -796,7 +796,7 @@ "type": "rectangle", "pos": { "x": 1256, - "y": 299 + "y": 129 }, "width": 53, "height": 292, @@ -840,7 +840,7 @@ ], "pos": { "x": 1349, - "y": 299 + "y": 129 }, "width": 267, "height": 292, @@ -881,7 +881,7 @@ "type": "rectangle", "pos": { "x": 1409, - "y": 359 + "y": 189 }, "width": 53, "height": 66, @@ -922,7 +922,7 @@ "type": "rectangle", "pos": { "x": 1502, - "y": 359 + "y": 189 }, "width": 54, "height": 66, @@ -963,7 +963,7 @@ "type": "rectangle", "pos": { "x": 1409, - "y": 465 + "y": 295 }, "width": 53, "height": 66, @@ -1004,7 +1004,7 @@ "type": "rectangle", "pos": { "x": 1502, - "y": 465 + "y": 295 }, "width": 54, "height": 66, @@ -1045,7 +1045,7 @@ "type": "rectangle", "pos": { "x": 1256, - "y": 631 + "y": 461 }, "width": 53, "height": 66, @@ -1086,7 +1086,7 @@ "type": "rectangle", "pos": { "x": 1349, - "y": 631 + "y": 461 }, "width": 267, "height": 66, @@ -1127,10 +1127,10 @@ "type": "rectangle", "pos": { "x": 1736, - "y": 0 + "y": 38 }, - "width": 921, - "height": 996, + "width": 321, + "height": 581, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1167,11 +1167,11 @@ "id": "grid w/ grid w/ grid.a", "type": "rectangle", "pos": { - "x": 1796, - "y": 60 + "x": 1736, + "y": 84 }, "width": 53, - "height": 810, + "height": 469, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1208,11 +1208,11 @@ "id": "grid w/ grid w/ grid.b", "type": "rectangle", "pos": { - "x": 1849, - "y": 60 + "x": 1789, + "y": 84 }, - "width": 748, - "height": 810, + "width": 268, + "height": 469, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1249,10 +1249,10 @@ "id": "grid w/ grid w/ grid.b.a", "type": "rectangle", "pos": { - "x": 1909, - "y": 120 + "x": 1789, + "y": 125 }, - "width": 574, + "width": 214, "height": 66, "opacity": 1, "strokeDash": 0, @@ -1290,8 +1290,8 @@ "id": "grid w/ grid w/ grid.b.b", "type": "rectangle", "pos": { - "x": 2483, - "y": 120 + "x": 2003, + "y": 125 }, "width": 54, "height": 66, @@ -1331,11 +1331,11 @@ "id": "grid w/ grid w/ grid.b.c", "type": "rectangle", "pos": { - "x": 1909, - "y": 186 + "x": 1789, + "y": 191 }, - "width": 574, - "height": 624, + "width": 214, + "height": 362, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1372,8 +1372,8 @@ "id": "grid w/ grid w/ grid.b.c.a", "type": "rectangle", "pos": { - "x": 1969, - "y": 246 + "x": 1789, + "y": 227 }, "width": 53, "height": 66, @@ -1413,10 +1413,10 @@ "id": "grid w/ grid w/ grid.b.c.b", "type": "rectangle", "pos": { - "x": 2022, - "y": 246 + "x": 1842, + "y": 227 }, - "width": 401, + "width": 161, "height": 66, "opacity": 1, "strokeDash": 0, @@ -1454,11 +1454,11 @@ "id": "grid w/ grid w/ grid.b.c.c", "type": "rectangle", "pos": { - "x": 1969, - "y": 312 + "x": 1789, + "y": 293 }, "width": 53, - "height": 438, + "height": 260, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1495,11 +1495,11 @@ "id": "grid w/ grid w/ grid.b.c.d", "type": "rectangle", "pos": { - "x": 2022, - "y": 312 + "x": 1842, + "y": 293 }, - "width": 401, - "height": 438, + "width": 161, + "height": 260, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1536,11 +1536,11 @@ "id": "grid w/ grid w/ grid.b.c.d.a", "type": "rectangle", "pos": { - "x": 2082, - "y": 372 + "x": 1842, + "y": 324 }, - "width": 227, - "height": 252, + "width": 107, + "height": 163, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1577,8 +1577,8 @@ "id": "grid w/ grid w/ grid.b.c.d.a.a", "type": "rectangle", "pos": { - "x": 2142, - "y": 432 + "x": 1842, + "y": 355 }, "width": 53, "height": 66, @@ -1618,8 +1618,8 @@ "id": "grid w/ grid w/ grid.b.c.d.a.b", "type": "rectangle", "pos": { - "x": 2195, - "y": 432 + "x": 1895, + "y": 355 }, "width": 54, "height": 66, @@ -1659,8 +1659,8 @@ "id": "grid w/ grid w/ grid.b.c.d.a.c", "type": "rectangle", "pos": { - "x": 2142, - "y": 498 + "x": 1842, + "y": 421 }, "width": 53, "height": 66, @@ -1700,8 +1700,8 @@ "id": "grid w/ grid w/ grid.b.c.d.a.d", "type": "rectangle", "pos": { - "x": 2195, - "y": 498 + "x": 1895, + "y": 421 }, "width": 54, "height": 66, @@ -1741,11 +1741,11 @@ "id": "grid w/ grid w/ grid.b.c.d.b", "type": "rectangle", "pos": { - "x": 2309, - "y": 372 + "x": 1949, + "y": 324 }, "width": 54, - "height": 252, + "height": 163, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1782,10 +1782,10 @@ "id": "grid w/ grid w/ grid.b.c.d.c", "type": "rectangle", "pos": { - "x": 2082, - "y": 624 + "x": 1842, + "y": 487 }, - "width": 227, + "width": 107, "height": 66, "opacity": 1, "strokeDash": 0, @@ -1823,8 +1823,8 @@ "id": "grid w/ grid w/ grid.b.c.d.d", "type": "rectangle", "pos": { - "x": 2309, - "y": 624 + "x": 1949, + "y": 487 }, "width": 54, "height": 66, @@ -1864,11 +1864,11 @@ "id": "grid w/ grid w/ grid.b.d", "type": "rectangle", "pos": { - "x": 2483, - "y": 186 + "x": 2003, + "y": 191 }, "width": 54, - "height": 624, + "height": 362, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1905,8 +1905,8 @@ "id": "grid w/ grid w/ grid.c", "type": "rectangle", "pos": { - "x": 1796, - "y": 870 + "x": 1736, + "y": 553 }, "width": 53, "height": 66, @@ -1946,10 +1946,10 @@ "id": "grid w/ grid w/ grid.d", "type": "rectangle", "pos": { - "x": 1849, - "y": 870 + "x": 1789, + "y": 553 }, - "width": 748, + "width": 268, "height": 66, "opacity": 1, "strokeDash": 0, diff --git a/e2etests/testdata/stable/grid_nested/dagre/sketch.exp.svg b/e2etests/testdata/stable/grid_nested/dagre/sketch.exp.svg index 0e7af994b..136a16b78 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-3889971613 .fill-N1{fill:#0A0F25;} + .d2-3889971613 .fill-N2{fill:#676C7E;} + .d2-3889971613 .fill-N3{fill:#9499AB;} + .d2-3889971613 .fill-N4{fill:#CFD2DD;} + .d2-3889971613 .fill-N5{fill:#DEE1EB;} + .d2-3889971613 .fill-N6{fill:#EEF1F8;} + .d2-3889971613 .fill-N7{fill:#FFFFFF;} + .d2-3889971613 .fill-B1{fill:#0D32B2;} + .d2-3889971613 .fill-B2{fill:#0D32B2;} + .d2-3889971613 .fill-B3{fill:#E3E9FD;} + .d2-3889971613 .fill-B4{fill:#E3E9FD;} + .d2-3889971613 .fill-B5{fill:#EDF0FD;} + .d2-3889971613 .fill-B6{fill:#F7F8FE;} + .d2-3889971613 .fill-AA2{fill:#4A6FF3;} + .d2-3889971613 .fill-AA4{fill:#EDF0FD;} + .d2-3889971613 .fill-AA5{fill:#F7F8FE;} + .d2-3889971613 .fill-AB4{fill:#EDF0FD;} + .d2-3889971613 .fill-AB5{fill:#F7F8FE;} + .d2-3889971613 .stroke-N1{stroke:#0A0F25;} + .d2-3889971613 .stroke-N2{stroke:#676C7E;} + .d2-3889971613 .stroke-N3{stroke:#9499AB;} + .d2-3889971613 .stroke-N4{stroke:#CFD2DD;} + .d2-3889971613 .stroke-N5{stroke:#DEE1EB;} + .d2-3889971613 .stroke-N6{stroke:#EEF1F8;} + .d2-3889971613 .stroke-N7{stroke:#FFFFFF;} + .d2-3889971613 .stroke-B1{stroke:#0D32B2;} + .d2-3889971613 .stroke-B2{stroke:#0D32B2;} + .d2-3889971613 .stroke-B3{stroke:#E3E9FD;} + .d2-3889971613 .stroke-B4{stroke:#E3E9FD;} + .d2-3889971613 .stroke-B5{stroke:#EDF0FD;} + .d2-3889971613 .stroke-B6{stroke:#F7F8FE;} + .d2-3889971613 .stroke-AA2{stroke:#4A6FF3;} + .d2-3889971613 .stroke-AA4{stroke:#EDF0FD;} + .d2-3889971613 .stroke-AA5{stroke:#F7F8FE;} + .d2-3889971613 .stroke-AB4{stroke:#EDF0FD;} + .d2-3889971613 .stroke-AB5{stroke:#F7F8FE;} + .d2-3889971613 .background-color-N1{background-color:#0A0F25;} + .d2-3889971613 .background-color-N2{background-color:#676C7E;} + .d2-3889971613 .background-color-N3{background-color:#9499AB;} + .d2-3889971613 .background-color-N4{background-color:#CFD2DD;} + .d2-3889971613 .background-color-N5{background-color:#DEE1EB;} + .d2-3889971613 .background-color-N6{background-color:#EEF1F8;} + .d2-3889971613 .background-color-N7{background-color:#FFFFFF;} + .d2-3889971613 .background-color-B1{background-color:#0D32B2;} + .d2-3889971613 .background-color-B2{background-color:#0D32B2;} + .d2-3889971613 .background-color-B3{background-color:#E3E9FD;} + .d2-3889971613 .background-color-B4{background-color:#E3E9FD;} + .d2-3889971613 .background-color-B5{background-color:#EDF0FD;} + .d2-3889971613 .background-color-B6{background-color:#F7F8FE;} + .d2-3889971613 .background-color-AA2{background-color:#4A6FF3;} + .d2-3889971613 .background-color-AA4{background-color:#EDF0FD;} + .d2-3889971613 .background-color-AA5{background-color:#F7F8FE;} + .d2-3889971613 .background-color-AB4{background-color:#EDF0FD;} + .d2-3889971613 .background-color-AB5{background-color:#F7F8FE;} + .d2-3889971613 .color-N1{color:#0A0F25;} + .d2-3889971613 .color-N2{color:#676C7E;} + .d2-3889971613 .color-N3{color:#9499AB;} + .d2-3889971613 .color-N4{color:#CFD2DD;} + .d2-3889971613 .color-N5{color:#DEE1EB;} + .d2-3889971613 .color-N6{color:#EEF1F8;} + .d2-3889971613 .color-N7{color:#FFFFFF;} + .d2-3889971613 .color-B1{color:#0D32B2;} + .d2-3889971613 .color-B2{color:#0D32B2;} + .d2-3889971613 .color-B3{color:#E3E9FD;} + .d2-3889971613 .color-B4{color:#E3E9FD;} + .d2-3889971613 .color-B5{color:#EDF0FD;} + .d2-3889971613 .color-B6{color:#F7F8FE;} + .d2-3889971613 .color-AA2{color:#4A6FF3;} + .d2-3889971613 .color-AA4{color:#EDF0FD;} + .d2-3889971613 .color-AA5{color:#F7F8FE;} + .d2-3889971613 .color-AB4{color:#EDF0FD;} + .d2-3889971613 .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/grid_nested/elk/board.exp.json b/e2etests/testdata/stable/grid_nested/elk/board.exp.json index abfc5cafd..09aabada3 100644 --- a/e2etests/testdata/stable/grid_nested/elk/board.exp.json +++ b/e2etests/testdata/stable/grid_nested/elk/board.exp.json @@ -11,7 +11,7 @@ ], "pos": { "x": 12, - "y": 314 + "y": 162 }, "width": 404, "height": 392, @@ -52,7 +52,7 @@ "type": "rectangle", "pos": { "x": 72, - "y": 374 + "y": 222 }, "width": 53, "height": 166, @@ -93,7 +93,7 @@ "type": "rectangle", "pos": { "x": 165, - "y": 374 + "y": 222 }, "width": 191, "height": 166, @@ -134,7 +134,7 @@ "type": "rectangle", "pos": { "x": 215, - "y": 424 + "y": 272 }, "width": 91, "height": 66, @@ -175,7 +175,7 @@ "type": "rectangle", "pos": { "x": 72, - "y": 580 + "y": 428 }, "width": 53, "height": 66, @@ -216,7 +216,7 @@ "type": "rectangle", "pos": { "x": 165, - "y": 580 + "y": 428 }, "width": 191, "height": 66, @@ -260,7 +260,7 @@ ], "pos": { "x": 436, - "y": 164 + "y": 12 }, "width": 972, "height": 692, @@ -301,7 +301,7 @@ "type": "rectangle", "pos": { "x": 496, - "y": 224 + "y": 72 }, "width": 53, "height": 466, @@ -342,7 +342,7 @@ "type": "rectangle", "pos": { "x": 589, - "y": 224 + "y": 72 }, "width": 759, "height": 466, @@ -383,7 +383,7 @@ "type": "rectangle", "pos": { "x": 639, - "y": 274 + "y": 122 }, "width": 659, "height": 366, @@ -424,7 +424,7 @@ "type": "rectangle", "pos": { "x": 689, - "y": 324 + "y": 172 }, "width": 266, "height": 266, @@ -465,7 +465,7 @@ "type": "rectangle", "pos": { "x": 739, - "y": 374 + "y": 222 }, "width": 166, "height": 166, @@ -506,7 +506,7 @@ "type": "rectangle", "pos": { "x": 789, - "y": 424 + "y": 272 }, "width": 66, "height": 66, @@ -547,7 +547,7 @@ "type": "rectangle", "pos": { "x": 975, - "y": 324 + "y": 172 }, "width": 273, "height": 266, @@ -588,7 +588,7 @@ "type": "rectangle", "pos": { "x": 1025, - "y": 374 + "y": 222 }, "width": 173, "height": 166, @@ -629,7 +629,7 @@ "type": "rectangle", "pos": { "x": 1075, - "y": 424 + "y": 272 }, "width": 73, "height": 66, @@ -670,7 +670,7 @@ "type": "rectangle", "pos": { "x": 496, - "y": 730 + "y": 578 }, "width": 53, "height": 66, @@ -711,7 +711,7 @@ "type": "rectangle", "pos": { "x": 589, - "y": 730 + "y": 578 }, "width": 759, "height": 66, @@ -755,7 +755,7 @@ ], "pos": { "x": 1428, - "y": 251 + "y": 99 }, "width": 480, "height": 518, @@ -796,7 +796,7 @@ "type": "rectangle", "pos": { "x": 1488, - "y": 311 + "y": 159 }, "width": 53, "height": 292, @@ -840,7 +840,7 @@ ], "pos": { "x": 1581, - "y": 311 + "y": 159 }, "width": 267, "height": 292, @@ -881,7 +881,7 @@ "type": "rectangle", "pos": { "x": 1641, - "y": 371 + "y": 219 }, "width": 53, "height": 66, @@ -922,7 +922,7 @@ "type": "rectangle", "pos": { "x": 1734, - "y": 371 + "y": 219 }, "width": 54, "height": 66, @@ -963,7 +963,7 @@ "type": "rectangle", "pos": { "x": 1641, - "y": 477 + "y": 325 }, "width": 53, "height": 66, @@ -1004,7 +1004,7 @@ "type": "rectangle", "pos": { "x": 1734, - "y": 477 + "y": 325 }, "width": 54, "height": 66, @@ -1045,7 +1045,7 @@ "type": "rectangle", "pos": { "x": 1488, - "y": 643 + "y": 491 }, "width": 53, "height": 66, @@ -1086,7 +1086,7 @@ "type": "rectangle", "pos": { "x": 1581, - "y": 643 + "y": 491 }, "width": 267, "height": 66, @@ -1127,10 +1127,10 @@ "type": "rectangle", "pos": { "x": 1928, - "y": 12 + "y": 67 }, - "width": 921, - "height": 996, + "width": 321, + "height": 581, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1167,11 +1167,11 @@ "id": "grid w/ grid w/ grid.a", "type": "rectangle", "pos": { - "x": 1988, - "y": 72 + "x": 1928, + "y": 113 }, "width": 53, - "height": 810, + "height": 469, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1208,11 +1208,11 @@ "id": "grid w/ grid w/ grid.b", "type": "rectangle", "pos": { - "x": 2041, - "y": 72 + "x": 1981, + "y": 113 }, - "width": 748, - "height": 810, + "width": 268, + "height": 469, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1249,10 +1249,10 @@ "id": "grid w/ grid w/ grid.b.a", "type": "rectangle", "pos": { - "x": 2101, - "y": 132 + "x": 1981, + "y": 154 }, - "width": 574, + "width": 214, "height": 66, "opacity": 1, "strokeDash": 0, @@ -1290,8 +1290,8 @@ "id": "grid w/ grid w/ grid.b.b", "type": "rectangle", "pos": { - "x": 2675, - "y": 132 + "x": 2195, + "y": 154 }, "width": 54, "height": 66, @@ -1331,11 +1331,11 @@ "id": "grid w/ grid w/ grid.b.c", "type": "rectangle", "pos": { - "x": 2101, - "y": 198 + "x": 1981, + "y": 220 }, - "width": 574, - "height": 624, + "width": 214, + "height": 362, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1372,8 +1372,8 @@ "id": "grid w/ grid w/ grid.b.c.a", "type": "rectangle", "pos": { - "x": 2161, - "y": 258 + "x": 1981, + "y": 256 }, "width": 53, "height": 66, @@ -1413,10 +1413,10 @@ "id": "grid w/ grid w/ grid.b.c.b", "type": "rectangle", "pos": { - "x": 2214, - "y": 258 + "x": 2034, + "y": 256 }, - "width": 401, + "width": 161, "height": 66, "opacity": 1, "strokeDash": 0, @@ -1454,11 +1454,11 @@ "id": "grid w/ grid w/ grid.b.c.c", "type": "rectangle", "pos": { - "x": 2161, - "y": 324 + "x": 1981, + "y": 322 }, "width": 53, - "height": 438, + "height": 260, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1495,11 +1495,11 @@ "id": "grid w/ grid w/ grid.b.c.d", "type": "rectangle", "pos": { - "x": 2214, - "y": 324 + "x": 2034, + "y": 322 }, - "width": 401, - "height": 438, + "width": 161, + "height": 260, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1536,11 +1536,11 @@ "id": "grid w/ grid w/ grid.b.c.d.a", "type": "rectangle", "pos": { - "x": 2274, - "y": 384 + "x": 2034, + "y": 353 }, - "width": 227, - "height": 252, + "width": 107, + "height": 163, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1577,8 +1577,8 @@ "id": "grid w/ grid w/ grid.b.c.d.a.a", "type": "rectangle", "pos": { - "x": 2334, - "y": 444 + "x": 2034, + "y": 384 }, "width": 53, "height": 66, @@ -1618,8 +1618,8 @@ "id": "grid w/ grid w/ grid.b.c.d.a.b", "type": "rectangle", "pos": { - "x": 2387, - "y": 444 + "x": 2087, + "y": 384 }, "width": 54, "height": 66, @@ -1659,8 +1659,8 @@ "id": "grid w/ grid w/ grid.b.c.d.a.c", "type": "rectangle", "pos": { - "x": 2334, - "y": 510 + "x": 2034, + "y": 450 }, "width": 53, "height": 66, @@ -1700,8 +1700,8 @@ "id": "grid w/ grid w/ grid.b.c.d.a.d", "type": "rectangle", "pos": { - "x": 2387, - "y": 510 + "x": 2087, + "y": 450 }, "width": 54, "height": 66, @@ -1741,11 +1741,11 @@ "id": "grid w/ grid w/ grid.b.c.d.b", "type": "rectangle", "pos": { - "x": 2501, - "y": 384 + "x": 2141, + "y": 353 }, "width": 54, - "height": 252, + "height": 163, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1782,10 +1782,10 @@ "id": "grid w/ grid w/ grid.b.c.d.c", "type": "rectangle", "pos": { - "x": 2274, - "y": 636 + "x": 2034, + "y": 516 }, - "width": 227, + "width": 107, "height": 66, "opacity": 1, "strokeDash": 0, @@ -1823,8 +1823,8 @@ "id": "grid w/ grid w/ grid.b.c.d.d", "type": "rectangle", "pos": { - "x": 2501, - "y": 636 + "x": 2141, + "y": 516 }, "width": 54, "height": 66, @@ -1864,11 +1864,11 @@ "id": "grid w/ grid w/ grid.b.d", "type": "rectangle", "pos": { - "x": 2675, - "y": 198 + "x": 2195, + "y": 220 }, "width": 54, - "height": 624, + "height": 362, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1905,8 +1905,8 @@ "id": "grid w/ grid w/ grid.c", "type": "rectangle", "pos": { - "x": 1988, - "y": 882 + "x": 1928, + "y": 582 }, "width": 53, "height": 66, @@ -1946,10 +1946,10 @@ "id": "grid w/ grid w/ grid.d", "type": "rectangle", "pos": { - "x": 2041, - "y": 882 + "x": 1981, + "y": 582 }, - "width": 748, + "width": 268, "height": 66, "opacity": 1, "strokeDash": 0, diff --git a/e2etests/testdata/stable/grid_nested/elk/sketch.exp.svg b/e2etests/testdata/stable/grid_nested/elk/sketch.exp.svg index 40a159ca8..cb2d63c26 100644 --- a/e2etests/testdata/stable/grid_nested/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/grid_nested/elk/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-747303535 .fill-N1{fill:#0A0F25;} + .d2-747303535 .fill-N2{fill:#676C7E;} + .d2-747303535 .fill-N3{fill:#9499AB;} + .d2-747303535 .fill-N4{fill:#CFD2DD;} + .d2-747303535 .fill-N5{fill:#DEE1EB;} + .d2-747303535 .fill-N6{fill:#EEF1F8;} + .d2-747303535 .fill-N7{fill:#FFFFFF;} + .d2-747303535 .fill-B1{fill:#0D32B2;} + .d2-747303535 .fill-B2{fill:#0D32B2;} + .d2-747303535 .fill-B3{fill:#E3E9FD;} + .d2-747303535 .fill-B4{fill:#E3E9FD;} + .d2-747303535 .fill-B5{fill:#EDF0FD;} + .d2-747303535 .fill-B6{fill:#F7F8FE;} + .d2-747303535 .fill-AA2{fill:#4A6FF3;} + .d2-747303535 .fill-AA4{fill:#EDF0FD;} + .d2-747303535 .fill-AA5{fill:#F7F8FE;} + .d2-747303535 .fill-AB4{fill:#EDF0FD;} + .d2-747303535 .fill-AB5{fill:#F7F8FE;} + .d2-747303535 .stroke-N1{stroke:#0A0F25;} + .d2-747303535 .stroke-N2{stroke:#676C7E;} + .d2-747303535 .stroke-N3{stroke:#9499AB;} + .d2-747303535 .stroke-N4{stroke:#CFD2DD;} + .d2-747303535 .stroke-N5{stroke:#DEE1EB;} + .d2-747303535 .stroke-N6{stroke:#EEF1F8;} + .d2-747303535 .stroke-N7{stroke:#FFFFFF;} + .d2-747303535 .stroke-B1{stroke:#0D32B2;} + .d2-747303535 .stroke-B2{stroke:#0D32B2;} + .d2-747303535 .stroke-B3{stroke:#E3E9FD;} + .d2-747303535 .stroke-B4{stroke:#E3E9FD;} + .d2-747303535 .stroke-B5{stroke:#EDF0FD;} + .d2-747303535 .stroke-B6{stroke:#F7F8FE;} + .d2-747303535 .stroke-AA2{stroke:#4A6FF3;} + .d2-747303535 .stroke-AA4{stroke:#EDF0FD;} + .d2-747303535 .stroke-AA5{stroke:#F7F8FE;} + .d2-747303535 .stroke-AB4{stroke:#EDF0FD;} + .d2-747303535 .stroke-AB5{stroke:#F7F8FE;} + .d2-747303535 .background-color-N1{background-color:#0A0F25;} + .d2-747303535 .background-color-N2{background-color:#676C7E;} + .d2-747303535 .background-color-N3{background-color:#9499AB;} + .d2-747303535 .background-color-N4{background-color:#CFD2DD;} + .d2-747303535 .background-color-N5{background-color:#DEE1EB;} + .d2-747303535 .background-color-N6{background-color:#EEF1F8;} + .d2-747303535 .background-color-N7{background-color:#FFFFFF;} + .d2-747303535 .background-color-B1{background-color:#0D32B2;} + .d2-747303535 .background-color-B2{background-color:#0D32B2;} + .d2-747303535 .background-color-B3{background-color:#E3E9FD;} + .d2-747303535 .background-color-B4{background-color:#E3E9FD;} + .d2-747303535 .background-color-B5{background-color:#EDF0FD;} + .d2-747303535 .background-color-B6{background-color:#F7F8FE;} + .d2-747303535 .background-color-AA2{background-color:#4A6FF3;} + .d2-747303535 .background-color-AA4{background-color:#EDF0FD;} + .d2-747303535 .background-color-AA5{background-color:#F7F8FE;} + .d2-747303535 .background-color-AB4{background-color:#EDF0FD;} + .d2-747303535 .background-color-AB5{background-color:#F7F8FE;} + .d2-747303535 .color-N1{color:#0A0F25;} + .d2-747303535 .color-N2{color:#676C7E;} + .d2-747303535 .color-N3{color:#9499AB;} + .d2-747303535 .color-N4{color:#CFD2DD;} + .d2-747303535 .color-N5{color:#DEE1EB;} + .d2-747303535 .color-N6{color:#EEF1F8;} + .d2-747303535 .color-N7{color:#FFFFFF;} + .d2-747303535 .color-B1{color:#0D32B2;} + .d2-747303535 .color-B2{color:#0D32B2;} + .d2-747303535 .color-B3{color:#E3E9FD;} + .d2-747303535 .color-B4{color:#E3E9FD;} + .d2-747303535 .color-B5{color:#EDF0FD;} + .d2-747303535 .color-B6{color:#F7F8FE;} + .d2-747303535 .color-AA2{color:#4A6FF3;} + .d2-747303535 .color-AA4{color:#EDF0FD;} + .d2-747303535 .color-AA5{color:#F7F8FE;} + .d2-747303535 .color-AB4{color:#EDF0FD;} + .d2-747303535 .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