fix: improve key press handling for quitting the application

Rshep3087 · Feb 9, 2025 · 65eb31c · 65eb31c
1 parent b97b3a3
commit 65eb31c
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/go.mod b/go.mod
@@ -20,7 +20,7 @@ require (
 	github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
 	github.com/catppuccin/go v0.3.0 // indirect
 	github.com/charmbracelet/x/ansi v0.8.0 // indirect
-	github.com/charmbracelet/x/exp/strings v0.0.0-20250206210616-ac5dd4e7ff44 // indirect
+	github.com/charmbracelet/x/exp/strings v0.0.0-20250207233001-40534c389c2d // indirect
 	github.com/charmbracelet/x/term v0.2.1 // indirect
 	github.com/cpuguy83/go-md2man/v2 v2.0.6 // indirect
 	github.com/dustin/go-humanize v1.0.1 // indirect

diff --git a/go.sum b/go.sum
@@ -26,6 +26,8 @@ github.com/charmbracelet/x/exp/golden v0.0.0-20240815200342-61de596daa2b h1:MnAM
 github.com/charmbracelet/x/exp/golden v0.0.0-20240815200342-61de596daa2b/go.mod h1:wDlXFlCrmJ8J+swcL/MnGUuYnqgQdW9rhSD61oNMb6U=
 github.com/charmbracelet/x/exp/strings v0.0.0-20250206210616-ac5dd4e7ff44 h1:qQ+AlEwPP1CcrES0o9S5ZoDN0bTI3uWbRyqbhmlsL4Q=
 github.com/charmbracelet/x/exp/strings v0.0.0-20250206210616-ac5dd4e7ff44/go.mod h1:pBhA0ybfXv6hDjQUZ7hk1lVxBiUbupdw5R31yPUViVQ=
+github.com/charmbracelet/x/exp/strings v0.0.0-20250207233001-40534c389c2d h1:DfaFioLurGyvLkEVtVonWhPquBrujumJUtVqXebtgYg=
+github.com/charmbracelet/x/exp/strings v0.0.0-20250207233001-40534c389c2d/go.mod h1:pBhA0ybfXv6hDjQUZ7hk1lVxBiUbupdw5R31yPUViVQ=
 github.com/charmbracelet/x/term v0.2.1 h1:AQeHeLZ1OqSXhrAWpYUtZyX1T3zVxfpZuEQMIQaGIAQ=
 github.com/charmbracelet/x/term v0.2.1/go.mod h1:oQ4enTYFV7QN4m0i9mzHrViD7TQKvNEEkHUMCmsxdUg=
 github.com/cpuguy83/go-md2man/v2 v2.0.6 h1:XJtiaUW6dEEqVuZiMTn1ldk455QWwEIsMIJlo5vtkx0=

diff --git a/main.go b/main.go
@@ -374,7 +374,17 @@ func handleKeyPress(msg tea.KeyMsg, m *model) (tea.Model, tea.Cmd) {
 	k := msg.String()
 	log.Debug("key pressed", "key", k)
 
-	if k == "q" || k == "ctrl+c" {
+	// always quit on ctrl+c
+	if k == "ctrl+c" {
+		return m, tea.Quit
+	}
+
+	// check if any of the models that support filtering.
+	if m.transactions.FilterState() == list.Filtering {
+		return m, nil
+	}
+
+	if k == "q" {
 		return m, tea.Quit
 	}