Merge branch 'dev' of ssh://git.commumedia.org:2222/alex/headquarter into dev

This commit is contained in:
2026-05-24 18:00:54 +00:00
+17 -1
View File
@@ -229,9 +229,16 @@ export const TerminalComponent: React.FC<TerminalProps> = ({
const { cols, rows } = termRef.current; const { cols, rows } = termRef.current;
console.log('[Terminal] fitTerminal result:', cols, rows, '(was:', oldCols, oldRows + ')'); console.log('[Terminal] fitTerminal result:', cols, rows, '(was:', oldCols, oldRows + ')');
// Force explicit resize to ensure xterm.js updates its canvas
if (cols !== oldCols || rows !== oldRows) {
termRef.current.resize(cols, rows);
}
// Always refresh on initial load or when dimensions change // Always refresh on initial load or when dimensions change
requestAnimationFrame(() => { requestAnimationFrame(() => {
termRef.current?.refresh(0, rows - 1); if (termRef.current) {
termRef.current.refresh(0, termRef.current.rows - 1);
}
}); });
if (ws.readyState === WebSocket.OPEN) { if (ws.readyState === WebSocket.OPEN) {
@@ -254,6 +261,14 @@ export const TerminalComponent: React.FC<TerminalProps> = ({
requestAnimationFrame(() => fitTerminal()); requestAnimationFrame(() => fitTerminal());
}); });
// Delayed refit after WebSocket connects to ensure backend is synced
const delayedFitTimeout = setTimeout(() => {
if (ws.readyState === WebSocket.OPEN) {
console.log('[Terminal] Delayed refit after WebSocket connect');
fitTerminal();
}
}, 1000);
// Handle terminal input // Handle terminal input
term.onData((data) => { term.onData((data) => {
if (ws.readyState !== WebSocket.OPEN) return; if (ws.readyState !== WebSocket.OPEN) return;
@@ -343,6 +358,7 @@ export const TerminalComponent: React.FC<TerminalProps> = ({
clearTimeout(resizeTimeout); clearTimeout(resizeTimeout);
clearTimeout(windowResizeTimeout); clearTimeout(windowResizeTimeout);
clearTimeout(headerHideTimeout); clearTimeout(headerHideTimeout);
clearTimeout(delayedFitTimeout);
resizeObserver.disconnect(); resizeObserver.disconnect();
window.removeEventListener("resize", handleWindowResize); window.removeEventListener("resize", handleWindowResize);
document.removeEventListener("visibilitychange", handleVisibilityChange); document.removeEventListener("visibilitychange", handleVisibilityChange);