diff --git a/internal/app/keymap.go b/internal/app/keymap.go index 65eec71..7364896 100644 --- a/internal/app/keymap.go +++ b/internal/app/keymap.go @@ -3,16 +3,15 @@ package app import "github.com/charmbracelet/bubbles/key" type KeyMap struct { - Exit key.Binding - Back key.Binding - ToggleView key.Binding + Exit key.Binding + Back key.Binding + ToggleView key.Binding ToggleViewArrow key.Binding - Up key.Binding - Down key.Binding - Filter key.Binding + Up key.Binding + Down key.Binding + Filter key.Binding } - var defaultKeys = KeyMap{ Exit: key.NewBinding( key.WithKeys("ctrl+c", "f10"), @@ -52,4 +51,4 @@ func (k KeyMap) FullHelp() [][]key.Binding { {k.Back, k.Up, k.Down}, // first column {k.ToggleView, k.Exit, k.Filter}, // second column } -} \ No newline at end of file +} diff --git a/internal/app/statefiltered.go b/internal/app/statefiltered.go index 187090f..48e0e08 100644 --- a/internal/app/statefiltered.go +++ b/internal/app/statefiltered.go @@ -17,7 +17,7 @@ type StateFiltered struct { logEntries source.LogEntries filterText string - keys KeyMap + keys KeyMap } func newStateFiltered( @@ -32,7 +32,7 @@ func newStateFiltered( table: previousState.table, filterText: filterText, - keys: defaultKeys, + keys: defaultKeys, } } @@ -67,12 +67,12 @@ func (s StateFiltered) Update(msg tea.Msg) (tea.Model, tea.Cmd) { return s.handleOpenJSONRowRequestedMsg(msg, s) case tea.KeyMsg: switch { - case key.Matches(msg, s.keys.Back): - return s.previousState.withApplication(s.Application) - case key.Matches(msg, s.keys.Filter): - return s.handleFilterKeyClickedMsg() - case key.Matches(msg, s.keys.ToggleViewArrow) , key.Matches(msg, s.keys.ToggleView): - return s.handleRequestOpenJSON() + case key.Matches(msg, s.keys.Back): + return s.previousState.withApplication(s.Application) + case key.Matches(msg, s.keys.Filter): + return s.handleFilterKeyClickedMsg() + case key.Matches(msg, s.keys.ToggleViewArrow), key.Matches(msg, s.keys.ToggleView): + return s.handleRequestOpenJSON() } if cmd := s.handleKeyMsg(msg); cmd != nil { return s, cmd diff --git a/internal/app/statefiltering.go b/internal/app/statefiltering.go index b463237..db08300 100644 --- a/internal/app/statefiltering.go +++ b/internal/app/statefiltering.go @@ -16,7 +16,7 @@ type StateFiltering struct { table logsTableModel textInput textinput.Model - keys KeyMap + keys KeyMap } func newStateFiltering( @@ -33,7 +33,7 @@ func newStateFiltering( table: previousState.table, textInput: textInput, - keys: defaultKeys, + keys: defaultKeys, } } @@ -58,10 +58,10 @@ func (s StateFiltering) Update(msg tea.Msg) (tea.Model, tea.Cmd) { return s.handleErrorOccuredMsg(msg) case tea.KeyMsg: switch { - case key.Matches(msg, s.keys.Back): - return s.previousState.withApplication(s.Application) - case key.Matches(msg, s.keys.ToggleView): - return s.handleEnterKeyClickedMsg() + case key.Matches(msg, s.keys.Back): + return s.previousState.withApplication(s.Application) + case key.Matches(msg, s.keys.ToggleView): + return s.handleEnterKeyClickedMsg() } if cmd := s.handleKeyMsg(msg); cmd != nil { // Intercept table update. diff --git a/internal/app/stateloaded.go b/internal/app/stateloaded.go index 79d630f..f07e614 100644 --- a/internal/app/stateloaded.go +++ b/internal/app/stateloaded.go @@ -75,15 +75,14 @@ func (s StateLoaded) Update(msg tea.Msg) (tea.Model, tea.Cmd) { return s.handleOpenJSONRowRequestedMsg(msg, s) case tea.KeyMsg: switch { - case key.Matches(msg, s.keys.Back): - return s, tea.Quit - case key.Matches(msg, s.keys.Filter): - return s.handleFilterKeyClickedMsg() - case key.Matches(msg, s.keys.ToggleViewArrow), key.Matches(msg, s.keys.ToggleView): - return s.handleRequestOpenJSON() + case key.Matches(msg, s.keys.Back): + return s, tea.Quit + case key.Matches(msg, s.keys.Filter): + return s.handleFilterKeyClickedMsg() + case key.Matches(msg, s.keys.ToggleViewArrow), key.Matches(msg, s.keys.ToggleView): + return s.handleRequestOpenJSON() } cmdBatch = append(cmdBatch, s.handleKeyMsg(msg)...) - } s.table, cmdBatch = batched(s.table.Update(msg))(cmdBatch) diff --git a/internal/app/stateviewrow.go b/internal/app/stateviewrow.go index 0e9d405..271b04f 100644 --- a/internal/app/stateviewrow.go +++ b/internal/app/stateviewrow.go @@ -63,8 +63,8 @@ func (s StateViewRow) Update(msg tea.Msg) (tea.Model, tea.Cmd) { return s.handleErrorOccuredMsg(msg) case tea.KeyMsg: switch { - case key.Matches(msg, s.keys.Back), key.Matches(msg, s.keys.ToggleView): - return s.previousState.withApplication(s.Application) + case key.Matches(msg, s.keys.Back), key.Matches(msg, s.keys.ToggleView): + return s.previousState.withApplication(s.Application) } if cmd = s.handleKeyMsg(msg); cmd != nil { return s, cmd diff --git a/internal/pkg/events/events.go b/internal/pkg/events/events.go index df40bc7..03aa6ab 100644 --- a/internal/pkg/events/events.go +++ b/internal/pkg/events/events.go @@ -25,7 +25,6 @@ type ( // ViewRowsReloadRequestedMsg is an event to start reloading of logs. ViewRowsReloadRequestedMsg struct{} - ) // OpenJSONRowRequested implements tea.Cmd. It creates OpenJSONRowRequestedMsg.