merge

Merge branch 'test@bslib@main' into report_redesign_poc@main

# Conflicts:
#	R/tm_a_regression.R

Author: m7pr

DESCRIPTION

@@ -30,6 +30,7 @@ Depends:
     teal (>= 0.16.0.9000),
     teal.transform (>= 0.6.0)
 Imports:
+    bslib (>= 0.8.0),
     checkmate (>= 2.1.0),
     colourpicker (>= 1.3.0),
     dplyr (>= 1.0.5),

R/tm_a_regression.R

@@ -285,7 +285,7 @@ ui_a_regression <- function(id, ...) {
       tags$div(verbatimTextOutput(ns("text")))
     )),
     encoding = tags$div(
-      tags$label("Encodings", class = "text-primary"),
+      tags$label("Encodings", class = "text-primary"), tags$br(),
       teal.transform::datanames_input(args[c("response", "regressor")]),
       teal.transform::data_extract_ui(
         id = ns("response"),
@@ -312,12 +312,10 @@ ui_a_regression <- function(id, ...) {
         teal.widgets::optionalSliderInput(
           ns("outlier"),
           tags$div(
-            class = "teal-tooltip",
             tagList(
               "Outlier definition:",
-              icon("circle-info"),
-              tags$span(
-                class = "tooltiptext",
+              bslib::tooltip(
+                icon("fas fa-circle-info"),
                 paste(
                   "Use the slider to choose the cut-off value to define outliers.",
                   "Points with a Cook's distance greater than",
@@ -343,16 +341,16 @@ ui_a_regression <- function(id, ...) {
           teal.widgets::optionalSliderInputValMinMax(
             inputId = ns("label_min_segment"),
             label = tags$div(
-              class = "teal-tooltip",
               tagList(
                 "Label min. segment:",
-                icon("circle-info"),
-                tags$span(
-                  class = "tooltiptext",
-                  paste(
-                    "Use the slider to choose the cut-off value to define minimum distance between label and point",
-                    "that generates a line segment.",
-                    "It's only valid when 'Display outlier labels' is checked."
+                bslib::tooltip(
+                  icon("circle-info"),
+                  tags$span(
+                    paste(
+                      "Use the slider to choose the cut-off value to define minimum distance between label and point",
+                      "that generates a line segment.",
+                      "It's only valid when 'Display outlier labels' is checked."
+                    )
                   )
                 )
               )

R/tm_g_distribution.R

@@ -337,13 +337,13 @@ ui_distribution <- function(id, ...) {
             teal.widgets::optionalSelectInput(
               ns("t_dist"),
               tags$div(
-                class = "teal-tooltip",
                 tagList(
                   "Distribution:",
-                  icon("circle-info"),
-                  tags$span(
-                    class = "tooltiptext",
-                    "Default parameters are optimized with MASS::fitdistr function."
+                  bslib::tooltip(
+                    icon("circle-info"),
+                    tags$span(
+                      "Default parameters are optimized with MASS::fitdistr function."
+                    )
                   )
                 )
               ),

R/tm_missing_data.R

@@ -392,13 +392,13 @@ encoding_missing_data <- function(id, summary_per_patient = FALSE, ggtheme, data
       checkboxInput(
         ns("any_na"),
         tags$div(
-          class = "teal-tooltip",
           tagList(
             "Add **anyna** variable",
-            icon("circle-info"),
-            tags$span(
-              class = "tooltiptext",
-              "Describes the number of observations with at least one missing value in any variable."
+            bslib::tooltip(
+              icon("circle-info"),
+              tags$span(
+                "Describes the number of observations with at least one missing value in any variable."
+              )
             )
           )
         ),
@@ -408,15 +408,15 @@ encoding_missing_data <- function(id, summary_per_patient = FALSE, ggtheme, data
         checkboxInput(
           ns("if_patients_plot"),
           tags$div(
-            class = "teal-tooltip",
             tagList(
               "Add summary per patients",
-              icon("circle-info"),
-              tags$span(
-                class = "tooltiptext",
-                paste(
-                  "Displays the number of missing values per observation,",
-                  "where the x-axis is sorted by observation appearance in the table."
+              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

@@ -435,15 +435,15 @@ srv_variable_browser <- function(id,
       sliderInput(
         inputId = session$ns("outlier_definition_slider"),
         tags$div(
-          class = "teal-tooltip",
           tagList(
             "Outlier definition:",
-            icon("circle-info"),
-            tags$span(
-              class = "tooltiptext",
-              paste(
-                "Use the slider to choose the cut-off value to define outliers; the larger the value the",
-                "further below Q1/above Q3 points have to be in order to be classed as outliers"
+            bslib::tooltip(
+              icon("circle-info"),
+              tags$span(
+                paste(
+                  "Use the slider to choose the cut-off value to define outliers; the larger the value the",
+                  "further below Q1/above Q3 points have to be in order to be classed as outliers"
+                )
               )
             )
           )