feat(viewport): line count getters (#283)

This reverts commit a4ed54327f.

.github/dependabot.yml

@@ -0,0 +1,22 @@
+version: 2
+updates:
+  - package-ecosystem: "gomod"
+    directory: "/"
+    schedule:
+      interval: "daily"
+      time: "08:00"
+    labels:
+      - "dependencies"
+    commit-message:
+      prefix: "feat"
+      include: "scope"
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily"
+      time: "08:00"
+    labels:
+      - "dependencies"
+    commit-message:
+      prefix: "chore"
+      include: "scope"

.github/workflows/build.yml

@@ -11,12 +11,12 @@ jobs:
       GO111MODULE: "on"
     steps:
       - name: Install Go
-        uses: actions/setup-go@v2
+        uses: actions/setup-go@v3
         with:
           go-version: ${{ matrix.go-version }}
 
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Download Go modules
         run: go mod download

.github/workflows/coverage.yml

@@ -12,12 +12,12 @@ jobs:
       GO111MODULE: "on"
     steps:
       - name: Install Go
-        uses: actions/setup-go@v2
+        uses: actions/setup-go@v3
         with:
           go-version: ${{ matrix.go-version }}
 
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Coverage
         env:

.github/workflows/lint-soft.yml

@@ -0,0 +1,28 @@
+name: lint-soft
+on:
+  push:
+  pull_request:
+
+permissions:
+  contents: read
+  # Optional: allow read access to pull request. Use with `only-new-issues` option.
+  pull-requests: read
+
+jobs:
+  golangci:
+    name: lint-soft
+    runs-on: ubuntu-latest
+    steps:
+      - name: Install Go
+        uses: actions/setup-go@v3
+        with:
+          go-version: ^1
+
+      - uses: actions/checkout@v3
+      - name: golangci-lint
+        uses: golangci/golangci-lint-action@v3
+        with:
+          # Optional: golangci-lint command line arguments.
+          args: --config .golangci-soft.yml --issues-exit-code=0
+          # Optional: show only new issues if it's a pull request. The default value is `false`.
+          only-new-issues: true

.github/workflows/lint.yml

@@ -1,18 +1,28 @@
 name: lint
-on: [push, pull_request]
+on:
+  push:
+  pull_request:
+
+permissions:
+  contents: read
+  # Optional: allow read access to pull request. Use with `only-new-issues` option.
+  pull-requests: read
 
 jobs:
   golangci:
     name: lint
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - name: Install Go
+        uses: actions/setup-go@v3
+        with:
+          go-version: ^1
+
+      - uses: actions/checkout@v3
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v2
+        uses: golangci/golangci-lint-action@v3
         with:
           # Optional: golangci-lint command line arguments.
-          args: --issues-exit-code=0
+          #args:
-          # Optional: working directory, useful for monorepos
-          # working-directory: somedir
           # Optional: show only new issues if it's a pull request. The default value is `false`.
           only-new-issues: true

.golangci-soft.yml

@@ -0,0 +1,47 @@
+run:
+  tests: false
+
+issues:
+  include:
+    - EXC0001
+    - EXC0005
+    - EXC0011
+    - EXC0012
+    - EXC0013
+
+  max-issues-per-linter: 0
+  max-same-issues: 0
+
+linters:
+  enable:
+    # - dupl
+    - exhaustive
+    # - exhaustivestruct
+    - goconst
+    - godot
+    - godox
+    - gomnd
+    - gomoddirectives
+    - goprintffuncname
+    - ifshort
+    # - lll
+    - misspell
+    - nakedret
+    - nestif
+    - noctx
+    - nolintlint
+    - prealloc
+    - wrapcheck
+
+  # disable default linters, they are already enabled in .golangci.yml
+  disable:
+    - deadcode
+    - errcheck
+    - gosimple
+    - govet
+    - ineffassign
+    - staticcheck
+    - structcheck
+    - typecheck
+    - unused
+    - varcheck

.golangci.yml

@@ -15,20 +15,15 @@ issues:
 linters:
   enable:
     - bodyclose
-    - dupl
     - exportloopref
-    - goconst
-    - godot
-    - godox
     - goimports
-    - goprintffuncname
     - gosec
-    - ifshort
+    - nilerr
-    - misspell
+    - predeclared
-    - prealloc
     - revive
     - rowserrcheck
     - sqlclosecheck
+    - tparallel
     - unconvert
     - unparam
     - whitespace

README.md

@@ -26,8 +26,8 @@ applications. These components are used in production in [Glow][glow],
 A spinner, useful for indicating that some kind an operation is happening.
 There are a couple default ones, but you can also pass your own ”frames.”
 
-* [Example code, basic spinner](https://github.com/charmbracelet/tea/tree/master/examples/spinner/main.go)
+* [Example code, basic spinner](https://github.com/charmbracelet/bubbletea/tree/master/examples/spinner/main.go)
-* [Example code, various spinners](https://github.com/charmbracelet/tea/tree/master/examples/spinners/main.go)
+* [Example code, various spinners](https://github.com/charmbracelet/bubbletea/tree/master/examples/spinners/main.go)
 
 
 ## Text Input
@@ -38,8 +38,8 @@ A text input field, akin to an `<input type="text">` in HTML. Supports unicode,
 pasting, in-place scrolling when the value exceeds the width of the element and
 the common, and many customization options.
 
-* [Example code, one field](https://github.com/charmbracelet/tea/tree/master/examples/textinput/main.go)
+* [Example code, one field](https://github.com/charmbracelet/bubbletea/tree/master/examples/textinput/main.go)
-* [Example code, many fields](https://github.com/charmbracelet/tea/tree/master/examples/textinputs/main.go)
+* [Example code, many fields](https://github.com/charmbracelet/bubbletea/tree/master/examples/textinputs/main.go)
 
 ## Text Area
 
@@ -50,17 +50,21 @@ spans multiple lines. Supports unicode, pasting, vertical scrolling when the
 value exceeds the width and height of the element,  and many customization
 options.
 
-* [Example code, chat input](https://github.com/charmbracelet/tea/tree/master/examples/chat/main.go)
+* [Example code, chat input](https://github.com/charmbracelet/bubbletea/tree/master/examples/chat/main.go)
-* [Example code, story time input](https://github.com/charmbracelet/tea/tree/master/examples/textarea/main.go)
+* [Example code, story time input](https://github.com/charmbracelet/bubbletea/tree/master/examples/textarea/main.go)
 
+## Table
+
+<img src="https://stuff.charm.sh/bubbles-examples/table.gif" width="400" alt="Table Example">
+
+A component for displaying and navigating tabular data (columns and rows).
+Supports vertical scrolling and many customization options.
+
+* [Example code, countries and populations](https://github.com/charmbracelet/bubbletea/tree/master/examples/table/main.go)
 
 ## Progress
 
-<picture>
+<img src="https://stuff.charm.sh/bubbles-examples/progress.gif" width="800" alt="Progressbar Example">
-  <source media="(max-width: 800px)" srcset="https://stuff.charm.sh/bubbles-examples/progress.gif">
-  <source media="(min-width: 800px)" width="800" srcset="https://stuff.charm.sh/bubbles-examples/progress.gif">
-  <img src="https://stuff.charm.sh/bubbles-examples/progress.gif" alt="Progressbar Example">
-</picture>
 
 A simple, customizable progress meter, with optional animation via
 [Harmonica][harmonica]. Supports solid and gradient fills. The empty and filled
@@ -87,17 +91,13 @@ logic and visualize pagination however you like.
 
 ## Viewport
 
-<picture>
+<img src="https://stuff.charm.sh/bubbles-examples/viewport.gif" width="600" alt="Viewport Example">
-  <source media="(max-width: 600px)" srcset="https://stuff.charm.sh/bubbles-examples/viewport.gif?0">
-  <source media="(min-width: 600px)" width="600" srcset="https://stuff.charm.sh/bubbles-examples/viewport.gif?0">
-  <img src="https://stuff.charm.sh/bubbles-examples/viewport.gif?0" alt="Viewport Example">
-</picture>
 
 A viewport for vertically scrolling content. Optionally includes standard
 pager keybindings and mouse wheel support. A high performance mode is available
 for applications which make use of the alternate screen buffer.
 
-* [Example code](https://github.com/charmbracelet/tea/tree/master/examples/pager/main.go)
+* [Example code](https://github.com/charmbracelet/bubbletea/tree/master/examples/pager/main.go)
 
 This component is well complemented with [Reflow][reflow] for ANSI-aware
 indenting and text wrapping.
@@ -107,20 +107,16 @@ indenting and text wrapping.
 
 ## List
 
-<picture>
+<img src="https://stuff.charm.sh/bubbles-examples/list.gif" width="600" alt="List Example">
-  <source media="(max-width: 600px)" srcset="https://stuff.charm.sh/bubbles-examples/list.gif">
-  <source media="(min-width: 600px)" width="600" srcset="https://stuff.charm.sh/bubbles-examples/list.gif">
-  <img src="https://stuff.charm.sh/bubbles-examples/list.gif" alt="List Example">
-</picture>
 
 A customizable, batteries-included component for browsing a set of items.
 Features pagination, fuzzy filtering, auto-generated help, an activity spinner,
 and status messages, all of which can be enabled and disabled as needed.
 Extrapolated from [Glow][glow].
 
-* [Example code, default list](https://github.com/charmbracelet/tea/tree/master/examples/list-default/main.go)
+* [Example code, default list](https://github.com/charmbracelet/bubbletea/tree/master/examples/list-default/main.go)
-* [Example code, simple list](https://github.com/charmbracelet/tea/tree/master/examples/list-simple/main.go)
+* [Example code, simple list](https://github.com/charmbracelet/bubbletea/tree/master/examples/list-simple/main.go)
-* [Example code, all features](https://github.com/charmbracelet/tea/tree/master/examples/list-fancy/main.go)
+* [Example code, all features](https://github.com/charmbracelet/bubbletea/tree/master/examples/list-fancy/main.go)
 
 
 ## Timer
@@ -145,11 +141,7 @@ can be customized as you see fit.
 
 ## Help
 
-<picture>
+<img src="https://stuff.charm.sh/bubbles-examples/help.gif" width="500" alt="Help Example">
-  <source media="(max-width: 500px)" srcset="https://stuff.charm.sh/bubbles-examples/help.gif">
-  <source media="(min-width: 500px)" width="500" srcset="https://stuff.charm.sh/bubbles-examples/help.gif">
-  <img src="https://stuff.charm.sh/bubbles-examples/help.gif" alt="Help Example">
-</picture>
 
 A customizable horizontal mini help view that automatically generates itself
 from your keybindings. It features single and multi-line modes, which the user
@@ -225,11 +217,17 @@ func (m Model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 If you’ve built a Bubble you think should be listed here,
 [let us know](mailto:vt100@charm.sh).
 
+## Feedback
+
+We’d love to hear your thoughts on this project. Feel free to drop us a note!
+
+* [Twitter](https://twitter.com/charmcli)
+* [The Fediverse](https://mastodon.social/@charmcli)
+* [Discord](https://charm.sh/chat)
 
 ## License
 
-[MIT](https://github.com/charmbracelet/teaparty/raw/master/LICENSE)
+[MIT](https://github.com/charmbracelet/bubbletea/raw/master/LICENSE)
-
 
 ***
 
@@ -238,5 +236,3 @@ Part of [Charm](https://charm.sh).
 <a href="https://charm.sh/"><img alt="The Charm logo" src="https://stuff.charm.sh/charm-badge.jpg" width="400"></a>
 
 Charm热爱开源 • Charm loves open source
-
-[charm]: https://charm.sh/

cursor/cursor.go

@@ -70,8 +70,8 @@ type Model struct {
 	blinkCtx *blinkCtx
 	// The ID of the blink message we're expecting to receive.
 	blinkTag int
-	// cursorMode determines the behavior of the cursor
+	// mode determines the behavior of the cursor
-	cursorMode Mode
+	mode Mode
 }
 
 // New creates a new model with default settings.
@@ -79,8 +79,8 @@ func New() Model {
 	return Model{
 		BlinkSpeed: defaultBlinkSpeed,
 
-		Blink:      true,
+		Blink: true,
-		cursorMode: CursorBlink,
+		mode:  CursorBlink,
 
 		blinkCtx: &blinkCtx{
 			ctx: context.Background(),
@@ -94,7 +94,7 @@ func (m Model) Update(msg tea.Msg) (Model, tea.Cmd) {
 	case initialBlinkMsg:
 		// We accept all initialBlinkMsgs generated by the Blink command.
 
-		if m.cursorMode != CursorBlink || !m.focus {
+		if m.mode != CursorBlink || !m.focus {
 			return m, nil
 		}
 
@@ -106,7 +106,7 @@ func (m Model) Update(msg tea.Msg) (Model, tea.Cmd) {
 		// only exactly when it should.
 
 		// Is this model blink-able?
-		if m.cursorMode != CursorBlink || !m.focus {
+		if m.mode != CursorBlink || !m.focus {
 			return m, nil
 		}
 
@@ -116,7 +116,7 @@ func (m Model) Update(msg tea.Msg) (Model, tea.Cmd) {
 		}
 
 		var cmd tea.Cmd
-		if m.cursorMode == CursorBlink {
+		if m.mode == CursorBlink {
 			m.Blink = !m.Blink
 			cmd = m.BlinkCmd()
 		}
@@ -128,18 +128,18 @@ func (m Model) Update(msg tea.Msg) (Model, tea.Cmd) {
 	return m, nil
 }
 
-// CursorMode returns the model's cursor mode. For available cursor modes, see
+// Mode returns the model's cursor mode. For available cursor modes, see
-// type CursorMode.
+// type Mode.
-func (m Model) CursorMode() Mode {
+func (m Model) Mode() Mode {
-	return m.cursorMode
+	return m.mode
 }
 
-// SetCursorMode sets the model's cursor mode. This method returns a command.
+// SetMode sets the model's cursor mode. This method returns a command.
 //
 // For available cursor modes, see type CursorMode.
-func (m *Model) SetCursorMode(mode Mode) tea.Cmd {
+func (m *Model) SetMode(mode Mode) tea.Cmd {
-	m.cursorMode = mode
+	m.mode = mode
-	m.Blink = m.cursorMode == CursorHide || !m.focus
+	m.Blink = m.mode == CursorHide || !m.focus
 	if mode == CursorBlink {
 		return Blink
 	}
@@ -148,7 +148,7 @@ func (m *Model) SetCursorMode(mode Mode) tea.Cmd {
 
 // BlinkCmd is an command used to manage cursor blinking.
 func (m *Model) BlinkCmd() tea.Cmd {
-	if m.cursorMode != CursorBlink {
+	if m.mode != CursorBlink {
 		return nil
 	}
 
@@ -179,9 +179,9 @@ func Blink() tea.Msg {
 // Focus focuses the cursor to allow it to blink if desired.
 func (m *Model) Focus() tea.Cmd {
 	m.focus = true
-	m.Blink = m.cursorMode == CursorHide // show the cursor unless we've explicitly hidden it
+	m.Blink = m.mode == CursorHide // show the cursor unless we've explicitly hidden it
 
-	if m.cursorMode == CursorBlink && m.focus {
+	if m.mode == CursorBlink && m.focus {
 		return m.BlinkCmd()
 	}
 	return nil
@@ -201,7 +201,7 @@ func (m *Model) SetChar(char string) {
 // View displays the cursor.
 func (m Model) View() string {
 	if m.Blink {
-		return m.TextStyle.Render(m.char)
+		return m.TextStyle.Inline(true).Render(m.char)
 	}
 	return m.Style.Inline(true).Reverse(true).Render(m.char)
 }

go.mod

@@ -4,12 +4,12 @@ go 1.13
 
 require (
 	github.com/atotto/clipboard v0.1.4
-	github.com/charmbracelet/bubbletea v0.21.0
+	github.com/charmbracelet/bubbletea v0.22.1
 	github.com/charmbracelet/harmonica v0.2.0
-	github.com/charmbracelet/lipgloss v0.5.0
+	github.com/charmbracelet/lipgloss v0.6.0
 	github.com/kylelemons/godebug v1.1.0 // indirect
 	github.com/lucasb-eyer/go-colorful v1.2.0
-	github.com/mattn/go-runewidth v0.0.13
+	github.com/mattn/go-runewidth v0.0.14
 	github.com/muesli/reflow v0.3.0
 	github.com/muesli/termenv v0.11.1-0.20220212125758-44cd13922739
 	github.com/sahilm/fuzzy v0.1.0

go.sum

@@ -1,27 +1,31 @@
 github.com/atotto/clipboard v0.1.4 h1:EH0zSVneZPSuFR11BlR9YppQTVDbh5+16AmcJi4g1z4=
 github.com/atotto/clipboard v0.1.4/go.mod h1:ZY9tmq7sm5xIbd9bOK4onWV4S6X0u6GY7Vn0Yu86PYI=
-github.com/charmbracelet/bubbletea v0.21.0 h1:f3y+kanzgev5PA916qxmDybSHU3N804uOnKnhRPXTcI=
+github.com/charmbracelet/bubbletea v0.22.1 h1:z66q0LWdJNOWEH9zadiAIXp2GN1AWrwNXU8obVY9X24=
-github.com/charmbracelet/bubbletea v0.21.0/go.mod h1:GgmJMec61d08zXsOhqRC/AiOx4K4pmz+VIcRIm1FKr4=
+github.com/charmbracelet/bubbletea v0.22.1/go.mod h1:8/7hVvbPN6ZZPkczLiB8YpLkLJ0n7DMho5Wvfd2X1C0=
 github.com/charmbracelet/harmonica v0.2.0 h1:8NxJWRWg/bzKqqEaaeFNipOu77YR5t8aSwG4pgaUBiQ=
 github.com/charmbracelet/harmonica v0.2.0/go.mod h1:KSri/1RMQOZLbw7AHqgcBycp8pgJnQMYYT8QZRqZ1Ao=
-github.com/charmbracelet/lipgloss v0.5.0 h1:lulQHuVeodSgDez+3rGiuxlPVXSnhth442DATR2/8t8=
+github.com/charmbracelet/lipgloss v0.6.0 h1:1StyZB9vBSOyuZxQUcUwGr17JmojPNm87inij9N3wJY=
-github.com/charmbracelet/lipgloss v0.5.0/go.mod h1:EZLha/HbzEt7cYqdFPovlqy5FZPj0xFhg5SaqxScmgs=
+github.com/charmbracelet/lipgloss v0.6.0/go.mod h1:tHh2wr34xcHjC2HCXIlGSG1jaDF0S0atAUvBMP6Ppuk=
 github.com/containerd/console v1.0.3 h1:lIr7SlA5PxZyMV30bDW0MGbiOPXwc63yRuCP0ARubLw=
 github.com/containerd/console v1.0.3/go.mod h1:7LqA/THxQ86k76b8c/EMSiaJ3h1eZkMkXar0TQ1gf3U=
 github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=
 github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
 github.com/lucasb-eyer/go-colorful v1.2.0 h1:1nnpGOrhyZZuNyfu1QjKiUICQ74+3FNCN69Aj6K7nkY=
 github.com/lucasb-eyer/go-colorful v1.2.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
-github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y=
 github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
+github.com/mattn/go-isatty v0.0.16 h1:bq3VjFmv/sOjHtdEhmkEV4x1AJtvUvOJ2PFAZ5+peKQ=
+github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
+github.com/mattn/go-localereader v0.0.1 h1:ygSAOl7ZXTx4RdPYinUpg6W99U8jWvWi9Ye2JC/oIi4=
+github.com/mattn/go-localereader v0.0.1/go.mod h1:8fBrzywKY7BI3czFoHkuzRoWE9C+EiG4R1k4Cjx5p88=
 github.com/mattn/go-runewidth v0.0.10/go.mod h1:RAqKPSqVFrSLVXbA8x7dzmKdmGzieGRCM46jaSJTDAk=
 github.com/mattn/go-runewidth v0.0.12/go.mod h1:RAqKPSqVFrSLVXbA8x7dzmKdmGzieGRCM46jaSJTDAk=
-github.com/mattn/go-runewidth v0.0.13 h1:lTGmDsbAYt5DmK6OnoV7EuIF1wEIFAcxld6ypU4OSgU=
 github.com/mattn/go-runewidth v0.0.13/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
+github.com/mattn/go-runewidth v0.0.14 h1:+xnbZSEeDbOIg5/mE6JF0w6n9duR1l3/WmbinWVwUuU=
+github.com/mattn/go-runewidth v0.0.14/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
 github.com/muesli/ansi v0.0.0-20211018074035-2e021307bc4b h1:1XF24mVaiu7u+CFywTdcDo2ie1pzzhwjt6RHqzpMU34=
 github.com/muesli/ansi v0.0.0-20211018074035-2e021307bc4b/go.mod h1:fQuZ0gauxyBcmsdE3ZT4NasjaRdxmbCS0jRHsrWu3Ho=
-github.com/muesli/cancelreader v0.2.0 h1:SOpr+CfyVNce341kKqvbhhzQhBPyJRXQaCtn03Pae1Q=
+github.com/muesli/cancelreader v0.2.2 h1:3I4Kt4BQjOR54NavqnDogx/MIoWBFa0StPA8ELUXHmA=
-github.com/muesli/cancelreader v0.2.0/go.mod h1:3XuTXfFS2VjM+HTLZY9Ak0l6eUKfijIfMUZ4EgX0QYo=
+github.com/muesli/cancelreader v0.2.2/go.mod h1:3XuTXfFS2VjM+HTLZY9Ak0l6eUKfijIfMUZ4EgX0QYo=
 github.com/muesli/reflow v0.2.1-0.20210115123740-9e1d0d53df68/go.mod h1:Xk+z4oIWdQqJzsxyjgl3P22oYZnHdZ8FFTHAQQt5BMQ=
 github.com/muesli/reflow v0.3.0 h1:IFsN6K9NfGtjeggFP+68I4chLZV2yIKsXJFNZ+eWh6s=
 github.com/muesli/reflow v0.3.0/go.mod h1:pbwTDkVPibjO2kyvBQRBxTWEEGDGq0FlB1BIKtnHY/8=
@@ -29,10 +33,7 @@ github.com/muesli/termenv v0.11.1-0.20220204035834-5ac8409525e0/go.mod h1:Bd5NYQ
 github.com/muesli/termenv v0.11.1-0.20220212125758-44cd13922739 h1:QANkGiGr39l1EESqrE0gZw0/AJNYzIvoGLhIoVYtluI=
 github.com/muesli/termenv v0.11.1-0.20220212125758-44cd13922739/go.mod h1:Bd5NYQ7pd+SrtBSrSNoBBmXlcY8+Xj4BMJgh8qcZrvs=
 github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
-github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
 github.com/rivo/uniseg v0.2.0 h1:S1pD9weZBuJdFmowNwbpi7BJ8TNftyUImj/0WQi72jY=
-github.com/rivo/uniseg v0.2.0 h1:S1pD9weZBuJdFmowNwbpi7BJ8TNftyUImj/0WQi72jY=
-github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
 github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
 github.com/sahilm/fuzzy v0.1.0 h1:FzWGaw2Opqyu+794ZQ9SYifWv2EIXpwP4q8dY1kDAwI=
 github.com/sahilm/fuzzy v0.1.0/go.mod h1:VFvziUEIMCrT6A6tw2RFIXPXXmzXbOsSHF0DOI8ZK9Y=
@@ -40,7 +41,10 @@ golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220204135822-1c1b9b1eba6a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220209214540-3681064d5158 h1:rm+CHSpPEEW2IsXUib1ThaHIjuBVZjxNgSKmBLFfD4c=
+golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab h1:2QkjZIsXupsJbJIdSjjUOgWK3aEtzyuh2mPt3l/CkeU=
-golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 h1:JGgROgKl9N8DuW20oFS5gxc+lE67/N3FcwmBPMe7ArY=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
+golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
+golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=

help/help.go

@@ -203,7 +203,7 @@ func (m Model) FullHelpView(groups [][]key.Binding) string {
 
 		// Column
 		totalWidth += lipgloss.Width(col)
-		if totalWidth > m.Width {
+		if m.Width > 0 && totalWidth > m.Width {
 			break
 		}
 
@@ -212,7 +212,7 @@ func (m Model) FullHelpView(groups [][]key.Binding) string {
 		// Separator
 		if i < len(group)-1 {
 			totalWidth += sepWidth
-			if totalWidth > m.Width {
+			if m.Width > 0 && totalWidth > m.Width {
 				break
 			}
 		}

key/key.go

@@ -2,35 +2,35 @@
 // keymappings useful in Bubble Tea components. There are a few different ways
 // you can define a keymapping with this package. Here's one example:
 //
-//     type KeyMap struct {
+//	type KeyMap struct {
-//         Up key.Binding
+//	    Up key.Binding
-//         Down key.Binding
+//	    Down key.Binding
-//     }
+//	}
 //
-//     var DefaultKeyMap = KeyMap{
+//	var DefaultKeyMap = KeyMap{
-//         Up: key.NewBinding(
+//	    Up: key.NewBinding(
-//             key.WithKeys("k", "up"),        // actual keybindings
+//	        key.WithKeys("k", "up"),        // actual keybindings
-//             key.WithHelp("↑/k", "move up"), // corresponding help text
+//	        key.WithHelp("↑/k", "move up"), // corresponding help text
-//         ),
+//	    ),
-//         Down: key.NewBinding(
+//	    Down: key.NewBinding(
-//             key.WithKeys("j", "down"),
+//	        key.WithKeys("j", "down"),
-//             key.WithHelp("↓/j", "move down"),
+//	        key.WithHelp("↓/j", "move down"),
-//         ),
+//	    ),
-//     }
+//	}
 //
-//     func (m Model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
+//	func (m Model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
-//         switch msg := msg.(type) {
+//	    switch msg := msg.(type) {
-//         case tea.KeyMsg:
+//	    case tea.KeyMsg:
-//             switch {
+//	        switch {
-//             case key.Matches(msg, DefaultKeyMap.Up):
+//	        case key.Matches(msg, DefaultKeyMap.Up):
-//                 // The user pressed up
+//	            // The user pressed up
-//             case key.Matches(msg, DefaultKeyMap.Down):
+//	        case key.Matches(msg, DefaultKeyMap.Down):
-//                 // The user pressed down
+//	            // The user pressed down
-//             }
+//	        }
-//         }
+//	    }
 //
-//         // ...
+//	    // ...
-//     }
+//	}
 //
 // The help information, which is not used in the example above, can be used
 // to render help text for keystrokes in your views.

list/list.go

@@ -183,18 +183,18 @@ type Model struct {
 func New(items []Item, delegate ItemDelegate, width, height int) Model {
 	styles := DefaultStyles()
 
-	sp := spinner.NewModel()
+	sp := spinner.New()
 	sp.Spinner = spinner.Line
 	sp.Style = styles.Spinner
 
-	filterInput := textinput.NewModel()
+	filterInput := textinput.New()
 	filterInput.Prompt = "Filter: "
 	filterInput.PromptStyle = styles.FilterPrompt
 	filterInput.CursorStyle = styles.FilterCursor
 	filterInput.CharLimit = 64
 	filterInput.Focus()
 
-	p := paginator.NewModel()
+	p := paginator.New()
 	p.Type = paginator.Dots
 	p.ActiveDot = styles.ActivePaginationDot.String()
 	p.InactiveDot = styles.InactivePaginationDot.String()
@@ -221,7 +221,7 @@ func New(items []Item, delegate ItemDelegate, width, height int) Model {
 		items:     items,
 		Paginator: p,
 		spinner:   sp,
-		Help:      help.NewModel(),
+		Help:      help.New(),
 	}
 
 	m.updatePagination()
@@ -526,7 +526,7 @@ func (m Model) FilterValue() string {
 // SettingFilter returns whether or not the user is currently editing the
 // filter value. It's purely a convenience method for the following:
 //
-//     m.FilterState() == Filtering
+//	m.FilterState() == Filtering
 //
 // It's included here because it's a common thing to check for when
 // implementing this component.
@@ -537,8 +537,7 @@ func (m Model) SettingFilter() bool {
 // IsFiltered returns whether or not the list is currently filtered.
 // It's purely a convenience method for the following:
 //
-//	 m.FilterState() == FilterApplied
+//	m.FilterState() == FilterApplied
-//
 func (m Model) IsFiltered() bool {
 	return m.filterState == FilterApplied
 }

paginator/paginator.go

@@ -7,6 +7,7 @@ package paginator
 import (
 	"fmt"
 
+	"github.com/charmbracelet/bubbles/key"
 	tea "github.com/charmbracelet/bubbletea"
 )
 
@@ -19,20 +20,49 @@ const (
 	Dots
 )
 
+// KeyMap is the key bindings for different actions within the paginator.
+type KeyMap struct {
+	PrevPage key.Binding
+	NextPage key.Binding
+}
+
+// DefaultKeyMap is the default set of key bindings for navigating and acting
+// upon the paginator.
+var DefaultKeyMap = KeyMap{
+	PrevPage: key.NewBinding(key.WithKeys("pgup", "left", "h")),
+	NextPage: key.NewBinding(key.WithKeys("pgdown", "right", "l")),
+}
+
 // Model is the Bubble Tea model for this user interface.
 type Model struct {
-	Type              Type
+	// Type configures how the pagination is rendered (Arabic, Dots).
-	Page              int
+	Type Type
-	PerPage           int
+	// Page is the current page number.
-	TotalPages        int
+	Page int
-	ActiveDot         string
+	// PerPage is the number of items per page.
-	InactiveDot       string
+	PerPage int
-	ArabicFormat      string
+	// TotalPages is the total number of pages.
+	TotalPages int
+	// ActiveDot is used to mark the current page under the Dots display type.
+	ActiveDot string
+	// InactiveDot is used to mark inactive pages under the Dots display type.
+	InactiveDot string
+	// ArabicFormat is the printf-style format to use for the Arabic display type.
+	ArabicFormat string
+
+	// KeyMap encodes the keybindings recognized by the widget.
+	KeyMap KeyMap
+
+	// Deprecated: customize KeyMap instead.
 	UsePgUpPgDownKeys bool
-	UseLeftRightKeys  bool
+	// Deprecated: customize KeyMap instead.
-	UseUpDownKeys     bool
+	UseLeftRightKeys bool
-	UseHLKeys         bool
+	// Deprecated: customize KeyMap instead.
-	UseJKKeys         bool
+	UseUpDownKeys bool
+	// Deprecated: customize KeyMap instead.
+	UseHLKeys bool
+	// Deprecated: customize KeyMap instead.
+	UseJKKeys bool
 }
 
 // SetTotalPages is a helper function for calculating the total number of pages
@@ -65,10 +95,9 @@ func (m Model) ItemsOnPage(totalItems int) int {
 // of the slice you're rendering and you'll receive the start and end bounds
 // corresponding the to pagination. For example:
 //
-//     bunchOfStuff := []stuff{...}
+//	bunchOfStuff := []stuff{...}
-//     start, end := model.GetSliceBounds(len(bunchOfStuff))
+//	start, end := model.GetSliceBounds(len(bunchOfStuff))
-//     sliceToRender := bunchOfStuff[start:end]
+//	sliceToRender := bunchOfStuff[start:end]
-//
 func (m *Model) GetSliceBounds(length int) (start int, end int) {
 	start = m.Page * m.PerPage
 	end = min(m.Page*m.PerPage+m.PerPage, length)
@@ -99,18 +128,14 @@ func (m Model) OnLastPage() bool {
 // New creates a new model with defaults.
 func New() Model {
 	return Model{
-		Type:              Arabic,
+		Type:         Arabic,
-		Page:              0,
+		Page:         0,
-		PerPage:           1,
+		PerPage:      1,
-		TotalPages:        1,
+		TotalPages:   1,
-		ActiveDot:         "•",
+		KeyMap:       DefaultKeyMap,
-		InactiveDot:       "○",
+		ActiveDot:    "•",
-		ArabicFormat:      "%d/%d",
+		InactiveDot:  "○",
-		UsePgUpPgDownKeys: true,
+		ArabicFormat: "%d/%d",
-		UseLeftRightKeys:  true,
-		UseUpDownKeys:     false,
-		UseHLKeys:         true,
-		UseJKKeys:         false,
 	}
 }
 
@@ -123,45 +148,11 @@ var NewModel = New
 func (m Model) Update(msg tea.Msg) (Model, tea.Cmd) {
 	switch msg := msg.(type) {
 	case tea.KeyMsg:
-		if m.UsePgUpPgDownKeys {
+		switch {
-			switch msg.String() {
+		case key.Matches(msg, m.KeyMap.NextPage):
-			case "pgup":
+			m.NextPage()
-				m.PrevPage()
+		case key.Matches(msg, m.KeyMap.PrevPage):
-			case "pgdown":
+			m.PrevPage()
-				m.NextPage()
-			}
-		}
-		if m.UseLeftRightKeys {
-			switch msg.String() {
-			case "left":
-				m.PrevPage()
-			case "right":
-				m.NextPage()
-			}
-		}
-		if m.UseUpDownKeys {
-			switch msg.String() {
-			case "up":
-				m.PrevPage()
-			case "down":
-				m.NextPage()
-			}
-		}
-		if m.UseHLKeys {
-			switch msg.String() {
-			case "h":
-				m.PrevPage()
-			case "l":
-				m.NextPage()
-			}
-		}
-		if m.UseJKKeys {
-			switch msg.String() {
-			case "j":
-				m.PrevPage()
-			case "k":
-				m.NextPage()
-			}
 		}
 	}
 

progress/progress.go

@@ -37,13 +37,12 @@ const (
 	defaultDamping   = 1.0
 )
 
-// Option is used to set options in NewModel. For example:
+// Option is used to set options in New. For example:
-//
-//     progress := NewModel(
-//	       WithRamp("#ff0000", "#0000ff"),
-//	       WithoutPercentage(),
-//     )
 //
+//	    progress := New(
+//		       WithRamp("#ff0000", "#0000ff"),
+//		       WithoutPercentage(),
+//	    )
 type Option func(*Model)
 
 // WithDefaultGradient sets a gradient fill with default colors.

spinner/spinner.go

@@ -85,7 +85,7 @@ var (
 	}
 )
 
-// Model contains the state for the spinner. Use NewModel to create new models
+// Model contains the state for the spinner. Use New to create new models
 // rather than using Model as a struct literal.
 type Model struct {
 	// Spinner settings to use. See type Spinner.
@@ -208,8 +208,7 @@ func Tick() tea.Msg {
 
 // Option is used to set options in New. For example:
 //
-//    spinner := New(WithSpinner(Dot))
+//	spinner := New(WithSpinner(Dot))
-//
 type Option func(*Model)
 
 // WithSpinner is an option to set the spinner.

table/table.go

@@ -109,8 +109,7 @@ func (m *Model) SetStyles(s Styles) {
 
 // Option is used to set options in New. For example:
 //
-//    table := New(WithColumns([]Column{{Title: "ID", Width: 10}}))
+//	table := New(WithColumns([]Column{{Title: "ID", Width: 10}}))
-//
 type Option func(*Model)
 
 // New creates a new model for the table widget.

textarea/textarea.go

@@ -494,6 +494,10 @@ func (m *Model) handlePaste(v string) {
 		}
 	}
 
+	// Put it all back together
+	value := append(head, tail...)
+	m.SetValue(string(value))
+
 	// Reset blink state if necessary and run overflow checks
 	m.SetCursor(m.col + len(paste))
 }

textinput/textinput.go

@@ -1,48 +1,18 @@
 package textinput
 
 import (
-	"context"
 	"strings"
-	"sync"
 	"time"
 	"unicode"
 
 	"github.com/atotto/clipboard"
+	"github.com/charmbracelet/bubbles/cursor"
+	"github.com/charmbracelet/bubbles/key"
 	tea "github.com/charmbracelet/bubbletea"
 	"github.com/charmbracelet/lipgloss"
 	rw "github.com/mattn/go-runewidth"
 )
 
-const defaultBlinkSpeed = time.Millisecond * 530
-
-// Internal ID management for text inputs. Necessary for blink integrity when
-// multiple text inputs are involved.
-var (
-	lastID int
-	idMtx  sync.Mutex
-)
-
-// Return the next ID we should use on the Model.
-func nextID() int {
-	idMtx.Lock()
-	defer idMtx.Unlock()
-	lastID++
-	return lastID
-}
-
-// initialBlinkMsg initializes cursor blinking.
-type initialBlinkMsg struct{}
-
-// blinkMsg signals that the cursor should blink. It contains metadata that
-// allows us to tell if the blink message is the one we're expecting.
-type blinkMsg struct {
-	id  int
-	tag int
-}
-
-// blinkCanceled is sent when a blink operation is canceled.
-type blinkCanceled struct{}
-
 // Internal messages for clipboard operations.
 type pasteMsg string
 type pasteErrMsg struct{ error }
@@ -65,35 +35,44 @@ const (
 	// EchoOnEdit.
 )
 
-// blinkCtx manages cursor blinking.
-type blinkCtx struct {
-	ctx    context.Context
-	cancel context.CancelFunc
-}
-
-// CursorMode describes the behavior of the cursor.
-type CursorMode int
-
-// Available cursor modes.
-const (
-	CursorBlink CursorMode = iota
-	CursorStatic
-	CursorHide
-)
-
-// String returns a the cursor mode in a human-readable format. This method is
-// provisional and for informational purposes only.
-func (c CursorMode) String() string {
-	return [...]string{
-		"blink",
-		"static",
-		"hidden",
-	}[c]
-}
-
 // ValidateFunc is a function that returns an error if the input is invalid.
 type ValidateFunc func(string) error
 
+// KeyMap is the key bindings for different actions within the textinput.
+type KeyMap struct {
+	CharacterForward        key.Binding
+	CharacterBackward       key.Binding
+	WordForward             key.Binding
+	WordBackward            key.Binding
+	DeleteWordBackward      key.Binding
+	DeleteWordForward       key.Binding
+	DeleteAfterCursor       key.Binding
+	DeleteBeforeCursor      key.Binding
+	DeleteCharacterBackward key.Binding
+	DeleteCharacterForward  key.Binding
+	LineStart               key.Binding
+	LineEnd                 key.Binding
+	Paste                   key.Binding
+}
+
+// DefaultKeyMap is the default set of key bindings for navigating and acting
+// upon the textinput.
+var DefaultKeyMap = KeyMap{
+	CharacterForward:        key.NewBinding(key.WithKeys("right", "ctrl+f")),
+	CharacterBackward:       key.NewBinding(key.WithKeys("left", "ctrl+b")),
+	WordForward:             key.NewBinding(key.WithKeys("alt+right", "alt+f")),
+	WordBackward:            key.NewBinding(key.WithKeys("alt+left", "alt+b")),
+	DeleteWordBackward:      key.NewBinding(key.WithKeys("alt+backspace", "ctrl+w")),
+	DeleteWordForward:       key.NewBinding(key.WithKeys("alte+delete", "alt+d")),
+	DeleteAfterCursor:       key.NewBinding(key.WithKeys("ctrl+k")),
+	DeleteBeforeCursor:      key.NewBinding(key.WithKeys("ctrl+u")),
+	DeleteCharacterBackward: key.NewBinding(key.WithKeys("backspace", "ctrl+h")),
+	DeleteCharacterForward:  key.NewBinding(key.WithKeys("delete", "ctrl+d")),
+	LineStart:               key.NewBinding(key.WithKeys("home", "ctrl+a")),
+	LineEnd:                 key.NewBinding(key.WithKeys("end", "ctrl+e")),
+	Paste:                   key.NewBinding(key.WithKeys("ctrl+v")),
+}
+
 // Model is the Bubble Tea model for this text input element.
 type Model struct {
 	Err error
@@ -101,9 +80,13 @@ type Model struct {
 	// General settings.
 	Prompt        string
 	Placeholder   string
-	BlinkSpeed    time.Duration
 	EchoMode      EchoMode
 	EchoCharacter rune
+	Cursor        cursor.Model
+
+	// Deprecated: use cursor.BlinkSpeed instead.
+	// This is unused and will be removed in the future.
+	BlinkSpeed time.Duration
 
 	// Styles. These will be applied as inline styles.
 	//
@@ -124,11 +107,8 @@ type Model struct {
 	// viewport. If 0 or less this setting is ignored.
 	Width int
 
-	// The ID of this Model as it relates to other textinput Models.
+	// KeyMap encodes the keybindings recognized by the widget.
-	id int
+	KeyMap KeyMap
-
-	// The ID of the blink message we're expecting to receive.
-	blinkTag int
 
 	// Underlying text value.
 	value []rune
@@ -137,9 +117,6 @@ type Model struct {
 	// component. When false, ignore keyboard input and hide the cursor.
 	focus bool
 
-	// Cursor blink state.
-	blink bool
-
 	// Cursor position.
 	pos int
 
@@ -148,12 +125,6 @@ type Model struct {
 	offset      int
 	offsetRight int
 
-	// Used to manage cursor blink
-	blinkCtx *blinkCtx
-
-	// cursorMode determines the behavior of the cursor
-	cursorMode CursorMode
-
 	// Validate is a function that checks whether or not the text within the
 	// input is valid. If it is not valid, the `Err` field will be set to the
 	// error returned by the function. If the function is not defined, all
@@ -165,21 +136,15 @@ type Model struct {
 func New() Model {
 	return Model{
 		Prompt:           "> ",
-		BlinkSpeed:       defaultBlinkSpeed,
 		EchoCharacter:    '*',
 		CharLimit:        0,
 		PlaceholderStyle: lipgloss.NewStyle().Foreground(lipgloss.Color("240")),
+		Cursor:           cursor.New(),
+		KeyMap:           DefaultKeyMap,
 
-		id:         nextID(),
+		value: nil,
-		value:      nil,
+		focus: false,
-		focus:      false,
+		pos:   0,
-		blink:      true,
-		pos:        0,
-		cursorMode: CursorBlink,
-
-		blinkCtx: &blinkCtx{
-			ctx: context.Background(),
-		},
 	}
 }
 
@@ -197,6 +162,7 @@ func (m *Model) SetValue(s string) {
 		}
 	}
 
+	empty := len(m.value) == 0
 	m.Err = nil
 
 	runes := []rune(s)
@@ -205,8 +171,8 @@ func (m *Model) SetValue(s string) {
 	} else {
 		m.value = runes
 	}
-	if m.pos == 0 || m.pos > len(m.value) {
+	if (m.pos == 0 && empty) || m.pos > len(m.value) {
-		m.setCursor(len(m.value))
+		m.SetCursor(len(m.value))
 	}
 	m.handleOverflow()
 }
@@ -216,74 +182,26 @@ func (m Model) Value() string {
 	return string(m.value)
 }
 
-// Cursor returns the cursor position.
+// Position returns the cursor position.
-func (m Model) Cursor() int {
+func (m Model) Position() int {
 	return m.pos
 }
 
-// Blink returns whether or not to draw the cursor.
-func (m Model) Blink() bool {
-	return m.blink
-}
-
 // SetCursor moves the cursor to the given position. If the position is
 // out of bounds the cursor will be moved to the start or end accordingly.
 func (m *Model) SetCursor(pos int) {
-	m.setCursor(pos)
-}
-
-// setCursor moves the cursor to the given position and returns whether or not
-// the cursor blink should be reset. If the position is out of bounds the
-// cursor will be moved to the start or end accordingly.
-func (m *Model) setCursor(pos int) bool {
 	m.pos = clamp(pos, 0, len(m.value))
 	m.handleOverflow()
-
-	// Show the cursor unless it's been explicitly hidden
-	m.blink = m.cursorMode == CursorHide
-
-	// Reset cursor blink if necessary
-	return m.cursorMode == CursorBlink
 }
 
 // CursorStart moves the cursor to the start of the input field.
 func (m *Model) CursorStart() {
-	m.cursorStart()
+	m.SetCursor(0)
-}
-
-// cursorStart moves the cursor to the start of the input field and returns
-// whether or not the curosr blink should be reset.
-func (m *Model) cursorStart() bool {
-	return m.setCursor(0)
 }
 
 // CursorEnd moves the cursor to the end of the input field.
 func (m *Model) CursorEnd() {
-	m.cursorEnd()
+	m.SetCursor(len(m.value))
-}
-
-// CursorMode returns the model's cursor mode. For available cursor modes, see
-// type CursorMode.
-func (m Model) CursorMode() CursorMode {
-	return m.cursorMode
-}
-
-// SetCursorMode sets the model's cursor mode. This method returns a command.
-//
-// For available cursor modes, see type CursorMode.
-func (m *Model) SetCursorMode(mode CursorMode) tea.Cmd {
-	m.cursorMode = mode
-	m.blink = m.cursorMode == CursorHide || !m.focus
-	if mode == CursorBlink {
-		return Blink
-	}
-	return nil
-}
-
-// cursorEnd moves the cursor to the end of the input field and returns whether
-// the cursor should blink should reset.
-func (m *Model) cursorEnd() bool {
-	return m.setCursor(len(m.value))
 }
 
 // Focused returns the focus state on the model.
@@ -292,34 +210,27 @@ func (m Model) Focused() bool {
 }
 
 // Focus sets the focus state on the model. When the model is in focus it can
-// receive keyboard input and the cursor will be hidden.
+// receive keyboard input and the cursor will be shown.
 func (m *Model) Focus() tea.Cmd {
 	m.focus = true
-	m.blink = m.cursorMode == CursorHide // show the cursor unless we've explicitly hidden it
+	return m.Cursor.Focus()
-
-	if m.cursorMode == CursorBlink && m.focus {
-		return m.blinkCmd()
-	}
-	return nil
 }
 
 // Blur removes the focus state on the model.  When the model is blurred it can
 // not receive keyboard input and the cursor will be hidden.
 func (m *Model) Blur() {
 	m.focus = false
-	m.blink = true
+	m.Cursor.Blur()
 }
 
-// Reset sets the input to its default state with no input. Returns whether
+// Reset sets the input to its default state with no input.
-// or not the cursor blink should reset.
+func (m *Model) Reset() {
-func (m *Model) Reset() bool {
 	m.value = nil
-	return m.setCursor(0)
+	m.SetCursor(0)
 }
 
-// handle a clipboard paste event, if supported. Returns whether or not the
+// handle a clipboard paste event, if supported.
-// cursor blink should reset.
+func (m *Model) handlePaste(v string) {
-func (m *Model) handlePaste(v string) bool {
 	paste := []rune(v)
 
 	var availSpace int
@@ -329,7 +240,7 @@ func (m *Model) handlePaste(v string) bool {
 
 	// If the char limit's been reached cancel
 	if m.CharLimit > 0 && availSpace <= 0 {
-		return false
+		return
 	}
 
 	// If there's not enough space to paste the whole thing cut the pasted
@@ -366,8 +277,7 @@ func (m *Model) handlePaste(v string) bool {
 		m.pos = oldPos
 	}
 
-	// Reset blink state if necessary and run overflow checks
+	m.SetCursor(m.pos)
-	return m.setCursor(m.pos)
 }
 
 // If a max width is defined, perform some logic to treat the visible area
@@ -415,31 +325,30 @@ func (m *Model) handleOverflow() {
 	}
 }
 
-// deleteBeforeCursor deletes all text before the cursor. Returns whether or
+// deleteBeforeCursor deletes all text before the cursor.
-// not the cursor blink should be reset.
+func (m *Model) deleteBeforeCursor() {
-func (m *Model) deleteBeforeCursor() bool {
 	m.value = m.value[m.pos:]
 	m.offset = 0
-	return m.setCursor(0)
+	m.SetCursor(0)
 }
 
-// deleteAfterCursor deletes all text after the cursor. Returns whether or not
+// deleteAfterCursor deletes all text after the cursor. If input is masked
-// the cursor blink should be reset. If input is masked delete everything after
+// delete everything after the cursor so as not to reveal word breaks in the
-// the cursor so as not to reveal word breaks in the masked input.
+// masked input.
-func (m *Model) deleteAfterCursor() bool {
+func (m *Model) deleteAfterCursor() {
 	m.value = m.value[:m.pos]
-	return m.setCursor(len(m.value))
+	m.SetCursor(len(m.value))
 }
 
-// deleteWordLeft deletes the word left to the cursor. Returns whether or not
+// deleteWordBackward deletes the word left to the cursor.
-// the cursor blink should be reset.
+func (m *Model) deleteWordBackward() {
-func (m *Model) deleteWordLeft() bool {
 	if m.pos == 0 || len(m.value) == 0 {
-		return false
+		return
 	}
 
 	if m.EchoMode != EchoNormal {
-		return m.deleteBeforeCursor()
+		m.deleteBeforeCursor()
+		return
 	}
 
 	// Linter note: it's critical that we acquire the initial cursor position
@@ -447,22 +356,22 @@ func (m *Model) deleteWordLeft() bool {
 	// call into the corresponding if clause does not apply here.
 	oldPos := m.pos //nolint:ifshort
 
-	blink := m.setCursor(m.pos - 1)
+	m.SetCursor(m.pos - 1)
 	for unicode.IsSpace(m.value[m.pos]) {
 		if m.pos <= 0 {
 			break
 		}
 		// ignore series of whitespace before cursor
-		blink = m.setCursor(m.pos - 1)
+		m.SetCursor(m.pos - 1)
 	}
 
 	for m.pos > 0 {
 		if !unicode.IsSpace(m.value[m.pos]) {
-			blink = m.setCursor(m.pos - 1)
+			m.SetCursor(m.pos - 1)
 		} else {
 			if m.pos > 0 {
 				// keep the previous space
-				blink = m.setCursor(m.pos + 1)
+				m.SetCursor(m.pos + 1)
 			}
 			break
 		}
@@ -473,27 +382,26 @@ func (m *Model) deleteWordLeft() bool {
 	} else {
 		m.value = append(m.value[:m.pos], m.value[oldPos:]...)
 	}
-
-	return blink
 }
 
-// deleteWordRight deletes the word right to the cursor. Returns whether or not
+// deleteWordForward deletes the word right to the cursor If input is masked
-// the cursor blink should be reset. If input is masked delete everything after
+// delete everything after the cursor so as not to reveal word breaks in the
-// the cursor so as not to reveal word breaks in the masked input.
+// masked input.
-func (m *Model) deleteWordRight() bool {
+func (m *Model) deleteWordForward() {
 	if m.pos >= len(m.value) || len(m.value) == 0 {
-		return false
+		return
 	}
 
 	if m.EchoMode != EchoNormal {
-		return m.deleteAfterCursor()
+		m.deleteAfterCursor()
+		return
 	}
 
 	oldPos := m.pos
-	m.setCursor(m.pos + 1)
+	m.SetCursor(m.pos + 1)
 	for unicode.IsSpace(m.value[m.pos]) {
 		// ignore series of whitespace after cursor
-		m.setCursor(m.pos + 1)
+		m.SetCursor(m.pos + 1)
 
 		if m.pos >= len(m.value) {
 			break
@@ -502,7 +410,7 @@ func (m *Model) deleteWordRight() bool {
 
 	for m.pos < len(m.value) {
 		if !unicode.IsSpace(m.value[m.pos]) {
-			m.setCursor(m.pos + 1)
+			m.SetCursor(m.pos + 1)
 		} else {
 			break
 		}
@@ -514,26 +422,25 @@ func (m *Model) deleteWordRight() bool {
 		m.value = append(m.value[:oldPos], m.value[m.pos:]...)
 	}
 
-	return m.setCursor(oldPos)
+	m.SetCursor(oldPos)
 }
 
-// wordLeft moves the cursor one word to the left. Returns whether or not the
+// wordBackward moves the cursor one word to the left. If input is masked, move
-// cursor blink should be reset. If input is masked, move input to the start
+// input to the start so as not to reveal word breaks in the masked input.
-// so as not to reveal word breaks in the masked input.
+func (m *Model) wordBackward() {
-func (m *Model) wordLeft() bool {
 	if m.pos == 0 || len(m.value) == 0 {
-		return false
+		return
 	}
 
 	if m.EchoMode != EchoNormal {
-		return m.cursorStart()
+		m.CursorStart()
+		return
 	}
 
-	blink := false
 	i := m.pos - 1
 	for i >= 0 {
 		if unicode.IsSpace(m.value[i]) {
-			blink = m.setCursor(m.pos - 1)
+			m.SetCursor(m.pos - 1)
 			i--
 		} else {
 			break
@@ -542,33 +449,30 @@ func (m *Model) wordLeft() bool {
 
 	for i >= 0 {
 		if !unicode.IsSpace(m.value[i]) {
-			blink = m.setCursor(m.pos - 1)
+			m.SetCursor(m.pos - 1)
 			i--
 		} else {
 			break
 		}
 	}
-
-	return blink
 }
 
-// wordRight moves the cursor one word to the right. Returns whether or not the
+// wordForward moves the cursor one word to the right. If the input is masked,
-// cursor blink should be reset. If the input is masked, move input to the end
+// move input to the end so as not to reveal word breaks in the masked input.
-// so as not to reveal word breaks in the masked input.
+func (m *Model) wordForward() {
-func (m *Model) wordRight() bool {
 	if m.pos >= len(m.value) || len(m.value) == 0 {
-		return false
+		return
 	}
 
 	if m.EchoMode != EchoNormal {
-		return m.cursorEnd()
+		m.CursorEnd()
+		return
 	}
 
-	blink := false
 	i := m.pos
 	for i < len(m.value) {
 		if unicode.IsSpace(m.value[i]) {
-			blink = m.setCursor(m.pos + 1)
+			m.SetCursor(m.pos + 1)
 			i++
 		} else {
 			break
@@ -577,14 +481,12 @@ func (m *Model) wordRight() bool {
 
 	for i < len(m.value) {
 		if !unicode.IsSpace(m.value[i]) {
-			blink = m.setCursor(m.pos + 1)
+			m.SetCursor(m.pos + 1)
 			i++
 		} else {
 			break
 		}
 	}
-
-	return blink
 }
 
 func (m Model) echoTransform(v string) string {
@@ -602,76 +504,58 @@ func (m Model) echoTransform(v string) string {
 // Update is the Bubble Tea update loop.
 func (m Model) Update(msg tea.Msg) (Model, tea.Cmd) {
 	if !m.focus {
-		m.blink = true
 		return m, nil
 	}
 
-	var resetBlink bool
+	// Let's remember where the position of the cursor currently is so that if
+	// the cursor position changes, we can reset the blink.
+	oldPos := m.pos //nolint
 
 	switch msg := msg.(type) {
 	case tea.KeyMsg:
-		switch msg.Type {
+		switch {
-		case tea.KeyBackspace, tea.KeyCtrlH: // delete character before cursor
+		case key.Matches(msg, m.KeyMap.DeleteWordBackward):
 			m.Err = nil
-
+			m.deleteWordBackward()
-			if msg.Alt {
+		case key.Matches(msg, m.KeyMap.DeleteCharacterBackward):
-				resetBlink = m.deleteWordLeft()
+			m.Err = nil
-			} else {
+			if len(m.value) > 0 {
-				if len(m.value) > 0 {
+				m.value = append(m.value[:max(0, m.pos-1)], m.value[m.pos:]...)
-					m.value = append(m.value[:max(0, m.pos-1)], m.value[m.pos:]...)
+				if m.pos > 0 {
-					if m.pos > 0 {
+					m.SetCursor(m.pos - 1)
-						resetBlink = m.setCursor(m.pos - 1)
-					}
 				}
 			}
-		case tea.KeyLeft, tea.KeyCtrlB:
+		case key.Matches(msg, m.KeyMap.WordBackward):
-			if msg.Alt { // alt+left arrow, back one word
+			m.wordBackward()
-				resetBlink = m.wordLeft()
+		case key.Matches(msg, m.KeyMap.CharacterBackward):
-				break
+			if m.pos > 0 {
+				m.SetCursor(m.pos - 1)
 			}
-			if m.pos > 0 { // left arrow, ^F, back one character
+		case key.Matches(msg, m.KeyMap.WordForward):
-				resetBlink = m.setCursor(m.pos - 1)
+			m.wordForward()
+		case key.Matches(msg, m.KeyMap.CharacterForward):
+			if m.pos < len(m.value) {
+				m.SetCursor(m.pos + 1)
 			}
-		case tea.KeyRight, tea.KeyCtrlF:
+		case key.Matches(msg, m.KeyMap.DeleteWordBackward):
-			if msg.Alt { // alt+right arrow, forward one word
+			m.deleteWordBackward()
-				resetBlink = m.wordRight()
+		case key.Matches(msg, m.KeyMap.LineStart):
-				break
+			m.CursorStart()
-			}
+		case key.Matches(msg, m.KeyMap.DeleteCharacterForward):
-			if m.pos < len(m.value) { // right arrow, ^F, forward one character
-				resetBlink = m.setCursor(m.pos + 1)
-			}
-		case tea.KeyCtrlW: // ^W, delete word left of cursor
-			resetBlink = m.deleteWordLeft()
-		case tea.KeyHome, tea.KeyCtrlA: // ^A, go to beginning
-			resetBlink = m.cursorStart()
-		case tea.KeyDelete, tea.KeyCtrlD: // ^D, delete char under cursor
 			if len(m.value) > 0 && m.pos < len(m.value) {
 				m.value = append(m.value[:m.pos], m.value[m.pos+1:]...)
 			}
-		case tea.KeyCtrlE, tea.KeyEnd: // ^E, go to end
+		case key.Matches(msg, m.KeyMap.LineEnd):
-			resetBlink = m.cursorEnd()
+			m.CursorEnd()
-		case tea.KeyCtrlK: // ^K, kill text after cursor
+		case key.Matches(msg, m.KeyMap.DeleteAfterCursor):
-			resetBlink = m.deleteAfterCursor()
+			m.deleteAfterCursor()
-		case tea.KeyCtrlU: // ^U, kill text before cursor
+		case key.Matches(msg, m.KeyMap.DeleteBeforeCursor):
-			resetBlink = m.deleteBeforeCursor()
+			m.deleteBeforeCursor()
-		case tea.KeyCtrlV: // ^V paste
+		case key.Matches(msg, m.KeyMap.Paste):
 			return m, Paste
-		case tea.KeyRunes, tea.KeySpace: // input regular characters
+		case key.Matches(msg, m.KeyMap.DeleteWordForward):
-			if msg.Alt && len(msg.Runes) == 1 {
+			m.deleteWordForward()
-				if msg.Runes[0] == 'd' { // alt+d, delete word right of cursor
+		default:
-					resetBlink = m.deleteWordRight()
-					break
-				}
-				if msg.Runes[0] == 'b' { // alt+b, back one word
-					resetBlink = m.wordLeft()
-					break
-				}
-				if msg.Runes[0] == 'f' { // alt+f, forward one word
-					resetBlink = m.wordRight()
-					break
-				}
-			}
-
 			// Input a regular character
 			if m.CharLimit <= 0 || len(m.value) < m.CharLimit {
 				runes := msg.Runes
@@ -681,59 +565,31 @@ func (m Model) Update(msg tea.Msg) (Model, tea.Cmd) {
 				value = append(value[:m.pos], append(runes, value[m.pos:]...)...)
 				m.SetValue(string(value))
 				if m.Err == nil {
-					resetBlink = m.setCursor(m.pos + len(runes))
+					m.SetCursor(m.pos + len(runes))
 				}
 			}
 		}
 
-	case initialBlinkMsg:
-		// We accept all initialBlinkMsgs genrated by the Blink command.
-
-		if m.cursorMode != CursorBlink || !m.focus {
-			return m, nil
-		}
-
-		cmd := m.blinkCmd()
-		return m, cmd
-
-	case blinkMsg:
-		// We're choosy about whether to accept blinkMsgs so that our cursor
-		// only exactly when it should.
-
-		// Is this model blinkable?
-		if m.cursorMode != CursorBlink || !m.focus {
-			return m, nil
-		}
-
-		// Were we expecting this blink message?
-		if msg.id != m.id || msg.tag != m.blinkTag {
-			return m, nil
-		}
-
-		var cmd tea.Cmd
-		if m.cursorMode == CursorBlink {
-			m.blink = !m.blink
-			cmd = m.blinkCmd()
-		}
-		return m, cmd
-
-	case blinkCanceled: // no-op
-		return m, nil
-
 	case pasteMsg:
-		resetBlink = m.handlePaste(string(msg))
+		m.handlePaste(string(msg))
 
 	case pasteErrMsg:
 		m.Err = msg
 	}
 
+	var cmds []tea.Cmd
 	var cmd tea.Cmd
-	if resetBlink {
+
-		cmd = m.blinkCmd()
+	m.Cursor, cmd = m.Cursor.Update(msg)
+	cmds = append(cmds, cmd)
+
+	if oldPos != m.pos {
+		m.Cursor.Blink = false
+		cmds = append(cmds, m.Cursor.BlinkCmd())
 	}
 
 	m.handleOverflow()
-	return m, cmd
+	return m, tea.Batch(cmds...)
 }
 
 // View renders the textinput in its current state.
@@ -750,10 +606,13 @@ func (m Model) View() string {
 	v := styleText(m.echoTransform(string(value[:pos])))
 
 	if pos < len(value) {
-		v += m.cursorView(m.echoTransform(string(value[pos]))) // cursor and text under it
+		char := m.echoTransform(string(value[pos]))
+		m.Cursor.SetChar(char)
+		v += m.Cursor.View()                                   // cursor and text under it
 		v += styleText(m.echoTransform(string(value[pos+1:]))) // text after cursor
 	} else {
-		v += m.cursorView(" ")
+		m.Cursor.SetChar(" ")
+		v += m.Cursor.View()
 	}
 
 	// If a max width and background color were set fill the empty spaces with
@@ -778,12 +637,9 @@ func (m Model) placeholderView() string {
 		style = m.PlaceholderStyle.Inline(true).Render
 	)
 
-	// Cursor
+	m.Cursor.TextStyle = m.PlaceholderStyle
-	if m.blink {
+	m.Cursor.SetChar(p[:1])
-		v += m.cursorView(style(p[:1]))
+	v += m.Cursor.View()
-	} else {
-		v += m.cursorView(p[:1])
-	}
 
 	// The rest of the placeholder text
 	v += style(p[1:])
@@ -791,42 +647,9 @@ func (m Model) placeholderView() string {
 	return m.PromptStyle.Render(m.Prompt) + v
 }
 
-// cursorView styles the cursor.
-func (m Model) cursorView(v string) string {
-	if m.blink {
-		return m.TextStyle.Render(v)
-	}
-	return m.CursorStyle.Inline(true).Reverse(true).Render(v)
-}
-
-// blinkCmd is an internal command used to manage cursor blinking.
-func (m *Model) blinkCmd() tea.Cmd {
-	if m.cursorMode != CursorBlink {
-		return nil
-	}
-
-	if m.blinkCtx != nil && m.blinkCtx.cancel != nil {
-		m.blinkCtx.cancel()
-	}
-
-	ctx, cancel := context.WithTimeout(m.blinkCtx.ctx, m.BlinkSpeed)
-	m.blinkCtx.cancel = cancel
-
-	m.blinkTag++
-
-	return func() tea.Msg {
-		defer cancel()
-		<-ctx.Done()
-		if ctx.Err() == context.DeadlineExceeded {
-			return blinkMsg{id: m.id, tag: m.blinkTag}
-		}
-		return blinkCanceled{}
-	}
-}
-
 // Blink is a command used to initialize cursor blinking.
 func Blink() tea.Msg {
-	return initialBlinkMsg{}
+	return cursor.Blink()
 }
 
 // Paste is a command for pasting from the clipboard into the text input.
@@ -858,3 +681,31 @@ func max(a, b int) int {
 	}
 	return b
 }
+
+// Deprecated.
+
+// Deprecated: use cursor.Mode.
+type CursorMode int
+
+const (
+	// Deprecated: use cursor.CursorBlink.
+	CursorBlink = CursorMode(cursor.CursorBlink)
+	// Deprecated: use cursor.CursorStatic.
+	CursorStatic = CursorMode(cursor.CursorStatic)
+	// Deprecated: use cursor.CursorHide.
+	CursorHide = CursorMode(cursor.CursorHide)
+)
+
+func (c CursorMode) String() string {
+	return cursor.Mode(c).String()
+}
+
+// Deprecated: use cursor.Mode().
+func (m Model) CursorMode() CursorMode {
+	return CursorMode(m.Cursor.Mode())
+}
+
+// Deprecated: use cursor.SetMode().
+func (m *Model) SetCursorMode(mode CursorMode) tea.Cmd {
+	return m.Cursor.SetMode(cursor.Mode(mode))
+}

viewport/viewport.go

@@ -207,6 +207,16 @@ func (m *Model) LineUp(n int) (lines []string) {
 	return m.visibleLines()
 }
 
+// TotalLineCount returns the total number of lines (both hidden and visible) within the viewport.
+func (m Model) TotalLineCount() int {
+	return len(m.lines)
+}
+
+// VisibleLineCount returns the number of the visible lines within the viewport.
+func (m Model) VisibleLineCount() int {
+	return len(m.visibleLines())
+}
+
 // GotoTop sets the viewport to the top position.
 func (m *Model) GotoTop() (lines []string) {
 	if m.AtTop() {
@@ -240,9 +250,8 @@ func Sync(m Model) tea.Cmd {
 // number of lines. Use Model.ViewDown to get the lines that should be rendered.
 // For example:
 //
-//     lines := model.ViewDown(1)
+//	lines := model.ViewDown(1)
-//     cmd := ViewDown(m, lines)
+//	cmd := ViewDown(m, lines)
-//
 func ViewDown(m Model, lines []string) tea.Cmd {
 	if len(lines) == 0 {
 		return nil