Skip to content

fix(desktop): guard terminal ResizeObserver against feedback loop #610

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
skevetter wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

fix(desktop): guard terminal ResizeObserver against feedback loop #610

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 9 additions & 5 deletions desktop/src/renderer/src/lib/components/terminal/Terminal.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ let containerEl: HTMLDivElement | undefined = $state()
let term: Terminal | undefined
let fitAddon: FitAddon | undefined
let resizeObserver: ResizeObserver | undefined
let lastCols = -1
let lastRows = -1

const darkTheme = {
background: "#1e1e2e",
Expand Down Expand Up @@ -187,11 +189,13 @@ onMount(async () => {
}

resizeObserver = new ResizeObserver(() => {
if (fitAddon && term) {
fitAddon.fit()
term.refresh(0, term.rows - 1)
terminalResize(sessionId, term.cols, term.rows)
}
if (!fitAddon || !term) return
fitAddon.fit()
if (term.cols === lastCols && term.rows === lastRows) return
lastCols = term.cols
lastRows = term.rows
term.refresh(0, term.rows - 1)
terminalResize(sessionId, term.cols, term.rows)
})
resizeObserver.observe(containerEl)
})
Expand Down
Loading