vinsynlib 0.4.2__tar.gz → 0.4.3__tar.gz

{vinsynlib-0.4.2/src/vinsynlib.egg-info → vinsynlib-0.4.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: vinsynlib
-Version: 0.4.2
+Version: 0.4.3
 Summary: Shared base for ROMpler instrument browsers: settings, favourites, banks, dumps, CLI and key conventions
 License-Expression: GPL-2.0-or-later
 Project-URL: Homepage, https://github.com/lentferj/vinsynlib
@@ -133,11 +133,11 @@ unit or emulator **before** connecting irreplaceable equipment.
 ## Installing it, and who depends on it
 
 This is a library, not a program. It is published on PyPI — the current
-release is 0.4.2 — so the ordinary way to depend on it is a dependency
+release is 0.4.3 — so the ordinary way to depend on it is a dependency
 line:
 
 ```toml
-vinsynlib>=0.4.2
+vinsynlib>=0.4.3
 ```
 
 ```sh

{vinsynlib-0.4.2 → vinsynlib-0.4.3}/README.md

@@ -107,11 +107,11 @@ unit or emulator **before** connecting irreplaceable equipment.
 ## Installing it, and who depends on it
 
 This is a library, not a program. It is published on PyPI — the current
-release is 0.4.2 — so the ordinary way to depend on it is a dependency
+release is 0.4.3 — so the ordinary way to depend on it is a dependency
 line:
 
 ```toml
-vinsynlib>=0.4.2
+vinsynlib>=0.4.3
 ```
 
 ```sh

{vinsynlib-0.4.2 → vinsynlib-0.4.3}/src/vinsynlib/__init__.py

@@ -56,7 +56,7 @@ __all__ = [
     "terms",
 ]
 
-__version__ = "0.4.2"
+__version__ = "0.4.3"
 
 
 def _release_parts(version_string: str, width: int) -> tuple[int, ...] | None:

{vinsynlib-0.4.2 → vinsynlib-0.4.3}/src/vinsynlib/ui/modals.py

@@ -90,9 +90,11 @@ class ReportScreen(ModalScreen[None]):
 class ChoiceScreen(ModalScreen[int | None]):
     """A modal list where the user picks one index.
 
-    The currently-selected item is marked with ``[x]``. ``enter`` confirms
-    with ``priority=True`` because a ``DataTable`` would otherwise consume it.
-    ``escape`` cancels and returns ``None``.
+    The currently-selected item is marked with ``[x]``. The focused
+    ``DataTable`` owns row navigation; ``_current`` follows the table's
+    highlighted row. ``enter`` confirms with ``priority=True`` because a
+    ``DataTable`` would otherwise consume it. ``escape`` cancels and
+    returns ``None``.
     """
 
     BINDINGS: ClassVar[list[Any]] = [
@@ -138,23 +140,18 @@ class ChoiceScreen(ModalScreen[int | None]):
     def on_mount(self) -> None:
         if self._table and self._choices:
             self._table.move_cursor(row=self._current)
+            self._table.focus()
         if self._status_message:
             self._notify(self._status_message)
 
-    def on_key(self, event: Any) -> None:
-        key = event.key if hasattr(event, "key") else ""
-        if key == "up" and self._current > 0:
-            self._current -= 1
-            if self._table:
-                self._table.move_cursor(row=self._current)
-                self._refresh_marker()
-            event.prevent_default()
-        elif key == "down" and self._current < len(self._choices) - 1:
-            self._current += 1
-            if self._table:
-                self._table.move_cursor(row=self._current)
-                self._refresh_marker()
-            event.prevent_default()
+    def on_data_table_row_highlighted(
+        self,
+        event: DataTable.RowHighlighted,
+    ) -> None:
+        if not self._table or event.data_table is not self._table:
+            return
+        self._current = event.cursor_row
+        self._refresh_marker()
 
     def action_confirm(self) -> None:
         if self._choices:

{vinsynlib-0.4.2 → vinsynlib-0.4.3/src/vinsynlib.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: vinsynlib
-Version: 0.4.2
+Version: 0.4.3
 Summary: Shared base for ROMpler instrument browsers: settings, favourites, banks, dumps, CLI and key conventions
 License-Expression: GPL-2.0-or-later
 Project-URL: Homepage, https://github.com/lentferj/vinsynlib
@@ -133,11 +133,11 @@ unit or emulator **before** connecting irreplaceable equipment.
 ## Installing it, and who depends on it
 
 This is a library, not a program. It is published on PyPI — the current
-release is 0.4.2 — so the ordinary way to depend on it is a dependency
+release is 0.4.3 — so the ordinary way to depend on it is a dependency
 line:
 
 ```toml
-vinsynlib>=0.4.2
+vinsynlib>=0.4.3
 ```
 
 ```sh

{vinsynlib-0.4.2 → vinsynlib-0.4.3}/tests/test_modals.py

@@ -20,6 +20,7 @@ from __future__ import annotations
 from typing import Any, cast
 
 from textual.app import App, ComposeResult
+from textual.coordinate import Coordinate
 
 from vinsynlib.catalog import make_key, split_key
 from vinsynlib.ui.modals import (
@@ -161,6 +162,53 @@ async def test_choice_screen_enter_priority_over_datatable() -> None:
     assert results == [1]
 
 
+async def test_choice_screen_table_owns_navigation() -> None:
+    """The table cursor, markers and result must agree after arrow keys."""
+    screen = ChoiceScreen("Pick", ["a", "b", "c"], current=1)
+    results: list[Any] = []
+
+    def collect(result: Any) -> None:
+        results.append(result)
+
+    def markers() -> list[str]:
+        table = screen._table
+        assert table is not None
+        return [
+            str(table.get_cell_at(Coordinate(row, 0)))
+            for row in range(len(screen._choices))
+        ]
+
+    async with ModalApp().run_test() as pilot:
+        await pilot.app.push_screen(screen, callback=collect)
+        await pilot.pause()
+        table = screen._table
+        assert table is not None
+        assert (table.cursor_row, screen._current) == (1, 1)
+        assert markers() == ["[ ]", "[x]", "[ ]"]
+
+        await pilot.press("down")
+        await pilot.pause()
+        assert (table.cursor_row, screen._current) == (2, 2)
+        assert markers() == ["[ ]", "[ ]", "[x]"]
+
+        # Returning to the previous row must not leave the cursor one row
+        # beyond it, which is what the old on_key handler did.
+        await pilot.press("up")
+        await pilot.pause()
+        assert (table.cursor_row, screen._current) == (1, 1)
+        assert markers() == ["[ ]", "[x]", "[ ]"]
+
+        await pilot.press("up")
+        await pilot.pause()
+        assert (table.cursor_row, screen._current) == (0, 0)
+        assert markers() == ["[x]", "[ ]", "[ ]"]
+
+        await pilot.press("enter")
+        await pilot.pause()
+
+    assert results == [0]
+
+
 async def test_choice_screen_sends_status() -> None:
     screen = ChoiceScreen("Pick", ["a", "b"], status_message="Choose one")
     async with ModalApp().run_test() as pilot: