Merge branch 'main' into fix-issue-2013

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)
-
 * Fixed `set()` method of `InputSelectize` controller so it clears existing selections before applying new values. (#2024)
 
 

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),

shiny/ui/_input_update.py

@@ -71,7 +71,7 @@
 def update_action_button(
     id: str,
     *,
-    label: Optional[str] = None,
+    label: Optional[TagChild] = None,
     icon: TagChild = None,
     disabled: Optional[bool] = None,
     session: Optional[Session] = None,
@@ -104,11 +104,9 @@ def update_action_button(
     """
 
     session = require_active_session(session)
-    # TODO: supporting a TagChild for label would require changes to shiny.js
-    # https://github.com/rstudio/shiny/issues/1140
     msg = {
-        "label": label,
-        "icon": session._process_ui(icon)["html"] if icon else None,
+        "label": session._process_ui(label) if label is not None else None,
+        "icon": session._process_ui(icon) if icon is not None else None,
         "disabled": disabled,
     }
     session.send_input_message(id, drop_none(msg))
@@ -119,7 +117,7 @@ def update_action_button(
 def update_action_link(
     id: str,
     *,
-    label: Optional[str] = None,
+    label: Optional[TagChild] = None,
     icon: TagChild = None,
     session: Optional[Session] = None,
 ) -> None:
@@ -148,11 +146,9 @@ def update_action_link(
     """
 
     session = require_active_session(session)
-    # TODO: supporting a TagChild for label would require changes to shiny.js
-    # https://github.com/rstudio/shiny/issues/1140
     msg = {
-        "label": label,
-        "icon": session._process_ui(icon)["html"] if icon else None,
+        "label": session._process_ui(label) if label is not None else None,
+        "icon": session._process_ui(icon) if icon is not None else None,
     }
     session.send_input_message(id, drop_none(msg))
 
@@ -229,7 +225,7 @@ def callback() -> None:
 def update_checkbox(
     id: str,
     *,
-    label: Optional[str] = None,
+    label: Optional[TagChild] = None,
     value: Optional[bool] = None,
     session: Optional[Session] = None,
 ) -> None:
@@ -258,7 +254,10 @@ def update_checkbox(
     """
 
     session = require_active_session(session)
-    msg = {"label": label, "value": value}
+    msg = {
+        "label": session._process_ui(label) if label is not None else None,
+        "value": value,
+    }
     session.send_input_message(id, drop_none(msg))
 
 
@@ -267,7 +266,7 @@ def update_checkbox(
 def update_switch(
     id: str,
     *,
-    label: Optional[str] = None,
+    label: Optional[TagChild] = None,
     value: Optional[bool] = None,
     session: Optional[Session] = None,
 ) -> None:
@@ -296,7 +295,10 @@ def update_switch(
     """
 
     session = require_active_session(session)
-    msg = {"label": label, "value": value}
+    msg = {
+        "label": session._process_ui(label) if label is not None else None,
+        "value": value,
+    }
     session.send_input_message(id, drop_none(msg))
 
 
@@ -305,7 +307,7 @@ def update_switch(
 def update_checkbox_group(
     id: str,
     *,
-    label: Optional[str] = None,
+    label: Optional[TagChild] = None,
     choices: Optional[ChoicesArg] = None,
     selected: Optional[str | list[str] | tuple[str, ...]] = None,
     inline: bool = False,
@@ -357,7 +359,7 @@ def update_checkbox_group(
 def update_radio_buttons(
     id: str,
     *,
-    label: Optional[str] = None,
+    label: Optional[TagChild] = None,
     choices: Optional[ChoicesArg] = None,
     selected: Optional[str] = None,
     inline: bool = False,
@@ -408,7 +410,7 @@ def _update_choice_input(
     id: str,
     *,
     type: Literal["checkbox", "radio"],
-    label: Optional[str] = None,
+    label: Optional[TagChild] = None,
     choices: Optional[ChoicesArg] = None,
     selected: Optional[str | list[str] | tuple[str, ...]] = None,
     inline: bool = False,
@@ -429,7 +431,11 @@ def _update_choice_input(
             inline=inline,
         )
         options = session._process_ui(opts)["html"]
-    msg = {"label": label, "options": options, "value": selected}
+    msg = {
+        "label": session._process_ui(label) if label is not None else None,
+        "options": options,
+        "value": selected,
+    }
     session.send_input_message(id, drop_none(msg))
 
 
@@ -441,7 +447,7 @@ def _update_choice_input(
 def update_date(
     id: str,
     *,
-    label: Optional[str] = None,
+    label: Optional[TagChild] = None,
     value: Optional[date | str] = None,
     min: Optional[date | str] = None,
     max: Optional[date | str] = None,
@@ -478,7 +484,7 @@ def update_date(
 
     session = require_active_session(session)
     msg = {
-        "label": label,
+        "label": session._process_ui(label) if label is not None else None,
         "value": _as_date_attr(value),
         "min": _as_date_attr(min),
         "max": _as_date_attr(max),
@@ -491,7 +497,7 @@ def update_date(
 def update_date_range(
     id: str,
     *,
-    label: Optional[str] = None,
+    label: Optional[TagChild] = None,
     start: Optional[date | str] = None,
     end: Optional[date | str] = None,
     min: Optional[date | str] = None,
@@ -535,7 +541,7 @@ def update_date_range(
     session = require_active_session(session)
     value = {"start": _as_date_attr(start), "end": _as_date_attr(end)}
     msg = {
-        "label": label,
+        "label": session._process_ui(label) if label is not None else None,
         "value": drop_none(value),
         "min": _as_date_attr(min),
         "max": _as_date_attr(max),
@@ -551,7 +557,7 @@ def update_date_range(
 def update_numeric(
     id: str,
     *,
-    label: Optional[str] = None,
+    label: Optional[TagChild] = None,
     value: Optional[float] = None,
     min: Optional[float] = None,
     max: Optional[float] = None,
@@ -589,7 +595,7 @@ def update_numeric(
 
     session = require_active_session(session)
     msg = {
-        "label": label,
+        "label": session._process_ui(label) if label is not None else None,
         "value": value,
         "min": min,
         "max": max,
@@ -606,7 +612,7 @@ def update_numeric(
 def update_select(
     id: str,
     *,
-    label: Optional[str] = None,
+    label: Optional[TagChild] = None,
     choices: Optional[SelectChoicesArg] = None,
     selected: Optional[str | list[str]] = None,
     session: Optional[Session] = None,
@@ -652,12 +658,10 @@ def update_select(
         options = None
     else:
         option_tags = _render_choices(_normalize_choices(choices), selected)
-        # Typing problem due to a bug in pylance:
-        # https://github.com/microsoft/pylance-release/issues/2377
-        options = session._process_ui(option_tags)["html"]  # type: ignore
+        options = session._process_ui(option_tags)["html"]
 
     msg = {
-        "label": label,
+        "label": session._process_ui(label) if label is not None else None,
         "options": options,
         "value": selected_values,
     }
@@ -675,7 +679,7 @@ class FlatSelectChoice(TypedDict):
 def update_selectize(
     id: str,
     *,
-    label: Optional[str] = None,
+    label: Optional[TagChild] = None,
     choices: Optional[SelectChoicesArg] = None,
     selected: Optional[str | list[str]] = None,
     options: Optional[dict[str, str | float | JSEval]] = None,
@@ -854,7 +858,7 @@ def selectize_choices_json(request: Request) -> Response:
 def update_slider(
     id: str,
     *,
-    label: Optional[str] = None,
+    label: Optional[TagChild] = None,
     value: Optional[SliderValueArg | tuple[SliderValueArg, SliderValueArg]] = None,
     min: Optional[SliderValueArg] = None,
     max: Optional[SliderValueArg] = None,
@@ -928,7 +932,7 @@ def update_slider(
         value_num = None
 
     msg = {
-        "label": label,
+        "label": session._process_ui(label) if label is not None else None,
         "value": value_num,
         "min": min_num,
         "max": max_num,
@@ -948,7 +952,7 @@ def update_slider(
 def update_text(
     id: str,
     *,
-    label: Optional[str] = None,
+    label: Optional[TagChild] = None,
     value: Optional[str] = None,
     placeholder: Optional[str] = None,
     session: Optional[Session] = None,
@@ -980,7 +984,11 @@ def update_text(
     """
 
     session = require_active_session(session)
-    msg = {"label": label, "value": value, "placeholder": placeholder}
+    msg = {
+        "label": session._process_ui(label) if label is not None else None,
+        "value": value,
+        "placeholder": placeholder,
+    }
     session.send_input_message(id, drop_none(msg))