git.iko.soy/crush
on main help sign in
Merge pull request #114 from charmbracelet/newline
72f469eKujtim Hoxha
internal/tui/components/chat/editor/editor.go+8−1
compare with main
unifiedsplit
@@ -145,6 +145,9 @@ func (m *editorCmp) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
145 var cmd tea.Cmd
145 var cmd tea.Cmd
146 var cmds []tea.Cmd
146 var cmds []tea.Cmd
147 switch msg := msg.(type) {
147 switch msg := msg.(type) {
148+ case tea.KeyboardEnhancementsMsg:
149+ m.keyMap.keyboard = msg
150+ return m, nil
148 case chat.SessionSelectedMsg:
151 case chat.SessionSelectedMsg:
149 if msg.ID != m.session.ID {
152 if msg.ID != m.session.ID {
150 m.session = msg
153 m.session = msg
@@ -245,7 +248,11 @@ func (m *editorCmp) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
245 m.deleteMode = false
248 m.deleteMode = false
246 return m, nil
249 return m, nil
247 }
250 }
251+ if key.Matches(msg, m.keyMap.Newline) {
252+ m.textarea.InsertRune('\n')
253+ return m, nil
254+ }
248− // Hanlde Enter key
255+ // Handle Enter key
249 if m.textarea.Focused() && key.Matches(msg, m.keyMap.SendMessage) {
256 if m.textarea.Focused() && key.Matches(msg, m.keyMap.SendMessage) {
250 value := m.textarea.Value()
257 value := m.textarea.Value()
251 if len(value) > 0 && value[len(value)-1] == '\\' {
258 if len(value) > 0 && value[len(value)-1] == '\\' {
internal/tui/components/chat/editor/keys.go+16
@@ -2,12 +2,16 @@ package editor
2
2
3import (
3import (
4 "github.com/charmbracelet/bubbles/v2/key"
4 "github.com/charmbracelet/bubbles/v2/key"
5+ tea "github.com/charmbracelet/bubbletea/v2"
5)
6)
6
7
7type EditorKeyMap struct {
8type EditorKeyMap struct {
8 AddFile key.Binding
9 AddFile key.Binding
9 SendMessage key.Binding
10 SendMessage key.Binding
10 OpenEditor key.Binding
11 OpenEditor key.Binding
12+ Newline key.Binding
13+
14+ keyboard tea.KeyboardEnhancementsMsg
11}
15}
12
16
13func DefaultEditorKeyMap() EditorKeyMap {
17func DefaultEditorKeyMap() EditorKeyMap {
@@ -24,15 +28,27 @@ func DefaultEditorKeyMap() EditorKeyMap {
24 key.WithKeys("ctrl+e"),
28 key.WithKeys("ctrl+e"),
25 key.WithHelp("ctrl+e", "open editor"),
29 key.WithHelp("ctrl+e", "open editor"),
26 ),
30 ),
31+ Newline: key.NewBinding(
32+ key.WithKeys("shift+enter", "ctrl+j"),
33+ // "ctrl+j" is a common keybinding for newline in many editors. If
34+ // the terminal supports "shift+enter", we substitute the help text
35+ // to reflect that.
36+ key.WithHelp("ctrl+j", "newline"),
37+ ),
27 }
38 }
28}
39}
29
40
30// KeyBindings implements layout.KeyMapProvider
41// KeyBindings implements layout.KeyMapProvider
31func (k EditorKeyMap) KeyBindings() []key.Binding {
42func (k EditorKeyMap) KeyBindings() []key.Binding {
43+ newline := k.Newline
44+ if k.keyboard.SupportsKeyDisambiguation() {
45+ newline.SetHelp("shift+enter", newline.Help().Desc)
46+ }
32 return []key.Binding{
47 return []key.Binding{
33 k.AddFile,
48 k.AddFile,
34 k.SendMessage,
49 k.SendMessage,
35 k.OpenEditor,
50 k.OpenEditor,
51+ newline,
36 }
52 }
37}
53}
38
54
internal/tui/page/chat/chat.go+4
@@ -81,6 +81,10 @@ func (p *chatPage) cancelTimerCmd() tea.Cmd {
81func (p *chatPage) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
81func (p *chatPage) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
82 var cmds []tea.Cmd
82 var cmds []tea.Cmd
83 switch msg := msg.(type) {
83 switch msg := msg.(type) {
84+ case tea.KeyboardEnhancementsMsg:
85+ m, cmd := p.layout.Update(msg)
86+ p.layout = m.(layout.SplitPaneLayout)
87+ return p, cmd
84 case CancelTimerExpiredMsg:
88 case CancelTimerExpiredMsg:
85 p.cancelPending = false
89 p.cancelPending = false
86 return p, nil
90 return p, nil
internal/tui/tui.go+8−1
@@ -115,7 +115,14 @@ func (a *appModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
115
115
116 switch msg := msg.(type) {
116 switch msg := msg.(type) {
117 case tea.KeyboardEnhancementsMsg:
117 case tea.KeyboardEnhancementsMsg:
118− return a, nil
118+ for id, page := range a.pages {
119+ m, pageCmd := page.Update(msg)
120+ a.pages[id] = m.(util.Model)
121+ if pageCmd != nil {
122+ cmds = append(cmds, pageCmd)
123+ }
124+ }
125+ return a, tea.Batch(cmds...)
119 case tea.WindowSizeMsg:
126 case tea.WindowSizeMsg:
120 return a, a.handleWindowResize(msg.Width, msg.Height)
127 return a, a.handleWindowResize(msg.Width, msg.Height)
121
128