fix(diffs): preserve inline note focus while scrolling

This commit is contained in:
Brennan Benson
2026-11-11 17:08:08 -08:00
parent f6cefe6b2e
commit f727ef07b5
3 changed files with 147 additions and 6 deletions
+39
View File
@@ -154,6 +154,45 @@ diff --git a/esm/vs/editor/browser/viewParts/viewZones/viewZones.js b/esm/vs/edi
changeViewZones(callback) {
let zonesHaveChanged = false;
this._context.viewModel.changeWhitespace((whitespaceAccessor) => {
@@ -282,6 +302,19 @@
visibleZones[visibleWhitespace.id] = visibleWhitespace;
hasVisibleZone = true;
}
+ let focusedZone;
+ for (let node = this.domNode.domNode.ownerDocument.activeElement; node; node = node.parentElement) {
+ if (node === this.domNode.domNode || node === this.marginDomNode.domNode) {
+ break;
+ }
+ const zone = this._zones[node.getAttribute('monaco-view-zone')];
+ if (zone && (zone.domNode.domNode === node || zone.marginDomNode?.domNode === node)) {
+ focusedZone = zone;
+ break;
+ }
+ }
+ const focusedBounds = focusedZone && !focusedZone.isInHiddenArea && !visibleZones.hasOwnProperty(focusedZone.whitespaceId)
+ ? this._context.viewLayout.getWhitespaceBounds(focusedZone.whitespaceId) : null;
const keys = Object.keys(this._zones);
for (let i = 0, len = keys.length; i < len; i++) {
const id = keys[i];
@@ -305,7 +338,17 @@
zone.domNode.removeAttribute('monaco-visible-view-zone');
zone.isVisible = false;
}
- this._safeCallOnDomNodeTop(zone.delegate, ctx.getScrolledTopFromAbsoluteTop(-1e6));
+ // Clipping a focused zone preserves its live control and caret; display:none blurs it.
+ if (zone === focusedZone && focusedBounds && focusedBounds.height > 0) {
+ newTop = focusedBounds.top - ctx.bigNumbersDelta;
+ newHeight = focusedBounds.height;
+ newDisplay = 'block';
+ hasVisibleZone = true;
+ this._safeCallOnDomNodeTop(zone.delegate, ctx.getScrolledTopFromAbsoluteTop(focusedBounds.top));
+ }
+ else {
+ this._safeCallOnDomNodeTop(zone.delegate, ctx.getScrolledTopFromAbsoluteTop(-1e6));
+ }
}
zone.domNode.setTop(newTop);
zone.domNode.setHeight(newHeight);
diff --git a/esm/vs/editor/browser/widget/codeEditor/codeEditorWidget.js b/esm/vs/editor/browser/widget/codeEditor/codeEditorWidget.js
--- a/esm/vs/editor/browser/widget/codeEditor/codeEditorWidget.js
+++ b/esm/vs/editor/browser/widget/codeEditor/codeEditorWidget.js
+6 -6
View File
@@ -213,7 +213,7 @@ patchedDependencies:
minimatch@10.2.5: 4324868e550a69eee9addc4801001bee415e98339c9b2b88d6ab4fc6028741c6
minimatch@10.2.6: 4324868e550a69eee9addc4801001bee415e98339c9b2b88d6ab4fc6028741c6
minimatch@9.0.9: c356feccb9147b4d6a1cc72b10270defcb95d14cb42ee74ddfe7219341417161
monaco-editor@0.55.1: 4853363cfda19b39553ee0b1a0a06afa3f8767e387bbe52c9813ef6b7f90877e
monaco-editor@0.55.1: 14b514590cb04b36f264365dabc59063216e76d6f3e7fd400a57bc34eec3b406
node-pty@1.1.0: 37dc98d9a4bcfc67153fa2fbf30689563ff49dcf8e6f0578484cbacdf1e38af5
oxlint-plugin-anti-slop@0.1.2: c10c871702365a0c2c59e9f1c5fb92df97cae5755d534c0a3d83c6368f6feafe
pdfjs-dist@6.3.289: 424fde648e16c965ce45c55bdda49ecb3a4aa992c856900714c841c3f13f8415
@@ -334,7 +334,7 @@ importers:
version: 4.2.1(supports-color@7.2.0)
'@monaco-editor/react':
specifier: ^4.7.0
version: 4.7.0(@types/react-dom@19.2.7(@types/react@19.2.18))(@types/react@19.2.18)(monaco-editor@0.55.1(patch_hash=4853363cfda19b39553ee0b1a0a06afa3f8767e387bbe52c9813ef6b7f90877e))(react-dom@19.2.8(@types/react@19.2.18)(react@19.2.8))(react@19.2.8)
version: 4.7.0(@types/react-dom@19.2.7(@types/react@19.2.18))(@types/react@19.2.18)(monaco-editor@0.55.1(patch_hash=14b514590cb04b36f264365dabc59063216e76d6f3e7fd400a57bc34eec3b406))(react-dom@19.2.8(@types/react@19.2.18)(react@19.2.8))(react@19.2.8)
'@noble/hashes':
specifier: 1.8.0
version: 1.8.0
@@ -559,7 +559,7 @@ importers:
version: 11.17.2
monaco-editor:
specifier: ^0.55.1
version: 0.55.1(patch_hash=4853363cfda19b39553ee0b1a0a06afa3f8767e387bbe52c9813ef6b7f90877e)
version: 0.55.1(patch_hash=14b514590cb04b36f264365dabc59063216e76d6f3e7fd400a57bc34eec3b406)
node-gyp:
specifier: 12.3.0
version: 12.3.0
@@ -9262,10 +9262,10 @@ snapshots:
dependencies:
state-local: 1.0.7
'@monaco-editor/react@4.7.0(@types/react-dom@19.2.7(@types/react@19.2.18))(@types/react@19.2.18)(monaco-editor@0.55.1(patch_hash=4853363cfda19b39553ee0b1a0a06afa3f8767e387bbe52c9813ef6b7f90877e))(react-dom@19.2.8(@types/react@19.2.18)(react@19.2.8))(react@19.2.8)':
'@monaco-editor/react@4.7.0(@types/react-dom@19.2.7(@types/react@19.2.18))(@types/react@19.2.18)(monaco-editor@0.55.1(patch_hash=14b514590cb04b36f264365dabc59063216e76d6f3e7fd400a57bc34eec3b406))(react-dom@19.2.8(@types/react@19.2.18)(react@19.2.8))(react@19.2.8)':
dependencies:
'@monaco-editor/loader': 1.7.0
monaco-editor: 0.55.1(patch_hash=4853363cfda19b39553ee0b1a0a06afa3f8767e387bbe52c9813ef6b7f90877e)
monaco-editor: 0.55.1(patch_hash=14b514590cb04b36f264365dabc59063216e76d6f3e7fd400a57bc34eec3b406)
react: 19.2.8
react-dom: 19.2.8(@types/react@19.2.18)(react@19.2.8)
optionalDependencies:
@@ -14155,7 +14155,7 @@ snapshots:
pkg-types: 1.3.1
ufo: 1.6.4
monaco-editor@0.55.1(patch_hash=4853363cfda19b39553ee0b1a0a06afa3f8767e387bbe52c9813ef6b7f90877e):
monaco-editor@0.55.1(patch_hash=14b514590cb04b36f264365dabc59063216e76d6f3e7fd400a57bc34eec3b406):
dependencies:
dompurify: 3.4.17
marked: 14.0.0
@@ -428,4 +428,106 @@ test.describe('Combined diff scroll restore', () => {
rmSync(fixture.repoPath, { recursive: true, force: true })
}
})
test('keeps a note selection focused while its bounded editor scrolls away', async ({
orcaPage
}, testInfo) => {
await waitForSessionReady(orcaPage)
const fixture = createCombinedDiffScrollRepo()
try {
const worktreeId = await addAndActivateRepo(orcaPage, fixture.repoPath)
await openCombinedDiff(orcaPage, worktreeId, fixture.repoPath)
const viewport = orcaPage.locator('[data-combined-diff-viewport]')
await expect(viewport).toBeVisible()
const line = orcaPage
.locator('.modified-in-monaco-diff-editor .view-line')
.filter({ hasText: 'export const changed_0_5 = 5' })
.first()
await expect(line).toBeVisible()
await line.hover({ position: { x: 4, y: 8 } })
await orcaPage.locator('.orca-diff-comment-add-btn:visible').click()
for (const kind of ['draft', 'saved'] as const) {
const card = orcaPage.locator(
kind === 'draft' ? '.orca-diff-comment-draft-card' : '.orca-diff-comment-card'
)
if (kind === 'saved') {
await card.getByTitle('Edit note').click()
}
const textarea = card.locator('textarea')
await expect(textarea).toBeFocused()
await textarea.fill('alpha beta gamma')
await textarea.press('Home')
for (let step = 0; step < 6; step++) {
await orcaPage.keyboard.press('ArrowRight')
}
for (let step = 0; step < 4; step++) {
await orcaPage.keyboard.press('Shift+ArrowRight')
}
const input = await textarea.elementHandle()
if (!input) {
throw new Error('note textarea missing')
}
const selection = () =>
input.evaluate((element) => ({
focused: document.activeElement === element,
start: element.selectionStart,
end: element.selectionEnd,
body: element.value
}))
await expect.poll(selection).toEqual({
focused: true,
start: 6,
end: 10,
body: 'alpha beta gamma'
})
const bounds = await viewport.boundingBox()
if (!bounds) {
throw new Error('combined viewport bounds missing')
}
await viewport.hover({ position: { x: 8, y: 100 } })
const distance = kind === 'draft' ? 1600 : 6000
await orcaPage.mouse.wheel(0, distance)
await expect(textarea).not.toBeInViewport()
await expect.poll(selection).toEqual({
focused: true,
start: 6,
end: 10,
body: 'alpha beta gamma'
})
await orcaPage.mouse.wheel(0, -distance)
await expect(textarea).toBeInViewport()
await expect.poll(selection).toEqual({
focused: true,
start: 6,
end: 10,
body: 'alpha beta gamma'
})
await orcaPage.keyboard.insertText('FOCUS')
await expect(textarea).toHaveValue('alpha FOCUS gamma')
await testInfo.attach(`${kind}-focus-after-return`, {
body: await orcaPage.screenshot(),
contentType: 'image/png'
})
if (kind === 'draft') {
await card.getByRole('button', { name: /add note/i }).click()
await expect(orcaPage.locator('.orca-diff-comment-card')).toContainText(
'alpha FOCUS gamma'
)
} else {
await viewport.hover({ position: { x: 8, y: 100 } })
await orcaPage.mouse.wheel(0, distance)
await expect(textarea).not.toBeInViewport()
await viewport.click({ position: { x: 8, y: 100 } })
await expect(textarea).not.toBeFocused()
await orcaPage.mouse.wheel(0, -distance)
await expect(textarea).toBeInViewport()
await expect(textarea).not.toBeFocused()
await card.getByRole('button', { name: /cancel/i }).click()
await expect(textarea).toHaveCount(0)
}
}
} finally {
rmSync(fixture.repoPath, { recursive: true, force: true })
}
})
})