scriptoriumadmin/strix
1
0
Fork 0
mirror of https://github.com/usestrix/strix.git synced 2026-08-28 05:25:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(tui): restore base foreground after ANSI resets (#1169)

Browse source
This commit is contained in:
alex s 2026-08-26 14:11:51 -04:00 • committed by GitHub
parent bfaaa904f2
commit a5856108a7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 28 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
strix/interface/tui/internal/app/model_test.go
View file

@ -865,6 +865,20 @@ func TestPanelPaddingResetsLeakingLineBackground(t *testing.T) {
}
}
func TestFillBackgroundRestoresBaseForegroundAfterReset(t *testing.T) {
const textFG = "\x1b[38;2;212;212;212m"
view := "\x1b[38;2;167;139;250m◈ \x1b[0m\x1b[2mspawning\x1b[0m"
filled := fillBackground(view)
baseStyle := blackBG + textFG
if !strings.HasPrefix(filled, baseStyle) {
t.Fatalf("frame does not set its base colors: %q", filled)
}
if got, want := strings.Count(filled, "\x1b[0m"+baseStyle), 2; got != want {
t.Fatalf("base colors restored after %d resets, want %d: %q", got, want, filled)
}
}
func TestMainTraceTreeAndFindingsRenderScrollbars(t *testing.T) {
model := New(nil)
model.width, model.height = 150, 35

21
strix/interface/tui/internal/app/view.go
View file

@ -352,21 +352,28 @@ func (m Model) toastOverlay(view string) string {
return strings.Join(bg, "\n")
}
// blackBG is the SGR that selects a solid black background.
const blackBG = "\x1b[48;2;0;0;0m"
// Base frame colors are reapplied after full SGR resets so the TUI does not
// inherit an unreadable foreground from the user's terminal profile.
const (
blackBG = "\x1b[48;2;0;0;0m"
textFG = "\x1b[38;2;212;212;212m"
baseFrameColors = blackBG + textFG
)
// fillBackground paints the whole frame black like Textual's Screen background.
// Bubble Tea has no screen compositor, so any cell the view does not explicitly
// color shows the terminal's default background. lipgloss emits a full reset
// (\x1b[0m) at the end of every styled span, which also clears the background, so
// we reassert black after each reset (and at the start). Spans that set their own
// background — inline code, selected rows, buttons — keep it, because their color
// is emitted before the reset.
// (\x1b[0m) at the end of every styled span, which clears both foreground and
// background. Reasserting only black made uncolored and faint text inherit the
// terminal profile's foreground; light profiles therefore rendered that text
// black-on-black. Reapply both base colors after each reset (and at the start).
// Spans that set their own colors — inline code, selected rows, buttons — keep
// them, because their color is emitted after the base style.
func fillBackground(view string) string {
if view == "" {
return view
}
return blackBG + strings.ReplaceAll(view, "\x1b[0m", "\x1b[0m"+blackBG)
return baseFrameColors + strings.ReplaceAll(view, "\x1b[0m", "\x1b[0m"+baseFrameColors)
}
func (m Model) splashView() string {