Mirrors/glow
2
0
Fork 0
mirror of https://github.com/charmbracelet/glow synced 2024-11-13 23:47:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

Bump bubbles to get pgup/pgdown in the stash (via the paginator)

Browse source
This commit is contained in:
Christian Rocha 2020-07-20 13:33:49 -04:00 committed by Christian Muehlhaeuser
parent f2fce69671
commit 2b42115599
3 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
go.mod
View file

@ -3,7 +3,7 @@ module github.com/charmbracelet/glow
go 1.13 go 1.13
require ( require (
github.com/charmbracelet/bubbles v0.4.1-0.20200720155635-88469a499e1a github.com/charmbracelet/bubbles v0.4.1-0.20200720161353-5a26cb0d8eb6
github.com/charmbracelet/bubbletea v0.10.1-0.20200720155027-2ee871862a49 github.com/charmbracelet/bubbletea v0.10.1-0.20200720155027-2ee871862a49
github.com/charmbracelet/charm v0.5.2 github.com/charmbracelet/charm v0.5.2
github.com/charmbracelet/glamour v0.1.1-0.20200521150359-e859bb067c06 github.com/charmbracelet/glamour v0.1.1-0.20200521150359-e859bb067c06

4
go.sum
View file

@ -16,8 +16,8 @@ github.com/calmh/randomart v1.1.0 h1:evl+iwc10LXtHdMZhzLxmsCQVmWnkXs44SbC6Uk0Il8
github.com/calmh/randomart v1.1.0/go.mod h1:DQUbPVyP+7PAs21w/AnfMKG5NioxS3TbZ2F9MSK/jFM= github.com/calmh/randomart v1.1.0/go.mod h1:DQUbPVyP+7PAs21w/AnfMKG5NioxS3TbZ2F9MSK/jFM=
github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
github.com/charmbracelet/bubbles v0.4.0/go.mod h1:yhk6OKN3haEO3i/vYQVrvbPamvOPo2dVavWfbpsuUjg= github.com/charmbracelet/bubbles v0.4.0/go.mod h1:yhk6OKN3haEO3i/vYQVrvbPamvOPo2dVavWfbpsuUjg=
github.com/charmbracelet/bubbles v0.4.1-0.20200720155635-88469a499e1a h1:Saz5ZuA/YfFjTM8Tk2KfAUPDutSIsU+GbSykL4LWUS0= github.com/charmbracelet/bubbles v0.4.1-0.20200720161353-5a26cb0d8eb6 h1:aRg6jZ74pEvFkLpPvtP99ZrbZrf1C7bEeOdh9XE/JfM=
github.com/charmbracelet/bubbles v0.4.1-0.20200720155635-88469a499e1a/go.mod h1:yhk6OKN3haEO3i/vYQVrvbPamvOPo2dVavWfbpsuUjg= github.com/charmbracelet/bubbles v0.4.1-0.20200720161353-5a26cb0d8eb6/go.mod h1:yhk6OKN3haEO3i/vYQVrvbPamvOPo2dVavWfbpsuUjg=
github.com/charmbracelet/bubbletea v0.9.1-0.20200713153904-2f53eeb54b90/go.mod h1:wjGGC5pyYvpuls0so+w4Zv+aZQW7RoPvsi9UBcDlSl8= github.com/charmbracelet/bubbletea v0.9.1-0.20200713153904-2f53eeb54b90/go.mod h1:wjGGC5pyYvpuls0so+w4Zv+aZQW7RoPvsi9UBcDlSl8=
github.com/charmbracelet/bubbletea v0.10.0/go.mod h1:wjGGC5pyYvpuls0so+w4Zv+aZQW7RoPvsi9UBcDlSl8= github.com/charmbracelet/bubbletea v0.10.0/go.mod h1:wjGGC5pyYvpuls0so+w4Zv+aZQW7RoPvsi9UBcDlSl8=
github.com/charmbracelet/bubbletea v0.10.1-0.20200720155027-2ee871862a49 h1:cc2ntD1GuEeaXZ/rweyMZnHYbi3VYPkeGhvVpNJUYQo= github.com/charmbracelet/bubbletea v0.10.1-0.20200720155027-2ee871862a49 h1:cc2ntD1GuEeaXZ/rweyMZnHYbi3VYPkeGhvVpNJUYQo=

12
ui/stash.go
View file

@ -283,9 +283,7 @@ func stashUpdate(msg tea.Msg, m stashModel) (stashModel, tea.Cmd) {
if msg, ok := msg.(tea.KeyMsg); ok { if msg, ok := msg.(tea.KeyMsg); ok {
switch msg.String() { switch msg.String() {
case "k": case "k", "up":
fallthrough
case "up":
m.index-- m.index--
if m.index < 0 && m.paginator.Page == 0 { if m.index < 0 && m.paginator.Page == 0 {
// Stop // Stop
@ -296,9 +294,7 @@ func stashUpdate(msg tea.Msg, m stashModel) (stashModel, tea.Cmd) {
m.index = m.paginator.ItemsOnPage(len(m.markdowns)) - 1 m.index = m.paginator.ItemsOnPage(len(m.markdowns)) - 1
} }
case "j": case "j", "down":
fallthrough
case "down":
itemsOnPage := m.paginator.ItemsOnPage(len(m.markdowns)) itemsOnPage := m.paginator.ItemsOnPage(len(m.markdowns))
m.index++ m.index++
if m.index >= itemsOnPage && m.paginator.OnLastPage() { if m.index >= itemsOnPage && m.paginator.OnLastPage() {
@ -361,7 +357,9 @@ func stashUpdate(msg tea.Msg, m stashModel) (stashModel, tea.Cmd) {
} }
} }
// Update paginator // Update paginator. Pagination key handling is done here, but it could
// also be moved up to this level, in which case we'd use model methods
// like model.PageUp().
newPaginatorModel, cmd := paginator.Update(msg, m.paginator) newPaginatorModel, cmd := paginator.Update(msg, m.paginator)
m.paginator = newPaginatorModel m.paginator = newPaginatorModel
cmds = append(cmds, cmd) cmds = append(cmds, cmd)