fix: layout would overflow when when list view width was at specific widths

Author: FredrikMWold

src/bubbles/app.go

@@ -146,6 +146,7 @@ func (m Model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 		m.width = msg.Width
 		m.height = msg.Height
 		msg.Height = msg.Height - 1
+		m.help.Width = msg.Width
 		m.registryselector, _ = m.registryselector.Update(msg)
 		m.selectedBlocks, _ = m.selectedBlocks.Update(msg)
 		m.blocklist, _ = m.blocklist.Update(msg)

src/bubbles/block_list/block_list.go

@@ -83,9 +83,10 @@ func (m Model) Update(msg tea.Msg) (Model, tea.Cmd) {
 				})
 			}
 		}
-		m.list.SetItems(items)
+		cmd = m.list.SetItems(items)
 	case tea.WindowSizeMsg:
 		m.list.SetWidth((msg.Width-config.SidebarWidth)/2 - 4)
+		m.list.Styles.HelpStyle = lipgloss.NewStyle().Width((msg.Width-config.SidebarWidth)/2 - 4)
 		m.list.SetHeight(msg.Height - 2)
 		return m, nil
 	case Blocks:
@@ -100,13 +101,11 @@ func (m Model) View() string {
 	var s string
 	if m.focus {
 		s += lipgloss.NewStyle().
-			Width(m.list.Width()).
 			BorderStyle(lipgloss.RoundedBorder()).
 			BorderForeground(lipgloss.Color("140")).
 			Render(m.list.View())
 	} else {
 		s += lipgloss.NewStyle().
-			Width(m.list.Width()).
 			BorderStyle(lipgloss.RoundedBorder()).
 			BorderForeground(lipgloss.Color("240")).
 			Render(m.list.View())

src/bubbles/key_binding_help/key_binding_help.go

@@ -12,7 +12,7 @@ type KeyMap struct {
 }
 
 func (k KeyMap) ShortHelp() []key.Binding {
-	return []key.Binding{k.Tab, k.AddNewRegistry, k.DownloadBlocks, k.S, k.P, k.Quit}
+	return []key.Binding{k.Tab, k.AddNewRegistry, k.DownloadBlocks, k.S, k.P}
 }
 
 func (k KeyMap) FullHelp() [][]key.Binding {
@@ -24,26 +24,26 @@ func (k KeyMap) FullHelp() [][]key.Binding {
 var Keys = KeyMap{
 	Tab: key.NewBinding(
 		key.WithKeys("tab"),
-		key.WithHelp("tab", "Switch between views"),
+		key.WithHelp("tab", "focus next block list panel"),
 	),
 	DownloadBlocks: key.NewBinding(
 		key.WithKeys("ctrl+d"),
-		key.WithHelp("ctrl+d", "Download blocks"),
+		key.WithHelp("ctrl+d", "download blocks"),
 	),
 	AddNewRegistry: key.NewBinding(
-		key.WithKeys("ctrl+n"),
-		key.WithHelp("ctrl+n", "Add new registry"),
+		key.WithKeys("ctrl+a"),
+		key.WithHelp("ctrl+a", "add registry"),
 	),
 	S: key.NewBinding(
 		key.WithKeys("s"),
-		key.WithHelp("s", "Select registry"),
+		key.WithHelp("s", "focus registries panel"),
 	),
 	P: key.NewBinding(
 		key.WithKeys("p"),
-		key.WithHelp("p", "Edit category paths"),
+		key.WithHelp("p", "focus categories panel"),
 	),
 	Quit: key.NewBinding(
 		key.WithKeys("ctrl+c"),
-		key.WithHelp("ctrl+c", "Quit"),
+		key.WithHelp("ctrl+c", "quit"),
 	),
 }

src/bubbles/selected_block_list/selected_block_list.go

@@ -11,9 +11,9 @@ import (
 )
 
 type Model struct {
-	listView list.Model
-	blocks   []manifest.Block
-	focus    bool
+	list   list.Model
+	blocks []manifest.Block
+	focus  bool
 }
 
 func New() Model {
@@ -29,8 +29,8 @@ func New() Model {
 	}
 
 	return Model{
-		listView: list,
-		blocks:   []manifest.Block{},
+		list:   list,
+		blocks: []manifest.Block{},
 	}
 }
 
@@ -46,11 +46,11 @@ func (m Model) Update(msg tea.Msg) (Model, tea.Cmd) {
 		switch msg.Type {
 		case tea.KeyBackspace:
 
-			listHasItems := m.listView.Items() != nil && len(m.listView.Items()) > 0
+			listHasItems := m.list.Items() != nil && len(m.list.Items()) > 0
 			if !listHasItems {
 				return m, nil
 			}
-			selectedItem := m.listView.SelectedItem().(block_list.ListItem)
+			selectedItem := m.list.SelectedItem().(block_list.ListItem)
 			var blocks []manifest.Block
 			for _, block := range m.blocks {
 				if block.Name != selectedItem.Name {
@@ -59,7 +59,7 @@ func (m Model) Update(msg tea.Msg) (Model, tea.Cmd) {
 			}
 			return m, block_list.UpdateBlocks(blocks)
 		case tea.KeyEnter:
-			listHasItems := m.listView.Items() != nil && len(m.listView.Items()) > 0
+			listHasItems := m.list.Items() != nil && len(m.list.Items()) > 0
 			if !listHasItems {
 				return m, nil
 			}
@@ -76,38 +76,37 @@ func (m Model) Update(msg tea.Msg) (Model, tea.Cmd) {
 			})
 
 		}
-		m.listView.SetItems(items)
+		cmd = m.list.SetItems(items)
 		return m, cmd
 
 	case tea.WindowSizeMsg:
 		margin := 4
 		if msg.Width%2 != 0 {
 			margin = 3
 		}
-		m.listView.SetWidth((msg.Width-config.SidebarWidth)/2 - margin)
-		m.listView.SetHeight(msg.Height - 2)
+		m.list.SetWidth((msg.Width-config.SidebarWidth)/2 - margin)
+		m.list.Styles.HelpStyle = lipgloss.NewStyle().Width((msg.Width-config.SidebarWidth)/2 - margin)
+		m.list.SetHeight(msg.Height - 2)
 		return m, nil
 
 	}
 
-	m.listView, cmd = m.listView.Update(msg)
+	m.list, cmd = m.list.Update(msg)
 	cmds = append(cmds, cmd)
 	return m, tea.Batch(cmds...)
 }
 
 func (m Model) View() string {
 	if m.focus {
 		return lipgloss.NewStyle().
-			Width(m.listView.Width()).
 			BorderStyle(lipgloss.RoundedBorder()).
 			BorderForeground(lipgloss.Color("140")).
-			Render(m.listView.View())
+			Render(m.list.View())
 	} else {
 		return lipgloss.NewStyle().
-			Width(m.listView.Width()).
 			BorderStyle(lipgloss.RoundedBorder()).
 			BorderForeground(lipgloss.Color("240")).
-			Render(m.listView.View())
+			Render(m.list.View())
 	}
 }
 
@@ -120,5 +119,5 @@ func (m *Model) Blur() {
 }
 
 func (m *Model) SetHeight(height int) {
-	m.listView.SetHeight(height - 2)
+	m.list.SetHeight(height - 2)
 }