Skip to content

fix(tui): correct cursor tracking for group reorder K/J #399

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
essentialols wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(tui): correct cursor tracking for group reorder K/J #399

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
40 changes: 30 additions & 10 deletions internal/ui/home.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4938,14 +4938,24 @@ func (h *Home) handleMainKey(msg tea.KeyMsg) (tea.Model, tea.Cmd) {
switch item.Type {
case session.ItemTypeGroup:
h.groupTree.MoveGroupUp(item.Path)
h.rebuildFlatItems()
// Track cursor to the group's new position (it may have jumped
// over multiple flat items if the sibling above was expanded).
for i, fi := range h.flatItems {
if fi.Type == session.ItemTypeGroup && fi.Path == item.Path {
h.cursor = i
break
}
}
h.saveGroupState()
case session.ItemTypeSession:
h.groupTree.MoveSessionUp(item.Session)
h.rebuildFlatItems()
if h.cursor > 0 {
h.cursor--
}
h.saveInstances()
}
h.rebuildFlatItems()
if h.cursor > 0 {
h.cursor--
}
h.saveInstances()
}
return h, nil

Expand All @@ -4956,14 +4966,24 @@ func (h *Home) handleMainKey(msg tea.KeyMsg) (tea.Model, tea.Cmd) {
switch item.Type {
case session.ItemTypeGroup:
h.groupTree.MoveGroupDown(item.Path)
h.rebuildFlatItems()
// Track cursor to the group's new position (it may have jumped
// over multiple flat items if the sibling below was expanded).
for i, fi := range h.flatItems {
if fi.Type == session.ItemTypeGroup && fi.Path == item.Path {
h.cursor = i
break
}
}
h.saveGroupState()
case session.ItemTypeSession:
h.groupTree.MoveSessionDown(item.Session)
h.rebuildFlatItems()
if h.cursor < len(h.flatItems)-1 {
h.cursor++
}
h.saveInstances()
}
h.rebuildFlatItems()
if h.cursor < len(h.flatItems)-1 {
h.cursor++
}
h.saveInstances()
}
return h, nil

Expand Down
Loading