@diagrammo/dgmo 0.2.19 → 0.2.21

package/src/sequence/renderer.ts

@@ -275,6 +275,7 @@ function renderDatabaseParticipant(
 
   // Filled body (no stroke) to hide the top arc of the bottom ellipse
   g.append('rect')
+    .attr('class', 'participant-body')
     .attr('x', -W / 2)
     .attr('y', topY)
     .attr('width', W)
@@ -333,6 +334,7 @@ function renderQueueParticipant(
 
   // Body rect (no stroke) to hide left arc of right ellipse
   g.append('rect')
+    .attr('class', 'participant-body')
     .attr('x', leftX)
     .attr('y', 0)
     .attr('width', bodyW)
@@ -380,6 +382,7 @@ function renderCacheParticipant(
   const s = stroke(palette);
   const dash = '4 3';
 
+  // Bottom ellipse (back face)
   g.append('ellipse')
     .attr('cx', 0)
     .attr('cy', topY + bodyH)
@@ -391,6 +394,7 @@ function renderCacheParticipant(
     .attr('stroke-dasharray', dash);
 
   g.append('rect')
+    .attr('class', 'participant-body')
     .attr('x', -W / 2)
     .attr('y', topY)
     .attr('width', W)
@@ -415,6 +419,7 @@ function renderCacheParticipant(
     .attr('stroke-width', SW)
     .attr('stroke-dasharray', dash);
 
+  // Top ellipse cap
   g.append('ellipse')
     .attr('cx', 0)
     .attr('cy', topY)
@@ -906,11 +911,13 @@ export function renderSequenceDiagram(
     msgToLastStep.set(step.messageIndex, si);
   });
 
-  // Map a note to the first render-step index of its preceding message
-  // (the forward/call arrow, not the return arrow).
+  // Map a note to the last render-step index of its preceding message
+  // (the return arrow if present, otherwise the call arrow).
+  // This ensures notes are positioned below the return arrow so they
+  // don't overlap it.
   // If the note's closest preceding message is hidden (collapsed section), return -1
   // so the note is hidden along with its section.
-  const findAssociatedFirstStep = (note: SequenceNote): number => {
+  const findAssociatedLastStep = (note: SequenceNote): number => {
     // First find the closest preceding message (ignoring hidden filter)
     let closestMsgIndex = -1;
     let closestLine = -1;
@@ -928,7 +935,7 @@ export function renderSequenceDiagram(
       return -1;
     }
     if (closestMsgIndex < 0) return -1;
-    return msgToFirstStep.get(closestMsgIndex) ?? -1;
+    return msgToLastStep.get(closestMsgIndex) ?? -1;
   };
 
   // Find the first visible message index in an element subtree
@@ -1254,7 +1261,7 @@ export function renderSequenceDiagram(
       for (let i = 0; i < els.length; i++) {
         const el = els[i];
         if (isSequenceNote(el)) {
-          const si = findAssociatedFirstStep(el);
+          const si = findAssociatedLastStep(el);
           if (si < 0) continue;
           // Check if there's a preceding note that we should stack below
           const prevNote = i > 0 && isSequenceNote(els[i - 1]) ? (els[i - 1] as SequenceNote) : null;
@@ -1728,6 +1735,7 @@ export function renderSequenceDiagram(
       .attr('stroke-opacity', 0.5)
       .attr('data-participant-id', act.participantId)
       .attr('data-msg-lines', coveredLines.join(','))
+      .attr('data-line-number', coveredLines[0] ?? '')
       .attr('class', 'activation');
   });