ros/automaker
1
0
Fork 0
mirror of https://github.com/AutoMaker-Org/automaker.git synced 2026-01-30 06:12:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #574 from stefandevo/fix/v0.13.0rc

Browse Source 
fix: use getTerminalFontFamily for dev server logs terminal font
This commit is contained in:
Web Dev Cody
2026-01-18 17:17:44 -05:00
committed by GitHub
parent 1c1d9d30a7 8ab9dc5a11
commit af95dae73a
2 changed files with 26 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
apps/ui/src/components/ui/xterm-log-viewer.tsx
View File

@@ -1,6 +1,6 @@
import { useEffect, useRef, useCallback, useState, forwardRef, useImperativeHandle } from 'react'; import { useEffect, useRef, useCallback, useState, forwardRef, useImperativeHandle } from 'react';
import { useAppStore } from '@/store/app-store'; import { useAppStore } from '@/store/app-store';
import { getTerminalTheme, DEFAULT_TERMINAL_FONT } from '@/config/terminal-themes'; import { getTerminalTheme, getTerminalFontFamily } from '@/config/terminal-themes';
// Types for dynamically imported xterm modules // Types for dynamically imported xterm modules
type XTerminal = InstanceType<typeof import('@xterm/xterm').Terminal>; type XTerminal = InstanceType<typeof import('@xterm/xterm').Terminal>;
@@ -20,7 +20,7 @@ export interface XtermLogViewerRef {
export interface XtermLogViewerProps { export interface XtermLogViewerProps {
/** Initial content to display */ /** Initial content to display */
initialContent?: string; initialContent?: string;
/** Font size in pixels (default: 13) */ /** Font size in pixels (uses terminal settings if not provided) */
fontSize?: number; fontSize?: number;
/** Whether to auto-scroll to bottom when new content is added (default: true) */ /** Whether to auto-scroll to bottom when new content is added (default: true) */
autoScroll?: boolean; autoScroll?: boolean;
@@ -42,7 +42,7 @@ export const XtermLogViewer = forwardRef<XtermLogViewerRef, XtermLogViewerProps>
( (
{ {
initialContent, initialContent,
fontSize = 13, fontSize,
autoScroll = true, autoScroll = true,
className, className,
minHeight = 300, minHeight = 300,
@@ -58,9 +58,14 @@ export const XtermLogViewer = forwardRef<XtermLogViewerRef, XtermLogViewerProps>
const autoScrollRef = useRef(autoScroll); const autoScrollRef = useRef(autoScroll);
const pendingContentRef = useRef<string[]>([]); const pendingContentRef = useRef<string[]>([]);
// Get theme from store // Get theme and font settings from store
const getEffectiveTheme = useAppStore((state) => state.getEffectiveTheme); const getEffectiveTheme = useAppStore((state) => state.getEffectiveTheme);
const effectiveTheme = getEffectiveTheme(); const effectiveTheme = getEffectiveTheme();
const terminalFontFamily = useAppStore((state) => state.terminalState.fontFamily);
const terminalFontSize = useAppStore((state) => state.terminalState.defaultFontSize);
// Use prop if provided, otherwise use store value, fallback to 13
const effectiveFontSize = fontSize ?? terminalFontSize ?? 13;
// Track system dark mode for "system" theme // Track system dark mode for "system" theme
const [systemIsDark, setSystemIsDark] = useState(() => { const [systemIsDark, setSystemIsDark] = useState(() => {
@@ -102,12 +107,17 @@ export const XtermLogViewer = forwardRef<XtermLogViewerRef, XtermLogViewerProps>
const terminalTheme = getTerminalTheme(resolvedTheme); const terminalTheme = getTerminalTheme(resolvedTheme);
// Get font settings from store at initialization time
const terminalState = useAppStore.getState().terminalState;
const fontFamily = getTerminalFontFamily(terminalState.fontFamily);
const initFontSize = fontSize ?? terminalState.defaultFontSize ?? 13;
const terminal = new Terminal({ const terminal = new Terminal({
cursorBlink: false, cursorBlink: false,
cursorStyle: 'underline', cursorStyle: 'underline',
cursorInactiveStyle: 'none', cursorInactiveStyle: 'none',
fontSize, fontSize: initFontSize,
fontFamily: DEFAULT_TERMINAL_FONT, fontFamily,
lineHeight: 1.2, lineHeight: 1.2,
theme: terminalTheme, theme: terminalTheme,
disableStdin: true, // Read-only mode disableStdin: true, // Read-only mode
@@ -181,10 +191,18 @@ export const XtermLogViewer = forwardRef<XtermLogViewerRef, XtermLogViewerProps>
// Update font size when it changes // Update font size when it changes
useEffect(() => { useEffect(() => {
if (xtermRef.current && isReady) { if (xtermRef.current && isReady) {
xtermRef.current.options.fontSize = fontSize; xtermRef.current.options.fontSize = effectiveFontSize;
fitAddonRef.current?.fit(); fitAddonRef.current?.fit();
} }
}, [fontSize, isReady]); }, [effectiveFontSize, isReady]);
// Update font family when it changes
useEffect(() => {
if (xtermRef.current && isReady) {
xtermRef.current.options.fontFamily = getTerminalFontFamily(terminalFontFamily);
fitAddonRef.current?.fit();
}
}, [terminalFontFamily, isReady]);
// Handle resize // Handle resize
useEffect(() => { useEffect(() => {

1
apps/ui/src/components/views/board-view/worktree-panel/components/dev-server-logs-panel.tsx
View File

@@ -256,7 +256,6 @@ export function DevServerLogsPanel({
ref={xtermRef} ref={xtermRef}
className="h-full" className="h-full"
minHeight={280} minHeight={280}
fontSize={13}
autoScroll={autoScrollEnabled} autoScroll={autoScrollEnabled}
onScrollAwayFromBottom={() => setAutoScrollEnabled(false)} onScrollAwayFromBottom={() => setAutoScrollEnabled(false)}
onScrollToBottom={() => setAutoScrollEnabled(true)} onScrollToBottom={() => setAutoScrollEnabled(true)}