picklist conquest

cmd/slackdump/internal/archive/search_wizard.go

@@ -83,7 +83,7 @@ func searchCfg() cfgui.Configuration {
 						default:
 							return "undefined search action"
 						}
-					}, &action)),
+					}, &action).Title("Search Scope")),
 				},
 			},
 		},

cmd/slackdump/internal/export/wizard.go

@@ -45,7 +45,6 @@ func (fl *exportFlags) configuration() cfgui.Configuration {
 					Inline:      false,
 					Updater: updaters.NewPicklist(&fl.ExportStorageType, huh.NewSelect[fileproc.StorageType]().
 						Title("Choose File storage type").
-						Description("test").
 						Options(
 							huh.NewOption("Mattermost", fileproc.STmattermost),
 							huh.NewOption("Standard", fileproc.STstandard),

cmd/slackdump/internal/ui/dumpui/model.go

@@ -184,11 +184,11 @@ func (m *Model) view() string {
 			p(sty.ItemDisabled.Render(iftrue(current, pointer, padding) + itm.Name))
 			continue
 		}
-		p(iftrue(
-			current,
-			sty.Cursor.Render(pointer)+sty.ItemSelected.Render(itm.Name),
-			sty.Item.Render(padding+itm.Name),
-		))
+		if current {
+			p(sty.Cursor.Render(pointer) + sty.ItemSelected.Render(itm.Name))
+		} else {
+			p(sty.Item.Render(padding + itm.Name))
+		}
 	}
 	p("\n" + m.footer())
 	return sty.Border.Render(b.String())

cmd/slackdump/internal/ui/filesystem.go

@@ -31,7 +31,7 @@ func FileSelector(msg, descr string, opt ...Option) (string, error) {
 	var resp struct {
 		Filename string
 	}
-	q := fieldFileInput(&resp.Filename, msg, descr, *opts)
+	q := huh.NewForm(huh.NewGroup(fieldFileInput(&resp.Filename, msg, descr, *opts))).WithTheme(HuhTheme)
 
 	for {
 		if err := q.Run(); err != nil {

cmd/slackdump/internal/ui/input.go

@@ -10,11 +10,11 @@ func Input(msg, help string, validateFn func(s string) error) (string, error) {
 		validateFn = NoValidation
 	}
 	var resp string
-	if err := huh.NewText().
+	if err := huh.NewForm(huh.NewGroup(huh.NewText().
 		Title(msg).
 		Description(help).
 		Validate(validateFn).
-		Value(&resp).
+		Value(&resp))).WithTheme(HuhTheme).
 		Run(); err != nil {
 		return "", err
 	}

cmd/slackdump/internal/ui/updaters/examples/picklist/main.go

@@ -12,12 +12,10 @@ import (
 
 func main() {
 	var result fileproc.StorageType
-
 	updaters.OnClose = tea.Quit
 
 	l := updaters.NewPicklist(&result, huh.NewSelect[fileproc.StorageType]().
 		Title("Title").
-		Description("Description").
 		Options(
 			huh.NewOption("None", fileproc.STnone),
 			huh.NewOption("Standard", fileproc.STstandard),
@@ -27,5 +25,6 @@ func main() {
 	if _, err := tea.NewProgram(l).Run(); err != nil {
 		log.Fatal(err)
 	}
+
 	fmt.Println("selected: ", result)
 }

cmd/slackdump/internal/ui/updaters/picklist.go

@@ -9,22 +9,21 @@ import (
 )
 
 type Model[T comparable] struct {
-	s         *huh.Select[T]
-	finishing bool
+	s         huh.Field
 	help      help.Model
+	finishing bool
 
 	// value
 	initial T
 	ptr     *T
 }
 
 func NewPicklist[T comparable](v *T, s *huh.Select[T]) *Model[T] {
-	s = s.Value(v).
-		WithTheme(ui.HuhTheme).
-		WithKeyMap(huh.NewDefaultKeyMap()).(*huh.Select[T])
-
 	m := &Model[T]{
-		s:    s,
+		s: s.Value(v).
+			Description("Select an option").
+			WithTheme(ui.HuhTheme).
+			WithKeyMap(huh.NewDefaultKeyMap()),
 		help: help.New(),
 
 		initial: *v,
@@ -55,7 +54,7 @@ func (m *Model[T]) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 	{
 		// update the select control
 		mod, cmd := m.s.Update(msg)
-		if mod, ok := mod.(*huh.Select[T]); ok {
+		if mod, ok := mod.(huh.Field); ok {
 			m.s = mod
 		}
 		cmds = append(cmds, cmd)

cmd/slackdump/main.go

@@ -40,10 +40,9 @@ func init() {
 	loadSecrets(secretFiles)
 
 	base.Slackdump.Commands = []*base.Command{
-		wizard.CmdWizard,
+		archive.CmdArchive,
 		export.CmdExport,
 		dump.CmdDump,
-		archive.CmdArchive,
 		archive.CmdSearch,
 		convertcmd.CmdConvert,
 		list.CmdList,
@@ -53,6 +52,7 @@ func init() {
 		apiconfig.CmdConfig,
 		format.CmdFormat,
 		view.CmdView,
+		wizard.CmdWizard,
 		CmdVersion,
 
 		man.WhatsNew,

go.sum

@@ -14,6 +14,8 @@ github.com/charmbracelet/bubbles v0.20.0 h1:jSZu6qD8cRQ6k9OMfR1WlM+ruM8fkPWkHvQW
 github.com/charmbracelet/bubbles v0.20.0/go.mod h1:39slydyswPy+uVOHZ5x/GjwVAFkCsV8IIVy+4MhzwwU=
 github.com/charmbracelet/bubbletea v1.1.2 h1:naQXF2laRxyLyil/i7fxdpiz1/k06IKquhm4vBfHsIc=
 github.com/charmbracelet/bubbletea v1.1.2/go.mod h1:9HIU/hBV24qKjlehyj8z1r/tR9TYTQEag+cWZnuXo8E=
+github.com/charmbracelet/huh v0.5.3 h1:3KLP4a/K1/S4dq4xFMTNMt3XWhgMl/yx8NYtygQ0bmg=
+github.com/charmbracelet/huh v0.5.3/go.mod h1:OZC3lshuF+/y8laj//DoZdFSHxC51OrtXLJI8xWVouQ=
 github.com/charmbracelet/huh v0.6.0 h1:mZM8VvZGuE0hoDXq6XLxRtgfWyTI3b2jZNKh0xWmax8=
 github.com/charmbracelet/huh v0.6.0/go.mod h1:GGNKeWCeNzKpEOh/OJD8WBwTQjV3prFAtQPpLv+AVwU=
 github.com/charmbracelet/huh/spinner v0.0.0-20241028115900-20a4d21717a8 h1:g+Bz64hsMLTf3lAgUqI6Rj1YEAlm/HN39IuhyneCokc=