#5237 Elk spacing tweak and fix for fonthandling in directives

packages/mermaid-layout-elk/src/render.ts

@@ -465,7 +465,7 @@ export const render = async (data4Layout, svg, element, algorithm) => {
       'elk.algorithm': algorithm,
       'nodePlacement.strategy': 'NETWORK_SIMPLEX',
 
-      'spacing.nodeNode': 70,
+      'spacing.nodeNode': 20,
       'spacing.nodeNodeBetweenLayers': 25,
       'spacing.edgeNode': 10,
       'spacing.edgeNodeBetweenLayers': 20,

packages/mermaid/src/config.ts

@@ -190,7 +190,10 @@ export const addDirective = (directive: MermaidConfig) => {
 
   // If the directive has a fontFamily, but no themeVariables, add the fontFamily to the themeVariables
   if (directive.fontFamily && (!directive.themeVariables || !directive.themeVariables.fontFamily)) {
-    directive.themeVariables = { fontFamily: directive.fontFamily };
+    directive.themeVariables = {
+      ...directive.themeVariables,
+      fontFamily: directive.fontFamily,
+    };
   }
 
   directives.push(directive);