fix: make errors blocking on input

charmbracelet · Dec 12, 2023 · 77c4239 · 77c4239
1 parent e7c5847
commit 77c4239
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 0 deletions.
diff --git a/examples/burger/main.go b/examples/burger/main.go
@@ -1,6 +1,7 @@
 package main
 
 import (
+	"errors"
 	"fmt"
 	"os"
 	"strconv"
@@ -124,6 +125,12 @@ func main() {
 				Value(&order.Name).
 				Title("What's your name?").
 				Placeholder("Margaret Thatcher").
+				Validate(func(s string) error {
+					if s == "Frank" {
+						return errors.New("no franks, sorry")
+					}
+					return nil
+				}).
 				Description("For when your order is ready."),
 
 			huh.NewText().

diff --git a/field_input.go b/field_input.go
@@ -162,8 +162,18 @@ func (i *Input) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 
 		switch {
 		case key.Matches(msg, i.keymap.Prev):
+			value := i.textinput.Value()
+			i.err = i.validate(value)
+			if i.err != nil {
+				return i, nil
+			}
 			cmds = append(cmds, prevField)
 		case key.Matches(msg, i.keymap.Next):
+			value := i.textinput.Value()
+			i.err = i.validate(value)
+			if i.err != nil {
+				return i, nil
+			}
 			cmds = append(cmds, nextField)
 		}
 	}