From e3e9c67f5bea55e63a01d7b73f5e8a1245fc241e Mon Sep 17 00:00:00 2001
From: Knut Sveidqvist <knut.sveidqvist@ipiccolo.com>
Date: Sat, 22 Jan 2022 12:36:18 +0100
Subject: [PATCH] fix: handling rerender in sandbox mode

---
 cypress/platform/render-after-error.html |  6 ++--
 src/diagrams/class/classDb.js            |  4 +--
 src/mermaidAPI.js                        | 44 ++++++++++++++++--------
 3 files changed, 35 insertions(+), 19 deletions(-)

diff --git a/cypress/platform/render-after-error.html b/cypress/platform/render-after-error.html
index 7b88ba5ba..7d311bf1f 100644
--- a/cypress/platform/render-after-error.html
+++ b/cypress/platform/render-after-error.html
@@ -11,10 +11,12 @@
         </div>
 
         <script src="./mermaid.js"></script>
-        <script>mermaid.init({ startOnLoad: false });
-         mermaid.mermaidAPI.initialize();
+        <script>mermaid.init({ startOnLoad: false, securityLevel: 'sandbox' });
+
+         mermaid.mermaidAPI.initialize({ securityLevel: 'sandbox' });
 
          try {
+           console.log('rendering');
            mermaid.mermaidAPI.render('graphDiv', `>`);
          } catch (e) {}
 
diff --git a/src/diagrams/class/classDb.js b/src/diagrams/class/classDb.js
index 6a6a0b522..2223f4489 100644
--- a/src/diagrams/class/classDb.js
+++ b/src/diagrams/class/classDb.js
@@ -143,8 +143,8 @@ export const addMember = function (className, member) {
 
     if (memberString.startsWith('<<') && memberString.endsWith('>>')) {
       // Remove leading and trailing brackets
-      theClass.annotations.push(memberString.substring(2, memberString.length - 2));
-      // theClass.annotations.push(sanitizeText(memberString.substring(2, memberString.length - 2)));
+      // theClass.annotations.push(memberString.substring(2, memberString.length - 2));
+      theClass.annotations.push(sanitizeText(memberString.substring(2, memberString.length - 2)));
     } else if (memberString.indexOf(')') > 0) {
       theClass.methods.push(sanitizeText(memberString));
     } else if (memberString) {
diff --git a/src/mermaidAPI.js b/src/mermaidAPI.js
index 835f4b82a..6544a80f7 100755
--- a/src/mermaidAPI.js
+++ b/src/mermaidAPI.js
@@ -233,24 +233,23 @@ const render = function (id, _txt, cb, container) {
   }
 
   // let d3Iframe;
-  let root;
-  if (cnf.securityLevel === 'sandbox') {
-    // IF we are in sandboxed mode, we do everyting mermaid related
-    // in a sandboxed div
-    const iframe = select('body')
-      .append('iframe')
-      .attr('id', 'i' + id)
-      .attr('style', 'width: 100%; height: 100%;')
-      .attr('sandbox', '');
-    // const iframeBody = ;
-    root = select(iframe.nodes()[0].contentDocument.body);
-    root.node().style.margin = 0;
-  } else {
-    root = select('body');
-  }
+  let root = select('body');
 
   // In regular execurtion the container will be the div with a mermaid class
   if (typeof container !== 'undefined') {
+    if (cnf.securityLevel === 'sandbox') {
+      // IF we are in sandboxed mode, we do everyting mermaid related
+      // in a sandboxed div
+      const iframe = select('body')
+        .append('iframe')
+        .attr('id', 'i' + id)
+        .attr('style', 'width: 100%; height: 100%;')
+        .attr('sandbox', '');
+      // const iframeBody = ;
+      root = select(iframe.nodes()[0].contentDocument.body);
+      root.node().style.margin = 0;
+    }
+
     // A container was provided by the caller
     container.innerHTML = '';
 
@@ -310,6 +309,21 @@ const render = function (id, _txt, cb, container) {
     // Add the tmp div used for rendering with the id `d${id}`
     // d+id it will contain a svg with the id "id"
 
+    if (cnf.securityLevel === 'sandbox') {
+      // IF we are in sandboxed mode, we do everyting mermaid related
+      // in a sandboxed div
+      const iframe = select('body')
+        .append('iframe')
+        .attr('id', 'i' + id)
+        .attr('style', 'width: 100%; height: 100%;')
+        .attr('sandbox', '');
+      // const iframeBody = ;
+      root = select(iframe.nodes()[0].contentDocument.body);
+      root.node().style.margin = 0;
+    } else {
+      root = select('body');
+    }
+
     // This is the temporary div
     root
       .append('div')