From 2e1579542e92db45b4f754e04682375229510ed5 Mon Sep 17 00:00:00 2001
From: Christian Rocha <christian@rocha.is>
Date: Tue, 10 Nov 2020 18:48:34 -0500
Subject: [PATCH] Don't highlight filtered items until search is blurred

---
 ui/stash.go     |  6 +-----
 ui/stashitem.go | 21 +++++++++------------
 2 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/ui/stash.go b/ui/stash.go
index 93245f1..f923fee 100644
--- a/ui/stash.go
+++ b/ui/stash.go
@@ -701,11 +701,7 @@ func stashUpdate(msg tea.Msg, m stashModel) (stashModel, tea.Cmd) {
 					m.state = stashStateReady
 				}
 
-			case "ctrl+k", "up":
-				m.moveCursorUp()
-				m.state = stashStateShowFiltered
-			case "ctrl+j", "down":
-				m.moveCursorDown()
+			case "ctrl+k", "ctrl+j", "up", "down":
 				m.state = stashStateShowFiltered
 			}
 		}
diff --git a/ui/stashitem.go b/ui/stashitem.go
index f3be1df..770d5d2 100644
--- a/ui/stashitem.go
+++ b/ui/stashitem.go
@@ -78,7 +78,15 @@ func stashItemView(b *strings.Builder, m stashModel, index int, md *markdown) {
 		title = truncate(title, truncateTo)
 	}
 
-	if index == m.index {
+	isSelected := index == m.index
+	notSearchingNotes := m.state != stashStateSearchNotes
+
+	// If there are multiple items being filtered we don't highlight a selected
+	// item in the results. If we've filtered down to one item, however,
+	// highlight that first item since pressing return will open it.
+	singleFilteredItem := m.state == stashStateSearchNotes && len(m.getNotes()) == 1
+
+	if isSelected && notSearchingNotes || singleFilteredItem {
 		// Selected item
 
 		switch m.state {
@@ -92,17 +100,6 @@ func stashItemView(b *strings.Builder, m stashModel, index int, md *markdown) {
 			icon = ""
 			title = textinput.View(m.noteInput)
 			date = dullYellowFg(date)
-		case stashStateSearchNotes:
-			if len(m.getNotes()) != 1 && m.searchInput.Value() == "" {
-				gutter = dimDullFuchsiaFg(verticalLine)
-				icon = dimDullFuchsiaFg(icon)
-				title = dimFuchsiaFg(title)
-				date = dimDullFuchsiaFg(date)
-				break
-			}
-			// If we've filtered down to exactly item color it as though it's
-			// not filtered, since pressing return will open it.
-			fallthrough
 		default:
 			gutter = dullFuchsiaFg(verticalLine)
 			icon = dullFuchsiaFg(icon)