deblan-mirror/gum
deblan-mirror/gum
1
0
Fork 0
mirror of https://github.com/charmbracelet/gum synced 2024-04-25 19:40:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(prompt): fix default selection of prompt, timer and exit code (#148)

Browse source 
* fix(prompt): fix default selection of prompt, timer and exit code

* chore(comment): remove unused comment

* fix(confirm): ensure timer is located at fixed selection

* chore(confirm): remove inefficient assignment

* fix: default timeout selection

---------

Co-authored-by: Maas Lalani <maas@lalani.dev>
This commit is contained in:
ChrHan 2023-02-28 07:16:08 +07:00 committed by GitHub
parent e6de7749b1
commit 46dee843db
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 28 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
confirm/command.go
View file

@ -14,15 +14,16 @@ import (
// action with an affirmative or negative answer.
func (o Options) Run() error {
m, err := tea.NewProgram(model{
affirmative: o.Affirmative,
negative: o.Negative,
confirmation: o.Default,
timeout: o.Timeout,
hasTimeout: o.Timeout > 0,
prompt: o.Prompt,
selectedStyle: o.SelectedStyle.ToLipgloss(),
unselectedStyle: o.UnselectedStyle.ToLipgloss(),
promptStyle: o.PromptStyle.ToLipgloss(),
affirmative: o.Affirmative,
negative: o.Negative,
confirmation: o.Default,
defaultSelection: o.Default,
timeout: o.Timeout,
hasTimeout: o.Timeout > 0,
prompt: o.Prompt,
selectedStyle: o.SelectedStyle.ToLipgloss(),
unselectedStyle: o.UnselectedStyle.ToLipgloss(),
promptStyle: o.PromptStyle.ToLipgloss(),
}, tea.WithOutput(os.Stderr)).Run()
if err != nil {

25
confirm/confirm.go
View file

@ -29,6 +29,8 @@ type model struct {
confirmation bool
defaultSelection bool
// styles
promptStyle lipgloss.Style
selectedStyle lipgloss.Style
@ -86,7 +88,7 @@ func (m model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
case tickMsg:
if m.timeout <= 0 {
m.quitting = true
m.confirmation = false
m.confirmation = m.defaultSelection
return m, tea.Quit
}
m.timeout -= tickInterval
@ -100,18 +102,27 @@ func (m model) View() string {
return ""
}
var aff, neg, timeout string
var aff, neg, timeout, affirmativeTimeout, negativeTimeout string
if m.hasTimeout {
timeout = fmt.Sprintf(" (%d)", max(0, int(m.timeout.Seconds())))
}
if m.confirmation {
aff = m.selectedStyle.Render(m.affirmative)
neg = m.unselectedStyle.Render(m.negative + timeout)
// set timer based on defaultSelection
if m.defaultSelection {
affirmativeTimeout = m.affirmative + timeout
negativeTimeout = m.negative
} else {
aff = m.unselectedStyle.Render(m.affirmative)
neg = m.selectedStyle.Render(m.negative + timeout)
affirmativeTimeout = m.affirmative
negativeTimeout = m.negative + timeout
}
if m.confirmation {
aff = m.selectedStyle.Render(affirmativeTimeout)
neg = m.unselectedStyle.Render(negativeTimeout)
} else {
aff = m.unselectedStyle.Render(affirmativeTimeout)
neg = m.selectedStyle.Render(negativeTimeout)
}
// If the option is intentionally empty, do not show it.