MediaMetz/gemini-cli
1
0
Fork 0
mirror of https://github.com/google-gemini/gemini-cli.git synced 2026-03-15 08:31:14 -07:00
Code Issues Packages Projects Releases Wiki Activity

fix(cli): ensure both light and dark themes are saved in the theme dialog

Browse Source
This commit is contained in:
Dan Zaharia
2026-03-04 11:27:00 -05:00
parent a32322dd06
commit 3013a0acb5
2 changed files with 51 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
packages/cli/src/ui/components/ThemeDialog.tsx
View File

@@ -31,6 +31,8 @@ interface ThemeDialogProps {
onSelect: (
themeName: string,
scope: LoadableSettingScope,
themeMode?: 'light' | 'dark',
otherThemeName?: string,
) => void | Promise<void>;
/** Callback function when the dialog is cancelled */
@@ -44,7 +46,10 @@ interface ThemeDialogProps {
terminalWidth: number;
}
import { resolveColor , getThemeTypeFromBackgroundColor } from '../themes/color-utils.js';
import {
resolveColor,
getThemeTypeFromBackgroundColor,
} from '../themes/color-utils.js';
import { DefaultLight } from '../themes/default-light.js';
import { DefaultDark } from '../themes/default.js';
@@ -137,10 +142,19 @@ export function ThemeDialog({
const handleThemeSelect = useCallback(
async (themeName: string) => {
// @ts-expect-error adding extra argument for the updated hook
await onSelect(themeName, selectedScope, activeTab);
const otherThemeName =
activeTab === 'light'
? highlightedThemeNameDark
: highlightedThemeNameLight;
await onSelect(themeName, selectedScope, activeTab, otherThemeName);
},
[onSelect, selectedScope, activeTab],
[
onSelect,
selectedScope,
activeTab,
highlightedThemeNameDark,
highlightedThemeNameLight,
],
);
const handleThemeHighlight = (themeName: string) => {
@@ -158,10 +172,19 @@ export function ThemeDialog({
const handleScopeSelect = useCallback(
async (scope: LoadableSettingScope) => {
// @ts-expect-error adding extra argument
await onSelect(highlightedThemeName, scope, activeTab);
const otherThemeName =
activeTab === 'light'
? highlightedThemeNameDark
: highlightedThemeNameLight;
await onSelect(highlightedThemeName, scope, activeTab, otherThemeName);
},
[onSelect, highlightedThemeName, activeTab],
[
onSelect,
highlightedThemeName,
activeTab,
highlightedThemeNameDark,
highlightedThemeNameLight,
],
);
const [mode, setMode] = useState<'theme' | 'scope'>('theme');

21
packages/cli/src/ui/hooks/useThemeCommand.ts
View File

@@ -26,6 +26,7 @@ interface UseThemeCommandReturn {
themeName: string,
scope: LoadableSettingScope,
themeMode?: 'light' | 'dark',
otherThemeName?: string,
) => Promise<void>;
handleThemeHighlight: (themeName: string | undefined) => void;
}
@@ -99,6 +100,7 @@ export const useThemeCommand = (
themeName: string,
scope: LoadableSettingScope,
themeMode?: 'light' | 'dark',
otherThemeName?: string,
) => {
try {
const mergedCustomThemes = {
@@ -114,10 +116,29 @@ export const useThemeCommand = (
return;
}
if (otherThemeName) {
const isBuiltInOther = themeManager.findThemeByName(otherThemeName);
const isCustomOther =
otherThemeName && mergedCustomThemes[otherThemeName];
if (!isBuiltInOther && !isCustomOther) {
setThemeError(
`Theme "${otherThemeName}" not found in selected scope.`,
);
setIsThemeDialogOpen(true);
return;
}
}
if (themeMode === 'light') {
loadedSettings.setValue(scope, 'ui.themeLight', themeName);
if (otherThemeName) {
loadedSettings.setValue(scope, 'ui.themeDark', otherThemeName);
}
} else if (themeMode === 'dark') {
loadedSettings.setValue(scope, 'ui.themeDark', themeName);
if (otherThemeName) {
loadedSettings.setValue(scope, 'ui.themeLight', otherThemeName);
}
} else {
loadedSettings.setValue(scope, 'ui.themeLight', themeName);
loadedSettings.setValue(scope, 'ui.themeDark', themeName);