Skip to content

Commit 0a3a8d1

Browse files
m7prm7pr
committed
merge
Merge branch 'test@bslib@main' into report_redesign_poc@main # Conflicts: # DESCRIPTION
2 parents d0865d1 + b25eaee commit 0a3a8d1

File tree

4 files changed

+61
-65
lines changed

4 files changed

+61
-65
lines changed

‎.github/workflows/scheduled.yaml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,3 +66,14 @@ jobs:
6666
)
6767
name: R-hub 🌐
6868
uses: insightsengineering/r.pkg.template/.github/workflows/rhub.yaml@main
69+
with:
70+
config: >-
71+
r-patched-linux-x86_64,
72+
r-release-linux-x86_64,
73+
r-devel-windows-x86_64,
74+
r-release-macos-arm64,
75+
r-release-macos-x86_64,
76+
r-release-windows-x86_64,
77+
r-oldrel-macos-arm64,
78+
r-oldrel-macos-x86_64,
79+
r-oldrel-windows-x86_64

‎DESCRIPTION‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
Type: Package
22
Package: teal.modules.general
33
Title: General Modules for 'teal' Applications
4-
Version: 0.3.0.9091
5-
Date: 2025-02-25
4+
Version: 0.4.0.9000
5+
Date: 2025-02-28
66
Authors@R: c(
77
person("Dawid", "Kaledkowski", , "[email protected]", role = c("aut", "cre")),
88
person("Pawel", "Rucki", , "[email protected]", role = "aut"),
@@ -48,8 +48,8 @@ Imports:
4848
jsonlite (>= 1.8.9),
4949
lattice (>= 0.18-4),
5050
lifecycle (>= 0.2.0),
51-
MASS (>= 7.3-61),
52-
rtables (>= 0.6.8),
51+
MASS (>= 7.3-60),
52+
rtables (>= 0.6.11),
5353
scales (>= 1.3.0),
5454
shinyjs (>= 2.1.0),
5555
shinyTree (>= 0.2.8),
@@ -58,12 +58,12 @@ Imports:
5858
sparkline (>= 2.0),
5959
stats,
6060
stringr (>= 1.4.1),
61-
teal.code (>= 0.6.0),
61+
teal.code (>= 0.6.1),
6262
teal.data (>= 0.7.0),
63-
teal.logger (>= 0.3.1),
63+
teal.logger (>= 0.3.2),
6464
teal.reporter (>= 0.4.0.9000),
6565
teal.widgets (>= 0.4.3.9000),
66-
tern (>= 0.9.5),
66+
tern (>= 0.9.7),
6767
tibble (>= 2.0.0),
6868
tidyr (>= 0.8.3),
6969
tools,

‎NEWS.md‎

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,23 @@
1-
# teal.modules.general 0.3.0.9091
1+
# teal.modules.general 0.4.0.9000
22

3-
* Removed `Show Warnings` modals from modules.
4-
* Soft deprecated `datasets_selected` argument of modules in favor of `datanames`.
5-
* Soft deprecated `show_metadata` argument of `tm_front_page()` in favor of `datanames`.
6-
* Modules' Show R Code widgets include library calls and their code is styled with `styler` package (#847, #786).
3+
# teal.modules.general 0.4.0
74

85
### Enhancements
6+
* Introduced `transformators` and `decorators` argument to modules (#863).
7+
* Modules' Show R Code widgets include library calls to boost reproducibility (#786).
8+
* Removed `Show Warnings` modals from modules.
99

10+
### Miscellaneous
11+
* Soft deprecated `datasets_selected` argument of modules in favor of `datanames`.
12+
* Soft deprecated `show_metadata` argument of `tm_front_page()` in favor of `datanames`.
1013
* Added `teal.logger` functionality for logging changes in shiny inputs in all modules.
14+
* All example data is now sourced from `teal.data`.
15+
* Update `tm_g_distribution` to not start with validation error (#823).
1116

1217
### Bug fixes
13-
* Fixed a bug in `tm_missing_data` in "Group by Subject" that was not using reactive data call.
18+
* Fixed a bug in `tm_missing_data` in "Group by Subject" that was not using reactive data call (#772).
19+
* Fixed out-of-bound labels for `tm_g_regression` (#66).
20+
* Fixed a bug in `tm_g_association` where the app would crash when a selected categorical variable was a factor instead of a character (#645).
1421

1522
# teal.modules.general 0.3.0
1623

‎R/tm_variable_browser.R‎

Lines changed: 30 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -141,24 +141,20 @@ ui_variable_browser <- function(id,
141141
post_output = NULL) {
142142
ns <- NS(id)
143143

144-
tagList(
144+
tags$div(
145145
include_css_files("custom"),
146146
shinyjs::useShinyjs(),
147147
teal.widgets::standard_layout(
148-
output = fluidRow(
148+
output = tags$div(
149149
htmlwidgets::getDependency("sparkline"), # needed for sparklines to work
150-
column(
151-
6,
152-
# variable browser
150+
bslib::layout_column_wrap(
151+
width = 0.5,
153152
teal.widgets::white_small_well(
154153
uiOutput(ns("ui_variable_browser")),
155154
shinyjs::hidden({
156155
checkboxInput(ns("show_parent_vars"), "Show parent dataset variables", value = FALSE)
157156
})
158-
)
159-
),
160-
column(
161-
6,
157+
),
162158
teal.widgets::white_small_well(
163159
### Reporter
164160
teal.reporter::simple_reporter_ui(ns("simple_reporter")),
@@ -331,41 +327,35 @@ srv_variable_browser <- function(id,
331327
varname <- plot_var$variable[[dataname]]
332328
df <- data()[[dataname]]
333329

334-
numeric_ui <- tagList(
335-
fluidRow(
336-
tags$div(
337-
class = "col-md-4",
338-
tags$br(),
339-
shinyWidgets::switchInput(
340-
inputId = session$ns("display_density"),
341-
label = "Show density",
330+
numeric_ui <- bslib::page_fluid(
331+
bslib::layout_columns(
332+
col_widths = c(8, 4),
333+
bslib::layout_columns(
334+
col_widths = c(6, 6, 12),
335+
style = bslib::css(grid_row_gap = 0),
336+
bslib::input_switch(
337+
id = session$ns("display_density"),
338+
label = tags$div(
339+
"Show density:",
340+
bslib::tooltip(
341+
trigger = icon("circle-info"),
342+
tags$span(
343+
"Show kernel density estimation with gaussian kernel and bandwidth function bw.nrd0 (R default)"
344+
)
345+
)
346+
),
342347
value = `if`(is.null(isolate(input$display_density)), TRUE, isolate(input$display_density)),
343-
width = "50%",
344-
labelWidth = "100px",
345-
handleWidth = "50px"
346-
)
347-
),
348-
tags$div(
349-
class = "col-md-4",
350-
tags$br(),
351-
shinyWidgets::switchInput(
352-
inputId = session$ns("remove_outliers"),
348+
width = "100%"
349+
),
350+
bslib::input_switch(
351+
id = session$ns("remove_outliers"),
353352
label = "Remove outliers",
354353
value = `if`(is.null(isolate(input$remove_outliers)), FALSE, isolate(input$remove_outliers)),
355-
width = "50%",
356-
labelWidth = "100px",
357-
handleWidth = "50px"
358-
)
354+
width = "100%"
355+
),
356+
uiOutput(session$ns("ui_outlier_help"))
359357
),
360-
tags$div(
361-
class = "col-md-4",
362-
uiOutput(session$ns("outlier_definition_slider_ui"))
363-
)
364-
),
365-
tags$div(
366-
class = "ml-4",
367-
uiOutput(session$ns("ui_density_help")),
368-
uiOutput(session$ns("ui_outlier_help"))
358+
uiOutput(session$ns("outlier_definition_slider_ui"))
369359
)
370360
)
371361

@@ -455,18 +445,6 @@ srv_variable_browser <- function(id,
455445
)
456446
})
457447

458-
output$ui_density_help <- renderUI({
459-
req(is.logical(input$display_density))
460-
if (input$display_density) {
461-
tags$small(helpText(paste(
462-
"Kernel density estimation with gaussian kernel",
463-
"and bandwidth function bw.nrd0 (R default)"
464-
)))
465-
} else {
466-
NULL
467-
}
468-
})
469-
470448
output$ui_outlier_help <- renderUI({
471449
req(is.logical(input$remove_outliers), input$outlier_definition_slider)
472450
if (input$remove_outliers) {

0 commit comments

Comments
 (0)