diff --git a/go.mod b/go.mod index bf707da..5ad8658 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.13 require ( github.com/atotto/clipboard v0.1.2 - github.com/charmbracelet/bubbletea v0.12.1 + github.com/charmbracelet/bubbletea v0.12.2-0.20201101135743-116a0cfb8f37 github.com/mattn/go-runewidth v0.0.9 github.com/muesli/termenv v0.7.4 golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897 // indirect diff --git a/go.sum b/go.sum index 24bda7b..cbe1192 100644 --- a/go.sum +++ b/go.sum @@ -1,7 +1,7 @@ github.com/atotto/clipboard v0.1.2 h1:YZCtFu5Ie8qX2VmVTBnrqLSiU9XOWwqNRmdT3gIQzbY= github.com/atotto/clipboard v0.1.2/go.mod h1:ZY9tmq7sm5xIbd9bOK4onWV4S6X0u6GY7Vn0Yu86PYI= -github.com/charmbracelet/bubbletea v0.12.1 h1:t21pkG2IDBRduPbt2J64Dx5yt8yIidAkXwhhrc11SzY= -github.com/charmbracelet/bubbletea v0.12.1/go.mod h1:3gZkYELUOiEUOp0bTInkxguucy/xRbGSOcbMs1geLxg= +github.com/charmbracelet/bubbletea v0.12.2-0.20201101135743-116a0cfb8f37 h1:BQLGyhKVE19a9XdNYcsnYlO9XHPlOVHIWM7+mmS014k= +github.com/charmbracelet/bubbletea v0.12.2-0.20201101135743-116a0cfb8f37/go.mod h1:3gZkYELUOiEUOp0bTInkxguucy/xRbGSOcbMs1geLxg= github.com/containerd/console v1.0.1 h1:u7SFAJyRqWcG6ogaMAx3KjSTy1e3hT9QxqX7Jco7dRc= github.com/containerd/console v1.0.1/go.mod h1:XUsP6YE/mKtz6bxc+I8UiKKTP04qjQL4qcS3XoQ5xkw= github.com/google/goterm v0.0.0-20190703233501-fc88cf888a3f h1:5CjVwnuUcp5adK4gmY6i72gpVFVnZDP2h5TmPScB6u4= diff --git a/textinput/textinput.go b/textinput/textinput.go index 9ececea..1d0a6fe 100644 --- a/textinput/textinput.go +++ b/textinput/textinput.go @@ -508,17 +508,17 @@ func (m Model) Update(msg tea.Msg) (Model, tea.Cmd) { m.offset = 0 case tea.KeyCtrlV: // ^V paste return m, Paste - case tea.KeyRune: // input a regular character - if msg.Alt { - if msg.Rune == 'd' { // alt+d, delete word right of cursor + case tea.KeyRunes: // input regular characters + if msg.Alt && len(msg.Runes) == 1 { + if msg.Runes[0] == 'd' { // alt+d, delete word right of cursor resetBlink = m.deleteWordRight() break } - if msg.Rune == 'b' { // alt+b, back one word + if msg.Runes[0] == 'b' { // alt+b, back one word resetBlink = m.wordLeft() break } - if msg.Rune == 'f' { // alt+f, forward one word + if msg.Runes[0] == 'f' { // alt+f, forward one word resetBlink = m.wordRight() break } @@ -526,8 +526,8 @@ func (m Model) Update(msg tea.Msg) (Model, tea.Cmd) { // Input a regular character if m.CharLimit <= 0 || len(m.value) < m.CharLimit { - m.value = append(m.value[:m.pos], append([]rune{msg.Rune}, m.value[m.pos:]...)...) - resetBlink = m.SetCursor(m.pos + 1) + m.value = append(m.value[:m.pos], append(msg.Runes, m.value[m.pos:]...)...) + resetBlink = m.SetCursor(m.pos + len(msg.Runes)) } }