From 66dae71253d26352f1190c76ac6f7fad8aca2993 Mon Sep 17 00:00:00 2001 From: Christian Rocha Date: Fri, 21 Aug 2020 17:30:33 -0400 Subject: [PATCH] Show spinner in stash view while stashing --- ui/stash.go | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/ui/stash.go b/ui/stash.go index 70c22d6..4424edd 100644 --- a/ui/stash.go +++ b/ui/stash.go @@ -290,7 +290,12 @@ func stashUpdate(msg tea.Msg, m stashModel) (stashModel, tea.Cmd) { } case spinner.TickMsg: - if !m.loaded.done() || m.loadingFromNetwork || m.state == stashStateLoadingDocument { + condition := !m.loaded.done() || + m.loadingFromNetwork || + m.state == stashStateLoadingDocument || + len(m.filesStashing) > 0 + + if condition { newSpinnerModel, cmd := spinner.Update(msg, m.spinner) m.spinner = newSpinnerModel cmds = append(cmds, cmd) @@ -410,7 +415,7 @@ func stashUpdate(msg tea.Msg, m stashModel) (stashModel, tea.Cmd) { } m.filesStashing[md.localPath] = struct{}{} - cmds = append(cmds, stashDocument(m.cc, *md)) + cmds = append(cmds, stashDocument(m.cc, *md), spinner.Tick(m.spinner)) // Prompt for deletion case "x": @@ -547,7 +552,7 @@ func stashView(m stashModel) string { case stashStateReady, stashStateSettingNote, stashStatePromptDelete: loadingIndicator := "" - if !m.loaded.done() || m.loadingFromNetwork { + if !m.loaded.done() || m.loadingFromNetwork || len(m.filesStashing) > 0 { loadingIndicator = spinner.View(m.spinner) }