Merge branch 'main' into feat/readme-porting-from-bslib

Author: gadenbuie

CHANGELOG.md

@@ -17,6 +17,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 * Fixed `ui.tooltip()`'s `options` parameter to properly pass Bootstrap tooltip options to the underlying web component. (#2101)
 
+* Fixed an issue where `session.bookmark()` would error when non-existent `input` values are read. (#2117)
+
+* Revised `accordion()`'s `open` logic to close all panels when an empty list is passed. (#2109)
+
 ## [1.5.0] - 2025-09-11
 
 ### New features

shiny/express/ui/_cm_components.py

@@ -9,7 +9,7 @@
 from ... import ui
 from ..._deprecated import warn_deprecated
 from ..._docstring import add_example, no_example
-from ...types import DEPRECATED, MISSING, MISSING_TYPE
+from ...types import DEPRECATED, MISSING, MISSING_TYPE, ListOrTuple
 from ...ui._accordion import AccordionPanel
 from ...ui._card import CardItem
 from ...ui._layout_columns import BreakpointsUser
@@ -649,7 +649,7 @@ def card_footer(
 def accordion(
     *,
     id: Optional[str] = None,
-    open: Optional[bool | str | list[str]] = None,
+    open: Optional[bool | str | ListOrTuple[str]] = None,
     multiple: bool = True,
     class_: Optional[str] = None,
     width: Optional[CssUnit] = None,
@@ -669,11 +669,12 @@ def accordion(
         value will correspond to the :func:`~shiny.ui.accordion_panel`'s
         `value` argument.
     open
-        A list of :func:`~shiny.ui.accordion_panel` values to open (i.e.,
-        show) by default. The default value of `None` will open the first
-        :func:`~shiny.ui.accordion_panel`. Use a value of `True` to open
-        all (or `False` to open none) of the items. It's only possible to open more than
-        one panel when `multiple=True`.
+        A `str` or list of `str` naming the :func:`~shiny.ui.accordion_panel`
+        value(s) to open (i.e., show) by default. (An empty list closes all panels.)
+        The default value of `None` will open the first
+        :func:`~shiny.ui.accordion_panel`. Use a value of `True` to open all (or `False`
+        to open none) of the items. It's only possible to open more than one panel when
+        `multiple=True`.
     multiple
         Whether multiple :func:`~shiny.ui.accordion_panel` can be open at
         once.

shiny/session/_session.py

@@ -1477,7 +1477,11 @@ async def _serialize(
                     continue
                 if key in exclude_set:
                     continue
-                val = value()
+
+                try:
+                    val = value()
+                except SilentException:
+                    continue
 
                 # Possibly apply custom serialization given the input id
                 serializer = self._serializers.get(key, serializer_default)

shiny/ui/_accordion.py

@@ -9,7 +9,7 @@
 from .._utils import drop_none, private_random_id
 from ..bookmark import restore_input
 from ..session import require_active_session
-from ..types import MISSING, MISSING_TYPE
+from ..types import MISSING, MISSING_TYPE, ListOrTuple
 from ._html_deps_shinyverse import components_dependencies
 from ._tag import consolidate_attrs
 from .css._css_unit import CssUnit, as_css_unit
@@ -176,7 +176,7 @@ def tagify(self) -> Tag:
 def accordion(
     *args: AccordionPanel | TagAttrs,
     id: Optional[str] = None,
-    open: Optional[bool | str | list[str]] = None,
+    open: Optional[bool | str | ListOrTuple[str]] = None,
     multiple: bool = True,
     class_: Optional[str] = None,
     width: Optional[CssUnit] = None,
@@ -198,11 +198,12 @@ def accordion(
         value will correspond to the :func:`~shiny.ui.accordion_panel`'s
         `value` argument.
     open
-        A list of :func:`~shiny.ui.accordion_panel` values to open (i.e.,
-        show) by default. The default value of `None` will open the first
-        :func:`~shiny.ui.accordion_panel`. Use a value of `True` to open
-        all (or `False` to open none) of the items. It's only possible to open more than
-        one panel when `multiple=True`.
+        A `str` or list of `str` naming the :func:`~shiny.ui.accordion_panel`
+        value(s) to open (i.e., show) by default. (An empty list closes all panels.)
+        The default value of `None` will open the first
+        :func:`~shiny.ui.accordion_panel`. Use a value of `True` to open all (or `False`
+        to open none) of the items. It's only possible to open more than one panel when
+        `multiple=True`.
     multiple
         Whether multiple :func:`~shiny.ui.accordion_panel` can be open at
         once.
@@ -259,21 +260,19 @@ def accordion(
     )
     open = restore_input(accordion_id, open)
 
-    is_open: list[bool] = []
-    if open is None:
-        is_open = [False for _ in panels]
+    is_open: list[bool]
+    if has_restored_input and open is None:
+        # None from restore_input indicates all panels closed
+        is_open = [False] * len(panels)
+    elif open is None:
+        # otherwise None indicates default behavior (open first panel)
+        is_open = [i == 0 for i in range(len(panels))]
     elif isinstance(open, bool):
-        is_open = [open for _ in panels]
+        is_open = [open] * len(panels)
     else:
-        if not isinstance(open, list):
-            open = [open]
-        #
-        is_open = [panel._data_value in open for panel in panels]
-
-    if not has_restored_input:
-        # Open the first panel by default
-        if open is not False and len(is_open) > 0 and not any(is_open):
-            is_open[0] = True
+        # str | ListOrTuple[str] -> set
+        open_set = {open} if isinstance(open, str) else set(open)
+        is_open = [panel._data_value in open_set for panel in panels]
 
     if (not multiple) and sum(is_open) > 1:
         raise ValueError("Can't select more than one panel when `multiple = False`")
@@ -384,11 +383,11 @@ def _accordion_panel_action(
     *,
     id: str,
     method: str,
-    values: bool | str | list[str],
+    values: bool | str | ListOrTuple[str],
     session: Session | None,
 ) -> None:
     if not isinstance(values, bool):
-        if not isinstance(values, list):
+        if not isinstance(values, (list, tuple)):
             values = [values]
         _assert_list_str(values)
 
@@ -404,7 +403,7 @@ def _accordion_panel_action(
 def update_accordion(
     id: str,
     *,
-    show: bool | str | list[str],
+    show: bool | str | ListOrTuple[str],
     session: Optional[Session] = None,
 ) -> None:
     """
@@ -502,7 +501,7 @@ def insert_accordion_panel(
 @add_example()
 def remove_accordion_panel(
     id: str,
-    target: str | list[str],
+    target: str | ListOrTuple[str],
     session: Optional[Session] = None,
 ) -> None:
     """
@@ -513,7 +512,8 @@ def remove_accordion_panel(
     id
         A string that matches an existing :func:`~shiny.ui.accordion`'s `id`.
     target
-        The `value` of an existing panel to remove.
+        A string or list of strings used to identify particular
+        :func:`~shiny.ui.accordion_panel`(s) by their `value`.
     session
         A Shiny session object (the default should almost always be used).
 
@@ -529,7 +529,7 @@ def remove_accordion_panel(
     * :func:`~shiny.ui.insert_accordion_panel`
     * :func:`~shiny.ui.update_accordion_panel`
     """
-    if not isinstance(target, list):
+    if not isinstance(target, (list, tuple)):
         target = [target]
 
     _send_panel_message(
@@ -632,8 +632,8 @@ def _assert_str(x: str) -> str:
     return x
 
 
-def _assert_list_str(x: list[str]) -> list[str]:
-    if not isinstance(x, list):
+def _assert_list_str(x: ListOrTuple[str]) -> ListOrTuple[str]:
+    if not isinstance(x, (list, tuple)):
         raise TypeError(f"Expected list, got {type(x)}")
     for i, x_i in enumerate(x):
         if not isinstance(x_i, str):

tests/playwright/shiny/bookmark/modal/app.py

@@ -9,12 +9,19 @@ def app_ui(request: Request):
     )
 
 
-def server(input: Inputs, ouput: Outputs, session: Session):
+def server(input: Inputs, output: Outputs, session: Session):
 
     @reactive.effect
     @reactive.event(input.letter, ignore_init=True)
     async def _():
         await session.bookmark()
 
+    # Just to make sure that missing inputs don't break bookmarking
+    # behavior (https://github.com/posit-dev/py-shiny/pull/2117)
+    @reactive.effect
+    @reactive.event(input.non_existent_input)
+    def _():
+        pass
+
 
 app = App(app_ui, server, bookmark_store="url")

tests/playwright/shiny/bookmark/modal/test_bookmark_modal.py

@@ -19,3 +19,4 @@ def test_bookmark_modules(page: Page, local_app: ShinyAppProc):
     )
 
     assert "?" not in page.url
+    assert "An error has occurred" not in page.inner_text("body")

tests/playwright/shiny/components/selectize/test_selectize.py

@@ -1,10 +1,12 @@
 # import pytest
 from playwright.sync_api import Page, expect
+from utils.deploy_utils import skip_if_not_chrome
 
 from shiny.playwright import controller
 from shiny.run import ShinyAppProc
 
 
+@skip_if_not_chrome  # trouble with firefox. ??
 def test_selectize(page: Page, local_app: ShinyAppProc) -> None:
     page.goto(local_app.url)