git.iko.soy/crush
on main help sign in
chore: rename active dialog id method
commitcef196f8f987f615d8fe459d58ccdbef1c46349a authorKujtim Hoxha <kujtimii.h@gmail.com> dateMon 16 Jun 2025, 10:36 (1 year ago) parent168fb7d
2 files changed+9−9
compare with main
unifiedsplit
internal/tui/components/dialogs/dialogs.go+2−2 internal/tui/tui.go+7−7
internal/tui/components/dialogs/dialogs.go+2−2
@@ -38,7 +38,7 @@ type DialogCmp interface {
3838 HasDialogs() bool
3939 GetLayers() []*lipgloss.Layer
4040 ActiveView() *tea.View
41− ActiveDialogId() DialogID
41+ ActiveDialogID() DialogID
4242}
4343
4444type dialogCmp struct {
@@ -140,7 +140,7 @@ func (d dialogCmp) ActiveView() *tea.View {
140140 return &view
141141}
142142
143−func (d dialogCmp) ActiveDialogId() DialogID {
143+func (d dialogCmp) ActiveDialogID() DialogID {
144144 if len(d.dialogs) == 0 {
145145 return ""
146146 }
internal/tui/tui.go+7−7
@@ -14,6 +14,7 @@ import (
1414 "github.com/charmbracelet/crush/internal/pubsub"
1515 cmpChat "github.com/charmbracelet/crush/internal/tui/components/chat"
1616 "github.com/charmbracelet/crush/internal/tui/components/completions"
17+ "github.com/charmbracelet/crush/internal/tui/components/core/layout"
1718 "github.com/charmbracelet/crush/internal/tui/components/core/status"
1819 "github.com/charmbracelet/crush/internal/tui/components/dialogs"
1920 "github.com/charmbracelet/crush/internal/tui/components/dialogs/commands"
@@ -24,7 +25,6 @@ import (
2425 "github.com/charmbracelet/crush/internal/tui/components/dialogs/permissions"
2526 "github.com/charmbracelet/crush/internal/tui/components/dialogs/quit"
2627 "github.com/charmbracelet/crush/internal/tui/components/dialogs/sessions"
27− "github.com/charmbracelet/crush/internal/tui/components/core/layout"
2828 "github.com/charmbracelet/crush/internal/tui/page"
2929 "github.com/charmbracelet/crush/internal/tui/page/chat"
3030 "github.com/charmbracelet/crush/internal/tui/page/logs"
@@ -167,7 +167,7 @@ func (a *appModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
167167
168168 // File Picker
169169 case chat.OpenFilePickerMsg:
170− if a.dialog.ActiveDialogId() == filepicker.FilePickerID {
170+ if a.dialog.ActiveDialogID() == filepicker.FilePickerID {
171171 // If the commands dialog is already open, close it
172172 return a, util.CmdHandler(dialogs.CloseDialogMsg{})
173173 }
@@ -194,7 +194,7 @@ func (a *appModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
194194 payload := msg.Payload
195195
196196 // Forward agent events to dialogs
197− if a.dialog.HasDialogs() && a.dialog.ActiveDialogId() == compact.CompactDialogID {
197+ if a.dialog.HasDialogs() && a.dialog.ActiveDialogID() == compact.CompactDialogID {
198198 u, dialogCmd := a.dialog.Update(payload)
199199 a.dialog = u.(dialogs.DialogCmp)
200200 cmds = append(cmds, dialogCmd)
@@ -292,7 +292,7 @@ func (a *appModel) handleKeyPressMsg(msg tea.KeyPressMsg) tea.Cmd {
292292 return cmd
293293 // dialogs
294294 case key.Matches(msg, a.keyMap.Quit):
295− if a.dialog.ActiveDialogId() == quit.QuitDialogID {
295+ if a.dialog.ActiveDialogID() == quit.QuitDialogID {
296296 // if the quit dialog is already open, close the app
297297 return tea.Quit
298298 }
@@ -301,7 +301,7 @@ func (a *appModel) handleKeyPressMsg(msg tea.KeyPressMsg) tea.Cmd {
301301 })
302302
303303 case key.Matches(msg, a.keyMap.Commands):
304− if a.dialog.ActiveDialogId() == commands.CommandsDialogID {
304+ if a.dialog.ActiveDialogID() == commands.CommandsDialogID {
305305 // If the commands dialog is already open, close it
306306 return util.CmdHandler(dialogs.CloseDialogMsg{})
307307 }
@@ -309,12 +309,12 @@ func (a *appModel) handleKeyPressMsg(msg tea.KeyPressMsg) tea.Cmd {
309309 Model: commands.NewCommandDialog(a.selectedSessionID),
310310 })
311311 case key.Matches(msg, a.keyMap.Sessions):
312− if a.dialog.ActiveDialogId() == sessions.SessionsDialogID {
312+ if a.dialog.ActiveDialogID() == sessions.SessionsDialogID {
313313 // If the sessions dialog is already open, close it
314314 return util.CmdHandler(dialogs.CloseDialogMsg{})
315315 }
316316 var cmds []tea.Cmd
317− if a.dialog.ActiveDialogId() == commands.CommandsDialogID {
317+ if a.dialog.ActiveDialogID() == commands.CommandsDialogID {
318318 // If the commands dialog is open, close it first
319319 cmds = append(cmds, util.CmdHandler(dialogs.CloseDialogMsg{}))
320320 }