Skip to content

Commit c675cad

Browse files
committed
Merge branch 'main' into test@bslib@main
2 parents 99a39ee + 94ff381 commit c675cad

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+2182
-1143
lines changed

.github/workflows/scheduled.yaml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,19 @@ jobs:
5656
)
5757
name: revdepcheck ↩️
5858
uses: insightsengineering/r.pkg.template/.github/workflows/revdepcheck.yaml@main
59+
with:
60+
lookup-refs: |
61+
insightsengineering/roxy.shinylive
62+
insightsengineering/teal
63+
insightsengineering/teal.transform
64+
insightsengineering/teal.code
65+
insightsengineering/teal.data
66+
insightsengineering/teal.slice
67+
insightsengineering/teal.logger
68+
insightsengineering/teal.reporter
69+
insightsengineering/teal.widgets
70+
insightsengineering/tern
71+
insightsengineering/rtables
5972
rhub:
6073
if: >
6174
github.event_name == 'schedule' || (
@@ -66,10 +79,12 @@ jobs:
6679
uses: insightsengineering/r.pkg.template/.github/workflows/rhub.yaml@main
6780
with:
6881
lookup-refs: |
82+
insightsengineering/roxy.shinylive
6983
insightsengineering/teal
7084
insightsengineering/teal.transform
7185
insightsengineering/teal.code
7286
insightsengineering/teal.data
87+
insightsengineering/teal.slice
7388
insightsengineering/teal.logger
7489
insightsengineering/teal.reporter
7590
insightsengineering/teal.widgets

.pre-commit-config.yaml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
---
22
# All available hooks: https://pre-commit.com/hooks.html
33
# R specific hooks: https://github.com/lorenzwalthert/precommit
4-
default_stages: [commit]
4+
default_stages: [pre-commit]
55
default_language_version:
66
python: python3
77
repos:
88
- repo: https://github.com/lorenzwalthert/precommit
9-
rev: v0.4.3.9001
9+
rev: v0.4.3.9003
1010
hooks:
1111
- id: style-files
1212
name: Style code with `styler`
@@ -18,8 +18,6 @@ repos:
1818
- ggmosaic
1919
- ggplot2
2020
- shiny
21-
- teal
22-
- teal.transform
2321
- checkmate
2422
- dplyr
2523
- DT
@@ -33,6 +31,9 @@ repos:
3331
- shinyWidgets
3432
- stats
3533
- stringr
34+
- insightsengineering/roxy.shinylive
35+
- insightsengineering/teal
36+
- insightsengineering/teal.transform
3637
- insightsengineering/teal.code
3738
- insightsengineering/teal.data
3839
- insightsengineering/teal.logger

DESCRIPTION

Lines changed: 21 additions & 18 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.9050
5-
Date: 2024-10-01
4+
Version: 0.3.0.9056
5+
Date: 2024-12-03
66
Authors@R: c(
77
person("Dawid", "Kaledkowski", , "[email protected]", role = c("aut", "cre")),
88
person("Pawel", "Rucki", , "[email protected]", role = "aut"),
@@ -27,24 +27,25 @@ Depends:
2727
ggplot2 (>= 3.4.0),
2828
R (>= 3.6),
2929
shiny (>= 1.6.0),
30-
teal (>= 0.15.2.9052),
31-
teal.transform (>= 0.5.0)
30+
teal (>= 0.15.2.9091),
31+
teal.transform (>= 0.5.0.9015)
3232
Imports:
3333
bslib (>= 0.8.0),
3434
checkmate (>= 2.1.0),
3535
dplyr (>= 1.0.5),
3636
DT (>= 0.13),
3737
forcats (>= 1.0.0),
3838
grid,
39+
lifecycle (>= 0.2.0),
3940
scales,
4041
shinyjs,
4142
shinyTree (>= 0.2.8),
4243
shinyvalidate,
4344
shinyWidgets (>= 0.5.1),
4445
stats,
4546
stringr (>= 1.4.1),
46-
teal.code (>= 0.5.0),
47-
teal.data (>= 0.5.0),
47+
teal.code (>= 0.5.0.9012),
48+
teal.data (>= 0.6.0.9015),
4849
teal.logger (>= 0.2.0.9004),
4950
teal.reporter (>= 0.3.0),
5051
teal.widgets (>= 0.4.0),
@@ -80,21 +81,23 @@ Suggests:
8081
testthat (>= 3.1.9),
8182
withr (>= 2.0.0)
8283
VignetteBuilder:
83-
knitr
84+
knitr,
85+
rmarkdown
8486
Config/Needs/verdepcheck: haleyjeppson/ggmosaic, tidyverse/ggplot2,
8587
rstudio/shiny, insightsengineering/teal,
8688
insightsengineering/teal.transform, mllg/checkmate, tidyverse/dplyr,
87-
rstudio/DT, tidyverse/forcats, r-lib/scales, daattali/shinyjs,
88-
shinyTree/shinyTree, rstudio/shinyvalidate, dreamRs/shinyWidgets,
89-
tidyverse/stringr, insightsengineering/teal.code,
90-
insightsengineering/teal.data, insightsengineering/teal.logger,
91-
insightsengineering/teal.reporter, insightsengineering/teal.widgets,
92-
insightsengineering/tern, tidyverse/tibble, tidyverse/tidyr,
93-
tidymodels/broom, daattali/colourpicker, daattali/ggExtra,
94-
aphalo/ggpmisc, aphalo/ggpp, slowkow/ggrepel, baddstats/goftest,
95-
ramnathv/htmlwidgets, jeroen/jsonlite, yihui/knitr, daroczig/logger,
96-
deepayan/lattice, insightsengineering/nestcolor, r-lib/pkgload,
97-
r-lib/rlang, rstudio/rmarkdown, insightsengineering/roxy.shinylive,
89+
rstudio/DT, tidyverse/forcats, r-lib/lifecycle, r-lib/scales,
90+
daattali/shinyjs, shinyTree/shinyTree, rstudio/shinyvalidate,
91+
dreamRs/shinyWidgets, tidyverse/stringr,
92+
insightsengineering/teal.code, insightsengineering/teal.data,
93+
insightsengineering/teal.logger, insightsengineering/teal.reporter,
94+
insightsengineering/teal.widgets, insightsengineering/tern,
95+
tidyverse/tibble, tidyverse/tidyr, tidymodels/broom,
96+
daattali/colourpicker, daattali/ggExtra, aphalo/ggpmisc, aphalo/ggpp,
97+
slowkow/ggrepel, baddstats/goftest, ramnathv/htmlwidgets,
98+
jeroen/jsonlite, yihui/knitr, daroczig/logger, deepayan/lattice,
99+
insightsengineering/nestcolor, r-lib/pkgload, r-lib/rlang,
100+
rstudio/rmarkdown, insightsengineering/roxy.shinylive,
98101
insightsengineering/rtables, tidyverse/rvest, htmlwidgets/sparkline,
99102
rstudio/shinytest2, r-lib/testthat, r-lib/withr
100103
Config/Needs/website: insightsengineering/nesttemplate

NEWS.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# teal.modules.general 0.3.0.9050
1+
# teal.modules.general 0.3.0.9056
22

33
* Removed `Show Warnings` modals from modules.
44

R/roxygen2_templates.R

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
# nocov start
2+
roxygen_decorators_param <- function(module_name) {
3+
paste(
4+
sep = " ",
5+
lifecycle::badge("experimental"),
6+
" (`list` of `teal_transform_module`, named `list` of `teal_transform_module` or",
7+
"`NULL`) optional, if not `NULL`, decorator for tables or plots included in the module.",
8+
"When a named list of `teal_transform_module`, the decorators are applied to the",
9+
"respective output objects.\n\n",
10+
"Otherwise, the decorators are applied to all objects, which is equivalent as using the name `default`.\n\n",
11+
sprintf("See section \"Decorating `%s`\"", module_name),
12+
"below for more details."
13+
)
14+
}
15+
16+
roxygen_ggplot2_args_param <- function(...) {
17+
paste(
18+
sep = " ",
19+
"(`ggplot2_args`) optional, object created by [`teal.widgets::ggplot2_args()`]",
20+
"with settings for all the plots or named list of `ggplot2_args` objects for plot-specific settings.",
21+
"The argument is merged with options variable `teal.ggplot2_args` and default module setup.\n\n",
22+
sprintf(
23+
"List names should match the following: `c(\"default\", %s)`.\n\n",
24+
paste("\"", unlist(rlang::list2(...)), "\"", collapse = ", ", sep = "")
25+
),
26+
"For more details see the vignette: `vignette(\"custom-ggplot2-arguments\", package = \"teal.widgets\")`."
27+
)
28+
}
29+
30+
# nocov end

0 commit comments

Comments
 (0)