- commit
- 48bc9c709b2eb5656e35f4e0189f66b4a5453bee
- parent
- 51ba889c080dbea07cf5d909c921312bc1301f60
- author
- Dami <dami.etoile@gmail.com>
| M | game/ | 74 | +++++++++++++++++++ |
| M | game/ | 114 | ++++++++++++++++++++++++++++++ |
| M | hashiwokakero/ | 19 | ++--- |
| M | hitori/ | 3 | +- |
| M | lightsout/ | 3 | +- |
| M | nonogram/ | 3 | +- |
| M | nonogram/ | 30 | ++++++++ |
| M | nurikabe/ | 25 | ++++--- |
| M | nurikabe/ | 94 | ++++++++++++++++++++++--- |
| M | nurikabe/ | 2 | +- |
| M | shikaku/ | 14 | +++- |
| M | shikaku/ | 39 | ++++++++++ |
| M | shikaku/ | 2 | +- |
| M | sudoku/ | 3 | +- |
| M | takuzu/ | 5 | +- |
| M | theme/ | 4 | +- |
| M | wordsearch/ | 1 | + |
| M | wordsearch/ | 2 | +- |
| M | wordsearch/ | 24 | ++++++ |
@@ -5,6 +5,7 @@ import (
55 "testing"66 77 tea "charm.land/bubbletea/v2"8+ "charm.land/lipgloss/v2"89 )910 1011 // --- Cursor.Move (P0) ---@@ -300,6 +301,79 @@ func TestTitleBarView(t *testing.T) {
300301 })301302 }302303 304+// --- ComposeGameView (P1) ---305+306+func TestComposeGameView(t *testing.T) {307+ t.Run("secondary width is fixed at 150 percent of primary", func(t *testing.T) {308+ primary := lipgloss.NewStyle().Width(12).Render("grid")309+ view := ComposeGameView(310+ "title-width",311+ primary,312+ "this secondary row is much wider than the primary area",313+ )314+315+ if got, want := lipgloss.Width(view), 18; got != want {316+ t.Errorf("width = %d, want %d", got, want)317+ }318+ })319+320+ t.Run("long secondary wraps and increases height", func(t *testing.T) {321+ primary := lipgloss.NewStyle().Width(10).Render("grid")322+323+ short := ComposeGameView("title-wrap", primary, "short row")324+ long := ComposeGameView(325+ "title-wrap",326+ primary,327+ "this secondary row should wrap to multiple lines when constrained",328+ )329+330+ if got, want := lipgloss.Width(long), 15; got != want {331+ t.Errorf("width = %d, want %d", got, want)332+ }333+ if got, want := lipgloss.Width(short), 15; got != want {334+ t.Errorf("width = %d, want %d", got, want)335+ }336+ if lipgloss.Height(long) <= lipgloss.Height(short) {337+ t.Errorf("height = %d, want > %d", lipgloss.Height(long), lipgloss.Height(short))338+ }339+ })340+341+ t.Run("wrap prefers double-space boundaries", func(t *testing.T) {342+ row := "alpha: one beta: two gamma: three"343+ got := wrapRowOnDoubleSpace(row, 18)344+ want := "alpha: one\nbeta: two\ngamma: three"345+ if got != want {346+ t.Fatalf("wrapRowOnDoubleSpace() = %q, want %q", got, want)347+ }348+ })349+350+ t.Run("stable row reserves max variant height", func(t *testing.T) {351+ primary := lipgloss.NewStyle().Width(10).Render("grid")352+ longCurrent := ComposeGameViewRows(353+ "title-pad",354+ primary,355+ StableRow(356+ "alpha: one beta: two gamma: three",357+ "alpha: one",358+ "alpha: one beta: two gamma: three",359+ ),360+ )361+ shortCurrent := ComposeGameViewRows(362+ "title-pad",363+ primary,364+ StableRow(365+ "alpha: one",366+ "alpha: one",367+ "alpha: one beta: two gamma: three",368+ ),369+ )370+371+ if got, want := lipgloss.Height(shortCurrent), lipgloss.Height(longCurrent); got != want {372+ t.Fatalf("height(short) = %d, want %d", got, want)373+ }374+ })375+}376+303377 // --- DebugHeader (P3) ---304378 305379 func TestDebugHeader(t *testing.T) {@@ -72,6 +72,120 @@ func TitleBarView(gameName, modeName string, solved bool) string {
7272 return lipgloss.NewStyle().PaddingBottom(1).Render(title)7373 }7474 75+// ComposeGameView joins title + primary content + optional secondary rows.76+// Secondary rows are width-anchored to primary so long help/info text wraps77+// instead of widening the full layout and shifting centered views.78+func ComposeGameView(title, primary string, secondary ...string) string {79+ rows := make([]SecondaryRow, 0, len(secondary))80+ for _, row := range secondary {81+ rows = append(rows, StaticRow(row))82+ }83+ return ComposeGameViewRows(title, primary, rows...)84+}85+86+// SecondaryRow defines one auxiliary row below the main game grid.87+// Variants can be provided to reserve the tallest wrapped height88+// up-front and avoid layout shift when row content changes.89+type SecondaryRow struct {90+ Current string91+ Variants []string92+}93+94+func StaticRow(row string) SecondaryRow {95+ return SecondaryRow{Current: row}96+}97+98+func StableRow(current string, variants ...string) SecondaryRow {99+ return SecondaryRow{Current: current, Variants: variants}100+}101+102+// ComposeGameViewRows joins title + primary content + optional secondary rows.103+// Secondary rows are rendered at 150% of primary width to reduce wrapping.104+// If variants are provided for a row, the row reserves the max wrapped height105+// across the variants and current value to avoid height jitter.106+func ComposeGameViewRows(title, primary string, rows ...SecondaryRow) string {107+ sections := []string{title, primary}108+ primaryWidth := lipgloss.Width(primary)109+ if primaryWidth <= 0 {110+ for _, row := range rows {111+ sections = append(sections, row.Current)112+ }113+ return lipgloss.JoinVertical(lipgloss.Center, sections...)114+ }115+116+ secondaryWidth := primaryWidth + (primaryWidth / 2)117+ rowStyle := lipgloss.NewStyle().Width(secondaryWidth).AlignHorizontal(lipgloss.Center)118+ for _, row := range rows {119+ rendered := wrapAndPadSecondary(row, secondaryWidth)120+ sections = append(sections, rowStyle.Render(rendered))121+ }122+123+ return lipgloss.JoinVertical(lipgloss.Center, sections...)124+}125+126+func wrapAndPadSecondary(row SecondaryRow, width int) string {127+ current := wrapRowOnDoubleSpace(row.Current, width)128+ target := lipgloss.Height(current)129+ for _, variant := range row.Variants {130+ h := lipgloss.Height(wrapRowOnDoubleSpace(variant, width))131+ if h > target {132+ target = h133+ }134+ }135+ if h := lipgloss.Height(current); target > h {136+ current += strings.Repeat("\n", target-h)137+ }138+ return current139+}140+141+func wrapRowOnDoubleSpace(row string, width int) string {142+ if width <= 0 || !strings.Contains(row, " ") {143+ return row144+ }145+146+ lines := strings.Split(row, "\n")147+ var out []string148+ for _, line := range lines {149+ out = append(out, wrapLineOnDoubleSpace(line, width)...)150+ }151+ return strings.Join(out, "\n")152+}153+154+func wrapLineOnDoubleSpace(line string, width int) []string {155+ if width <= 0 || lipgloss.Width(line) <= width || !strings.Contains(line, " ") {156+ return []string{line}157+ }158+159+ parts := strings.Split(line, " ")160+ var (161+ wrapped []string162+ current string163+ )164+ for _, part := range parts {165+ if part == "" {166+ continue167+ }168+ if current == "" {169+ current = part170+ continue171+ }172+ candidate := current + " " + part173+ if lipgloss.Width(candidate) <= width {174+ current = candidate175+ continue176+ }177+ wrapped = append(wrapped, current)178+ current = part179+ }180+ if current != "" {181+ wrapped = append(wrapped, current)182+ }183+ if len(wrapped) == 0 {184+ return []string{line}185+ }186+ return wrapped187+}188+75189 // DebugHeader returns the markdown heading and property table header for debug info.76190 // rows is a list of [key, value] pairs for the "Game State" table.77191 func DebugHeader(title string, rows [][2]string) string {@@ -6,7 +6,6 @@ import (
66 77 "charm.land/bubbles/v2/key"88 tea "charm.land/bubbletea/v2"9- "charm.land/lipgloss/v2"109 "github.com/FelineStateMachine/puzzletea/game"1110 )1211 @@ -133,15 +132,15 @@ func (m Model) View() string {
133132 title := game.TitleBarView("Hashiwokakero", m.modeTitle, solved)134133 grid := gridView(m, solved)135134 info := infoView(&m.puzzle)136- status := statusBarView(m.selectedIsland != nil, m.showFullHelp)137-138- // Pin info and status to the grid width so that variable-length text139- // never widens the layout and causes centering shifts on re-render.140- w := lipgloss.Width(grid)141- info = lipgloss.NewStyle().Width(w).AlignHorizontal(lipgloss.Center).Render(info)142- status = lipgloss.NewStyle().Width(w).AlignHorizontal(lipgloss.Center).Render(status)143-144- return lipgloss.JoinVertical(lipgloss.Center, title, grid, info, status)135+ selected := m.selectedIsland != nil136+ status := statusBarView(selected, m.showFullHelp)137+138+ return game.ComposeGameViewRows(139+ title,140+ grid,141+ game.StaticRow(info),142+ game.StableRow(status, statusBarView(selected, false), statusBarView(selected, true)),143+ )145144 }146145 147146 func (m Model) SetTitle(t string) game.Gamer {@@ -8,7 +8,6 @@ import (
88 99 "charm.land/bubbles/v2/key"1010 tea "charm.land/bubbletea/v2"11- "charm.land/lipgloss/v2"1211 )1312 1413 // Model implements game.Gamer for Hitori.@@ -104,7 +103,7 @@ func (m Model) View() string {
104103 title := game.TitleBarView("Hitori", m.modeTitle, m.solved)105104 grid := gridView(m.numbers, m.marks, m.cursor, m.solved, m.conflicts)106105 status := statusBarView(m.showFullHelp)107- return lipgloss.JoinVertical(lipgloss.Center, title, grid, status)106+ return game.ComposeGameViewRows(title, grid, game.StableRow(status, statusBarView(false), statusBarView(true)))108107 }109108 110109 func (m Model) SetTitle(t string) game.Gamer {@@ -7,7 +7,6 @@ import (
77 88 "charm.land/bubbles/v2/key"99 tea "charm.land/bubbletea/v2"10- "charm.land/lipgloss/v2"1110 "github.com/FelineStateMachine/puzzletea/game"1211 )1312 @@ -92,7 +91,7 @@ func (m Model) View() string {
9291 grid := gridView(m.grid, m.cursor, solved)9392 status := statusBarView(m.showFullHelp)9493 95- return lipgloss.JoinVertical(lipgloss.Center, title, grid, status)94+ return game.ComposeGameViewRows(title, grid, game.StableRow(status, statusBarView(false), statusBarView(true)))9695 }9796 9897 func (m Model) SetTitle(t string) game.Gamer {@@ -87,6 +87,7 @@ func (m Model) Update(msg tea.Msg) (game.Gamer, tea.Cmd) {
8787 switch msg := msg.(type) {8888 case game.HelpToggleMsg:8989 m.showFullHelp = msg.Show90+ m.originValid = false9091 9192 case tea.KeyboardEnhancementsMsg:9293 m.supportsKeyRelease = msg.SupportsEventTypes()@@ -190,7 +191,7 @@ func (m Model) View() string {
190191 191192 grid := lipgloss.JoinVertical(lipgloss.Center, s1, s2)192193 193- return lipgloss.JoinVertical(lipgloss.Center, title, grid, status)194+ return game.ComposeGameViewRows(title, grid, game.StableRow(status, statusBarView(false), statusBarView(true)))194195 }195196 196197 func (m Model) GetDebugInfo() string {@@ -1150,3 +1150,33 @@ func TestScreenToGrid(t *testing.T) {
11501150 }11511151 })11521152 }1153+1154+func TestHelpToggleInvalidatesOriginCache(t *testing.T) {1155+ mode := NonogramMode{1156+ BaseMode: game.NewBaseMode("Test", "5x5"),1157+ Width: 5,1158+ Height: 5,1159+ }1160+ hints := Hints{1161+ rows: TomographyDefinition{{1}, {1}, {1}, {1}, {1}},1162+ cols: TomographyDefinition{{1}, {1}, {1}, {1}, {1}},1163+ }1164+ g, err := New(mode, hints)1165+ if err != nil {1166+ t.Fatal(err)1167+ }1168+1169+ m := g.(Model)1170+ m.originValid = true1171+ m.originX = 31172+ m.originY = 41173+1174+ next, _ := m.Update(game.HelpToggleMsg{Show: true})1175+ got := next.(Model)1176+ if !got.showFullHelp {1177+ t.Fatal("expected showFullHelp to be true")1178+ }1179+ if got.originValid {1180+ t.Fatal("expected origin cache to be invalidated")1181+ }1182+}@@ -5,7 +5,6 @@ import (
55 66 "charm.land/bubbles/v2/key"77 tea "charm.land/bubbletea/v2"8- "charm.land/lipgloss/v2"98 "github.com/FelineStateMachine/puzzletea/game"109 )1110 @@ -77,6 +76,7 @@ func (m Model) Update(msg tea.Msg) (game.Gamer, tea.Cmd) {
7776 switch msg := msg.(type) {7877 case game.HelpToggleMsg:7978 m.showFullHelp = msg.Show79+ m.originValid = false8080 8181 case tea.WindowSizeMsg:8282 m.termWidth = msg.Width@@ -91,7 +91,8 @@ func (m Model) Update(msg tea.Msg) (game.Gamer, tea.Cmd) {
9191 }9292 case key.Matches(msg, m.keys.SetIsland):9393 if !m.solved {94- m.setCellAtCursor(islandCell)94+ current := m.marks[m.cursor.Y][m.cursor.X]95+ m.setCellAtCursor(m.islandTarget(current))9596 }9697 case key.Matches(msg, m.keys.Clear):9798 if !m.solved {@@ -113,12 +114,12 @@ func (m Model) Update(msg tea.Msg) (game.Gamer, tea.Cmd) {
113114 m.cursor.X, m.cursor.Y = col, row114115 switch msg.Button {115116 case tea.MouseLeft:116- target := m.leftClickTarget(m.marks[row][col])117+ target := m.leftClickTarget()117118 m.dragging = true118119 m.dragTarget = target119120 m.setCellAtCursor(target)120121 case tea.MouseRight:121- target := m.rightClickTarget()122+ target := m.rightClickTarget(m.marks[row][col])122123 m.dragging = true123124 m.dragTarget = target124125 m.setCellAtCursor(target)@@ -171,14 +172,18 @@ func (m *Model) recomputeDerivedState() {
171172 m.conflicts = computeConflicts(m.marks, m.clues)172173 }173174 174-func (m Model) leftClickTarget(current cellState) cellState {175- if current == seaCell {176- return unknownCell177- }175+func (m Model) leftClickTarget() cellState {178176 return seaCell179177 }180178 181-func (m Model) rightClickTarget() cellState {179+func (m Model) rightClickTarget(current cellState) cellState {180+ return m.islandTarget(current)181+}182+183+func (m Model) islandTarget(current cellState) cellState {184+ if current == islandCell {185+ return unknownCell186+ }182187 return islandCell183188 }184189 @@ -186,7 +191,7 @@ func (m Model) View() string {
186191 title := game.TitleBarView("Nurikabe", m.modeTitle, m.solved)187192 grid := gridView(m)188193 status := statusBarView(m.showFullHelp)189- return lipgloss.JoinVertical(lipgloss.Center, title, grid, status)194+ return game.ComposeGameViewRows(title, grid, game.StableRow(status, statusBarView(false), statusBarView(true)))190195 }191196 192197 func (m Model) SetTitle(t string) game.Gamer {@@ -279,6 +279,12 @@ func TestModelKeyboardUpdate(t *testing.T) {
279279 if m.marks[1][1] != islandCell {280280 t.Fatalf("expected island at (1,1), got %q", rune(m.marks[1][1]))281281 }282+283+ next, _ = m.Update(tea.KeyPressMsg{Code: 'z', Text: "z"})284+ m = next.(Model)285+ if m.marks[1][1] != unknownCell {286+ t.Fatalf("expected unknown at (1,1), got %q", rune(m.marks[1][1]))287+ }282288 }283289 284290 func TestModelMouseDragPaint(t *testing.T) {@@ -314,7 +320,7 @@ func TestModelMouseDragPaint(t *testing.T) {
314320 }315321 }316322 317-func TestModelMouseLeftClickToggleBehavior(t *testing.T) {323+func TestModelMouseClickMirrorsKeyboard(t *testing.T) {318324 mode := NewMode("Mini", "test", 3, 3, 0.3, 5)319325 p := Puzzle{Width: 3, Height: 3, Clues: makeClues(320326 []int{2, 0, 0},@@ -342,8 +348,8 @@ func TestModelMouseLeftClickToggleBehavior(t *testing.T) {
342348 343349 next, _ = m.Update(tea.MouseClickMsg{X: cellX, Y: cellY, Button: tea.MouseLeft})344350 m = next.(Model)345- if m.marks[1][1] != unknownCell {346- t.Fatalf("left click from sea should set unknown, got %q", rune(m.marks[1][1]))351+ if m.marks[1][1] != seaCell {352+ t.Fatalf("left click from sea should keep sea, got %q", rune(m.marks[1][1]))347353 }348354 349355 next, _ = m.Update(tea.MouseClickMsg{X: cellX, Y: cellY, Button: tea.MouseRight})@@ -352,14 +358,20 @@ func TestModelMouseLeftClickToggleBehavior(t *testing.T) {
352358 t.Fatalf("right click should set island, got %q", rune(m.marks[1][1]))353359 }354360 361+ next, _ = m.Update(tea.MouseClickMsg{X: cellX, Y: cellY, Button: tea.MouseRight})362+ m = next.(Model)363+ if m.marks[1][1] != unknownCell {364+ t.Fatalf("right click from island should set unknown, got %q", rune(m.marks[1][1]))365+ }366+355367 next, _ = m.Update(tea.MouseClickMsg{X: cellX, Y: cellY, Button: tea.MouseLeft})356368 m = next.(Model)357369 if m.marks[1][1] != seaCell {358- t.Fatalf("left click from island should set sea, got %q", rune(m.marks[1][1]))370+ t.Fatalf("left click from unknown should set sea, got %q", rune(m.marks[1][1]))359371 }360372 }361373 362-func TestModelMouseRightClickSetsIsland(t *testing.T) {374+func TestModelMouseRightClickTogglesIsland(t *testing.T) {363375 mode := NewMode("Mini", "test", 3, 3, 0.3, 5)364376 p := Puzzle{Width: 3, Height: 3, Clues: makeClues(365377 []int{2, 0, 0},@@ -387,8 +399,8 @@ func TestModelMouseRightClickSetsIsland(t *testing.T) {
387399 388400 next, _ = m.Update(tea.MouseClickMsg{X: cellX, Y: cellY, Button: tea.MouseRight})389401 m = next.(Model)390- if m.marks[1][1] != islandCell {391- t.Fatalf("expected island after second right click, got %q", rune(m.marks[1][1]))402+ if m.marks[1][1] != unknownCell {403+ t.Fatalf("expected unknown after second right click, got %q", rune(m.marks[1][1]))392404 }393405 }394406 @@ -423,7 +435,42 @@ func TestModelMouseRightDragPaintIsland(t *testing.T) {
423435 }424436 }425437 426-func TestModelMouseLeftDragPaintUnknownFromSea(t *testing.T) {438+func TestModelMouseRightDragClearsIsland(t *testing.T) {439+ mode := NewMode("Mini", "test", 3, 3, 0.3, 5)440+ p := Puzzle{Width: 3, Height: 3, Clues: makeClues(441+ []int{2, 0, 0},442+ []int{0, 0, 0},443+ []int{0, 0, 1},444+ )}445+ g, err := New(mode, p)446+ if err != nil {447+ t.Fatalf("New error: %v", err)448+ }449+ m := g.(Model)450+ m.cursor = pointToCursor(1, 1)451+ m.setCellAtCursor(islandCell)452+ m.cursor = pointToCursor(2, 1)453+ m.setCellAtCursor(islandCell)454+455+ next, _ := m.Update(tea.WindowSizeMsg{Width: 120, Height: 40})456+ m = next.(Model)457+ ox, oy := m.gridOrigin()458+459+ next, _ = m.Update(tea.MouseClickMsg{X: ox + cellWidth, Y: oy + 1, Button: tea.MouseRight})460+ m = next.(Model)461+462+ next, _ = m.Update(tea.MouseMotionMsg{X: ox + 2*cellWidth, Y: oy + 1, Button: tea.MouseRight})463+ m = next.(Model)464+465+ next, _ = m.Update(tea.MouseReleaseMsg{})466+ m = next.(Model)467+468+ if m.marks[1][1] != unknownCell || m.marks[1][2] != unknownCell {469+ t.Fatalf("right drag from island should clear to unknown: row= %q", string([]rune{rune(m.marks[1][0]), rune(m.marks[1][1]), rune(m.marks[1][2])}))470+ }471+}472+473+func TestModelMouseLeftDragPaintSeaFromSea(t *testing.T) {427474 mode := NewMode("Mini", "test", 3, 3, 0.3, 5)428475 p := Puzzle{Width: 3, Height: 3, Clues: makeClues(429476 []int{2, 0, 0},@@ -451,8 +498,35 @@ func TestModelMouseLeftDragPaintUnknownFromSea(t *testing.T) {
451498 next, _ = m.Update(tea.MouseReleaseMsg{})452499 m = next.(Model)453500 454- if m.marks[1][1] != unknownCell || m.marks[1][2] != unknownCell {455- t.Fatalf("left drag from sea should paint unknown: row= %q", string([]rune{rune(m.marks[1][0]), rune(m.marks[1][1]), rune(m.marks[1][2])}))501+ if m.marks[1][1] != seaCell || m.marks[1][2] != seaCell {502+ t.Fatalf("left drag from sea should paint sea: row= %q", string([]rune{rune(m.marks[1][0]), rune(m.marks[1][1]), rune(m.marks[1][2])}))503+ }504+}505+506+func TestHelpToggleInvalidatesOriginCache(t *testing.T) {507+ mode := NewMode("Mini", "test", 3, 3, 0.3, 5)508+ p := Puzzle{Width: 3, Height: 3, Clues: makeClues(509+ []int{2, 0, 0},510+ []int{0, 0, 0},511+ []int{0, 0, 1},512+ )}513+ g, err := New(mode, p)514+ if err != nil {515+ t.Fatalf("New error: %v", err)516+ }517+ m := g.(Model)518+ m.originValid = true519+ m.originX = 5520+ m.originY = 7521+522+ next, _ := m.Update(game.HelpToggleMsg{Show: true})523+ got := next.(Model)524+525+ if !got.showFullHelp {526+ t.Fatal("expected showFullHelp to be true")527+ }528+ if got.originValid {529+ t.Fatal("expected origin cache to be invalidated")456530 }457531 }458532 @@ -29,7 +29,7 @@ func gridBorderSolvedStyle() lipgloss.Style {
2929 func cellStyle(c cellState, clue int, isCursor, solved, conflict, inSeaSquare bool) (lipgloss.Style, string) {3030 p := theme.Current()3131 display := " "32- landBg := theme.Blend(p.Surface, p.Success, 0.45)32+ landBg := theme.Blend(p.BG, p.Success, 0.45)3333 style := lipgloss.NewStyle().Background(landBg).Foreground(theme.TextOnBG(landBg))3434 3535 switch {@@ -7,7 +7,6 @@ import (
77 88 "charm.land/bubbles/v2/key"99 tea "charm.land/bubbletea/v2"10- "charm.land/lipgloss/v2"1110 )1211 1312 // expansion tracks how far the preview rectangle extends from the clue cell.@@ -75,6 +74,7 @@ func (m Model) Update(msg tea.Msg) (game.Gamer, tea.Cmd) {
7574 switch msg := msg.(type) {7675 case game.HelpToggleMsg:7776 m.showFullHelp = msg.Show77+ m.originValid = false7878 7979 case tea.WindowSizeMsg:8080 m.termWidth = msg.Width@@ -347,11 +347,17 @@ func (m Model) View() string {
347347 title := game.TitleBarView("Shikaku", m.modeTitle, solved)348348 grid := gridView(m, solved)349349 if solved {350- return lipgloss.JoinVertical(lipgloss.Center, title, grid)350+ return game.ComposeGameView(title, grid)351351 }352+ selected := m.selectedClue != nil352353 info := infoView(&m.puzzle)353- status := statusBarView(m.selectedClue != nil, m.showFullHelp)354- return lipgloss.JoinVertical(lipgloss.Center, title, grid, info, status)354+ status := statusBarView(selected, m.showFullHelp)355+ return game.ComposeGameViewRows(356+ title,357+ grid,358+ game.StaticRow(info),359+ game.StableRow(status, statusBarView(selected, false), statusBarView(selected, true)),360+ )355361 }356362 357363 func (m Model) SetTitle(t string) game.Gamer {@@ -6,6 +6,8 @@ import (
66 "testing"77 88 tea "charm.land/bubbletea/v2"9+ "charm.land/lipgloss/v2"10+ "github.com/FelineStateMachine/puzzletea/game"911 )1012 1113 // --- helpers ---@@ -551,6 +553,43 @@ func TestScreenToGrid(t *testing.T) {
551553 }552554 }553555 556+func TestHelpToggleInvalidatesOriginCache(t *testing.T) {557+ m := Model{558+ puzzle: *simplePuzzle(),559+ keys: DefaultKeyMap,560+ modeTitle: "Test",561+ originX: 7,562+ originY: 11,563+ originValid: true,564+ }565+566+ next, _ := m.Update(game.HelpToggleMsg{Show: true})567+ got := next.(Model)568+569+ if !got.showFullHelp {570+ t.Fatal("expected showFullHelp to be true")571+ }572+ if got.originValid {573+ t.Fatal("expected origin cache to be invalidated")574+ }575+}576+577+func TestViewWidthStableWhenFullHelpExpanded(t *testing.T) {578+ m := Model{579+ puzzle: *simplePuzzle(),580+ keys: DefaultKeyMap,581+ modeTitle: "Test",582+ }583+584+ shortWidth := lipgloss.Width(m.View())585+ next, _ := m.Update(game.HelpToggleMsg{Show: true})586+ fullWidth := lipgloss.Width(next.(Model).View())587+588+ if fullWidth > shortWidth {589+ t.Errorf("full-help width = %d, want <= %d", fullWidth, shortWidth)590+ }591+}592+554593 // --- rectFromCorners (P1) ---555594 556595 func TestRectFromCorners(t *testing.T) {@@ -85,7 +85,7 @@ func cellView(m Model, x, y int, solved bool, preview *Rectangle, previewClue *C
8585 s := lipgloss.NewStyle().Foreground(p.TextDim)8686 8787 if clue != nil {88- s = lipgloss.NewStyle().Foreground(p.Given).Background(p.Surface).Bold(true)88+ s = lipgloss.NewStyle().Foreground(p.Given).Background(p.BG).Bold(true)8989 }9090 9191 // Rectangle background color (from current theme palette).@@ -7,7 +7,6 @@ import (
77 88 "charm.land/bubbles/v2/key"99 tea "charm.land/bubbletea/v2"10- "charm.land/lipgloss/v2"1110 "github.com/FelineStateMachine/puzzletea/game"1211 )1312 @@ -99,7 +98,7 @@ func (m Model) View() string {
9998 grid := renderGrid(m, solved, m.conflicts)10099 status := statusBarView(m.showFullHelp)101100 102- return lipgloss.JoinVertical(lipgloss.Center, title, grid, status)101+ return game.ComposeGameViewRows(title, grid, game.StableRow(status, statusBarView(false), statusBarView(true)))103102 }104103 105104 func (m Model) GetDebugInfo() string {@@ -6,7 +6,6 @@ import (
66 77 "charm.land/bubbles/v2/key"88 tea "charm.land/bubbletea/v2"9- "charm.land/lipgloss/v2"109 "github.com/FelineStateMachine/puzzletea/game"1110 )1211 @@ -77,10 +76,10 @@ func (m Model) View() string {
7776 title := game.TitleBarView("Takuzu", m.modeTitle, m.solved)7877 grid := gridView(m.grid, m.provided, m.cursor, m.solved)7978 if m.solved {80- return lipgloss.JoinVertical(lipgloss.Center, title, grid)79+ return game.ComposeGameView(title, grid)8180 }8281 status := statusBarView(m.showFullHelp)83- return lipgloss.JoinVertical(lipgloss.Center, title, grid, status)82+ return game.ComposeGameViewRows(title, grid, game.StableRow(status, statusBarView(false), statusBarView(true)))8483 }8584 8685 func (m Model) SetTitle(t string) game.Gamer {@@ -156,8 +156,8 @@ func derivePalette(t Theme) Palette {
156156 SuccessBorder: ansi[10], // brightGreen157157 SolvedFG: ansi[15], // brightWhite — text on state BGs158158 Error: errorFG,159- Info: ansi[4], // blue160- Given: ansi[5], // purple159+ Info: ansi[12], // brightBlue160+ Given: ansi[5], // purple161161 Linked: linked,162162 Highlight: highlight,163163 Secondary: secondary,@@ -87,6 +87,7 @@ func (m Model) Update(msg tea.Msg) (game.Gamer, tea.Cmd) {
8787 switch msg := msg.(type) {8888 case game.HelpToggleMsg:8989 m.showFullHelp = msg.Show90+ m.originValid = false9091 9192 case tea.WindowSizeMsg:9293 m.termWidth = msg.Width@@ -103,7 +103,7 @@ func renderView(m Model) string {
103103 104104 status := statusBarView(m.showFullHelp)105105 106- return lipgloss.JoinVertical(lipgloss.Center, title, mainView, status)106+ return game.ComposeGameViewRows(title, mainView, game.StableRow(status, statusBarView(false), statusBarView(true)))107107 }108108 109109 func statusBarView(showFullHelp bool) string {@@ -617,6 +617,30 @@ func TestScreenToGrid(t *testing.T) {
617617 }618618 }619619 620+func TestHelpToggleInvalidatesOriginCache(t *testing.T) {621+ m := Model{622+ width: 10,623+ height: 10,624+ grid: createEmptyGrid(10, 10),625+ keys: DefaultKeyMap,626+ modeTitle: "Test",627+ foundCells: buildFoundCells(10, 10, nil),628+ originX: 9,629+ originY: 13,630+ originValid: true,631+ }632+633+ next, _ := m.Update(game.HelpToggleMsg{Show: true})634+ got := next.(Model)635+636+ if !got.showFullHelp {637+ t.Fatal("expected showFullHelp to be true")638+ }639+ if got.originValid {640+ t.Fatal("expected origin cache to be invalidated")641+ }642+}643+620644 // --- Save/Load round-trip (P1) ---621645 622646 func TestSaveLoadRoundTrip(t *testing.T) {