feat(ui): update error detection rendering position

update error detection rendering position

Signed-off-by: mritd <[email protected]>

Author: mritd

ui_commit.go

@@ -3,6 +3,8 @@ package main
 import (
 	"strings"
 
+	"github.com/charmbracelet/bubbles/spinner"
+
 	tea "github.com/charmbracelet/bubbletea"
 )
 
@@ -58,9 +60,9 @@ func (m *commitModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 		// some special views need to determine the state of the data to update
 		switch m.viewIndex {
 		case INPUTS:
-			return m, m.inputs
+			return m, tea.Batch(spinner.Tick, m.inputs)
 		case COMMIT:
-			return m, m.commit
+			return m, tea.Batch(spinner.Tick, m.commit)
 		case ERROR:
 			return m, m.showErr
 		default:

ui_commit_committing.go

@@ -94,13 +94,11 @@ func (m committingModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 			return m, nil
 		}
 	case commitMsg:
-		var cmd tea.Cmd
-		m.spinner, cmd = m.spinner.Update(spinner.Tick())
 		m.msg = msg
-		return m, tea.Batch(cmd, func() tea.Msg {
+		return m, func() tea.Msg {
 			time.Sleep(time.Second)
 			return commit(msg)
-		})
+		}
 	case error:
 		m.done = true
 		m.err = msg

ui_commit_inputs.go

@@ -88,7 +88,7 @@ type inputsModel struct {
 }
 
 func (m inputsModel) Init() tea.Cmd {
-	return textinput.Blink
+	return tea.Batch(textinput.Blink, spinner.Tick)
 }
 
 func (m inputsModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
@@ -145,13 +145,6 @@ func (m inputsModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 				m.inputs[i].input.TextStyle = inputsTextNormalStyle
 			}
 
-			if m.focusIndex < len(m.inputs) && m.inputs[m.focusIndex].checker != nil {
-				m.err = m.inputs[m.focusIndex].checker(m.inputs[m.focusIndex].input.Value())
-				cmds = append(cmds, spinner.Tick)
-			} else {
-				m.err = nil
-			}
-
 			return m, tea.Batch(cmds...)
 		}
 	case string:
@@ -196,12 +189,19 @@ func (m inputsModel) View() string {
 		button = inputsButtonStyle.Render("➜ Submit")
 	}
 
-	if m.err != nil {
-		b.WriteString(inputsButtonBlockStyle.Render(button + inputsErrLayout.Render(m.errSpinner.View()+" "+inputsErrStyle.Render(m.err.Error()))))
-	} else {
-		b.WriteString(inputsButtonBlockStyle.Render(button))
+	// check input value
+	for _, iwc := range m.inputs {
+		if iwc.checker != nil {
+			m.err = iwc.checker(iwc.input.Value())
+			if m.err != nil {
+				button += inputsErrLayout.Render(m.errSpinner.View() + " " + inputsErrStyle.Render(m.err.Error()))
+				break
+			}
+		}
 	}
 
+	b.WriteString(inputsButtonBlockStyle.Render(button))
+
 	title := inputsTitleBarStyle.Render(inputsTitleStyle.Render(m.title))
 	inputs := inputsBlockStyle.Render(b.String())