Skip to content

Navigate filtered nodes with arrow keys + smaller cleanup #208

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
eibx wants to merge 1 commit into
base: main
Choose a base branch
from
+19 −38
Open

Navigate filtered nodes with arrow keys + smaller cleanup #208

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 19 additions & 37 deletions sqlit/domains/explorer/ui/mixins/tree_filter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ class TreeFilterMixin:
_tree_filter_text: str = ""
_tree_filter_query: str = ""
_tree_filter_fuzzy: bool = False
_tree_filter_typing: bool = False
_tree_filter_matches: list[Any] = []
_tree_filter_match_index: int = 0
_tree_original_labels: dict[int, str] = {}
Expand All @@ -34,7 +33,6 @@ def action_tree_filter(self: TreeFilterMixinHost) -> None:
self._tree_filter_text = ""
self._tree_filter_query = ""
self._tree_filter_fuzzy = False
self._tree_filter_typing = True
self._tree_filter_matches = []
self._tree_filter_match_index = 0
self._tree_original_labels = {}
Expand All @@ -49,7 +47,6 @@ def action_tree_filter_close(self: TreeFilterMixinHost) -> None:
self._tree_filter_text = ""
self._tree_filter_query = ""
self._tree_filter_fuzzy = False
self._tree_filter_typing = False
self.tree_filter_input.hide()
self._restore_tree_labels()
self._show_all_tree_nodes()
Expand Down Expand Up @@ -116,40 +113,33 @@ def on_key(self: TreeFilterMixinHost, event: Any) -> None:
return

key = event.key

if key == "enter":
self.action_tree_filter_accept()
event.prevent_default()
event.stop()
return

if not self._tree_filter_typing:
if key in ("n", "j"):
self.action_tree_filter_next()
event.prevent_default()
event.stop()
return

if key in ("N", "k"):
self.action_tree_filter_prev()
event.prevent_default()
event.stop()
return

if key == "/":
self.action_tree_filter()
event.prevent_default()
event.stop()
return

# Handle backspace
if key == "backspace":
if self._tree_filter_typing:
if self._tree_filter_text:
self._tree_filter_text = self._tree_filter_text[:-1]
self._update_tree_filter()
else:
# Exit filter when backspacing with no text
self.action_tree_filter_close()
if self._tree_filter_text:
self._tree_filter_text = self._tree_filter_text[:-1]
self._update_tree_filter()
else:
# Exit filter when backspacing with no text
self.action_tree_filter_close()
event.prevent_default()
event.stop()
return

if key == "up":
self.action_tree_filter_prev()
event.prevent_default()
event.stop()
return

if key == "down":
self.action_tree_filter_next()
event.prevent_default()
event.stop()
return
Expand All @@ -158,14 +148,6 @@ def on_key(self: TreeFilterMixinHost, event: Any) -> None:
# event.key might be "shift+?" but event.character will be "?"
char = getattr(event, "character", None)
if char and char.isprintable():
if char == "/" and not self._tree_filter_typing:
self.action_tree_filter()
event.prevent_default()
event.stop()
return
if not self._tree_filter_typing:
super().on_key(event) # type: ignore[misc]
return
self._tree_filter_text += char
self._update_tree_filter()
event.prevent_default()
Expand Down
1 change: 0 additions & 1 deletion sqlit/shared/ui/protocols/explorer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ class ExplorerStateProtocol(Protocol):
_tree_filter_text: str
_tree_filter_query: str
_tree_filter_fuzzy: bool
_tree_filter_typing: bool
_tree_filter_matches: list[Any]
_tree_filter_match_index: int
_tree_original_labels: dict[int, str]
Expand Down