From b94919d4a60285581b521c9c1945404bb3853591 Mon Sep 17 00:00:00 2001
From: Daniel Sjoberg <danield.sjoberg@gmail.com>
Date: Fri, 12 Jan 2024 18:13:03 -0800
Subject: [PATCH] Adding `tbl_summary(percent)` argument (#1585)

* updates

* updates
---
 DESCRIPTION        |  2 +-
 R/bridge_summary.R | 17 +++++++++--------
 R/tbl_summary.R    |  9 +++++----
 3 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/DESCRIPTION b/DESCRIPTION
index e94414b283..95d33b9021 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -46,7 +46,7 @@ Depends:
     R (>= 4.1)
 Imports: 
     broom.helpers,
-    cards (>= 0.0.0.9009),
+    cards (>= 0.0.0.9010),
     cli (>= 3.6.1),
     dplyr (>= 1.1.3),
     glue (>= 1.6.2),
diff --git a/R/bridge_summary.R b/R/bridge_summary.R
index 43102fa3ab..cc2cc1cd14 100644
--- a/R/bridge_summary.R
+++ b/R/bridge_summary.R
@@ -140,7 +140,7 @@ pier_summary_dichotomous <- function(x, variables, value = x$inputs$value) {
       .data$variable_level %in% list(NULL) |
         .data$variable_level %in% list(value[[.data$variable[1]]])
     ) |>
-    # updating the context to continuous, because it will be process that way below
+    # updating the context to continuous, because it will be processed that way below
     dplyr::mutate(
       context = ifelse(.data$context %in% "categorical", "continuous", .data$context)
     )
@@ -169,8 +169,7 @@ pier_summary_categorical <- function(x, variables, missing, missing_text, missin
           cards::get_ard_statistics(
             df_variable_stats,
             .data$variable_level %in% list(NULL),
-            .column = "statistic_fmt",
-            .attributes = NULL
+            .column = "statistic_fmt"
           )
 
         str_statistic_pre_glue <-
@@ -193,7 +192,7 @@ pier_summary_categorical <- function(x, variables, missing, missing_text, missin
                           glue::glue(
                             str_to_glue,
                             .envir =
-                              cards::get_ard_statistics(df_variable_level_stats, .column = "statistic_fmt", .attributes = NULL) |>
+                              cards::get_ard_statistics(df_variable_level_stats, .column = "statistic_fmt") |>
                               c(lst_variable_stats)
                           ) |>
                           as.character()
@@ -286,7 +285,7 @@ pier_summary_continuous2 <- function(x, variables, missing, missing_text, missin
                 stat =
                   glue::glue(
                     str_to_glue,
-                    .envir = cards::get_ard_statistics(.x, .column = "statistic_fmt", .attributes = NULL)
+                    .envir = cards::get_ard_statistics(.x, .column = "statistic_fmt")
                   ) |>
                   as.character()
               }
@@ -299,7 +298,7 @@ pier_summary_continuous2 <- function(x, variables, missing, missing_text, missin
                 label =
                   glue::glue(
                     str_to_glue,
-                    .envir = cards::get_ard_statistics(.x, .column = "stat_label", .attributes = NULL)
+                    .envir = cards::get_ard_statistics(.x, .column = "stat_label")
                   ) |>
                   as.character()
               }
@@ -362,6 +361,7 @@ pier_summary_continuous2 <- function(x, variables, missing, missing_text, missin
 #' @rdname bridge_summary
 #' @export
 pier_summary_continuous <- function(x, variables, missing, missing_text, missing_stat) {
+  if (is_empty(variables)) return(dplyr::tibble())
   # subsetting cards object on continuous summaries ----------------------------
   card <-
     x$cards |>
@@ -379,7 +379,7 @@ pier_summary_continuous <- function(x, variables, missing, missing_text, missing
         stat =
           glue::glue(
             x$inputs$statistic[[.data$variable[1]]],
-            .envir = cards::get_ard_statistics(.x, .column = "statistic_fmt", .attributes = NULL)
+            .envir = cards::get_ard_statistics(.x, .column = "statistic_fmt")
           ) |>
           as.character()
       )
@@ -502,7 +502,8 @@ pier_summary_missing_row <- function(x, variables = x$inputs$include) {
           df_by_stats |>
           dplyr::filter(.data$stat_name %in% "N") |>
           dplyr::pull("statistic") |>
-          unlist()
+          unlist() |>
+          getElement(1L)
       ) |>
       dplyr::left_join(
         df_by_stats_wide,
diff --git a/R/tbl_summary.R b/R/tbl_summary.R
index 82d406b4dc..88de91e383 100644
--- a/R/tbl_summary.R
+++ b/R/tbl_summary.R
@@ -125,14 +125,15 @@ tbl_summary <- function(data,
       # tabulate categorical summaries
       cards::ard_categorical(
         data,
-        by = by,
-        variables = .get_variables_by_type(type, c("categorical", "dichotomous")),
-        fmt_fn = digits
+        by = all_of(by),
+        variables = all_of(.get_variables_by_type(type, c("categorical", "dichotomous"))),
+        fmt_fn = digits,
+        denominator = percent
       ),
       # calculate categorical summaries
       cards::ard_continuous(
         data,
-        by = by,
+        by = all_of(by),
         variables = .get_variables_by_type(type, c("continuous", "continuous2")),
         fmt_fn = digits
       )