fix: add ResizeObserver and delayed fit for terminal sizing
- Add ResizeObserver to watch terminal container and trigger fit() on size changes - Add delayed second fit() call 500ms after initialization - Remove initial setTimeout resize in favor of ResizeObserver - Ensure resizeObserver is cleaned up on unmount
This commit is contained in:
@@ -167,10 +167,24 @@ export const TerminalComponent: React.FC<TerminalProps> = ({
|
|||||||
// Connect WebSocket
|
// Connect WebSocket
|
||||||
const ws = connectWebSocket();
|
const ws = connectWebSocket();
|
||||||
|
|
||||||
// Fit after layout settles - use rAF to ensure DOM is ready
|
// Fit after layout settles - use rAF + timeout to ensure DOM is ready
|
||||||
requestAnimationFrame(() => {
|
requestAnimationFrame(() => {
|
||||||
requestAnimationFrame(() => {
|
requestAnimationFrame(() => {
|
||||||
fitAddon.fit();
|
fitAddon.fit();
|
||||||
|
// Force a second fit after layout fully settles
|
||||||
|
setTimeout(() => {
|
||||||
|
fitAddon.fit();
|
||||||
|
const { cols, rows } = term;
|
||||||
|
if (ws.readyState === WebSocket.OPEN) {
|
||||||
|
ws.send(
|
||||||
|
JSON.stringify({
|
||||||
|
type: "resize",
|
||||||
|
cols,
|
||||||
|
rows,
|
||||||
|
})
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}, 500);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -213,8 +227,13 @@ export const TerminalComponent: React.FC<TerminalProps> = ({
|
|||||||
|
|
||||||
window.addEventListener("resize", handleResize);
|
window.addEventListener("resize", handleResize);
|
||||||
|
|
||||||
// Initial resize
|
// Use ResizeObserver to detect container size changes
|
||||||
setTimeout(handleResize, 100);
|
const resizeObserver = new ResizeObserver(() => {
|
||||||
|
handleResize();
|
||||||
|
});
|
||||||
|
if (terminalRef.current) {
|
||||||
|
resizeObserver.observe(terminalRef.current);
|
||||||
|
}
|
||||||
|
|
||||||
// Notify parent about terminal readiness
|
// Notify parent about terminal readiness
|
||||||
if (onTerminalReadyRef.current) {
|
if (onTerminalReadyRef.current) {
|
||||||
@@ -244,6 +263,7 @@ export const TerminalComponent: React.FC<TerminalProps> = ({
|
|||||||
return () => {
|
return () => {
|
||||||
clearTimeout(resizeTimeout);
|
clearTimeout(resizeTimeout);
|
||||||
window.removeEventListener("resize", handleResize);
|
window.removeEventListener("resize", handleResize);
|
||||||
|
resizeObserver.disconnect();
|
||||||
document.removeEventListener("visibilitychange", handleVisibilityChange);
|
document.removeEventListener("visibilitychange", handleVisibilityChange);
|
||||||
ws.close();
|
ws.close();
|
||||||
term.dispose();
|
term.dispose();
|
||||||
|
|||||||
Reference in New Issue
Block a user