Include logic for gitgraph with unconnected branches

mathbraga · Jan 16, 2024 · c77a6e1 · c77a6e1
1 parent 02246f6
commit c77a6e1
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/packages/mermaid/src/diagrams/git/gitGraphRenderer.js b/packages/mermaid/src/diagrams/git/gitGraphRenderer.js
@@ -115,9 +115,16 @@ const drawCommits = (svg, commits, modifyGraph) => {
   sortedKeys.forEach((key) => {
     const commit = commits[key];
 
-    if (isParallelCommits && commit.parents.length) {
-      const closestParent = findClosestParent(commit.parents);
-      pos = dir === 'TB' ? commitPos[closestParent].y + 40 : commitPos[closestParent].x + 40;
+    if (isParallelCommits) {
+      if (!commit.parents.length) {
+        pos = 0;
+        if (dir === 'TB') {
+          pos = 30;
+        }
+      } else {
+        const closestParent = findClosestParent(commit.parents);
+        pos = dir === 'TB' ? commitPos[closestParent].y + 40 : commitPos[closestParent].x + 40;
+      }
     }
 
     const y = dir === 'TB' ? pos + 10 : branchPos[commit.branch].pos;