Update textinput for multi-char (IME) input in Bubble Tea master

README.md

@@ -36,11 +36,6 @@ the common, and many customization options.
 * [Example code, many fields](https://github.com/charmbracelet/tea/tree/master/examples/textinputs/main.go)
 
 
-## Button
-
-A button component.
-
-
 ## Paginator
 
 <img src="https://stuff.charm.sh/bubbles-examples/pagination.gif" width="200" alt="Paginator Example">

button/button.go

@@ -1,90 +0,0 @@
-package button
-
-import (
-	tea "github.com/charmbracelet/bubbletea"
-	"github.com/muesli/termenv"
-)
-
-var (
-	// color is a helper for returning colors.
-	color func(s string) termenv.Color = termenv.ColorProfile().Color
-)
-
-// Model is the Bubble Tea model for a button element.
-type Model struct {
-	Err error
-
-	Label   string
-	Default bool
-
-	TextColor              string
-	BackgroundColor        string
-	FocusedTextColor       string
-	FocusedBackgroundColor string
-
-	// Focus indicates whether user focus should be on this button component
-	focus bool
-}
-
-// NewModel creates a new model with default settings.
-func NewModel() Model {
-	return Model{
-		Label: "Button",
-	}
-}
-
-// Update is the Tea update loop.
-func (m Model) Update(msg tea.Msg) (Model, tea.Cmd) {
-	if !m.focus {
-		return m, nil
-	}
-
-	switch msg := msg.(type) {
-	case tea.KeyMsg:
-		switch msg.String() {
-		case "enter":
-			// TODO: implement
-		}
-	}
-
-	return m, nil
-}
-
-// View renders the button in its current state.
-func (m Model) View() string {
-	margin := m.styled("  ").String()
-	label := m.styled(m.Label)
-	if m.Default {
-		label = label.Underline()
-	}
-
-	return margin + label.String() + margin
-}
-
-// Focused returns the focus state on the model.
-func (m Model) Focused() bool {
-	return m.focus
-}
-
-// Focus sets the focus state on the model.
-func (m *Model) Focus() {
-	m.focus = true
-}
-
-// Blur removes the focus state on the model.
-func (m *Model) Blur() {
-	m.focus = false
-}
-
-func (m Model) styled(s string) termenv.Style {
-	view := termenv.String(s)
-	if m.focus {
-		view = view.Foreground(color(m.FocusedTextColor)).
-			Background(color(m.FocusedBackgroundColor))
-	} else {
-		view = view.Foreground(color(m.TextColor)).
-			Background(color(m.BackgroundColor))
-	}
-
-	return view
-}

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

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=

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))
 			}
 		}