Merge branch 'main' into fix/depdencies-vulnerability

mermaid-js · Sep 20, 2023 · b6113e6 · b6113e6
2 parents f3f4d20 + 26a5c0c
commit b6113e6
Show file tree

Hide file tree

Showing 9 changed files with 6,372 additions and 5,992 deletions.
diff --git a/...mponents/DiagramFrame/SeqDiagram/MessageLayer/Block/Statement/Interaction/Interaction.vue b/...mponents/DiagramFrame/SeqDiagram/MessageLayer/Block/Statement/Interaction/Interaction.vue
@@ -5,7 +5,7 @@
     :data-to="to"
     data-type="interaction"
     :data-signature="signature"
-    :class="{ highlight: isCurrent, self: isSelf, 'inited-from-occurrence': isInitedFromOccurrence }"
+    :class="{ highlight: isCurrent, self: isSelf, 'inited-from-occurrence': isInitedFromOccurrence, 'right-to-left': rightToLeft }"
     :style="{
       width: !isSelf && (interactionWidth + 'px'),
       transform: 'translateX(' + translateX + 'px)',

diff --git a/src/components/DiagramFrame/SeqDiagram/MessageLayer/MessageLayer.vue b/src/components/DiagramFrame/SeqDiagram/MessageLayer/MessageLayer.vue
@@ -55,68 +55,76 @@ export default {
 
 <style lang="scss">
 .zenuml {
-/* Avoid moving interaction to the left or right with margins.
-We can always assume that an interaction's border is the lifeline.
-Moving content with padding is OK.
-Don't move this to the Interaction component. This is also used by Interaction-async
- */
-.interaction {
-  /*Keep dashed or solid here otherwise no space is given to the border*/
-  border: dashed transparent 0;
-}
-
-.interaction.sync {
-  /* This border width configuration make sure the content width is
-     the same as from the source occurrence's right border to target
-     occurrence's left boarder (boarder not inclusive).*/
-  border-right-width: 7px;
-}
-
-.interaction.inited-from-occurrence,
-.interaction.self-invocation {
-  border-left-width: 7px;
-}
-
-.interaction.return {
-  border-left-width: 7px;
-  border-right-width: 7px;
-}
-
-.interaction.return-to-start {
-  border-left-width: 0;
-}
-
-.interaction:hover {
-  cursor: pointer;
-}
-
-.message {
-  position: relative; /* positioning Point */
-}
-
-.message > .name {
-  text-align: center;
-}
-
-.interaction.right-to-left > .occurrence {
-  /* InteractionBorderWidth + (OccurrenceWidth-1)/2 */
-  left: -14px; /* overlay occurrence bar on the existing bar. */
-}
-
-.interaction.self > .occurrence {
-  /* width of InteractionBorderWidth 7px + lifeline center 1px */
-  left: -8px; /* overlay occurrence bar on the existing bar. */
-  margin-top: -10px;
-}
-
-.fragment {
-  border-width: 1px;
-  margin: 8px 0 0 0;
-  padding-bottom: 10px;
-}
-
-.fragment .fragment {
-  margin: 16px 0 0 0;
-}
+  /* Avoid moving interaction to the left or right with margins.
+  We can always assume that an interaction's border is the lifeline.
+  Moving content with padding is OK.
+  Don't move this to the Interaction component. This is also used by Interaction-async
+   */
+  .interaction {
+    /*Keep dashed or solid here otherwise no space is given to the border*/
+    border: dashed transparent 0;
+  }
+
+  .interaction.sync {
+    /* This border width configuration make sure the content width is
+       the same as from the source occurrence's right border to target
+       occurrence's left boarder (boarder not inclusive).*/
+    border-right-width: 7px;
+  }
+
+  .interaction.sync.right-to-left {
+    /* This border width configuration make sure the content width is
+       the same as from the source occurrence's right border to target
+       occurrence's left boarder (boarder not inclusive).*/
+    border-right-width: 0;
+    border-left-width: 7px;
+  }
+
+  .interaction.inited-from-occurrence,
+  .interaction.self-invocation {
+    border-left-width: 7px;
+  }
+
+  .interaction.return {
+    border-left-width: 7px;
+    border-right-width: 7px;
+  }
+
+  .interaction.return-to-start {
+    border-left-width: 0;
+  }
+
+  .interaction:hover {
+    cursor: pointer;
+  }
+
+  .message {
+    position: relative; /* positioning Point */
+  }
+
+  .message > .name {
+    text-align: center;
+  }
+
+  .interaction.right-to-left > .occurrence {
+    /* InteractionBorderWidth + (OccurrenceWidth-1)/2 */
+    left: -14px; /* overlay occurrence bar on the existing bar. */
+  }
+
+  .interaction.self > .occurrence {
+    /* width of InteractionBorderWidth 7px + lifeline center 1px */
+    left: -8px; /* overlay occurrence bar on the existing bar. */
+    margin-top: -10px;
+  }
+
+  .fragment {
+    border-width: 1px;
+    margin: 8px 0 0 0;
+    padding-bottom: 10px;
+  }
+
+  .fragment .fragment {
+    margin: 16px 0 0 0;
+  }
 }
 </style>
diff --git a/src/g4/sequenceParser.g4 b/src/g4/sequenceParser.g4
@@ -12,7 +12,7 @@ prog
  ;
 
 title
- : TITLE TITLE_CONTENT TITLE_END?
+ : TITLE TITLE_CONTENT? TITLE_END?
  ;
 
 head

diff --git a/src/generated-parser/sequenceLexer.js b/src/generated-parser/sequenceLexer.js
diff --git a/src/generated-parser/sequenceParser.js b/src/generated-parser/sequenceParser.js
-Original file line number
+Diff line change
@@ Expand Up / @@ -12,7 +12,7 @@ prog @@
      ;
     title
-     : TITLE TITLE_CONTENT TITLE_END?
+     : TITLE TITLE_CONTENT? TITLE_END?
      ;
     head
@@ Expand Down @@