From c77a6e156c6fe30c2851019dba74bbad76bd5ef7 Mon Sep 17 00:00:00 2001 From: Matheus B Date: Tue, 16 Jan 2024 20:54:26 -0300 Subject: [PATCH] Include logic for gitgraph with unconnected branches --- .../mermaid/src/diagrams/git/gitGraphRenderer.js | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/packages/mermaid/src/diagrams/git/gitGraphRenderer.js b/packages/mermaid/src/diagrams/git/gitGraphRenderer.js index f9df1db34..4790949b5 100644 --- 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;