tui: use "q" and "l" to quit the linksmode

azimut · Apr 26, 2023 · 38ac070 · 38ac070
1 parent 6b703c7
commit 38ac070
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/internal/tui/list.go b/internal/tui/list.go
@@ -74,10 +74,10 @@ var DefaultListKeyMap = list.KeyMap{
 	),
 
 	// Quitting.
-	Quit: key.NewBinding(
-		key.WithKeys("q", "esc"),
-		key.WithHelp("q", "quit"),
-	),
+	// Quit: key.NewBinding(
+	// 	key.WithKeys("q", "esc"),
+	// 	key.WithHelp("q", "quit"),
+	// ),
 	ForceQuit: key.NewBinding(key.WithKeys("ctrl+c")),
 }
 

diff --git a/internal/tui/tui.go b/internal/tui/tui.go
@@ -87,6 +87,7 @@ func (m Model) Update(msg tea.Msg) (Model, tea.Cmd) {
 			)
 			m.list.KeyMap = DefaultListKeyMap
 			m.list.SetShowTitle(false)
+			m.list.DisableQuitKeybindings()
 			m.Viewport = viewport.Model{
 				Width:  msg.Width,
 				Height: msg.Height,
@@ -105,6 +106,10 @@ func (m Model) Update(msg tea.Msg) (Model, tea.Cmd) {
 	case tea.KeyMsg:
 		if m.onLinkScreen {
 			switch {
+			case key.Matches(msg, DefaultKeyMap.Links):
+				m.onLinkScreen = false
+			case key.Matches(msg, DefaultKeyMap.Quit):
+				m.onLinkScreen = false
 			case key.Matches(msg, DefaultKeyMap.LinksOpen):
 				i, ok := m.list.SelectedItem().(item)
 				if ok {