Skip to content

Commit 215d617

Browse files
committed
chore: align input text color with message theme
1 parent 206d7bc commit 215d617

File tree

1 file changed

+30
-20
lines changed

1 file changed

+30
-20
lines changed

cli/src/utils/theme-system.ts

Lines changed: 30 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -180,29 +180,39 @@ const applyNeutralTextDefaults = (
180180
return allowDefault ? 'default' : fallback
181181
}
182182

183+
const resolvedMessageAiText = resolveColor(
184+
theme.messageAiText,
185+
neutrals.primary,
186+
allowTerminalDefaults,
187+
)
188+
const resolvedMessageUserText = resolveColor(
189+
theme.messageUserText,
190+
neutrals.primary,
191+
allowTerminalDefaults,
192+
)
193+
const messageUserFallback =
194+
resolvedMessageUserText === 'default'
195+
? neutrals.primary
196+
: resolvedMessageUserText
197+
198+
const resolvedInputFg = resolveColor(
199+
theme.inputFg,
200+
messageUserFallback,
201+
allowTerminalDefaults,
202+
)
203+
const resolvedInputFocusedFg = resolveColor(
204+
theme.inputFocusedFg ?? theme.inputFg ?? messageUserFallback,
205+
messageUserFallback,
206+
allowTerminalDefaults,
207+
)
208+
183209
const adjustedTheme: ChatTheme = {
184210
...theme,
185211
chromeText: theme.chromeText ?? neutrals.primary,
186-
messageAiText: resolveColor(
187-
theme.messageAiText,
188-
neutrals.primary,
189-
allowTerminalDefaults,
190-
),
191-
messageUserText: resolveColor(
192-
theme.messageUserText,
193-
neutrals.primary,
194-
allowTerminalDefaults,
195-
),
196-
inputFg: resolveColor(
197-
theme.inputFg,
198-
neutrals.primary,
199-
allowTerminalDefaults,
200-
),
201-
inputFocusedFg: resolveColor(
202-
theme.inputFocusedFg ?? theme.inputFg,
203-
neutrals.primary,
204-
allowTerminalDefaults,
205-
),
212+
messageAiText: resolvedMessageAiText,
213+
messageUserText: resolvedMessageUserText,
214+
inputFg: resolvedInputFg,
215+
inputFocusedFg: resolvedInputFocusedFg,
206216
agentText: resolveColor(
207217
theme.agentText,
208218
neutrals.primary,

0 commit comments

Comments
 (0)