From e36f2f946baf82e72ef4eb0d463e5b75c90d87db Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Wed, 15 Mar 2023 13:03:49 -0700 Subject: [PATCH] elk fit labels, center contents --- ci/release/changelogs/next.md | 2 + d2layouts/d2elklayout/layout.go | 18 +- .../TestCLI_E2E/internal_linked_pdf.exp.pdf | Bin 81564 -> 81564 bytes e2etests/stable_test.go | 3 +- .../stable/elk_shim/dagre/board.exp.json | 4 +- .../stable/elk_shim/dagre/sketch.exp.svg | 166 +++++++-------- .../stable/elk_shim/elk/board.exp.json | 48 ++--- .../stable/elk_shim/elk/sketch.exp.svg | 174 ++++++++-------- .../elk/board.exp.json | 10 +- .../elk/sketch.exp.svg | 160 +++++++-------- .../elk/board.exp.json | 10 +- .../elk/sketch.exp.svg | 160 +++++++-------- .../elk/board.exp.json | 60 +++--- .../elk/sketch.exp.svg | 160 +++++++-------- .../shape_set_width_height/elk/board.exp.json | 62 +++--- .../shape_set_width_height/elk/sketch.exp.svg | 194 +++++++++--------- 16 files changed, 615 insertions(+), 616 deletions(-) diff --git a/ci/release/changelogs/next.md b/ci/release/changelogs/next.md index e08ec8aef..f51886b4b 100644 --- a/ci/release/changelogs/next.md +++ b/ci/release/changelogs/next.md @@ -10,6 +10,8 @@ - `elk` layouts have less bends in the routes. [#1033](https://github.com/terrastruct/d2/pull/1033) - `elk` layouts center nodes better. [#1028](https://github.com/terrastruct/d2/pull/1028) - `elk` layouts have nicer margins between node boundaries and edges. [#1028](https://github.com/terrastruct/d2/pull/1028) +- `elk` layouts container contents are centered within. [#1038](https://github.com/terrastruct/d2/pull/1038) +- `elk` layouts container dimensions fit label. [#1038](https://github.com/terrastruct/d2/pull/1038) - `sketch` draws connections with less roughness, which especially improves look of corner bends in ELK. [#1014](https://github.com/terrastruct/d2/pull/1014) - CSS in SVGs are diagram-specific, which means you can embed multiple D2 diagrams on a web page without fear of style conflicts. [#1016](https://github.com/terrastruct/d2/pull/1016) diff --git a/d2layouts/d2elklayout/layout.go b/d2layouts/d2elklayout/layout.go index 0a8a426a7..aa2e3c80d 100644 --- a/d2layouts/d2elklayout/layout.go +++ b/d2layouts/d2elklayout/layout.go @@ -110,6 +110,7 @@ type elkOpts struct { ConsiderModelOrder string `json:"elk.layered.considerModelOrder.strategy,omitempty"` NodeSizeConstraints string `json:"elk.nodeSize.constraints,omitempty"` + ContentAlignment string `json:"elk.contentAlignment,omitempty"` NodeSizeMinimum string `json:"elk.nodeSize.minimum,omitempty"` ConfigurableOpts @@ -148,6 +149,8 @@ func Layout(ctx context.Context, g *d2graph.Graph, opts *ConfigurableOpts) (err HierarchyHandling: "INCLUDE_CHILDREN", FixedAlignment: "BALANCED", ConsiderModelOrder: "NODES_AND_EDGES", + NodeSizeConstraints: "MINIMUM_SIZE", + ContentAlignment: "H_CENTER V_CENTER", ConfigurableOpts: ConfigurableOpts{ Algorithm: opts.Algorithm, NodeSpacing: opts.NodeSpacing, @@ -227,8 +230,8 @@ func Layout(ctx context.Context, g *d2graph.Graph, opts *ConfigurableOpts) (err FixedAlignment: "BALANCED", EdgeNode: edge_node_spacing, ConsiderModelOrder: "NODES_AND_EDGES", - // Why is it (height, width)? I have no clue, but it works. - NodeSizeMinimum: fmt.Sprintf("(%d, %d)", int(math.Ceil(height)), int(math.Ceil(width))), + NodeSizeConstraints: "MINIMUM_SIZE", + ContentAlignment: "H_CENTER V_CENTER", ConfigurableOpts: ConfigurableOpts{ NodeSpacing: opts.NodeSpacing, EdgeNodeSpacing: opts.EdgeNodeSpacing, @@ -236,11 +239,12 @@ func Layout(ctx context.Context, g *d2graph.Graph, opts *ConfigurableOpts) (err Padding: opts.Padding, }, } - // Only set if specified. - // There's a bug where if it's the node label dimensions that set the NodeSizeMinimum, - // then suddenly it's reversed back to (width, height). I must be missing something - if obj.Attributes.Width != nil || obj.Attributes.Height != nil { - n.LayoutOptions.NodeSizeConstraints = "MINIMUM_SIZE" + + switch elkGraph.LayoutOptions.Direction { + case "DOWN", "UP": + n.LayoutOptions.NodeSizeMinimum = fmt.Sprintf("(%d, %d)", int(math.Ceil(height)), int(math.Ceil(width))) + case "RIGHT", "LEFT": + n.LayoutOptions.NodeSizeMinimum = fmt.Sprintf("(%d, %d)", int(math.Ceil(width)), int(math.Ceil(height))) } if n.LayoutOptions.Padding == DefaultOpts.Padding { diff --git a/e2etests-cli/testdata/TestCLI_E2E/internal_linked_pdf.exp.pdf b/e2etests-cli/testdata/TestCLI_E2E/internal_linked_pdf.exp.pdf index 2074617dc26e87bc1c25cd9ed752ce85b9288a9a..cd314f85fb5eba9f0c0041fa4ea3840babd98607 100644 GIT binary patch delta 68 zcmbR9mu1dhmWC~i8CKJ0S}__-PqSh)oPN@Z@v5?^p|OFnp{XX9zHfetOJYf?f`*Hg Rk%19d6e73%pf%%dCIBQm6(0Zq delta 68 zcmbR9mu1dhmWC~i8CKJ0SuyHQPqSh)ntsxX@v5?kp@p%ffr%!UzHfetOJYf?f`*Hg Tk%5u1fw3V}Zu>!N#@kE)CV&+- diff --git a/e2etests/stable_test.go b/e2etests/stable_test.go index 12453afe5..7391a6e2a 100644 --- a/e2etests/stable_test.go +++ b/e2etests/stable_test.go @@ -103,7 +103,8 @@ func testStable(t *testing.T) { } } - online portal: { + # long label to expand + online portal: ONLINE PORTALLLL { ui: { shape: hexagon } } diff --git a/e2etests/testdata/stable/elk_shim/dagre/board.exp.json b/e2etests/testdata/stable/elk_shim/dagre/board.exp.json index 0e917cd3c..f839bf8a2 100644 --- a/e2etests/testdata/stable/elk_shim/dagre/board.exp.json +++ b/e2etests/testdata/stable/elk_shim/dagre/board.exp.json @@ -194,7 +194,7 @@ "fields": null, "methods": null, "columns": null, - "label": "online portal", + "label": "ONLINE PORTALLLL", "fontSize": 24, "fontFamily": "DEFAULT", "language": "", @@ -202,7 +202,7 @@ "italic": false, "bold": false, "underline": false, - "labelWidth": 128, + "labelWidth": 198, "labelHeight": 31, "labelPosition": "OUTSIDE_TOP_CENTER", "zIndex": 0, diff --git a/e2etests/testdata/stable/elk_shim/dagre/sketch.exp.svg b/e2etests/testdata/stable/elk_shim/dagre/sketch.exp.svg index 1b47e10f3..e7d58b831 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 portaldata processorsatellitestransmitteruistorage sendsendsendphone logsmake call accessdisplaypersist - + .d2-2659960328 .fill-N1{fill:#0A0F25;} + .d2-2659960328 .fill-N2{fill:#676C7E;} + .d2-2659960328 .fill-N3{fill:#9499AB;} + .d2-2659960328 .fill-N4{fill:#CFD2DD;} + .d2-2659960328 .fill-N5{fill:#DEE1EB;} + .d2-2659960328 .fill-N6{fill:#EEF1F8;} + .d2-2659960328 .fill-N7{fill:#FFFFFF;} + .d2-2659960328 .fill-B1{fill:#0D32B2;} + .d2-2659960328 .fill-B2{fill:#0D32B2;} + .d2-2659960328 .fill-B3{fill:#E3E9FD;} + .d2-2659960328 .fill-B4{fill:#E3E9FD;} + .d2-2659960328 .fill-B5{fill:#EDF0FD;} + .d2-2659960328 .fill-B6{fill:#F7F8FE;} + .d2-2659960328 .fill-AA2{fill:#4A6FF3;} + .d2-2659960328 .fill-AA4{fill:#EDF0FD;} + .d2-2659960328 .fill-AA5{fill:#F7F8FE;} + .d2-2659960328 .fill-AB4{fill:#EDF0FD;} + .d2-2659960328 .fill-AB5{fill:#F7F8FE;} + .d2-2659960328 .stroke-N1{stroke:#0A0F25;} + .d2-2659960328 .stroke-N2{stroke:#676C7E;} + .d2-2659960328 .stroke-N3{stroke:#9499AB;} + .d2-2659960328 .stroke-N4{stroke:#CFD2DD;} + .d2-2659960328 .stroke-N5{stroke:#DEE1EB;} + .d2-2659960328 .stroke-N6{stroke:#EEF1F8;} + .d2-2659960328 .stroke-N7{stroke:#FFFFFF;} + .d2-2659960328 .stroke-B1{stroke:#0D32B2;} + .d2-2659960328 .stroke-B2{stroke:#0D32B2;} + .d2-2659960328 .stroke-B3{stroke:#E3E9FD;} + .d2-2659960328 .stroke-B4{stroke:#E3E9FD;} + .d2-2659960328 .stroke-B5{stroke:#EDF0FD;} + .d2-2659960328 .stroke-B6{stroke:#F7F8FE;} + .d2-2659960328 .stroke-AA2{stroke:#4A6FF3;} + .d2-2659960328 .stroke-AA4{stroke:#EDF0FD;} + .d2-2659960328 .stroke-AA5{stroke:#F7F8FE;} + .d2-2659960328 .stroke-AB4{stroke:#EDF0FD;} + .d2-2659960328 .stroke-AB5{stroke:#F7F8FE;} + .d2-2659960328 .background-color-N1{background-color:#0A0F25;} + .d2-2659960328 .background-color-N2{background-color:#676C7E;} + .d2-2659960328 .background-color-N3{background-color:#9499AB;} + .d2-2659960328 .background-color-N4{background-color:#CFD2DD;} + .d2-2659960328 .background-color-N5{background-color:#DEE1EB;} + .d2-2659960328 .background-color-N6{background-color:#EEF1F8;} + .d2-2659960328 .background-color-N7{background-color:#FFFFFF;} + .d2-2659960328 .background-color-B1{background-color:#0D32B2;} + .d2-2659960328 .background-color-B2{background-color:#0D32B2;} + .d2-2659960328 .background-color-B3{background-color:#E3E9FD;} + .d2-2659960328 .background-color-B4{background-color:#E3E9FD;} + .d2-2659960328 .background-color-B5{background-color:#EDF0FD;} + .d2-2659960328 .background-color-B6{background-color:#F7F8FE;} + .d2-2659960328 .background-color-AA2{background-color:#4A6FF3;} + .d2-2659960328 .background-color-AA4{background-color:#EDF0FD;} + .d2-2659960328 .background-color-AA5{background-color:#F7F8FE;} + .d2-2659960328 .background-color-AB4{background-color:#EDF0FD;} + .d2-2659960328 .background-color-AB5{background-color:#F7F8FE;} + .d2-2659960328 .color-N1{color:#0A0F25;} + .d2-2659960328 .color-N2{color:#676C7E;} + .d2-2659960328 .color-N3{color:#9499AB;} + .d2-2659960328 .color-N4{color:#CFD2DD;} + .d2-2659960328 .color-N5{color:#DEE1EB;} + .d2-2659960328 .color-N6{color:#EEF1F8;} + .d2-2659960328 .color-N7{color:#FFFFFF;} + .d2-2659960328 .color-B1{color:#0D32B2;} + .d2-2659960328 .color-B2{color:#0D32B2;} + .d2-2659960328 .color-B3{color:#E3E9FD;} + .d2-2659960328 .color-B4{color:#E3E9FD;} + .d2-2659960328 .color-B5{color:#EDF0FD;} + .d2-2659960328 .color-B6{color:#F7F8FE;} + .d2-2659960328 .color-AA2{color:#4A6FF3;} + .d2-2659960328 .color-AA4{color:#EDF0FD;} + .d2-2659960328 .color-AA5{color:#F7F8FE;} + .d2-2659960328 .color-AB4{color:#EDF0FD;} + .d2-2659960328 .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/stable/elk_shim/elk/board.exp.json b/e2etests/testdata/stable/elk_shim/elk/board.exp.json index 831a7997f..a4a1d1412 100644 --- a/e2etests/testdata/stable/elk_shim/elk/board.exp.json +++ b/e2etests/testdata/stable/elk_shim/elk/board.exp.json @@ -10,7 +10,7 @@ "x": 12, "y": 311 }, - "width": 540, + "width": 603, "height": 892, "opacity": 1, "strokeDash": 0, @@ -174,7 +174,7 @@ "x": 322, "y": 366 }, - "width": 180, + "width": 243, "height": 169, "opacity": 1, "strokeDash": 0, @@ -194,7 +194,7 @@ "fields": null, "methods": null, "columns": null, - "label": "online portal", + "label": "ONLINE PORTALLLL", "fontSize": 24, "fontFamily": "DEFAULT", "language": "", @@ -202,7 +202,7 @@ "italic": false, "bold": false, "underline": false, - "labelWidth": 128, + "labelWidth": 198, "labelHeight": 31, "labelPosition": "INSIDE_TOP_CENTER", "zIndex": 0, @@ -212,7 +212,7 @@ "id": "network.online portal.ui", "type": "hexagon", "pos": { - "x": 372, + "x": 403, "y": 416 }, "width": 80, @@ -335,7 +335,7 @@ "id": "user", "type": "person", "pos": { - "x": 286, + "x": 317, "y": 12 }, "width": 130, @@ -376,7 +376,7 @@ "id": "api server", "type": "rectangle", "pos": { - "x": 534, + "x": 597, "y": 59 }, "width": 116, @@ -417,7 +417,7 @@ "id": "logs", "type": "page", "pos": { - "x": 632, + "x": 695, "y": 311 }, "width": 73, @@ -643,19 +643,19 @@ "labelPercentage": 0, "route": [ { - "x": 329, + "x": 361, "y": 99 }, { - "x": 329.33333333333337, + "x": 360.83333333333337, "y": 165 }, { - "x": 222.83333333333334, + "x": 238.58333333333334, "y": 165 }, { - "x": 222.83333333333334, + "x": 238.58333333333334, "y": 361 } ], @@ -691,11 +691,11 @@ "labelPercentage": 0, "route": [ { - "x": 399, + "x": 430, "y": 99 }, { - "x": 399, + "x": 430, "y": 416 } ], @@ -731,19 +731,19 @@ "labelPercentage": 0, "route": [ { - "x": 563, + "x": 626, "y": 125 }, { - "x": 563, + "x": 626, "y": 266 }, { - "x": 425.33333333333337, + "x": 456.83333333333337, "y": 266 }, { - "x": 425, + "x": 457, "y": 416 } ], @@ -779,19 +779,19 @@ "labelPercentage": 0, "route": [ { - "x": 621, + "x": 684, "y": 125 }, { - "x": 621, + "x": 684, "y": 165 }, { - "x": 668.5, + "x": 731.5, "y": 165 }, { - "x": 669, + "x": 732, "y": 311 } ], @@ -835,11 +835,11 @@ "y": 1248 }, { - "x": 592, + "x": 655, "y": 1248 }, { - "x": 592, + "x": 655, "y": 125 } ], diff --git a/e2etests/testdata/stable/elk_shim/elk/sketch.exp.svg b/e2etests/testdata/stable/elk_shim/elk/sketch.exp.svg index c3810254b..3595fa0cb 100644 --- a/e2etests/testdata/stable/elk_shim/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/elk_shim/elk/sketch.exp.svg @@ -1,23 +1,23 @@ -networkuserapi serverlogscell toweronline portaldata processorsatellitestransmitteruistorage sendsendsendphone logsmake call accessdisplaypersist - + .d2-40321108 .fill-N1{fill:#0A0F25;} + .d2-40321108 .fill-N2{fill:#676C7E;} + .d2-40321108 .fill-N3{fill:#9499AB;} + .d2-40321108 .fill-N4{fill:#CFD2DD;} + .d2-40321108 .fill-N5{fill:#DEE1EB;} + .d2-40321108 .fill-N6{fill:#EEF1F8;} + .d2-40321108 .fill-N7{fill:#FFFFFF;} + .d2-40321108 .fill-B1{fill:#0D32B2;} + .d2-40321108 .fill-B2{fill:#0D32B2;} + .d2-40321108 .fill-B3{fill:#E3E9FD;} + .d2-40321108 .fill-B4{fill:#E3E9FD;} + .d2-40321108 .fill-B5{fill:#EDF0FD;} + .d2-40321108 .fill-B6{fill:#F7F8FE;} + .d2-40321108 .fill-AA2{fill:#4A6FF3;} + .d2-40321108 .fill-AA4{fill:#EDF0FD;} + .d2-40321108 .fill-AA5{fill:#F7F8FE;} + .d2-40321108 .fill-AB4{fill:#EDF0FD;} + .d2-40321108 .fill-AB5{fill:#F7F8FE;} + .d2-40321108 .stroke-N1{stroke:#0A0F25;} + .d2-40321108 .stroke-N2{stroke:#676C7E;} + .d2-40321108 .stroke-N3{stroke:#9499AB;} + .d2-40321108 .stroke-N4{stroke:#CFD2DD;} + .d2-40321108 .stroke-N5{stroke:#DEE1EB;} + .d2-40321108 .stroke-N6{stroke:#EEF1F8;} + .d2-40321108 .stroke-N7{stroke:#FFFFFF;} + .d2-40321108 .stroke-B1{stroke:#0D32B2;} + .d2-40321108 .stroke-B2{stroke:#0D32B2;} + .d2-40321108 .stroke-B3{stroke:#E3E9FD;} + .d2-40321108 .stroke-B4{stroke:#E3E9FD;} + .d2-40321108 .stroke-B5{stroke:#EDF0FD;} + .d2-40321108 .stroke-B6{stroke:#F7F8FE;} + .d2-40321108 .stroke-AA2{stroke:#4A6FF3;} + .d2-40321108 .stroke-AA4{stroke:#EDF0FD;} + .d2-40321108 .stroke-AA5{stroke:#F7F8FE;} + .d2-40321108 .stroke-AB4{stroke:#EDF0FD;} + .d2-40321108 .stroke-AB5{stroke:#F7F8FE;} + .d2-40321108 .background-color-N1{background-color:#0A0F25;} + .d2-40321108 .background-color-N2{background-color:#676C7E;} + .d2-40321108 .background-color-N3{background-color:#9499AB;} + .d2-40321108 .background-color-N4{background-color:#CFD2DD;} + .d2-40321108 .background-color-N5{background-color:#DEE1EB;} + .d2-40321108 .background-color-N6{background-color:#EEF1F8;} + .d2-40321108 .background-color-N7{background-color:#FFFFFF;} + .d2-40321108 .background-color-B1{background-color:#0D32B2;} + .d2-40321108 .background-color-B2{background-color:#0D32B2;} + .d2-40321108 .background-color-B3{background-color:#E3E9FD;} + .d2-40321108 .background-color-B4{background-color:#E3E9FD;} + .d2-40321108 .background-color-B5{background-color:#EDF0FD;} + .d2-40321108 .background-color-B6{background-color:#F7F8FE;} + .d2-40321108 .background-color-AA2{background-color:#4A6FF3;} + .d2-40321108 .background-color-AA4{background-color:#EDF0FD;} + .d2-40321108 .background-color-AA5{background-color:#F7F8FE;} + .d2-40321108 .background-color-AB4{background-color:#EDF0FD;} + .d2-40321108 .background-color-AB5{background-color:#F7F8FE;} + .d2-40321108 .color-N1{color:#0A0F25;} + .d2-40321108 .color-N2{color:#676C7E;} + .d2-40321108 .color-N3{color:#9499AB;} + .d2-40321108 .color-N4{color:#CFD2DD;} + .d2-40321108 .color-N5{color:#DEE1EB;} + .d2-40321108 .color-N6{color:#EEF1F8;} + .d2-40321108 .color-N7{color:#FFFFFF;} + .d2-40321108 .color-B1{color:#0D32B2;} + .d2-40321108 .color-B2{color:#0D32B2;} + .d2-40321108 .color-B3{color:#E3E9FD;} + .d2-40321108 .color-B4{color:#E3E9FD;} + .d2-40321108 .color-B5{color:#EDF0FD;} + .d2-40321108 .color-B6{color:#F7F8FE;} + .d2-40321108 .color-AA2{color:#4A6FF3;} + .d2-40321108 .color-AA4{color:#EDF0FD;} + .d2-40321108 .color-AA5{color:#F7F8FE;} + .d2-40321108 .color-AB4{color:#EDF0FD;} + .d2-40321108 .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/font_sizes_containers_large/elk/board.exp.json b/e2etests/testdata/stable/font_sizes_containers_large/elk/board.exp.json index a05e2b636..afc33fcc2 100644 --- a/e2etests/testdata/stable/font_sizes_containers_large/elk/board.exp.json +++ b/e2etests/testdata/stable/font_sizes_containers_large/elk/board.exp.json @@ -10,7 +10,7 @@ "x": 12, "y": 12 }, - "width": 464, + "width": 497, "height": 572, "opacity": 1, "strokeDash": 0, @@ -48,7 +48,7 @@ "id": "ninety nine.sixty four", "type": "rectangle", "pos": { - "x": 62, + "x": 78, "y": 142 }, "width": 364, @@ -89,7 +89,7 @@ "id": "ninety nine.sixty four.thirty two", "type": "rectangle", "pos": { - "x": 112, + "x": 128, "y": 228 }, "width": 264, @@ -130,7 +130,7 @@ "id": "ninety nine.sixty four.thirty two.sixteen", "type": "rectangle", "pos": { - "x": 162, + "x": 178, "y": 278 }, "width": 164, @@ -171,7 +171,7 @@ "id": "ninety nine.sixty four.thirty two.sixteen.eight", "type": "rectangle", "pos": { - "x": 212, + "x": 228, "y": 328 }, "width": 64, diff --git a/e2etests/testdata/stable/font_sizes_containers_large/elk/sketch.exp.svg b/e2etests/testdata/stable/font_sizes_containers_large/elk/sketch.exp.svg index 2355ef027..db9b6b468 100644 --- a/e2etests/testdata/stable/font_sizes_containers_large/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/font_sizes_containers_large/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -ninety ninesixty fourthirty twosixteeneight - + .d2-4155058823 .fill-N1{fill:#0A0F25;} + .d2-4155058823 .fill-N2{fill:#676C7E;} + .d2-4155058823 .fill-N3{fill:#9499AB;} + .d2-4155058823 .fill-N4{fill:#CFD2DD;} + .d2-4155058823 .fill-N5{fill:#DEE1EB;} + .d2-4155058823 .fill-N6{fill:#EEF1F8;} + .d2-4155058823 .fill-N7{fill:#FFFFFF;} + .d2-4155058823 .fill-B1{fill:#0D32B2;} + .d2-4155058823 .fill-B2{fill:#0D32B2;} + .d2-4155058823 .fill-B3{fill:#E3E9FD;} + .d2-4155058823 .fill-B4{fill:#E3E9FD;} + .d2-4155058823 .fill-B5{fill:#EDF0FD;} + .d2-4155058823 .fill-B6{fill:#F7F8FE;} + .d2-4155058823 .fill-AA2{fill:#4A6FF3;} + .d2-4155058823 .fill-AA4{fill:#EDF0FD;} + .d2-4155058823 .fill-AA5{fill:#F7F8FE;} + .d2-4155058823 .fill-AB4{fill:#EDF0FD;} + .d2-4155058823 .fill-AB5{fill:#F7F8FE;} + .d2-4155058823 .stroke-N1{stroke:#0A0F25;} + .d2-4155058823 .stroke-N2{stroke:#676C7E;} + .d2-4155058823 .stroke-N3{stroke:#9499AB;} + .d2-4155058823 .stroke-N4{stroke:#CFD2DD;} + .d2-4155058823 .stroke-N5{stroke:#DEE1EB;} + .d2-4155058823 .stroke-N6{stroke:#EEF1F8;} + .d2-4155058823 .stroke-N7{stroke:#FFFFFF;} + .d2-4155058823 .stroke-B1{stroke:#0D32B2;} + .d2-4155058823 .stroke-B2{stroke:#0D32B2;} + .d2-4155058823 .stroke-B3{stroke:#E3E9FD;} + .d2-4155058823 .stroke-B4{stroke:#E3E9FD;} + .d2-4155058823 .stroke-B5{stroke:#EDF0FD;} + .d2-4155058823 .stroke-B6{stroke:#F7F8FE;} + .d2-4155058823 .stroke-AA2{stroke:#4A6FF3;} + .d2-4155058823 .stroke-AA4{stroke:#EDF0FD;} + .d2-4155058823 .stroke-AA5{stroke:#F7F8FE;} + .d2-4155058823 .stroke-AB4{stroke:#EDF0FD;} + .d2-4155058823 .stroke-AB5{stroke:#F7F8FE;} + .d2-4155058823 .background-color-N1{background-color:#0A0F25;} + .d2-4155058823 .background-color-N2{background-color:#676C7E;} + .d2-4155058823 .background-color-N3{background-color:#9499AB;} + .d2-4155058823 .background-color-N4{background-color:#CFD2DD;} + .d2-4155058823 .background-color-N5{background-color:#DEE1EB;} + .d2-4155058823 .background-color-N6{background-color:#EEF1F8;} + .d2-4155058823 .background-color-N7{background-color:#FFFFFF;} + .d2-4155058823 .background-color-B1{background-color:#0D32B2;} + .d2-4155058823 .background-color-B2{background-color:#0D32B2;} + .d2-4155058823 .background-color-B3{background-color:#E3E9FD;} + .d2-4155058823 .background-color-B4{background-color:#E3E9FD;} + .d2-4155058823 .background-color-B5{background-color:#EDF0FD;} + .d2-4155058823 .background-color-B6{background-color:#F7F8FE;} + .d2-4155058823 .background-color-AA2{background-color:#4A6FF3;} + .d2-4155058823 .background-color-AA4{background-color:#EDF0FD;} + .d2-4155058823 .background-color-AA5{background-color:#F7F8FE;} + .d2-4155058823 .background-color-AB4{background-color:#EDF0FD;} + .d2-4155058823 .background-color-AB5{background-color:#F7F8FE;} + .d2-4155058823 .color-N1{color:#0A0F25;} + .d2-4155058823 .color-N2{color:#676C7E;} + .d2-4155058823 .color-N3{color:#9499AB;} + .d2-4155058823 .color-N4{color:#CFD2DD;} + .d2-4155058823 .color-N5{color:#DEE1EB;} + .d2-4155058823 .color-N6{color:#EEF1F8;} + .d2-4155058823 .color-N7{color:#FFFFFF;} + .d2-4155058823 .color-B1{color:#0D32B2;} + .d2-4155058823 .color-B2{color:#0D32B2;} + .d2-4155058823 .color-B3{color:#E3E9FD;} + .d2-4155058823 .color-B4{color:#E3E9FD;} + .d2-4155058823 .color-B5{color:#EDF0FD;} + .d2-4155058823 .color-B6{color:#F7F8FE;} + .d2-4155058823 .color-AA2{color:#4A6FF3;} + .d2-4155058823 .color-AA4{color:#EDF0FD;} + .d2-4155058823 .color-AA5{color:#F7F8FE;} + .d2-4155058823 .color-AB4{color:#EDF0FD;} + .d2-4155058823 .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/elk/board.exp.json b/e2etests/testdata/stable/font_sizes_containers_large_right/elk/board.exp.json index a05e2b636..afc33fcc2 100644 --- a/e2etests/testdata/stable/font_sizes_containers_large_right/elk/board.exp.json +++ b/e2etests/testdata/stable/font_sizes_containers_large_right/elk/board.exp.json @@ -10,7 +10,7 @@ "x": 12, "y": 12 }, - "width": 464, + "width": 497, "height": 572, "opacity": 1, "strokeDash": 0, @@ -48,7 +48,7 @@ "id": "ninety nine.sixty four", "type": "rectangle", "pos": { - "x": 62, + "x": 78, "y": 142 }, "width": 364, @@ -89,7 +89,7 @@ "id": "ninety nine.sixty four.thirty two", "type": "rectangle", "pos": { - "x": 112, + "x": 128, "y": 228 }, "width": 264, @@ -130,7 +130,7 @@ "id": "ninety nine.sixty four.thirty two.sixteen", "type": "rectangle", "pos": { - "x": 162, + "x": 178, "y": 278 }, "width": 164, @@ -171,7 +171,7 @@ "id": "ninety nine.sixty four.thirty two.sixteen.eight", "type": "rectangle", "pos": { - "x": 212, + "x": 228, "y": 328 }, "width": 64, diff --git a/e2etests/testdata/stable/font_sizes_containers_large_right/elk/sketch.exp.svg b/e2etests/testdata/stable/font_sizes_containers_large_right/elk/sketch.exp.svg index 2355ef027..db9b6b468 100644 --- a/e2etests/testdata/stable/font_sizes_containers_large_right/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/font_sizes_containers_large_right/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -ninety ninesixty fourthirty twosixteeneight - + .d2-4155058823 .fill-N1{fill:#0A0F25;} + .d2-4155058823 .fill-N2{fill:#676C7E;} + .d2-4155058823 .fill-N3{fill:#9499AB;} + .d2-4155058823 .fill-N4{fill:#CFD2DD;} + .d2-4155058823 .fill-N5{fill:#DEE1EB;} + .d2-4155058823 .fill-N6{fill:#EEF1F8;} + .d2-4155058823 .fill-N7{fill:#FFFFFF;} + .d2-4155058823 .fill-B1{fill:#0D32B2;} + .d2-4155058823 .fill-B2{fill:#0D32B2;} + .d2-4155058823 .fill-B3{fill:#E3E9FD;} + .d2-4155058823 .fill-B4{fill:#E3E9FD;} + .d2-4155058823 .fill-B5{fill:#EDF0FD;} + .d2-4155058823 .fill-B6{fill:#F7F8FE;} + .d2-4155058823 .fill-AA2{fill:#4A6FF3;} + .d2-4155058823 .fill-AA4{fill:#EDF0FD;} + .d2-4155058823 .fill-AA5{fill:#F7F8FE;} + .d2-4155058823 .fill-AB4{fill:#EDF0FD;} + .d2-4155058823 .fill-AB5{fill:#F7F8FE;} + .d2-4155058823 .stroke-N1{stroke:#0A0F25;} + .d2-4155058823 .stroke-N2{stroke:#676C7E;} + .d2-4155058823 .stroke-N3{stroke:#9499AB;} + .d2-4155058823 .stroke-N4{stroke:#CFD2DD;} + .d2-4155058823 .stroke-N5{stroke:#DEE1EB;} + .d2-4155058823 .stroke-N6{stroke:#EEF1F8;} + .d2-4155058823 .stroke-N7{stroke:#FFFFFF;} + .d2-4155058823 .stroke-B1{stroke:#0D32B2;} + .d2-4155058823 .stroke-B2{stroke:#0D32B2;} + .d2-4155058823 .stroke-B3{stroke:#E3E9FD;} + .d2-4155058823 .stroke-B4{stroke:#E3E9FD;} + .d2-4155058823 .stroke-B5{stroke:#EDF0FD;} + .d2-4155058823 .stroke-B6{stroke:#F7F8FE;} + .d2-4155058823 .stroke-AA2{stroke:#4A6FF3;} + .d2-4155058823 .stroke-AA4{stroke:#EDF0FD;} + .d2-4155058823 .stroke-AA5{stroke:#F7F8FE;} + .d2-4155058823 .stroke-AB4{stroke:#EDF0FD;} + .d2-4155058823 .stroke-AB5{stroke:#F7F8FE;} + .d2-4155058823 .background-color-N1{background-color:#0A0F25;} + .d2-4155058823 .background-color-N2{background-color:#676C7E;} + .d2-4155058823 .background-color-N3{background-color:#9499AB;} + .d2-4155058823 .background-color-N4{background-color:#CFD2DD;} + .d2-4155058823 .background-color-N5{background-color:#DEE1EB;} + .d2-4155058823 .background-color-N6{background-color:#EEF1F8;} + .d2-4155058823 .background-color-N7{background-color:#FFFFFF;} + .d2-4155058823 .background-color-B1{background-color:#0D32B2;} + .d2-4155058823 .background-color-B2{background-color:#0D32B2;} + .d2-4155058823 .background-color-B3{background-color:#E3E9FD;} + .d2-4155058823 .background-color-B4{background-color:#E3E9FD;} + .d2-4155058823 .background-color-B5{background-color:#EDF0FD;} + .d2-4155058823 .background-color-B6{background-color:#F7F8FE;} + .d2-4155058823 .background-color-AA2{background-color:#4A6FF3;} + .d2-4155058823 .background-color-AA4{background-color:#EDF0FD;} + .d2-4155058823 .background-color-AA5{background-color:#F7F8FE;} + .d2-4155058823 .background-color-AB4{background-color:#EDF0FD;} + .d2-4155058823 .background-color-AB5{background-color:#F7F8FE;} + .d2-4155058823 .color-N1{color:#0A0F25;} + .d2-4155058823 .color-N2{color:#676C7E;} + .d2-4155058823 .color-N3{color:#9499AB;} + .d2-4155058823 .color-N4{color:#CFD2DD;} + .d2-4155058823 .color-N5{color:#DEE1EB;} + .d2-4155058823 .color-N6{color:#EEF1F8;} + .d2-4155058823 .color-N7{color:#FFFFFF;} + .d2-4155058823 .color-B1{color:#0D32B2;} + .d2-4155058823 .color-B2{color:#0D32B2;} + .d2-4155058823 .color-B3{color:#E3E9FD;} + .d2-4155058823 .color-B4{color:#E3E9FD;} + .d2-4155058823 .color-B5{color:#EDF0FD;} + .d2-4155058823 .color-B6{color:#F7F8FE;} + .d2-4155058823 .color-AA2{color:#4A6FF3;} + .d2-4155058823 .color-AA4{color:#EDF0FD;} + .d2-4155058823 .color-AA5{color:#F7F8FE;} + .d2-4155058823 .color-AB4{color:#EDF0FD;} + .d2-4155058823 .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/todo/container_label_edge_adjustment/elk/board.exp.json b/e2etests/testdata/todo/container_label_edge_adjustment/elk/board.exp.json index c873f8fed..fc7d41eef 100644 --- a/e2etests/testdata/todo/container_label_edge_adjustment/elk/board.exp.json +++ b/e2etests/testdata/todo/container_label_edge_adjustment/elk/board.exp.json @@ -7,7 +7,7 @@ "id": "a", "type": "rectangle", "pos": { - "x": 12, + "x": 41, "y": 12 }, "width": 53, @@ -48,10 +48,10 @@ "id": "b", "type": "cloud", "pos": { - "x": 39, + "x": 12, "y": 213 }, - "width": 180, + "width": 294, "height": 166, "opacity": 1, "strokeDash": 0, @@ -89,7 +89,7 @@ "id": "b.c", "type": "rectangle", "pos": { - "x": 89, + "x": 119, "y": 263 }, "width": 80, @@ -130,7 +130,7 @@ "id": "d", "type": "rectangle", "pos": { - "x": 102, + "x": 132, "y": 454 }, "width": 54, @@ -171,7 +171,7 @@ "id": "e", "type": "rectangle", "pos": { - "x": 85, + "x": 114, "y": 12 }, "width": 53, @@ -212,7 +212,7 @@ "id": "f", "type": "rectangle", "pos": { - "x": 158, + "x": 187, "y": 12 }, "width": 51, @@ -253,7 +253,7 @@ "id": "g", "type": "rectangle", "pos": { - "x": 229, + "x": 258, "y": 12 }, "width": 54, @@ -319,19 +319,19 @@ "labelPercentage": 0, "route": [ { - "x": 38.5, + "x": 68.33333333333337, "y": 78 }, { - "x": 38.5, + "x": 68.33333333333337, "y": 168 }, { - "x": 115.8333333333333, + "x": 145.66666666666669, "y": 168 }, { - "x": 115.8333333333333, + "x": 145.66666666666669, "y": 263 } ], @@ -367,11 +367,11 @@ "labelPercentage": 0, "route": [ { - "x": 129.16666666666663, + "x": 159, "y": 329 }, { - "x": 129.16666666666663, + "x": 159, "y": 454 } ], @@ -407,19 +407,19 @@ "labelPercentage": 0, "route": [ { - "x": 111.5, + "x": 141.33333333333337, "y": 78 }, { - "x": 111.5, + "x": 141.33333333333337, "y": 118 }, { - "x": 142.49999999999997, + "x": 172.33333333333334, "y": 118 }, { - "x": 142.49999999999997, + "x": 172.33333333333334, "y": 263 } ], @@ -455,20 +455,20 @@ "labelPercentage": 0, "route": [ { - "x": 183.5, + "x": 213.33333333333337, "y": 78 }, { - "x": 183.5, + "x": 213.33333333333337, "y": 118 }, { - "x": 152.49999999999997, + "x": 182.33333333333334, "y": 118 }, { - "x": 153, - "y": 214 + "x": 182, + "y": 212 } ], "animated": false, @@ -503,20 +503,12 @@ "labelPercentage": 0, "route": [ { - "x": 256, + "x": 285.83333333333337, "y": 78 }, { - "x": 256, - "y": 168 - }, - { - "x": 162.49999999999997, - "y": 168 - }, - { - "x": 163, - "y": 219 + "x": 286, + "y": 281 } ], "animated": false, diff --git a/e2etests/testdata/todo/container_label_edge_adjustment/elk/sketch.exp.svg b/e2etests/testdata/todo/container_label_edge_adjustment/elk/sketch.exp.svg index f026c19af..87392f0d7 100644 --- a/e2etests/testdata/todo/container_label_edge_adjustment/elk/sketch.exp.svg +++ b/e2etests/testdata/todo/container_label_edge_adjustment/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -aa container labeldefgc - + .d2-621565839 .fill-N1{fill:#0A0F25;} + .d2-621565839 .fill-N2{fill:#676C7E;} + .d2-621565839 .fill-N3{fill:#9499AB;} + .d2-621565839 .fill-N4{fill:#CFD2DD;} + .d2-621565839 .fill-N5{fill:#DEE1EB;} + .d2-621565839 .fill-N6{fill:#EEF1F8;} + .d2-621565839 .fill-N7{fill:#FFFFFF;} + .d2-621565839 .fill-B1{fill:#0D32B2;} + .d2-621565839 .fill-B2{fill:#0D32B2;} + .d2-621565839 .fill-B3{fill:#E3E9FD;} + .d2-621565839 .fill-B4{fill:#E3E9FD;} + .d2-621565839 .fill-B5{fill:#EDF0FD;} + .d2-621565839 .fill-B6{fill:#F7F8FE;} + .d2-621565839 .fill-AA2{fill:#4A6FF3;} + .d2-621565839 .fill-AA4{fill:#EDF0FD;} + .d2-621565839 .fill-AA5{fill:#F7F8FE;} + .d2-621565839 .fill-AB4{fill:#EDF0FD;} + .d2-621565839 .fill-AB5{fill:#F7F8FE;} + .d2-621565839 .stroke-N1{stroke:#0A0F25;} + .d2-621565839 .stroke-N2{stroke:#676C7E;} + .d2-621565839 .stroke-N3{stroke:#9499AB;} + .d2-621565839 .stroke-N4{stroke:#CFD2DD;} + .d2-621565839 .stroke-N5{stroke:#DEE1EB;} + .d2-621565839 .stroke-N6{stroke:#EEF1F8;} + .d2-621565839 .stroke-N7{stroke:#FFFFFF;} + .d2-621565839 .stroke-B1{stroke:#0D32B2;} + .d2-621565839 .stroke-B2{stroke:#0D32B2;} + .d2-621565839 .stroke-B3{stroke:#E3E9FD;} + .d2-621565839 .stroke-B4{stroke:#E3E9FD;} + .d2-621565839 .stroke-B5{stroke:#EDF0FD;} + .d2-621565839 .stroke-B6{stroke:#F7F8FE;} + .d2-621565839 .stroke-AA2{stroke:#4A6FF3;} + .d2-621565839 .stroke-AA4{stroke:#EDF0FD;} + .d2-621565839 .stroke-AA5{stroke:#F7F8FE;} + .d2-621565839 .stroke-AB4{stroke:#EDF0FD;} + .d2-621565839 .stroke-AB5{stroke:#F7F8FE;} + .d2-621565839 .background-color-N1{background-color:#0A0F25;} + .d2-621565839 .background-color-N2{background-color:#676C7E;} + .d2-621565839 .background-color-N3{background-color:#9499AB;} + .d2-621565839 .background-color-N4{background-color:#CFD2DD;} + .d2-621565839 .background-color-N5{background-color:#DEE1EB;} + .d2-621565839 .background-color-N6{background-color:#EEF1F8;} + .d2-621565839 .background-color-N7{background-color:#FFFFFF;} + .d2-621565839 .background-color-B1{background-color:#0D32B2;} + .d2-621565839 .background-color-B2{background-color:#0D32B2;} + .d2-621565839 .background-color-B3{background-color:#E3E9FD;} + .d2-621565839 .background-color-B4{background-color:#E3E9FD;} + .d2-621565839 .background-color-B5{background-color:#EDF0FD;} + .d2-621565839 .background-color-B6{background-color:#F7F8FE;} + .d2-621565839 .background-color-AA2{background-color:#4A6FF3;} + .d2-621565839 .background-color-AA4{background-color:#EDF0FD;} + .d2-621565839 .background-color-AA5{background-color:#F7F8FE;} + .d2-621565839 .background-color-AB4{background-color:#EDF0FD;} + .d2-621565839 .background-color-AB5{background-color:#F7F8FE;} + .d2-621565839 .color-N1{color:#0A0F25;} + .d2-621565839 .color-N2{color:#676C7E;} + .d2-621565839 .color-N3{color:#9499AB;} + .d2-621565839 .color-N4{color:#CFD2DD;} + .d2-621565839 .color-N5{color:#DEE1EB;} + .d2-621565839 .color-N6{color:#EEF1F8;} + .d2-621565839 .color-N7{color:#FFFFFF;} + .d2-621565839 .color-B1{color:#0D32B2;} + .d2-621565839 .color-B2{color:#0D32B2;} + .d2-621565839 .color-B3{color:#E3E9FD;} + .d2-621565839 .color-B4{color:#E3E9FD;} + .d2-621565839 .color-B5{color:#EDF0FD;} + .d2-621565839 .color-B6{color:#F7F8FE;} + .d2-621565839 .color-AA2{color:#4A6FF3;} + .d2-621565839 .color-AA4{color:#EDF0FD;} + .d2-621565839 .color-AA5{color:#F7F8FE;} + .d2-621565839 .color-AB4{color:#EDF0FD;} + .d2-621565839 .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/shape_set_width_height/elk/board.exp.json b/e2etests/testdata/todo/shape_set_width_height/elk/board.exp.json index 2907d8c2e..bb1404527 100644 --- a/e2etests/testdata/todo/shape_set_width_height/elk/board.exp.json +++ b/e2etests/testdata/todo/shape_set_width_height/elk/board.exp.json @@ -10,7 +10,7 @@ "x": 12, "y": 12 }, - "width": 1072, + "width": 1388, "height": 328, "opacity": 1, "strokeDash": 0, @@ -49,10 +49,10 @@ "type": "oval", "pos": { "x": 62, - "y": 94 + "y": 76 }, "width": 228, - "height": 164, + "height": 200, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -133,7 +133,7 @@ "x": 310, "y": 62 }, - "width": 228, + "width": 414, "height": 228, "opacity": 1, "strokeDash": 0, @@ -171,7 +171,7 @@ "id": "containers.diamond container.circle", "type": "oval", "pos": { - "x": 360, + "x": 453, "y": 112 }, "width": 128, @@ -212,10 +212,10 @@ "id": "containers.oval container", "type": "oval", "pos": { - "x": 558, + "x": 744, "y": 94 }, - "width": 228, + "width": 266, "height": 164, "opacity": 1, "strokeDash": 0, @@ -253,7 +253,7 @@ "id": "containers.oval container.hexagon", "type": "hexagon", "pos": { - "x": 608, + "x": 813, "y": 144 }, "width": 128, @@ -294,10 +294,10 @@ "id": "containers.hexagon container", "type": "hexagon", "pos": { - "x": 806, + "x": 1030, "y": 94 }, - "width": 228, + "width": 320, "height": 164, "opacity": 1, "strokeDash": 0, @@ -335,7 +335,7 @@ "id": "containers.hexagon container.oval", "type": "oval", "pos": { - "x": 856, + "x": 1126, "y": 144 }, "width": 128, @@ -376,7 +376,7 @@ "id": "cloud", "type": "cloud", "pos": { - "x": 1104, + "x": 1420, "y": 84 }, "width": 512, @@ -417,7 +417,7 @@ "id": "tall cylinder", "type": "cylinder", "pos": { - "x": 1232, + "x": 1548, "y": 1280 }, "width": 256, @@ -458,7 +458,7 @@ "id": "class", "type": "class", "pos": { - "x": 960, + "x": 1276, "y": 610 }, "width": 800, @@ -533,7 +533,7 @@ "id": "users", "type": "sql_table", "pos": { - "x": 960, + "x": 1276, "y": 1862 }, "width": 800, @@ -717,7 +717,7 @@ "id": "container", "type": "rectangle", "pos": { - "x": 1923, + "x": 2239, "y": 274 }, "width": 114, @@ -758,7 +758,7 @@ "id": "text", "type": "text", "pos": { - "x": 1780, + "x": 2096, "y": 410 }, "width": 400, @@ -798,7 +798,7 @@ "id": "code", "type": "code", "pos": { - "x": 1780, + "x": 2096, "y": 1386 }, "width": 400, @@ -838,7 +838,7 @@ "id": "small code", "type": "code", "pos": { - "x": 1884, + "x": 2200, "y": 1862 }, "width": 191, @@ -903,11 +903,11 @@ "labelPercentage": 0, "route": [ { - "x": 1360, + "x": 1676, "y": 339 }, { - "x": 1360, + "x": 1676, "y": 610 } ], @@ -943,11 +943,11 @@ "labelPercentage": 0, "route": [ { - "x": 1360, + "x": 1676, "y": 1010 }, { - "x": 1360, + "x": 1676, "y": 1280 } ], @@ -983,11 +983,11 @@ "labelPercentage": 0, "route": [ { - "x": 1360, + "x": 1676, "y": 1792 }, { - "x": 1360, + "x": 1676, "y": 1862 } ], @@ -1023,11 +1023,11 @@ "labelPercentage": 0, "route": [ { - "x": 1980, + "x": 2296, "y": 340 }, { - "x": 1980, + "x": 2296, "y": 410 } ], @@ -1063,11 +1063,11 @@ "labelPercentage": 0, "route": [ { - "x": 1980, + "x": 2296, "y": 1210 }, { - "x": 1980, + "x": 2296, "y": 1386 } ], @@ -1103,11 +1103,11 @@ "labelPercentage": 0, "route": [ { - "x": 1980, + "x": 2296, "y": 1686 }, { - "x": 1980, + "x": 2296, "y": 1862 } ], diff --git a/e2etests/testdata/todo/shape_set_width_height/elk/sketch.exp.svg b/e2etests/testdata/todo/shape_set_width_height/elk/sketch.exp.svg index 76b3c6abc..079e52abc 100644 --- a/e2etests/testdata/todo/shape_set_width_height/elk/sketch.exp.svg +++ b/e2etests/testdata/todo/shape_set_width_height/elk/sketch.exp.svg @@ -1,30 +1,30 @@ -containerscloudtall cylinderclass-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voidusersidintnamestringemailstringpasswordstringlast_logindatetimecontainer

markdown text expanded to 800x400

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

markdown text expanded to 800x400

+
a := 5 b := a + 7 -fmt.Printf("%d", b)a := 5 +fmt.Printf("%d", b)a := 5 b := a + 7 -fmt.Printf("%d", b)a := 5 +fmt.Printf("%d", b)a := 5 b := a + 7 -fmt.Printf("%d", b)a := 5 +fmt.Printf("%d", b)a := 5 b := a + 7 -fmt.Printf("%d", b)circle containerdiamond containeroval containerhexagon containerdiamondcirclehexagonoval - +fmt.Printf("%d", b)circle containerdiamond containeroval containerhexagon containerdiamondcirclehexagonoval + \ No newline at end of file