diff --git a/R/utils.R b/R/utils.R index 7bd5d9aa4e..8ea170b861 100644 --- a/R/utils.R +++ b/R/utils.R @@ -26,17 +26,13 @@ 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( @@ -44,7 +40,7 @@ get_teal_bs_theme <- function() { 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 diff --git a/R/zzz.R b/R/zzz.R index 88d10863d8..73c589f71b 100644 --- a/R/zzz.R +++ b/R/zzz.R @@ -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()