Use ArrowMixin.js in Interaction.vue.

mermaid-js · Nov 1, 2024 · 9382fe8 · 9382fe8
1 parent 0c6ce3a
commit 9382fe8
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 13 deletions.
diff --git a/src/components/DiagramFrame/SeqDiagram/MessageLayer/Block/Statement/ArrowMixin.js b/src/components/DiagramFrame/SeqDiagram/MessageLayer/Block/Statement/ArrowMixin.js
@@ -21,8 +21,9 @@ export default {
   },
   methods: {
     isJointOccurrence(participant) {
-      let ancestorContextForParticipant = this.findOwningContext(participant);
-
+      let ancestorContextForParticipant =
+        this.findContextForReceiver(participant);
+      console.debug("owning context", ancestorContextForParticipant);
       // If no owning context found, it means this is a bare connection
       if (!ancestorContextForParticipant) {
         return false;
@@ -35,9 +36,13 @@ export default {
         ancestorContextForParticipant instanceof sequenceParser.CreationContext
       );
     },
-    findOwningContext(participant) {
+    // Input `participant` is the receiver. This method
+    findContextForReceiver(participant) {
       let currentContext = this.context;
-
+      const messageContext = this.context.message();
+      if (messageContext && messageContext.Owner() === participant) {
+        return messageContext;
+      }
       while (currentContext) {
         if (!currentContext.Owner) {
           currentContext = currentContext.parentCtx;

diff --git a/...mponents/DiagramFrame/SeqDiagram/MessageLayer/Block/Statement/Interaction/Interaction.vue b/...mponents/DiagramFrame/SeqDiagram/MessageLayer/Block/Statement/Interaction/Interaction.vue
@@ -8,11 +8,10 @@
     :class="{
       highlight: isCurrent,
       self: isSelf,
-      'from-no-occurrence': providedFrom && providedFrom !== origin,
-      'inited-from-occurrence': isInitedFromOccurrence,
       'right-to-left': rightToLeft,
     }"
     :style="{
+      ...borderWidth,
       width: isSelf ? undefined : interactionWidth + 'px',
       transform: 'translateX(' + translateX + 'px)',
     }"
@@ -73,6 +72,7 @@ import { mapGetters } from "vuex";
 import SelfInvocation from "./SelfInvocation/SelfInvocation.vue";
 import { CodeRange } from "@/parser/CodeRange";
 import { ProgContext } from "@/parser";
+import ArrowMixin from "@/components/DiagramFrame/SeqDiagram/MessageLayer/Block/Statement/ArrowMixin";
 
 export default {
   name: "interaction",
@@ -83,6 +83,7 @@ export default {
     "number",
     // "inheritFromOccurrence",
   ],
+  mixins: [ArrowMixin],
   computed: {
     // add tracker to the mapGetters
     ...mapGetters(["participants", "distance2", "cursor", "onElementClick"]),
@@ -104,6 +105,13 @@ export default {
     from: function () {
       return this.providedFrom || this.origin;
     },
+    // used by ArrowMixin
+    source: function () {
+      return this.from;
+    },
+    target: function () {
+      return this.to;
+    },
     outOfBand: function () {
       return !!this.providedFrom && this.providedFrom !== this.origin;
     },
@@ -166,9 +174,6 @@ export default {
       // this.to === undefined if it is a self interaction and root message.
       return !this.to || this.to === this.from;
     },
-    isInitedFromOccurrence: function () {
-      return this.message?.isInitedFromOccurrence(this.context);
-    },
   },
   methods: {
     onClick() {

diff --git a/src/parser/Owner.js b/src/parser/Owner.js
@@ -1,3 +1,10 @@
+/**
+ * Owner is the receiver of the message.
+ * For example, in `S -> A.m1 {B.m2 {C.m3}} D->E:m4`,
+ *                       |     |     |         |
+ * Owner of              m1    m2    m3        m4
+ */
+
 import { default as sequenceParser } from "../generated-parser/sequenceParser";
 
 const seqParser = sequenceParser;
@@ -25,10 +32,6 @@ CreationContext.prototype.To = function () {
   return this.Constructor();
 };
 
-// Owner is essentially the 'to' or receiver of a message.
-// For example, in `S -> A.m1 {B.m2 {C.m3}}`,
-//                       |     |     |
-// Owner of              m1    m2    m3
 CreationContext.prototype.Owner = function () {
   if (!this.Constructor()) {
     return "Missing Constructor";