Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

chore: replace AlecAivazis/survey with charmbracelet/bubbletea#14475

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Merged
DanielleMaywood merged 28 commits intomainfromdm-replace-survey-with-bubbletea
Sep 4, 2024
Merged
Changes from1 commit
Commits
Show all changes
28 commits
Select commitHold shift + click to select a range
3934cb6
chore: replace survery library with bubbletea
DanielleMaywoodAug 29, 2024
164402b
chore: fix nolint comments
DanielleMaywoodAug 29, 2024
360fb95
chore: add message and colour to select prompts
DanielleMaywoodAug 29, 2024
7cf35d1
chore: make SelectedOptions private
DanielleMaywoodAug 29, 2024
b5092a6
chore: add filtering for multiselect, improve filtering algo
DanielleMaywoodAug 29, 2024
e4c010e
chore: allow vertical wrap on select/multiselect
DanielleMaywoodAug 29, 2024
2b6cd6e
chore: fix failing jobs
DanielleMaywoodAug 29, 2024
35fe461
chore: update charmbracelet/bubbletea to v1.0.0
DanielleMaywoodAug 29, 2024
5982185
chore: remove windows testing workaround for survey library
DanielleMaywoodAug 29, 2024
affbfbe
chore: update bubbletea to v1.1.0
DanielleMaywoodSep 2, 2024
33196cd
chore: reimplement testing workaround
DanielleMaywoodSep 2, 2024
409cec5
chore: use survey's default page size
DanielleMaywoodSep 2, 2024
52ed127
chore: ensure no underflow on page bottom
DanielleMaywoodSep 2, 2024
60c83d0
chore: remove multi-select test from cmd/cliui
DanielleMaywoodSep 3, 2024
2b621ce
chore: disable HideSearch from cmd/cliui select
DanielleMaywoodSep 3, 2024
8a3cd26
chore: use strings.Builder, fix select all logic, apply nitpicks
DanielleMaywoodSep 3, 2024
6e59ecb
chore: use strings.Builder
DanielleMaywoodSep 3, 2024
579c73b
chore: move m.search.Update out of case
DanielleMaywoodSep 3, 2024
9078242
chore: use tea.WithContext(inv.Context()) for tea program
DanielleMaywoodSep 3, 2024
f2ed4fa
chore: return nil as err already handled
DanielleMaywoodSep 3, 2024
7784110
chore: use const instead of magic number
DanielleMaywoodSep 3, 2024
f598836
chore: handle signals ourself instead of bubbletea
DanielleMaywoodSep 3, 2024
8a7f1bc
chore: update flake.nix
DanielleMaywoodSep 4, 2024
77804e0
chore: update flake.nix
DanielleMaywoodSep 4, 2024
2904b7c
chore: update flake.nix
DanielleMaywoodSep 4, 2024
0b99afe
chore: update flake.nix
DanielleMaywoodSep 4, 2024
b173fb0
chore: update flake.nix
DanielleMaywoodSep 4, 2024
966f772
chore: update flake.nix
DanielleMaywoodSep 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
PrevPrevious commit
NextNext commit
chore: add message and colour to select prompts
  • Loading branch information
@DanielleMaywood
DanielleMaywood committedSep 4, 2024
commit360fb95329dfd81219b5aa8f2acd37ae3f52df94
97 changes: 73 additions & 24 deletionscli/cliui/select.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ import (
"golang.org/x/xerrors"

"github.com/coder/coder/v2/codersdk"
"github.com/coder/pretty"
"github.com/coder/serpent"
)

Expand DownExpand Up@@ -80,6 +81,7 @@ func Select(inv *serpent.Invocation, opts SelectOptions) (string, error) {
hideSearch: opts.HideSearch,
options: opts.Options,
height: opts.Size,
message: opts.Message,
}

if initialModel.height == 0 {
Expand DownExpand Up@@ -110,6 +112,7 @@ type selectModel struct {
options []string
cursor int
height int
message string
selected string
canceled bool
hideSearch bool
Expand DownExpand Up@@ -170,22 +173,33 @@ func (m selectModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
func (m selectModel) View() string {
var s string

if m.hideSearch {
s += "? [Use arrows to move]\n"
} else {
s += fmt.Sprintf("? %s [Use arrows to move, type to filter]\n", m.search.View())
}
msg := pretty.Sprintf(pretty.Bold(), "? %s", m.message)

options, start := m.viewableOptions()

for i, option := range options {
// Is this the currently selected option?
cursor := " "
if m.cursor == start+i {
cursor = ">"
if m.selected == "" {
if m.hideSearch {
s += fmt.Sprintf("%s [Use arrows to move]\n", msg)
} else {
s += fmt.Sprintf("%s %s[Use arrows to move, type to filter]\n", msg, m.search.View())
}

s += fmt.Sprintf("%s %s\n", cursor, option)
options, start := m.viewableOptions()

for i, option := range options {
// Is this the currently selected option?
style := pretty.Wrap(" ", "")
if m.cursor == start+i {
style = pretty.Style{
pretty.Wrap("> ", ""),
pretty.FgColor(Green),
}
}

s += pretty.Sprint(style, option)
s += "\n"
}
} else {
selected := pretty.Sprint(DefaultStyles.Keyword, m.selected)
s += fmt.Sprintf("%s %s\n", msg, selected)
}

return s
Expand DownExpand Up@@ -238,11 +252,18 @@ func MultiSelect(inv *serpent.Invocation, opts MultiSelectOptions) ([]string, er
options := make([]multiSelectOption, len(opts.Options))
for i, option := range opts.Options {
options[i].option = option

for _, d := range opts.Defaults {
if option == d {
options[i].chosen = true
}
}
}

initialModel := multiSelectModel{
search: textinput.New(),
options: options,
message: opts.Message,
}

initialModel.search.Prompt = ""
Expand DownExpand Up@@ -278,7 +299,9 @@ type multiSelectModel struct {
search textinput.Model
options []multiSelectOption
cursor int
message string
canceled bool
selected bool
}

func (multiSelectModel) Init() tea.Cmd {
Expand All@@ -297,12 +320,13 @@ func (m multiSelectModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {

case tea.KeyEnter:
if len(m.options) != 0 {
m.selected = true
return m, tea.Quit
}

case tea.KeySpace:
if len(m.options) != 0 {
m.options[m.cursor].chosen =true
m.options[m.cursor].chosen =!m.options[m.cursor].chosen
}

case tea.KeyUp:
Expand DownExpand Up@@ -343,21 +367,46 @@ func (m multiSelectModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
}

func (m multiSelectModel) View() string {
s := fmt.Sprintf("? %s [Use arrows to move, space to select, <right> to all, <left> to none, type to filter]\n", m.search.View())
var s string

for i, option := range m.options {
cursor := " "
if m.cursor == i {
cursor = ">"
}
msg := pretty.Sprintf(pretty.Bold(), "? %s", m.message)

chosen := "[ ]"
if option.chosen {
chosen = "[x]"
if !m.selected {
s += fmt.Sprintf("%s %s[Use arrows to move, space to select, <right> to all, <left> to none, type to filter]\n", msg, m.search.View())

for i, option := range m.options {
cursor := " "
if m.cursor == i {
cursor = pretty.Sprint(pretty.FgColor(Green), "> ")
}

chosen := "[ ]"
if option.chosen {
chosen = pretty.Sprint(pretty.FgColor(Green), "[x]")
}

o := option.option
if m.cursor == i {
o = pretty.Sprint(pretty.FgColor(Green), o)
}

s += fmt.Sprintf("%s%s %s\n", cursor, chosen, o)
}
} else {
selected := pretty.Sprint(DefaultStyles.Keyword, strings.Join(m.SelectedOptions(), ", "))

s += fmt.Sprintf("%s %s %s\n",cursor, chosen, option.option)
s += fmt.Sprintf("%s %s\n",msg, selected)
}

return s
}

func (m multiSelectModel) SelectedOptions() []string {
selected := []string{}
for _, o := range m.options {
if o.chosen {
selected = append(selected, o.option)
}
}
return selected
}
[8]ページ先頭
©2009-2025 Movatter.jp