Remove spaces after emoji spinners

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
 	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 h1:y9Yo2Pv8tcm3mAJsWONGsmHhzrbNxJVxpVtemikxE9A=
+github.com/charmbracelet/bubbletea v0.12.2/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=

layouts/vertical.go

@@ -1,118 +0,0 @@
-package layouts
-
-import (
-	tea "github.com/charmbracelet/bubbletea"
-)
-
-// Model is the Bubble Tea model for a vertical layout element.
-type Model struct {
-	Index int
-	Items []tea.Model
-
-	// Focus indicates whether user focus should be on this component
-	focus bool
-}
-
-type FocusItem interface {
-	Focus() tea.Model
-	Blur() tea.Model
-}
-
-// NewModel creates a new model with default settings.
-func NewModel() Model {
-	return Model{}
-}
-
-// 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 "shift+tab", "up":
-			m.Index--
-			if m.Index < 0 {
-				m.Index = len(m.Items) - 1
-			}
-			m.updateFocus()
-
-		case "tab", "down":
-			m.Index++
-			if m.Index >= len(m.Items) {
-				m.Index = 0
-			}
-			m.updateFocus()
-		}
-	}
-
-	cmd := m.updateItems(msg)
-	return m, cmd
-}
-
-// View renders the layout in its current state.
-func (m Model) View() string {
-	var view string
-
-	for _, v := range m.Items {
-		if mi, ok := v.(tea.Model); ok {
-			view += mi.View() + "\n"
-		}
-	}
-
-	return view
-}
-
-func (m *Model) updateFocus() {
-	for i, v := range m.Items {
-		if m.Index == i {
-			if fi, ok := v.(FocusItem); ok {
-				// new focused item
-				m.Items[i] = fi.Focus()
-			}
-		} else {
-			if fi, ok := v.(FocusItem); ok {
-				m.Items[i] = fi.Blur()
-			}
-		}
-	}
-}
-
-// Pass messages and models through to text input components. Only text inputs
-// with Focus() set will respond, so it's safe to simply update all of them
-// here without any further logic.
-func (m *Model) updateItems(msg tea.Msg) tea.Cmd {
-	var (
-		cmd  tea.Cmd
-		cmds []tea.Cmd
-	)
-
-	for i, v := range m.Items {
-		if mi, ok := v.(tea.Model); ok {
-			m.Items[i], cmd = mi.Update(msg)
-			if cmd != nil {
-				cmds = append(cmds, cmd)
-			}
-		}
-	}
-
-	return tea.Batch(cmds...)
-}
-
-// 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
-	m.updateFocus()
-}
-
-// Blur removes the focus state on the model.
-func (m *Model) Blur() {
-	m.focus = false
-}

paginator/paginator.go

@@ -19,7 +19,7 @@ const (
 	Dots
 )
 
