pycascadeui 3.3.3__tar.gz → 3.3.4__tar.gz

{pycascadeui-3.3.3/pycascadeui.egg-info → pycascadeui-3.3.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pycascadeui
-Version: 3.3.3
+Version: 3.3.4
 Summary: Redux-inspired UI framework for discord.py
 Author-email: HollowTheSilver <hollow@users.noreply.github.com>
 License-Expression: MIT

{pycascadeui-3.3.3 → pycascadeui-3.3.4}/cascadeui/__init__.py

@@ -147,7 +147,7 @@ if "SQLiteBackend" in _persistence_all:
 # // ========================================( Script )======================================== // #
 
 
-__version__ = "3.3.3"
+__version__ = "3.3.4"
 
 # Export public API
 __all__ = [

{pycascadeui-3.3.3 → pycascadeui-3.3.4}/cascadeui/views/_navigation.py

@@ -395,6 +395,39 @@ class _NavigationMixin:
         # populates the tree post-init.
         new_view._check_placement()
 
+        # Push/pop reuse the parent's Discord message, carried onto
+        # new_view._message in the navigation batch above. That message --
+        # not the acting interaction's -- is the navigation edit target.
+        target_message = new_view._message or self._message
+
+        # The acting interaction normally IS a click on target_message. A
+        # with_confirmation wrapper, though, runs the original callback with
+        # the confirm-button interaction, whose message is the ephemeral
+        # prompt -- a different message. Both interaction-coupled paths below
+        # (response.edit_message and edit_original_response) would then render
+        # the new view onto the prompt and leave target_message stale. When
+        # the interaction carries a message that differs from the view's,
+        # edit target_message directly through the channel endpoint instead.
+        # Interactions with no message (slash commands) keep the
+        # edit_original_response path -- their original response IS the view's
+        # message.
+        interaction_msg_id = getattr(getattr(current_interaction, "message", None), "id", None)
+        if (
+            target_message is not None
+            and interaction_msg_id is not None
+            and interaction_msg_id != target_message.id
+        ):
+            # Ack the foreign interaction so the click does not error
+            # (_safe_defer no-ops when a wrapper already consumed the slot),
+            # then edit the view's own message. refresh() carries the
+            # cooldown/backoff/digest machinery and its own acting-fast-path
+            # gate re-confirms the message match, so it cannot misfire here.
+            await self._safe_defer(current_interaction)
+            if new_view._message is None:
+                new_view._message = target_message
+            await new_view.refresh(**edit_kwargs)
+            return
+
         # Fast path: a component/modal interaction whose response slot is still
         # open edits + acks in one request -- no separate defer round-trip, which
         # was the source of the navigation pause. Bounded at the ack deadline via

{pycascadeui-3.3.3 → pycascadeui-3.3.4}/cascadeui/views/base.py

@@ -1452,6 +1452,17 @@ class _StatefulMixin(_InteractionMixin, _NavigationMixin):
                 parts.append(("t", item.content))
             # Buttons and selects: record the wire-visible attributes.
             elif hasattr(item, "custom_id"):
+                # A select's rendered selection lives in opt.default, which
+                # none of the scalar attributes above capture. set_selected()
+                # mutates exactly that field, so a selection-only rebuild
+                # would otherwise hash identical and refresh() would drop the
+                # re-render. Walk options (string selects only -- auto-populated
+                # UserSelect/RoleSelect/etc. expose no .options, so the getattr
+                # returns None for them and for buttons).
+                options = getattr(item, "options", None)
+                option_state = (
+                    tuple((opt.value, opt.default) for opt in options) if options else None
+                )
                 parts.append(
                     (
                         "i",
@@ -1463,6 +1474,7 @@ class _StatefulMixin(_InteractionMixin, _NavigationMixin):
                         getattr(item, "url", None),
                         getattr(item, "placeholder", None),
                         str(getattr(item, "emoji", None)) if getattr(item, "emoji", None) else None,
+                        option_state,
                     )
                 )
             # Other layout items (Separator, MediaGallery, Thumbnail) do

{pycascadeui-3.3.3 → pycascadeui-3.3.4/pycascadeui.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pycascadeui
-Version: 3.3.3
+Version: 3.3.4
 Summary: Redux-inspired UI framework for discord.py
 Author-email: HollowTheSilver <hollow@users.noreply.github.com>
 License-Expression: MIT

{pycascadeui-3.3.3 → pycascadeui-3.3.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "pycascadeui"
-version = "3.3.3"
+version = "3.3.4"
 description = "Redux-inspired UI framework for discord.py"
 readme = "README.md"
 license = "MIT"

{pycascadeui-3.3.3 → pycascadeui-3.3.4}/tests/test_layout_view.py

@@ -10,7 +10,7 @@ import pytest
 from discord.ui import ActionRow, LayoutView, TextDisplay
 from helpers import make_interaction as _make_interaction
 
-from cascadeui.components.base import StatefulButton
+from cascadeui.components.base import StatefulButton, StatefulSelect
 from cascadeui.state.singleton import get_store
 from cascadeui.state.store import _CURRENT_INTERACTION
 from cascadeui.views.base import _StatefulMixin, _view_class_registry
@@ -764,6 +764,75 @@ class TestRenderHashShortCircuit:
         after = view._compute_tree_digest()
         assert before != after
 
+    def test_digest_reflects_select_selection(self):
+        """A select's rendered selection lives in opt.default, which the
+        scalar wire attributes (placeholder/disabled/...) do not capture.
+        A selection-only rebuild must change the digest, or refresh()
+        short-circuits and the re-render is silently dropped -- the client
+        keeps the stale selection and the next interaction submits stale
+        values.
+        """
+        selected = ["a"]
+
+        def build(view):
+            view.clear_items()
+            view.add_item(
+                ActionRow(
+                    StatefulSelect(
+                        placeholder="Pick",
+                        options=[
+                            discord.SelectOption(
+                                label="A", value="a", default=(selected[0] == "a")
+                            ),
+                            discord.SelectOption(
+                                label="B", value="b", default=(selected[0] == "b")
+                            ),
+                        ],
+                        min_values=0,
+                        max_values=1,
+                    )
+                )
+            )
+
+        view = self._make_view_with_build(build)
+        view.build_ui()
+        before = view._compute_tree_digest()
+
+        selected[0] = "b"
+        view.build_ui()
+        after = view._compute_tree_digest()
+        assert before != after
+
+    def test_digest_reflects_set_selected(self):
+        """set_selected() is the canonical selection-mutation API; it
+        rewrites opt.default in place without rebuilding the component.
+        The digest must reflect the change so the same select object
+        flipped to a new selection re-renders.
+        """
+        select = StatefulSelect(
+            placeholder="Pick",
+            options=[
+                discord.SelectOption(label="A", value="a"),
+                discord.SelectOption(label="B", value="b"),
+            ],
+            min_values=0,
+            max_values=1,
+        )
+
+        def build(view):
+            view.clear_items()
+            view.add_item(ActionRow(select))
+
+        view = self._make_view_with_build(build)
+        select.set_selected("a")
+        view.build_ui()
+        before = view._compute_tree_digest()
+
+        select.set_selected("b")
+        view.build_ui()
+        after = view._compute_tree_digest()
+        assert before != after
+
     async def test_refresh_skips_edit_when_digest_matches(self):
         def build(view):
             view.clear_items()

{pycascadeui-3.3.3 → pycascadeui-3.3.4}/tests/test_navigation.py

@@ -538,6 +538,69 @@ class TestNavigationFastPath:
         nav.edit_original_response.assert_awaited_once()
 
 
+class TestNavigationForeignInteraction:
+    """A with_confirmation wrapper runs the navigation callback with the
+    confirm-button interaction, whose message is the ephemeral prompt --
+    a different message than the view's dashboard. Navigation must edit the
+    view's own message via the channel endpoint, not the foreign prompt."""
+
+    async def test_push_with_foreign_interaction_edits_view_message(self):
+        class _Root(StatefulView):
+            pass
+
+        class _Sub(StatefulView):
+            async def on_state_changed(self, state):
+                pass
+
+        root = _Root(interaction=_make_interaction(user_id=1, guild_id=100))
+        await root.send()
+        # Pin a concrete dashboard message id for the foreign comparison.
+        dashboard = MagicMock(id=555, channel=MagicMock(id=2))
+        dashboard.edit = AsyncMock()
+        root._message = dashboard
+
+        # Confirm-button click on the ephemeral prompt (different message id),
+        # slot already consumed by the prompt edit -- the with_confirmation shape.
+        prompt = MagicMock(id=999)
+        confirm = _make_interaction(user_id=1, guild_id=100, is_done=True, message=prompt)
+        confirm.edit_original_response = AsyncMock()
+
+        sub = await root.push(_Sub, interaction=confirm)
+
+        # The view's own message is edited; the foreign prompt is untouched.
+        dashboard.edit.assert_awaited()
+        confirm.edit_original_response.assert_not_called()
+        confirm.response.edit_message.assert_not_called()
+        assert sub._message is dashboard
+
+    async def test_pop_with_foreign_interaction_edits_view_message(self):
+        class _Root(StatefulView):
+            pass
+
+        class _Sub(StatefulView):
+            async def on_state_changed(self, state):
+                pass
+
+        root = _Root(interaction=_make_interaction(user_id=1, guild_id=100))
+        await root.send()
+        dashboard = MagicMock(id=555, channel=MagicMock(id=2))
+        dashboard.edit = AsyncMock()
+        root._message = dashboard
+
+        sub = await root.push(_Sub)
+
+        prompt = MagicMock(id=999)
+        confirm = _make_interaction(user_id=1, guild_id=100, is_done=True, message=prompt)
+        confirm.edit_original_response = AsyncMock()
+
+        restored = await sub.pop(confirm)
+
+        assert restored is not None
+        dashboard.edit.assert_awaited()
+        confirm.edit_original_response.assert_not_called()
+        confirm.response.edit_message.assert_not_called()
+
+
 class TestNavigationUndoTransfer:
     """Push/pop forward-transfer the undo/redo stacks to the new view's state
     row so the undo timeline stays continuous across navigation. The transfer