diff --git a/R/sysdata.rda b/R/sysdata.rda index 41af7e704..4f1e95705 100644 Binary files a/R/sysdata.rda and b/R/sysdata.rda differ diff --git a/R/utils-deps.R b/R/utils-deps.R index 81f6c5114..efa23b0d7 100644 --- a/R/utils-deps.R +++ b/R/utils-deps.R @@ -45,15 +45,19 @@ component_dependency_sass <- function(theme) { } } -component_dependency_sass_ <- function(theme) { +component_dependency_sass_files <- function() { scss_dir <- path_inst("components", "scss") scss_files <- c( file.path(scss_dir, "mixins", "_mixins.scss"), dir(scss_dir, pattern = "\\.scss$", full.names = TRUE) ) - # Although rare, it's possible for bs_dependency_defer() to pass - # along a NULL theme (e.g., renderTags(accordion())), so fallback + lapply(scss_files, sass_file) +} + +component_dependency_sass_ <- function(theme) { + # Although rare, it's possible for bs_dependency_defer() to pass + # along a NULL theme (e.g., renderTags(accordion())), so fallback # to the default theme if need be theme <- theme %||% bs_theme() @@ -65,7 +69,7 @@ component_dependency_sass_ <- function(theme) { } bs_dependency( - input = lapply(scss_files, sass_file), + input = component_dependency_sass_files(), theme = theme, name = "bslib-component-css", version = get_package_version("bslib"), diff --git a/inst/builtin/bs5/shiny/_mixins.scss b/inst/builtin/bs5/shiny/_mixins.scss index 276aef506..7c64f0699 100644 --- a/inst/builtin/bs5/shiny/_mixins.scss +++ b/inst/builtin/bs5/shiny/_mixins.scss @@ -4,9 +4,5 @@ $accordion-button-active-bg: null; $accordion-button-active-color: null; $accordion-icon-active-color: null; -// Shiny: selectInput() and selectizeInput() -$selectize-color-dropdown-item-active: $component-active-bg !default; -$selectize-color-dropdown-item-active-text: $component-active-color !default; - // Component Variables @import "ionrangeslider/_variables.scss";