Change overlay display to allow bubblezone to work

Signed-off-by: Hadi <[email protected]>

app/app.go

@@ -0,0 +1,33 @@
+package app
+
+import tea "charm.land/bubbletea/v2"
+
+type QuitMsg struct{}
+
+func Quit() tea.Cmd {
+	return func() tea.Msg { return QuitMsg{} }
+}
+
+type FocusMsg struct{}
+
+func Focus() tea.Cmd {
+	return func() tea.Msg { return FocusMsg{} }
+}
+
+type BlurMsg struct{}
+
+func Blur() tea.Cmd {
+	return func() tea.Msg { return BlurMsg{} }
+}
+
+type RequestFocusMsg struct{}
+
+func RequestFocus() tea.Cmd {
+	return func() tea.Msg { return RequestFocusMsg{} }
+}
+
+type SetTitleMsg struct{ Title string }
+
+func SetTitle(title string) tea.Cmd {
+	return func() tea.Msg { return SetTitleMsg{Title: title} }
+}

drawer/render.go

@@ -43,11 +43,7 @@ func (m Model) renderOne(d Drawer, background string, w, h int) string {
 		x = max(w-bw, 0)
 	}
 
-	compositor := lipgloss.NewCompositor(
+	return style.Overlay(dim(background, s.DimColor), box, x, 0)
-		lipgloss.NewLayer(dim(background, s.DimColor)),
-		lipgloss.NewLayer(box).X(x).Y(0).Z(1),
-	)
-	return compositor.Render()
 }
 
 func dim(s string, c color.Color) string {

helpbar/helpbar.go

@@ -1,10 +1,13 @@
 package helpbar
 
 import (
+	"strings"
+
 	"charm.land/bubbles/v2/help"
 	"charm.land/bubbles/v2/key"
 	tea "charm.land/bubbletea/v2"
 	"charm.land/lipgloss/v2"
+	"github.com/charmbracelet/x/ansi"
 
 	"github.com/anotherhadi/ilovetui/bubbles"
 )
@@ -59,10 +62,21 @@ func (m Model) View(contextual ...key.Binding) string {
 	if len(bindings) == 0 || m.width <= 0 {
 		return ""
 	}
+	var view string
 	if !m.ShowAll {
-		return m.help.ShortHelpView(bindings)
+		view = m.help.ShortHelpView(bindings)
+	} else {
+		view = m.help.FullHelpView(m.columns(bindings))
 	}
-	return m.help.FullHelpView(m.columns(bindings))
+	return m.clampWidth(view)
+}
+
+func (m Model) clampWidth(view string) string {
+	lines := strings.Split(view, "\n")
+	for i, line := range lines {
+		lines[i] = ansi.Truncate(line, m.width, "")
+	}
+	return strings.Join(lines, "\n")
 }
 
 func (m Model) Height(contextual ...key.Binding) int {

minsize/minsize.go

@@ -0,0 +1,60 @@
+package minsize
+
+import (
+	"fmt"
+
+	"charm.land/lipgloss/v2"
+
+	"github.com/anotherhadi/ilovetui/style"
+)
+
+type Model struct {
+	MinWidth  int
+	MinHeight int
+	Style     lipgloss.Style
+}
+
+type Option func(*Model)
+
+func WithStyle(s lipgloss.Style) Option {
+	return func(m *Model) { m.Style = s }
+}
+
+func New(minWidth, minHeight int, opts ...Option) Model {
+	m := Model{
+		MinWidth:  minWidth,
+		MinHeight: minHeight,
+		Style:     lipgloss.NewStyle().Foreground(style.S.Muted),
+	}
+	for _, opt := range opts {
+		opt(&m)
+	}
+	return m
+}
+
+func (m Model) Fits(width, height int) bool {
+	return width >= m.MinWidth && height >= m.MinHeight
+}
+
+func (m Model) View(width, height int) string {
+	msg := m.Style.Render(m.message(width, height))
+	if width < 1 || height < 1 {
+		return msg
+	}
+	return lipgloss.Place(width, height, lipgloss.Center, lipgloss.Center, msg)
+}
+
+func (m Model) message(width, height int) string {
+	tooNarrow := width < m.MinWidth
+	tooShort := height < m.MinHeight
+	switch {
+	case tooNarrow && tooShort:
+		return fmt.Sprintf("minimum is %dx%d", m.MinWidth, m.MinHeight)
+	case tooNarrow:
+		return fmt.Sprintf("minimum width: %d", m.MinWidth)
+	case tooShort:
+		return fmt.Sprintf("minimum height: %d", m.MinHeight)
+	default:
+		return ""
+	}
+}

modal/render.go

@@ -42,11 +42,7 @@ func (m Model) renderOne(mo Modal, background string, w, h int) string {
 	bw, bh := lipgloss.Width(box), lipgloss.Height(box)
 	x, y := max((w-bw)/2, 0), max((h-bh)/2, 0)
 
-	compositor := lipgloss.NewCompositor(
+	return style.Overlay(dim(background, s.DimColor), box, x, y)
-		lipgloss.NewLayer(dim(background, s.DimColor)),
-		lipgloss.NewLayer(box).X(x).Y(y).Z(1),
-	)
-	return compositor.Render()
 }
 
 func dim(s string, c color.Color) string {

notification/render.go

@@ -24,11 +24,7 @@ func (m Model) Render(background string) string {
 	sw, sh := lipgloss.Width(stack), lipgloss.Height(stack)
 	x, y := placement(m.position, w, h, sw, sh)
 
-	compositor := lipgloss.NewCompositor(
+	return style.Overlay(background, stack, x, y)
-		lipgloss.NewLayer(background),
-		lipgloss.NewLayer(stack).X(x).Y(y).Z(1),
-	)
-	return compositor.Render()
 }
 
 func (m Model) View(width, height int) string {

style/border.go

@@ -4,6 +4,7 @@ import (
 	"strings"
 
 	"charm.land/lipgloss/v2"
+	"github.com/charmbracelet/x/ansi"
 )
 
 var borderTypes = map[string]lipgloss.Border{
@@ -41,12 +42,18 @@ func RenderWithTitle(border lipgloss.Style, title, content string, width, height
 	box := border.BorderTop(false).Width(width).Height(boxH).Render(content)
 
 	boxWidth := lipgloss.Width(strings.SplitN(box, "\n", 2)[0])
-	titleW := lipgloss.Width(title)
 
 	b, _, _, _, _ := border.GetBorder()
 	topLeft, top, topRight := b.TopLeft, b.Top, b.TopRight
+	overhead := lipgloss.Width(topLeft) + lipgloss.Width(topRight) + 2
 
-	fillW := boxWidth - titleW - lipgloss.Width(topLeft) - lipgloss.Width(topRight) - 2
+	maxTitleW := max(boxWidth-overhead, 0)
+	if titleW := lipgloss.Width(title); titleW > maxTitleW {
+		title = ansi.Truncate(title, maxTitleW, "")
+	}
+	titleW := lipgloss.Width(title)
+
+	fillW := boxWidth - titleW - overhead
 	if fillW < 0 {
 		fillW = 0
 	}

style/overlay.go

@@ -0,0 +1,26 @@
+package style
+
+import (
+	"strings"
+
+	"github.com/charmbracelet/x/ansi"
+)
+
+func Overlay(base, top string, x, y int) string {
+	baseLines := strings.Split(base, "\n")
+	topLines := strings.Split(top, "\n")
+
+	for i, tl := range topLines {
+		row := y + i
+		if row < 0 || row >= len(baseLines) {
+			continue
+		}
+		bl := baseLines[row]
+		tw := ansi.StringWidth(tl)
+		left := ansi.Cut(bl, 0, x)
+		right := ansi.Cut(bl, x+tw, ansi.StringWidth(bl))
+		baseLines[row] = left + tl + right
+	}
+
+	return strings.Join(baseLines, "\n")
+}