Skip to content

Commit 95cdc59

Browse files
authored
Merge branch 'main' into feat/current_output_id
2 parents 1a9ed7f + 82a83ee commit 95cdc59

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+341
-255
lines changed

.github/workflows/deploy-tests.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ jobs:
109109
- name: Deploy apps and run tests (on `push` or `deploy**` branches)
110110
env:
111111
DEPLOY_APPS: "true"
112-
DEPLOY_CONNECT_SERVER_URL: "${{ (matrix.config.released_connect_server && 'https://connect.posit.it/') || 'https://rsc.radixu.com/' }}"
112+
DEPLOY_CONNECT_SERVER_URL: "${{ (matrix.config.released_connect_server && 'https://connect.posit.it/') || 'https://dogfood.team.pct.posit.it/' }}"
113113
DEPLOY_CONNECT_SERVER_API_KEY: "${{ (matrix.config.released_connect_server && secrets.DEPLOY_CONNECT_POSIT_SERVER_API_KEY) || secrets.DEPLOY_CONNECT_SERVER_API_KEY }}"
114114
DEPLOY_SHINYAPPS_NAME: "${{ matrix.config.test_shinyappsio && secrets.DEPLOY_SHINYAPPS_NAME }}"
115115
DEPLOY_SHINYAPPS_TOKEN: "${{ matrix.config.test_shinyappsio && secrets.DEPLOY_SHINYAPPS_TOKEN }}"

CHANGELOG.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1313

1414
### Improvements
1515

16+
* `selectize`, `remove_button`, and `options` parameters of `ui.input_select()` have been deprecated; use `ui.input_selectize()` instead. (Thanks, @ErdaradunGaztea!) (#1947)
17+
1618
* Improved the styling and readability of markdown tables rendered by `ui.Chat()` and `ui.MarkdownStream()`. (#1973)
1719

20+
### Bug fixes
21+
22+
* Explicitly call out module usage in UI input bookmark button documentation. (#1983)
23+
24+
* Fix missing session when trying to display an error duing bookmarking. (#1984)
25+
26+
1827
## [1.4.0] - 2025-04-08
1928

2029
### New features

js/build.ts

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -93,11 +93,6 @@ const opts: Array<BuildOptions> = [
9393
entryPoints: { "data-frame/data-frame": "data-frame/index.tsx" },
9494
plugins: [sassPlugin({ type: "css-text", sourceMap: false })],
9595
},
96-
{
97-
entryPoints: {
98-
"text-area/textarea-autoresize": "text-area/textarea-autoresize.ts",
99-
},
100-
},
10196
{
10297
entryPoints: {
10398
"page-output/page-output": "page-output/page-output.ts",

js/text-area/textarea-autoresize.css

Lines changed: 0 additions & 6 deletions
This file was deleted.

js/text-area/textarea-autoresize.ts

Lines changed: 0 additions & 86 deletions
This file was deleted.

scripts/_pkg-sources.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
list(
2-
bslib = "rstudio/bslib@fix/page-main-container-fillable",
2+
bslib = "rstudio/bslib@main",
33
shiny = "rstudio/shiny@main",
44
sass = "sass",
55
htmltools = "rstudio/htmltools@main"

shiny/_versions.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
shiny_html_deps = "1.10.0.9000"
1+
shiny_html_deps = "1.10.0.9001"
22
bslib = "0.9.0.9000"
33
htmltools = "0.5.8.9000"
44
bootstrap = "5.3.1"

shiny/api-examples/Module/app-core.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ def counter_ui(label: str = "Increment counter") -> ui.TagChild:
99
return ui.card(
1010
ui.h2("This is " + label),
1111
ui.input_action_button(id="button", label=label),
12-
ui.output_text_verbatim(id="out"),
12+
ui.output_text(id="out"),
1313
)
1414

1515

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
from shiny import reactive
2+
from shiny.express import module, render, ui
3+
4+
5+
# ============================================================
6+
# Counter module
7+
# ============================================================
8+
@module
9+
def counter(input, output, session, label, starting_value: int = 0):
10+
count = reactive.value(starting_value)
11+
with ui.card():
12+
ui.h2(f"This is {label}")
13+
ui.input_action_button("button", f"{label}")
14+
15+
@render.text
16+
def out():
17+
return f"Click count is {count()}"
18+
19+
@reactive.effect
20+
@reactive.event(input.button)
21+
def _():
22+
count.set(count() + 1)
23+
24+
25+
# =============================================================================
26+
# App that uses module
27+
# =============================================================================
28+
counter("counter1", "Counter 1", starting_value=0)
29+
ui.hr()
30+
counter("counter2", "Counter 2", starting_value=0)

shiny/api-examples/express_module/app-express.py

Lines changed: 0 additions & 25 deletions
This file was deleted.

0 commit comments

Comments
 (0)