make a menu bubble

rusq · Nov 4, 2024 · 0f16ddd · 0f16ddd
1 parent 06152e9
commit 0f16ddd
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 19 deletions.
diff --git a/cmd/slackdump/internal/diag/wizdebug.go b/cmd/slackdump/internal/diag/wizdebug.go
@@ -6,8 +6,8 @@ import (
 	tea "github.com/charmbracelet/bubbletea"
 	"github.com/charmbracelet/huh"
 	"github.com/rusq/slackdump/v3/cmd/slackdump/internal/golang/base"
+	"github.com/rusq/slackdump/v3/cmd/slackdump/internal/ui/bubbles/menu"
 	"github.com/rusq/slackdump/v3/cmd/slackdump/internal/ui/cfgui"
-	"github.com/rusq/slackdump/v3/cmd/slackdump/internal/ui/dumpui"
 )
 
 var CmdWizDebug = &base.Command{
@@ -56,7 +56,7 @@ func runWizDebug(ctx context.Context, cmd *base.Command, args []string) error {
 }
 
 func debugDumpUI(ctx context.Context) error {
-	menu := []dumpui.MenuItem{
+	mnu := []menu.MenuItem{
 		{
 			ID:   "run",
 			Name: "Run",
@@ -79,7 +79,7 @@ func debugDumpUI(ctx context.Context) error {
 			Help: "Exit to main menu",
 		},
 	}
-	w := dumpui.NewModel("Wizard Debug", menu, false)
+	w := menu.New("Wizard Debug", mnu, false)
 
 	if _, err := tea.NewProgram(w, tea.WithContext(ctx)).Run(); err != nil {
 		return err

diff --git a/...lackdump/internal/ui/dumpui/focusmodel.go → ...mp/internal/ui/bubbles/menu/focusmodel.go b/...lackdump/internal/ui/dumpui/focusmodel.go → ...mp/internal/ui/bubbles/menu/focusmodel.go
@@ -1,4 +1,4 @@
-package dumpui
+package menu
 
 import tea "github.com/charmbracelet/bubbletea"
 

diff --git a/cmd/slackdump/internal/ui/dumpui/keymap.go → ...ckdump/internal/ui/bubbles/menu/keymap.go b/cmd/slackdump/internal/ui/dumpui/keymap.go → ...ckdump/internal/ui/bubbles/menu/keymap.go
@@ -1,4 +1,4 @@
-package dumpui
+package menu
 
 import "github.com/charmbracelet/bubbles/key"
 

diff --git a/cmd/slackdump/internal/ui/dumpui/menuitem.go → ...dump/internal/ui/bubbles/menu/menuitem.go b/cmd/slackdump/internal/ui/dumpui/menuitem.go → ...dump/internal/ui/bubbles/menu/menuitem.go
@@ -1,4 +1,4 @@
-package dumpui
+package menu
 
 // MenuItem is an item in a menu.
 type MenuItem struct {

diff --git a/cmd/slackdump/internal/ui/dumpui/model.go → ...ackdump/internal/ui/bubbles/menu/model.go b/cmd/slackdump/internal/ui/dumpui/model.go → ...ackdump/internal/ui/bubbles/menu/model.go
@@ -1,4 +1,4 @@
-package dumpui
+package menu
 
 import (
 	"strings"
@@ -30,7 +30,7 @@ type Model struct {
 	cursor int
 }
 
-func NewModel(title string, items []MenuItem, preview bool) *Model {
+func New(title string, items []MenuItem, preview bool) *Model {
 	return &Model{
 		title:     title,
 		items:     items,

diff --git a/cmd/slackdump/internal/ui/dumpui/style.go → ...ackdump/internal/ui/bubbles/menu/style.go b/cmd/slackdump/internal/ui/dumpui/style.go → ...ackdump/internal/ui/bubbles/menu/style.go
@@ -1,4 +1,4 @@
-package dumpui
+package menu
 
 import (
 	"github.com/charmbracelet/lipgloss"

diff --git a/cmd/slackdump/internal/ui/dumpui/dumpui.go b/cmd/slackdump/internal/ui/dumpui/dumpui.go
@@ -6,6 +6,7 @@ import (
 
 	tea "github.com/charmbracelet/bubbletea"
 	"github.com/rusq/slackdump/v3/cmd/slackdump/internal/golang/base"
+	"github.com/rusq/slackdump/v3/cmd/slackdump/internal/ui/bubbles/menu"
 	"github.com/rusq/slackdump/v3/cmd/slackdump/internal/ui/cfgui"
 )
 
@@ -42,10 +43,10 @@ var description = map[string]string{
 }
 
 func (w *Wizard) Run(ctx context.Context) error {
-	var menu = func() *Model {
-		var items []MenuItem
+	var menu = func() *menu.Model {
+		var items []menu.MenuItem
 		if w.LocalConfig != nil {
-			items = append(items, MenuItem{
+			items = append(items, menu.MenuItem{
 				ID:    actLocalConfig,
 				Name:  "Configure " + w.Name + "...",
 				Help:  description[actLocalConfig],
@@ -55,7 +56,7 @@ func (w *Wizard) Run(ctx context.Context) error {
 
 		items = append(
 			items,
-			MenuItem{
+			menu.MenuItem{
 				ID:   actRun,
 				Name: "Run " + w.Name,
 				Help: description[actRun],
@@ -68,26 +69,26 @@ func (w *Wizard) Run(ctx context.Context) error {
 			},
 		)
 		if w.Help != "" {
-			items = append(items, MenuItem{
+			items = append(items, menu.MenuItem{
 				ID:   "help",
 				Name: "Help",
 				Help: "Read help for " + w.Name,
 			})
 		}
 
 		items = append(items,
-			MenuItem{Separator: true},
-			MenuItem{
+			menu.MenuItem{Separator: true},
+			menu.MenuItem{
 				ID:    actGlobalConfig,
 				Name:  "Global Configuration...",
 				Help:  description[actGlobalConfig],
 				Model: cfgui.NewConfigUI(cfgui.DefaultStyle(), cfgui.GlobalConfig), // TODO: filthy cast
 			},
-			MenuItem{Separator: true},
-			MenuItem{ID: actExit, Name: "Exit", Help: description[actExit]},
+			menu.MenuItem{Separator: true},
+			menu.MenuItem{ID: actExit, Name: "Exit", Help: description[actExit]},
 		)
 
-		return NewModel(w.Title, items, false)
+		return menu.New(w.Title, items, false)
 	}
 
 LOOP: