changed Style handling and implemented jump

- Changed Style fields in list Model struct
- added jump to example movement

Author: Kilian Drechsler

list/example/main.go

@@ -5,6 +5,7 @@ import (
 	"github.com/charmbracelet/bubbles/list"
 	tea "github.com/charmbracelet/bubbletea"
 	"os"
+	"strconv"
 	"strings"
 )
 
@@ -13,6 +14,7 @@ type model struct {
 	list      list.Model
 	finished  bool
 	endResult chan<- string
+	jump      string
 }
 
 func main() {
@@ -28,7 +30,8 @@ func main() {
 		"When you print the items there will be a loss of information,",
 		"since one can not say what was a line break within an item or what is a new item",
 		"Use '+' or '-' to move the item under the curser up and down.",
-		"The 'v' inverts the selected state of each item.",
+		"The key 'v' inverts the selected state of each item.",
+		"To toggle betwen only absolute itemnumbers and also relativ numbers, the 'r' key is your friend.",
 	}
 	endResult := make(chan string, 1)
 
@@ -87,10 +90,32 @@ func update(msg tea.Msg, mdl tea.Model) (tea.Model, tea.Cmd) {
 			m.endResult <- ""
 			return m, tea.Quit
 		}
-		switch msg.String() {
+		switch keyString := msg.String(); keyString {
 		case "q":
 			m.endResult <- ""
 			return m, tea.Quit
+		case "1", "2", "3", "4", "5", "6", "7", "8", "9", "0":
+			m.jump += keyString
+			return m, nil
+		case "down", "j":
+			j := 1
+			if m.jump != "" {
+				j, _ = strconv.Atoi(m.jump)
+				m.jump = ""
+			}
+			m.list.Move(j)
+			return m, nil
+		case "up", "k":
+			j := 1
+			if m.jump != "" {
+				j, _ = strconv.Atoi(m.jump)
+				m.jump = ""
+			}
+			m.list.Move(-j)
+			return m, nil
+		case "r":
+			m.list.NumberRelative = !m.list.NumberRelative
+			return m, nil
 		}
 
 		// Enter prints the selected lines to StdOut

list/list.go

@@ -34,10 +34,9 @@ type Model struct {
 	Number         bool
 	NumberRelative bool
 
-	LineForeGroundStyle     termenv.Style
-	LineBackGroundStyle     termenv.Style
-	SelectedForeGroundStyle termenv.Style
-	SelectedBackGroundStyle termenv.Style
+	LineStyle     termenv.Style
+	SelectedStyle termenv.Style
+	CurrentStyle  termenv.Style
 }
 
 // Item are Items used in the list Model
@@ -155,18 +154,18 @@ out:
 		}
 
 		// Selecting: handel highlighting and prefixing of selected lines
-		selString := prepad       // assume not selected
-		style := termenv.String() // create empty style
+		selString := prepad
+		style := m.LineStyle
 
 		if item.selected {
-			style = m.SelectedBackGroundStyle // fill style
-			selString = prefix                // change if selected
+			style = m.SelectedStyle
+			selString = prefix
 		}
 
 		// Current: handel highlighting of current item/first-line
 		curPad := sufpad
 		if index == m.curIndex {
-			style = style.Reverse()
+			style = m.CurrentStyle
 			curPad = suffix
 		}
 
@@ -352,7 +351,7 @@ func (m *Model) Move(amount int) error {
 	}
 	// visible Up movement
 	if direction < 0 && target < upperBorder {
-		visOff = target-curOff
+		visOff = target - curOff
 	}
 	// dont go infront of list begin
 	if visOff < 0 {
@@ -366,7 +365,8 @@ func (m *Model) Move(amount int) error {
 // NewModel returns a Model with some save/sane defaults
 func NewModel() Model {
 	p := termenv.ColorProfile()
-	style := termenv.Style{}.Background(p.Color("#ff0000"))
+	selStyle := termenv.Style{}.Background(p.Color("#ff0000"))
+	curStyle := termenv.Style{}.Reverse()
 	return Model{
 		CurserOffset: 5,
 
@@ -382,7 +382,8 @@ func NewModel() Model {
 			return k < l
 		},
 
-		SelectedBackGroundStyle: style,
+		SelectedStyle: selStyle,
+		CurrentStyle:  curStyle,
 	}
 }