Skip to content

Commit f0a8936

Browse files
gadenbuiecpsievert
andauthored
chore: sync with R versions of shiny, bslib, htmltools (#1266)
Co-authored-by: Carson Sievert <[email protected]>
1 parent 6b1dcfb commit f0a8936

21 files changed

+48
-44
lines changed

CHANGELOG.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1919

2020
* Experimental: `@render.data_frame` return values of `DataTable` and `DataGrid` support `mode="edit"` to enable editing of the data table cells. (#1198)
2121

22-
* `ui.card()` and `ui.value_box()` now take an `id` argument that, when provided, is used to report the full screen state of the card or value box to the server. For example, when using `ui.card(id = "my_card", full_screen = TRUE)` you can determine if the card is currently in full screen mode by reading the boolean value of `input.my_card()["full_screen"]`. (#1215)
22+
* `ui.card()` and `ui.value_box()` now take an `id` argument that, when provided, is used to report the full screen state of the card or value box to the server. For example, when using `ui.card(id = "my_card", full_screen = TRUE)` you can determine if the card is currently in full screen mode by reading the boolean value of `input.my_card_full_screen()`. (#1215, #1266)
2323

2424
* Added support for using `shiny.express` in Quarto Dashboards. (#1217)
2525

@@ -41,6 +41,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
4141

4242
* `ui.panel_conditional()` now adds the `.shiny-panel-conditional` class to the `<div>` element wrapping the conditional panel contents. (#1257)
4343

44+
* `ui.panel_conditional()` no longer results in unwanted double padding when the parent container uses `gap` for spacing multiple elements (e.g., when used in `ui.layout_columns()`, `ui.page_fillable()`, etc). (#1266)
45+
46+
* Error messages now use `var(--bs-danger)` instead of `var(--bs-danger-text-emphasis)` for the text color. (#1266)
47+
4448
### Other changes
4549

4650
* The fill CSS used by fillable containers (i.e. when `fillable=True`) now uses a [CSS cascade layer](https://developer.mozilla.org/en-US/docs/Learn/CSS/Building_blocks/Cascade_layers) named `htmltools` to reduce the precedence order of the fill CSS. (#1228)

shiny/_versions.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
shiny_html_deps = "1.8.0.9000"
2-
bslib = "0.6.1.9001"
3-
htmltools = "0.5.7.9000"
1+
shiny_html_deps = "1.8.1.9000"
2+
bslib = "0.6.2.9000"
3+
htmltools = "0.5.8.9000"
44
bootstrap = "5.3.1"
55
requirejs = "2.3.6"
66

shiny/ui/_card.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,8 @@ def card(
8383
Additional CSS classes for the returned Tag.
8484
id
8585
Provide a unique identifier for the :func:`~shiny.ui.card` or to report its
86-
state to Shiny. For example, using `id="my_card"`, you can observe the card's
87-
full screen state with `input.my_card()["full_screen"]`.
86+
full screen state to Shiny. For example, using `id="my_card"`, you can observe
87+
the card's full screen state with `input.my_card_full_screen()`.
8888
**kwargs
8989
HTML attributes on the returned Tag.
9090

shiny/www/shared/_version.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"note!": "This file is auto-generated by scripts/htmlDependencies.R",
33
"package": "shiny",
4-
"version": "Github (rstudio/shiny@ae308e03adcb040756ac5d13c76b50244216173d)"
4+
"version": "Github (rstudio/shiny@47526a769a741d3f9ad1530362f64c6509ed19a2)"
55
}
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"note!": "This file is auto-generated by scripts/htmlDependencies.R",
3-
"shiny_version": "Github (rstudio/shiny@ae308e03adcb040756ac5d13c76b50244216173d)",
4-
"bslib_version": "Github (rstudio/bslib@2ec3067eb20fcdcd25260a8ee7ec6a7607839429)",
5-
"htmltools_version": "Github (rstudio/htmltools@f8e059157c3de6f03bf8d8dcebcaff531bc97fd4)",
3+
"shiny_version": "Github (rstudio/shiny@47526a769a741d3f9ad1530362f64c6509ed19a2)",
4+
"bslib_version": "Github (rstudio/bslib@5e974fdfc304c01934e722d378a31843cd0b7d3e)",
5+
"htmltools_version": "Github (rstudio/htmltools@038ef7be3b02a9248f122b745ad7830cc429d437)",
66
"bootstrap_version": "5.3.1"
77
}

shiny/www/shared/bootstrap/bootstrap.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"note!": "This file is auto-generated by scripts/htmlDependencies.R",
33
"package": "bslib",
4-
"version": "Github (rstudio/bslib@2ec3067eb20fcdcd25260a8ee7ec6a7607839429)"
4+
"version": "Github (rstudio/bslib@5e974fdfc304c01934e722d378a31843cd0b7d3e)"
55
}

shiny/www/shared/bslib/components/components.min.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

shiny/www/shared/bslib/components/components.min.js.map

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

shiny/www/shared/bslib/components/web-components.min.js

Lines changed: 8 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)