Merge pull request #1646 from gavin-ts/fix-grid-rows-gap-bug

Fix grid rows gap bug
terrastruct · Oct 6, 2023 · db126ab · db126ab
2 parents 65fd4b7 + 5b4818a
commit db126ab
Show file tree

Hide file tree

Showing 12 changed files with 1,002 additions and 374 deletions.
diff --git a/ci/release/changelogs/next.md b/ci/release/changelogs/next.md
@@ -7,4 +7,5 @@
 
 #### Bugfixes ⛑️
 
+- Fixes a bug calculating grid height with only grid-rows and different horizontal-gap and vertical-gap values. [#1646](https://github.com/terrastruct/d2/pull/1646)
 - Grid layout now accounts for each cell's outside labels and icons [#1624](https://github.com/terrastruct/d2/pull/1624)
diff --git a/d2layouts/d2grid/layout.go b/d2layouts/d2grid/layout.go
@@ -397,7 +397,7 @@ func (gd *gridDiagram) layoutDynamic(g *d2graph.Graph, obj *d2graph.Object) {
 			cursor.X = 0
 			cursor.Y += rowHeight + verticalGap
 		}
-		maxY = cursor.Y - horizontalGap
+		maxY = cursor.Y - verticalGap
 	} else {
 		// measure column heights
 		colHeights := []float64{}

diff --git a/e2etests/regression_test.go b/e2etests/regression_test.go
@@ -1047,6 +1047,7 @@ cf many required: {
 		loadFromFile(t, "empty_nested_grid"),
 		loadFromFile(t, "code_font_size"),
 		loadFromFile(t, "disclaimer"),
+		loadFromFile(t, "grid_rows_gap_bug"),
 	}
 
 	runa(t, tcs)

diff --git a/e2etests/testdata/files/grid_rows_gap_bug.d2 b/e2etests/testdata/files/grid_rows_gap_bug.d2
@@ -0,0 +1,8 @@
+grid: "" {
+  grid-rows: 3
+  horizontal-gap: 100
+  vertical-gap: 0
+  first
+  second
+  third
+}
diff --git a/e2etests/testdata/regression/grid_rows_gap_bug/dagre/board.exp.json b/e2etests/testdata/regression/grid_rows_gap_bug/dagre/board.exp.json
diff --git a/e2etests/testdata/regression/grid_rows_gap_bug/dagre/sketch.exp.svg b/e2etests/testdata/regression/grid_rows_gap_bug/dagre/sketch.exp.svg
Original file line number	Diff line number	Diff line change
Expand Up		@@ -7,4 +7,5 @@

		#### Bugfixes ⛑️

		- Fixes a bug calculating grid height with only grid-rows and different horizontal-gap and vertical-gap values. [#1646](https://github.com/terrastruct/d2/pull/1646)
		- Grid layout now accounts for each cell's outside labels and icons [#1624](https://github.com/terrastruct/d2/pull/1624)