Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions src/renderer/hooks/useXterm.ts
Original file line number Diff line number Diff line change
Expand Up @@ -614,7 +614,27 @@ export function useXterm({
setTimeout(() => {
if (writeBufferRef.current.length > 0) {
const bufferedData = writeBufferRef.current;

// If user has scrolled up to view history, lock their viewport position.
// TUI control sequences (CSI 2J, CSI 3J, alternate buffer switch)
// can reset or scroll the viewport regardless of isUserScrolling.
// We preserve the user's scroll offset from the bottom.
const buffer = terminal.buffer.active;
const offsetFromBottom = buffer.baseY - buffer.viewportY;
const shouldLockViewport = offsetFromBottom > 0;
const savedOffsetFromBottom = shouldLockViewport ? offsetFromBottom : 0;

terminal.write(bufferedData);

// Restore viewport if it was moved by the write
if (shouldLockViewport) {
const targetViewportY = terminal.buffer.active.baseY - savedOffsetFromBottom;
const currentViewportY = terminal.buffer.active.viewportY;
if (targetViewportY !== currentViewportY) {
terminal.scrollLines(targetViewportY - currentViewportY);
}
}

// Call onData after write to avoid React re-render storm
onDataRef.current?.(bufferedData);
writeBufferRef.current = '';
Expand Down
Loading