diff --git a/ci/release/changelogs/next.md b/ci/release/changelogs/next.md index 7dd5fcc66c..317fa401ca 100644 --- a/ci/release/changelogs/next.md +++ b/ci/release/changelogs/next.md @@ -4,5 +4,6 @@ - Sequence diagram edge groups account for edge label heights [#2038](https://github.com/terrastruct/d2/pull/2038) - Sequence diagram self-referential edges account for edge label heights [#2040](https://github.com/terrastruct/d2/pull/2040) +- Sequence diagram: The spacing between self-referential edges and regular edges is uniform [#2043](https://github.com/terrastruct/d2/pull/2043) #### Bugfixes ⛑️ diff --git a/d2layouts/d2sequence/sequence_diagram.go b/d2layouts/d2sequence/sequence_diagram.go index 394adccc65..f93b503992 100644 --- a/d2layouts/d2sequence/sequence_diagram.go +++ b/d2layouts/d2sequence/sequence_diagram.go @@ -536,7 +536,6 @@ func (sd *sequenceDiagram) placeSpans() { // in another step, routes are adjusted to spans borders when necessary func (sd *sequenceDiagram) routeMessages() error { var prevIsLoop bool - var prevGroup *d2graph.Object messageOffset := sd.maxActorHeight + sd.yStep for _, message := range sd.messages { message.ZIndex = MESSAGE_Z_INDEX @@ -547,12 +546,10 @@ func (sd *sequenceDiagram) routeMessages() error { } } - // we need extra space if the previous message is a loop in a different group - group := message.GetGroup() - if prevIsLoop && prevGroup != group { - messageOffset += MIN_MESSAGE_DISTANCE + // we need extra space if the previous message is a loop + if prevIsLoop { + messageOffset += MIN_MESSAGE_DISTANCE * 1.5 } - prevGroup = group startY := messageOffset + noteOffset diff --git a/d2renderers/d2svg/appendix/testdata/diagram_wider_than_tooltip/sketch.exp.svg b/d2renderers/d2svg/appendix/testdata/diagram_wider_than_tooltip/sketch.exp.svg index 4a43ef05bd..6036db20d5 100644 --- a/d2renderers/d2svg/appendix/testdata/diagram_wider_than_tooltip/sketch.exp.svg +++ b/d2renderers/d2svg/appendix/testdata/diagram_wider_than_tooltip/sketch.exp.svg @@ -1,19 +1,19 @@ -customerissuerstoreLike starbucks or somethingacquirerI'm not sure what this isnetworkcustomer bankstore bankinitial transactionpayment processor behind the scenessimplified 1 banana please$10 dollarsthinking: wow, inflationchecks bank accountSavings: $11I can do that, here's my cardRun this cardProcess to card issuerProcess this payment$10 debit$10 creditAn error in judgement is about to occurLike starbucks or something1I'm not sure what this is2 - + .d2-1932340008 .fill-N1{fill:#0A0F25;} + .d2-1932340008 .fill-N2{fill:#676C7E;} + .d2-1932340008 .fill-N3{fill:#9499AB;} + .d2-1932340008 .fill-N4{fill:#CFD2DD;} + .d2-1932340008 .fill-N5{fill:#DEE1EB;} + .d2-1932340008 .fill-N6{fill:#EEF1F8;} + .d2-1932340008 .fill-N7{fill:#FFFFFF;} + .d2-1932340008 .fill-B1{fill:#0D32B2;} + .d2-1932340008 .fill-B2{fill:#0D32B2;} + .d2-1932340008 .fill-B3{fill:#E3E9FD;} + .d2-1932340008 .fill-B4{fill:#E3E9FD;} + .d2-1932340008 .fill-B5{fill:#EDF0FD;} + .d2-1932340008 .fill-B6{fill:#F7F8FE;} + .d2-1932340008 .fill-AA2{fill:#4A6FF3;} + .d2-1932340008 .fill-AA4{fill:#EDF0FD;} + .d2-1932340008 .fill-AA5{fill:#F7F8FE;} + .d2-1932340008 .fill-AB4{fill:#EDF0FD;} + .d2-1932340008 .fill-AB5{fill:#F7F8FE;} + .d2-1932340008 .stroke-N1{stroke:#0A0F25;} + .d2-1932340008 .stroke-N2{stroke:#676C7E;} + .d2-1932340008 .stroke-N3{stroke:#9499AB;} + .d2-1932340008 .stroke-N4{stroke:#CFD2DD;} + .d2-1932340008 .stroke-N5{stroke:#DEE1EB;} + .d2-1932340008 .stroke-N6{stroke:#EEF1F8;} + .d2-1932340008 .stroke-N7{stroke:#FFFFFF;} + .d2-1932340008 .stroke-B1{stroke:#0D32B2;} + .d2-1932340008 .stroke-B2{stroke:#0D32B2;} + .d2-1932340008 .stroke-B3{stroke:#E3E9FD;} + .d2-1932340008 .stroke-B4{stroke:#E3E9FD;} + .d2-1932340008 .stroke-B5{stroke:#EDF0FD;} + .d2-1932340008 .stroke-B6{stroke:#F7F8FE;} + .d2-1932340008 .stroke-AA2{stroke:#4A6FF3;} + .d2-1932340008 .stroke-AA4{stroke:#EDF0FD;} + .d2-1932340008 .stroke-AA5{stroke:#F7F8FE;} + .d2-1932340008 .stroke-AB4{stroke:#EDF0FD;} + .d2-1932340008 .stroke-AB5{stroke:#F7F8FE;} + .d2-1932340008 .background-color-N1{background-color:#0A0F25;} + .d2-1932340008 .background-color-N2{background-color:#676C7E;} + .d2-1932340008 .background-color-N3{background-color:#9499AB;} + .d2-1932340008 .background-color-N4{background-color:#CFD2DD;} + .d2-1932340008 .background-color-N5{background-color:#DEE1EB;} + .d2-1932340008 .background-color-N6{background-color:#EEF1F8;} + .d2-1932340008 .background-color-N7{background-color:#FFFFFF;} + .d2-1932340008 .background-color-B1{background-color:#0D32B2;} + .d2-1932340008 .background-color-B2{background-color:#0D32B2;} + .d2-1932340008 .background-color-B3{background-color:#E3E9FD;} + .d2-1932340008 .background-color-B4{background-color:#E3E9FD;} + .d2-1932340008 .background-color-B5{background-color:#EDF0FD;} + .d2-1932340008 .background-color-B6{background-color:#F7F8FE;} + .d2-1932340008 .background-color-AA2{background-color:#4A6FF3;} + .d2-1932340008 .background-color-AA4{background-color:#EDF0FD;} + .d2-1932340008 .background-color-AA5{background-color:#F7F8FE;} + .d2-1932340008 .background-color-AB4{background-color:#EDF0FD;} + .d2-1932340008 .background-color-AB5{background-color:#F7F8FE;} + .d2-1932340008 .color-N1{color:#0A0F25;} + .d2-1932340008 .color-N2{color:#676C7E;} + .d2-1932340008 .color-N3{color:#9499AB;} + .d2-1932340008 .color-N4{color:#CFD2DD;} + .d2-1932340008 .color-N5{color:#DEE1EB;} + .d2-1932340008 .color-N6{color:#EEF1F8;} + .d2-1932340008 .color-N7{color:#FFFFFF;} + .d2-1932340008 .color-B1{color:#0D32B2;} + .d2-1932340008 .color-B2{color:#0D32B2;} + .d2-1932340008 .color-B3{color:#E3E9FD;} + .d2-1932340008 .color-B4{color:#E3E9FD;} + .d2-1932340008 .color-B5{color:#EDF0FD;} + .d2-1932340008 .color-B6{color:#F7F8FE;} + .d2-1932340008 .color-AA2{color:#4A6FF3;} + .d2-1932340008 .color-AA4{color:#EDF0FD;} + .d2-1932340008 .color-AA5{color:#F7F8FE;} + .d2-1932340008 .color-AB4{color:#EDF0FD;} + .d2-1932340008 .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}]]>customerissuerstoreLike starbucks or somethingacquirerI'm not sure what this isnetworkcustomer bankstore bankinitial transactionpayment processor behind the scenessimplified 1 banana please$10 dollarsthinking: wow, inflationchecks bank accountSavings: $11I can do that, here's my cardRun this cardProcess to card issuerProcess this payment$10 debit$10 creditAn error in judgement is about to occurLike starbucks or something1I'm not sure what this is2 + @@ -109,22 +109,22 @@ - - + + - - - - - - - - + + + + + + + + -1Like starbucks or something -2I'm not sure what this is +1Like starbucks or something +2I'm not sure what this is ABCgroup 1group 2group 3group 4group 5group 6group 7group 8group 9group 10group 11 - + .d2-1332431490 .fill-N1{fill:#0A0F25;} + .d2-1332431490 .fill-N2{fill:#676C7E;} + .d2-1332431490 .fill-N3{fill:#9499AB;} + .d2-1332431490 .fill-N4{fill:#CFD2DD;} + .d2-1332431490 .fill-N5{fill:#DEE1EB;} + .d2-1332431490 .fill-N6{fill:#EEF1F8;} + .d2-1332431490 .fill-N7{fill:#FFFFFF;} + .d2-1332431490 .fill-B1{fill:#0D32B2;} + .d2-1332431490 .fill-B2{fill:#0D32B2;} + .d2-1332431490 .fill-B3{fill:#E3E9FD;} + .d2-1332431490 .fill-B4{fill:#E3E9FD;} + .d2-1332431490 .fill-B5{fill:#EDF0FD;} + .d2-1332431490 .fill-B6{fill:#F7F8FE;} + .d2-1332431490 .fill-AA2{fill:#4A6FF3;} + .d2-1332431490 .fill-AA4{fill:#EDF0FD;} + .d2-1332431490 .fill-AA5{fill:#F7F8FE;} + .d2-1332431490 .fill-AB4{fill:#EDF0FD;} + .d2-1332431490 .fill-AB5{fill:#F7F8FE;} + .d2-1332431490 .stroke-N1{stroke:#0A0F25;} + .d2-1332431490 .stroke-N2{stroke:#676C7E;} + .d2-1332431490 .stroke-N3{stroke:#9499AB;} + .d2-1332431490 .stroke-N4{stroke:#CFD2DD;} + .d2-1332431490 .stroke-N5{stroke:#DEE1EB;} + .d2-1332431490 .stroke-N6{stroke:#EEF1F8;} + .d2-1332431490 .stroke-N7{stroke:#FFFFFF;} + .d2-1332431490 .stroke-B1{stroke:#0D32B2;} + .d2-1332431490 .stroke-B2{stroke:#0D32B2;} + .d2-1332431490 .stroke-B3{stroke:#E3E9FD;} + .d2-1332431490 .stroke-B4{stroke:#E3E9FD;} + .d2-1332431490 .stroke-B5{stroke:#EDF0FD;} + .d2-1332431490 .stroke-B6{stroke:#F7F8FE;} + .d2-1332431490 .stroke-AA2{stroke:#4A6FF3;} + .d2-1332431490 .stroke-AA4{stroke:#EDF0FD;} + .d2-1332431490 .stroke-AA5{stroke:#F7F8FE;} + .d2-1332431490 .stroke-AB4{stroke:#EDF0FD;} + .d2-1332431490 .stroke-AB5{stroke:#F7F8FE;} + .d2-1332431490 .background-color-N1{background-color:#0A0F25;} + .d2-1332431490 .background-color-N2{background-color:#676C7E;} + .d2-1332431490 .background-color-N3{background-color:#9499AB;} + .d2-1332431490 .background-color-N4{background-color:#CFD2DD;} + .d2-1332431490 .background-color-N5{background-color:#DEE1EB;} + .d2-1332431490 .background-color-N6{background-color:#EEF1F8;} + .d2-1332431490 .background-color-N7{background-color:#FFFFFF;} + .d2-1332431490 .background-color-B1{background-color:#0D32B2;} + .d2-1332431490 .background-color-B2{background-color:#0D32B2;} + .d2-1332431490 .background-color-B3{background-color:#E3E9FD;} + .d2-1332431490 .background-color-B4{background-color:#E3E9FD;} + .d2-1332431490 .background-color-B5{background-color:#EDF0FD;} + .d2-1332431490 .background-color-B6{background-color:#F7F8FE;} + .d2-1332431490 .background-color-AA2{background-color:#4A6FF3;} + .d2-1332431490 .background-color-AA4{background-color:#EDF0FD;} + .d2-1332431490 .background-color-AA5{background-color:#F7F8FE;} + .d2-1332431490 .background-color-AB4{background-color:#EDF0FD;} + .d2-1332431490 .background-color-AB5{background-color:#F7F8FE;} + .d2-1332431490 .color-N1{color:#0A0F25;} + .d2-1332431490 .color-N2{color:#676C7E;} + .d2-1332431490 .color-N3{color:#9499AB;} + .d2-1332431490 .color-N4{color:#CFD2DD;} + .d2-1332431490 .color-N5{color:#DEE1EB;} + .d2-1332431490 .color-N6{color:#EEF1F8;} + .d2-1332431490 .color-N7{color:#FFFFFF;} + .d2-1332431490 .color-B1{color:#0D32B2;} + .d2-1332431490 .color-B2{color:#0D32B2;} + .d2-1332431490 .color-B3{color:#E3E9FD;} + .d2-1332431490 .color-B4{color:#E3E9FD;} + .d2-1332431490 .color-B5{color:#EDF0FD;} + .d2-1332431490 .color-B6{color:#F7F8FE;} + .d2-1332431490 .color-AA2{color:#4A6FF3;} + .d2-1332431490 .color-AA4{color:#EDF0FD;} + .d2-1332431490 .color-AA5{color:#F7F8FE;} + .d2-1332431490 .color-AB4{color:#EDF0FD;} + .d2-1332431490 .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}]]>ABCgroup 1group 2group 3group 4group 5group 6group 7group 8group 9group 10group 11 + - - - - - - - - - - + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/regression/sequence_diagram_self_edge_group_overlap/elk/board.exp.json b/e2etests/testdata/regression/sequence_diagram_self_edge_group_overlap/elk/board.exp.json index 77fef00cae..e14feb56f2 100644 --- a/e2etests/testdata/regression/sequence_diagram_self_edge_group_overlap/elk/board.exp.json +++ b/e2etests/testdata/regression/sequence_diagram_self_edge_group_overlap/elk/board.exp.json @@ -173,7 +173,7 @@ "type": "rectangle", "pos": { "x": 22, - "y": 304 + "y": 319 }, "width": 230, "height": 61, @@ -215,7 +215,7 @@ "type": "rectangle", "pos": { "x": 22, - "y": 405 + "y": 420 }, "width": 160, "height": 106, @@ -257,10 +257,10 @@ "type": "rectangle", "pos": { "x": 56, - "y": 486 + "y": 501 }, "width": 12, - "height": 106, + "height": 121, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -297,7 +297,7 @@ "type": "rectangle", "pos": { "x": 28, - "y": 536 + "y": 566 }, "width": 224, "height": 61, @@ -339,10 +339,10 @@ "type": "rectangle", "pos": { "x": 172, - "y": 637 + "y": 667 }, "width": 160, - "height": 176, + "height": 221, "opacity": 1, "strokeDash": 0, "strokeWidth": 0, @@ -381,7 +381,7 @@ "type": "rectangle", "pos": { "x": 22, - "y": 838 + "y": 928 }, "width": 230, "height": 61, @@ -423,7 +423,7 @@ "type": "rectangle", "pos": { "x": 22, - "y": 939 + "y": 1029 }, "width": 160, "height": 106, @@ -465,7 +465,7 @@ "type": "rectangle", "pos": { "x": 22, - "y": 1070 + "y": 1175 }, "width": 160, "height": 106, @@ -507,7 +507,7 @@ "type": "rectangle", "pos": { "x": 22, - "y": 1301 + "y": 1436 }, "width": 160, "height": 106, @@ -549,7 +549,7 @@ "type": "rectangle", "pos": { "x": 322, - "y": 1572 + "y": 1767 }, "width": 160, "height": 106, @@ -591,7 +591,7 @@ "type": "rectangle", "pos": { "x": 322, - "y": 1773 + "y": 1983 }, "width": 160, "height": 106, @@ -702,11 +702,11 @@ "route": [ { "x": 62, - "y": 350 + "y": 365 }, { "x": 212, - "y": 350 + "y": 365 } ], "animated": false, @@ -740,19 +740,19 @@ "route": [ { "x": 62, - "y": 451 + "y": 466 }, { "x": 142, - "y": 451 + "y": 466 }, { "x": 142, - "y": 496 + "y": 511 }, { "x": 68, - "y": 496 + "y": 511 } ], "animated": false, @@ -786,11 +786,11 @@ "route": [ { "x": 68, - "y": 582 + "y": 612 }, { "x": 212, - "y": 582 + "y": 612 } ], "animated": false, @@ -824,19 +824,19 @@ "route": [ { "x": 212, - "y": 683 + "y": 713 }, { "x": 292, - "y": 683 + "y": 713 }, { "x": 292, - "y": 728 + "y": 758 }, { "x": 212, - "y": 728 + "y": 758 } ], "animated": false, @@ -870,19 +870,19 @@ "route": [ { "x": 212, - "y": 753 + "y": 828 }, { "x": 292, - "y": 753 + "y": 828 }, { "x": 292, - "y": 798 + "y": 873 }, { "x": 212, - "y": 798 + "y": 873 } ], "animated": false, @@ -916,11 +916,11 @@ "route": [ { "x": 212, - "y": 884 + "y": 974 }, { "x": 62, - "y": 884 + "y": 974 } ], "animated": false, @@ -954,19 +954,19 @@ "route": [ { "x": 62, - "y": 985 + "y": 1075 }, { "x": 142, - "y": 985 + "y": 1075 }, { "x": 142, - "y": 1030 + "y": 1120 }, { "x": 62, - "y": 1030 + "y": 1120 } ], "animated": false, @@ -1000,19 +1000,19 @@ "route": [ { "x": 62, - "y": 1116 + "y": 1221 }, { "x": 142, - "y": 1116 + "y": 1221 }, { "x": 142, - "y": 1161 + "y": 1266 }, { "x": 62, - "y": 1161 + "y": 1266 } ], "animated": false, @@ -1046,19 +1046,19 @@ "route": [ { "x": 62, - "y": 1216 + "y": 1336 }, { "x": 142, - "y": 1216 + "y": 1336 }, { "x": 142, - "y": 1261 + "y": 1381 }, { "x": 62, - "y": 1261 + "y": 1381 } ], "animated": false, @@ -1092,19 +1092,19 @@ "route": [ { "x": 62, - "y": 1347 + "y": 1482 }, { "x": 142, - "y": 1347 + "y": 1482 }, { "x": 142, - "y": 1392 + "y": 1527 }, { "x": 62, - "y": 1392 + "y": 1527 } ], "animated": false, @@ -1138,19 +1138,19 @@ "route": [ { "x": 62, - "y": 1447 + "y": 1597 }, { "x": 142, - "y": 1447 + "y": 1597 }, { "x": 142, - "y": 1492 + "y": 1642 }, { "x": 62, - "y": 1492 + "y": 1642 } ], "animated": false, @@ -1184,11 +1184,11 @@ "route": [ { "x": 212, - "y": 1517 + "y": 1712 }, { "x": 362, - "y": 1517 + "y": 1712 } ], "animated": false, @@ -1222,19 +1222,19 @@ "route": [ { "x": 362, - "y": 1618 + "y": 1813 }, { "x": 442, - "y": 1618 + "y": 1813 }, { "x": 442, - "y": 1663 + "y": 1858 }, { "x": 362, - "y": 1663 + "y": 1858 } ], "animated": false, @@ -1268,11 +1268,11 @@ "route": [ { "x": 212, - "y": 1718 + "y": 1928 }, { "x": 362, - "y": 1718 + "y": 1928 } ], "animated": false, @@ -1306,19 +1306,19 @@ "route": [ { "x": 362, - "y": 1819 + "y": 2029 }, { "x": 442, - "y": 1819 + "y": 2029 }, { "x": 442, - "y": 1864 + "y": 2074 }, { "x": 362, - "y": 1864 + "y": 2074 } ], "animated": false, @@ -1352,11 +1352,11 @@ "route": [ { "x": 212, - "y": 1919 + "y": 2144 }, { "x": 362, - "y": 1919 + "y": 2144 } ], "animated": false, @@ -1394,7 +1394,7 @@ }, { "x": 62, - "y": 1989 + "y": 2214 } ], "animated": false, @@ -1432,7 +1432,7 @@ }, { "x": 212, - "y": 1989 + "y": 2214 } ], "animated": false, @@ -1470,7 +1470,7 @@ }, { "x": 362, - "y": 1989 + "y": 2214 } ], "animated": false, diff --git a/e2etests/testdata/regression/sequence_diagram_self_edge_group_overlap/elk/sketch.exp.svg b/e2etests/testdata/regression/sequence_diagram_self_edge_group_overlap/elk/sketch.exp.svg index b9af06fcf5..c49f0efb10 100644 --- a/e2etests/testdata/regression/sequence_diagram_self_edge_group_overlap/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/sequence_diagram_self_edge_group_overlap/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -ABCgroup 1group 2group 3group 4group 5group 6group 7group 8group 9group 10group 11 - + .d2-1332431490 .fill-N1{fill:#0A0F25;} + .d2-1332431490 .fill-N2{fill:#676C7E;} + .d2-1332431490 .fill-N3{fill:#9499AB;} + .d2-1332431490 .fill-N4{fill:#CFD2DD;} + .d2-1332431490 .fill-N5{fill:#DEE1EB;} + .d2-1332431490 .fill-N6{fill:#EEF1F8;} + .d2-1332431490 .fill-N7{fill:#FFFFFF;} + .d2-1332431490 .fill-B1{fill:#0D32B2;} + .d2-1332431490 .fill-B2{fill:#0D32B2;} + .d2-1332431490 .fill-B3{fill:#E3E9FD;} + .d2-1332431490 .fill-B4{fill:#E3E9FD;} + .d2-1332431490 .fill-B5{fill:#EDF0FD;} + .d2-1332431490 .fill-B6{fill:#F7F8FE;} + .d2-1332431490 .fill-AA2{fill:#4A6FF3;} + .d2-1332431490 .fill-AA4{fill:#EDF0FD;} + .d2-1332431490 .fill-AA5{fill:#F7F8FE;} + .d2-1332431490 .fill-AB4{fill:#EDF0FD;} + .d2-1332431490 .fill-AB5{fill:#F7F8FE;} + .d2-1332431490 .stroke-N1{stroke:#0A0F25;} + .d2-1332431490 .stroke-N2{stroke:#676C7E;} + .d2-1332431490 .stroke-N3{stroke:#9499AB;} + .d2-1332431490 .stroke-N4{stroke:#CFD2DD;} + .d2-1332431490 .stroke-N5{stroke:#DEE1EB;} + .d2-1332431490 .stroke-N6{stroke:#EEF1F8;} + .d2-1332431490 .stroke-N7{stroke:#FFFFFF;} + .d2-1332431490 .stroke-B1{stroke:#0D32B2;} + .d2-1332431490 .stroke-B2{stroke:#0D32B2;} + .d2-1332431490 .stroke-B3{stroke:#E3E9FD;} + .d2-1332431490 .stroke-B4{stroke:#E3E9FD;} + .d2-1332431490 .stroke-B5{stroke:#EDF0FD;} + .d2-1332431490 .stroke-B6{stroke:#F7F8FE;} + .d2-1332431490 .stroke-AA2{stroke:#4A6FF3;} + .d2-1332431490 .stroke-AA4{stroke:#EDF0FD;} + .d2-1332431490 .stroke-AA5{stroke:#F7F8FE;} + .d2-1332431490 .stroke-AB4{stroke:#EDF0FD;} + .d2-1332431490 .stroke-AB5{stroke:#F7F8FE;} + .d2-1332431490 .background-color-N1{background-color:#0A0F25;} + .d2-1332431490 .background-color-N2{background-color:#676C7E;} + .d2-1332431490 .background-color-N3{background-color:#9499AB;} + .d2-1332431490 .background-color-N4{background-color:#CFD2DD;} + .d2-1332431490 .background-color-N5{background-color:#DEE1EB;} + .d2-1332431490 .background-color-N6{background-color:#EEF1F8;} + .d2-1332431490 .background-color-N7{background-color:#FFFFFF;} + .d2-1332431490 .background-color-B1{background-color:#0D32B2;} + .d2-1332431490 .background-color-B2{background-color:#0D32B2;} + .d2-1332431490 .background-color-B3{background-color:#E3E9FD;} + .d2-1332431490 .background-color-B4{background-color:#E3E9FD;} + .d2-1332431490 .background-color-B5{background-color:#EDF0FD;} + .d2-1332431490 .background-color-B6{background-color:#F7F8FE;} + .d2-1332431490 .background-color-AA2{background-color:#4A6FF3;} + .d2-1332431490 .background-color-AA4{background-color:#EDF0FD;} + .d2-1332431490 .background-color-AA5{background-color:#F7F8FE;} + .d2-1332431490 .background-color-AB4{background-color:#EDF0FD;} + .d2-1332431490 .background-color-AB5{background-color:#F7F8FE;} + .d2-1332431490 .color-N1{color:#0A0F25;} + .d2-1332431490 .color-N2{color:#676C7E;} + .d2-1332431490 .color-N3{color:#9499AB;} + .d2-1332431490 .color-N4{color:#CFD2DD;} + .d2-1332431490 .color-N5{color:#DEE1EB;} + .d2-1332431490 .color-N6{color:#EEF1F8;} + .d2-1332431490 .color-N7{color:#FFFFFF;} + .d2-1332431490 .color-B1{color:#0D32B2;} + .d2-1332431490 .color-B2{color:#0D32B2;} + .d2-1332431490 .color-B3{color:#E3E9FD;} + .d2-1332431490 .color-B4{color:#E3E9FD;} + .d2-1332431490 .color-B5{color:#EDF0FD;} + .d2-1332431490 .color-B6{color:#F7F8FE;} + .d2-1332431490 .color-AA2{color:#4A6FF3;} + .d2-1332431490 .color-AA4{color:#EDF0FD;} + .d2-1332431490 .color-AA5{color:#F7F8FE;} + .d2-1332431490 .color-AB4{color:#EDF0FD;} + .d2-1332431490 .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}]]>ABCgroup 1group 2group 3group 4group 5group 6group 7group 8group 9group 10group 11 + - - - - - - - - - - + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/regression/sequence_diagram_span_cover/dagre/board.exp.json b/e2etests/testdata/regression/sequence_diagram_span_cover/dagre/board.exp.json index ef88f2dce3..8a164ee41b 100644 --- a/e2etests/testdata/regression/sequence_diagram_span_cover/dagre/board.exp.json +++ b/e2etests/testdata/regression/sequence_diagram_span_cover/dagre/board.exp.json @@ -52,7 +52,7 @@ "y": 178 }, "width": 12, - "height": 135, + "height": 180, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -158,19 +158,19 @@ "route": [ { "x": 68, - "y": 258 + "y": 303 }, { "x": 142, - "y": 258 + "y": 303 }, { "x": 142, - "y": 303 + "y": 348 }, { "x": 68, - "y": 303 + "y": 348 } ], "animated": false, @@ -208,7 +208,7 @@ }, { "x": 62, - "y": 373 + "y": 418 } ], "animated": false, diff --git a/e2etests/testdata/regression/sequence_diagram_span_cover/dagre/sketch.exp.svg b/e2etests/testdata/regression/sequence_diagram_span_cover/dagre/sketch.exp.svg index 98b13eb79b..0688b34797 100644 --- a/e2etests/testdata/regression/sequence_diagram_span_cover/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/sequence_diagram_span_cover/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -b - + .d2-3879014770 .fill-N1{fill:#0A0F25;} + .d2-3879014770 .fill-N2{fill:#676C7E;} + .d2-3879014770 .fill-N3{fill:#9499AB;} + .d2-3879014770 .fill-N4{fill:#CFD2DD;} + .d2-3879014770 .fill-N5{fill:#DEE1EB;} + .d2-3879014770 .fill-N6{fill:#EEF1F8;} + .d2-3879014770 .fill-N7{fill:#FFFFFF;} + .d2-3879014770 .fill-B1{fill:#0D32B2;} + .d2-3879014770 .fill-B2{fill:#0D32B2;} + .d2-3879014770 .fill-B3{fill:#E3E9FD;} + .d2-3879014770 .fill-B4{fill:#E3E9FD;} + .d2-3879014770 .fill-B5{fill:#EDF0FD;} + .d2-3879014770 .fill-B6{fill:#F7F8FE;} + .d2-3879014770 .fill-AA2{fill:#4A6FF3;} + .d2-3879014770 .fill-AA4{fill:#EDF0FD;} + .d2-3879014770 .fill-AA5{fill:#F7F8FE;} + .d2-3879014770 .fill-AB4{fill:#EDF0FD;} + .d2-3879014770 .fill-AB5{fill:#F7F8FE;} + .d2-3879014770 .stroke-N1{stroke:#0A0F25;} + .d2-3879014770 .stroke-N2{stroke:#676C7E;} + .d2-3879014770 .stroke-N3{stroke:#9499AB;} + .d2-3879014770 .stroke-N4{stroke:#CFD2DD;} + .d2-3879014770 .stroke-N5{stroke:#DEE1EB;} + .d2-3879014770 .stroke-N6{stroke:#EEF1F8;} + .d2-3879014770 .stroke-N7{stroke:#FFFFFF;} + .d2-3879014770 .stroke-B1{stroke:#0D32B2;} + .d2-3879014770 .stroke-B2{stroke:#0D32B2;} + .d2-3879014770 .stroke-B3{stroke:#E3E9FD;} + .d2-3879014770 .stroke-B4{stroke:#E3E9FD;} + .d2-3879014770 .stroke-B5{stroke:#EDF0FD;} + .d2-3879014770 .stroke-B6{stroke:#F7F8FE;} + .d2-3879014770 .stroke-AA2{stroke:#4A6FF3;} + .d2-3879014770 .stroke-AA4{stroke:#EDF0FD;} + .d2-3879014770 .stroke-AA5{stroke:#F7F8FE;} + .d2-3879014770 .stroke-AB4{stroke:#EDF0FD;} + .d2-3879014770 .stroke-AB5{stroke:#F7F8FE;} + .d2-3879014770 .background-color-N1{background-color:#0A0F25;} + .d2-3879014770 .background-color-N2{background-color:#676C7E;} + .d2-3879014770 .background-color-N3{background-color:#9499AB;} + .d2-3879014770 .background-color-N4{background-color:#CFD2DD;} + .d2-3879014770 .background-color-N5{background-color:#DEE1EB;} + .d2-3879014770 .background-color-N6{background-color:#EEF1F8;} + .d2-3879014770 .background-color-N7{background-color:#FFFFFF;} + .d2-3879014770 .background-color-B1{background-color:#0D32B2;} + .d2-3879014770 .background-color-B2{background-color:#0D32B2;} + .d2-3879014770 .background-color-B3{background-color:#E3E9FD;} + .d2-3879014770 .background-color-B4{background-color:#E3E9FD;} + .d2-3879014770 .background-color-B5{background-color:#EDF0FD;} + .d2-3879014770 .background-color-B6{background-color:#F7F8FE;} + .d2-3879014770 .background-color-AA2{background-color:#4A6FF3;} + .d2-3879014770 .background-color-AA4{background-color:#EDF0FD;} + .d2-3879014770 .background-color-AA5{background-color:#F7F8FE;} + .d2-3879014770 .background-color-AB4{background-color:#EDF0FD;} + .d2-3879014770 .background-color-AB5{background-color:#F7F8FE;} + .d2-3879014770 .color-N1{color:#0A0F25;} + .d2-3879014770 .color-N2{color:#676C7E;} + .d2-3879014770 .color-N3{color:#9499AB;} + .d2-3879014770 .color-N4{color:#CFD2DD;} + .d2-3879014770 .color-N5{color:#DEE1EB;} + .d2-3879014770 .color-N6{color:#EEF1F8;} + .d2-3879014770 .color-N7{color:#FFFFFF;} + .d2-3879014770 .color-B1{color:#0D32B2;} + .d2-3879014770 .color-B2{color:#0D32B2;} + .d2-3879014770 .color-B3{color:#E3E9FD;} + .d2-3879014770 .color-B4{color:#E3E9FD;} + .d2-3879014770 .color-B5{color:#EDF0FD;} + .d2-3879014770 .color-B6{color:#F7F8FE;} + .d2-3879014770 .color-AA2{color:#4A6FF3;} + .d2-3879014770 .color-AA4{color:#EDF0FD;} + .d2-3879014770 .color-AA5{color:#F7F8FE;} + .d2-3879014770 .color-AB4{color:#EDF0FD;} + .d2-3879014770 .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}]]>b + \ No newline at end of file diff --git a/e2etests/testdata/regression/sequence_diagram_span_cover/elk/board.exp.json b/e2etests/testdata/regression/sequence_diagram_span_cover/elk/board.exp.json index ef88f2dce3..8a164ee41b 100644 --- a/e2etests/testdata/regression/sequence_diagram_span_cover/elk/board.exp.json +++ b/e2etests/testdata/regression/sequence_diagram_span_cover/elk/board.exp.json @@ -52,7 +52,7 @@ "y": 178 }, "width": 12, - "height": 135, + "height": 180, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -158,19 +158,19 @@ "route": [ { "x": 68, - "y": 258 + "y": 303 }, { "x": 142, - "y": 258 + "y": 303 }, { "x": 142, - "y": 303 + "y": 348 }, { "x": 68, - "y": 303 + "y": 348 } ], "animated": false, @@ -208,7 +208,7 @@ }, { "x": 62, - "y": 373 + "y": 418 } ], "animated": false, diff --git a/e2etests/testdata/regression/sequence_diagram_span_cover/elk/sketch.exp.svg b/e2etests/testdata/regression/sequence_diagram_span_cover/elk/sketch.exp.svg index 98b13eb79b..0688b34797 100644 --- a/e2etests/testdata/regression/sequence_diagram_span_cover/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/sequence_diagram_span_cover/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -b - + .d2-3879014770 .fill-N1{fill:#0A0F25;} + .d2-3879014770 .fill-N2{fill:#676C7E;} + .d2-3879014770 .fill-N3{fill:#9499AB;} + .d2-3879014770 .fill-N4{fill:#CFD2DD;} + .d2-3879014770 .fill-N5{fill:#DEE1EB;} + .d2-3879014770 .fill-N6{fill:#EEF1F8;} + .d2-3879014770 .fill-N7{fill:#FFFFFF;} + .d2-3879014770 .fill-B1{fill:#0D32B2;} + .d2-3879014770 .fill-B2{fill:#0D32B2;} + .d2-3879014770 .fill-B3{fill:#E3E9FD;} + .d2-3879014770 .fill-B4{fill:#E3E9FD;} + .d2-3879014770 .fill-B5{fill:#EDF0FD;} + .d2-3879014770 .fill-B6{fill:#F7F8FE;} + .d2-3879014770 .fill-AA2{fill:#4A6FF3;} + .d2-3879014770 .fill-AA4{fill:#EDF0FD;} + .d2-3879014770 .fill-AA5{fill:#F7F8FE;} + .d2-3879014770 .fill-AB4{fill:#EDF0FD;} + .d2-3879014770 .fill-AB5{fill:#F7F8FE;} + .d2-3879014770 .stroke-N1{stroke:#0A0F25;} + .d2-3879014770 .stroke-N2{stroke:#676C7E;} + .d2-3879014770 .stroke-N3{stroke:#9499AB;} + .d2-3879014770 .stroke-N4{stroke:#CFD2DD;} + .d2-3879014770 .stroke-N5{stroke:#DEE1EB;} + .d2-3879014770 .stroke-N6{stroke:#EEF1F8;} + .d2-3879014770 .stroke-N7{stroke:#FFFFFF;} + .d2-3879014770 .stroke-B1{stroke:#0D32B2;} + .d2-3879014770 .stroke-B2{stroke:#0D32B2;} + .d2-3879014770 .stroke-B3{stroke:#E3E9FD;} + .d2-3879014770 .stroke-B4{stroke:#E3E9FD;} + .d2-3879014770 .stroke-B5{stroke:#EDF0FD;} + .d2-3879014770 .stroke-B6{stroke:#F7F8FE;} + .d2-3879014770 .stroke-AA2{stroke:#4A6FF3;} + .d2-3879014770 .stroke-AA4{stroke:#EDF0FD;} + .d2-3879014770 .stroke-AA5{stroke:#F7F8FE;} + .d2-3879014770 .stroke-AB4{stroke:#EDF0FD;} + .d2-3879014770 .stroke-AB5{stroke:#F7F8FE;} + .d2-3879014770 .background-color-N1{background-color:#0A0F25;} + .d2-3879014770 .background-color-N2{background-color:#676C7E;} + .d2-3879014770 .background-color-N3{background-color:#9499AB;} + .d2-3879014770 .background-color-N4{background-color:#CFD2DD;} + .d2-3879014770 .background-color-N5{background-color:#DEE1EB;} + .d2-3879014770 .background-color-N6{background-color:#EEF1F8;} + .d2-3879014770 .background-color-N7{background-color:#FFFFFF;} + .d2-3879014770 .background-color-B1{background-color:#0D32B2;} + .d2-3879014770 .background-color-B2{background-color:#0D32B2;} + .d2-3879014770 .background-color-B3{background-color:#E3E9FD;} + .d2-3879014770 .background-color-B4{background-color:#E3E9FD;} + .d2-3879014770 .background-color-B5{background-color:#EDF0FD;} + .d2-3879014770 .background-color-B6{background-color:#F7F8FE;} + .d2-3879014770 .background-color-AA2{background-color:#4A6FF3;} + .d2-3879014770 .background-color-AA4{background-color:#EDF0FD;} + .d2-3879014770 .background-color-AA5{background-color:#F7F8FE;} + .d2-3879014770 .background-color-AB4{background-color:#EDF0FD;} + .d2-3879014770 .background-color-AB5{background-color:#F7F8FE;} + .d2-3879014770 .color-N1{color:#0A0F25;} + .d2-3879014770 .color-N2{color:#676C7E;} + .d2-3879014770 .color-N3{color:#9499AB;} + .d2-3879014770 .color-N4{color:#CFD2DD;} + .d2-3879014770 .color-N5{color:#DEE1EB;} + .d2-3879014770 .color-N6{color:#EEF1F8;} + .d2-3879014770 .color-N7{color:#FFFFFF;} + .d2-3879014770 .color-B1{color:#0D32B2;} + .d2-3879014770 .color-B2{color:#0D32B2;} + .d2-3879014770 .color-B3{color:#E3E9FD;} + .d2-3879014770 .color-B4{color:#E3E9FD;} + .d2-3879014770 .color-B5{color:#EDF0FD;} + .d2-3879014770 .color-B6{color:#F7F8FE;} + .d2-3879014770 .color-AA2{color:#4A6FF3;} + .d2-3879014770 .color-AA4{color:#EDF0FD;} + .d2-3879014770 .color-AA5{color:#F7F8FE;} + .d2-3879014770 .color-AB4{color:#EDF0FD;} + .d2-3879014770 .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}]]>b + \ No newline at end of file diff --git a/e2etests/testdata/stable/sequence-inter-span-self/dagre/board.exp.json b/e2etests/testdata/stable/sequence-inter-span-self/dagre/board.exp.json index 1a4753593c..47f2267eb0 100644 --- a/e2etests/testdata/stable/sequence-inter-span-self/dagre/board.exp.json +++ b/e2etests/testdata/stable/sequence-inter-span-self/dagre/board.exp.json @@ -133,7 +133,7 @@ "y": 293 }, "width": 12, - "height": 45, + "height": 90, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -277,11 +277,11 @@ "route": [ { "x": 68, - "y": 328 + "y": 373 }, { "x": 212, - "y": 328 + "y": 373 } ], "animated": false, @@ -319,7 +319,7 @@ }, { "x": 62, - "y": 398 + "y": 443 } ], "animated": false, @@ -357,7 +357,7 @@ }, { "x": 212, - "y": 398 + "y": 443 } ], "animated": false, diff --git a/e2etests/testdata/stable/sequence-inter-span-self/dagre/sketch.exp.svg b/e2etests/testdata/stable/sequence-inter-span-self/dagre/sketch.exp.svg index cb9d0cdd03..a9d434b265 100644 --- a/e2etests/testdata/stable/sequence-inter-span-self/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence-inter-span-self/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -AB fooredirectbar - + .d2-3459117552 .fill-N1{fill:#0A0F25;} + .d2-3459117552 .fill-N2{fill:#676C7E;} + .d2-3459117552 .fill-N3{fill:#9499AB;} + .d2-3459117552 .fill-N4{fill:#CFD2DD;} + .d2-3459117552 .fill-N5{fill:#DEE1EB;} + .d2-3459117552 .fill-N6{fill:#EEF1F8;} + .d2-3459117552 .fill-N7{fill:#FFFFFF;} + .d2-3459117552 .fill-B1{fill:#0D32B2;} + .d2-3459117552 .fill-B2{fill:#0D32B2;} + .d2-3459117552 .fill-B3{fill:#E3E9FD;} + .d2-3459117552 .fill-B4{fill:#E3E9FD;} + .d2-3459117552 .fill-B5{fill:#EDF0FD;} + .d2-3459117552 .fill-B6{fill:#F7F8FE;} + .d2-3459117552 .fill-AA2{fill:#4A6FF3;} + .d2-3459117552 .fill-AA4{fill:#EDF0FD;} + .d2-3459117552 .fill-AA5{fill:#F7F8FE;} + .d2-3459117552 .fill-AB4{fill:#EDF0FD;} + .d2-3459117552 .fill-AB5{fill:#F7F8FE;} + .d2-3459117552 .stroke-N1{stroke:#0A0F25;} + .d2-3459117552 .stroke-N2{stroke:#676C7E;} + .d2-3459117552 .stroke-N3{stroke:#9499AB;} + .d2-3459117552 .stroke-N4{stroke:#CFD2DD;} + .d2-3459117552 .stroke-N5{stroke:#DEE1EB;} + .d2-3459117552 .stroke-N6{stroke:#EEF1F8;} + .d2-3459117552 .stroke-N7{stroke:#FFFFFF;} + .d2-3459117552 .stroke-B1{stroke:#0D32B2;} + .d2-3459117552 .stroke-B2{stroke:#0D32B2;} + .d2-3459117552 .stroke-B3{stroke:#E3E9FD;} + .d2-3459117552 .stroke-B4{stroke:#E3E9FD;} + .d2-3459117552 .stroke-B5{stroke:#EDF0FD;} + .d2-3459117552 .stroke-B6{stroke:#F7F8FE;} + .d2-3459117552 .stroke-AA2{stroke:#4A6FF3;} + .d2-3459117552 .stroke-AA4{stroke:#EDF0FD;} + .d2-3459117552 .stroke-AA5{stroke:#F7F8FE;} + .d2-3459117552 .stroke-AB4{stroke:#EDF0FD;} + .d2-3459117552 .stroke-AB5{stroke:#F7F8FE;} + .d2-3459117552 .background-color-N1{background-color:#0A0F25;} + .d2-3459117552 .background-color-N2{background-color:#676C7E;} + .d2-3459117552 .background-color-N3{background-color:#9499AB;} + .d2-3459117552 .background-color-N4{background-color:#CFD2DD;} + .d2-3459117552 .background-color-N5{background-color:#DEE1EB;} + .d2-3459117552 .background-color-N6{background-color:#EEF1F8;} + .d2-3459117552 .background-color-N7{background-color:#FFFFFF;} + .d2-3459117552 .background-color-B1{background-color:#0D32B2;} + .d2-3459117552 .background-color-B2{background-color:#0D32B2;} + .d2-3459117552 .background-color-B3{background-color:#E3E9FD;} + .d2-3459117552 .background-color-B4{background-color:#E3E9FD;} + .d2-3459117552 .background-color-B5{background-color:#EDF0FD;} + .d2-3459117552 .background-color-B6{background-color:#F7F8FE;} + .d2-3459117552 .background-color-AA2{background-color:#4A6FF3;} + .d2-3459117552 .background-color-AA4{background-color:#EDF0FD;} + .d2-3459117552 .background-color-AA5{background-color:#F7F8FE;} + .d2-3459117552 .background-color-AB4{background-color:#EDF0FD;} + .d2-3459117552 .background-color-AB5{background-color:#F7F8FE;} + .d2-3459117552 .color-N1{color:#0A0F25;} + .d2-3459117552 .color-N2{color:#676C7E;} + .d2-3459117552 .color-N3{color:#9499AB;} + .d2-3459117552 .color-N4{color:#CFD2DD;} + .d2-3459117552 .color-N5{color:#DEE1EB;} + .d2-3459117552 .color-N6{color:#EEF1F8;} + .d2-3459117552 .color-N7{color:#FFFFFF;} + .d2-3459117552 .color-B1{color:#0D32B2;} + .d2-3459117552 .color-B2{color:#0D32B2;} + .d2-3459117552 .color-B3{color:#E3E9FD;} + .d2-3459117552 .color-B4{color:#E3E9FD;} + .d2-3459117552 .color-B5{color:#EDF0FD;} + .d2-3459117552 .color-B6{color:#F7F8FE;} + .d2-3459117552 .color-AA2{color:#4A6FF3;} + .d2-3459117552 .color-AA4{color:#EDF0FD;} + .d2-3459117552 .color-AA5{color:#F7F8FE;} + .d2-3459117552 .color-AB4{color:#EDF0FD;} + .d2-3459117552 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>AB fooredirectbar + - + \ No newline at end of file diff --git a/e2etests/testdata/stable/sequence-inter-span-self/elk/board.exp.json b/e2etests/testdata/stable/sequence-inter-span-self/elk/board.exp.json index 1a4753593c..47f2267eb0 100644 --- a/e2etests/testdata/stable/sequence-inter-span-self/elk/board.exp.json +++ b/e2etests/testdata/stable/sequence-inter-span-self/elk/board.exp.json @@ -133,7 +133,7 @@ "y": 293 }, "width": 12, - "height": 45, + "height": 90, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -277,11 +277,11 @@ "route": [ { "x": 68, - "y": 328 + "y": 373 }, { "x": 212, - "y": 328 + "y": 373 } ], "animated": false, @@ -319,7 +319,7 @@ }, { "x": 62, - "y": 398 + "y": 443 } ], "animated": false, @@ -357,7 +357,7 @@ }, { "x": 212, - "y": 398 + "y": 443 } ], "animated": false, diff --git a/e2etests/testdata/stable/sequence-inter-span-self/elk/sketch.exp.svg b/e2etests/testdata/stable/sequence-inter-span-self/elk/sketch.exp.svg index cb9d0cdd03..a9d434b265 100644 --- a/e2etests/testdata/stable/sequence-inter-span-self/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence-inter-span-self/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -AB fooredirectbar - + .d2-3459117552 .fill-N1{fill:#0A0F25;} + .d2-3459117552 .fill-N2{fill:#676C7E;} + .d2-3459117552 .fill-N3{fill:#9499AB;} + .d2-3459117552 .fill-N4{fill:#CFD2DD;} + .d2-3459117552 .fill-N5{fill:#DEE1EB;} + .d2-3459117552 .fill-N6{fill:#EEF1F8;} + .d2-3459117552 .fill-N7{fill:#FFFFFF;} + .d2-3459117552 .fill-B1{fill:#0D32B2;} + .d2-3459117552 .fill-B2{fill:#0D32B2;} + .d2-3459117552 .fill-B3{fill:#E3E9FD;} + .d2-3459117552 .fill-B4{fill:#E3E9FD;} + .d2-3459117552 .fill-B5{fill:#EDF0FD;} + .d2-3459117552 .fill-B6{fill:#F7F8FE;} + .d2-3459117552 .fill-AA2{fill:#4A6FF3;} + .d2-3459117552 .fill-AA4{fill:#EDF0FD;} + .d2-3459117552 .fill-AA5{fill:#F7F8FE;} + .d2-3459117552 .fill-AB4{fill:#EDF0FD;} + .d2-3459117552 .fill-AB5{fill:#F7F8FE;} + .d2-3459117552 .stroke-N1{stroke:#0A0F25;} + .d2-3459117552 .stroke-N2{stroke:#676C7E;} + .d2-3459117552 .stroke-N3{stroke:#9499AB;} + .d2-3459117552 .stroke-N4{stroke:#CFD2DD;} + .d2-3459117552 .stroke-N5{stroke:#DEE1EB;} + .d2-3459117552 .stroke-N6{stroke:#EEF1F8;} + .d2-3459117552 .stroke-N7{stroke:#FFFFFF;} + .d2-3459117552 .stroke-B1{stroke:#0D32B2;} + .d2-3459117552 .stroke-B2{stroke:#0D32B2;} + .d2-3459117552 .stroke-B3{stroke:#E3E9FD;} + .d2-3459117552 .stroke-B4{stroke:#E3E9FD;} + .d2-3459117552 .stroke-B5{stroke:#EDF0FD;} + .d2-3459117552 .stroke-B6{stroke:#F7F8FE;} + .d2-3459117552 .stroke-AA2{stroke:#4A6FF3;} + .d2-3459117552 .stroke-AA4{stroke:#EDF0FD;} + .d2-3459117552 .stroke-AA5{stroke:#F7F8FE;} + .d2-3459117552 .stroke-AB4{stroke:#EDF0FD;} + .d2-3459117552 .stroke-AB5{stroke:#F7F8FE;} + .d2-3459117552 .background-color-N1{background-color:#0A0F25;} + .d2-3459117552 .background-color-N2{background-color:#676C7E;} + .d2-3459117552 .background-color-N3{background-color:#9499AB;} + .d2-3459117552 .background-color-N4{background-color:#CFD2DD;} + .d2-3459117552 .background-color-N5{background-color:#DEE1EB;} + .d2-3459117552 .background-color-N6{background-color:#EEF1F8;} + .d2-3459117552 .background-color-N7{background-color:#FFFFFF;} + .d2-3459117552 .background-color-B1{background-color:#0D32B2;} + .d2-3459117552 .background-color-B2{background-color:#0D32B2;} + .d2-3459117552 .background-color-B3{background-color:#E3E9FD;} + .d2-3459117552 .background-color-B4{background-color:#E3E9FD;} + .d2-3459117552 .background-color-B5{background-color:#EDF0FD;} + .d2-3459117552 .background-color-B6{background-color:#F7F8FE;} + .d2-3459117552 .background-color-AA2{background-color:#4A6FF3;} + .d2-3459117552 .background-color-AA4{background-color:#EDF0FD;} + .d2-3459117552 .background-color-AA5{background-color:#F7F8FE;} + .d2-3459117552 .background-color-AB4{background-color:#EDF0FD;} + .d2-3459117552 .background-color-AB5{background-color:#F7F8FE;} + .d2-3459117552 .color-N1{color:#0A0F25;} + .d2-3459117552 .color-N2{color:#676C7E;} + .d2-3459117552 .color-N3{color:#9499AB;} + .d2-3459117552 .color-N4{color:#CFD2DD;} + .d2-3459117552 .color-N5{color:#DEE1EB;} + .d2-3459117552 .color-N6{color:#EEF1F8;} + .d2-3459117552 .color-N7{color:#FFFFFF;} + .d2-3459117552 .color-B1{color:#0D32B2;} + .d2-3459117552 .color-B2{color:#0D32B2;} + .d2-3459117552 .color-B3{color:#E3E9FD;} + .d2-3459117552 .color-B4{color:#E3E9FD;} + .d2-3459117552 .color-B5{color:#EDF0FD;} + .d2-3459117552 .color-B6{color:#F7F8FE;} + .d2-3459117552 .color-AA2{color:#4A6FF3;} + .d2-3459117552 .color-AA4{color:#EDF0FD;} + .d2-3459117552 .color-AA5{color:#F7F8FE;} + .d2-3459117552 .color-AB4{color:#EDF0FD;} + .d2-3459117552 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>AB fooredirectbar + - + \ No newline at end of file diff --git a/e2etests/testdata/stable/sequence_diagram_self_edges/dagre/board.exp.json b/e2etests/testdata/stable/sequence_diagram_self_edges/dagre/board.exp.json index 21c41ae543..ce8400658f 100644 --- a/e2etests/testdata/stable/sequence_diagram_self_edges/dagre/board.exp.json +++ b/e2etests/testdata/stable/sequence_diagram_self_edges/dagre/board.exp.json @@ -90,10 +90,10 @@ "type": "rectangle", "pos": { "x": 206, - "y": 363 + "y": 408 }, "width": 12, - "height": 125, + "height": 215, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -130,10 +130,10 @@ "type": "rectangle", "pos": { "x": 202, - "y": 433 + "y": 523 }, "width": 20, - "height": 45, + "height": 90, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -170,7 +170,7 @@ "type": "rectangle", "pos": { "x": 56, - "y": 518 + "y": 698 }, "width": 12, "height": 100, @@ -210,7 +210,7 @@ "type": "rectangle", "pos": { "x": 52, - "y": 528 + "y": 708 }, "width": 20, "height": 30, @@ -250,7 +250,7 @@ "type": "rectangle", "pos": { "x": 206, - "y": 598 + "y": 778 }, "width": 12, "height": 30, @@ -359,11 +359,11 @@ "route": [ { "x": 62, - "y": 258 + "y": 303 }, { "x": 212, - "y": 258 + "y": 303 } ], "animated": false, @@ -397,19 +397,19 @@ "route": [ { "x": 212, - "y": 328 + "y": 373 }, { "x": 292, - "y": 328 + "y": 373 }, { "x": 292, - "y": 373 + "y": 418 }, { "x": 218, - "y": 373 + "y": 418 } ], "animated": false, @@ -443,19 +443,19 @@ "route": [ { "x": 218, - "y": 398 + "y": 488 }, { "x": 292, - "y": 398 + "y": 488 }, { "x": 292, - "y": 443 + "y": 533 }, { "x": 222, - "y": 443 + "y": 533 } ], "animated": false, @@ -489,19 +489,19 @@ "route": [ { "x": 222, - "y": 468 + "y": 603 }, { "x": 292, - "y": 468 + "y": 603 }, { "x": 292, - "y": 513 + "y": 648 }, { "x": 212, - "y": 513 + "y": 648 } ], "animated": false, @@ -535,11 +535,11 @@ "route": [ { "x": 212, - "y": 538 + "y": 718 }, { "x": 72, - "y": 538 + "y": 718 } ], "animated": false, @@ -573,11 +573,11 @@ "route": [ { "x": 68, - "y": 608 + "y": 788 }, { "x": 206, - "y": 608 + "y": 788 } ], "animated": false, @@ -615,7 +615,7 @@ }, { "x": 62, - "y": 678 + "y": 858 } ], "animated": false, @@ -653,7 +653,7 @@ }, { "x": 212, - "y": 678 + "y": 858 } ], "animated": false, diff --git a/e2etests/testdata/stable/sequence_diagram_self_edges/dagre/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_self_edges/dagre/sketch.exp.svg index 272e4feeda..09070f2034 100644 --- a/e2etests/testdata/stable/sequence_diagram_self_edges/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_self_edges/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -ab a self edge herebetween actorsto descendantto deeper descendantto parentactor - + .d2-2664246922 .fill-N1{fill:#0A0F25;} + .d2-2664246922 .fill-N2{fill:#676C7E;} + .d2-2664246922 .fill-N3{fill:#9499AB;} + .d2-2664246922 .fill-N4{fill:#CFD2DD;} + .d2-2664246922 .fill-N5{fill:#DEE1EB;} + .d2-2664246922 .fill-N6{fill:#EEF1F8;} + .d2-2664246922 .fill-N7{fill:#FFFFFF;} + .d2-2664246922 .fill-B1{fill:#0D32B2;} + .d2-2664246922 .fill-B2{fill:#0D32B2;} + .d2-2664246922 .fill-B3{fill:#E3E9FD;} + .d2-2664246922 .fill-B4{fill:#E3E9FD;} + .d2-2664246922 .fill-B5{fill:#EDF0FD;} + .d2-2664246922 .fill-B6{fill:#F7F8FE;} + .d2-2664246922 .fill-AA2{fill:#4A6FF3;} + .d2-2664246922 .fill-AA4{fill:#EDF0FD;} + .d2-2664246922 .fill-AA5{fill:#F7F8FE;} + .d2-2664246922 .fill-AB4{fill:#EDF0FD;} + .d2-2664246922 .fill-AB5{fill:#F7F8FE;} + .d2-2664246922 .stroke-N1{stroke:#0A0F25;} + .d2-2664246922 .stroke-N2{stroke:#676C7E;} + .d2-2664246922 .stroke-N3{stroke:#9499AB;} + .d2-2664246922 .stroke-N4{stroke:#CFD2DD;} + .d2-2664246922 .stroke-N5{stroke:#DEE1EB;} + .d2-2664246922 .stroke-N6{stroke:#EEF1F8;} + .d2-2664246922 .stroke-N7{stroke:#FFFFFF;} + .d2-2664246922 .stroke-B1{stroke:#0D32B2;} + .d2-2664246922 .stroke-B2{stroke:#0D32B2;} + .d2-2664246922 .stroke-B3{stroke:#E3E9FD;} + .d2-2664246922 .stroke-B4{stroke:#E3E9FD;} + .d2-2664246922 .stroke-B5{stroke:#EDF0FD;} + .d2-2664246922 .stroke-B6{stroke:#F7F8FE;} + .d2-2664246922 .stroke-AA2{stroke:#4A6FF3;} + .d2-2664246922 .stroke-AA4{stroke:#EDF0FD;} + .d2-2664246922 .stroke-AA5{stroke:#F7F8FE;} + .d2-2664246922 .stroke-AB4{stroke:#EDF0FD;} + .d2-2664246922 .stroke-AB5{stroke:#F7F8FE;} + .d2-2664246922 .background-color-N1{background-color:#0A0F25;} + .d2-2664246922 .background-color-N2{background-color:#676C7E;} + .d2-2664246922 .background-color-N3{background-color:#9499AB;} + .d2-2664246922 .background-color-N4{background-color:#CFD2DD;} + .d2-2664246922 .background-color-N5{background-color:#DEE1EB;} + .d2-2664246922 .background-color-N6{background-color:#EEF1F8;} + .d2-2664246922 .background-color-N7{background-color:#FFFFFF;} + .d2-2664246922 .background-color-B1{background-color:#0D32B2;} + .d2-2664246922 .background-color-B2{background-color:#0D32B2;} + .d2-2664246922 .background-color-B3{background-color:#E3E9FD;} + .d2-2664246922 .background-color-B4{background-color:#E3E9FD;} + .d2-2664246922 .background-color-B5{background-color:#EDF0FD;} + .d2-2664246922 .background-color-B6{background-color:#F7F8FE;} + .d2-2664246922 .background-color-AA2{background-color:#4A6FF3;} + .d2-2664246922 .background-color-AA4{background-color:#EDF0FD;} + .d2-2664246922 .background-color-AA5{background-color:#F7F8FE;} + .d2-2664246922 .background-color-AB4{background-color:#EDF0FD;} + .d2-2664246922 .background-color-AB5{background-color:#F7F8FE;} + .d2-2664246922 .color-N1{color:#0A0F25;} + .d2-2664246922 .color-N2{color:#676C7E;} + .d2-2664246922 .color-N3{color:#9499AB;} + .d2-2664246922 .color-N4{color:#CFD2DD;} + .d2-2664246922 .color-N5{color:#DEE1EB;} + .d2-2664246922 .color-N6{color:#EEF1F8;} + .d2-2664246922 .color-N7{color:#FFFFFF;} + .d2-2664246922 .color-B1{color:#0D32B2;} + .d2-2664246922 .color-B2{color:#0D32B2;} + .d2-2664246922 .color-B3{color:#E3E9FD;} + .d2-2664246922 .color-B4{color:#E3E9FD;} + .d2-2664246922 .color-B5{color:#EDF0FD;} + .d2-2664246922 .color-B6{color:#F7F8FE;} + .d2-2664246922 .color-AA2{color:#4A6FF3;} + .d2-2664246922 .color-AA4{color:#EDF0FD;} + .d2-2664246922 .color-AA5{color:#F7F8FE;} + .d2-2664246922 .color-AB4{color:#EDF0FD;} + .d2-2664246922 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>ab a self edge herebetween actorsto descendantto deeper descendantto parentactor + - - - - - + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/sequence_diagram_self_edges/elk/board.exp.json b/e2etests/testdata/stable/sequence_diagram_self_edges/elk/board.exp.json index 21c41ae543..ce8400658f 100644 --- a/e2etests/testdata/stable/sequence_diagram_self_edges/elk/board.exp.json +++ b/e2etests/testdata/stable/sequence_diagram_self_edges/elk/board.exp.json @@ -90,10 +90,10 @@ "type": "rectangle", "pos": { "x": 206, - "y": 363 + "y": 408 }, "width": 12, - "height": 125, + "height": 215, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -130,10 +130,10 @@ "type": "rectangle", "pos": { "x": 202, - "y": 433 + "y": 523 }, "width": 20, - "height": 45, + "height": 90, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -170,7 +170,7 @@ "type": "rectangle", "pos": { "x": 56, - "y": 518 + "y": 698 }, "width": 12, "height": 100, @@ -210,7 +210,7 @@ "type": "rectangle", "pos": { "x": 52, - "y": 528 + "y": 708 }, "width": 20, "height": 30, @@ -250,7 +250,7 @@ "type": "rectangle", "pos": { "x": 206, - "y": 598 + "y": 778 }, "width": 12, "height": 30, @@ -359,11 +359,11 @@ "route": [ { "x": 62, - "y": 258 + "y": 303 }, { "x": 212, - "y": 258 + "y": 303 } ], "animated": false, @@ -397,19 +397,19 @@ "route": [ { "x": 212, - "y": 328 + "y": 373 }, { "x": 292, - "y": 328 + "y": 373 }, { "x": 292, - "y": 373 + "y": 418 }, { "x": 218, - "y": 373 + "y": 418 } ], "animated": false, @@ -443,19 +443,19 @@ "route": [ { "x": 218, - "y": 398 + "y": 488 }, { "x": 292, - "y": 398 + "y": 488 }, { "x": 292, - "y": 443 + "y": 533 }, { "x": 222, - "y": 443 + "y": 533 } ], "animated": false, @@ -489,19 +489,19 @@ "route": [ { "x": 222, - "y": 468 + "y": 603 }, { "x": 292, - "y": 468 + "y": 603 }, { "x": 292, - "y": 513 + "y": 648 }, { "x": 212, - "y": 513 + "y": 648 } ], "animated": false, @@ -535,11 +535,11 @@ "route": [ { "x": 212, - "y": 538 + "y": 718 }, { "x": 72, - "y": 538 + "y": 718 } ], "animated": false, @@ -573,11 +573,11 @@ "route": [ { "x": 68, - "y": 608 + "y": 788 }, { "x": 206, - "y": 608 + "y": 788 } ], "animated": false, @@ -615,7 +615,7 @@ }, { "x": 62, - "y": 678 + "y": 858 } ], "animated": false, @@ -653,7 +653,7 @@ }, { "x": 212, - "y": 678 + "y": 858 } ], "animated": false, diff --git a/e2etests/testdata/stable/sequence_diagram_self_edges/elk/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_self_edges/elk/sketch.exp.svg index 272e4feeda..09070f2034 100644 --- a/e2etests/testdata/stable/sequence_diagram_self_edges/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_self_edges/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -ab a self edge herebetween actorsto descendantto deeper descendantto parentactor - + .d2-2664246922 .fill-N1{fill:#0A0F25;} + .d2-2664246922 .fill-N2{fill:#676C7E;} + .d2-2664246922 .fill-N3{fill:#9499AB;} + .d2-2664246922 .fill-N4{fill:#CFD2DD;} + .d2-2664246922 .fill-N5{fill:#DEE1EB;} + .d2-2664246922 .fill-N6{fill:#EEF1F8;} + .d2-2664246922 .fill-N7{fill:#FFFFFF;} + .d2-2664246922 .fill-B1{fill:#0D32B2;} + .d2-2664246922 .fill-B2{fill:#0D32B2;} + .d2-2664246922 .fill-B3{fill:#E3E9FD;} + .d2-2664246922 .fill-B4{fill:#E3E9FD;} + .d2-2664246922 .fill-B5{fill:#EDF0FD;} + .d2-2664246922 .fill-B6{fill:#F7F8FE;} + .d2-2664246922 .fill-AA2{fill:#4A6FF3;} + .d2-2664246922 .fill-AA4{fill:#EDF0FD;} + .d2-2664246922 .fill-AA5{fill:#F7F8FE;} + .d2-2664246922 .fill-AB4{fill:#EDF0FD;} + .d2-2664246922 .fill-AB5{fill:#F7F8FE;} + .d2-2664246922 .stroke-N1{stroke:#0A0F25;} + .d2-2664246922 .stroke-N2{stroke:#676C7E;} + .d2-2664246922 .stroke-N3{stroke:#9499AB;} + .d2-2664246922 .stroke-N4{stroke:#CFD2DD;} + .d2-2664246922 .stroke-N5{stroke:#DEE1EB;} + .d2-2664246922 .stroke-N6{stroke:#EEF1F8;} + .d2-2664246922 .stroke-N7{stroke:#FFFFFF;} + .d2-2664246922 .stroke-B1{stroke:#0D32B2;} + .d2-2664246922 .stroke-B2{stroke:#0D32B2;} + .d2-2664246922 .stroke-B3{stroke:#E3E9FD;} + .d2-2664246922 .stroke-B4{stroke:#E3E9FD;} + .d2-2664246922 .stroke-B5{stroke:#EDF0FD;} + .d2-2664246922 .stroke-B6{stroke:#F7F8FE;} + .d2-2664246922 .stroke-AA2{stroke:#4A6FF3;} + .d2-2664246922 .stroke-AA4{stroke:#EDF0FD;} + .d2-2664246922 .stroke-AA5{stroke:#F7F8FE;} + .d2-2664246922 .stroke-AB4{stroke:#EDF0FD;} + .d2-2664246922 .stroke-AB5{stroke:#F7F8FE;} + .d2-2664246922 .background-color-N1{background-color:#0A0F25;} + .d2-2664246922 .background-color-N2{background-color:#676C7E;} + .d2-2664246922 .background-color-N3{background-color:#9499AB;} + .d2-2664246922 .background-color-N4{background-color:#CFD2DD;} + .d2-2664246922 .background-color-N5{background-color:#DEE1EB;} + .d2-2664246922 .background-color-N6{background-color:#EEF1F8;} + .d2-2664246922 .background-color-N7{background-color:#FFFFFF;} + .d2-2664246922 .background-color-B1{background-color:#0D32B2;} + .d2-2664246922 .background-color-B2{background-color:#0D32B2;} + .d2-2664246922 .background-color-B3{background-color:#E3E9FD;} + .d2-2664246922 .background-color-B4{background-color:#E3E9FD;} + .d2-2664246922 .background-color-B5{background-color:#EDF0FD;} + .d2-2664246922 .background-color-B6{background-color:#F7F8FE;} + .d2-2664246922 .background-color-AA2{background-color:#4A6FF3;} + .d2-2664246922 .background-color-AA4{background-color:#EDF0FD;} + .d2-2664246922 .background-color-AA5{background-color:#F7F8FE;} + .d2-2664246922 .background-color-AB4{background-color:#EDF0FD;} + .d2-2664246922 .background-color-AB5{background-color:#F7F8FE;} + .d2-2664246922 .color-N1{color:#0A0F25;} + .d2-2664246922 .color-N2{color:#676C7E;} + .d2-2664246922 .color-N3{color:#9499AB;} + .d2-2664246922 .color-N4{color:#CFD2DD;} + .d2-2664246922 .color-N5{color:#DEE1EB;} + .d2-2664246922 .color-N6{color:#EEF1F8;} + .d2-2664246922 .color-N7{color:#FFFFFF;} + .d2-2664246922 .color-B1{color:#0D32B2;} + .d2-2664246922 .color-B2{color:#0D32B2;} + .d2-2664246922 .color-B3{color:#E3E9FD;} + .d2-2664246922 .color-B4{color:#E3E9FD;} + .d2-2664246922 .color-B5{color:#EDF0FD;} + .d2-2664246922 .color-B6{color:#F7F8FE;} + .d2-2664246922 .color-AA2{color:#4A6FF3;} + .d2-2664246922 .color-AA4{color:#EDF0FD;} + .d2-2664246922 .color-AA5{color:#F7F8FE;} + .d2-2664246922 .color-AB4{color:#EDF0FD;} + .d2-2664246922 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>ab a self edge herebetween actorsto descendantto deeper descendantto parentactor + - - - - - + + + + + \ No newline at end of file diff --git a/e2etests/testdata/txtar/sequence-bounding-box#01/dagre/board.exp.json b/e2etests/testdata/txtar/sequence-bounding-box#01/dagre/board.exp.json new file mode 100644 index 0000000000..93cc3aba27 --- /dev/null +++ b/e2etests/testdata/txtar/sequence-bounding-box#01/dagre/board.exp.json @@ -0,0 +1,256 @@ +{ + "name": "", + "isFolderOnly": false, + "fontFamily": "SourceSansPro", + "shapes": [ + { + "id": "backend", + "type": "rectangle", + "pos": { + "x": 10, + "y": 20 + }, + "width": 263, + "height": 406, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B4", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "backend", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 98, + "labelHeight": 36, + "labelPosition": "OUTSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "backend.client", + "type": "sequence_diagram", + "pos": { + "x": 40, + "y": 50 + }, + "width": 203, + "height": 346, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 0, + "borderRadius": 0, + "fill": "N7", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "client", + "fontSize": 24, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 55, + "labelHeight": 31, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "backend.client.client", + "type": "rectangle", + "pos": { + "x": 52, + "y": 133 + }, + "width": 100, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "client", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 38, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 3 + } + ], + "connections": [ + { + "id": "backend.client.(client -> client)[0]", + "src": "backend.client.client", + "srcArrow": "none", + "dst": "backend.client.client", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "BO_ID -> D2_ID", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 99, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPercentage": 0, + "route": [ + { + "x": 102, + "y": 269 + }, + { + "x": 182, + "y": 269 + }, + { + "x": 182, + "y": 314 + }, + { + "x": 102, + "y": 314 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 4 + }, + { + "id": "(backend.client.client -- )[0]", + "src": "backend.client.client", + "srcArrow": "none", + "dst": "client-lifeline-end-2119091193", + "dstArrow": "none", + "opacity": 1, + "strokeDash": 6, + "strokeWidth": 2, + "stroke": "B2", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "route": [ + { + "x": 102, + "y": 199 + }, + { + "x": 102, + "y": 384 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 1 + } + ], + "root": { + "id": "", + "type": "", + "pos": { + "x": 0, + "y": 0 + }, + "width": 0, + "height": 0, + "opacity": 0, + "strokeDash": 0, + "strokeWidth": 0, + "borderRadius": 0, + "fill": "N7", + "stroke": "", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "zIndex": 0, + "level": 0 + } +} diff --git a/e2etests/testdata/txtar/sequence-bounding-box#01/dagre/sketch.exp.svg b/e2etests/testdata/txtar/sequence-bounding-box#01/dagre/sketch.exp.svg new file mode 100644 index 0000000000..c86b9a754f --- /dev/null +++ b/e2etests/testdata/txtar/sequence-bounding-box#01/dagre/sketch.exp.svg @@ -0,0 +1,105 @@ +backendclientclient BO_ID -> D2_ID + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/txtar/sequence-bounding-box#01/elk/board.exp.json b/e2etests/testdata/txtar/sequence-bounding-box#01/elk/board.exp.json new file mode 100644 index 0000000000..11e468f6d9 --- /dev/null +++ b/e2etests/testdata/txtar/sequence-bounding-box#01/elk/board.exp.json @@ -0,0 +1,256 @@ +{ + "name": "", + "isFolderOnly": false, + "fontFamily": "SourceSansPro", + "shapes": [ + { + "id": "backend", + "type": "rectangle", + "pos": { + "x": 12, + "y": 12 + }, + "width": 304, + "height": 446, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B4", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "backend", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 98, + "labelHeight": 36, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "backend.client", + "type": "sequence_diagram", + "pos": { + "x": 62, + "y": 62 + }, + "width": 204, + "height": 346, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 0, + "borderRadius": 0, + "fill": "N7", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "client", + "fontSize": 24, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 55, + "labelHeight": 31, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "backend.client.client", + "type": "rectangle", + "pos": { + "x": 74, + "y": 145 + }, + "width": 100, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "client", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 38, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 3 + } + ], + "connections": [ + { + "id": "backend.client.(client -> client)[0]", + "src": "backend.client.client", + "srcArrow": "none", + "dst": "backend.client.client", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "BO_ID -> D2_ID", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 99, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPercentage": 0, + "route": [ + { + "x": 124, + "y": 281 + }, + { + "x": 204, + "y": 281 + }, + { + "x": 204, + "y": 326 + }, + { + "x": 124, + "y": 326 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 4 + }, + { + "id": "(backend.client.client -- )[0]", + "src": "backend.client.client", + "srcArrow": "none", + "dst": "client-lifeline-end-2119091193", + "dstArrow": "none", + "opacity": 1, + "strokeDash": 6, + "strokeWidth": 2, + "stroke": "B2", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "route": [ + { + "x": 124, + "y": 211 + }, + { + "x": 124, + "y": 396 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 1 + } + ], + "root": { + "id": "", + "type": "", + "pos": { + "x": 0, + "y": 0 + }, + "width": 0, + "height": 0, + "opacity": 0, + "strokeDash": 0, + "strokeWidth": 0, + "borderRadius": 0, + "fill": "N7", + "stroke": "", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "zIndex": 0, + "level": 0 + } +} diff --git a/e2etests/testdata/txtar/sequence-bounding-box#01/elk/sketch.exp.svg b/e2etests/testdata/txtar/sequence-bounding-box#01/elk/sketch.exp.svg new file mode 100644 index 0000000000..a8793aa97a --- /dev/null +++ b/e2etests/testdata/txtar/sequence-bounding-box#01/elk/sketch.exp.svg @@ -0,0 +1,105 @@ +backendclientclient BO_ID -> D2_ID + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/txtar/sequence-multiline-alignment/dagre/board.exp.json b/e2etests/testdata/txtar/sequence-multiline-alignment/dagre/board.exp.json new file mode 100644 index 0000000000..280828a8ab --- /dev/null +++ b/e2etests/testdata/txtar/sequence-multiline-alignment/dagre/board.exp.json @@ -0,0 +1,377 @@ +{ + "name": "", + "isFolderOnly": false, + "fontFamily": "SourceSansPro", + "shapes": [ + { + "id": "a", + "type": "rectangle", + "pos": { + "x": 12, + "y": 52 + }, + "width": 100, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "a", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 7, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "b", + "type": "rectangle", + "pos": { + "x": 162, + "y": 52 + }, + "width": 100, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "b", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "a.req", + "type": "rectangle", + "pos": { + "x": 56, + "y": 528 + }, + "width": 12, + "height": 30, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B4", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 21, + "labelHeight": 21, + "zIndex": 2, + "level": 2 + } + ], + "connections": [ + { + "id": "(b -> b)[0]", + "src": "b", + "srcArrow": "none", + "dst": "b", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "one\ntwo\nthree\nfour\nfive", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 35, + "labelHeight": 85, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPercentage": 0, + "route": [ + { + "x": 212, + "y": 188 + }, + { + "x": 292, + "y": 188 + }, + { + "x": 292, + "y": 315.5 + }, + { + "x": 212, + "y": 315.5 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 4 + }, + { + "id": "(b -> b)[1]", + "src": "b", + "srcArrow": "none", + "dst": "b", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "one\ntwo\nthree\nfour\nfive", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 35, + "labelHeight": 85, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPercentage": 0, + "route": [ + { + "x": 212, + "y": 363 + }, + { + "x": 292, + "y": 363 + }, + { + "x": 292, + "y": 490.5 + }, + { + "x": 212, + "y": 490.5 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 4 + }, + { + "id": "(a.req -> b)[0]", + "src": "a.req", + "srcArrow": "none", + "dst": "b", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "okay then", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 65, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPercentage": 0, + "route": [ + { + "x": 68, + "y": 538 + }, + { + "x": 212, + "y": 538 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 4 + }, + { + "id": "(a -- )[0]", + "src": "a", + "srcArrow": "none", + "dst": "a-lifeline-end-2251863791", + "dstArrow": "none", + "opacity": 1, + "strokeDash": 6, + "strokeWidth": 2, + "stroke": "B2", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "route": [ + { + "x": 62, + "y": 118 + }, + { + "x": 62, + "y": 608 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 1 + }, + { + "id": "(b -- )[0]", + "src": "b", + "srcArrow": "none", + "dst": "b-lifeline-end-668380428", + "dstArrow": "none", + "opacity": 1, + "strokeDash": 6, + "strokeWidth": 2, + "stroke": "B2", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "route": [ + { + "x": 212, + "y": 118 + }, + { + "x": 212, + "y": 608 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 1 + } + ], + "root": { + "id": "", + "type": "", + "pos": { + "x": 0, + "y": 0 + }, + "width": 0, + "height": 0, + "opacity": 0, + "strokeDash": 0, + "strokeWidth": 0, + "borderRadius": 0, + "fill": "N7", + "stroke": "", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "zIndex": 0, + "level": 0 + } +} diff --git a/e2etests/testdata/txtar/sequence-multiline-alignment/dagre/sketch.exp.svg b/e2etests/testdata/txtar/sequence-multiline-alignment/dagre/sketch.exp.svg new file mode 100644 index 0000000000..000af325ae --- /dev/null +++ b/e2etests/testdata/txtar/sequence-multiline-alignment/dagre/sketch.exp.svg @@ -0,0 +1,106 @@ +ab onetwothreefourfiveonetwothreefourfiveokay then + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/txtar/sequence-multiline-alignment/elk/board.exp.json b/e2etests/testdata/txtar/sequence-multiline-alignment/elk/board.exp.json new file mode 100644 index 0000000000..280828a8ab --- /dev/null +++ b/e2etests/testdata/txtar/sequence-multiline-alignment/elk/board.exp.json @@ -0,0 +1,377 @@ +{ + "name": "", + "isFolderOnly": false, + "fontFamily": "SourceSansPro", + "shapes": [ + { + "id": "a", + "type": "rectangle", + "pos": { + "x": 12, + "y": 52 + }, + "width": 100, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "a", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 7, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "b", + "type": "rectangle", + "pos": { + "x": 162, + "y": 52 + }, + "width": 100, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "b", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "a.req", + "type": "rectangle", + "pos": { + "x": 56, + "y": 528 + }, + "width": 12, + "height": 30, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B4", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 21, + "labelHeight": 21, + "zIndex": 2, + "level": 2 + } + ], + "connections": [ + { + "id": "(b -> b)[0]", + "src": "b", + "srcArrow": "none", + "dst": "b", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "one\ntwo\nthree\nfour\nfive", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 35, + "labelHeight": 85, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPercentage": 0, + "route": [ + { + "x": 212, + "y": 188 + }, + { + "x": 292, + "y": 188 + }, + { + "x": 292, + "y": 315.5 + }, + { + "x": 212, + "y": 315.5 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 4 + }, + { + "id": "(b -> b)[1]", + "src": "b", + "srcArrow": "none", + "dst": "b", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "one\ntwo\nthree\nfour\nfive", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 35, + "labelHeight": 85, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPercentage": 0, + "route": [ + { + "x": 212, + "y": 363 + }, + { + "x": 292, + "y": 363 + }, + { + "x": 292, + "y": 490.5 + }, + { + "x": 212, + "y": 490.5 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 4 + }, + { + "id": "(a.req -> b)[0]", + "src": "a.req", + "srcArrow": "none", + "dst": "b", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "okay then", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 65, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPercentage": 0, + "route": [ + { + "x": 68, + "y": 538 + }, + { + "x": 212, + "y": 538 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 4 + }, + { + "id": "(a -- )[0]", + "src": "a", + "srcArrow": "none", + "dst": "a-lifeline-end-2251863791", + "dstArrow": "none", + "opacity": 1, + "strokeDash": 6, + "strokeWidth": 2, + "stroke": "B2", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "route": [ + { + "x": 62, + "y": 118 + }, + { + "x": 62, + "y": 608 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 1 + }, + { + "id": "(b -- )[0]", + "src": "b", + "srcArrow": "none", + "dst": "b-lifeline-end-668380428", + "dstArrow": "none", + "opacity": 1, + "strokeDash": 6, + "strokeWidth": 2, + "stroke": "B2", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "route": [ + { + "x": 212, + "y": 118 + }, + { + "x": 212, + "y": 608 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 1 + } + ], + "root": { + "id": "", + "type": "", + "pos": { + "x": 0, + "y": 0 + }, + "width": 0, + "height": 0, + "opacity": 0, + "strokeDash": 0, + "strokeWidth": 0, + "borderRadius": 0, + "fill": "N7", + "stroke": "", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "zIndex": 0, + "level": 0 + } +} diff --git a/e2etests/testdata/txtar/sequence-multiline-alignment/elk/sketch.exp.svg b/e2etests/testdata/txtar/sequence-multiline-alignment/elk/sketch.exp.svg new file mode 100644 index 0000000000..000af325ae --- /dev/null +++ b/e2etests/testdata/txtar/sequence-multiline-alignment/elk/sketch.exp.svg @@ -0,0 +1,106 @@ +ab onetwothreefourfiveonetwothreefourfiveokay then + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/txtar/sequence-multiline-self-reference/dagre/board.exp.json b/e2etests/testdata/txtar/sequence-multiline-self-reference/dagre/board.exp.json index 4929dc207d..42162ebc3f 100644 --- a/e2etests/testdata/txtar/sequence-multiline-self-reference/dagre/board.exp.json +++ b/e2etests/testdata/txtar/sequence-multiline-self-reference/dagre/board.exp.json @@ -159,19 +159,19 @@ "route": [ { "x": 62, - "y": 286 + "y": 331 }, { "x": 142, - "y": 286 + "y": 331 }, { "x": 142, - "y": 341.5 + "y": 386.5 }, { "x": 62, - "y": 341.5 + "y": 386.5 } ], "animated": false, @@ -205,11 +205,11 @@ "route": [ { "x": 62, - "y": 368 + "y": 458 }, { "x": 212, - "y": 368 + "y": 458 } ], "animated": false, @@ -243,19 +243,19 @@ "route": [ { "x": 212, - "y": 438 + "y": 528 }, { "x": 292, - "y": 438 + "y": 528 }, { "x": 292, - "y": 517.5 + "y": 607.5 }, { "x": 212, - "y": 517.5 + "y": 607.5 } ], "animated": false, @@ -293,7 +293,7 @@ }, { "x": 62, - "y": 587.5 + "y": 677.5 } ], "animated": false, @@ -331,7 +331,7 @@ }, { "x": 212, - "y": 587.5 + "y": 677.5 } ], "animated": false, diff --git a/e2etests/testdata/txtar/sequence-multiline-self-reference/dagre/sketch.exp.svg b/e2etests/testdata/txtar/sequence-multiline-self-reference/dagre/sketch.exp.svg index 34918e21a0..a4b79fe126 100644 --- a/e2etests/testdata/txtar/sequence-multiline-self-reference/dagre/sketch.exp.svg +++ b/e2etests/testdata/txtar/sequence-multiline-self-reference/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -xy self referential long description which ismultirow3 rowsself referential long description which ismultirownormalself referential long description which ismultirow3 rows - + .d2-3910102872 .fill-N1{fill:#0A0F25;} + .d2-3910102872 .fill-N2{fill:#676C7E;} + .d2-3910102872 .fill-N3{fill:#9499AB;} + .d2-3910102872 .fill-N4{fill:#CFD2DD;} + .d2-3910102872 .fill-N5{fill:#DEE1EB;} + .d2-3910102872 .fill-N6{fill:#EEF1F8;} + .d2-3910102872 .fill-N7{fill:#FFFFFF;} + .d2-3910102872 .fill-B1{fill:#0D32B2;} + .d2-3910102872 .fill-B2{fill:#0D32B2;} + .d2-3910102872 .fill-B3{fill:#E3E9FD;} + .d2-3910102872 .fill-B4{fill:#E3E9FD;} + .d2-3910102872 .fill-B5{fill:#EDF0FD;} + .d2-3910102872 .fill-B6{fill:#F7F8FE;} + .d2-3910102872 .fill-AA2{fill:#4A6FF3;} + .d2-3910102872 .fill-AA4{fill:#EDF0FD;} + .d2-3910102872 .fill-AA5{fill:#F7F8FE;} + .d2-3910102872 .fill-AB4{fill:#EDF0FD;} + .d2-3910102872 .fill-AB5{fill:#F7F8FE;} + .d2-3910102872 .stroke-N1{stroke:#0A0F25;} + .d2-3910102872 .stroke-N2{stroke:#676C7E;} + .d2-3910102872 .stroke-N3{stroke:#9499AB;} + .d2-3910102872 .stroke-N4{stroke:#CFD2DD;} + .d2-3910102872 .stroke-N5{stroke:#DEE1EB;} + .d2-3910102872 .stroke-N6{stroke:#EEF1F8;} + .d2-3910102872 .stroke-N7{stroke:#FFFFFF;} + .d2-3910102872 .stroke-B1{stroke:#0D32B2;} + .d2-3910102872 .stroke-B2{stroke:#0D32B2;} + .d2-3910102872 .stroke-B3{stroke:#E3E9FD;} + .d2-3910102872 .stroke-B4{stroke:#E3E9FD;} + .d2-3910102872 .stroke-B5{stroke:#EDF0FD;} + .d2-3910102872 .stroke-B6{stroke:#F7F8FE;} + .d2-3910102872 .stroke-AA2{stroke:#4A6FF3;} + .d2-3910102872 .stroke-AA4{stroke:#EDF0FD;} + .d2-3910102872 .stroke-AA5{stroke:#F7F8FE;} + .d2-3910102872 .stroke-AB4{stroke:#EDF0FD;} + .d2-3910102872 .stroke-AB5{stroke:#F7F8FE;} + .d2-3910102872 .background-color-N1{background-color:#0A0F25;} + .d2-3910102872 .background-color-N2{background-color:#676C7E;} + .d2-3910102872 .background-color-N3{background-color:#9499AB;} + .d2-3910102872 .background-color-N4{background-color:#CFD2DD;} + .d2-3910102872 .background-color-N5{background-color:#DEE1EB;} + .d2-3910102872 .background-color-N6{background-color:#EEF1F8;} + .d2-3910102872 .background-color-N7{background-color:#FFFFFF;} + .d2-3910102872 .background-color-B1{background-color:#0D32B2;} + .d2-3910102872 .background-color-B2{background-color:#0D32B2;} + .d2-3910102872 .background-color-B3{background-color:#E3E9FD;} + .d2-3910102872 .background-color-B4{background-color:#E3E9FD;} + .d2-3910102872 .background-color-B5{background-color:#EDF0FD;} + .d2-3910102872 .background-color-B6{background-color:#F7F8FE;} + .d2-3910102872 .background-color-AA2{background-color:#4A6FF3;} + .d2-3910102872 .background-color-AA4{background-color:#EDF0FD;} + .d2-3910102872 .background-color-AA5{background-color:#F7F8FE;} + .d2-3910102872 .background-color-AB4{background-color:#EDF0FD;} + .d2-3910102872 .background-color-AB5{background-color:#F7F8FE;} + .d2-3910102872 .color-N1{color:#0A0F25;} + .d2-3910102872 .color-N2{color:#676C7E;} + .d2-3910102872 .color-N3{color:#9499AB;} + .d2-3910102872 .color-N4{color:#CFD2DD;} + .d2-3910102872 .color-N5{color:#DEE1EB;} + .d2-3910102872 .color-N6{color:#EEF1F8;} + .d2-3910102872 .color-N7{color:#FFFFFF;} + .d2-3910102872 .color-B1{color:#0D32B2;} + .d2-3910102872 .color-B2{color:#0D32B2;} + .d2-3910102872 .color-B3{color:#E3E9FD;} + .d2-3910102872 .color-B4{color:#E3E9FD;} + .d2-3910102872 .color-B5{color:#EDF0FD;} + .d2-3910102872 .color-B6{color:#F7F8FE;} + .d2-3910102872 .color-AA2{color:#4A6FF3;} + .d2-3910102872 .color-AA4{color:#EDF0FD;} + .d2-3910102872 .color-AA5{color:#F7F8FE;} + .d2-3910102872 .color-AB4{color:#EDF0FD;} + .d2-3910102872 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>xy self referential long description which ismultirow3 rowsself referential long description which ismultirownormalself referential long description which ismultirow3 rows + - - - + + + \ No newline at end of file diff --git a/e2etests/testdata/txtar/sequence-multiline-self-reference/elk/board.exp.json b/e2etests/testdata/txtar/sequence-multiline-self-reference/elk/board.exp.json index 4929dc207d..42162ebc3f 100644 --- a/e2etests/testdata/txtar/sequence-multiline-self-reference/elk/board.exp.json +++ b/e2etests/testdata/txtar/sequence-multiline-self-reference/elk/board.exp.json @@ -159,19 +159,19 @@ "route": [ { "x": 62, - "y": 286 + "y": 331 }, { "x": 142, - "y": 286 + "y": 331 }, { "x": 142, - "y": 341.5 + "y": 386.5 }, { "x": 62, - "y": 341.5 + "y": 386.5 } ], "animated": false, @@ -205,11 +205,11 @@ "route": [ { "x": 62, - "y": 368 + "y": 458 }, { "x": 212, - "y": 368 + "y": 458 } ], "animated": false, @@ -243,19 +243,19 @@ "route": [ { "x": 212, - "y": 438 + "y": 528 }, { "x": 292, - "y": 438 + "y": 528 }, { "x": 292, - "y": 517.5 + "y": 607.5 }, { "x": 212, - "y": 517.5 + "y": 607.5 } ], "animated": false, @@ -293,7 +293,7 @@ }, { "x": 62, - "y": 587.5 + "y": 677.5 } ], "animated": false, @@ -331,7 +331,7 @@ }, { "x": 212, - "y": 587.5 + "y": 677.5 } ], "animated": false, diff --git a/e2etests/testdata/txtar/sequence-multiline-self-reference/elk/sketch.exp.svg b/e2etests/testdata/txtar/sequence-multiline-self-reference/elk/sketch.exp.svg index 34918e21a0..a4b79fe126 100644 --- a/e2etests/testdata/txtar/sequence-multiline-self-reference/elk/sketch.exp.svg +++ b/e2etests/testdata/txtar/sequence-multiline-self-reference/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -xy self referential long description which ismultirow3 rowsself referential long description which ismultirownormalself referential long description which ismultirow3 rows - + .d2-3910102872 .fill-N1{fill:#0A0F25;} + .d2-3910102872 .fill-N2{fill:#676C7E;} + .d2-3910102872 .fill-N3{fill:#9499AB;} + .d2-3910102872 .fill-N4{fill:#CFD2DD;} + .d2-3910102872 .fill-N5{fill:#DEE1EB;} + .d2-3910102872 .fill-N6{fill:#EEF1F8;} + .d2-3910102872 .fill-N7{fill:#FFFFFF;} + .d2-3910102872 .fill-B1{fill:#0D32B2;} + .d2-3910102872 .fill-B2{fill:#0D32B2;} + .d2-3910102872 .fill-B3{fill:#E3E9FD;} + .d2-3910102872 .fill-B4{fill:#E3E9FD;} + .d2-3910102872 .fill-B5{fill:#EDF0FD;} + .d2-3910102872 .fill-B6{fill:#F7F8FE;} + .d2-3910102872 .fill-AA2{fill:#4A6FF3;} + .d2-3910102872 .fill-AA4{fill:#EDF0FD;} + .d2-3910102872 .fill-AA5{fill:#F7F8FE;} + .d2-3910102872 .fill-AB4{fill:#EDF0FD;} + .d2-3910102872 .fill-AB5{fill:#F7F8FE;} + .d2-3910102872 .stroke-N1{stroke:#0A0F25;} + .d2-3910102872 .stroke-N2{stroke:#676C7E;} + .d2-3910102872 .stroke-N3{stroke:#9499AB;} + .d2-3910102872 .stroke-N4{stroke:#CFD2DD;} + .d2-3910102872 .stroke-N5{stroke:#DEE1EB;} + .d2-3910102872 .stroke-N6{stroke:#EEF1F8;} + .d2-3910102872 .stroke-N7{stroke:#FFFFFF;} + .d2-3910102872 .stroke-B1{stroke:#0D32B2;} + .d2-3910102872 .stroke-B2{stroke:#0D32B2;} + .d2-3910102872 .stroke-B3{stroke:#E3E9FD;} + .d2-3910102872 .stroke-B4{stroke:#E3E9FD;} + .d2-3910102872 .stroke-B5{stroke:#EDF0FD;} + .d2-3910102872 .stroke-B6{stroke:#F7F8FE;} + .d2-3910102872 .stroke-AA2{stroke:#4A6FF3;} + .d2-3910102872 .stroke-AA4{stroke:#EDF0FD;} + .d2-3910102872 .stroke-AA5{stroke:#F7F8FE;} + .d2-3910102872 .stroke-AB4{stroke:#EDF0FD;} + .d2-3910102872 .stroke-AB5{stroke:#F7F8FE;} + .d2-3910102872 .background-color-N1{background-color:#0A0F25;} + .d2-3910102872 .background-color-N2{background-color:#676C7E;} + .d2-3910102872 .background-color-N3{background-color:#9499AB;} + .d2-3910102872 .background-color-N4{background-color:#CFD2DD;} + .d2-3910102872 .background-color-N5{background-color:#DEE1EB;} + .d2-3910102872 .background-color-N6{background-color:#EEF1F8;} + .d2-3910102872 .background-color-N7{background-color:#FFFFFF;} + .d2-3910102872 .background-color-B1{background-color:#0D32B2;} + .d2-3910102872 .background-color-B2{background-color:#0D32B2;} + .d2-3910102872 .background-color-B3{background-color:#E3E9FD;} + .d2-3910102872 .background-color-B4{background-color:#E3E9FD;} + .d2-3910102872 .background-color-B5{background-color:#EDF0FD;} + .d2-3910102872 .background-color-B6{background-color:#F7F8FE;} + .d2-3910102872 .background-color-AA2{background-color:#4A6FF3;} + .d2-3910102872 .background-color-AA4{background-color:#EDF0FD;} + .d2-3910102872 .background-color-AA5{background-color:#F7F8FE;} + .d2-3910102872 .background-color-AB4{background-color:#EDF0FD;} + .d2-3910102872 .background-color-AB5{background-color:#F7F8FE;} + .d2-3910102872 .color-N1{color:#0A0F25;} + .d2-3910102872 .color-N2{color:#676C7E;} + .d2-3910102872 .color-N3{color:#9499AB;} + .d2-3910102872 .color-N4{color:#CFD2DD;} + .d2-3910102872 .color-N5{color:#DEE1EB;} + .d2-3910102872 .color-N6{color:#EEF1F8;} + .d2-3910102872 .color-N7{color:#FFFFFF;} + .d2-3910102872 .color-B1{color:#0D32B2;} + .d2-3910102872 .color-B2{color:#0D32B2;} + .d2-3910102872 .color-B3{color:#E3E9FD;} + .d2-3910102872 .color-B4{color:#E3E9FD;} + .d2-3910102872 .color-B5{color:#EDF0FD;} + .d2-3910102872 .color-B6{color:#F7F8FE;} + .d2-3910102872 .color-AA2{color:#4A6FF3;} + .d2-3910102872 .color-AA4{color:#EDF0FD;} + .d2-3910102872 .color-AA5{color:#F7F8FE;} + .d2-3910102872 .color-AB4{color:#EDF0FD;} + .d2-3910102872 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>xy self referential long description which ismultirow3 rowsself referential long description which ismultirownormalself referential long description which ismultirow3 rows + - - - + + + \ No newline at end of file diff --git a/e2etests/txtar.txt b/e2etests/txtar.txt index cea8672ef6..aab9e408fb 100644 --- a/e2etests/txtar.txt +++ b/e2etests/txtar.txt @@ -319,3 +319,19 @@ backend.client: { shape: sequence_diagram client -> client: BO_ID -> D2_ID } + +-- sequence-bounding-box -- +backend.client: { + shape: sequence_diagram + client -> client: BO_ID -> D2_ID +} + +-- sequence-multiline-alignment -- +shape: sequence_diagram +a +b + +b -> b: one\ntwo\nthree\nfour\nfive +b -> b: one\ntwo\nthree\nfour\nfive + +a.req -> b: okay then