git.iko.soy/crush
on main help sign in
fix(ui): simplify QuitDialogKeyMap by embedding key bindings directly
039f744Ayman Bagabas
internal/ui/dialog/quit.go+29−42
compare with main
unifiedsplit
@@ -10,60 +10,47 @@ import (
10// QuitDialogID is the identifier for the quit dialog.
10// QuitDialogID is the identifier for the quit dialog.
11const QuitDialogID = "quit"
11const QuitDialogID = "quit"
12
12
13−// QuitDialogKeyMap represents key bindings for the quit dialog.
14−type QuitDialogKeyMap struct {
15− LeftRight,
16− EnterSpace,
17− Yes,
18− No,
19− Tab,
20− Close key.Binding
21−}
22−
23−// DefaultQuitKeyMap returns the default key bindings for the quit dialog.
24−func DefaultQuitKeyMap() QuitDialogKeyMap {
25− return QuitDialogKeyMap{
26− LeftRight: key.NewBinding(
27− key.WithKeys("left", "right"),
28− key.WithHelp("←/→", "switch options"),
29− ),
30− EnterSpace: key.NewBinding(
31− key.WithKeys("enter", " "),
32− key.WithHelp("enter/space", "confirm"),
33− ),
34− Yes: key.NewBinding(
35− key.WithKeys("y", "Y", "ctrl+c"),
36− key.WithHelp("y/Y/ctrl+c", "yes"),
37− ),
38− No: key.NewBinding(
39− key.WithKeys("n", "N"),
40− key.WithHelp("n/N", "no"),
41− ),
42− Tab: key.NewBinding(
43− key.WithKeys("tab"),
44− key.WithHelp("tab", "switch options"),
45− ),
46− Close: key.NewBinding(
47− key.WithKeys("esc", "alt+esc"),
48− key.WithHelp("esc", "cancel"),
49− ),
50− }
51−}
52−
53// Quit represents a confirmation dialog for quitting the application.
13// Quit represents a confirmation dialog for quitting the application.
54type Quit struct {
14type Quit struct {
55 com *common.Common
15 com *common.Common
56− keyMap QuitDialogKeyMap
57 selectedNo bool // true if "No" button is selected
16 selectedNo bool // true if "No" button is selected
17+ keyMap struct {
18+ LeftRight,
19+ EnterSpace,
20+ Yes,
21+ No,
22+ Tab,
23+ Close key.Binding
24+ }
58}
25}
59
26
60// NewQuit creates a new quit confirmation dialog.
27// NewQuit creates a new quit confirmation dialog.
61func NewQuit(com *common.Common) *Quit {
28func NewQuit(com *common.Common) *Quit {
62 q := &Quit{
29 q := &Quit{
63 com: com,
30 com: com,
64− keyMap: DefaultQuitKeyMap(),
65 selectedNo: true,
31 selectedNo: true,
66 }
32 }
33+ q.keyMap.LeftRight = key.NewBinding(
34+ key.WithKeys("left", "right"),
35+ key.WithHelp("←/→", "switch options"),
36+ )
37+ q.keyMap.EnterSpace = key.NewBinding(
38+ key.WithKeys("enter", " "),
39+ key.WithHelp("enter/space", "confirm"),
40+ )
41+ q.keyMap.Yes = key.NewBinding(
42+ key.WithKeys("y", "Y", "ctrl+c"),
43+ key.WithHelp("y/Y/ctrl+c", "yes"),
44+ )
45+ q.keyMap.No = key.NewBinding(
46+ key.WithKeys("n", "N"),
47+ key.WithHelp("n/N", "no"),
48+ )
49+ q.keyMap.Tab = key.NewBinding(
50+ key.WithKeys("tab"),
51+ key.WithHelp("tab", "switch options"),
52+ )
53+ q.keyMap.Close = CloseKey
67 return q
54 return q
68}
55}
69
56