v0.8.0 release candidate (#1094)

* Start v0.8.0 release candidate * `yarn build` (GitHub Actions) * ran revdepcheck on cloud. No known issues * `yarn build` (GitHub Actions) * re-run checks * fix(page): Allow empty dots in page functions (#1095) * fix empty trailing arguments in dots of page functions * Add unit tests --------- Co-authored-by: Carson <[email protected]> * Update snapshot tests * Follow up to #1093: card_image() used to fill by default * Fix R CMD check note about Rd links targets missing package anchors * Missed a few --------- Co-authored-by: cpsievert <[email protected]> Co-authored-by: Barret Schloerke <[email protected]> Co-authored-by: Garrick Aden-Buie <[email protected]> Co-authored-by: gadenbuie <[email protected]>
rstudio · Jul 29, 2024 · 112efd0 · 112efd0
1 parent 65c1fe9
commit 112efd0
Show file tree

Hide file tree

Showing 29 changed files with 85 additions and 126 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: bslib
 Title: Custom 'Bootstrap' 'Sass' Themes for 'shiny' and 'rmarkdown'
-Version: 0.7.0.9000
+Version: 0.8.0
 Authors@R: c(
     person("Carson", "Sievert", , "[email protected]", role = c("aut", "cre"),
            comment = c(ORCID = "0000-0002-4958-2844")),
@@ -55,8 +55,6 @@ Suggests:
     testthat,
     thematic,
     withr
-Remotes:
-    rstudio/shiny
 Config/Needs/deploy:
     BH,
     chiflights22,

diff --git a/NEWS.md b/NEWS.md
@@ -1,4 +1,4 @@
-# bslib (development version)
+# bslib 0.8.0
 
 ## Breaking changes
 

diff --git a/R/bs-dependencies.R b/R/bs-dependencies.R
@@ -159,7 +159,7 @@ bs_theme_dependencies <- function(
 #' variables, functions, and/or mixins (i.e., stuff inside of `theme`).
 #' `bs_dependencies()` makes it a bit easier to create themeable components by
 #' compiling [sass::sass()] (`input`) together with Bootstrap Sass inside of a
-#' `theme`, and packaging up the result into an [htmlDependency()].
+#' `theme`, and packaging up the result into an [htmltools::htmlDependency()].
 #'
 #' Themable components can also be  _dynamically_ themed inside of Shiny (i.e.,
 #' they may be themed in 'real-time' via [bs_themer()], and more generally,
@@ -246,7 +246,7 @@ bs_dependency <- function(input = list(), theme, name, version,
 #' @rdname bs_dependency
 #' @param func a _non-anonymous_ function, with a _single_ argument.
 #'   This function should accept a [bs_theme()] object and return a single
-#'   [htmlDependency()], a list of them, or `NULL`.
+#'   [htmltools::htmlDependency()], a list of them, or `NULL`.
 #' @param memoise whether or not to memoise (i.e., cache) `func` results for a
 #'   short period of time. The default, `TRUE`, can have large performance
 #'   benefits when many instances of the same themable widget are rendered. Note

diff --git a/R/fill.R b/R/fill.R
@@ -17,8 +17,8 @@
 #'
 #' @details
 #' Although `as_fill()`, `as_fillable()`, and `as_fill_carrier()` can work with
-#' non-tag objects that have a [as.tags] method (e.g., htmlwidgets), they return
-#' the "tagified" version of that object.
+#' non-tag objects that have a [htmltools::as.tags] method (e.g., htmlwidgets),
+#' they return the "tagified" version of that object.
 #'
 #' @examplesIf rlang::is_interactive()
 #' library(shiny)
@@ -56,7 +56,7 @@
 #' @param style A character vector of CSS properties to add to the tag.
 #' @param css_selector A character string containing a CSS selector for
 #'   targeting particular (inner) tag(s) of interest. For more details on what
-#'   selector(s) are supported, see [tagAppendAttributes()].
+#'   selector(s) are supported, see [htmltools::tagAppendAttributes()].
 #'
 #' @export
 as_fill_carrier <- function(x, ..., min_height = NULL, max_height = NULL, gap = NULL, class = NULL, style = NULL, css_selector = NULL) {

diff --git a/R/nav-items.R b/R/nav-items.R
@@ -4,13 +4,13 @@
 #' [navset_bar()], etc).
 #'
 #' @param title A title to display. Can be a character string or UI elements
-#'   (i.e., [tags]).
+#'   (i.e., [htmltools::tags]).
 #' @param ... Depends on the function:
-#'   * For `nav_panel()` and `nav_panel_hidden()`: UI elements (i.e., [tags]) to
-#'     display when the item is active.
+#'   * For `nav_panel()` and `nav_panel_hidden()`: UI elements (i.e.,
+#'     [htmltools::tags]) to display when the item is active.
 #'   * For `nav_menu()`: a collection of nav items (e.g., `nav_panel()`,
 #'     `nav_item()`).
-#'   * For `nav_item()`: UI elements (i.e., [tags]) to place directly in
+#'   * For `nav_item()`: UI elements (i.e., [htmltools::tags]) to place directly in
 #'     the navigation panel (e.g., search forms, links to external content, etc).
 #' @param value A character string to assign to the nav item. This value may be
 #'   supplied to the relevant container's `selected` argument in order to show

diff --git a/R/navs-legacy.R b/R/navs-legacy.R
@@ -12,8 +12,10 @@
 #'    [nav_select()]).
 #' @param selected a character string matching the `value` of a particular
 #'   [nav_panel()] item to selected by default.
-#' @param header UI element(s) ([tags]) to display _above_ the nav content.
-#' @param footer UI element(s) ([tags]) to display _below_ the nav content.
+#' @param header UI element(s) ([htmltools::tags]) to display _above_ the nav
+#'   content.
+#' @param footer UI element(s) ([htmltools::tags]) to display _below_ the nav
+#'   content.
 #'
 #' @seealso [nav_panel()], [nav_panel_hidden()] create panels of content.
 #' @seealso [nav_menu()], [nav_item()], [nav_spacer()] create menus, items, or

diff --git a/R/page.R b/R/page.R
@@ -43,12 +43,12 @@ page <- function(..., title = NULL, theme = bs_theme(), lang = NULL) {
 page_fluid <- function(..., title = NULL, theme = bs_theme(), lang = NULL) {
   as_page(
     shiny::fluidPage(
+      # Components require Bootstrap 5+
+      if (isTRUE(theme_version(theme) >= 5)) component_dependencies(),
       ...,
       title = title,
       theme = theme,
-      lang = lang,
-      # Components require Bootstrap 5+
-      if (isTRUE(theme_version(theme) >= 5)) component_dependencies()
+      lang = lang
     ),
     theme = theme
   )
@@ -62,12 +62,12 @@ page_fluid <- function(..., title = NULL, theme = bs_theme(), lang = NULL) {
 page_fixed <- function(..., title = NULL, theme = bs_theme(), lang = NULL) {
   as_page(
     shiny::fixedPage(
+      # Components require Bootstrap 5+
+      if (isTRUE(theme_version(theme) >= 5)) component_dependencies(),
       ...,
       title = title,
       theme = theme,
-      lang = lang,
-      # Components require Bootstrap 5+
-      if (isTRUE(theme_version(theme) >= 5)) component_dependencies()
+      lang = lang
     ),
     theme = theme
   )
@@ -186,9 +186,9 @@ page_fillable <- function(
       padding = validateCssPadding(padding),
       gap = validateCssUnit(gap)
     ),
-    ...,
+    as_fillable_container(),
     tags$head(tags$style("html { height: 100%; }")),
-    as_fillable_container()
+    ...
   )
 }
 

diff --git a/R/popover.R b/R/popover.R
@@ -10,9 +10,10 @@
 #'   [shiny::actionButton()] or similar). If `trigger` renders as multiple HTML
 #'   elements (e.g., it's a `tagList()`), the last HTML element is used for the
 #'   trigger. If the `trigger` should contain all of those elements, wrap the
-#'   object in a [div()] or [span()].
+#'   object in a [htmltools::div()] or [htmltools::span()].
 #' @param ... UI elements for the popover's body. Character strings are
-#'   [automatically escaped][htmlEscape()] unless marked as [HTML()].
+#'   [automatically escaped][htmltools::htmlEscape()] unless marked as
+#'   [htmltools::HTML()].
 #' @param title A title (header) for the popover. To remove a header
 #'   with `update_popover()`, provide a either an empty string or `character(0)`.
 #' @param id A character string. Required to re-actively respond to the

diff --git a/R/print.R b/R/print.R
@@ -26,7 +26,7 @@ print.bslib_fragment <- function(x, ...) {
 #' Save a bslib page/fragment as HTML
 #'
 #' @param html a bslib page/fragment.
-#' @param ... passed along to an underlying [save_html()] method.
+#' @param ... passed along to an underlying [htmltools::save_html()] method.
 #' @export
 #' @keywords internal
 #' @rdname save-html

diff --git a/R/tooltip.R b/R/tooltip.R
@@ -9,9 +9,9 @@
 #'   as the tooltip trigger. If `trigger` renders as multiple HTML
 #'   elements (e.g., it's a `tagList()`), the last HTML element is used for the
 #'   trigger. If the `trigger` should contain all of those elements, wrap the
-#'   object in a [div()] or [span()].
+#'   object in a [htmltools::div()] or [htmltools::span()].
 #' @param ... UI elements for the tooltip. Character strings are [automatically
-#'   escaped][htmlEscape()] unless marked as [HTML()].
+#'   escaped][htmltools::htmlEscape()] unless marked as [htmltools::HTML()].
 #' @param id A character string. Required to re-actively respond to the
 #'   visibility of the tooltip (via the `input[[id]]` value) and/or update the
 #'   visibility/contents of the tooltip.

diff --git a/inst/components/dist/components.js b/inst/components/dist/components.js
diff --git a/inst/components/dist/components.min.js b/inst/components/dist/components.min.js
diff --git a/inst/components/dist/web-components.js b/inst/components/dist/web-components.js
diff --git a/inst/components/dist/web-components.min.js b/inst/components/dist/web-components.min.js
diff --git a/inst/examples-shiny/card/app.R b/inst/examples-shiny/card/app.R
@@ -72,6 +72,7 @@ main_grid <- layout_column_wrap(
       card_body(card_image(
         file = "www/shiny-hex.svg",
         height = 200,
+        fill = TRUE,
         href = "https://github.com/rstudio/shiny"
       ))
     ),

diff --git a/man/as_fill_carrier.Rd b/man/as_fill_carrier.Rd
diff --git a/man/bs_dependency.Rd b/man/bs_dependency.Rd
diff --git a/man/nav-items.Rd b/man/nav-items.Rd
diff --git a/man/navset.Rd b/man/navset.Rd
diff --git a/man/page_navbar.Rd b/man/page_navbar.Rd
diff --git a/man/popover.Rd b/man/popover.Rd
diff --git a/man/save-html.Rd b/man/save-html.Rd
diff --git a/man/tooltip.Rd b/man/tooltip.Rd
diff --git a/revdep/README.md b/revdep/README.md
@@ -1,8 +1,2 @@
 # Revdeps
 
-## Failed to check (1)
-
-|package        |version |error |warning |note |
-|:--------------|:-------|:-----|:-------|:----|
-|multilevelcoda |1.2.3   |1     |        |     |
-
diff --git a/revdep/cran.md b/revdep/cran.md
@@ -1,12 +1,7 @@
 ## revdepcheck results
 
-We checked 60 reverse dependencies, comparing R CMD check results across CRAN and dev versions of this package.
+We checked 67 reverse dependencies, comparing R CMD check results across CRAN and dev versions of this package.
 
  * We saw 0 new problems
- * We failed to check 1 packages
+ * We failed to check 0 packages
 
-Issues with CRAN packages are summarised below.
-
-### Failed to check
-
-* multilevelcoda (NA)
diff --git a/revdep/failures.md b/revdep/failures.md
@@ -1,60 +1 @@
-# multilevelcoda
-
-<details>
-
-* Version: 1.2.3
-* GitHub: https://github.com/florale/multilevelcoda
-* Source code: https://github.com/cran/multilevelcoda
-* Date/Publication: 2024-03-10 23:00:03 UTC
-* Number of recursive dependencies: 160
-
-Run `revdepcheck::cloud_details(, "multilevelcoda")` for more info
-
-</details>
-
-## In both
-
-*   checking whether package ‘multilevelcoda’ can be installed ... ERROR
-    ```
-    Installation failed.
-    See ‘/tmp/workdir/multilevelcoda/new/multilevelcoda.Rcheck/00install.out’ for details.
-    ```
-
-## Installation
-
-### Devel
-
-```
-* installing *source* package ‘multilevelcoda’ ...
-** package ‘multilevelcoda’ successfully unpacked and MD5 sums checked
-** using staged installation
-** R
-** data
-*** moving datasets to lazyload DB
-** inst
-** byte-compile and prepare package for lazy loading
-Error: object ‘launch_shinystan’ is not exported by 'namespace:brms'
-Execution halted
-ERROR: lazy loading failed for package ‘multilevelcoda’
-* removing ‘/tmp/workdir/multilevelcoda/new/multilevelcoda.Rcheck/multilevelcoda’
-
-
-```
-### CRAN
-
-```
-* installing *source* package ‘multilevelcoda’ ...
-** package ‘multilevelcoda’ successfully unpacked and MD5 sums checked
-** using staged installation
-** R
-** data
-*** moving datasets to lazyload DB
-** inst
-** byte-compile and prepare package for lazy loading
-Error: object ‘launch_shinystan’ is not exported by 'namespace:brms'
-Execution halted
-ERROR: lazy loading failed for package ‘multilevelcoda’
-* removing ‘/tmp/workdir/multilevelcoda/old/multilevelcoda.Rcheck/multilevelcoda’
-
-
-```
+*Wow, no problems at all. :)*