feat: ui changes

Author: vedhav

R/tm_data_table.R

@@ -161,22 +161,15 @@ ui_page_data_table <- function(id, pre_output = NULL, post_output = NULL) {
     include_css_files("custom"),
     teal.widgets::standard_layout(
       output = teal.widgets::white_small_well(
-        fluidRow(
-          column(
-            width = 12,
-            checkboxInput(
-              ns("if_distinct"),
-              "Show only distinct rows:",
-              value = FALSE
-            )
+        bslib::page_fluid(
+          checkboxInput(
+            ns("if_distinct"),
+            "Show only distinct rows:",
+            value = FALSE
           )
         ),
-        fluidRow(
-          class = "mb-8",
-          column(
-            width = 12,
-            uiOutput(ns("dataset_table"))
-          )
+        bslib::page_fluid(
+          uiOutput(ns("dataset_table"))
         )
       ),
       pre_output = pre_output,
@@ -233,15 +226,12 @@ srv_page_data_table <- function(id,
               }
               tabPanel(
                 title = x,
-                column(
-                  width = 12,
-                  div(
-                    class = "mt-4",
-                    ui_data_table(
-                      id = session$ns(x),
-                      choices = choices,
-                      selected = variables_selected
-                    )
+                bslib::layout_columns(
+                  col_widths = 12,
+                  ui_data_table(
+                    id = session$ns(x),
+                    choices = choices,
+                    selected = variables_selected
                   )
                 )
               )
@@ -281,7 +271,7 @@ ui_data_table <- function(id, choices, selected) {
 
   tagList(
     teal.widgets::get_dt_rows(ns("data_table"), ns("dt_rows")),
-    fluidRow(
+    bslib::page_fluid(
       teal.widgets::optionalSelectInput(
         ns("variables"),
         "Select variables:",
@@ -291,7 +281,7 @@ ui_data_table <- function(id, choices, selected) {
         width = "100%"
       )
     ),
-    fluidRow(
+    bslib::page_fluid(
       DT::dataTableOutput(ns("data_table"), width = "100%")
     )
   )

R/tm_g_bivariate.R

@@ -372,8 +372,12 @@ ui_g_bivariate <- function(id, ...) {
       if (!is.null(args$row_facet) || !is.null(args$col_facet)) {
         tags$div(
           class = "data-extract-box",
-          tags$label("Facetting"),
-          shinyWidgets::switchInput(inputId = ns("facetting"), value = args$facet, size = "mini"),
+          tags$br(),
+          bslib::input_switch(
+            id = ns("facetting"),
+            label = "Facetting",
+            value = args$facet
+          ),
           conditionalPanel(
             condition = paste0("input['", ns("facetting"), "']"),
             tags$div(
@@ -404,7 +408,11 @@ ui_g_bivariate <- function(id, ...) {
         tags$div(
           class = "data-extract-box",
           tags$label("Color settings"),
-          shinyWidgets::switchInput(inputId = ns("coloring"), value = TRUE, size = "mini"),
+          bslib::input_switch(
+            id = ns("coloring"),
+            label = "Color settings",
+            value = TRUE
+          ),
           conditionalPanel(
             condition = paste0("input['", ns("coloring"), "']"),
             tags$div(

R/tm_missing_data.R

@@ -186,13 +186,7 @@ ui_page_missing_data <- function(id, pre_output = NULL, post_output = NULL) {
     include_css_files("custom"),
     teal.widgets::standard_layout(
       output = teal.widgets::white_small_well(
-        tags$div(
-          class = "flex",
-          column(
-            width = 12,
-            uiOutput(ns("dataset_tabs"))
-          )
-        )
+        uiOutput(ns("dataset_tabs"))
       ),
       encoding = tags$div(
         uiOutput(ns("dataset_encodings"))
@@ -230,13 +224,7 @@ srv_page_missing_data <- function(id, data, reporter, filter_panel_api, dataname
             function(x) {
               tabPanel(
                 title = x,
-                column(
-                  width = 12,
-                  tags$div(
-                    class = "mt-4",
-                    ui_missing_data(id = ns(x), by_subject_plot = if_subject_plot)
-                  )
-                )
+                ui_missing_data(id = ns(x), by_subject_plot = if_subject_plot)
               )
             }
           )
@@ -389,34 +377,30 @@ encoding_missing_data <- function(id, summary_per_patient = FALSE, ggtheme, data
     ),
     conditionalPanel(
       is_tab_active_js(ns("summary_type"), "Summary"),
-      checkboxInput(
-        ns("any_na"),
-        tags$div(
-          tagList(
-            "Add **anyna** variable",
-            bslib::tooltip(
-              icon("circle-info"),
-              tags$span(
-                "Describes the number of observations with at least one missing value in any variable."
-              )
+      bslib::input_switch(
+        id = ns("any_na"),
+        label = tags$div(
+          HTML("Add <b>anyna</b> variable"),
+          bslib::tooltip(
+            icon("circle-info"),
+            tags$span(
+              "Describes the number of observations with at least one missing value in any variable."
             )
           )
         ),
         value = FALSE
       ),
       if (summary_per_patient) {
-        checkboxInput(
-          ns("if_patients_plot"),
-          tags$div(
-            tagList(
-              "Add summary per patients",
-              bslib::tooltip(
-                icon("circle-info"),
-                tags$span(
-                  paste(
-                    "Displays the number of missing values per observation,",
-                    "where the x-axis is sorted by observation appearance in the table."
-                  )
+        bslib::input_switch(
+          id = ns("if_patients_plot"),
+          label = tags$div(
+            "Add summary per patients",
+            bslib::tooltip(
+              icon("circle-info"),
+              tags$span(
+                paste(
+                  "Displays the number of missing values per observation,",
+                  "where the x-axis is sorted by observation appearance in the table."
                 )
               )
             )

R/tm_variable_browser.R

@@ -156,20 +156,11 @@ ui_variable_browser <- function(id,
             })
           ),
           teal.widgets::white_small_well(
-            ### Reporter
             teal.reporter::simple_reporter_ui(ns("simple_reporter")),
-            ###
-            tags$div(
-              class = "block",
-              uiOutput(ns("ui_histogram_display"))
-            ),
-            tags$div(
-              class = "block",
-              uiOutput(ns("ui_numeric_display"))
-            ),
+            uiOutput(ns("ui_histogram_display")),
+            uiOutput(ns("ui_numeric_display")),
             teal.widgets::plot_with_settings_ui(ns("variable_plot")),
             tags$br(),
-            # input user-defined text size
             teal.widgets::panel_item(
               title = "Plot settings",
               collapsed = TRUE,
@@ -178,15 +169,16 @@ ui_variable_browser <- function(id,
                 choices = ggplot_themes,
                 selected = "grey"
               ),
-              fluidRow(
-                column(6, sliderInput(
+              bslib::layout_columns(
+                col_widths = c(6, 6),
+                sliderInput(
                   inputId = ns("font_size"), label = "font size",
                   min = 5L, max = 30L, value = 15L, step = 1L, ticks = FALSE
-                )),
-                column(6, sliderInput(
+                ),
+                sliderInput(
                   inputId = ns("label_rotation"), label = "rotate x labels",
                   min = 0L, max = 90L, value = 45L, step = 1, ticks = FALSE
-                ))
+                )
               )
             ),
             tags$br(),
@@ -392,19 +384,14 @@ srv_variable_browser <- function(id,
       varname <- plot_var$variable[[dataname]]
       df <- data()[[dataname]]
 
-      numeric_ui <- tagList(fluidRow(
-        tags$div(
-          class = "col-md-4",
-          shinyWidgets::switchInput(
-            inputId = session$ns("remove_NA_hist"),
-            label = "Remove NA values",
-            value = FALSE,
-            width = "50%",
-            labelWidth = "100px",
-            handleWidth = "50px"
-          )
-        )
-      ))
+      numeric_ui <- shinyWidgets::switchInput(
+        inputId = session$ns("remove_NA_hist"),
+        label = "Remove NA values",
+        value = FALSE,
+        width = "50%",
+        labelWidth = "100px",
+        handleWidth = "50px"
+      )
 
       var <- df[[varname]]
       if (anyNA(var) && (is.factor(var) || is.character(var) || is.logical(var))) {