send window msg when push/pop the nav stack

KevM · Feb 20, 2024 · ae61793 · ae61793
1 parent 0a7d9da
commit ae61793
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 7 deletions.
diff --git a/examples/deeper/main.go b/examples/deeper/main.go
@@ -57,7 +57,7 @@ func (m model) View() string {
 
 func main() {
 	w := window.New(10, 20, 6)
-	ns := navstack.New()
+	ns := navstack.New(&w)
 	artists := data.GetArtists()
 	choices := make([]menu.Choice, len(artists))
 	for i, a := range artists {

diff --git a/examples/simple/main.go b/examples/simple/main.go
@@ -75,8 +75,8 @@ func main() {
 	choices := []menu.Choice{red, green, blue}
 
 	title := "Colorful Choices"
-	ns := navstack.New()
 	w := window.New(10, 20, 6)
+	ns := navstack.New(&w)
 	m := model{
 		menu:   menu.New(title, choices, nil, &w),
 		window: &w,

diff --git a/navstack/model.go b/navstack/model.go
@@ -2,19 +2,22 @@ package navstack
 
 import (
 	tea "github.com/charmbracelet/bubbletea"
+	"github.com/kevm/bubbleo/window"
 )
 
 type Closable interface {
 	Close() error
 }
 
 type Model struct {
-	stack []NavigationItem
+	stack  []NavigationItem
+	window *window.Model
 }
 
-func New() Model {
+func New(w *window.Model) Model {
 	model := Model{
-		stack: []NavigationItem{},
+		stack:  []NavigationItem{},
+		window: w,
 	}
 
 	return model
@@ -30,8 +33,12 @@ func (m Model) Init() tea.Cmd {
 }
 
 func (m *Model) Push(item NavigationItem) tea.Cmd {
+
+	nim, cmd := item.Model.Update(tea.WindowSizeMsg{Width: m.window.Width, Height: m.window.Height - m.window.TopOffset})
+	item.Model = nim
+
 	m.stack = append(m.stack, item)
-	return item.Init()
+	return tea.Batch(cmd, item.Init())
 }
 
 func (m *Model) Pop() tea.Cmd {
@@ -44,13 +51,18 @@ func (m *Model) Pop() tea.Cmd {
 		c.Close()
 	}
 
+	cmds := []tea.Cmd{}
+	nim, cmd := top.Model.Update(tea.WindowSizeMsg{Width: m.window.Width, Height: m.window.Height - m.window.TopOffset})
+	top.Model = nim
+	cmds = append(cmds, cmd, top.Init())
+
 	m.stack = m.stack[:len(m.stack)-1]
 	top = m.Top()
 	if top == nil {
 		return tea.Quit
 	}
 
-	return top.Init()
+	return tea.Batch(cmds...)
 }
 
 func (m Model) Top() *NavigationItem {