Use a new widget to pick a column

Author: FrancescAlted

src/blosc2/b2view/app.py

@@ -265,7 +265,7 @@ class HelpScreen(ModalScreen[None]):
             [
                 ("left / right", "move cursor; pages at the edges"),
                 ("s / e  (home / end)", "first / last column window"),
-                ("c", "go to column index or name..."),
+                ("c", "go to column (searchable name list; CTable, else index)"),
                 ("/", "pick which columns to show (searchable multi-select; CTable)"),
                 ("p", "plot a whole-column overview (needs textual-plotext)"),
                 ("enter", "decode a skipped cell (list/struct/object column)"),
@@ -453,6 +453,7 @@ class ColumnSelectScreen(ModalScreen["int | None"]):
 
     Dismisses with the chosen column's index into *names* (or None on cancel),
     a drop-in for :class:`GoToColumnScreen`'s result contract.  Used by the
+    ``c`` go-to-column key (CTables, where columns have names) and by the
     scatter ``s`` key to pick the Y column from the visible-column universe.
     """
 
@@ -2707,9 +2708,16 @@ def action_go_to_column(self) -> None:
         page = self.table_page
         if page.get("source_kind") not in _COL_PAGED_KINDS:
             return
-        current = page["col_start"] + self.query_one("#data-table", DataTable).cursor_column
-        names = self.browser.column_names(self.selected_path) if page["source_kind"] == "ctable" else None
-        screen = GoToColumnScreen(ncols=page["ncols"], current=current, names=names)
+        if page["source_kind"] == "ctable":
+            # Named columns -> pick from a searchable list (type to filter, ↑/↓,
+            # Enter); the option ids index into the visible-column universe, which
+            # is exactly what _go_to_column expects.
+            names = self.browser.column_names(self.selected_path)
+            screen: ModalScreen[int | None] = ColumnSelectScreen(names=names, title="Go to column")
+        else:
+            # N-D arrays have no column names; fall back to a numeric index entry.
+            current = page["col_start"] + self.query_one("#data-table", DataTable).cursor_column
+            screen = GoToColumnScreen(ncols=page["ncols"], current=current, names=None)
         self.push_screen(screen, self._go_to_column)
 
     def action_filter_rows(self) -> None:

tests/b2view/test_basics.py

@@ -51,6 +51,7 @@
 from blosc2.b2view.app import (
     B2ViewApp,
     ColumnFilterScreen,
+    ColumnSelectScreen,
     FilterScreen,
     GoToColumnScreen,
     GoToRowScreen,
@@ -301,11 +302,17 @@ async def test_2d_paging(store_path):
         await wait_for_table(pilot)
         assert app.table_page["col_start"] == 0
 
-        # 'c' jumps to a column by index (arrays have no column names)
+        # 'c' jumps to a column by index (arrays have no column names).  The
+        # modal pre-fills the current index and pre-selects it, so typing a new
+        # index replaces it (not appends, e.g. "0" + "97" -> "097").
         await pilot.press("c")
         await pilot.pause()
         assert isinstance(app.screen, GoToColumnScreen)
-        app.screen.query_one("#gotocol-input", Input).value = "97"
+        gotocol_input = app.screen.query_one("#gotocol-input", Input)
+        assert gotocol_input.value == "0"  # pre-filled with current column
+        for ch in "97":
+            await pilot.press(ch)
+        assert gotocol_input.value == "97"  # replaced, not "097"
         await pilot.press("enter")
         await wait_for_table(pilot)
         page = app.table_page
@@ -515,11 +522,14 @@ async def test_ctable_column_paging(store_path):
         assert page["start"] + table.cursor_row == 150
         _assert_ctable_window_values(page, expected)
 
-        # 'c' goes to a column by name; the row position is kept
+        # 'c' opens a searchable column picker (type to filter, ↑/↓, Enter);
+        # the row position is kept.  Pick v12 by typing its name.
         await pilot.press("c")
         await pilot.pause()
-        assert isinstance(app.screen, GoToColumnScreen)
-        app.screen.query_one("#gotocol-input", Input).value = "v12"
+        assert isinstance(app.screen, ColumnSelectScreen)
+        for ch in "v12":
+            await pilot.press(ch)
+        await pilot.pause()
         await pilot.press("enter")
         await wait_for_table(pilot)
         page = app.table_page
@@ -529,40 +539,28 @@ async def test_ctable_column_paging(store_path):
         assert page["start"] + table.cursor_row == 150
         _assert_ctable_window_values(page, expected)
 
-        # Typing a name replaces the pre-filled current index (not appends): the
-        # modal opens with the current column index selected, so the first
-        # keystroke overwrites it instead of producing e.g. "0v12".
+        # ↑/↓ drive the highlight: filter to the v1x family, then arrow to v12
         await pilot.press("c")
         await pilot.pause()
-        gotocol_input = app.screen.query_one("#gotocol-input", Input)
-        assert gotocol_input.value == str(app.table_page["col_start"])  # pre-filled
-        for ch in "v12":
+        assert isinstance(app.screen, ColumnSelectScreen)
+        for ch in "v1":  # matches v10, v11, ..., v19 in column order
             await pilot.press(ch)
-        assert gotocol_input.value == "v12"  # replaced, not "<index>v12"
+        await pilot.pause()
+        await pilot.press("down")  # v10 -> v11
+        await pilot.press("down")  # v11 -> v12
         await pilot.press("enter")
         await wait_for_table(pilot)
         assert app.table_page["col_start"] == all_names.index("v12")
         assert app.table_page["columns"][0] == "v12"
 
-        # An ambiguous name prefix keeps the modal open; escape cancels
+        # escape cancels the picker without moving
         await pilot.press("c")
         await pilot.pause()
-        app.screen.query_one("#gotocol-input", Input).value = "v1"
-        await pilot.press("enter")
-        await pilot.pause()
-        assert isinstance(app.screen, GoToColumnScreen)
+        assert isinstance(app.screen, ColumnSelectScreen)
         await pilot.press("escape")
         await wait_for_table(pilot)
         assert app.table_page["col_start"] == all_names.index("v12")
 
-        # ...and a numeric index works as well
-        await pilot.press("c")
-        await pilot.pause()
-        app.screen.query_one("#gotocol-input", Input).value = "0"
-        await pilot.press("enter")
-        await wait_for_table(pilot)
-        assert app.table_page["col_start"] == 0
-
         # Shrinking the terminal re-fits the column window to the new width
         wide_columns = list(app.table_page["columns"])
         await pilot.resize_terminal(80, 40)
@@ -678,10 +676,13 @@ async def submit_filter(expr: str) -> None:
         assert page["columns"][0] == "b"
         assert app.browser.get_column_filter("/level0/ctable") == f"{ncols - 1} of {ncols}"
 
-        # The goto-column modal resolves names within the visible set.
+        # The goto-column picker lists names within the visible set.
         await pilot.press("c")
         await pilot.pause()
-        app.screen.query_one("#gotocol-input", Input).value = "v15"
+        assert isinstance(app.screen, ColumnSelectScreen)
+        for ch in "v15":
+            await pilot.press(ch)
+        await pilot.pause()
         await pilot.press("enter")
         await wait_for_table(pilot)
         assert app.table_page["columns"][0] == "v15"