Skip to content
Open
Show file tree
Hide file tree
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
8 changes: 6 additions & 2 deletions media/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -1760,8 +1760,12 @@ document.addEventListener('keydown', e => {

if (editingCell && ((e.ctrlKey || e.metaKey) && e.key === 's')) {
e.preventDefault();
editingCell.blur();
vscode.postMessage({ type: 'save' });
const cellRef = editingCell;
cellRef && cellRef.blur();
// Let blur's edit commit message flush first, then save.
setTimeout(() => {
vscode.postMessage({ type: 'save' });
}, 0);
}
if (editingCell && e.key === 'Enter') {
e.preventDefault();
Expand Down
8 changes: 8 additions & 0 deletions src/test/webview-edit-shortcuts.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,14 @@ describe('Webview edit shortcuts', () => {
assert.ok(webviewSource.includes('setSingleSelection(nextCell);'));
});

it('commits blur before save when using Ctrl/Cmd+S during edit', () => {
assert.ok(webviewSource.includes("if (editingCell && ((e.ctrlKey || e.metaKey) && e.key === 's')) {"));
assert.ok(webviewSource.includes("const cellRef = editingCell;"));
assert.ok(webviewSource.includes("cellRef && cellRef.blur();"));
assert.ok(webviewSource.includes("setTimeout(() => {"));
assert.ok(webviewSource.includes("vscode.postMessage({ type: 'save' });"));
});

it('handles selection-mode paste as a grid operation', () => {
assert.ok(webviewSource.includes("document.addEventListener('paste', e => {"));
assert.ok(webviewSource.includes("type: 'pasteCells'"));
Expand Down
Loading