From e21643229e4447699755b699e4d151471e549b2d Mon Sep 17 00:00:00 2001
From: Aakansha Doshi <aakansha1216@gmail.com>
Date: Wed, 14 Feb 2024 12:12:49 +0530
Subject: [PATCH 1/3] feat: add name field to the actors

---
 demos/sequence.html                                   | 7 +++++++
 packages/mermaid/src/diagrams/common/commonTypes.ts   | 1 +
 packages/mermaid/src/diagrams/common/svgDrawCommon.ts | 1 +
 packages/mermaid/src/diagrams/sequence/svgDraw.js     | 2 ++
 4 files changed, 11 insertions(+)

diff --git a/demos/sequence.html b/demos/sequence.html
index 8eecae6105..49d2d4285c 100644
--- a/demos/sequence.html
+++ b/demos/sequence.html
@@ -187,6 +187,13 @@ <h1>Sequence diagram demos</h1>
         Note left of Bob: Alice/Bob Note
       end
     </pre>
+    <pre class="mermaid">
+      sequenceDiagram
+        actor Alice
+        actor John
+        Alice-xJohn: Hello John, how are you?
+        John--xAlice: Great!
+    </pre>
 
     <script type="module">
       import mermaid from './mermaid.esm.mjs';
diff --git a/packages/mermaid/src/diagrams/common/commonTypes.ts b/packages/mermaid/src/diagrams/common/commonTypes.ts
index 84c26db6e1..db51f8fb38 100644
--- a/packages/mermaid/src/diagrams/common/commonTypes.ts
+++ b/packages/mermaid/src/diagrams/common/commonTypes.ts
@@ -11,6 +11,7 @@ export interface RectData {
   ry?: number;
   attrs?: Record<string, string | number>;
   anchor?: string;
+  name: string;
 }
 
 export interface Bound {
diff --git a/packages/mermaid/src/diagrams/common/svgDrawCommon.ts b/packages/mermaid/src/diagrams/common/svgDrawCommon.ts
index 706d43ab9d..6bf445ecf7 100644
--- a/packages/mermaid/src/diagrams/common/svgDrawCommon.ts
+++ b/packages/mermaid/src/diagrams/common/svgDrawCommon.ts
@@ -21,6 +21,7 @@ export const drawRect = (element: SVG | Group, rectData: RectData): D3RectElemen
   rectElement.attr('stroke', rectData.stroke);
   rectElement.attr('width', rectData.width);
   rectElement.attr('height', rectData.height);
+  rectElement.attr('name', rectData.name);
   rectData.rx !== undefined && rectElement.attr('rx', rectData.rx);
   rectData.ry !== undefined && rectElement.attr('ry', rectData.ry);
 
diff --git a/packages/mermaid/src/diagrams/sequence/svgDraw.js b/packages/mermaid/src/diagrams/sequence/svgDraw.js
index e2f1ffa6a6..7272e5831b 100644
--- a/packages/mermaid/src/diagrams/sequence/svgDraw.js
+++ b/packages/mermaid/src/diagrams/sequence/svgDraw.js
@@ -333,6 +333,7 @@ const drawActorTypeParticipant = function (elem, actor, conf, isFooter) {
   rect.class = cssclass;
   rect.rx = 3;
   rect.ry = 3;
+  rect.name = actor.name;
   const rectElem = drawRect(g, rect);
   actor.rectData = rect;
 
@@ -397,6 +398,7 @@ const drawActorTypeActor = function (elem, actor, conf, isFooter) {
     cssClass += ` ${TOP_ACTOR_CLASS}`;
   }
   actElem.attr('class', cssClass);
+  actElem.attr('name', actor.name);
 
   const rect = svgDrawCommon.getNoteRect();
   rect.x = actor.x;

From bee88ac70e35560bb87104d5f1fc2ae78e45b800 Mon Sep 17 00:00:00 2001
From: Aakansha Doshi <aakansha1216@gmail.com>
Date: Wed, 14 Feb 2024 12:35:06 +0530
Subject: [PATCH 2/3] make name optional

---
 packages/mermaid/src/diagrams/common/commonTypes.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/mermaid/src/diagrams/common/commonTypes.ts b/packages/mermaid/src/diagrams/common/commonTypes.ts
index db51f8fb38..36473f3e42 100644
--- a/packages/mermaid/src/diagrams/common/commonTypes.ts
+++ b/packages/mermaid/src/diagrams/common/commonTypes.ts
@@ -11,7 +11,7 @@ export interface RectData {
   ry?: number;
   attrs?: Record<string, string | number>;
   anchor?: string;
-  name: string;
+  name?: string;
 }
 
 export interface Bound {

From 23dd7b2b100394afe68ddc8c161326e34f939833 Mon Sep 17 00:00:00 2001
From: Aakansha Doshi <aakansha1216@gmail.com>
Date: Wed, 14 Feb 2024 12:41:54 +0530
Subject: [PATCH 3/3] add name only when present in rectData

---
 packages/mermaid/src/diagrams/common/svgDrawCommon.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/mermaid/src/diagrams/common/svgDrawCommon.ts b/packages/mermaid/src/diagrams/common/svgDrawCommon.ts
index 6bf445ecf7..cf962f33ec 100644
--- a/packages/mermaid/src/diagrams/common/svgDrawCommon.ts
+++ b/packages/mermaid/src/diagrams/common/svgDrawCommon.ts
@@ -21,7 +21,9 @@ export const drawRect = (element: SVG | Group, rectData: RectData): D3RectElemen
   rectElement.attr('stroke', rectData.stroke);
   rectElement.attr('width', rectData.width);
   rectElement.attr('height', rectData.height);
-  rectElement.attr('name', rectData.name);
+  if (rectData.name) {
+    rectElement.attr('name', rectData.name);
+  }
   rectData.rx !== undefined && rectElement.attr('rx', rectData.rx);
   rectData.ry !== undefined && rectElement.attr('ry', rectData.ry);