Skip to content

Commit 53589fb

Browse files
committed
file-review: fix Cmd+K comment bugs in rich mode with vim nav (v1.6.1)
PreviewNavigator now ignores vim keys when metaKey is held, preventing Cmd+K from triggering vim-up. handleAddCommentShortcut uses the active preview block instead of the hidden editor cursor in preview mode.
1 parent 13247d4 commit 53589fb

5 files changed

Lines changed: 20 additions & 3 deletions

File tree

file-review/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "file-review",
33
"private": true,
4-
"version": "1.6.0",
4+
"version": "1.6.1",
55
"type": "module",
66
"scripts": {
77
"dev": "tauri dev --",

file-review/src-tauri/Cargo.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

file-review/src-tauri/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "file-review"
3-
version = "1.6.0"
3+
version = "1.6.1"
44
description = "A Tauri application for reviewing and managing files."
55
authors = ["contact@desplega.ai"]
66
edition = "2021"

file-review/src/main.ts

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -580,6 +580,20 @@ function updateViewMode() {
580580
}
581581

582582
function handleAddCommentShortcut() {
583+
// In preview mode, use the active block from preview navigation
584+
if (!isRawMode && isMarkdownFile) {
585+
const previewContainer = getPreviewContainer();
586+
const activeEl = previewContainer?.querySelector<HTMLElement>('.preview-active');
587+
if (activeEl) {
588+
const sourceStart = parseInt(activeEl.dataset.sourceStart ?? '0', 10);
589+
const sourceEnd = parseInt(activeEl.dataset.sourceEnd ?? '0', 10);
590+
handlePreviewAddComment(sourceStart, sourceEnd, activeEl);
591+
}
592+
// No active block — nothing to comment on
593+
return;
594+
}
595+
596+
// Raw mode: use CodeMirror editor position
583597
const selection = getSelection();
584598
const view = getEditorView();
585599

file-review/src/preview-nav.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,9 @@ export class PreviewNavigator {
6565
if (this.isEditableTarget(e.target)) return;
6666
if (!this.getVimEnabled()) return;
6767

68+
// Bail if meta key is held — let shortcuts like Cmd+K pass through
69+
if (e.metaKey) return;
70+
6871
const key = e.key;
6972

7073
if (key === 'j') {

0 commit comments

Comments
 (0)