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

Change repetitive values into consts

Browse Source
This commit is contained in:
Matheus B
2024-01-20 20:57:58 -03:00
parent 9213afbacd
commit 4f60a27472
1 changed files with 23 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -112,8 +112,11 @@ const drawCommits = (svg, commits, modifyGraph) => {
}); });
const isParallelCommits = gitGraphConfig.parallelCommits; const isParallelCommits = gitGraphConfig.parallelCommits;
const layoutOffset = 10;
const commitStep = 40;
sortedKeys.forEach((key) => { sortedKeys.forEach((key) => {
const commit = commits[key]; const commit = commits[key];
const posWithOffset = pos + layoutOffset;
if (isParallelCommits) { if (isParallelCommits) {
if (!commit.parents.length) { if (!commit.parents.length) {
@@ -123,12 +126,15 @@ const drawCommits = (svg, commits, modifyGraph) => {
} }
} else { } else {
const closestParent = findClosestParent(commit.parents); const closestParent = findClosestParent(commit.parents);
pos = dir === 'TB' ? commitPos[closestParent].y + 40 : commitPos[closestParent].x + 40; pos =
dir === 'TB'
? commitPos[closestParent].y + commitStep
: commitPos[closestParent].x + commitStep;
} }
} }
const y = dir === 'TB' ? pos + 10 : branchPos[commit.branch].pos; const y = dir === 'TB' ? posWithOffset : branchPos[commit.branch].pos;
const x = dir === 'TB' ? branchPos[commit.branch].pos : pos + 10; const x = dir === 'TB' ? branchPos[commit.branch].pos : posWithOffset;
// Don't draw the commits now but calculate the positioning which is used by the branch lines etc. // Don't draw the commits now but calculate the positioning which is used by the branch lines etc.
if (modifyGraph) { if (modifyGraph) {
@@ -253,9 +259,9 @@ const drawCommits = (svg, commits, modifyGraph) => {
} }
} }
if (dir === 'TB') { if (dir === 'TB') {
commitPos[commit.id] = { x: x, y: pos + 10 }; commitPos[commit.id] = { x: x, y: posWithOffset };
} else { } else {
commitPos[commit.id] = { x: pos + 10, y: y }; commitPos[commit.id] = { x: posWithOffset, y: y };
} }
// The first iteration over the commits are for positioning purposes, this // The first iteration over the commits are for positioning purposes, this
@@ -284,7 +290,7 @@ const drawCommits = (svg, commits, modifyGraph) => {
// Now we have the label, lets position the background // Now we have the label, lets position the background
labelBkg labelBkg
.attr('x', pos + 10 - bbox.width / 2 - py) .attr('x', posWithOffset - bbox.width / 2 - py)
.attr('y', y + 13.5) .attr('y', y + 13.5)
.attr('width', bbox.width + 2 * py) .attr('width', bbox.width + 2 * py)
.attr('height', bbox.height + 2 * py); .attr('height', bbox.height + 2 * py);
@@ -295,7 +301,7 @@ const drawCommits = (svg, commits, modifyGraph) => {
} }
if (dir !== 'TB') { if (dir !== 'TB') {
text.attr('x', pos + 10 - bbox.width / 2); text.attr('x', posWithOffset - bbox.width / 2);
} }
if (gitGraphConfig.rotateCommitLabel) { if (gitGraphConfig.rotateCommitLabel) {
if (dir === 'TB') { if (dir === 'TB') {
@@ -321,7 +327,7 @@ const drawCommits = (svg, commits, modifyGraph) => {
.attr('class', 'tag-label') .attr('class', 'tag-label')
.text(commit.tag); .text(commit.tag);
let tagBbox = tag.node().getBBox(); let tagBbox = tag.node().getBBox();
tag.attr('x', pos + 10 - tagBbox.width / 2); tag.attr('x', posWithOffset - tagBbox.width / 2);
const h2 = tagBbox.height / 2; const h2 = tagBbox.height / 2;
const ly = y - 19.2; const ly = y - 19.2;
@@ -330,10 +336,10 @@ const drawCommits = (svg, commits, modifyGraph) => {
` `
${pos - tagBbox.width / 2 - px / 2},${ly + py} ${pos - tagBbox.width / 2 - px / 2},${ly + py}
${pos - tagBbox.width / 2 - px / 2},${ly - py} ${pos - tagBbox.width / 2 - px / 2},${ly - py}
${pos + 10 - tagBbox.width / 2 - px},${ly - h2 - py} ${posWithOffset - tagBbox.width / 2 - px},${ly - h2 - py}
${pos + 10 + tagBbox.width / 2 + px},${ly - h2 - py} ${posWithOffset + tagBbox.width / 2 + px},${ly - h2 - py}
${pos + 10 + tagBbox.width / 2 + px},${ly + h2 + py} ${posWithOffset + tagBbox.width / 2 + px},${ly + h2 + py}
${pos + 10 - tagBbox.width / 2 - px},${ly + h2 + py}` ${posWithOffset - tagBbox.width / 2 - px},${ly + h2 + py}`
); );
hole hole
@@ -350,10 +356,10 @@ const drawCommits = (svg, commits, modifyGraph) => {
` `
${x},${pos + py} ${x},${pos + py}
${x},${pos - py} ${x},${pos - py}
${x + 10},${pos - h2 - py} ${x + layoutOffset},${pos - h2 - py}
${x + 10 + tagBbox.width + px},${pos - h2 - py} ${x + layoutOffset + tagBbox.width + px},${pos - h2 - py}
${x + 10 + tagBbox.width + px},${pos + h2 + py} ${x + layoutOffset + tagBbox.width + px},${pos + h2 + py}
${x + 10},${pos + h2 + py}` ${x + layoutOffset},${pos + h2 + py}`
) )
.attr('transform', 'translate(12,12) rotate(45, ' + x + ',' + pos + ')'); .attr('transform', 'translate(12,12) rotate(45, ' + x + ',' + pos + ')');
hole hole
@@ -367,7 +373,7 @@ const drawCommits = (svg, commits, modifyGraph) => {
} }
} }
} }
pos += 50; pos += commitStep + layoutOffset;
if (pos > maxPos) { if (pos > maxPos) {
maxPos = pos; maxPos = pos;
} }