Merge pull request #127 from babarot/babarot/fix-restore-tui-small-window

fix: keep restore TUI within terminal bounds (closes #125)

Author: babarot

internal/ui/update.go

@@ -28,7 +28,20 @@ func (m Model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 		}
 
 	case tea.WindowSizeMsg:
-		m.list.SetWidth(msg.Width)
+		// view.go appends a help block wrapped in lipgloss Margin(1, 2)
+		// below the list: 1 row top margin + 1 row content + 1 row bottom
+		// margin = 3 rows tall, and 2 cols on each side = 4 cols total.
+		const (
+			helpReservedRows = 3
+			helpReservedCols = 4
+		)
+		if msg.Width > 0 {
+			m.list.SetWidth(msg.Width)
+			m.help.Width = max(msg.Width-helpReservedCols, 0)
+		}
+		if msg.Height > 0 {
+			m.list.SetHeight(max(msg.Height-helpReservedRows, 1))
+		}
 		return m, tea.Batch(cmds...)
 
 	case FileListUpdatedMsg:

internal/ui/update_test.go

@@ -8,6 +8,7 @@ import (
 	"github.com/charmbracelet/bubbles/list"
 	"github.com/charmbracelet/bubbles/viewport"
 	tea "github.com/charmbracelet/bubbletea"
+	"github.com/charmbracelet/lipgloss"
 
 	"github.com/babarot/gomi/internal/config"
 	"github.com/babarot/gomi/internal/trash"
@@ -60,6 +61,88 @@ func TestUpdate_WindowSizeMsg(t *testing.T) {
 	}
 }
 
+func TestUpdate_WindowSizeMsg_ShrinksListHeight(t *testing.T) {
+	m := newTestModel()
+
+	const termHeight = 20
+	msg := tea.WindowSizeMsg{Width: 80, Height: termHeight}
+	updated, _ := m.Update(msg)
+	model := asModel(t, updated)
+
+	if model.list.Height() > termHeight {
+		t.Errorf("list height = %d, want <= %d (terminal height); "+
+			"list is not following the terminal height and will push items off-screen",
+			model.list.Height(), termHeight)
+	}
+}
+
+func TestUpdate_WindowSizeMsg_SetsHelpWidth(t *testing.T) {
+	m := newTestModel()
+
+	const termWidth = 70
+	msg := tea.WindowSizeMsg{Width: termWidth, Height: 20}
+	updated, _ := m.Update(msg)
+	model := asModel(t, updated)
+
+	if model.help.Width == 0 {
+		t.Fatal("help.Width = 0; the help model was not informed of the " +
+			"terminal width, so its View() will not truncate and may overflow")
+	}
+	if model.help.Width > termWidth {
+		t.Errorf("help.Width = %d, want <= %d (terminal width)",
+			model.help.Width, termWidth)
+	}
+}
+
+func TestView_FitsSmallTerminal(t *testing.T) {
+	m := newTestModel()
+	m.help = newHelpModel()
+	m.state.SetView(ListView)
+
+	const (
+		termWidth  = 70
+		termHeight = 20
+	)
+	msg := tea.WindowSizeMsg{Width: termWidth, Height: termHeight}
+	updated, _ := m.Update(msg)
+	model := asModel(t, updated)
+
+	view := model.View()
+
+	if h := lipgloss.Height(view); h > termHeight {
+		t.Errorf("View height = %d lines, want <= %d; "+
+			"output is taller than the terminal so the top rows scroll off",
+			h, termHeight)
+	}
+	if w := lipgloss.Width(view); w > termWidth {
+		t.Errorf("View width = %d cols, want <= %d; "+
+			"output is wider than the terminal so the right edge is clipped/wrapped",
+			w, termWidth)
+	}
+}
+
+// TestUpdate_WindowSizeMsg_HeightZero verifies that a synthetic
+// WindowSizeMsg with only Width set (sent by confirm-view cancel
+// paths in update.go) does not collapse the list height.
+func TestUpdate_WindowSizeMsg_HeightZero(t *testing.T) {
+	m := newTestModel()
+
+	// First, set a real terminal size.
+	updated, _ := m.Update(tea.WindowSizeMsg{Width: 120, Height: 40})
+	m = asModel(t, updated)
+	prevHeight := m.list.Height()
+
+	// Then send a width-only message (Height == 0).
+	updated, _ = m.Update(tea.WindowSizeMsg{Width: m.list.Width()})
+	model := asModel(t, updated)
+
+	if model.list.Height() != prevHeight {
+		t.Errorf("list height = %d, want %d; "+
+			"width-only WindowSizeMsg must not change list height",
+			model.list.Height(), prevHeight)
+	}
+}
+
 func TestUpdate_ErrorMsg(t *testing.T) {
 	m := newTestModel()