From afc51f7a9d13bb22c1b4e4fa9e5640c9c5346cc0 Mon Sep 17 00:00:00 2001 From: Gavin Nishizawa Date: Tue, 26 Sep 2023 17:48:33 -0700 Subject: [PATCH] update tests --- .../dagre/board.exp.json | 16 +- .../dagre/sketch.exp.svg | 170 +++++++------- .../elk/board.exp.json | 16 +- .../elk/sketch.exp.svg | 170 +++++++------- .../stable/grid_icon/dagre/board.exp.json | 66 +++--- .../stable/grid_icon/dagre/sketch.exp.svg | 210 +++++++++--------- .../stable/grid_nested/dagre/board.exp.json | 44 ++-- .../stable/grid_nested/dagre/sketch.exp.svg | 194 ++++++++-------- 8 files changed, 443 insertions(+), 443 deletions(-) diff --git a/e2etests/testdata/regression/outside_grid_label_position/dagre/board.exp.json b/e2etests/testdata/regression/outside_grid_label_position/dagre/board.exp.json index e4d63f30e..d59b3cdda 100644 --- a/e2etests/testdata/regression/outside_grid_label_position/dagre/board.exp.json +++ b/e2etests/testdata/regression/outside_grid_label_position/dagre/board.exp.json @@ -11,7 +11,7 @@ "y": 29 }, "width": 681, - "height": 390, + "height": 404, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -52,7 +52,7 @@ "y": 70 }, "width": 621, - "height": 319, + "height": 333, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -93,7 +93,7 @@ "y": 100 }, "width": 561, - "height": 259, + "height": 273, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -131,7 +131,7 @@ "type": "rectangle", "pos": { "x": 120, - "y": 172 + "y": 186 }, "width": 140, "height": 127, @@ -172,7 +172,7 @@ "type": "rectangle", "pos": { "x": 150, - "y": 202 + "y": 216 }, "width": 80, "height": 66, @@ -213,7 +213,7 @@ "type": "rectangle", "pos": { "x": 300, - "y": 172 + "y": 186 }, "width": 140, "height": 127, @@ -254,7 +254,7 @@ "type": "rectangle", "pos": { "x": 330, - "y": 202 + "y": 216 }, "width": 80, "height": 66, @@ -295,7 +295,7 @@ "type": "rectangle", "pos": { "x": 480, - "y": 172 + "y": 186 }, "width": 81, "height": 127, diff --git a/e2etests/testdata/regression/outside_grid_label_position/dagre/sketch.exp.svg b/e2etests/testdata/regression/outside_grid_label_position/dagre/sketch.exp.svg index ce14de299..f9f126ca0 100644 --- a/e2etests/testdata/regression/outside_grid_label_position/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/outside_grid_label_position/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -container1container2container3firstsecondthirdchildchild - + .d2-1894090104 .fill-N1{fill:#0A0F25;} + .d2-1894090104 .fill-N2{fill:#676C7E;} + .d2-1894090104 .fill-N3{fill:#9499AB;} + .d2-1894090104 .fill-N4{fill:#CFD2DD;} + .d2-1894090104 .fill-N5{fill:#DEE1EB;} + .d2-1894090104 .fill-N6{fill:#EEF1F8;} + .d2-1894090104 .fill-N7{fill:#FFFFFF;} + .d2-1894090104 .fill-B1{fill:#0D32B2;} + .d2-1894090104 .fill-B2{fill:#0D32B2;} + .d2-1894090104 .fill-B3{fill:#E3E9FD;} + .d2-1894090104 .fill-B4{fill:#E3E9FD;} + .d2-1894090104 .fill-B5{fill:#EDF0FD;} + .d2-1894090104 .fill-B6{fill:#F7F8FE;} + .d2-1894090104 .fill-AA2{fill:#4A6FF3;} + .d2-1894090104 .fill-AA4{fill:#EDF0FD;} + .d2-1894090104 .fill-AA5{fill:#F7F8FE;} + .d2-1894090104 .fill-AB4{fill:#EDF0FD;} + .d2-1894090104 .fill-AB5{fill:#F7F8FE;} + .d2-1894090104 .stroke-N1{stroke:#0A0F25;} + .d2-1894090104 .stroke-N2{stroke:#676C7E;} + .d2-1894090104 .stroke-N3{stroke:#9499AB;} + .d2-1894090104 .stroke-N4{stroke:#CFD2DD;} + .d2-1894090104 .stroke-N5{stroke:#DEE1EB;} + .d2-1894090104 .stroke-N6{stroke:#EEF1F8;} + .d2-1894090104 .stroke-N7{stroke:#FFFFFF;} + .d2-1894090104 .stroke-B1{stroke:#0D32B2;} + .d2-1894090104 .stroke-B2{stroke:#0D32B2;} + .d2-1894090104 .stroke-B3{stroke:#E3E9FD;} + .d2-1894090104 .stroke-B4{stroke:#E3E9FD;} + .d2-1894090104 .stroke-B5{stroke:#EDF0FD;} + .d2-1894090104 .stroke-B6{stroke:#F7F8FE;} + .d2-1894090104 .stroke-AA2{stroke:#4A6FF3;} + .d2-1894090104 .stroke-AA4{stroke:#EDF0FD;} + .d2-1894090104 .stroke-AA5{stroke:#F7F8FE;} + .d2-1894090104 .stroke-AB4{stroke:#EDF0FD;} + .d2-1894090104 .stroke-AB5{stroke:#F7F8FE;} + .d2-1894090104 .background-color-N1{background-color:#0A0F25;} + .d2-1894090104 .background-color-N2{background-color:#676C7E;} + .d2-1894090104 .background-color-N3{background-color:#9499AB;} + .d2-1894090104 .background-color-N4{background-color:#CFD2DD;} + .d2-1894090104 .background-color-N5{background-color:#DEE1EB;} + .d2-1894090104 .background-color-N6{background-color:#EEF1F8;} + .d2-1894090104 .background-color-N7{background-color:#FFFFFF;} + .d2-1894090104 .background-color-B1{background-color:#0D32B2;} + .d2-1894090104 .background-color-B2{background-color:#0D32B2;} + .d2-1894090104 .background-color-B3{background-color:#E3E9FD;} + .d2-1894090104 .background-color-B4{background-color:#E3E9FD;} + .d2-1894090104 .background-color-B5{background-color:#EDF0FD;} + .d2-1894090104 .background-color-B6{background-color:#F7F8FE;} + .d2-1894090104 .background-color-AA2{background-color:#4A6FF3;} + .d2-1894090104 .background-color-AA4{background-color:#EDF0FD;} + .d2-1894090104 .background-color-AA5{background-color:#F7F8FE;} + .d2-1894090104 .background-color-AB4{background-color:#EDF0FD;} + .d2-1894090104 .background-color-AB5{background-color:#F7F8FE;} + .d2-1894090104 .color-N1{color:#0A0F25;} + .d2-1894090104 .color-N2{color:#676C7E;} + .d2-1894090104 .color-N3{color:#9499AB;} + .d2-1894090104 .color-N4{color:#CFD2DD;} + .d2-1894090104 .color-N5{color:#DEE1EB;} + .d2-1894090104 .color-N6{color:#EEF1F8;} + .d2-1894090104 .color-N7{color:#FFFFFF;} + .d2-1894090104 .color-B1{color:#0D32B2;} + .d2-1894090104 .color-B2{color:#0D32B2;} + .d2-1894090104 .color-B3{color:#E3E9FD;} + .d2-1894090104 .color-B4{color:#E3E9FD;} + .d2-1894090104 .color-B5{color:#EDF0FD;} + .d2-1894090104 .color-B6{color:#F7F8FE;} + .d2-1894090104 .color-AA2{color:#4A6FF3;} + .d2-1894090104 .color-AA4{color:#EDF0FD;} + .d2-1894090104 .color-AA5{color:#F7F8FE;} + .d2-1894090104 .color-AB4{color:#EDF0FD;} + .d2-1894090104 .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}]]>container1container2container3firstsecondthirdchildchild + - - - - - + + + + + \ No newline at end of file diff --git a/e2etests/testdata/regression/outside_grid_label_position/elk/board.exp.json b/e2etests/testdata/regression/outside_grid_label_position/elk/board.exp.json index 26f38abc9..953d15c18 100644 --- a/e2etests/testdata/regression/outside_grid_label_position/elk/board.exp.json +++ b/e2etests/testdata/regression/outside_grid_label_position/elk/board.exp.json @@ -11,7 +11,7 @@ "y": 12 }, "width": 841, - "height": 498, + "height": 512, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -52,7 +52,7 @@ "y": 62 }, "width": 741, - "height": 398, + "height": 412, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -93,7 +93,7 @@ "y": 112 }, "width": 641, - "height": 298, + "height": 312, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -131,7 +131,7 @@ "type": "rectangle", "pos": { "x": 172, - "y": 184 + "y": 198 }, "width": 180, "height": 166, @@ -172,7 +172,7 @@ "type": "rectangle", "pos": { "x": 222, - "y": 234 + "y": 248 }, "width": 80, "height": 66, @@ -213,7 +213,7 @@ "type": "rectangle", "pos": { "x": 392, - "y": 184 + "y": 198 }, "width": 180, "height": 166, @@ -254,7 +254,7 @@ "type": "rectangle", "pos": { "x": 442, - "y": 234 + "y": 248 }, "width": 80, "height": 66, @@ -295,7 +295,7 @@ "type": "rectangle", "pos": { "x": 612, - "y": 184 + "y": 198 }, "width": 81, "height": 166, diff --git a/e2etests/testdata/regression/outside_grid_label_position/elk/sketch.exp.svg b/e2etests/testdata/regression/outside_grid_label_position/elk/sketch.exp.svg index 33ff27a74..e46c1bd7b 100644 --- a/e2etests/testdata/regression/outside_grid_label_position/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/outside_grid_label_position/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -container1container2container3firstsecondthirdchildchild - + .d2-2885429201 .fill-N1{fill:#0A0F25;} + .d2-2885429201 .fill-N2{fill:#676C7E;} + .d2-2885429201 .fill-N3{fill:#9499AB;} + .d2-2885429201 .fill-N4{fill:#CFD2DD;} + .d2-2885429201 .fill-N5{fill:#DEE1EB;} + .d2-2885429201 .fill-N6{fill:#EEF1F8;} + .d2-2885429201 .fill-N7{fill:#FFFFFF;} + .d2-2885429201 .fill-B1{fill:#0D32B2;} + .d2-2885429201 .fill-B2{fill:#0D32B2;} + .d2-2885429201 .fill-B3{fill:#E3E9FD;} + .d2-2885429201 .fill-B4{fill:#E3E9FD;} + .d2-2885429201 .fill-B5{fill:#EDF0FD;} + .d2-2885429201 .fill-B6{fill:#F7F8FE;} + .d2-2885429201 .fill-AA2{fill:#4A6FF3;} + .d2-2885429201 .fill-AA4{fill:#EDF0FD;} + .d2-2885429201 .fill-AA5{fill:#F7F8FE;} + .d2-2885429201 .fill-AB4{fill:#EDF0FD;} + .d2-2885429201 .fill-AB5{fill:#F7F8FE;} + .d2-2885429201 .stroke-N1{stroke:#0A0F25;} + .d2-2885429201 .stroke-N2{stroke:#676C7E;} + .d2-2885429201 .stroke-N3{stroke:#9499AB;} + .d2-2885429201 .stroke-N4{stroke:#CFD2DD;} + .d2-2885429201 .stroke-N5{stroke:#DEE1EB;} + .d2-2885429201 .stroke-N6{stroke:#EEF1F8;} + .d2-2885429201 .stroke-N7{stroke:#FFFFFF;} + .d2-2885429201 .stroke-B1{stroke:#0D32B2;} + .d2-2885429201 .stroke-B2{stroke:#0D32B2;} + .d2-2885429201 .stroke-B3{stroke:#E3E9FD;} + .d2-2885429201 .stroke-B4{stroke:#E3E9FD;} + .d2-2885429201 .stroke-B5{stroke:#EDF0FD;} + .d2-2885429201 .stroke-B6{stroke:#F7F8FE;} + .d2-2885429201 .stroke-AA2{stroke:#4A6FF3;} + .d2-2885429201 .stroke-AA4{stroke:#EDF0FD;} + .d2-2885429201 .stroke-AA5{stroke:#F7F8FE;} + .d2-2885429201 .stroke-AB4{stroke:#EDF0FD;} + .d2-2885429201 .stroke-AB5{stroke:#F7F8FE;} + .d2-2885429201 .background-color-N1{background-color:#0A0F25;} + .d2-2885429201 .background-color-N2{background-color:#676C7E;} + .d2-2885429201 .background-color-N3{background-color:#9499AB;} + .d2-2885429201 .background-color-N4{background-color:#CFD2DD;} + .d2-2885429201 .background-color-N5{background-color:#DEE1EB;} + .d2-2885429201 .background-color-N6{background-color:#EEF1F8;} + .d2-2885429201 .background-color-N7{background-color:#FFFFFF;} + .d2-2885429201 .background-color-B1{background-color:#0D32B2;} + .d2-2885429201 .background-color-B2{background-color:#0D32B2;} + .d2-2885429201 .background-color-B3{background-color:#E3E9FD;} + .d2-2885429201 .background-color-B4{background-color:#E3E9FD;} + .d2-2885429201 .background-color-B5{background-color:#EDF0FD;} + .d2-2885429201 .background-color-B6{background-color:#F7F8FE;} + .d2-2885429201 .background-color-AA2{background-color:#4A6FF3;} + .d2-2885429201 .background-color-AA4{background-color:#EDF0FD;} + .d2-2885429201 .background-color-AA5{background-color:#F7F8FE;} + .d2-2885429201 .background-color-AB4{background-color:#EDF0FD;} + .d2-2885429201 .background-color-AB5{background-color:#F7F8FE;} + .d2-2885429201 .color-N1{color:#0A0F25;} + .d2-2885429201 .color-N2{color:#676C7E;} + .d2-2885429201 .color-N3{color:#9499AB;} + .d2-2885429201 .color-N4{color:#CFD2DD;} + .d2-2885429201 .color-N5{color:#DEE1EB;} + .d2-2885429201 .color-N6{color:#EEF1F8;} + .d2-2885429201 .color-N7{color:#FFFFFF;} + .d2-2885429201 .color-B1{color:#0D32B2;} + .d2-2885429201 .color-B2{color:#0D32B2;} + .d2-2885429201 .color-B3{color:#E3E9FD;} + .d2-2885429201 .color-B4{color:#E3E9FD;} + .d2-2885429201 .color-B5{color:#EDF0FD;} + .d2-2885429201 .color-B6{color:#F7F8FE;} + .d2-2885429201 .color-AA2{color:#4A6FF3;} + .d2-2885429201 .color-AA4{color:#EDF0FD;} + .d2-2885429201 .color-AA5{color:#F7F8FE;} + .d2-2885429201 .color-AB4{color:#EDF0FD;} + .d2-2885429201 .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}]]>container1container2container3firstsecondthirdchildchild + - - - - - + + + + + \ 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 e8b5da641..e5bf4fa9e 100644 --- a/e2etests/testdata/stable/grid_icon/dagre/board.exp.json +++ b/e2etests/testdata/stable/grid_icon/dagre/board.exp.json @@ -14,7 +14,7 @@ "y": 0 }, "width": 364, - "height": 417, + "height": 421, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -52,10 +52,10 @@ "type": "rectangle", "pos": { "x": 60, - "y": 125 + "y": 60 }, "width": 53, - "height": 126, + "height": 195, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -93,7 +93,7 @@ "type": "rectangle", "pos": { "x": 153, - "y": 125 + "y": 129 }, "width": 151, "height": 126, @@ -146,7 +146,7 @@ "type": "rectangle", "pos": { "x": 183, - "y": 155 + "y": 159 }, "width": 91, "height": 66, @@ -187,7 +187,7 @@ "type": "rectangle", "pos": { "x": 60, - "y": 291 + "y": 295 }, "width": 53, "height": 66, @@ -228,7 +228,7 @@ "type": "rectangle", "pos": { "x": 153, - "y": 291 + "y": 295 }, "width": 151, "height": 66, @@ -272,7 +272,7 @@ ], "pos": { "x": 424, - "y": 56 + "y": 58 }, "width": 278, "height": 306, @@ -325,7 +325,7 @@ "type": "rectangle", "pos": { "x": 489, - "y": 130 + "y": 132 }, "width": 53, "height": 66, @@ -366,7 +366,7 @@ "type": "rectangle", "pos": { "x": 582, - "y": 130 + "y": 132 }, "width": 54, "height": 66, @@ -407,7 +407,7 @@ "type": "rectangle", "pos": { "x": 489, - "y": 236 + "y": 238 }, "width": 53, "height": 66, @@ -448,7 +448,7 @@ "type": "rectangle", "pos": { "x": 582, - "y": 236 + "y": 238 }, "width": 54, "height": 66, @@ -492,10 +492,10 @@ ], "pos": { "x": 762, - "y": 3 + "y": 10 }, "width": 433, - "height": 412, + "height": 402, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -545,10 +545,10 @@ "type": "rectangle", "pos": { "x": 856, - "y": 123 + "y": 84 }, "width": 53, - "height": 126, + "height": 162, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -586,7 +586,7 @@ "type": "rectangle", "pos": { "x": 949, - "y": 123 + "y": 120 }, "width": 151, "height": 126, @@ -627,7 +627,7 @@ "type": "rectangle", "pos": { "x": 979, - "y": 153 + "y": 150 }, "width": 91, "height": 66, @@ -668,7 +668,7 @@ "type": "rectangle", "pos": { "x": 856, - "y": 289 + "y": 286 }, "width": 53, "height": 66, @@ -709,7 +709,7 @@ "type": "rectangle", "pos": { "x": 949, - "y": 289 + "y": 286 }, "width": 151, "height": 66, @@ -753,10 +753,10 @@ ], "pos": { "x": 1255, - "y": 23 + "y": 0 }, "width": 364, - "height": 371, + "height": 421, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -794,10 +794,10 @@ "type": "rectangle", "pos": { "x": 1315, - "y": 102 + "y": 60 }, "width": 53, - "height": 126, + "height": 195, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -835,7 +835,7 @@ "type": "rectangle", "pos": { "x": 1408, - "y": 102 + "y": 129 }, "width": 151, "height": 126, @@ -888,7 +888,7 @@ "type": "rectangle", "pos": { "x": 1438, - "y": 132 + "y": 159 }, "width": 91, "height": 66, @@ -929,7 +929,7 @@ "type": "rectangle", "pos": { "x": 1315, - "y": 268 + "y": 295 }, "width": 53, "height": 66, @@ -970,7 +970,7 @@ "type": "rectangle", "pos": { "x": 1408, - "y": 268 + "y": 295 }, "width": 151, "height": 66, @@ -1014,7 +1014,7 @@ ], "pos": { "x": 1679, - "y": 56 + "y": 58 }, "width": 267, "height": 306, @@ -1067,7 +1067,7 @@ "type": "rectangle", "pos": { "x": 1739, - "y": 130 + "y": 132 }, "width": 53, "height": 66, @@ -1108,7 +1108,7 @@ "type": "rectangle", "pos": { "x": 1832, - "y": 130 + "y": 132 }, "width": 54, "height": 66, @@ -1149,7 +1149,7 @@ "type": "rectangle", "pos": { "x": 1739, - "y": 236 + "y": 238 }, "width": 53, "height": 66, @@ -1190,7 +1190,7 @@ "type": "rectangle", "pos": { "x": 1832, - "y": 236 + "y": 238 }, "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 619e1ea9b..37ef678d3 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-379655365 .fill-N1{fill:#0A0F25;} + .d2-379655365 .fill-N2{fill:#676C7E;} + .d2-379655365 .fill-N3{fill:#9499AB;} + .d2-379655365 .fill-N4{fill:#CFD2DD;} + .d2-379655365 .fill-N5{fill:#DEE1EB;} + .d2-379655365 .fill-N6{fill:#EEF1F8;} + .d2-379655365 .fill-N7{fill:#FFFFFF;} + .d2-379655365 .fill-B1{fill:#0D32B2;} + .d2-379655365 .fill-B2{fill:#0D32B2;} + .d2-379655365 .fill-B3{fill:#E3E9FD;} + .d2-379655365 .fill-B4{fill:#E3E9FD;} + .d2-379655365 .fill-B5{fill:#EDF0FD;} + .d2-379655365 .fill-B6{fill:#F7F8FE;} + .d2-379655365 .fill-AA2{fill:#4A6FF3;} + .d2-379655365 .fill-AA4{fill:#EDF0FD;} + .d2-379655365 .fill-AA5{fill:#F7F8FE;} + .d2-379655365 .fill-AB4{fill:#EDF0FD;} + .d2-379655365 .fill-AB5{fill:#F7F8FE;} + .d2-379655365 .stroke-N1{stroke:#0A0F25;} + .d2-379655365 .stroke-N2{stroke:#676C7E;} + .d2-379655365 .stroke-N3{stroke:#9499AB;} + .d2-379655365 .stroke-N4{stroke:#CFD2DD;} + .d2-379655365 .stroke-N5{stroke:#DEE1EB;} + .d2-379655365 .stroke-N6{stroke:#EEF1F8;} + .d2-379655365 .stroke-N7{stroke:#FFFFFF;} + .d2-379655365 .stroke-B1{stroke:#0D32B2;} + .d2-379655365 .stroke-B2{stroke:#0D32B2;} + .d2-379655365 .stroke-B3{stroke:#E3E9FD;} + .d2-379655365 .stroke-B4{stroke:#E3E9FD;} + .d2-379655365 .stroke-B5{stroke:#EDF0FD;} + .d2-379655365 .stroke-B6{stroke:#F7F8FE;} + .d2-379655365 .stroke-AA2{stroke:#4A6FF3;} + .d2-379655365 .stroke-AA4{stroke:#EDF0FD;} + .d2-379655365 .stroke-AA5{stroke:#F7F8FE;} + .d2-379655365 .stroke-AB4{stroke:#EDF0FD;} + .d2-379655365 .stroke-AB5{stroke:#F7F8FE;} + .d2-379655365 .background-color-N1{background-color:#0A0F25;} + .d2-379655365 .background-color-N2{background-color:#676C7E;} + .d2-379655365 .background-color-N3{background-color:#9499AB;} + .d2-379655365 .background-color-N4{background-color:#CFD2DD;} + .d2-379655365 .background-color-N5{background-color:#DEE1EB;} + .d2-379655365 .background-color-N6{background-color:#EEF1F8;} + .d2-379655365 .background-color-N7{background-color:#FFFFFF;} + .d2-379655365 .background-color-B1{background-color:#0D32B2;} + .d2-379655365 .background-color-B2{background-color:#0D32B2;} + .d2-379655365 .background-color-B3{background-color:#E3E9FD;} + .d2-379655365 .background-color-B4{background-color:#E3E9FD;} + .d2-379655365 .background-color-B5{background-color:#EDF0FD;} + .d2-379655365 .background-color-B6{background-color:#F7F8FE;} + .d2-379655365 .background-color-AA2{background-color:#4A6FF3;} + .d2-379655365 .background-color-AA4{background-color:#EDF0FD;} + .d2-379655365 .background-color-AA5{background-color:#F7F8FE;} + .d2-379655365 .background-color-AB4{background-color:#EDF0FD;} + .d2-379655365 .background-color-AB5{background-color:#F7F8FE;} + .d2-379655365 .color-N1{color:#0A0F25;} + .d2-379655365 .color-N2{color:#676C7E;} + .d2-379655365 .color-N3{color:#9499AB;} + .d2-379655365 .color-N4{color:#CFD2DD;} + .d2-379655365 .color-N5{color:#DEE1EB;} + .d2-379655365 .color-N6{color:#EEF1F8;} + .d2-379655365 .color-N7{color:#FFFFFF;} + .d2-379655365 .color-B1{color:#0D32B2;} + .d2-379655365 .color-B2{color:#0D32B2;} + .d2-379655365 .color-B3{color:#E3E9FD;} + .d2-379655365 .color-B4{color:#E3E9FD;} + .d2-379655365 .color-B5{color:#EDF0FD;} + .d2-379655365 .color-B6{color:#F7F8FE;} + .d2-379655365 .color-AA2{color:#4A6FF3;} + .d2-379655365 .color-AA4{color:#EDF0FD;} + .d2-379655365 .color-AA5{color:#F7F8FE;} + .d2-379655365 .color-AB4{color:#EDF0FD;} + .d2-379655365 .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 4d4abbc98..99cef9427 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": 99 + "y": 97 }, "width": 364, - "height": 384, + "height": 388, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -52,10 +52,10 @@ "type": "rectangle", "pos": { "x": 60, - "y": 191 + "y": 157 }, "width": 53, - "height": 126, + "height": 162, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -93,7 +93,7 @@ "type": "rectangle", "pos": { "x": 153, - "y": 191 + "y": 193 }, "width": 151, "height": 126, @@ -134,7 +134,7 @@ "type": "rectangle", "pos": { "x": 183, - "y": 221 + "y": 223 }, "width": 91, "height": 66, @@ -175,7 +175,7 @@ "type": "rectangle", "pos": { "x": 60, - "y": 357 + "y": 359 }, "width": 53, "height": 66, @@ -216,7 +216,7 @@ "type": "rectangle", "pos": { "x": 153, - "y": 357 + "y": 359 }, "width": 151, "height": 66, @@ -260,10 +260,10 @@ ], "pos": { "x": 424, - "y": 5 + "y": 3 }, "width": 692, - "height": 572, + "height": 576, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -301,10 +301,10 @@ "type": "rectangle", "pos": { "x": 484, - "y": 97 + "y": 63 }, "width": 53, - "height": 314, + "height": 350, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -342,7 +342,7 @@ "type": "rectangle", "pos": { "x": 577, - "y": 97 + "y": 99 }, "width": 479, "height": 314, @@ -383,7 +383,7 @@ "type": "rectangle", "pos": { "x": 597, - "y": 133 + "y": 135 }, "width": 439, "height": 248, @@ -424,7 +424,7 @@ "type": "rectangle", "pos": { "x": 617, - "y": 164 + "y": 166 }, "width": 186, "height": 187, @@ -465,7 +465,7 @@ "type": "rectangle", "pos": { "x": 647, - "y": 195 + "y": 197 }, "width": 126, "height": 126, @@ -506,7 +506,7 @@ "type": "rectangle", "pos": { "x": 677, - "y": 225 + "y": 227 }, "width": 66, "height": 66, @@ -547,7 +547,7 @@ "type": "rectangle", "pos": { "x": 823, - "y": 164 + "y": 166 }, "width": 193, "height": 187, @@ -588,7 +588,7 @@ "type": "rectangle", "pos": { "x": 853, - "y": 195 + "y": 197 }, "width": 133, "height": 126, @@ -629,7 +629,7 @@ "type": "rectangle", "pos": { "x": 883, - "y": 225 + "y": 227 }, "width": 73, "height": 66, @@ -670,7 +670,7 @@ "type": "rectangle", "pos": { "x": 484, - "y": 451 + "y": 453 }, "width": 53, "height": 66, @@ -711,7 +711,7 @@ "type": "rectangle", "pos": { "x": 577, - "y": 451 + "y": 453 }, "width": 479, "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 78ba506bc..c16ab304f 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-2055001460 .fill-N1{fill:#0A0F25;} + .d2-2055001460 .fill-N2{fill:#676C7E;} + .d2-2055001460 .fill-N3{fill:#9499AB;} + .d2-2055001460 .fill-N4{fill:#CFD2DD;} + .d2-2055001460 .fill-N5{fill:#DEE1EB;} + .d2-2055001460 .fill-N6{fill:#EEF1F8;} + .d2-2055001460 .fill-N7{fill:#FFFFFF;} + .d2-2055001460 .fill-B1{fill:#0D32B2;} + .d2-2055001460 .fill-B2{fill:#0D32B2;} + .d2-2055001460 .fill-B3{fill:#E3E9FD;} + .d2-2055001460 .fill-B4{fill:#E3E9FD;} + .d2-2055001460 .fill-B5{fill:#EDF0FD;} + .d2-2055001460 .fill-B6{fill:#F7F8FE;} + .d2-2055001460 .fill-AA2{fill:#4A6FF3;} + .d2-2055001460 .fill-AA4{fill:#EDF0FD;} + .d2-2055001460 .fill-AA5{fill:#F7F8FE;} + .d2-2055001460 .fill-AB4{fill:#EDF0FD;} + .d2-2055001460 .fill-AB5{fill:#F7F8FE;} + .d2-2055001460 .stroke-N1{stroke:#0A0F25;} + .d2-2055001460 .stroke-N2{stroke:#676C7E;} + .d2-2055001460 .stroke-N3{stroke:#9499AB;} + .d2-2055001460 .stroke-N4{stroke:#CFD2DD;} + .d2-2055001460 .stroke-N5{stroke:#DEE1EB;} + .d2-2055001460 .stroke-N6{stroke:#EEF1F8;} + .d2-2055001460 .stroke-N7{stroke:#FFFFFF;} + .d2-2055001460 .stroke-B1{stroke:#0D32B2;} + .d2-2055001460 .stroke-B2{stroke:#0D32B2;} + .d2-2055001460 .stroke-B3{stroke:#E3E9FD;} + .d2-2055001460 .stroke-B4{stroke:#E3E9FD;} + .d2-2055001460 .stroke-B5{stroke:#EDF0FD;} + .d2-2055001460 .stroke-B6{stroke:#F7F8FE;} + .d2-2055001460 .stroke-AA2{stroke:#4A6FF3;} + .d2-2055001460 .stroke-AA4{stroke:#EDF0FD;} + .d2-2055001460 .stroke-AA5{stroke:#F7F8FE;} + .d2-2055001460 .stroke-AB4{stroke:#EDF0FD;} + .d2-2055001460 .stroke-AB5{stroke:#F7F8FE;} + .d2-2055001460 .background-color-N1{background-color:#0A0F25;} + .d2-2055001460 .background-color-N2{background-color:#676C7E;} + .d2-2055001460 .background-color-N3{background-color:#9499AB;} + .d2-2055001460 .background-color-N4{background-color:#CFD2DD;} + .d2-2055001460 .background-color-N5{background-color:#DEE1EB;} + .d2-2055001460 .background-color-N6{background-color:#EEF1F8;} + .d2-2055001460 .background-color-N7{background-color:#FFFFFF;} + .d2-2055001460 .background-color-B1{background-color:#0D32B2;} + .d2-2055001460 .background-color-B2{background-color:#0D32B2;} + .d2-2055001460 .background-color-B3{background-color:#E3E9FD;} + .d2-2055001460 .background-color-B4{background-color:#E3E9FD;} + .d2-2055001460 .background-color-B5{background-color:#EDF0FD;} + .d2-2055001460 .background-color-B6{background-color:#F7F8FE;} + .d2-2055001460 .background-color-AA2{background-color:#4A6FF3;} + .d2-2055001460 .background-color-AA4{background-color:#EDF0FD;} + .d2-2055001460 .background-color-AA5{background-color:#F7F8FE;} + .d2-2055001460 .background-color-AB4{background-color:#EDF0FD;} + .d2-2055001460 .background-color-AB5{background-color:#F7F8FE;} + .d2-2055001460 .color-N1{color:#0A0F25;} + .d2-2055001460 .color-N2{color:#676C7E;} + .d2-2055001460 .color-N3{color:#9499AB;} + .d2-2055001460 .color-N4{color:#CFD2DD;} + .d2-2055001460 .color-N5{color:#DEE1EB;} + .d2-2055001460 .color-N6{color:#EEF1F8;} + .d2-2055001460 .color-N7{color:#FFFFFF;} + .d2-2055001460 .color-B1{color:#0D32B2;} + .d2-2055001460 .color-B2{color:#0D32B2;} + .d2-2055001460 .color-B3{color:#E3E9FD;} + .d2-2055001460 .color-B4{color:#E3E9FD;} + .d2-2055001460 .color-B5{color:#EDF0FD;} + .d2-2055001460 .color-B6{color:#F7F8FE;} + .d2-2055001460 .color-AA2{color:#4A6FF3;} + .d2-2055001460 .color-AA4{color:#EDF0FD;} + .d2-2055001460 .color-AA5{color:#F7F8FE;} + .d2-2055001460 .color-AB4{color:#EDF0FD;} + .d2-2055001460 .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 - - + + - - - - - - - - + + + + + + + + @@ -118,8 +118,8 @@ - - + + @@ -128,20 +128,20 @@ - - + + - - + + - - + +