Skip to content

markdown: fix scroll sync regressions introduced in #287050 #307763

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

Open
AshtonYoon wants to merge 2 commits into
base: main
Choose a base branch
from
+12 −5
Open

markdown: fix scroll sync regressions introduced in #287050 #307763

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
611bf74
markdown: fix scroll sync regressions introduced in #287050
AshtonYoon Apr 4, 2026
4e9dd03
Merge branch 'main' into fix/markdown-preview-scroll-sync-regressions
mjbvz Apr 4, 2026
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
16 changes: 12 additions & 4 deletions extensions/markdown-language-features/preview-src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,9 @@ onceDocumentLoaded(() => {
addImageContexts();
if (typeof scrollProgress === 'number' && !settings.settings.fragment) {
doAfterImagesLoaded(() => {
scrollDisabledCount += 1;
scrollDisabledCount = 1;
if (scrollDisabledTimer) { clearTimeout(scrollDisabledTimer); }
scrollDisabledTimer = window.setTimeout(() => { scrollDisabledCount = 0; }, 200);
// Always set scroll of at least 1 to prevent VS Code's webview code from auto scrolling us
const scrollToY = Math.max(1, scrollProgress * document.body.clientHeight);
window.scrollTo(0, scrollToY);
Expand All @@ -113,12 +115,16 @@ onceDocumentLoaded(() => {

const element = getLineElementForFragment(fragment, documentVersion);
if (element) {
scrollDisabledCount += 1;
scrollDisabledCount = 1;
if (scrollDisabledTimer) { clearTimeout(scrollDisabledTimer); }
scrollDisabledTimer = window.setTimeout(() => { scrollDisabledCount = 0; }, 200);
scrollToRevealSourceLine(element.line, documentVersion, settings);
}
} else {
if (!isNaN(settings.settings.line!)) {
scrollDisabledCount += 1;
scrollDisabledCount = 1;
if (scrollDisabledTimer) { clearTimeout(scrollDisabledTimer); }
scrollDisabledTimer = window.setTimeout(() => { scrollDisabledCount = 0; }, 200);
scrollToRevealSourceLine(settings.settings.line!, documentVersion, settings);
}
}
Expand Down Expand Up @@ -152,7 +158,9 @@ const onUpdateView = (() => {
})();

window.addEventListener('resize', () => {
scrollDisabledCount += 1;
scrollDisabledCount = 1;
if (scrollDisabledTimer) { clearTimeout(scrollDisabledTimer); }
scrollDisabledTimer = window.setTimeout(() => { scrollDisabledCount = 0; }, 200);
updateScrollProgress();
}, true);

Expand Down
1 change: 0 additions & 1 deletion extensions/markdown-language-features/src/preview/preview.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,6 @@ class MarkdownPreview extends Disposable implements WebviewResourceProvider {
}

if (this.#isScrolling) {
this.#isScrolling = false;
return;
}

Expand Down