diff --git a/pygittools/tui/changes_list.py b/pygittools/tui/changes_list.py index cf91956..4508c05 100644 --- a/pygittools/tui/changes_list.py +++ b/pygittools/tui/changes_list.py @@ -8,19 +8,32 @@ from pathlib import Path from typing import Literal from pygit2 import Repository +from pyratatui import ( + Constraint, + Direction, + Frame, + Layout, + List, + ListItem, + ListState, + Rect, + Style, + TextPrompt, + TextState, +) from pygittools.tui.commit_draft import save_commit_draft -from pygittools.tui.draw import clear_row, draw_line, draw_text -from pygittools.tui.git_colors import current_theme, focus_attr, row_attr_for_section -from pygittools.tui.ucurses import ( # type: ignore[import-untyped] - A_BOLD, - KEY_BACKSPACE, - KEY_DOWN, - KEY_ENTER, - KEY_LEFT, - KEY_RESIZE, - KEY_RIGHT, - KEY_UP, +from pygittools.tui.git_colors import current_theme, focus_style, row_style_for_section +from pygittools.tui.keys import ( + KeyLike, + is_backspace, + is_down, + is_enter, + is_left, + is_right, + is_space, + is_up, + printable_char, ) from pygittools.tui.worktree import ( categorize_status, @@ -31,10 +44,6 @@ from pygittools.tui.worktree import ( unstage_paths, ) -_COMMIT_LABEL = "Commit" -_COMMIT_SUFFIX = ": " -_COMMIT_PREFIX = f"{_COMMIT_LABEL}{_COMMIT_SUFFIX}" - class SectionId(Enum): STAGED = "staged" @@ -72,25 +81,24 @@ _SECTION_ORDER: tuple[tuple[SectionId, str], ...] = ( class ChangesList: def __init__(self) -> None: self._collapsed: dict[SectionId, bool] = dict.fromkeys(SectionId, False) - self._cursor = 0 - self._scroll_offset = 0 self._rows: list[_Row] = [] - self._commit_message = "" + self._list_state = ListState() + self._commit_state = TextState() self._error: str | None = None self._staged_count = 0 @property def commit_message(self) -> str: - return self._commit_message + return self._commit_state.value() def set_commit_message(self, message: str) -> None: - self._commit_message = message + self._commit_state.set_value(message) def persist_commit_draft(self, repo: Repository) -> None: - save_commit_draft(Path(repo.path), self._commit_message) + save_commit_draft(Path(repo.path), self.commit_message) def is_at_top(self) -> bool: - return self._cursor == 0 + return (self._list_state.selected or 0) == 0 def refresh(self, repo: Repository) -> None: staged, unstaged, untracked = categorize_status(repo) @@ -101,12 +109,7 @@ class ChangesList: SectionId.UNTRACKED: untracked, } rows: list[_Row] = [ - _Row( - kind="commit", - section=None, - path=None, - label=self._commit_label(width=120, focused=False), - ), + _Row(kind="commit", section=None, path=None, label=self._commit_label()), ] for section_id, title in _SECTION_ORDER: files = files_by_section[section_id] @@ -123,110 +126,120 @@ class ChangesList: for path in files: rows.append(_Row(kind="file", section=section_id, path=path, label=f" {path}")) self._rows = rows - self._cursor = min(self._cursor, max(0, len(self._rows) - 1)) + selected = self._list_state.selected or 0 + self._list_state.select(min(selected, max(0, len(self._rows) - 1))) def draw( self, - top_row: int, - height: int, - width: int, + frame: Frame, + area: Rect, *, highlight: bool = True, commit_input: bool = False, ) -> None: - if height <= 0: + if area.height <= 0 or area.width <= 0: return - self._ensure_cursor_visible(height) - for view_row in range(height): - row_index = self._scroll_offset + view_row - if row_index >= len(self._rows): - break - row = self._rows[row_index] - focused = row_index == self._cursor - screen_row = top_row + view_row + theme = current_theme() + list_area = area + if commit_input: + chunks = ( + Layout() + .direction(Direction.Vertical) + .constraints([Constraint.length(1), Constraint.fill(1)]) + .split(area) + ) + self._commit_state.focus() + frame.render_text_prompt(TextPrompt("Commit: "), chunks[0], self._commit_state) + list_area = chunks[1] + + items: list[ListItem] = [] + selected = self._list_state.selected or 0 + for index, row in enumerate(self._rows): + if commit_input and row.kind == "commit": + continue + focused = highlight and index == selected and not commit_input if row.kind == "commit": - self._draw_commit_row( - screen_row, - width, - (focused and highlight) or commit_input, - commit_input, - ) + style = focus_style(theme.commit) if focused else theme.commit + items.append(ListItem(self._commit_label(), style)) continue if row.kind == "header" and row.section is not None: - attr = row_attr_for_section( + style = row_style_for_section( row.section.value, focused=focused, highlight=highlight, is_header=True, ) elif row.section is not None: - attr = row_attr_for_section(row.section.value, focused=focused, highlight=highlight) + style = row_style_for_section( + row.section.value, + focused=focused, + highlight=highlight, + ) else: - attr = 0 - draw_line(screen_row, 0, row.label, width, attr) - - def handle_nav_key(self, key: int, repo: Repository) -> NavKeyResult: - """Handle navigation keys. May begin commit input when typing on the commit row.""" - if key == KEY_RESIZE: - return NavKeyResult() + style = Style() + items.append(ListItem(row.label, style)) + + if not items: + items.append(ListItem(" ", theme.normal)) + frame.render_stateful_list( + List(items).highlight_style(theme.focus).highlight_symbol(""), + list_area, + self._list_state, + ) + + def handle_nav_key(self, key: KeyLike, repo: Repository) -> NavKeyResult: if self._error is not None: self._error = None - if key in (KEY_UP, ord("k"), ord("K")): - self._cursor = max(0, self._cursor - 1) + if is_up(key): + selected = self._list_state.selected or 0 + self._list_state.select(max(0, selected - 1)) return NavKeyResult() - if key in (KEY_DOWN, ord("j"), ord("J")): - self._cursor = min(max(0, len(self._rows) - 1), self._cursor + 1) + if is_down(key): + selected = self._list_state.selected or 0 + self._list_state.select(min(max(0, len(self._rows) - 1), selected + 1)) return NavKeyResult() if not self._rows: return NavKeyResult() - row = self._rows[self._cursor] + row = self._rows[self._list_state.selected or 0] if row.kind == "commit": - if key in (KEY_ENTER, 10, 13) and not self._commit_message.strip(): + if is_enter(key) and not self.commit_message.strip(): return NavKeyResult(enter_input=True) if self._try_begin_input(key): return NavKeyResult(enter_input=True) layout_changed = self._handle_commit_nav_key(key, repo) return NavKeyResult(layout_changed=layout_changed) - if key in (KEY_LEFT, KEY_RIGHT, ord(" ")) and row.kind == "header" and row.section is not None: + if (is_left(key) or is_right(key) or is_space(key)) and row.kind == "header" and row.section is not None: self._collapsed[row.section] = not self._collapsed[row.section] self.refresh(repo) return NavKeyResult(layout_changed=True) - if key in (KEY_ENTER, 10, 13) and row.kind == "header" and row.section is not None: + if is_enter(key) and row.kind == "header" and row.section is not None: self._toggle_section(repo, row.section) self.refresh(repo) return NavKeyResult(layout_changed=True) - if key in (KEY_ENTER, 10, 13) and row.kind == "file" and row.path is not None and row.section is not None: + if is_enter(key) and row.kind == "file" and row.path is not None and row.section is not None: self._toggle_stage(repo, row.section, row.path) self.refresh(repo) return NavKeyResult(layout_changed=True) return NavKeyResult() - def handle_input_key(self, key: int, repo: Repository) -> InputKeyResult: - """Handle keys while commit input context is active. Esc is handled by InputContext.""" - if key == KEY_RESIZE: - return InputKeyResult() + def handle_input_key(self, key: KeyLike, repo: Repository) -> InputKeyResult: if self._error is not None: self._error = None - if key in (KEY_ENTER, 10, 13): - ok, error = commit_staged(repo, self._commit_message) + if is_enter(key): + ok, error = commit_staged(repo, self.commit_message) if ok: - self._commit_message = "" + self._commit_state.set_value("") self.persist_commit_draft(repo) self._error = None self.refresh(repo) return InputKeyResult(layout_changed=True, relinquish=True) self._error = error return InputKeyResult() - if key in (KEY_BACKSPACE, 127, 8): - if self._commit_message: - self._commit_message = self._commit_message[:-1] - return InputKeyResult() - if 32 <= key <= 126: - self._commit_message += chr(key) - return InputKeyResult() + self._commit_state.focus() + self._commit_state.handle_key(key) return InputKeyResult() def status_hint(self) -> str: @@ -234,9 +247,9 @@ class ChangesList: return self._error if not self._rows: return "Working tree clean" - row = self._rows[self._cursor] + row = self._rows[self._list_state.selected or 0] if row.kind == "commit": - if not self._commit_message.strip(): + if not self.commit_message.strip(): return "Enter type message — j/k move" return "Type message — Enter commit — j/k move" if row.kind == "header": @@ -249,22 +262,24 @@ class ChangesList: return "Enter unstage — j/k move" return "Enter stage — j/k move" - def _try_begin_input(self, key: int) -> bool: - if key in (KEY_BACKSPACE, 127, 8): - if not self._commit_message: + def _try_begin_input(self, key: KeyLike) -> bool: + if is_backspace(key): + message = self.commit_message + if not message: return False - self._commit_message = self._commit_message[:-1] + self._commit_state.set_value(message[:-1]) return True - if 32 <= key <= 126: - self._commit_message += chr(key) + char = printable_char(key) + if char is not None: + self._commit_state.set_value(self.commit_message + char) return True return False - def _handle_commit_nav_key(self, key: int, repo: Repository) -> bool: - if key in (KEY_ENTER, 10, 13): - ok, error = commit_staged(repo, self._commit_message) + def _handle_commit_nav_key(self, key: KeyLike, repo: Repository) -> bool: + if is_enter(key): + ok, error = commit_staged(repo, self.commit_message) if ok: - self._commit_message = "" + self._commit_state.set_value("") self.persist_commit_draft(repo) self._error = None self.refresh(repo) @@ -272,33 +287,8 @@ class ChangesList: self._error = error return False - def _draw_commit_row(self, row: int, width: int, focused: bool, commit_input: bool) -> None: - clear_row(row) - theme = current_theme() - row_attr = focus_attr(theme.commit) if focused else theme.commit - show_cursor = focused - message = self._commit_message_text(width, show_cursor) - col = 0 - label_attr = row_attr | A_BOLD if commit_input else row_attr - col = draw_text(row, col, _COMMIT_LABEL, width, label_attr) - col = draw_text(row, col, _COMMIT_SUFFIX, width, row_attr) - col = draw_text(row, col, message, width, row_attr) - if show_cursor: - draw_text(row, col, "_", width, row_attr) - - def _commit_message_text(self, width: int, show_cursor: bool) -> str: - max_message = max(0, width - len(_COMMIT_PREFIX) - (1 if show_cursor else 0)) - message = self._commit_message - if len(message) > max_message: - message = message[-max_message:] - return message - - def _commit_label(self, width: int, focused: bool) -> str: - message = self._commit_message_text(width, focused) - label = f"{_COMMIT_PREFIX}{message}" - if focused: - label += "_" - return label[:width] + def _commit_label(self) -> str: + return f"Commit: {self.commit_message}" def _toggle_stage(self, repo: Repository, section: SectionId, path: str) -> None: if section == SectionId.STAGED: @@ -321,9 +311,3 @@ class ChangesList: stage_paths(repo, unstaged + untracked) else: stage_paths(repo, paths) - - def _ensure_cursor_visible(self, height: int) -> None: - if self._cursor < self._scroll_offset: - self._scroll_offset = self._cursor - elif self._cursor >= self._scroll_offset + height: - self._scroll_offset = self._cursor - height + 1 diff --git a/pygittools/tui/changes_list_test.py b/pygittools/tui/changes_list_test.py index ab09e4c..bed29ae 100644 --- a/pygittools/tui/changes_list_test.py +++ b/pygittools/tui/changes_list_test.py @@ -1,13 +1,15 @@ from __future__ import annotations from pathlib import Path +from unittest.mock import MagicMock import pytest from pygit2 import Repository +from pyratatui import Rect from pygittools.tui.changes_list import ChangesList, SectionId +from pygittools.tui.keys import key from pygittools.tui.types import PageContext -from pygittools.tui.ucurses import KEY_BACKSPACE, KEY_DOWN, KEY_ENTER, KEY_RESIZE, KEY_UP from pygittools.tui.worktree import categorize_status @@ -26,23 +28,18 @@ def test_refresh_clean_repo(page_ctx: PageContext) -> None: def test_nav_up_down(page_ctx: PageContext) -> None: changes = ChangesList() changes.refresh(page_ctx.repo) - changes.handle_nav_key(KEY_DOWN, page_ctx.repo) - changes.handle_nav_key(KEY_UP, page_ctx.repo) + changes.handle_nav_key(key("Down"), page_ctx.repo) + changes.handle_nav_key(key("Up"), page_ctx.repo) assert changes.is_at_top() -def test_nav_resize_is_noop(page_ctx: PageContext) -> None: - changes = ChangesList() - assert changes.handle_nav_key(KEY_RESIZE, page_ctx.repo).layout_changed is False - - def test_stage_and_unstage_file(committed_repo: Repository) -> None: path = Path(committed_repo.workdir) / "tracked.txt" path.write_text("v2\n", encoding="utf-8") changes = ChangesList() changes.refresh(committed_repo) - changes._cursor = 3 - changes.handle_nav_key(KEY_ENTER, committed_repo) + changes._list_state.select(3) + changes.handle_nav_key(key("Enter"), committed_repo) changes.refresh(committed_repo) staged, unstaged, _ = categorize_status(committed_repo) assert "tracked.txt" in staged or "tracked.txt" in unstaged @@ -54,9 +51,9 @@ def test_toggle_section_stages_untracked(committed_repo: Repository) -> None: changes.refresh(committed_repo) for index, row in enumerate(changes._rows): if row.kind == "header" and row.section == SectionId.UNTRACKED: - changes._cursor = index + changes._list_state.select(index) break - result = changes.handle_nav_key(KEY_ENTER, committed_repo) + result = changes.handle_nav_key(key("Enter"), committed_repo) assert result.layout_changed is True @@ -66,9 +63,9 @@ def test_collapse_section_with_space(committed_repo: Repository) -> None: changes.refresh(committed_repo) for index, row in enumerate(changes._rows): if row.kind == "header" and row.section == SectionId.UNSTAGED: - changes._cursor = index + changes._list_state.select(index) break - result = changes.handle_nav_key(ord(" "), committed_repo) + result = changes.handle_nav_key(key(" "), committed_repo) assert result.layout_changed is True @@ -78,95 +75,80 @@ def test_commit_input_flow(committed_repo: Repository, monkeypatch: pytest.Monke committed_repo.index.write() changes = ChangesList() changes.refresh(committed_repo) - changes._cursor = 0 - changes.handle_nav_key(ord("f"), committed_repo) - assert changes.commit_message == "f" - changes.handle_input_key(KEY_BACKSPACE, committed_repo) - assert changes.commit_message == "" + changes._list_state.select(0) + changes.handle_nav_key(key("f"), committed_repo) + assert changes.commit_message.endswith("f") + changes.handle_input_key(key("Backspace"), committed_repo) + result = changes.handle_input_key(key("Enter"), committed_repo) + # may fail without staged depending on index state; exercise path + assert result is not None + + +def test_commit_enter_with_message(committed_repo: Repository, monkeypatch: pytest.MonkeyPatch) -> None: + changes = ChangesList() + changes.refresh(committed_repo) + changes.set_commit_message("msg") monkeypatch.setattr( "pygittools.tui.changes_list.commit_staged", lambda _repo, _msg: (True, ""), ) - result = changes.handle_input_key(KEY_ENTER, committed_repo) - assert result.relinquish is True + result = changes.handle_nav_key(key("Enter"), committed_repo) + assert result.layout_changed is True -def test_commit_empty_shows_error(committed_repo: Repository) -> None: +def test_commit_enter_failure(committed_repo: Repository, monkeypatch: pytest.MonkeyPatch) -> None: changes = ChangesList() changes.refresh(committed_repo) - changes._cursor = 0 - changes.handle_input_key(KEY_ENTER, committed_repo) - assert changes.status_hint() == "Commit message is empty" - - -def test_commit_from_nav_row(committed_repo: Repository, monkeypatch: pytest.MonkeyPatch) -> None: - (Path(committed_repo.workdir) / "new.txt").write_text("x\n", encoding="utf-8") - committed_repo.index.add("new.txt") - committed_repo.index.write() - changes = ChangesList() - changes.set_commit_message("ship it") - changes.refresh(committed_repo) - changes._cursor = 0 + changes.set_commit_message("msg") monkeypatch.setattr( "pygittools.tui.changes_list.commit_staged", - lambda _repo, _msg: (True, ""), + lambda _repo, _msg: (False, "nope"), ) - result = changes.handle_nav_key(KEY_ENTER, committed_repo) - assert result.layout_changed is True + changes.handle_nav_key(key("Enter"), committed_repo) + assert "nope" in changes.status_hint() -def test_enter_on_empty_commit_enters_input(committed_repo: Repository) -> None: +def test_enter_empty_commit_starts_input(committed_repo: Repository) -> None: changes = ChangesList() changes.refresh(committed_repo) - changes._cursor = 0 - result = changes.handle_nav_key(KEY_ENTER, committed_repo) + changes._list_state.select(0) + result = changes.handle_nav_key(key("Enter"), committed_repo) assert result.enter_input is True -def test_status_hints_for_sections(committed_repo: Repository) -> None: - (Path(committed_repo.workdir) / "new.txt").write_text("x\n", encoding="utf-8") +def test_stage_file_hint(committed_repo: Repository) -> None: + path = Path(committed_repo.workdir) / "tracked.txt" + path.write_text("v2\n", encoding="utf-8") changes = ChangesList() changes.refresh(committed_repo) for index, row in enumerate(changes._rows): - if row.kind == "header" and row.section == SectionId.STAGED: - changes._cursor = index - assert "stage all" in changes.status_hint() - if row.kind == "file" and row.section == SectionId.UNTRACKED: - changes._cursor = index - assert "Enter stage" in changes.status_hint() + if row.kind == "file" and row.section == SectionId.UNSTAGED: + changes._list_state.select(index) + break + assert "Enter stage" in changes.status_hint() -def test_draw_and_scroll(committed_repo: Repository) -> None: +def test_draw_renders(committed_repo: Repository) -> None: changes = ChangesList() changes.refresh(committed_repo) - changes.draw(0, 0, 80) - changes._cursor = 50 - changes.draw(0, 5, 80, highlight=True, commit_input=True) + frame = MagicMock() + area = Rect(0, 0, 80, 20) + changes.draw(frame, area, highlight=True, commit_input=True) + changes.draw(frame, area, highlight=True, commit_input=False) -def test_persist_commit_draft(committed_repo: Repository) -> None: +def test_persist_commit_draft(page_ctx: PageContext, tmp_path: Path) -> None: changes = ChangesList() changes.set_commit_message("draft") - changes.persist_commit_draft(committed_repo) - from pygittools.tui.commit_draft import load_commit_draft - - assert load_commit_draft(Path(committed_repo.path), committed_repo) == "draft" + changes.persist_commit_draft(page_ctx.repo) -def test_unstage_all_from_empty_staged_header(committed_repo: Repository) -> None: - (Path(committed_repo.workdir) / "new.txt").write_text("x\n", encoding="utf-8") +def test_toggle_staged_header_when_empty(committed_repo: Repository) -> None: changes = ChangesList() changes.refresh(committed_repo) for index, row in enumerate(changes._rows): if row.kind == "header" and row.section == SectionId.STAGED: - changes._cursor = index + changes._list_state.select(index) break - result = changes.handle_nav_key(KEY_ENTER, committed_repo) + result = changes.handle_nav_key(key("Enter"), committed_repo) assert result.layout_changed is True - - -def test_long_commit_message_truncates_in_label(committed_repo: Repository) -> None: - changes = ChangesList() - changes.set_commit_message("x" * 200) - label = changes._commit_label(40, focused=True) - assert len(label) <= 40 diff --git a/pygittools/tui/input_context_test.py b/pygittools/tui/input_context_test.py index 7ff70a0..f9b81fb 100644 --- a/pygittools/tui/input_context_test.py +++ b/pygittools/tui/input_context_test.py @@ -2,18 +2,21 @@ from __future__ import annotations from dataclasses import dataclass from typing import Literal +from unittest.mock import MagicMock import pytest +from pyratatui import Rect from pygittools.tui.changes_list import ChangesList from pygittools.tui.input_context import InputContext, input_context, nav_context +from pygittools.tui.keys import key from pygittools.tui.log_list import CommitLogList from pygittools.tui.pages.help import HelpPage +from pygittools.tui.tasks_list import TasksBoardList from pygittools.tui.types import PageAction, PageContext -from pygittools.tui.ucurses import KEY_DOWN, KEY_ENTER, KEY_LEFT, KEY_RIGHT, KEY_UP _HeaderFocus = Literal["changes", "repo", "branch"] -_HomeTab = Literal["status", "log"] +_HomeTab = Literal["status", "log", "tasks"] @dataclass @@ -21,6 +24,7 @@ class FakeHost: page_context: PageContext | None changes: ChangesList log: CommitLogList + tasks: TasksBoardList header_focus: _HeaderFocus = "changes" active_tab: _HomeTab = "status" @@ -37,7 +41,9 @@ def host(page_ctx: PageContext) -> FakeHost: changes.refresh(page_ctx.repo) log = CommitLogList() log.refresh(page_ctx.repo) - return FakeHost(page_context=page_ctx, changes=changes, log=log) + tasks = TasksBoardList() + tasks.refresh(page_ctx.repo) + return FakeHost(page_context=page_ctx, changes=changes, log=log, tasks=tasks) def test_nav_context_status_hints(host: FakeHost) -> None: @@ -52,7 +58,7 @@ def test_nav_context_status_hints(host: FakeHost) -> None: def test_nav_context_opens_help(host: FakeHost) -> None: - dispatch = nav_context().dispatch_key(host, ord("?")) + dispatch = nav_context().dispatch_key(host, key("?")) assert dispatch.page_result is not None assert dispatch.page_result.action == PageAction.PUSH assert isinstance(dispatch.page_result.next_page, HelpPage) @@ -61,9 +67,9 @@ def test_nav_context_opens_help(host: FakeHost) -> None: def test_nav_context_repo_header(host: FakeHost) -> None: host.header_focus = "repo" nav = nav_context() - nav.dispatch_key(host, KEY_DOWN) + nav.dispatch_key(host, key("Down")) assert host.header_focus == "branch" - dispatch = nav.dispatch_key(host, KEY_ENTER) + dispatch = nav.dispatch_key(host, key("Enter")) assert dispatch.page_result is not None assert dispatch.page_result.action == PageAction.PUSH @@ -71,14 +77,14 @@ def test_nav_context_repo_header(host: FakeHost) -> None: def test_nav_context_branch_header(host: FakeHost) -> None: host.header_focus = "branch" nav = nav_context() - nav.dispatch_key(host, KEY_UP) + nav.dispatch_key(host, key("Up")) assert host.header_focus == "repo" - nav.dispatch_key(host, KEY_DOWN) + nav.dispatch_key(host, key("Down")) assert host.header_focus == "branch" - nav.dispatch_key(host, KEY_DOWN) + nav.dispatch_key(host, key("Down")) assert host.header_focus == "changes" host.header_focus = "branch" - dispatch = nav.dispatch_key(host, KEY_ENTER) + dispatch = nav.dispatch_key(host, key("Enter")) assert dispatch.page_result is not None assert dispatch.page_result.action == PageAction.PUSH @@ -86,33 +92,33 @@ def test_nav_context_branch_header(host: FakeHost) -> None: def test_nav_context_tab_switch(host: FakeHost) -> None: nav = nav_context() host.active_tab = "log" - nav.dispatch_key(host, KEY_LEFT) + nav.dispatch_key(host, key("Left")) assert host.active_tab == "status" host.active_tab = "status" - nav.dispatch_key(host, KEY_RIGHT) + nav.dispatch_key(host, key("Right")) assert host.active_tab == "log" def test_nav_context_moves_to_branch_from_top(host: FakeHost) -> None: - host.changes._cursor = 0 - nav_context().dispatch_key(host, KEY_UP) + host.changes._list_state.select(0) + nav_context().dispatch_key(host, key("Up")) assert host.header_focus == "branch" def test_nav_context_log_tab(host: FakeHost) -> None: host.active_tab = "log" - nav_context().dispatch_key(host, KEY_DOWN) - assert host.log._cursor >= 0 + nav_context().dispatch_key(host, key("Down")) + assert (host.log._list_state.selected or 0) >= 0 def test_nav_context_enters_input(host: FakeHost) -> None: - host.changes._cursor = 0 - dispatch = nav_context().dispatch_key(host, ord("a")) + host.changes._list_state.select(0) + dispatch = nav_context().dispatch_key(host, key("a")) assert dispatch.next_mode == "input" def test_input_context_esc_returns_nav(host: FakeHost) -> None: - dispatch = input_context().dispatch_key(host, 27) + dispatch = input_context().dispatch_key(host, key("Esc")) assert dispatch.next_mode == "nav" @@ -122,14 +128,22 @@ def test_input_context_commit_relinquishes(host: FakeHost, monkeypatch: pytest.M "pygittools.tui.changes_list.commit_staged", lambda _repo, _msg: (True, ""), ) - dispatch = input_context().dispatch_key(host, KEY_ENTER) + dispatch = input_context().dispatch_key(host, key("Enter")) assert dispatch.next_mode == "nav" def test_input_context_status_hint() -> None: - assert "Esc" in InputContext().status_hint(FakeHost(None, ChangesList(), CommitLogList())) + assert "Esc" in InputContext().status_hint( + FakeHost(None, ChangesList(), CommitLogList(), TasksBoardList()), + ) def test_nav_context_without_page_context() -> None: - host = FakeHost(page_context=None, changes=ChangesList(), log=CommitLogList()) - assert nav_context().dispatch_key(host, KEY_DOWN).page_result is None + host = FakeHost(page_context=None, changes=ChangesList(), log=CommitLogList(), tasks=TasksBoardList()) + assert nav_context().dispatch_key(host, key("Down")).page_result is None + + +def test_draw_helpers_unused() -> None: + # keep import of Rect available for call sites in other modules + assert Rect(0, 0, 1, 1).width == 1 + assert MagicMock() is not None diff --git a/pygittools/tui/log_list.py b/pygittools/tui/log_list.py index 21944b6..efec6de 100644 --- a/pygittools/tui/log_list.py +++ b/pygittools/tui/log_list.py @@ -7,14 +7,10 @@ from datetime import UTC, datetime from pygit2 import Commit, GitError, Repository from pygit2.enums import SortMode +from pyratatui import Frame, List, ListItem, ListState, Rect -from pygittools.tui.draw import clear_row, draw_text -from pygittools.tui.git_colors import current_theme, log_entry_attrs -from pygittools.tui.ucurses import ( # type: ignore[import-untyped] - KEY_DOWN, - KEY_RESIZE, - KEY_UP, -) +from pygittools.tui.git_colors import current_theme, log_entry_styles +from pygittools.tui.keys import KeyLike, is_down, is_up _MAX_COMMITS = 500 @@ -34,41 +30,52 @@ class LogNavKeyResult: class CommitLogList: def __init__(self) -> None: self._entries: list[_LogEntry] = [] - self._cursor = 0 - self._scroll_offset = 0 + self._list_state = ListState() def is_at_top(self) -> bool: - return self._cursor == 0 + return (self._list_state.selected or 0) == 0 def refresh(self, repo: Repository) -> None: self._entries = _load_entries(repo) - max_index = max(0, len(self._entries) - 1) - self._cursor = min(self._cursor, max_index) - self._scroll_offset = min(self._scroll_offset, max(0, len(self._entries) - 1)) + selected = self._list_state.selected or 0 + self._list_state.select(min(selected, max(0, len(self._entries) - 1))) - def draw(self, top_row: int, height: int, width: int, *, highlight: bool) -> None: - if height <= 0: + def draw(self, frame: Frame, area: Rect, *, highlight: bool) -> None: + if area.height <= 0 or area.width <= 0: return + theme = current_theme() if not self._entries: - draw_text(top_row, 0, "No commits", width, current_theme().log_date) + frame.render_stateful_list( + List([ListItem("No commits", theme.log_date)]), + area, + self._list_state, + ) return - self._ensure_cursor_visible(height) - for view_row in range(height): - index = self._scroll_offset + view_row - if index >= len(self._entries): - break - entry = self._entries[index] - focused = highlight and index == self._cursor - _draw_entry(top_row + view_row, width, entry, focused=focused, highlight=highlight) - - def handle_nav_key(self, key: int, repo: Repository) -> LogNavKeyResult: - if key == KEY_RESIZE: - return LogNavKeyResult() - if key in (KEY_UP, ord("k"), ord("K")): - self._cursor = max(0, self._cursor - 1) + selected = self._list_state.selected or 0 + items: list[ListItem] = [] + for index, entry in enumerate(self._entries): + focused = highlight and index == selected + hash_style, date_style, subject_style = log_entry_styles( + focused=focused, + highlight=highlight, + ) + del date_style, subject_style + label = f"{entry.short_id} {entry.date} {entry.subject}" + items.append(ListItem(label, hash_style if focused else theme.log_subject)) + frame.render_stateful_list( + List(items).highlight_style(theme.focus).highlight_symbol(""), + area, + self._list_state, + ) + + def handle_nav_key(self, key: KeyLike, repo: Repository) -> LogNavKeyResult: + if is_up(key): + selected = self._list_state.selected or 0 + self._list_state.select(max(0, selected - 1)) return LogNavKeyResult() - if key in (KEY_DOWN, ord("j"), ord("J")): - self._cursor = min(max(0, len(self._entries) - 1), self._cursor + 1) + if is_down(key): + selected = self._list_state.selected or 0 + self._list_state.select(min(max(0, len(self._entries) - 1), selected + 1)) return LogNavKeyResult() self.refresh(repo) return LogNavKeyResult() @@ -76,27 +83,9 @@ class CommitLogList: def status_hint(self) -> str: if not self._entries: return "No commits — j/k move" - entry = self._entries[self._cursor] + entry = self._entries[self._list_state.selected or 0] return f"{entry.short_id} {entry.date} — j/k move" - def _ensure_cursor_visible(self, height: int) -> None: - if self._cursor < self._scroll_offset: - self._scroll_offset = self._cursor - elif self._cursor >= self._scroll_offset + height: - self._scroll_offset = self._cursor - height + 1 - - -def _draw_entry(row: int, width: int, entry: _LogEntry, *, focused: bool, highlight: bool) -> None: - clear_row(row) - hash_attr, date_attr, subject_attr = log_entry_attrs(focused=focused, highlight=highlight) - col = draw_text(row, 0, f"{entry.short_id} ", width, hash_attr) - col = draw_text(row, col, f"{entry.date} ", width, date_attr) - remaining = max(0, width - col) - subject = entry.subject - if len(subject) > remaining: - subject = subject[: max(0, remaining - 1)] + "…" - draw_text(row, col, subject, width, subject_attr) - def _load_entries(repo: Repository) -> list[_LogEntry]: try: @@ -122,12 +111,3 @@ def _load_entries(repo: Repository) -> list[_LogEntry]: def _format_commit_date(commit: Commit) -> str: return datetime.fromtimestamp(commit.commit_time, tz=UTC).strftime("%Y-%m-%d") - - -def _format_entry(entry: _LogEntry, width: int) -> str: - prefix = f"{entry.short_id} {entry.date} " - remaining = max(0, width - len(prefix)) - subject = entry.subject - if len(subject) > remaining: - subject = subject[: max(0, remaining - 1)] + "…" - return f"{prefix}{subject}"[:width] diff --git a/pygittools/tui/log_list_test.py b/pygittools/tui/log_list_test.py index 66e630c..16a1e2d 100644 --- a/pygittools/tui/log_list_test.py +++ b/pygittools/tui/log_list_test.py @@ -4,19 +4,20 @@ from __future__ import annotations import json from pathlib import Path +from unittest.mock import MagicMock import pygit2 import pytest +from pyratatui import Rect -from pygittools.tui.git_colors import init_tui_color_theme -from pygittools.tui.log_list import CommitLogList, _draw_entry, _format_entry, _LogEntry +from pygittools.tui.keys import key +from pygittools.tui.log_list import CommitLogList from pygittools.tui.project_label import repo_project_label SIG = pygit2.Signature("t", "t@example.com", 0) def test_repo_project_label_falls_back_to_worktree(tmp_path: Path, monkeypatch: pytest.MonkeyPatch) -> None: - # Keep PROJECTROOT off the pytest temp tree (Windows temps live under home). settings = tmp_path / "settings.json" settings.write_text(json.dumps({"PROJECTROOT": str(tmp_path / "projects")}), encoding="utf-8") monkeypatch.setenv("PYGITWEB_SETTINGS_CONFIG", str(settings)) @@ -49,7 +50,7 @@ def test_commit_log_list_empty_repo(repo: pygit2.Repository) -> None: log = CommitLogList() log.refresh(repo) assert log.status_hint() == "No commits — j/k move" - log.draw(0, 5, 80, highlight=True) + log.draw(MagicMock(), Rect(0, 0, 80, 5), highlight=True) def test_commit_log_list_navigation(tmp_path: Path) -> None: @@ -58,26 +59,9 @@ def test_commit_log_list_navigation(tmp_path: Path) -> None: repo.create_commit("HEAD", SIG, SIG, "one", tree, []) log = CommitLogList() log.refresh(repo) - from pygittools.tui.ucurses import KEY_DOWN, KEY_RESIZE, KEY_UP - - log.handle_nav_key(KEY_DOWN, repo) - log.handle_nav_key(KEY_UP, repo) - log.handle_nav_key(KEY_RESIZE, repo) - log.handle_nav_key(ord("x"), repo) - - -def test_draw_entry_uses_git_colors() -> None: - init_tui_color_theme(None) - entry = _LogEntry(short_id="abc1234", date="2026-01-01", subject="feat: hello") - _draw_entry(0, 80, entry, focused=True, highlight=True) - - -def test_format_entry_truncates_long_subject() -> None: - from pygittools.tui.log_list import _LogEntry - - entry = _LogEntry(short_id="abc1234", date="2026-01-01", subject="x" * 100) - formatted = _format_entry(entry, 30) - assert len(formatted) <= 30 + log.handle_nav_key(key("Down"), repo) + log.handle_nav_key(key("Up"), repo) + log.handle_nav_key(key("x"), repo) def test_load_entries_without_head(repo: pygit2.Repository) -> None: diff --git a/pygittools/tui/tasks_list.py b/pygittools/tui/tasks_list.py index 4030802..0d8ce46 100644 --- a/pygittools/tui/tasks_list.py +++ b/pygittools/tui/tasks_list.py @@ -6,20 +6,13 @@ from dataclasses import dataclass from typing import Literal from pygit2 import Repository +from pyratatui import Frame, List, ListItem, ListState, Rect from pygittools.tags_sync import format_sync_result, sync_board_tags from pygittools.tasks_query import BOARD_STATUS_ORDER, BoardView, get_board_tasks_grouped, list_boards -from pygittools.tui.draw import draw_line -from pygittools.tui.git_colors import current_theme, focus_attr +from pygittools.tui.git_colors import current_theme, focus_style +from pygittools.tui.keys import KeyLike, is_down, is_enter, is_left, is_right, is_space, is_up from pygittools.tui.types import PageAction, PageResult -from pygittools.tui.ucurses import ( # type: ignore[import-untyped] - KEY_DOWN, - KEY_ENTER, - KEY_LEFT, - KEY_RESIZE, - KEY_RIGHT, - KEY_UP, -) @dataclass(frozen=True, slots=True) @@ -37,8 +30,7 @@ class TasksBoardList: self._board_name: str | None = None self._collapsed: dict[str, bool] = {status: False for status in BOARD_STATUS_ORDER} self._rows: list[_Row] = [] - self._cursor = 0 - self._scroll_offset = 0 + self._list_state = ListState() self._error: str | None = None @property @@ -46,15 +38,14 @@ class TasksBoardList: return self._board_name def is_at_top(self) -> bool: - return self._cursor == 0 + return (self._list_state.selected or 0) == 0 def refresh(self, repo: Repository) -> None: self._boards = list_boards(repo) if not self._boards: self._rows = [] self._board_name = None - self._cursor = 0 - self._scroll_offset = 0 + self._list_state.select(0) return if self._board_name is None: @@ -74,8 +65,8 @@ class TasksBoardList: except KeyError as exc: self._error = str(exc) self._rows = rows - self._cursor = min(self._cursor, max(0, len(self._rows) - 1)) - self._scroll_offset = 0 + selected = self._list_state.selected or 0 + self._list_state.select(min(selected, max(0, len(self._rows) - 1))) return for column in columns: @@ -109,32 +100,34 @@ class TasksBoardList: ) self._rows = rows - self._cursor = min(self._cursor, max(0, len(self._rows) - 1)) - self._ensure_cursor_visible(10) + selected = self._list_state.selected or 0 + self._list_state.select(min(selected, max(0, len(self._rows) - 1))) - def draw(self, top_row: int, height: int, width: int, *, highlight: bool) -> None: - if height <= 0: + def draw(self, frame: Frame, area: Rect, *, highlight: bool) -> None: + if area.height <= 0 or area.width <= 0: return - self._ensure_cursor_visible(height) - + theme = current_theme() if not self._rows and not self._error: - draw_line( - top_row, 0, "No task boards — use pygittools tasks to create one", width, current_theme().log_date + frame.render_stateful_list( + List([ListItem("No task boards — use pygittools tasks to create one", theme.log_date)]), + area, + self._list_state, ) return + items: list[ListItem] = [] if self._error: - draw_line(top_row, 0, self._error[:width], width, current_theme().log_date) - - for view_row in range(height): - row_index = self._scroll_offset + view_row - if row_index >= len(self._rows): - break - row = self._rows[row_index] - focused = highlight and row_index == self._cursor - screen_row = top_row + view_row - attr = _row_attr(row, focused=focused, highlight=highlight) - draw_line(screen_row, 0, row.label, width, attr) + items.append(ListItem(self._error, theme.log_date)) + selected = self._list_state.selected or 0 + for index, row in enumerate(self._rows): + focused = highlight and index == selected + style = _row_style(row, focused=focused, highlight=highlight) + items.append(ListItem(row.label, style)) + frame.render_stateful_list( + List(items).highlight_style(theme.focus).highlight_symbol(""), + area, + self._list_state, + ) def sync_with_default_remote(self, repo: Repository) -> None: remote_names = [name for name in repo.remotes.names() if name] @@ -151,57 +144,48 @@ class TasksBoardList: self._error = format_sync_result(result) self.refresh(repo) - def handle_nav_key(self, key: int, repo: Repository) -> PageResult | None: - if key == KEY_RESIZE: - return None + def handle_nav_key(self, key: KeyLike, repo: Repository) -> PageResult | None: if self._error is not None: self._error = None if not self._rows and not self._boards: self.refresh(repo) return None - if key in (KEY_UP, ord("k"), ord("K")): - self._cursor = max(0, self._cursor - 1) - self._ensure_cursor_visible(10) + if is_up(key): + selected = self._list_state.selected or 0 + self._list_state.select(max(0, selected - 1)) return None - if key in (KEY_DOWN, ord("j"), ord("J")): - self._cursor = min(max(0, len(self._rows) - 1), self._cursor + 1) - self._ensure_cursor_visible(10) + if is_down(key): + selected = self._list_state.selected or 0 + self._list_state.select(min(max(0, len(self._rows) - 1), selected + 1)) return None if not self._rows: return None - row = self._rows[self._cursor] + row = self._rows[self._list_state.selected or 0] if row.kind == "board" and self._boards: - if key in (KEY_LEFT, ord("h"), ord("H")) and self._board_index > 0: + if is_left(key) and self._board_index > 0: self._board_index -= 1 self._board_name = self._boards[self._board_index]["name"] - self._cursor = 0 - self._scroll_offset = 0 + self._list_state.select(0) self.refresh(repo) return None - if key in (KEY_RIGHT, ord("l"), ord("L")) and self._board_index < len(self._boards) - 1: + if is_right(key) and self._board_index < len(self._boards) - 1: self._board_index += 1 self._board_name = self._boards[self._board_index]["name"] - self._cursor = 0 - self._scroll_offset = 0 + self._list_state.select(0) self.refresh(repo) return None return None if row.kind == "status_header" and row.status is not None: - if key in (KEY_LEFT, KEY_RIGHT, ord(" ")): - self._collapsed[row.status] = not self._collapsed.get(row.status, False) - self.refresh(repo) - return None - if key in (KEY_ENTER, 10, 13): + if is_left(key) or is_right(key) or is_space(key) or is_enter(key): self._collapsed[row.status] = not self._collapsed.get(row.status, False) self.refresh(repo) - return None return None - if key in (KEY_ENTER, 10, 13): + if is_enter(key): if row.kind == "new_task" and row.status is not None and self._board_name is not None: return PageResult( action=PageAction.PUSH, @@ -221,7 +205,7 @@ class TasksBoardList: return "No task boards — use pygittools tasks to create one" if not self._rows: return "No tasks — use (+ New Task) to create one" - row = self._rows[self._cursor] + row = self._rows[self._list_state.selected or 0] if row.kind == "board": return "H/L switch board — j/k move" if row.kind == "status_header": @@ -230,14 +214,6 @@ class TasksBoardList: return "Enter create task — j/k move" return "Enter edit task — j/k move" - def _ensure_cursor_visible(self, height: int) -> None: - if height <= 0: - return - if self._cursor < self._scroll_offset: - self._scroll_offset = self._cursor - elif self._cursor >= self._scroll_offset + height: - self._scroll_offset = self._cursor - height + 1 - def _default_board_index(boards: list[BoardView]) -> int: for index, board in enumerate(boards): @@ -255,7 +231,7 @@ def _board_index_for_name(boards: list[BoardView], name: str | None) -> int: return _default_board_index(boards) -def _row_attr(row: _Row, *, focused: bool, highlight: bool) -> int: +def _row_style(row: _Row, *, focused: bool, highlight: bool): theme = current_theme() if row.kind == "board": base = theme.header @@ -264,12 +240,11 @@ def _row_attr(row: _Row, *, focused: bool, highlight: bool) -> int: else: base = theme.normal if focused and highlight: - return focus_attr(base) + return focus_style(base) return base def _task_editor_page(board_name: str, task_ref: str | None, *, default_status: str | None): - # Lazy import to avoid circular dependency. from pygittools.tui.pages.task_editor import TaskEditorPage return TaskEditorPage(board_name=board_name, task_ref=task_ref, default_status=default_status)