From 57a9d7356ca6467c816834d970099adcbacd6bd3 Mon Sep 17 00:00:00 2001 From: Guy Pursey Date: Fri, 27 Oct 2023 12:11:27 +0100 Subject: [PATCH] GitGraph: made reroute fn more readable Pre-commit lint hook had made the use of ternaries harder to read than I'd originally intended so I introduced an additional variable which explains what is being checked and keeps ternaries from becoming obscured. --- packages/mermaid/src/diagrams/git/gitGraphRenderer.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/packages/mermaid/src/diagrams/git/gitGraphRenderer.js b/packages/mermaid/src/diagrams/git/gitGraphRenderer.js index 22a23a381..66e2277de 100644 --- a/packages/mermaid/src/diagrams/git/gitGraphRenderer.js +++ b/packages/mermaid/src/diagrams/git/gitGraphRenderer.js @@ -359,9 +359,8 @@ const drawCommits = (svg, commits, modifyGraph) => { * return true */ const shouldRerouteArrow = (commitA, commitB, p1, p2, allCommits) => { - const branchToGetCurve = (dir === 'TB' ? p1.x < p2.x : p1.y < p2.y) - ? commitB.branch - : commitA.branch; + const commitBIsFurthest = dir === 'TB' ? p1.x < p2.x : p1.y < p2.y; + const branchToGetCurve = commitBIsFurthest ? commitB.branch : commitA.branch; const isOnBranchToGetCurve = (x) => x.branch === branchToGetCurve; const isBetweenCommits = (x) => x.seq > commitA.seq && x.seq < commitB.seq; return Object.values(allCommits).some((commitX) => {