feat: working loading state with all correct animation sequence

Author: traviolus

models/weaveinit/run_l1_node.go

@@ -609,10 +609,15 @@ func (m *InitializingAppLoading) Init() tea.Cmd {
 }
 
 func (m *InitializingAppLoading) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
-	md, cmd := m.Loading.Update(msg)
-	return md, cmd
+	loader, cmd := m.Loading.Update(msg)
+	m.Loading = loader
+	if m.Loading.Completing {
+		m.state.weave.PreviousResponse += styles.RenderPreviousResponse(styles.NoSeparator, "Initialization successful.", []string{}, "")
+		return m, tea.Quit
+	}
+	return m, cmd
 }
 
 func (m *InitializingAppLoading) View() string {
-	return m.Loading.View()
+	return m.Loading.View(m.state.weave.PreviousResponse)
 }

styles/text.go

@@ -74,21 +74,12 @@ func RenderPrompt(text string, highlights []string, status PromptStatus) string
 	return prompt + text
 }
 
-type ResponseSeparator int64
-
-const (
-	ArrowSeparator ResponseSeparator = iota
-	DotsSeparator
+var (
+	NoSeparator    string = ""
+	ArrowSeparator string = Text(" > ", Gray)
+	DotsSeparator  string = Text(" ... ", Gray)
 )
 
-func RenderPreviousResponse(separator ResponseSeparator, question string, highlights []string, answer string) string {
-	var separatorString string
-	switch separator {
-	case ArrowSeparator:
-		separatorString = Text(" > ", Gray)
-	case DotsSeparator:
-		separatorString = Text(" ... ", Gray)
-	}
-
-	return RenderPrompt(question, highlights, Completed) + separatorString + answer + "\n"
+func RenderPreviousResponse(separator string, question string, highlights []string, answer string) string {
+	return RenderPrompt(question, highlights, Completed) + separator + answer + "\n"
 }

utils/loading.go

@@ -23,13 +23,13 @@ var Dot = Spinner{
 }
 
 type Loading struct {
-	Spinner Spinner
-	Style   lipgloss.Style
-	Text    string
+	Spinner    Spinner
+	Style      lipgloss.Style
+	Text       string
+	Completing bool
 
-	quitting   bool
-	completing bool
-	frame      int
+	quitting bool
+	frame    int
 }
 
 func NewLoading(text string) Loading {
@@ -44,16 +44,16 @@ func (m Loading) Init() tea.Cmd {
 	return m.tick()
 }
 
-func (m Loading) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
+func (m Loading) Update(msg tea.Msg) (Loading, tea.Cmd) {
 	switch msg := msg.(type) {
 	case tea.KeyMsg:
 		switch msg.String() {
 		case "q", "esc", "ctrl+c":
 			m.quitting = true
 			return m, tea.Quit
 		case "f":
-			m.completing = true
-			return m, tea.Quit
+			m.Completing = true
+			return m, nil
 		default:
 			return m, nil
 		}
@@ -69,19 +69,16 @@ func (m Loading) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 	}
 }
 
-func (m Loading) View() string {
+func (m Loading) View(previousResponse string) string {
 	if m.frame >= len(m.Spinner.Frames) {
 		return "(error)"
 	}
 	spinner := m.Style.Render(m.Spinner.Frames[m.frame])
 
-	if m.completing {
-		return fmt.Sprintf("\n%s %s\n", m.Spinner.Complete, m.Text)
-	}
-	str := fmt.Sprintf("\n%s %s\n", spinner, m.Text)
-	if m.quitting {
-		return str + "\n"
+	if m.Completing {
+		return previousResponse
 	}
+	str := fmt.Sprintf("%s%s%s\n", previousResponse, spinner, m.Text)
 	return str
 }