Skip to content

fix right to show last focused on following mode #264

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
davixcky wants to merge 3 commits into
base: main
Choose a base branch
from
Open

fix right to show last focused on following mode #264

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
45b2139
fix right to show last focused on following mode
davixcky Oct 31, 2025
dd75da9
Merge branch 'main' of github.com:signadot/cli into tui-fix-right-not…
davixcky Oct 31, 2025
276549b
fix pr comment
davixcky Oct 31, 2025
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
3 changes: 3 additions & 0 deletions internal/tui/views/trafficwatch/left_pane.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,9 @@ func (l *LeftPane) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
}

var cmd tea.Cmd
if val, ok := msg.(tea.KeyMsg); ok && val.String() == "left" {
return l, nil
}
l.paginator, cmd = l.paginator.Update(msg)
return l, cmd
}
Expand Down
16 changes: 7 additions & 9 deletions internal/tui/views/trafficwatch/main_view.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,22 +335,20 @@ func (m *MainView) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
}

// Update focused pane
var cmd tea.Cmd
if m.state == StateWithData {
m.rightPane.SetFocused(m.focus == "right")

switch m.focus {
case "left":
_, cmd = m.leftPane.Update(msg)
case "right":
_, cmd = m.rightPane.Update(msg)
}
_, cmd := m.leftPane.Update(msg)
cmds = append(cmds, cmd)

_, cmd = m.rightPane.Update(msg)
Copy link
Contributor

@daniel-de-vera daniel-de-vera Oct 31, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't we need an cmds = append(cmds, cmd) here?

Copy link
Contributor Author

@davixcky davixcky Oct 31, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added 276549b

cmds = append(cmds, cmd)
}

if m.state == StateLogs {
_, cmd = m.logsView.Update(msg)
_, cmd := m.logsView.Update(msg)
cmds = append(cmds, cmd)
}
cmds = append(cmds, cmd)

return m, tea.Batch(cmds...)
}
Expand Down