Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: sync with R versions of shiny, bslib, htmltools #1266

Merged
merged 5 commits into from
Mar 29, 2024
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

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

* `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)
* `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)

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

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

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

* Unwanted double padding is also removed for items in `ui.panel_conditional()` the parent container uses `gap` for spacing multiple elements (e.g., when used in `ui.layout_columns()`, `ui.page_fillable()`, etc). (#1266)

* Error messages now use `var(--bs-danger)` instead of `var(--bs-danger-text-emphasis)` for the text color. (#1266)

### Other changes

* 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)
Expand Down
6 changes: 3 additions & 3 deletions shiny/_versions.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
shiny_html_deps = "1.8.0.9000"
bslib = "0.6.1.9001"
htmltools = "0.5.7.9000"
shiny_html_deps = "1.8.1.9000"
bslib = "0.6.2.9000"
htmltools = "0.5.8.9000"
bootstrap = "5.3.1"
requirejs = "2.3.6"

Expand Down
4 changes: 2 additions & 2 deletions shiny/ui/_card.py
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,8 @@ def card(
Additional CSS classes for the returned Tag.
id
Provide a unique identifier for the :func:`~shiny.ui.card` or to report its
state to Shiny. For example, using `id="my_card"`, you can observe the card's
full screen state with `input.my_card()["full_screen"]`.
full screen state to Shiny. For example, using `id="my_card"`, you can observe
the card's full screen state with `input.my_card_full_screen()`.
**kwargs
HTML attributes on the returned Tag.

Expand Down
2 changes: 1 addition & 1 deletion shiny/www/shared/_version.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"note!": "This file is auto-generated by scripts/htmlDependencies.R",
"package": "shiny",
"version": "Github (rstudio/shiny@ae308e03adcb040756ac5d13c76b50244216173d)"
"version": "Github (rstudio/shiny@47526a769a741d3f9ad1530362f64c6509ed19a2)"
}
6 changes: 3 additions & 3 deletions shiny/www/shared/bootstrap/_version.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"note!": "This file is auto-generated by scripts/htmlDependencies.R",
"shiny_version": "Github (rstudio/shiny@ae308e03adcb040756ac5d13c76b50244216173d)",
"bslib_version": "Github (rstudio/bslib@2ec3067eb20fcdcd25260a8ee7ec6a7607839429)",
"htmltools_version": "Github (rstudio/htmltools@f8e059157c3de6f03bf8d8dcebcaff531bc97fd4)",
"shiny_version": "Github (rstudio/shiny@47526a769a741d3f9ad1530362f64c6509ed19a2)",
"bslib_version": "Github (rstudio/bslib@5e974fdfc304c01934e722d378a31843cd0b7d3e)",
"htmltools_version": "Github (rstudio/htmltools@038ef7be3b02a9248f122b745ad7830cc429d437)",
"bootstrap_version": "5.3.1"
}
2 changes: 1 addition & 1 deletion shiny/www/shared/bootstrap/bootstrap.min.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion shiny/www/shared/bslib/_version.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"note!": "This file is auto-generated by scripts/htmlDependencies.R",
"package": "bslib",
"version": "Github (rstudio/bslib@2ec3067eb20fcdcd25260a8ee7ec6a7607839429)"
"version": "Github (rstudio/bslib@5e974fdfc304c01934e722d378a31843cd0b7d3e)"
}
4 changes: 2 additions & 2 deletions shiny/www/shared/bslib/components/components.min.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions shiny/www/shared/bslib/components/components.min.js.map

Large diffs are not rendered by default.

16 changes: 8 additions & 8 deletions shiny/www/shared/bslib/components/web-components.min.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions shiny/www/shared/bslib/components/web-components.min.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion shiny/www/shared/htmltools/_version.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"note!": "This file is auto-generated by scripts/htmlDependencies.R",
"package": "htmltools",
"version": "Github (rstudio/htmltools@f8e059157c3de6f03bf8d8dcebcaff531bc97fd4)"
"version": "Github (rstudio/htmltools@038ef7be3b02a9248f122b745ad7830cc429d437)"
}
2 changes: 1 addition & 1 deletion shiny/www/shared/shiny-autoreload.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion shiny/www/shared/shiny-showcase.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion shiny/www/shared/shiny-showcase.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion shiny/www/shared/shiny-testmode.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions shiny/www/shared/shiny.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*! shiny 1.8.0.9000 | (c) 2012-2024 RStudio, PBC. | License: GPL-3 | file LICENSE */
/*! shiny 1.8.1.9000 | (c) 2012-2024 RStudio, PBC. | License: GPL-3 | file LICENSE */
"use strict";
(function() {
var __create = Object.create;
Expand Down Expand Up @@ -25106,7 +25106,7 @@
var windowShiny2;
function setShiny(windowShiny_) {
windowShiny2 = windowShiny_;
windowShiny2.version = "1.8.0.9000";
windowShiny2.version = "1.8.1.9000";
var _initInputBindings = initInputBindings(), inputBindings = _initInputBindings.inputBindings, fileInputBinding2 = _initInputBindings.fileInputBinding;
var _initOutputBindings = initOutputBindings(), outputBindings = _initOutputBindings.outputBindings;
setFileInputBinding(fileInputBinding2);
Expand Down
Loading
Loading