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

#755 Linting fixes + merge

Browse Source
This commit is contained in:
Eduardas Michelsonas
2019-10-08 14:25:29 +02:00
parent 341456cc25
commit 1cba50266e
1 changed files with 58 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
src/diagrams/sequence/sequenceRenderer.js
View File

@@ -230,44 +230,80 @@ const drawMessage = function(elem, startx, stopx, verticalPos, msg, sequenceInde
const g = elem.append('g'); const g = elem.append('g');
const txtCenter = startx + (stopx - startx) / 2; const txtCenter = startx + (stopx - startx) / 2;
let textElem let textElem;
let counterBreaklines = 0 let counterBreaklines = 0;
let breaklineOffset = 17 let breaklineOffset = 17;
const breaklines = msg.message.split(/<br\/?>/ig) const breaklines = msg.message.split(/<br\/?>/gi);
for (const breakline of breaklines) { for (const breakline of breaklines) {
textElem = g.append('text') // text label for the x axis textElem = g
.append('text') // text label for the x axis
.attr('x', txtCenter) .attr('x', txtCenter)
.attr('y', verticalPos - 7 + counterBreaklines * breaklineOffset) .attr('y', verticalPos - 7 + counterBreaklines * breaklineOffset)
.style('text-anchor', 'middle') .style('text-anchor', 'middle')
.attr('class', 'messageText') .attr('class', 'messageText')
.text(breakline.trim()) .text(breakline.trim());
counterBreaklines++ counterBreaklines++;
} }
const offsetLineCounter = counterBreaklines - 1 const offsetLineCounter = counterBreaklines - 1;
const totalOffset = offsetLineCounter * breaklineOffset const totalOffset = offsetLineCounter * breaklineOffset;
let textWidth = (textElem._groups || textElem)[0][0].getBBox().width; let textWidth = (textElem._groups || textElem)[0][0].getBBox().width;
let line; let line;
if (startx === stopx) { if (startx === stopx) {
if (conf.rightAngles) { if (conf.rightAngles) {
line = g.append('path').attr('d', `M ${startx},${verticalPos + totalOffset} H ${startx + (conf.width / 2)} V ${verticalPos + 25 + totalOffset} H ${startx}`) line = g
.append('path')
.attr(
'd',
`M ${startx},${verticalPos + totalOffset} H ${startx + conf.width / 2} V ${verticalPos +
25 +
totalOffset} H ${startx}`
);
} else { } else {
line = g.append('path') line = g
.attr('d', 'M ' + startx + ',' + (verticalPos + totalOffset) + ' C ' + (startx + 60) + ',' + (verticalPos - 10 + totalOffset) + ' ' + (startx + 60) + ',' + .append('path')
(verticalPos + 30 + totalOffset) + ' ' + startx + ',' + (verticalPos + 20 + totalOffset)) .attr(
'd',
'M ' +
startx +
',' +
(verticalPos + totalOffset) +
' C ' +
(startx + 60) +
',' +
(verticalPos - 10 + totalOffset) +
' ' +
(startx + 60) +
',' +
(verticalPos + 30 + totalOffset) +
' ' +
startx +
',' +
(verticalPos + 20 + totalOffset)
);
} }
bounds.bumpVerticalPos(30 + totalOffset) bounds.bumpVerticalPos(30 + totalOffset);
const dx = Math.max(textWidth / 2, 100) const dx = Math.max(textWidth / 2, 100);
bounds.insert(startx - dx, bounds.getVerticalPos() - 10 + totalOffset, stopx + dx, bounds.getVerticalPos() + totalOffset) bounds.insert(
startx - dx,
bounds.getVerticalPos() - 10 + totalOffset,
stopx + dx,
bounds.getVerticalPos() + totalOffset
);
} else { } else {
line = g.append('line') line = g.append('line');
line.attr('x1', startx) line.attr('x1', startx);
line.attr('y1', verticalPos) line.attr('y1', verticalPos);
line.attr('x2', stopx) line.attr('x2', stopx);
line.attr('y2', verticalPos) line.attr('y2', verticalPos);
bounds.insert(startx, bounds.getVerticalPos() - 10 + totalOffset, stopx, bounds.getVerticalPos() + totalOffset) bounds.insert(
startx,
bounds.getVerticalPos() - 10 + totalOffset,
stopx,
bounds.getVerticalPos() + totalOffset
);
} }
// Make an SVG Container // Make an SVG Container
// Draw the line // Draw the line