marcel/mermaid
1
0
Fork 0
mirror of https://github.com/mermaid-js/mermaid.git synced 2025-10-02 13:49:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

GitGraph: rename overlap check to shouldRerouteArrow

Browse Source 
The function also now does an additional check to see
if source branch in overlap check is on main.

As we're no longer purely checking for an overlap and
the only use of this function is to reroute the arrows
to avoid running over commits, this more literal name
should be clearer.
This commit is contained in:
Guy Pursey
2023-10-13 10:07:26 +01:00
parent dba7197fc6
commit 7c87df7cf6
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -341,7 +341,8 @@ const drawCommits = (svg, commits, modifyGraph) => {
* Detect if there are commits
* between commitA's x-position
* and commitB's x-position on the
* same branch as commitA
* same branch as commitA, where
* commitA isn't main
*
* @param {any} commitA
* @param {any} commitB
@@ -350,8 +351,11 @@ const drawCommits = (svg, commits, modifyGraph) => {
* If there are commits between
* commitA's x-position
* and commitB's x-position
* on the source branch, where
* source branch is not main
* return true
*/
const hasOverlappingCommits = (commitA, commitB, allCommits) => {
const shouldRerouteArrow = (commitA, commitB, allCommits) => {
const isOnSourceBranch = (x) => x.branch === commitA.branch;
const isBetweenCommits = (x) => x.seq > commitA.seq && x.seq < commitB.seq;
const sourceIsMain = commitA.branch === getConfig().gitGraph.mainBranchName;
@@ -395,8 +399,8 @@ const findLane = (y1, y2, depth = 0) => {
const drawArrow = (svg, commitA, commitB, allCommits) => {
const p1 = commitPos[commitA.id];
const p2 = commitPos[commitB.id];
const overlappingCommits = hasOverlappingCommits(commitA, commitB, allCommits);
// log.debug('drawArrow', p1, p2, overlappingCommits, commitA.id, commitB.id);
const arrowNeedsRerouting = shouldRerouteArrow(commitA, commitB, allCommits);
// log.debug('drawArrow', p1, p2, arrowNeedsReroute, commitA.id, commitB.id);
let arc = '';
let arc2 = '';
@@ -404,7 +408,7 @@ const drawArrow = (svg, commitA, commitB, allCommits) => {
let offset = 0;
let colorClassNum = branchPos[commitB.branch].index;
let lineDef;
if (overlappingCommits) {
if (arrowNeedsRerouting) {
arc = 'A 10 10, 0, 0, 0,';
arc2 = 'A 10 10, 0, 0, 1,';
radius = 10;