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

Merge pull request #2521 from pbendersky/bug/1342-spaces-in-state-name

Browse Source 
Changed logic to render states with spaces in names to fix regressions.
This commit is contained in:
Knut Sveidqvist
2021-11-29 17:55:56 +01:00
committed by GitHub
parent 5d99ac7d8d 31851b2e30
commit f887420818
1 changed files with 32 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -60,13 +60,29 @@ const setupNode = (g, parent, node, altFlag) => {
// Build of the array of description strings accordinging // Build of the array of description strings accordinging
if (node.description) { if (node.description) {
if (Array.isArray(nodeDb[node.id].description)) {
// There already is an array of strings,add to it
nodeDb[node.id].shape = 'rectWithTitle';
nodeDb[node.id].description.push(node.description);
} else {
if (nodeDb[node.id].description.length > 0) {
// if there is a description already transformit to an array
nodeDb[node.id].shape = 'rectWithTitle';
if (nodeDb[node.id].description === node.id) {
// If the previous description was the is, remove it
if (Array.isArray(node.description)) {
nodeDb[node.id].description = node.description;
} else {
nodeDb[node.id].description = [node.description];
}
} else {
nodeDb[node.id].description = [nodeDb[node.id].description, node.description];
}
} else {
nodeDb[node.id].shape = 'rect'; nodeDb[node.id].shape = 'rect';
nodeDb[node.id].description = node.description; nodeDb[node.id].description = node.description;
}
nodeDb[node.id].description = common.sanitizeTextOrArray( }
nodeDb[node.id].description,
getConfig()
);
} }
// Save data for description and group so that for instance a statement without description overwrites // Save data for description and group so that for instance a statement without description overwrites
@@ -84,10 +100,17 @@ const setupNode = (g, parent, node, altFlag) => {
(altFlag ? 'statediagram-cluster statediagram-cluster-alt' : 'statediagram-cluster'); (altFlag ? 'statediagram-cluster statediagram-cluster-alt' : 'statediagram-cluster');
} }
let nodeShape = nodeDb[node.id].shape;
let nodeLabelText = nodeDb[node.id].description;
if (Array.isArray(nodeLabelText) && nodeLabelText.length == 1) {
nodeShape = 'rect';
nodeLabelText = nodeLabelText[0];
}
const nodeData = { const nodeData = {
labelStyle: '', labelStyle: '',
shape: nodeDb[node.id].shape, shape: nodeShape,
labelText: nodeDb[node.id].description, labelText: nodeLabelText,
// 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,