GitHub/mermaid
1
0
Fork 0
mirror of https://github.com/mermaid-js/mermaid.git synced 2025-01-14 06:43:25 +08:00
Code Issues Projects Releases Wiki Activity

#2496 A more delicate fix for issue

Browse Source
This commit is contained in:
Knut Sveidqvist 2021-11-17 21:31:52 +01:00
parent fcbd8a5081
commit 3feff08d42
3 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/dagre-wrapper/createLabel.js
View File

@ -85,7 +85,7 @@ function addHtmlLabel(node) {
} }
const createLabel = (_vertexText, style, isTitle, isNode) => { const createLabel = (_vertexText, style, isTitle, isNode) => {
let vertexText = sanitizeText(_vertexText || '', getConfig()); let vertexText = _vertexText || '';
if (typeof vertexText === 'object') vertexText = vertexText[0]; if (typeof vertexText === 'object') vertexText = vertexText[0];
if (evaluate(getConfig().flowchart.htmlLabels)) { if (evaluate(getConfig().flowchart.htmlLabels)) {
// TODO: addHtmlLabel accepts a labelStyle. Do we possibly have that? // TODO: addHtmlLabel accepts a labelStyle. Do we possibly have that?

2
src/diagrams/class/classDb.js
View File

@ -25,7 +25,7 @@ const splitClassNameAndType = function (id) {
let split = id.split('~'); let split = id.split('~');
className = split[0]; className = split[0];
genericType = split[1]; genericType = common.sanitizeText(split[1], configApi.getConfig());
} }
return { className: className, type: genericType }; return { className: className, type: genericType };

19
src/diagrams/state/stateRenderer-v2.js
View File

@ -61,20 +61,23 @@ const setupNode = (g, parent, node, altFlag) => {
if (Array.isArray(nodeDb[node.id].description)) { if (Array.isArray(nodeDb[node.id].description)) {
// There already is an array of strings,add to it // There already is an array of strings,add to it
nodeDb[node.id].shape = 'rectWithTitle'; nodeDb[node.id].shape = 'rectWithTitle';
nodeDb[node.id].description.push(node.description); nodeDb[node.id].description.push(common.sanitizeText(node.description, getConfig()));
} else { } else {
if (nodeDb[node.id].description.length > 0) { if (nodeDb[node.id].description.length > 0) {
// if there is a description already transformit to an array // if there is a description already transformit to an array
nodeDb[node.id].shape = 'rectWithTitle'; nodeDb[node.id].shape = 'rectWithTitle';
if (nodeDb[node.id].description === node.id) { if (nodeDb[node.id].description === node.id) {
// If the previous description was the is, remove it // If the previous description was the is, remove it
nodeDb[node.id].description = [node.description]; nodeDb[node.id].description = [common.sanitizeText(node.description, getConfig())];
} else { } else {
nodeDb[node.id].description = [nodeDb[node.id].description, node.description]; nodeDb[node.id].description = [
common.sanitizeText(nodeDb[node.id].description, getConfig()),
common.sanitizeText(node.description, getConfig()),
];
} }
} else { } else {
nodeDb[node.id].shape = 'rect'; nodeDb[node.id].shape = 'rect';
nodeDb[node.id].description = node.description; nodeDb[node.id].description = common.sanitizeText(node.description, getConfig());
} }
} }
} }
@ -97,7 +100,7 @@ const setupNode = (g, parent, node, altFlag) => {
const nodeData = { const nodeData = {
labelStyle: '', labelStyle: '',
shape: nodeDb[node.id].shape, shape: nodeDb[node.id].shape,
labelText: nodeDb[node.id].description, labelText: common.sanitizeText(nodeDb[node.id].description, getConfig()),
// typeof nodeDb[node.id].description === 'object' // typeof nodeDb[node.id].description === 'object'
// ? nodeDb[node.id].description[0] // ? nodeDb[node.id].description[0]
// : nodeDb[node.id].description, // : nodeDb[node.id].description,
@ -115,7 +118,7 @@ const setupNode = (g, parent, node, altFlag) => {
const noteData = { const noteData = {
labelStyle: '', labelStyle: '',
shape: 'note', shape: 'note',
labelText: node.note.text, labelText: common.sanitizeText(node.note.text, getConfig()),
classes: 'statediagram-note', //classStr, classes: 'statediagram-note', //classStr,
style: '', //styles.style, style: '', //styles.style,
id: node.id + '----note-' + cnt, id: node.id + '----note-' + cnt,
@ -126,7 +129,7 @@ const setupNode = (g, parent, node, altFlag) => {
const groupData = { const groupData = {
labelStyle: '', labelStyle: '',
shape: 'noteGroup', shape: 'noteGroup',
labelText: node.note.text, labelText: common.sanitizeText(node.note.text, getConfig()),
classes: nodeDb[node.id].classes, //classStr, classes: nodeDb[node.id].classes, //classStr,
style: '', //styles.style, style: '', //styles.style,
id: node.id + '----parent', id: node.id + '----parent',
@ -194,7 +197,7 @@ const setupDoc = (g, parent, doc, altFlag) => {
arrowTypeEnd: 'arrow_barb', arrowTypeEnd: 'arrow_barb',
style: 'fill:none', style: 'fill:none',
labelStyle: '', labelStyle: '',
label: item.description, label: common.sanitizeText(item.description, getConfig()),
arrowheadStyle: 'fill: #333', arrowheadStyle: 'fill: #333',
labelpos: 'c', labelpos: 'c',
labelType: 'text', labelType: 'text',