diff --git a/src/ui/features/docker/components/ConsoleTerminal.tsx b/src/ui/features/docker/components/ConsoleTerminal.tsx index 7d2104ef..c837aeac 100644 --- a/src/ui/features/docker/components/ConsoleTerminal.tsx +++ b/src/ui/features/docker/components/ConsoleTerminal.tsx @@ -20,6 +20,7 @@ import type { SSHHost } from "@/types"; import { isElectron } from "@/main-axios.ts"; import { SimpleLoader } from "@/lib/SimpleLoader.tsx"; import { useTranslation } from "react-i18next"; +import { resolveTermixThemeColors } from "@/features/terminal/terminal-theme"; import { TERMINAL_THEMES, DEFAULT_TERMINAL_CONFIG, @@ -49,26 +50,10 @@ export function ConsoleTerminal({ [hostConfig.terminalConfig], ); - const isDarkMode = - appTheme === "dark" || - appTheme === "dracula" || - appTheme === "gentlemansChoice" || - appTheme === "midnightEspresso" || - appTheme === "catppuccinMocha" || - (appTheme === "system" && - window.matchMedia("(prefers-color-scheme: dark)").matches); - const themeColors = React.useMemo(() => { const activeTheme = terminalConfig.theme; - if (activeTheme === "termix") { - return isDarkMode - ? TERMINAL_THEMES.termixDark.colors - : TERMINAL_THEMES.termixLight.colors; - } - return ( - TERMINAL_THEMES[activeTheme]?.colors ?? TERMINAL_THEMES.termixDark.colors - ); - }, [terminalConfig.theme, isDarkMode]); + return resolveTermixThemeColors(activeTheme, appTheme); + }, [terminalConfig.theme, appTheme]); const [isConnected, setIsConnected] = React.useState(false); const [isConnecting, setIsConnecting] = React.useState(false);