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

conf.messageFont() would have a different cacheKey based on the cacheKey calculations done in this particular branch. This will be normalized with the memoize PR about to be created.

Browse Source
This commit is contained in:
chris moran
2020-06-30 07:18:28 -04:00
parent 5b37536ce5
commit 6c6f6838ee
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -250,7 +250,7 @@ const drawNote = function(elem, noteModel) {
const drawMessage = function(g, msgModel) { const drawMessage = function(g, msgModel) {
const { startx, stopx, starty, message, type, sequenceIndex, wrap } = msgModel; const { startx, stopx, starty, message, type, sequenceIndex, wrap } = msgModel;
const lines = message.split(common.lineBreakRegex).length; const lines = message.split(common.lineBreakRegex).length;
let textDims = utils.calculateTextDimensions(message, conf); let textDims = utils.calculateTextDimensions(message, conf.messageFont());
const lineHeight = textDims.height / lines; const lineHeight = textDims.height / lines;
msgModel.height += lineHeight; msgModel.height += lineHeight;
@@ -968,17 +968,13 @@ const buildMessageModel = function(msg, actors) {
if (msg.wrap && msg.message && !common.lineBreakRegex.test(msg.message)) { if (msg.wrap && msg.message && !common.lineBreakRegex.test(msg.message)) {
msg.message = utils.wrapLabel( msg.message = utils.wrapLabel(
msg.message, msg.message,
Math.max( Math.max(boundedWidth + 2 * conf.wrapPadding, conf.width),
msgDims.width + 2 * conf.wrapPadding,
boundedWidth + 2 * conf.wrapPadding,
conf.width
),
conf.messageFont() conf.messageFont()
); );
} }
return { return {
width: Math.max( width: Math.max(
msgDims.width + 2 * conf.wrapPadding, msg.wrap ? 0 : msgDims.width + 2 * conf.wrapPadding,
boundedWidth + 2 * conf.wrapPadding, boundedWidth + 2 * conf.wrapPadding,
conf.width conf.width
), ),