diff --git a/src/modals.ts b/src/modals.ts index 768a49e..77cc04f 100644 --- a/src/modals.ts +++ b/src/modals.ts @@ -37,7 +37,7 @@ abstract class OmnisearchModal extends Modal { ] as const) { for (const modifier of ['Ctrl', 'Meta'] as const) { this.scope.register([modifier], key.k, e => { - if (settings.CtrlJK) { + if (settings.CtrlJK && this.app.vault.getConfig('vimMode')) { e.preventDefault() eventBus.emit('arrow-' + key.dir) } @@ -52,7 +52,7 @@ abstract class OmnisearchModal extends Modal { ] as const) { for (const modifier of ['Ctrl', 'Meta'] as const) { this.scope.register([modifier], key.k, e => { - if (settings.CtrlNP) { + if (settings.CtrlNP && this.app.vault.getConfig('vimMode')) { e.preventDefault() eventBus.emit('arrow-' + key.dir) } diff --git a/src/settings.ts b/src/settings.ts index 417b0e7..5c5a836 100644 --- a/src/settings.ts +++ b/src/settings.ts @@ -129,7 +129,7 @@ export class SettingsTab extends PluginSettingTab { new Setting(containerEl).setName('Shortcuts').setHeading() new Setting(containerEl) - .setName('Use [Ctrl/Cmd]+j/k to navigate up/down in the results') + .setName('Use [Ctrl/Cmd]+j/k to navigate up/down in the results, if Vim mode is enabled') .addToggle(toggle => toggle.setValue(settings.CtrlJK).onChange(async v => { settings.CtrlJK = v @@ -138,7 +138,7 @@ export class SettingsTab extends PluginSettingTab { ) new Setting(containerEl) - .setName('Use [Ctrl/Cmd]+n/p to navigate up/down in the results') + .setName('Use [Ctrl/Cmd]+n/p to navigate up/down in the results, if Vim mode is enabled') .addToggle(toggle => toggle.setValue(settings.CtrlNP).onChange(async v => { settings.CtrlNP = v diff --git a/src/types.d.ts b/src/types.d.ts index ad8686a..ff21c9a 100644 --- a/src/types.d.ts +++ b/src/types.d.ts @@ -1,4 +1,4 @@ -import type { MetadataCache, ViewState } from 'obsidian' +import type { MetadataCache, ViewState, Vault } from 'obsidian' declare module 'obsidian' { interface MetadataCache { @@ -14,4 +14,8 @@ declare module 'obsidian' { file?: string } } + + interface Vault { + getConfig(string): unknown + } }