Moved interactionWidth to ArrowMixin

mermaid-js · Nov 21, 2024 · 89698f0 · 89698f0
1 parent 27ab9e7
commit 89698f0
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 22 deletions.
diff --git a/...mponents/DiagramFrame/SeqDiagram/MessageLayer/Block/Statement/Interaction/Interaction.vue b/...mponents/DiagramFrame/SeqDiagram/MessageLayer/Block/Statement/Interaction/Interaction.vue
@@ -71,7 +71,6 @@ import ArrowMixin from "@/components/DiagramFrame/SeqDiagram/MessageLayer/Block/
 import { _STARTER_ } from "@/parser/OrderedParticipants";
 
 import { DirectionMixin } from "@/components/DiagramFrame/SeqDiagram/MessageLayer/Block/Statement/DirectionMixin";
-import { LIFELINE_WIDTH } from "@/positioning/Constants";
 
 export default {
   name: "interaction",
@@ -116,12 +115,6 @@ export default {
       return this.message?.isCurrent(this.cursor);
     },
 
-    interactionWidth: function () {
-      return (
-        Math.abs(this.anchorSource.calculateEdgeOffset(this.anchorTarget)) -
-        LIFELINE_WIDTH
-      );
-    },
     isSelf: function () {
       // this.to === undefined if it is a self interaction and root message.
       return !this.target || this.target === this.source;

diff --git a/...agramFrame/SeqDiagram/MessageLayer/Block/Statement/InteractionAsync/Interaction-async.vue b/...agramFrame/SeqDiagram/MessageLayer/Block/Statement/InteractionAsync/Interaction-async.vue
@@ -49,7 +49,6 @@ import Message from "../Message/Message.vue";
 import { mapGetters } from "vuex";
 import { CodeRange } from "@/parser/CodeRange";
 import ArrowMixin from "@/components/DiagramFrame/SeqDiagram/MessageLayer/Block/Statement/ArrowMixin";
-import { LIFELINE_WIDTH } from "@/positioning/Constants";
 import { DirectionMixin } from "@/components/DiagramFrame/SeqDiagram/MessageLayer/Block/Statement/DirectionMixin";
 import Anchor from "@/positioning/Anchor";
 
@@ -173,12 +172,6 @@ export default {
 
       return (length - 1) * 7;
     },
-    interactionWidth: function () {
-      return (
-        Math.abs(this.anchorSource.calculateEdgeOffset(this.anchorTarget)) -
-        LIFELINE_WIDTH
-      );
-    },
     // Both 'left' and 'translateX' can be used to move the element horizontally.
     // Change it to use translate according to https://stackoverflow.com/a/53892597/529187.
     translateX: function () {

diff --git a/src/components/DiagramFrame/SeqDiagram/MessageLayer/Block/Statement/Return/Return.vue b/src/components/DiagramFrame/SeqDiagram/MessageLayer/Block/Statement/Return/Return.vue
@@ -14,7 +14,11 @@
       'bare-target': bareTarget,
       highlight: isCurrent,
     }"
-    :style="{ ...borderWidth, width: width + 'px', left: left + 'px' }"
+    :style="{
+      ...borderWidth,
+      width: interactionWidth + 'px',
+      left: left + 'px',
+    }"
   >
     <comment v-if="comment" :commentObj="commentObj" />
     <div v-if="isSelf" class="flex items-center">
@@ -50,8 +54,6 @@ import Comment from "../Comment/Comment.vue";
 import Message from "../Message/Message.vue";
 import { mapGetters } from "vuex";
 import { CodeRange } from "@/parser/CodeRange";
-import WidthProviderOnBrowser from "@/positioning/WidthProviderFunc";
-import { TextType } from "@/positioning/Coordinate";
 import ArrowMixin from "@/components/DiagramFrame/SeqDiagram/MessageLayer/Block/Statement/ArrowMixin";
 import { DirectionMixin } from "@/components/DiagramFrame/SeqDiagram/MessageLayer/Block/Statement/DirectionMixin";
 import { _STARTER_ } from "@/parser/OrderedParticipants";
@@ -74,11 +76,6 @@ export default {
     asyncMessage: function () {
       return this.ret?.asyncMessage();
     },
-    width: function () {
-      return this.isSelf
-        ? WidthProviderOnBrowser(this.signature, TextType.MessageContent)
-        : Math.abs(this.distance(this.target, this.source));
-    },
     left: function () {
       return this.rightToLeft
         ? this.distance(this.target, this.origin)