Merge pull request #6119 from NealGooch/bug/5706_block_positioning_issues_when_nesting

Fix 5706 Block Positioning when nesting and blocks span columns

Author: knsv

.changeset/fix-block-nested-positioning.md

@@ -0,0 +1,5 @@
+---
+'mermaid': patch
+---
+
+fix: correct block positioning when nested blocks span multiple columns

cypress/integration/rendering/block.spec.js

@@ -404,6 +404,44 @@ describe('Block diagram', () => {
   a
   b
   a --- b
+`,
+      {}
+    );
+  });
+
+  it('BL32: nested blocks spanning columns should not overlap (issue #5706)', () => {
+    imgSnapshotTest(
+      `block-beta
+    columns 4
+
+    block:0_0:4
+        columns 6
+            Example:2
+        space:2
+        ExampleOther:2
+        ExampleOther:1
+        block:0_0_0:6
+            a b c d e f g h
+        end
+    end
+`,
+      {}
+    );
+  });
+
+  it('BL33: rows with different heights should not overlap', () => {
+    imgSnapshotTest(
+      `block
+  columns 3
+  a:3
+  block:group1:2
+    columns 2
+    h i j k
+  end
+  g
+  block:group2:3
+    l m n o p q r
+  end
 `,
       {}
     );