Merge branch 'main' into run-py-shiny-template-tests

Author: karangattu

CHANGELOG.md

@@ -9,20 +9,28 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### New features
 
+* `ui.sidebar()` is now interactively resizable. (#2020)
+
+* `ui.update_*()` functions now accept `ui.TagChild` (i.e., HTML) as input to the `label` and `icon` arguments. (#2020)
+
+* `playwright.controller.InputActionButton` gains a `expect_icon()` method. As a result, the already existing `expect_label()` no longer includes the icon. (#2020)
+
 ### Improvements
 
+* Improved the styling and readability of markdown tables rendered by `ui.Chat()` and `ui.MarkdownStream()`. (#1973)
+
 * `selectize`, `remove_button`, and `options` parameters of `ui.input_select()` have been deprecated; use `ui.input_selectize()` instead. (Thanks, @ErdaradunGaztea!) (#1947)
 
-* Improved the styling and readability of markdown tables rendered by `ui.Chat()` and `ui.MarkdownStream()`. (#1973)
+* Added `timeout_secs` parameter to `create_app_fixture` to allow testing apps with longer startup times. (#2033)
 
 ### Bug fixes
 
+* Fixed an issue with `ui.Chat()` sometimes wanting to scroll a parent element. (#1996)
+
 * Explicitly call out module usage in UI input bookmark button documentation. (#1983)
 
 * Fix missing session when trying to display an error duing bookmarking. (#1984)
 
-* Fixed an issue with `ui.Chat()` sometimes wanting to scroll a parent element. (#1996)
-
 
 ## [1.4.0] - 2025-04-08
 
@@ -50,6 +58,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Bug fixes
 
+* Fixed issue where apps run in Workbench were unexpectedly crashing. Apps running in Workbench will now have `ws_per_message_deflate=False` enforced. (#2005)
+
 * Fixed an issue where the `<main>` areas of `ui.page_sidebar()` and `ui.page_navbar()` (with a `sidebar`) were made to be a fillable containers even when `fillable=False`. (#1816)
 
 * Fixed an issue where the `.update_user_input()` method on `ui.Chat()` isn't working in shinylive.  (#1891)

js/markdown-stream/markdown-stream.ts

@@ -284,7 +284,7 @@ class MarkdownElement extends LightElement {
     while (el) {
       if (el.scrollHeight > el.clientHeight) return el;
       el = el.parentElement;
-      if (el?.tagName === CHAT_CONTAINER_TAG) {
+      if (el?.tagName?.toLowerCase() === CHAT_CONTAINER_TAG.toLowerCase()) {
         // This ensures that we do not accidentally scroll a parent element of the chat
         // container. If the chat container itself is scrollable, a scrollable element
         // would already have been identified.

shiny/_main.py

@@ -9,6 +9,7 @@
 import re
 import sys
 import types
+import warnings
 from pathlib import Path
 from typing import Any, Optional
 
@@ -20,6 +21,7 @@
 
 from . import __version__, _autoreload, _hostenv, _static, _utils
 from ._docstring import no_example
+from ._hostenv import is_workbench
 from ._typing_extensions import NotRequired, TypedDict
 from .bookmark._bookmark_state import shiny_bookmarks_folder_name
 from .express import is_express_app
@@ -399,6 +401,8 @@ def run_app(
 
     maybe_setup_rsw_proxying(log_config)
 
+    _set_workbench_kwargs(kwargs)
+
     uvicorn.run(  # pyright: ignore[reportUnknownMemberType]
         app,
         host=host,
@@ -713,6 +717,18 @@ class ReloadArgs(TypedDict):
     reload_dirs: NotRequired[list[str]]
 
 
+def _set_workbench_kwargs(kwargs: dict[str, Any]) -> None:
+    if is_workbench():
+        if kwargs.get("ws_per_message_deflate"):
+            # Workaround for nginx/uvicorn issue within Workbench
+            # https://github.com/rstudio/rstudio-pro/issues/7368#issuecomment-2918016088
+            warnings.warn(
+                "Overwriting kwarg `ws_per_message_deflate=True` to `False` to avoid breaking issue in Workbench",
+                stacklevel=2,
+            )
+        kwargs["ws_per_message_deflate"] = False
+
+
 # Check that the version of rsconnect supports Shiny Express; can be removed in the
 # future once this version of rsconnect is widely used. The dependency on "packaging"
 # can also be removed then, because it is only used here. (Added 2024-03)

shiny/_versions.py

@@ -1,4 +1,4 @@
-shiny_html_deps = "1.10.0.9001"
+shiny_html_deps = "1.11.1.9000"
 bslib = "0.9.0.9000"
 htmltools = "0.5.8.9000"
 bootstrap = "5.3.1"

shiny/playwright/controller/_base.py

@@ -451,8 +451,6 @@ def expect_label(
         """
         Expect the label of the input button to have a specific value.
 
-        Note: This must include the icon if it is present!
-
         Parameters
         ----------
         value
@@ -461,7 +459,28 @@ def expect_label(
             The maximum time to wait for the expectation to be fulfilled. Defaults to `None`.
         """
 
-        self.expect.to_have_text(value, timeout=timeout)
+        loc_label = self.loc.locator(".action-label")
+        playwright_expect(loc_label).to_have_text(value, timeout=timeout)
+
+    def expect_icon(
+        self,
+        value: PatternOrStr,
+        *,
+        timeout: Timeout = None,
+    ) -> None:
+        """
+        Expect the icon of the input button to have a specific value.
+
+        Parameters
+        ----------
+        value
+            The expected value of the icon.
+        timeout
+            The maximum time to wait for the expectation to be fulfilled. Defaults to `None`.
+        """
+
+        loc_icon = self.loc.locator(".action-icon")
+        playwright_expect(loc_icon).to_have_text(value, timeout=timeout)
 
     def click(self, *, timeout: Timeout = None, **kwargs: object) -> None:
         """

shiny/pytest/_fixture.py

@@ -36,6 +36,7 @@
 def create_app_fixture(
     app: PurePath | str | list[PurePath | str],
     scope: ScopeName = "module",
+    timeout_secs: float = 30,
 ):
     """
     Create a fixture for a local Shiny app directory.
@@ -70,6 +71,8 @@ def create_app_fixture(
         will be created once per module. See [Pytest fixture
         scopes](https://docs.pytest.org/en/stable/how-to/fixtures.html#fixture-scopes)
         for more details.
+    timeout_secs
+        The maximum number of seconds to wait for the app to become ready.
 
     Returns
     -------
@@ -133,7 +136,7 @@ def get_app_path(request: pytest.FixtureRequest, app: PurePath | str):
         @pytest.fixture(scope=scope, params=app)
         def fixture_func(request: pytest.FixtureRequest):
             app_path = get_app_path(request, request.param)
-            sa_gen = shiny_app_gen(app_path)
+            sa_gen = shiny_app_gen(app_path, timeout_secs=timeout_secs)
             yield next(sa_gen)
 
     else:
@@ -142,7 +145,7 @@ def fixture_func(request: pytest.FixtureRequest):
         @pytest.fixture(scope=scope)
         def fixture_func(request: pytest.FixtureRequest):
             app_path = get_app_path(request, app)
-            sa_gen = shiny_app_gen(app_path)
+            sa_gen = shiny_app_gen(app_path, timeout_secs=timeout_secs)
             yield next(sa_gen)
 
     return fixture_func

shiny/ui/_input_action_button.py

@@ -61,10 +61,15 @@ def input_action_button(
     if "_add_ws" not in kwargs:
         kwargs["_add_ws"] = True
 
+    if icon is not None:
+        icon = tags.span(icon, class_="action-icon")
+
+    if label is not None:
+        label = tags.span(label, class_="action-label")
+
     return tags.button(
         {"class": "btn btn-default action-button", "style": css(width=width)},
         icon,
-        None if icon is None else " ",
         label,
         id=resolve_id(id),
         type="button",
@@ -114,8 +119,14 @@ def input_action_link(
     * :func:`~shiny.reactive.event`
     """
 
+    if icon is not None:
+        icon = tags.span(icon, class_="action-icon")
+
+    if label is not None:
+        label = tags.span(label, class_="action-label")
+
     return tags.a(
-        {"class": "action-button"},
+        {"class": "action-button action-link"},
         icon,
         label,
         id=resolve_id(id),