Remove bootstrap HTML dependency

.Rbuildignore

@@ -19,3 +19,4 @@
 ^coverage$
 ^.nvmrc$
 ^\.github$
+^tools$

DESCRIPTION

@@ -42,7 +42,8 @@ Imports:
 Suggests:
     shiny,
     ggplot2,
-    testthat (>= 2.1.0)
+    testthat (>= 2.1.0),
+    sass
 URL: https://rstudio.github.io/crosstalk/
 BugReports: https://github.com/rstudio/crosstalk/issues
 RoxygenNote: 7.1.1

NEWS.md

@@ -1,6 +1,12 @@
 ## crosstalk 1.1.1.9000
 
+### Breaking changes
 
+* Removed the Bootstrap HTML dependency attached to `filter_select()`, `filter_checkbox()`, and `bscols()`. This allows `{crosstalk}` to be used in a non-Bootstrap CSS framework (e.g., `{distill}`) without de-grading the overall look. If this change happens to break functionality or de-grade the overall appearance of your `{crosstalk}` site, consider adding `bslib::bs_theme_dependencies(bslib::bs_theme(version = 3))` to the UI definition, which will add back the Bootstrap dependency.
+
+### Improvements
+
+* Upgraded `filter_select()`'s selectize.js dependency to v0.12.4.
 
 ## crosstalk 1.1.1
 

R/controls.R

@@ -1,23 +1,18 @@
-bootstrapLib <- function(theme = NULL) {
-  # Intentionally use an older version of bootstrap. The rendering
-  # environment may use a bootstrap version that has a theme, and
-  # we don't want to trump that just for our little controls.
-  # Ideally we should find a better solution for this.
+bootstrapGrid <- function() {
   htmlDependency(
-    name = "bootstrap",
-    version = "3.3.2",
+    name = "bootstrap-grid",
+    version = "3.4.1", # must be updated with tools/updateBootstrapGrid.R
     package = "crosstalk",
-    src = file.path("lib", "bootstrap"),
-    script = "js/bootstrap.min.js",
-    stylesheet = if (is.null(theme)) "css/bootstrap.min.css",
+    src = "lib/bootstrap",
+    stylesheet = "bootstrap-grid.min.css",
     meta = list(viewport = "width=device-width, initial-scale=1")
   )
 }
 
 selectizeLib <- function(bootstrap = TRUE) {
   htmlDependency(
     name = "selectize",
-    version = "0.11.2",
+    version = "0.12.4",
     package = "crosstalk",
     src = "lib/selectize",
     stylesheet = if (bootstrap) "css/selectize.bootstrap3.css",
@@ -143,7 +138,7 @@ filter_select <- function(id, label, sharedData, group, allLevels = FALSE,
         )
       )
     ),
-    c(list(jqueryLib(), bootstrapLib(), selectizeLib()), crosstalkLibs())
+    c(list(jqueryLib(), selectizeLib()), crosstalkLibs())
   ))
 }
 
@@ -192,7 +187,7 @@ filter_checkbox <- function(id, label, sharedData, group, allLevels = FALSE, inl
         jsonlite::toJSON(options, dataframe = "columns", pretty = TRUE)
       )
     ),
-    c(list(jqueryLib(), bootstrapLib()), crosstalkLibs())
+    c(list(jqueryLib()), crosstalkLibs())
   ))
 }
 
@@ -544,7 +539,7 @@ bscols <- function(..., widths = NA, device = c("xs", "sm", "md", "lg")) {
 
   ui <- tags$div(class = "container-fluid crosstalk-bscols",
     # Counteract knitr pre/code output blocks
-    tags$div(class = "fluid-row",
+    tags$div(class = "row",
       unname(mapply(list(...), widths, FUN = function(el, width) {
         div(class = sprintf("col-%s-%s", device, width),
           el
@@ -553,7 +548,7 @@ bscols <- function(..., widths = NA, device = c("xs", "sm", "md", "lg")) {
     )
   )
 
-  browsable(attachDependencies(ui, list(jqueryLib(), bootstrapLib())))
+  browsable(attachDependencies(ui, list(jqueryLib(), bootstrapGrid())))
 }
 
 controlLabel <- function(controlName, label) {

R/crosstalk.R

@@ -22,7 +22,7 @@ crosstalkLibs <- function() {
       package = "crosstalk",
       src = "www",
       script = "js/crosstalk.min.js",
-      stylesheet = "css/crosstalk.css"
+      stylesheet = "css/crosstalk.min.css"
     )
   )
 }