fix: overlaping keys in textarea

Signed-off-by: Hadi <112569860+anotherhadi@users.noreply.github.com>
This commit is contained in:
Hadi
2026-05-30 19:10:33 +02:00
parent ef1789af2f
commit 8211d87379
3 changed files with 1 additions and 38 deletions
+1 -4
View File
@@ -18,12 +18,9 @@ func (e Model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
case tea.KeyPressMsg: case tea.KeyPressMsg:
if e.searching { if e.searching {
switch { switch {
case key.Matches(msg, d.SearchReset): case key.Matches(msg, g.Escape):
e.searching = false e.searching = false
e.searchInput.Blur() e.searchInput.Blur()
e.searchInput.SetValue("")
e.matches = nil
e.matchIndex = 0
e.SetSize(e.width, e.height) e.SetSize(e.width, e.height)
case msg.String() == "enter": case msg.String() == "enter":
e.searching = false e.searching = false
-19
View File
@@ -105,7 +105,6 @@ func (m Model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
g := keys.Keys.Global g := keys.Keys.Global
if m.searchKind != searchKindOff && !m.searchAccepted { if m.searchKind != searchKindOff && !m.searchAccepted {
// Actively typing: only search navigation + accept/cancel.
switch { switch {
case key.Matches(msg, g.Escape): case key.Matches(msg, g.Escape):
return m, m.clearSearch() return m, m.clearSearch()
@@ -116,24 +115,6 @@ func (m Model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
} }
m.acceptSearch() m.acceptSearch()
case key.Matches(msg, g.Up):
if m.cursor > 0 {
m.cursor--
m.refreshListViewport()
m.refreshBody()
m.bodyViewport.SetYOffset(0)
m.bodyViewport.SetXOffset(0)
}
case key.Matches(msg, g.Down):
if m.cursor < len(m.entries)-1 {
m.cursor++
m.refreshListViewport()
m.refreshBody()
m.bodyViewport.SetYOffset(0)
m.bodyViewport.SetXOffset(0)
}
default: default:
var cmd tea.Cmd var cmd tea.Cmd
m.searchInput, cmd = m.searchInput.Update(msg) m.searchInput, cmd = m.searchInput.Update(msg)
-15
View File
@@ -287,8 +287,6 @@ func (m Model) updateNormalMode(msg tea.KeyPressMsg, cmds *[]tea.Cmd) (tea.Model
} }
func (m Model) updateEditMode(msg tea.KeyPressMsg, cmds *[]tea.Cmd) (tea.Model, tea.Cmd) { func (m Model) updateEditMode(msg tea.KeyPressMsg, cmds *[]tea.Cmd) (tea.Model, tea.Cmd) {
onResponses := m.captureResponse && m.focusedPanel == panelResponses
switch { switch {
case key.Matches(msg, keys.Keys.Global.Escape): case key.Matches(msg, keys.Keys.Global.Escape):
m.saveCurrentEdit() m.saveCurrentEdit()
@@ -296,19 +294,6 @@ func (m Model) updateEditMode(msg tea.KeyPressMsg, cmds *[]tea.Cmd) (tea.Model,
m.textarea.Blur() m.textarea.Blur()
m.refreshBodyViewport() m.refreshBodyViewport()
case key.Matches(msg, keys.Keys.Intercept.UndoEdits):
if onResponses {
if len(m.responseQueue) > 0 {
delete(m.pendingResponseEdits, m.responseQueue[m.responseCursor])
m.textarea.SetValue(intercept.FormatRawResponse(m.responseQueue[m.responseCursor].Flow))
}
} else {
if len(m.queue) > 0 {
delete(m.pendingEdits, m.queue[m.cursor])
m.textarea.SetValue(intercept.FormatRawRequest(m.queue[m.cursor].Flow))
}
}
default: default:
var cmd tea.Cmd var cmd tea.Cmd
m.textarea, cmd = m.textarea.Update(msg) m.textarea, cmd = m.textarea.Update(msg)