fix: Fix invalid order of event handling in input/text

Key binds should be checked before the key event is accepted as user input. See charmbracelet/bubbletea#1041 for more information.
Sculas · Jun 18, 2024 · 596c6e9 · 596c6e9
1 parent 90406d7
commit 596c6e9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/field_input.go b/field_input.go
@@ -205,10 +205,6 @@ func (i *Input) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 	var cmds []tea.Cmd
 	var cmd tea.Cmd
 
-	i.textinput, cmd = i.textinput.Update(msg)
-	cmds = append(cmds, cmd)
-	i.accessor.Set(i.textinput.Value())
-
 	switch msg := msg.(type) {
 	case tea.KeyMsg:
 		i.err = nil
@@ -231,6 +227,10 @@ func (i *Input) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 		}
 	}
 
+	i.textinput, cmd = i.textinput.Update(msg)
+	cmds = append(cmds, cmd)
+	i.accessor.Set(i.textinput.Value())
+
 	return i, tea.Batch(cmds...)
 }
 

diff --git a/field_text.go b/field_text.go
@@ -202,10 +202,6 @@ func (t *Text) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 	var cmds []tea.Cmd
 	var cmd tea.Cmd
 
-	t.textarea, cmd = t.textarea.Update(msg)
-	cmds = append(cmds, cmd)
-	t.accessor.Set(t.textarea.Value())
-
 	switch msg := msg.(type) {
 	case updateValueMsg:
 		t.textarea.SetValue(string(msg))
@@ -244,6 +240,10 @@ func (t *Text) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 		}
 	}
 
+	t.textarea, cmd = t.textarea.Update(msg)
+	cmds = append(cmds, cmd)
+	t.accessor.Set(t.textarea.Value())
+
 	return t, tea.Batch(cmds...)
 }