Skip to content

Change .default_teal_bslib_theming from object to function #1722

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
llrs-roche wants to merge 1 commit into
base: main
Choose a base branch
from
+4 −8
Open

Change .default_teal_bslib_theming from object to function #1722

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 3 additions & 7 deletions R/utils.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,25 +26,21 @@ get_client_timezone <- function(ns) {
#' Set the default bslib theme for teal apps
#' @noRd
#' @keywords internal
.default_teal_bslib_theming <- bslib::bs_theme(`font-size-base` = "0.875rem")
.default_teal_bslib_theming <- function() bslib::bs_theme(`font-size-base` = "0.875rem")

#' Resolve the expected bootstrap theme
#' @noRd
#' @keywords internal
get_teal_bs_theme <- function() {
bs_theme <- getOption("teal.bs_theme")

if (is.null(bs_theme)) {
bs_theme <- .default_teal_bslib_theming
}
bs_theme <- getOption("teal.bs_theme", default = .default_teal_bslib_theming())

if (!checkmate::test_class(bs_theme, "bs_theme")) {
warning(
"Assertion on 'teal.bs_theme' option value failed: ",
checkmate::check_class(bs_theme, "bs_theme"),
". The default bslib Bootstrap theme will be used."
)
bs_theme <- .default_teal_bslib_theming
bs_theme <- .default_teal_bslib_theming()
}

bs_theme
Expand Down
2 changes: 1 addition & 1 deletion R/zzz.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
teal.reporter.nav_buttons = c("preview", "download", "load", "reset"),
teal.show_src = TRUE,
teal.snapshot_manager.enable = TRUE,
teal.bs_theme = .default_teal_bslib_theming
teal.bs_theme = .default_teal_bslib_theming()
)

op <- options()
Expand Down
Loading