fix code and add tests

Author: Doubt-0KB

R/plot_grid.R

@@ -178,9 +178,10 @@ plot_grid <- function(..., plotlist = NULL, align = c("none", "h", "v", "hv"),
   if (is.null(rows)) rows <- ceiling(num_plots/cols)
 
   # if the user wants to layout the plots by column, we use the calculated rows to reorder plots and labels
-  if (!isTRUE(byrow)) 
+  if (!isTRUE(byrow)){
     plots <- plots[c(t(matrix(c(1:num_plots, rep(NA, (rows * cols) - num_plots)), nrow = rows, byrow = FALSE)))]
     labels <- labels[c(t(matrix(c(1:num_plots, rep(NA, (rows * cols) - num_plots)), nrow = rows, byrow = FALSE)))]
+  }
 
   # Align the plots (if specified)
   grobs <- align_plots(plotlist = plots, align = align, axis = axis, greedy = greedy)

tests/figs/plot-grid/byrow-is-false.svg

@@ -98,3 +98,18 @@ test_that("alignment", {
     plot_grid(p1, p2, ncol = 1, align = 'v', axis = "rl") + theme_map()
   )
 })
+
+
+
+test_that("labels reorder by byrow", {
+
+  p_list <- lapply(1:3, \(x) ggplot())
+
+  expect_doppelganger("byrow is TRUE",
+    plot_grid(plotlist = p_list, ncol = 2, labels = 1:3, byrow = TRUE)
+  )
+
+  expect_doppelganger("byrow is FALSE",
+    plot_grid(plotlist = p_list, ncol = 2, labels = 1:3, byrow = FALSE)
+  )
+})