Flowchart: Apply nodeSpacing/rankSpacing config to subgraphs

demos/flowchart.html

@@ -1540,6 +1540,33 @@ <h3>flowchart</h3>
     </pre>
     <hr />
 
+    <pre class="mermaid">
+      ---
+      title: Subgraph nodeSpacing and rankSpacing example
+      config:
+        flowchart:
+          nodeSpacing: 1
+          rankSpacing: 1
+      ---
+
+      flowchart LR
+
+      X --> Y
+
+      subgraph X
+        direction LR
+        A
+        C
+      end
+
+      subgraph Y
+        direction LR
+        B
+        D
+      end
+    </pre>
+    <hr />
+
     <h1 id="link-clicked">Anchor for "link-clicked" test</h1>
 
     <script type="module">

packages/mermaid/src/dagre-wrapper/index.js

@@ -54,6 +54,9 @@ const recursiveRender = async (_elem, graph, diagramtype, id, parentCluster, sit
       if (node && node.clusterNode) {
         // const children = graph.children(v);
         log.info('Cluster identified', v, node.width, graph.node(v));
+        // node.graph.setGraph applies the graph configurations such as nodeSpacing to subgraphs as without this the default values would be used
+        // We override the `rankdir` variable to allow for the subgraph's direction to override the graphs direction in the subgraph
+        node.graph.setGraph({ ...graph.graph(), rankdir: node.graph.graph().rankdir });
         const o = await recursiveRender(
           nodes,
           node.graph,