From db8e2ce16595e8f8be594e1811f4e6227b9f84d5 Mon Sep 17 00:00:00 2001
From: dermirko <gitlab@dermirko.de>
Date: Tue, 16 Apr 2024 22:14:41 +0200
Subject: [PATCH 1/2] implementation of additional support for column groups in
 interactive tables #1618

---
 R/render_as_i_html.R                 |  55 +++++++-
 R/tab_create_modify.R                |   4 +
 inst/css/gt_styles_default.scss      |   5 +
 man/tab_spanner.Rd                   |   6 +-
 tests/testthat/_snaps/tab_spanner.md |  10 ++
 tests/testthat/test-tab_spanner.R    | 189 +++++++++++++++++++++++++++
 6 files changed, 264 insertions(+), 5 deletions(-)
 create mode 100644 tests/testthat/_snaps/tab_spanner.md

diff --git a/R/render_as_i_html.R b/R/render_as_i_html.R
index 9b7444401e..1c0e189453 100644
--- a/R/render_as_i_html.R
+++ b/R/render_as_i_html.R
@@ -50,6 +50,9 @@ render_as_ihtml <- function(data, id) {
   # Determine if the rendered table should have a header section
   has_header_section <- dt_heading_has_title(data = data)
 
+  # Determine if there are tab spanners
+  has_tab_spanners <- dt_spanners_exists(data = data)
+
   # Obtain the language from the `locale`, if provided
   locale <- dt_locale_get_value(data = data)
 
@@ -340,6 +343,48 @@ render_as_ihtml <- function(data, id) {
     footer_component <- NULL
   }
 
+  # Generate the column groups, if there are any tab_spanners
+  colgroups_def <- NULL
+
+  if (has_tab_spanners) {
+    col_groups <- (dt_spanners_get(data = data) %>% dplyr::filter(spanner_level == 1))
+
+    if (max(dt_spanners_get(data = data)$spanner_level) > 1) {
+      first_colgroups <- base::paste0(col_groups$built, collapse = "|")
+
+      cli::cli_warn(c(
+        "When displaying an interactive gt table, there must not be more than 1 level of column groups (tab_spanners)",
+        "*" = "Currently there are {max(dt_spanners_get(data = data)$spanner_level)} levels of tab spanners.",
+        "i" = "Only the first level will be used for the interactive table, that is: [{first_colgroups}]"
+      ))
+    }
+
+    colgroups_def <-
+      apply(
+        col_groups, 1,
+        FUN = function(x) {
+          reactable::colGroup(
+            name = x$spanner_label,
+            columns = x$vars,
+            header = x$built,
+            html = TRUE,
+            align = NULL,
+            headerVAlign = NULL,
+            sticky = NULL,
+            headerClass = NULL,
+            headerStyle = list(
+              fontWeight = "normal",
+              borderBottomStyle = column_labels_border_bottom_style,
+              borderBottomWidth = column_labels_border_bottom_width,
+              borderBottomColor = column_labels_border_bottom_color,
+              marginLeft = "4px",
+              marginRight = "4px"
+            )
+          )
+        }
+      )
+  }
+
   # Generate the default theme for the table
   tbl_theme <-
     reactable::reactableTheme(
@@ -353,15 +398,17 @@ render_as_ihtml <- function(data, id) {
       style = list(
         fontFamily = font_family_str
       ),
-      tableStyle = NULL,
-      headerStyle = list(
+      tableStyle = list(
         borderTopStyle = column_labels_border_top_style,
         borderTopWidth = column_labels_border_top_width,
-        borderTopColor = column_labels_border_top_color,
+        borderTopColor = column_labels_border_top_color
+      ),
+      headerStyle = list(
         borderBottomStyle = column_labels_border_bottom_style,
         borderBottomWidth = column_labels_border_bottom_width,
         borderBottomColor = column_labels_border_bottom_color
       ),
+      # individually defined for the margins left+right
       groupHeaderStyle = NULL,
       tableBodyStyle = NULL,
       rowGroupStyle = NULL,
@@ -387,7 +434,7 @@ render_as_ihtml <- function(data, id) {
     reactable::reactable(
       data = data_tbl,
       columns = col_defs,
-      columnGroups = NULL,
+      columnGroups = colgroups_def,
       rownames = NULL,
       groupBy = NULL,
       sortable = use_sorting,
diff --git a/R/tab_create_modify.R b/R/tab_create_modify.R
index af80be79c9..5c3c887aae 100644
--- a/R/tab_create_modify.R
+++ b/R/tab_create_modify.R
@@ -214,6 +214,10 @@ tab_header <- function(
 #'   and `spanners`, placing the spanner label where it will fit. The first
 #'   spanner level (right above the column labels) is `1`.
 #'
+#'   In combination with [opt_interactive()] or `ihtml.active = TRUE` in
+#'   [tab_options()] only level `1` is supported, additional levels would be
+#'   discarded.
+#'
 #' @param id *Spanner ID*
 #'
 #'   `scalar<character>` // *default:* `label`
diff --git a/inst/css/gt_styles_default.scss b/inst/css/gt_styles_default.scss
index 92e7431d98..af744b2750 100644
--- a/inst/css/gt_styles_default.scss
+++ b/inst/css/gt_styles_default.scss
@@ -435,4 +435,9 @@
     display: inline-flex !important;
     margin-bottom: 0.75em !important;
   }
+
+  div.Reactable > div.rt-table > div.rt-thead > div.rt-tr.rt-tr-group-header > div.rt-th-group:after {
+    height: 0px !important;
+  }
+
 }
diff --git a/man/tab_spanner.Rd b/man/tab_spanner.Rd
index 6107d02a10..d14dd915ff 100644
--- a/man/tab_spanner.Rd
+++ b/man/tab_spanner.Rd
@@ -57,7 +57,11 @@ argument works in tandem with the \code{columns} argument.}
 An explicit level to which the spanner should be placed. If not provided,
 \strong{gt} will choose the level based on the inputs provided within \code{columns}
 and \code{spanners}, placing the spanner label where it will fit. The first
-spanner level (right above the column labels) is \code{1}.}
+spanner level (right above the column labels) is \code{1}.
+
+In combination with \code{\link[=opt_interactive]{opt_interactive()}} or \code{ihtml.active = TRUE} in
+\code{\link[=tab_options]{tab_options()}} only level \code{1} is supported, additional levels would be
+discarded.}
 
 \item{id}{\emph{Spanner ID}
 
diff --git a/tests/testthat/_snaps/tab_spanner.md b/tests/testthat/_snaps/tab_spanner.md
new file mode 100644
index 0000000000..9469413b04
--- /dev/null
+++ b/tests/testthat/_snaps/tab_spanner.md
@@ -0,0 +1,10 @@
+# multiple levels of `tab_spanner()` are not compatible with interactive tables [plain]
+
+    Code
+      local({
+        tmp <- exibble[, 1:4] %>% gt() %>% tab_spanner(label = "spanner_numdat",
+          columns = c(num, date)) %>% tab_spanner(label = "spanner_char", columns = c(
+          char)) %>% tab_spanner(label = "spanner_numdatchar", columns = c(num, date,
+          char)) %>% opt_interactive()
+      })
+
diff --git a/tests/testthat/test-tab_spanner.R b/tests/testthat/test-tab_spanner.R
index 3ac719bd08..0884e30246 100644
--- a/tests/testthat/test-tab_spanner.R
+++ b/tests/testthat/test-tab_spanner.R
@@ -15,6 +15,18 @@ selection_text <- function(html, selection) {
   rvest::html_text(rvest::html_nodes(html, selection))
 }
 
+# returns the json-object of the reactable javascript-part
+reactive_table_to_json <- function(reactable_obj){
+  tmp_html_tag <- reactable_obj %>%
+    htmltools::as.tags()  %>%
+    htmltools::doRenderTags()  %>%
+    stringr::str_match(pattern = '<script type="application/json" data-for="[^>]+>(?<found>.+)</script>') %>%
+    tibble::as_tibble(.name_repair = "minimal") %>%
+    .$found %>%
+    as.character() %>%
+    jsonlite::parse_json()
+}
+
 test_that("A gt table contains the expected spanner column labels", {
 
   # Check that specific suggested packages are available
@@ -935,3 +947,180 @@ test_that("The `dt_spanners_print_matrix()` util function works well", {
     )
   )
 })
+
+test_that("`tab_spanner()` is compatible with interactive tables", {
+  check_suggests()
+  skip_if_not_installed("jsonlite")
+  skip_if_not_installed("tibble")
+
+  #
+  # simple example with 1 spanner, 1 level
+  #
+
+  # reactable should have the expected spanners
+  interactive_tbl <-
+    exibble[, 1:4] %>%
+    gt() %>%
+    tab_spanner(label = "spanner_datechar", columns = c(date, char)) %>%
+    opt_interactive() %>%
+    reactive_table_to_json()
+
+  interactive_tbl_colgroups <- do.call(rbind, interactive_tbl$x$tag$attribs$columnGroups) %>%
+    tibble::as_tibble() %>%
+    dplyr::mutate(across(c(-columns), ~ .x %>% sapply("[[", 1)))
+
+  testthat::expect_equal(nrow(interactive_tbl_colgroups), 1)
+  testthat::expect_equal(
+    interactive_tbl_colgroups$name %>% sort(),
+    c("spanner_datechar")
+  )
+
+  # expected spanners should contain the expected cols
+  testthat::expect_equal(
+    interactive_tbl_colgroups %>% dplyr::filter(name == "spanner_datechar") %>% .$columns %>% .[[1]] %>% sapply("[[", 1) %>% sort(),
+    c("char", "date")
+  )
+
+  #
+  # more complex example with multiple spanners, 1 level
+  #
+
+  interactive_tbl <-
+    exibble[, 1:4] %>%
+    gt() %>%
+    tab_spanner(label = "spanner_numchar", columns = c(num, char)) %>%
+    tab_spanner(label = "spanner_dat", columns = c(date)) %>%
+    opt_interactive() %>%
+    reactive_table_to_json()
+
+  interactive_tbl_colgroups <- do.call(rbind, interactive_tbl$x$tag$attribs$columnGroups) %>%
+    tibble::as_tibble() %>%
+    dplyr::mutate(across(c(-columns), ~ .x %>% sapply("[[", 1)))
+
+  testthat::expect_equal(nrow(interactive_tbl_colgroups), 2)
+  testthat::expect_equal(
+    interactive_tbl_colgroups$name %>% sort(),
+    c("spanner_dat", "spanner_numchar")
+  )
+
+  # expected spanners should contain the expected cols
+  testthat::expect_equal(
+    interactive_tbl_colgroups %>% dplyr::filter(name == "spanner_numchar") %>% .$columns %>% .[[1]] %>% sapply("[[", 1) %>% sort(),
+    c("char", "num")
+  )
+
+  testthat::expect_equal(
+    interactive_tbl_colgroups %>% dplyr::filter(name == "spanner_dat") %>% .$columns %>% .[[1]] %>% sapply("[[", 1) %>% sort(),
+    c("date")
+  )
+
+  #
+  # MD, HTML should be rendered - raw text should be escaped
+  #
+
+  interactive_tbl <-
+    exibble[, 1:4] %>%
+    gt() %>%
+    tab_spanner(label = md("*md spanner*"), columns = c(num)) %>%
+    tab_spanner(label = HTML("<u>html spanner</u>"), columns = c(date)) %>%
+    tab_spanner(label = "normal spanner with <u>tags</u> and *more*", columns = c(char)) %>%
+    opt_interactive() %>%
+    reactive_table_to_json()
+
+  interactive_tbl_colgroups <- do.call(rbind, interactive_tbl$x$tag$attribs$columnGroups) %>%
+    tibble::as_tibble() %>%
+    dplyr::mutate(across(c(-columns), ~ .x %>% sapply("[[", 1)))
+
+  testthat::expect_match(interactive_tbl_colgroups %>% dplyr::filter(name == "*md spanner*") %>% dplyr::select(header) %>% as.character(),
+    regexp = "<span.+md spanner.+"
+  )
+
+  testthat::expect_match(interactive_tbl_colgroups %>% dplyr::filter(name == "<u>html spanner</u>") %>% dplyr::select(header) %>% as.character(),
+    regexp = "<u>html spanner</u>"
+  )
+
+  testthat::expect_match(interactive_tbl_colgroups %>% dplyr::filter(name == "normal spanner with <u>tags</u> and *more*") %>% dplyr::select(header) %>% as.character(),
+    regexp = "normal spanner with &lt;u&gt;.+"
+  )
+
+  #
+  # spanners with same name but different ID must not be a problem
+  #
+
+  interactive_tbl <-
+    exibble[, 1:4] %>%
+    gt() %>%
+    tab_spanner(label = "spanner_label", columns = c(num), id = 1) %>%
+    tab_spanner(label = "spanner_label", columns = c(date, fctr), id = 2) %>%
+    tab_spanner(label = "another_label", columns = c(char), id = 3) %>%
+    opt_interactive() %>%
+    reactive_table_to_json()
+
+  interactive_tbl_colgroups <- do.call(rbind, interactive_tbl$x$tag$attribs$columnGroups) %>%
+    tibble::as_tibble() %>%
+    dplyr::mutate(across(c(-columns), ~ .x %>% sapply("[[", 1))) %>%
+    dplyr::rowwise() %>%
+    dplyr::mutate(size = length(columns)) %>%
+    dplyr::arrange(size)
+
+  testthat::expect_equal(
+    interactive_tbl_colgroups %>% dplyr::filter(name == "spanner_label") %>% .$columns %>% .[[1]] %>% sapply("[[", 1) %>% sort(),
+    "num"
+  )
+
+  testthat::expect_equal(
+    interactive_tbl_colgroups %>% dplyr::filter(name == "spanner_label") %>% .$columns %>% .[[2]] %>% sapply("[[", 1) %>% sort(),
+    c("date", "fctr")
+  )
+})
+
+# spanners with multiple levels result in a warning message
+cli::test_that_cli("multiple levels of `tab_spanner()` are not compatible with interactive tables",
+  configs = c("plain"), code = {
+    check_suggests()
+
+    expect_snapshot(local({
+      tmp <- exibble[, 1:4] %>%
+        gt() %>%
+        tab_spanner(label = "spanner_numdat", columns = c(num, date)) %>%
+        tab_spanner(label = "spanner_char", columns = c(char)) %>%
+        tab_spanner(label = "spanner_numdatchar", columns = c(num, date, char)) %>%
+        opt_interactive()
+    }))
+  }
+)
+
+test_that("multiple levels of `tab_spanner()` are not compatible with interactive tables and only use 1st level", {
+  check_suggests()
+  skip_if_not_installed("jsonlite")
+
+  suppressWarnings({
+    interactive_tbl <-
+      exibble[, 1:4] %>%
+      gt() %>%
+      tab_spanner(label = "spanner_numdat", columns = c(num, date)) %>%
+      tab_spanner(label = "spanner_char", columns = c(char)) %>%
+      tab_spanner(label = "spanner_numdatchar", columns = c(num, date, char)) %>%
+      opt_interactive() %>%
+      reactive_table_to_json()
+  })
+
+
+  interactive_tbl_colgroups <- do.call(rbind, interactive_tbl$x$tag$attribs$columnGroups) %>%
+    tibble::as_tibble() %>%
+    dplyr::mutate(across(c(-columns), ~ .x %>% sapply("[[", 1))) %>%
+    dplyr::rowwise() %>%
+    dplyr::mutate(size = length(columns)) %>%
+    dplyr::arrange(size)
+
+  # expected spanners should contain the expected cols
+  testthat::expect_equal(
+    interactive_tbl_colgroups %>% dplyr::filter(name == "spanner_char") %>% .$columns %>% .[[1]] %>% sapply("[[", 1) %>% sort(),
+    c("char")
+  )
+
+  testthat::expect_equal(
+    interactive_tbl_colgroups %>% dplyr::filter(name == "spanner_numdat") %>% .$columns %>% .[[1]] %>% sapply("[[", 1) %>% sort(),
+    c("date", "num")
+  )
+})

From e69c8472f99d41eaac5c21de7c093d02162558f6 Mon Sep 17 00:00:00 2001
From: dermirko <gitlab@dermirko.de>
Date: Wed, 17 Apr 2024 08:13:44 +0200
Subject: [PATCH 2/2] NEWS and test-error bugfix for #1618

---
 NEWS.md                           | 2 ++
 tests/testthat/test-tab_spanner.R | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/NEWS.md b/NEWS.md
index 7739924242..5ae826512e 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -6,6 +6,8 @@
 
 * `gtsave()` saves correctly to .rtf if using `cols_label()` and `summary_rows()` or `grand_summary_rows()` (@olivroy, #1233)
 
+* interactive tables are now rendering the first level of column groups, added by `tab_spanner()` (@obsaditelnost, #1618)
+
 # gt 0.10.1
 
 ## Improvements to nanoplots
diff --git a/tests/testthat/test-tab_spanner.R b/tests/testthat/test-tab_spanner.R
index 0884e30246..09220cf6e8 100644
--- a/tests/testthat/test-tab_spanner.R
+++ b/tests/testthat/test-tab_spanner.R
@@ -1022,7 +1022,7 @@ test_that("`tab_spanner()` is compatible with interactive tables", {
     exibble[, 1:4] %>%
     gt() %>%
     tab_spanner(label = md("*md spanner*"), columns = c(num)) %>%
-    tab_spanner(label = HTML("<u>html spanner</u>"), columns = c(date)) %>%
+    tab_spanner(label = html("<u>html spanner</u>"), columns = c(date)) %>%
     tab_spanner(label = "normal spanner with <u>tags</u> and *more*", columns = c(char)) %>%
     opt_interactive() %>%
     reactive_table_to_json()