From 3feff08d4235347470bea0b51006fb2b47606d2c Mon Sep 17 00:00:00 2001
From: Knut Sveidqvist <knut.sveidqvist@ipiccolo.com>
Date: Wed, 17 Nov 2021 21:31:52 +0100
Subject: [PATCH] #2496 A more delicate fix for issue

---
 src/dagre-wrapper/createLabel.js       |  2 +-
 src/diagrams/class/classDb.js          |  2 +-
 src/diagrams/state/stateRenderer-v2.js | 19 +++++++++++--------
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/dagre-wrapper/createLabel.js b/src/dagre-wrapper/createLabel.js
index 1137b6bf9..3a2169258 100644
--- a/src/dagre-wrapper/createLabel.js
+++ b/src/dagre-wrapper/createLabel.js
@@ -85,7 +85,7 @@ function addHtmlLabel(node) {
 }
 
 const createLabel = (_vertexText, style, isTitle, isNode) => {
-  let vertexText = sanitizeText(_vertexText || '', getConfig());
+  let vertexText = _vertexText || '';
   if (typeof vertexText === 'object') vertexText = vertexText[0];
   if (evaluate(getConfig().flowchart.htmlLabels)) {
     // TODO: addHtmlLabel accepts a labelStyle. Do we possibly have that?
diff --git a/src/diagrams/class/classDb.js b/src/diagrams/class/classDb.js
index e4a0cc1c3..027b85564 100644
--- a/src/diagrams/class/classDb.js
+++ b/src/diagrams/class/classDb.js
@@ -25,7 +25,7 @@ const splitClassNameAndType = function (id) {
     let split = id.split('~');
     className = split[0];
 
-    genericType = split[1];
+    genericType = common.sanitizeText(split[1], configApi.getConfig());
   }
 
   return { className: className, type: genericType };
diff --git a/src/diagrams/state/stateRenderer-v2.js b/src/diagrams/state/stateRenderer-v2.js
index 33ee7914d..1f0134896 100644
--- a/src/diagrams/state/stateRenderer-v2.js
+++ b/src/diagrams/state/stateRenderer-v2.js
@@ -61,20 +61,23 @@ const setupNode = (g, parent, node, altFlag) => {
       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);
+        nodeDb[node.id].description.push(common.sanitizeText(node.description, getConfig()));
       } 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
-            nodeDb[node.id].description = [node.description];
+            nodeDb[node.id].description = [common.sanitizeText(node.description, getConfig())];
           } 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 {
           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 = {
       labelStyle: '',
       shape: nodeDb[node.id].shape,
-      labelText: nodeDb[node.id].description,
+      labelText: common.sanitizeText(nodeDb[node.id].description, getConfig()),
       // typeof nodeDb[node.id].description === 'object'
       //   ? nodeDb[node.id].description[0]
       //   : nodeDb[node.id].description,
@@ -115,7 +118,7 @@ const setupNode = (g, parent, node, altFlag) => {
       const noteData = {
         labelStyle: '',
         shape: 'note',
-        labelText: node.note.text,
+        labelText: common.sanitizeText(node.note.text, getConfig()),
         classes: 'statediagram-note', //classStr,
         style: '', //styles.style,
         id: node.id + '----note-' + cnt,
@@ -126,7 +129,7 @@ const setupNode = (g, parent, node, altFlag) => {
       const groupData = {
         labelStyle: '',
         shape: 'noteGroup',
-        labelText: node.note.text,
+        labelText: common.sanitizeText(node.note.text, getConfig()),
         classes: nodeDb[node.id].classes, //classStr,
         style: '', //styles.style,
         id: node.id + '----parent',
@@ -194,7 +197,7 @@ const setupDoc = (g, parent, doc, altFlag) => {
         arrowTypeEnd: 'arrow_barb',
         style: 'fill:none',
         labelStyle: '',
-        label: item.description,
+        label: common.sanitizeText(item.description, getConfig()),
         arrowheadStyle: 'fill: #333',
         labelpos: 'c',
         labelType: 'text',