From a3456ec933e60fc2d6379e7245797a2d98e82309 Mon Sep 17 00:00:00 2001
From: Sidharth Vinod <sidharthv96@gmail.com>
Date: Tue, 26 Sep 2023 18:36:05 +0530
Subject: [PATCH] fix: Sequence diagram loop rendering

---
 .../src/diagrams/sequence/sequenceRenderer.ts | 40 +++++++++++--------
 1 file changed, 24 insertions(+), 16 deletions(-)

diff --git a/packages/mermaid/src/diagrams/sequence/sequenceRenderer.ts b/packages/mermaid/src/diagrams/sequence/sequenceRenderer.ts
index a596a3a029..058646dc8b 100644
--- a/packages/mermaid/src/diagrams/sequence/sequenceRenderer.ts
+++ b/packages/mermaid/src/diagrams/sequence/sequenceRenderer.ts
@@ -1421,23 +1421,31 @@ const buildMessageModel = function (msg, actors, diagObj) {
     return isArrowToRight ? -value : value;
   };
 
-  /**
-   * This is an edge case for the first activation.
-   * Proper fix would require significant changes.
-   * So, we set an activate flag in the message, and cross check that with isToActivation
-   * In cases where the message is to an activation that was properly detected, we don't want to move the arrow head
-   * The activation will not be detected on the first message, so we need to move the arrow head
-   */
-  if (msg.activate && !isArrowToActivation) {
-    stopx += adjustValue(conf.activationWidth / 2 - 1);
-  }
+  // 3 is max difference for +/- 1
+  if (Math.abs(startx - stopx) <= 3) {
+    // This is a self reference, so we need to make sure the arrow is drawn correctly
+    // There are many checks in the downstream rendering that checks for equality.
+    // The lines on loops will be off by few pixels, but that's fine for now.
+    stopx = startx;
+  } else {
+    /**
+     * This is an edge case for the first activation.
+     * Proper fix would require significant changes.
+     * So, we set an activate flag in the message, and cross check that with isToActivation
+     * In cases where the message is to an activation that was properly detected, we don't want to move the arrow head
+     * The activation will not be detected on the first message, so we need to move the arrow head
+     */
+    if (msg.activate && !isArrowToActivation) {
+      stopx += adjustValue(conf.activationWidth / 2 - 1);
+    }
 
-  /**
-   * Shorten the length of arrow at the end and move the marker forward (using refX) to have a clean arrowhead
-   * This is not required for open arrows that don't have arrowheads
-   */
-  if (![diagObj.db.LINETYPE.SOLID_OPEN, diagObj.db.LINETYPE.DOTTED_OPEN].includes(msg.type)) {
-    stopx += adjustValue(3);
+    /**
+     * Shorten the length of arrow at the end and move the marker forward (using refX) to have a clean arrowhead
+     * This is not required for open arrows that don't have arrowheads
+     */
+    if (![diagObj.db.LINETYPE.SOLID_OPEN, diagObj.db.LINETYPE.DOTTED_OPEN].includes(msg.type)) {
+      stopx += adjustValue(3);
+    }
   }
 
   const allBounds = [fromLeft, fromRight, toLeft, toRight];