-// Model is the Tea model for this user interface.
+// Model is the Bubble Tea model for this user interface.
 type Model struct {
 	Type              Type
 	Page              int
@@ -115,7 +115,7 @@ func NewModel() Model {
 }
 
 // Update is the Tea update function which binds keystrokes to pagination.
-func Update(msg tea.Msg, m Model) (Model, tea.Cmd) {
+func (m Model) Update(msg tea.Msg) (Model, tea.Cmd) {
 	switch msg := msg.(type) {
 	case tea.KeyMsg:
 		if m.UsePgUpPgDownKeys {
@@ -164,16 +164,16 @@ func Update(msg tea.Msg, m Model) (Model, tea.Cmd) {
 }
 
 // View renders the pagination to a string.
-func View(m Model) string {
+func (m Model) View() string {
 	switch m.Type {
 	case Dots:
-		return dotsView(m)
+		return m.dotsView()
 	default:
-		return arabicView(m)
+		return m.arabicView()
 	}
 }
 
-func dotsView(m Model) string {
+func (m Model) dotsView() string {
 	var s string
 	for i := 0; i < m.TotalPages; i++ {
 		if i == m.Page {
@@ -185,7 +185,7 @@ func dotsView(m Model) string {
 	return s
 }
 
-func arabicView(m Model) string {
+func (m Model) arabicView() string {
 	return fmt.Sprintf(m.ArabicFormat, m.Page+1, m.TotalPages)
 }
 

spinner/spinner.go

@@ -7,17 +7,52 @@ import (
 	"github.com/muesli/termenv"
 )
 
-const (
-	defaultFPS = time.Second / 10
-)
+const defaultFPS = time.Second / 10
 
 // Spinner is a set of frames used in animating the spinner.
-type Spinner = []string
+type Spinner struct {
+	Frames []string
+	FPS    time.Duration
+}
 
 var (
 	// Some spinners to choose from. You could also make your own.
-	Line = Spinner([]string{"|", "/", "-", "\\"})
-	Dot  = Spinner([]string{"⣾ ", "⣽ ", "⣻ ", "⢿ ", "⡿ ", "⣟ ", "⣯ ", "⣷ "})
+	Line = Spinner{
+		Frames: []string{"|", "/", "-", "\\"},
+		FPS:    time.Second / 10,
+	}
+	Dot = Spinner{
+		Frames: []string{"⣾ ", "⣽ ", "⣻ ", "⢿ ", "⡿ ", "⣟ ", "⣯ ", "⣷ "},
+		FPS:    time.Second / 10,
+	}
+	MiniDot = Spinner{
+		Frames: []string{"⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧", "⠇", "⠏"},
+		FPS:    time.Second / 12,
+	}
+	Jump = Spinner{
+		Frames: []string{"⢄", "⢂", "⢁", "⡁", "⡈", "⡐", "⡠"},
+		FPS:    time.Second / 10,
+	}
+	Pulse = Spinner{
+		Frames: []string{"█", "▓", "▒", "░"},
+		FPS:    time.Second / 8,
+	}
+	Points = Spinner{
+		Frames: []string{"∙∙∙", "●∙∙", "∙●∙", "∙∙●"},
+		FPS:    time.Second / 7,
+	}
+	Globe = Spinner{
+		Frames: []string{"🌍", "🌎", "🌏"},
+		FPS:    time.Second / 4,
+	}
+	Moon = Spinner{
+		Frames: []string{"🌑", "🌒", "🌓", "🌔", "🌕", "🌖", "🌗", "🌘"},
+		FPS:    time.Second / 8,
+	}
+	Monkey = Spinner{
+		Frames: []string{"🙈", "🙉", "🙊"},
+		FPS:    time.Second / 3,
+	}
 
 	color = termenv.ColorProfile().Color
 )
@@ -26,22 +61,19 @@ var (
 // rather than using Model as a struct literal.
 type Model struct {
 
-	// Type is the set of frames to use. See Spinner.
-	Frames Spinner
+	// Spinner settings to use. See type Spinner.
+	Spinner Spinner
 
-	// FPS is the speed at which the ticker should tick.
-	FPS time.Duration
-
-	// ForegroundColor sets the background color of the spinner. It can be a
-	// hex code or one of the 256 ANSI colors. If the terminal emulator can't
-	// doesn't support the color specified it will automatically degrade
-	// (per github.com/muesli/termenv).
+	// ForegroundColor sets the background color of the spinner. It can be
+	// a hex code or one of the 256 ANSI colors. If the terminal emulator can't
+	// support the color specified it will automatically degrade (per
+	// github.com/muesli/termenv).
 	ForegroundColor string
 
-	// BackgroundColor sets the background color of the spinner. It can be a
-	// hex code or one of the 256 ANSI colors. If the terminal emulator can't
-	// doesn't support the color specified it will automatically degrade
-	// (per github.com/muesli/termenv).
+	// BackgroundColor sets the background color of the spinner. It can be
+	// a hex code or one of the 256 ANSI colors. If the terminal emulator can't
+	// support the color specified it will automatically degrade (per
+	// github.com/muesli/termenv).
 	BackgroundColor string
 
 	// MinimumLifetime is the minimum amount of time the spinner can run. Any
@@ -118,10 +150,7 @@ func (m Model) Visible() bool {
 
 // NewModel returns a model with default values.
 func NewModel() Model {
-	return Model{
-		Frames: Line,
-		FPS:    defaultFPS,
-	}
+	return Model{Spinner: Line}
 }
 
 // TickMsg indicates that the timer has ticked and we should render a frame.
@@ -132,30 +161,32 @@ type TickMsg struct {
 // Update is the Tea update function. This will advance the spinner one frame
 // every time it's called, regardless the message passed, so be sure the logic
 // is setup so as not to call this Update needlessly.
-func Update(msg tea.Msg, m Model) (Model, tea.Cmd) {
-	if _, ok := msg.(TickMsg); ok {
+func (m Model) Update(msg tea.Msg) (Model, tea.Cmd) {
+	switch msg.(type) {
+	case TickMsg:
 		m.frame++
-		if m.frame >= len(m.Frames) {
+		if m.frame >= len(m.Spinner.Frames) {
 			m.frame = 0
 		}
-		return m, Tick(m)
+		return m, m.tick()
+	default:
+		return m, nil
 	}
-	return m, nil
 }
 
 // View renders the model's view.
-func View(model Model) string {
-	if model.frame >= len(model.Frames) {
-		return "error"
+func (m Model) View() string {
+	if m.frame >= len(m.Spinner.Frames) {
+		return "(error)"
 	}
 
-	frame := model.Frames[model.frame]
+	frame := m.Spinner.Frames[m.frame]
 
-	if model.ForegroundColor != "" || model.BackgroundColor != "" {
+	if m.ForegroundColor != "" || m.BackgroundColor != "" {
 		return termenv.
 			String(frame).
-			Foreground(color(model.ForegroundColor)).
-			Background(color(model.BackgroundColor)).
+			Foreground(color(m.ForegroundColor)).
+			Background(color(m.BackgroundColor)).
 			String()
 	}
 
@@ -163,8 +194,12 @@ func View(model Model) string {
 }
 
 // Tick is the command used to advance the spinner one frame.
-func Tick(m Model) tea.Cmd {
-	return tea.Tick(m.FPS, func(t time.Time) tea.Msg {
+func Tick() tea.Msg {
+	return TickMsg{Time: time.Now()}
+}
+
+func (m Model) tick() tea.Cmd {
+	return tea.Tick(m.Spinner.FPS, func(t time.Time) tea.Msg {
 		return TickMsg{
 			Time: t,
 		}

textinput/textinput.go

@@ -67,7 +67,6 @@ type Model struct {
 	Cursor           string
 	BlinkSpeed       time.Duration
 	TextColor        string
-	FocusedTextColor string
 	BackgroundColor  string
 	PlaceholderColor string
 	CursorColor      string
@@ -115,7 +114,6 @@ func NewModel() Model {
 		Placeholder:      "",
 		BlinkSpeed:       defaultBlinkSpeed,
 		TextColor:        "",
-		FocusedTextColor: "205",
 		PlaceholderColor: "240",
 		CursorColor:      "",
 		EchoCharacter:    '*',
@@ -184,19 +182,15 @@ func (m Model) Focused() bool {
 }
 
 // Focus sets the focus state on the model.
-func (m Model) Focus() tea.Model {
+func (m *Model) Focus() {
 	m.focus = true
 	m.blink = m.cursorMode == cursorHide // show the cursor unless we've explicitly hidden it
-
-	return m
 }
 
 // Blur removes the focus state on the model.
-func (m Model) Blur() tea.Model {
+func (m *Model) Blur() {
 	m.focus = false
 	m.blink = true
-
-	return m
 }
 
 // Reset sets the input to its default state with no input. Returns whether
@@ -456,12 +450,8 @@ func (m Model) echoTransform(v string) string {
 	}
 }
 
-func (m Model) Init() tea.Cmd {
-	return Blink
-}
-
 // Update is the Bubble Tea update loop.
-func (m Model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
+func (m Model) Update(msg tea.Msg) (Model, tea.Cmd) {
 	if !m.focus {
 		m.blink = true
 		return m, nil
@@ -518,17 +508,17 @@ func (m Model) Update(msg tea.Msg) (tea.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
 				}
@@ -536,8 +526,8 @@ func (m Model) Update(msg tea.Msg) (tea.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))
 			}
 		}
 
@@ -570,14 +560,9 @@ func (m Model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 
 // View renders the textinput in its current state.
 func (m Model) View() string {
-	prompt := termenv.String(m.Prompt)
-	if m.focus {
-		prompt = prompt.Foreground(color(m.FocusedTextColor))
-	}
-
 	// Placeholder text
 	if len(m.value) == 0 && m.Placeholder != "" {
-		return prompt.String() + m.placeholderView()
+		return m.placeholderView()
 	}
 
 	value := m.value[m.offset:m.offsetRight]
@@ -605,7 +590,7 @@ func (m Model) View() string {
 		)
 	}
 
-	return prompt.String() + v
+	return m.Prompt + v
 }
 
 // placeholderView returns the prompt and placeholder view, if any.
@@ -625,7 +610,7 @@ func (m Model) placeholderView() string {
 	// The rest of the placeholder text
 	v += m.colorPlaceholder(p[1:])
 
-	return v
+	return m.Prompt + v
 }
 
 // cursorView styles the cursor.

viewport/viewport.go

@@ -7,9 +7,7 @@ import (
 	tea "github.com/charmbracelet/bubbletea"
 )
 
-const (
-	spacebar = " "
-)
+const spacebar = " "
 
 // MODEL
 
@@ -269,7 +267,7 @@ func ViewDown(m Model, lines []string) tea.Cmd {
 }
 
 // ViewUp is a high performance command the moves the viewport down by a given
-// number of lines height. Use Model.ViewDown to get the lines that should be
+// number of lines height. Use Model.ViewUp to get the lines that should be
 // rendered.
 func ViewUp(m Model, lines []string) tea.Cmd {
 	if len(lines) == 0 {
@@ -283,7 +281,7 @@ func ViewUp(m Model, lines []string) tea.Cmd {
 // Update runs the update loop with default keybindings similar to popular
 // pagers. To define your own keybindings use the methods on Model (i.e.
 // Model.LineDown()) and define your own update function.
-func Update(msg tea.Msg, m Model) (Model, tea.Cmd) {
+func (m Model) Update(msg tea.Msg) (Model, tea.Cmd) {
 	var cmd tea.Cmd
 
 	switch msg := msg.(type) {
@@ -354,7 +352,7 @@ func Update(msg tea.Msg, m Model) (Model, tea.Cmd) {
 // VIEW
 
 // View renders the viewport into a string.
-func View(m Model) string {
+func (m Model) View() string {
 	if m.HighPerformanceRendering {
 		// Just send newlines since we're doing to be rendering the actual
 		// content seprately. We still need send something that equals the