Skip to content

fix(file): account for header, lipgloss block join separators in internal filepicker spacing #1031

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bntrtm wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix(file): account for header, lipgloss block join separators in internal filepicker spacing #1031

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a363bea
fix(filepicker): account for \n join sep in filepicker height
bntrtm Mar 22, 2026
4aa1ad1
fix(filepicker): account for header in filepicker height
bntrtm Mar 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 17 additions & 4 deletions file/file.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,11 +69,20 @@ func (m model) Init() tea.Cmd { return m.filepicker.Init() }
func (m model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
switch msg := msg.(type) {
case tea.WindowSizeMsg:
height := msg.Height - m.padding[0] - m.padding[2]
fpHeight := msg.Height - m.padding[0] - m.padding[2]

// Account for newline used by lipgloss.JoinVertical
// to join filepicker block and help block together.
const SepHeight = 1

if m.header != "" {
fpHeight -= lipgloss.Height(m.headerRender()) + SepHeight
}

if m.showHelp {
height -= lipgloss.Height(m.helpView())
fpHeight -= SepHeight + lipgloss.Height(m.helpView())
}
m.filepicker.SetHeight(height)
m.filepicker.SetHeight(fpHeight)
case tea.KeyMsg:
switch {
case key.Matches(msg, keyAbort):
Expand All @@ -100,7 +109,7 @@ func (m model) View() string {
}
var parts []string
if m.header != "" {
parts = append(parts, m.headerStyle.Render(m.header))
parts = append(parts, m.headerRender())
}
parts = append(parts, m.filepicker.View())
if m.showHelp {
Expand All @@ -117,3 +126,7 @@ func (m model) View() string {
func (m model) helpView() string {
return m.help.View(m.keymap)
}

func (m model) headerRender() string {
return m.headerStyle.Render(m.header)
}