Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,8 @@ Suggests:
shiny,
tidyr,
webshot,
xml2
xml2,
bslib
Roxygen: list(markdown = TRUE)
Collate:
'as_data_frame.R'
Expand Down Expand Up @@ -112,3 +113,4 @@ Collate:
'utils_render_latex.R'
'utils_render_rtf_redo.R'
'zzz.R'
Remotes: rstudio/bslib
35 changes: 34 additions & 1 deletion R/compile_scss.R
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,38 @@ compile_scss <- function(data, id = NULL) {
table_additional_css <- paste(additional_css, collapse = "\n") %>% paste_right("\n")
}

# If a bslib theme is active, use it to provide defaults based on Bootstrap Sass variables
theme_vars <- list()
theme <- bs_current_theme()
if (length(theme)) {
# Replace default option values with bslib Sass defaults
bslib_col <- if ("3" %in% theme_version(theme)) "value3" else "value"
gt_options_tbl <- gt_options_tbl %>%
dplyr::left_join(
dplyr::select(dt_options_tbl, parameter, default = value), by = "parameter"
) %>%
dplyr::left_join(
dplyr::select(bslib_options_tbl, parameter, bsvalue = !!rlang::sym(bslib_col)), by = "parameter"
) %>%
dplyr::mutate(
is_default = as.logical(Map(identical, value, default)),
value = ifelse(is_default & !is.na(bsvalue), bsvalue, value)
)
# Add values of bslib::bs_theme(bg, fg) as official Sass vars to the theme (since value3 uses them)
bfg <- bslib::bs_get_variables(theme, c("bg", "fg"))
theme <- bslib::bs_add_variables(theme, !!!as.list(bfg))
theme_vars <- sass::as_sass_layer(theme)
theme_vars$rules <- ""
}

sass::sass(
list(
list(element_id = id),
as.list(stats::setNames(gt_options_tbl$value, gt_options_tbl$parameter)),
theme_vars,
as.list(stats::setNames(
paste(gt_options_tbl$value, "!default"),
gt_options_tbl$parameter
)),
sass::sass_file(system_file(file = "css/gt_colors.scss")),
sass::sass_file(system_file(file = "css/gt_styles_default.scss")),
glue::glue(
Expand All @@ -46,3 +74,8 @@ compile_scss <- function(data, id = NULL) {
)
)
}

bs_current_theme <- function() {
if ("bslib" %in% loadedNamespaces())
bslib::bs_current_theme()
}
Loading