Merge pull request #164 from mermaid-js/fix/self-sync-message-at-root

MrCoder · web-flow · commit 83f2db493ba7 · 2024-06-02T16:28:06.000+10:00
Fix/self sync message at root
diff --git a/cy/self-sync-message-at-root.html b/cy/self-sync-message-at-root.html
@@ -14,8 +14,11 @@
   <body>
     <div id="diagram" class="diagram">
       <pre class="zenuml" style="margin: 0">
-@Starter(A)
-new B()
+selfSync() {
+  A.method {
+    B.method
+  }
+}
       </pre>
     </div>
 
diff --git a/cy/smoke.html b/cy/smoke.html
@@ -14,7 +14,6 @@
   <body>
     <div id="diagram" class="diagram">
       <pre class="zenuml" style="margin: 0">
-
 title ABCD Title
 // Generating Sequence Diagrams from Java code is experimental.
 // Please report errors to https://github.com/ZenUml/jetbrains-zenuml/discussions
@@ -32,7 +31,6 @@
   }
   return "resultStringBuilder.toString()";
 }
-
 </pre
       >
     </div>
diff --git a/cypress/e2e/__image_snapshots__/Smoke test  Self Sync Message at Root #0.png b/cypress/e2e/__image_snapshots__/Smoke test  Self Sync Message at Root #0.png
diff --git a/src/components/DiagramFrame/SeqDiagram/LifeLineLayer/LifeLine.vue b/src/components/DiagramFrame/SeqDiagram/LifeLineLayer/LifeLine.vue
@@ -6,7 +6,7 @@
     :class="{ 'transform -translate-x-1/2': renderParticipants }"
     :style="{ paddingTop: top + 'px', left: left + 'px' }"
   >
-    <participant v-if="renderParticipants" :entity="entity" :offsetTop="top" />
+    <participant v-if="renderParticipants" :entity="entity" :offsetTop2="top" />
     <div v-if="renderLifeLine" class="line w0 mx-auto flex-grow w-px"></div>
   </div>
 </template>
diff --git a/src/components/DiagramFrame/SeqDiagram/LifeLineLayer/Participant.vue b/src/components/DiagramFrame/SeqDiagram/LifeLineLayer/Participant.vue
@@ -69,7 +69,7 @@ export default {
     const intersectionTop = useIntersectionTop();
     const [scrollTop] = useDocumentScroll();
     const translate = computed(() => {
-      const participantOffsetTop = props.offsetTop || 0;
+      const participantOffsetTop = props.offsetTop2 || 0;
       let top = intersectionTop.value + scrollTop.value;
       if (
         intersectionTop.value > INTERSECTION_ERROR_MARGIN &&
@@ -93,7 +93,8 @@ export default {
       type: Object,
       required: true,
     },
-    offsetTop: {
+    // offsetTop is a standard HTML property, so we use offsetTop2.
+    offsetTop2: {
       type: Number,
       default: 0,
     },
diff --git a/src/components/DiagramFrame/SeqDiagram/MessageLayer/Block/Statement/Creation/Creation.spec.ts b/src/components/DiagramFrame/SeqDiagram/MessageLayer/Block/Statement/Creation/Creation.spec.ts
@@ -4,7 +4,10 @@ import { VueSequence } from "@/index";
 import Creation from "./Creation.vue";
 import { Fixture } from "../../../../../../../../test/unit/parser/fixture/Fixture";
 
-function mountCreationWithCode(code: string, contextLocator: () => void) {
+function mountCreationWithCode(
+  code: string,
+  contextLocator: (code: string) => any,
+) {
   const storeConfig = VueSequence.Store();
   // @ts-ignore
   storeConfig.state.code = code;
diff --git a/src/components/DiagramFrame/SeqDiagram/MessageLayer/Block/Statement/Creation/Creation.vue b/src/components/DiagramFrame/SeqDiagram/MessageLayer/Block/Statement/Creation/Creation.vue
@@ -88,10 +88,6 @@ export default {
       return this.context.creation();
     },
     interactionWidth() {
-      if (this.context && this.isSelf) {
-        return 0;
-      }
-
       let safeOffset = this.selfCallIndent || 0;
       return Math.abs(this.distance2(this.from, this.to) - safeOffset) - 1;
     },
diff --git a/src/parser/IsInitedFromOccurrence.js b/src/parser/IsInitedFromOccurrence.js
@@ -33,9 +33,7 @@ function isInitedFromOccurrence(from) {
       } else if (current.creation && current.creation()) {
         participant = current.creation().Owner();
       }
-      console.log("!!!", participant, from);
       if (participant === from) {
-        console.log("!!! true");
         return true;
       }
     }

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,6 @@`
`14`	`14`	`<body>`
`15`	`15`	`<div id="diagram" class="diagram">`
`16`	`16`	`<pre class="zenuml" style="margin: 0">`
`17`		`-`
`18`	`17`	`title ABCD Title`
`19`	`18`	`// Generating Sequence Diagrams from Java code is experimental.`
`20`	`19`	`// Please report errors to https://github.com/ZenUml/jetbrains-zenuml/discussions`
`@@ -32,7 +31,6 @@`
`32`	`31`	`}`
`33`	`32`	`return "resultStringBuilder.toString()";`
`34`	`33`	`}`
`35`		`-`
`36`	`34`	`</pre`
`37`	`35`	`>`
`38`	`36`	`</div>`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`:class="{ 'transform -translate-x-1/2': renderParticipants }"`
`7`	`7`	`:style="{ paddingTop: top + 'px', left: left + 'px' }"`
`8`	`8`	`>`
`9`		`- <participant v-if="renderParticipants" :entity="entity" :offsetTop="top" />`
	`9`	`+ <participant v-if="renderParticipants" :entity="entity" :offsetTop2="top" />`
`10`	`10`	`<div v-if="renderLifeLine" class="line w0 mx-auto flex-grow w-px"></div>`
`11`	`11`	`</div>`
`12`	`12`	`</template>`
Original file line number	Diff line number	Diff line change
`@@ -33,9 +33,7 @@ function isInitedFromOccurrence(from) {`
`33`	`33`	`} else if (current.creation && current.creation()) {`
`34`	`34`	`participant = current.creation().Owner();`
`35`	`35`	`}`
`36`		`- console.log("!!!", participant, from);`
`37`	`36`	`if (participant === from) {`
`38`		`- console.log("!!! true");`
`39`	`37`	`return true;`
`40`	`38`	`}`
`41`	`39`	`}`