Switch to bslib (#259)

Closes #250

Author: vedhav

DESCRIPTION

@@ -23,6 +23,7 @@ Depends:
 Imports:
     checkmate (>= 2.1.0),
     dplyr (>= 1.1.0),
+    htmltools,
     lifecycle (>= 0.2.0),
     logger (>= 0.2.0),
     methods,
@@ -38,6 +39,7 @@ Imports:
     tidyselect,
     utils
 Suggests:
+    bslib (>= 0.8.0),
     knitr (>= 1.42),
     rmarkdown (>= 2.23),
     roxy.shinylive (>= 1.0.0),

R/choices_labeled.R

@@ -39,7 +39,7 @@
 #'   subset = c("ARMCD", "ARM")
 #' )
 #'
-#' ui <- fluidPage(
+#' ui <- bslib::page_fluid(
 #'   selectInput("c1",
 #'     label = "Choices from ADSL",
 #'     choices = choices1,

R/choices_selected.R

@@ -116,7 +116,7 @@ no_select_keyword <- "-- no selection --"
 #'   selected = "A"
 #' )
 #'
-#' ui <- fluidPage(
+#' ui <- bslib::page_fluid(
 #'   optionalSelectInput(
 #'     inputId = "id",
 #'     choices = cs$choices,

R/data_extract_module.R

@@ -47,6 +47,18 @@ cond_data_extract_single_ui <- function(ns, single_data_extract_spec) {
   )
 }
 
+#' @keywords internal
+#' @noRd
+data_extract_deps <- function() {
+  htmltools::htmlDependency(
+    name = "teal-widgets-data-extract",
+    version = utils::packageVersion("teal.transform"),
+    package = "teal.transform",
+    src = "css",
+    stylesheet = "data-extract.css"
+  )
+}
+
 #' `teal` data extraction module user-interface
 #'
 #' @description
@@ -109,9 +121,9 @@ cond_data_extract_single_ui <- function(ns, single_data_extract_spec) {
 #'   )
 #' )
 #' # Call to use inside your teal module UI function
-#' standard_layout(
-#'   output = tableOutput("table"),
-#'   encoding = tags$div(
+#' bslib::layout_sidebar(
+#'   tableOutput("table"),
+#'   sidebar = tags$div(
 #'     data_extract_ui(
 #'       id = "regressor",
 #'       label = "Regressor Variable",
@@ -170,7 +182,7 @@ data_extract_ui <- function(id, label, data_extract_spec, is_single_dataset = FA
     }
   }
   tagList(
-    include_css_files(pattern = "data_extract"),
+    data_extract_deps(),
     tags$div(
       class = "data-extract",
       tags$label(label),
@@ -322,9 +334,9 @@ check_data_extract_spec_react <- function(datasets, data_extract) {
 #' join_keys <- join_keys(join_key("ADSL", "ADSL", c("STUDYID", "USUBJID")))
 #'
 #' # App: data extraction with validation
-#' ui <- fluidPage(
-#'   standard_layout(
-#'     output = verbatimTextOutput("out1"),
+#' ui <- bslib::page_fluid(
+#'   bslib::layout_sidebar(
+#'     verbatimTextOutput("out1"),
 #'     encoding = tagList(
 #'       data_extract_ui(
 #'         id = "adsl_var",
@@ -364,10 +376,10 @@ check_data_extract_spec_react <- function(datasets, data_extract) {
 #' }
 #'
 #' # App: simplified data extraction
-#' ui <- fluidPage(
-#'   standard_layout(
-#'     output = verbatimTextOutput("out1"),
-#'     encoding = tagList(
+#' ui <- bslib::page_fluid(
+#'   bslib::layout_sidebar(
+#'     verbatimTextOutput("out1"),
+#'     sidebar = tagList(
 #'       data_extract_ui(
 #'         id = "adsl_var",
 #'         label = "ADSL selection",
@@ -613,11 +625,11 @@ data_extract_srv.list <- function(id,
 #'
 #' data_list <- list(iris = reactive(iris))
 #'
-#' ui <- fluidPage(
+#' ui <- bslib::page_fluid(
 #'   useShinyjs(),
-#'   standard_layout(
-#'     output = verbatimTextOutput("out1"),
-#'     encoding = tagList(
+#'   bslib::layout_sidebar(
+#'     verbatimTextOutput("out1"),
+#'     sidebar = tagList(
 #'       data_extract_ui(
 #'         id = "x_var",
 #'         label = "Please select an X column",

R/format_data_extract.R

@@ -18,7 +18,7 @@
 #'   select = select_spec(choices = c("Petal.Length", "Species"))
 #' )
 #'
-#' ui <- fluidPage(
+#' ui <- bslib::page_fluid(
 #'   data_extract_ui(
 #'     id = "extract",
 #'     label = "data extract ui",

R/include_css_js.R

@@ -80,13 +80,13 @@
 #'   )
 #' )
 #'
-#' ui <- fluidPage(
-#'   standard_layout(
-#'     output = tags$div(
+#' ui <- bslib::page_fluid(
+#'   bslib::layout_sidebar(
+#'     tags$div(
 #'       verbatimTextOutput("expr"),
 #'       dataTableOutput("data")
 #'     ),
-#'     encoding = tagList(
+#'     sidebar = tagList(
 #'       data_extract_ui("adsl_var", label = "ADSL selection", adsl_extract),
 #'       data_extract_ui("adlb_var", label = "ADLB selection", adlb_extract)
 #'     )
@@ -278,13 +278,13 @@ merge_expression_module.list <- function(datasets,
 #'   )
 #' )
 #'
-#' ui <- fluidPage(
-#'   standard_layout(
-#'     output = tags$div(
+#' ui <- bslib::page_fluid(
+#'   bslib::layout_sidebar(
+#'     tags$div(
 #'       verbatimTextOutput("expr"),
 #'       dataTableOutput("data")
 #'     ),
-#'     encoding = tagList(
+#'     sidebar = tagList(
 #'       data_extract_ui("adsl_var", label = "ADSL selection", adsl_extract),
 #'       data_extract_ui("adlb_var", label = "ADLB selection", adlb_extract)
 #'     )

R/merge_expression_module.R

@@ -82,11 +82,11 @@ extract_choices_labels <- function(choices, values = NULL) {
 #'
 #' data_list <- list(iris = reactive(iris))
 #'
-#' ui <- fluidPage(
+#' ui <- bslib::page_fluid(
 #'   useShinyjs(),
-#'   standard_layout(
-#'     output = verbatimTextOutput("out1"),
-#'     encoding = tagList(
+#'   bslib::layout_sidebar(
+#'     verbatimTextOutput("out1"),
+#'     sidebar = tagList(
 #'       data_extract_ui(
 #'         id = "x_var",
 #'         label = "Please select an X column",

R/utils.R

@@ -1,7 +1,7 @@
 /* teal.transform data_extract css */
 
 .data-extract {
-  border-left: 3px solid #e3e3e3;
+  border-left: 3px solid var(--bs-gray-200);
   padding-left: 0.6em;
   border-radius: 5px;
   margin-left: -0.6em;