d2sequence: fix self reference message alignment

terrastruct · Aug 5, 2024 · f3b0a2f · f3b0a2f
1 parent 9b83a0f
commit f3b0a2f
Show file tree

Hide file tree

Showing 32 changed files with 2,817 additions and 1,115 deletions.
diff --git 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
@@ -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 {
+		// we need extra space if the previous message is a loop
+		if prevIsLoop {
 			messageOffset += MIN_MESSAGE_DISTANCE
 		}
-		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
diff --git a/e2etests/testdata/regression/sequence_diagram_self_edge_group_overlap/dagre/board.exp.json b/e2etests/testdata/regression/sequence_diagram_self_edge_group_overlap/dagre/board.exp.json