marcel/mermaid
1
0
Fork 0
mirror of https://github.com/mermaid-js/mermaid.git synced 2025-11-17 19:24:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

GitGraph: simplified branch check in arrow rerouting fn

Browse Source 
Wanted to avoid repetition given that the originally nested
ternaries had the same structure
This commit is contained in:
Guy Pursey
2023-10-27 11:42:57 +01:00
parent d80e1a2662
commit a9c5d903c5
1 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
packages/mermaid/src/diagrams/git/gitGraphRenderer.js
View File

@@ -359,14 +359,9 @@ const drawCommits = (svg, commits, modifyGraph) => {
* return true * return true
*/ */
const shouldRerouteArrow = (commitA, commitB, p1, p2, allCommits) => { const shouldRerouteArrow = (commitA, commitB, p1, p2, allCommits) => {
const branchToGetCurve = const branchToGetCurve = (dir === 'TB' ? p1.x < p2.x : p1.y < p2.y)
dir === 'TB' ? commitB.branch
? p1.x < p2.x : commitA.branch;
? commitB.branch
: commitA.branch
: p1.y < p2.y
? commitB.branch
: commitA.branch;
const isOnBranchToGetCurve = (x) => x.branch === branchToGetCurve; const isOnBranchToGetCurve = (x) => x.branch === branchToGetCurve;
const isBetweenCommits = (x) => x.seq > commitA.seq && x.seq < commitB.seq; const isBetweenCommits = (x) => x.seq > commitA.seq && x.seq < commitB.seq;
return Object.values(allCommits).some((commitX) => { return Object.values(allCommits).some((commitX) => {