Merge pull request #1557 from cmmoran/develop

Render tweak - each diagram should reset the config to siteConfig upon rendering

package.json

@@ -29,7 +29,6 @@
     "test": "yarn lint && jest src/.*",
     "test:watch": "jest --watch src",
     "prepublishOnly": "yarn build && yarn test && yarn e2e",
-    "prepush": "yarn test",
     "prepare": "yarn build"
   },
   "repository": {
@@ -106,5 +105,10 @@
   "sideEffects": [
     "**/*.css",
     "**/*.scss"
-  ]
+  ],
+  "husky": {
+    "hooks": {
+      "pre-push": "yarn test"
+    }
+  }
 }

src/mermaidAPI.js

@@ -197,16 +197,20 @@ export const decodeEntities = function(text) {
  * completed.
  */
 const render = function(id, _txt, cb, container) {
-  const cnf = getConfig();
-  // Check the maximum allowed text size
   let txt = _txt;
-  if (_txt.length > cnf.maxTextSize) {
-    txt = 'graph TB;a[Maximum text size in diagram exceeded];style a fill:#faa';
-  }
   const graphInit = utils.detectInit(txt);
   if (graphInit) {
     reinitialize(graphInit);
-    assignWithDepth(cnf, getConfig());
+  } else {
+    configApi.reset();
+    const siteConfig = getSiteConfig();
+    updateRendererConfigs(siteConfig);
+  }
+
+  const cnf = getConfig();
+  // Check the maximum allowed text size
+  if (_txt.length > cnf.maxTextSize) {
+    txt = 'graph TB;a[Maximum text size in diagram exceeded];style a fill:#faa';
   }
 
   if (typeof container !== 'undefined') {