opencode-vim 0.0.17 → 0.0.19

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opencode-vim",
-  "version": "0.0.17",
+  "version": "0.0.19",
   "repository": {
     "type": "git",
     "url": "https://github.com/Tarquinen/opencode-vim"

package/src/modules/snippets/view.tsx

@@ -103,7 +103,7 @@ export function SnippetAutocomplete(props: SnippetAutocompleteProps) {
         props.controller.navigate = undefined
     })
 
-    const dialogBlockingInput = () => dialogOpen() || dialogHandoffUntil() > Date.now()
+    const dialogBlockingInput = () => props.ctx.api.ui.dialog.open || dialogOpen() || dialogHandoffUntil() > Date.now()
     const match = createMemo(() => {
         if (props.ctx.disabled || props.ctx.visible === false) return undefined
         return findTrailingHashtagTrigger(input())

package/src/modules/vim/index.tsx

@@ -43,7 +43,7 @@ function VimKeyboard(props: { ctx: PromptContext; config: VimConfig; state: Retu
 
     const cursorStyleTimer = setInterval(syncCursorStyle, 50)
     const offKeyIntercept = props.ctx.api.keymap.intercept("key", ({ event }) => {
-        if (!props.enabled() || props.ctx.disabled || props.ctx.visible === false) return
+        if (!canHandleKeys(props)) return
         const key = keyNotation(event)
         if (!key || !passThroughKey(event, key, props.state.mode())) return
         if (preparePassThroughKey(props.ctx, key, props.state.mode())) preparedEvents.add(event)
@@ -61,8 +61,8 @@ function VimKeyboard(props: { ctx: PromptContext; config: VimConfig; state: Retu
             pending: props.state.pending(),
         })
 
-        if (!props.enabled() || props.ctx.disabled || props.ctx.visible === false) {
-            props.log("keyboard.skip", { enabled: props.enabled(), disabled: props.ctx.disabled, visible: props.ctx.visible })
+        if (!canHandleKeys(props)) {
+            props.log("keyboard.skip", { enabled: props.enabled(), disabled: props.ctx.disabled, visible: props.ctx.visible, dialogOpen: props.ctx.api.ui.dialog.open })
             return
         }
 
@@ -77,6 +77,11 @@ function VimKeyboard(props: { ctx: PromptContext; config: VimConfig; state: Retu
             return
         }
 
+        if (key === "<Esc>" && props.state.mode() === "normal" && !props.state.pending()) {
+            props.log("keyboard.fallthrough", { key, mode: props.state.mode() })
+            return
+        }
+
         if (sendNavigationKey(event, props.ctx, key, props.state.mode(), props.snippets)) {
             syncCursorStyle(true)
             props.ctx.requestRender()
@@ -112,6 +117,10 @@ function VimKeyboard(props: { ctx: PromptContext; config: VimConfig; state: Retu
     }
 }
 
+function canHandleKeys(props: { ctx: PromptContext; enabled: Accessor<boolean> }) {
+    return props.enabled() && !props.ctx.disabled && props.ctx.visible !== false && !props.ctx.api.ui.dialog.open
+}
+
 function readablePending(sequence: string) {
     if (!sequence) return undefined
     return sequence.replaceAll("><", " ")