From bf153e30bbbad0136889bf68782c3c23be34ba43 Mon Sep 17 00:00:00 2001 From: Jonathan0823 Date: Thu, 5 Nov 2026 10:44:08 +0700 Subject: [PATCH] fix(file-picker): prevent double-click crash --- sqlit/shared/ui/screens/file_picker.py | 14 +++++--- tests/ui/test_file_picker.py | 47 ++++++++++++++++++++++++++ 2 files changed, 57 insertions(+), 4 deletions(-) create mode 100644 tests/ui/test_file_picker.py diff --git a/sqlit/shared/ui/screens/file_picker.py b/sqlit/shared/ui/screens/file_picker.py index 4302c6c5..6dfc6be0 100644 --- a/sqlit/shared/ui/screens/file_picker.py +++ b/sqlit/shared/ui/screens/file_picker.py @@ -14,6 +14,12 @@ from sqlit.shared.ui.widgets import Dialog +class _FilePickerEntryLabel(Static): + """Render a file-picker entry without enabling Textual text selection.""" + + ALLOW_SELECT = False + + class FilePickerMode(Enum): """Mode for the file picker dialog.""" @@ -191,7 +197,7 @@ async def _refresh_file_list(self, update_input: bool = True) -> None: # Add parent directory entry if self._current_dir.parent != self._current_dir: - item = ListItem(Static("📁 ..")) + item = ListItem(_FilePickerEntryLabel("📁 ..")) items.append(item) self._entries.append(None) # None = parent @@ -199,7 +205,7 @@ async def _refresh_file_list(self, update_input: bool = True) -> None: try: entries = sorted(self._current_dir.iterdir(), key=lambda p: (not p.is_dir(), p.name.lower())) except PermissionError: - items.append(ListItem(Static("⚠️ Permission denied"))) + items.append(ListItem(_FilePickerEntryLabel("⚠️ Permission denied"))) await list_view.extend(items) return @@ -207,11 +213,11 @@ async def _refresh_file_list(self, update_input: bool = True) -> None: if entry.name.startswith("."): continue # Skip hidden files if entry.is_dir(): - item = ListItem(Static(f"📁 {entry.name}")) + item = ListItem(_FilePickerEntryLabel(f"📁 {entry.name}")) items.append(item) self._entries.append(entry) elif show_files and self._matches_extension(entry): - item = ListItem(Static(f"📄 {entry.name}")) + item = ListItem(_FilePickerEntryLabel(f"📄 {entry.name}")) items.append(item) self._entries.append(entry) diff --git a/tests/ui/test_file_picker.py b/tests/ui/test_file_picker.py new file mode 100644 index 00000000..0a4cd160 --- /dev/null +++ b/tests/ui/test_file_picker.py @@ -0,0 +1,47 @@ +"""UI tests for the shared file picker.""" + +from __future__ import annotations + +from pathlib import Path + +import pytest +from textual.app import App +from textual.widgets import Static + +from sqlit.shared.ui.screens.file_picker import FilePickerMode, FilePickerScreen + + +class _FilePickerApp(App[None]): + def __init__(self, start_directory: Path) -> None: + super().__init__() + self.start_directory = start_directory + + async def on_mount(self) -> None: + await self.push_screen( + FilePickerScreen( + mode=FilePickerMode.SAVE, + start_directory=self.start_directory, + ) + ) + + +@pytest.mark.asyncio +async def test_file_picker_rows_are_not_text_selectable_and_mouse_navigation_works( + tmp_path: Path, +) -> None: + child = tmp_path / "child" + child.mkdir() + app = _FilePickerApp(tmp_path) + + async with app.run_test(size=(100, 35)) as pilot: + screen = app.screen + labels = list(screen.query(Static)) + + assert labels + assert all(not label.allow_select for label in labels) + + child_label = next(label for label in labels if "child" in str(label.render())) + await pilot.click(child_label) + await pilot.pause() + + assert screen._current_dir == child