diff --git a/assets/styles.css b/assets/styles.css index 61a6950..e2ef8b4 100644 --- a/assets/styles.css +++ b/assets/styles.css @@ -29,3 +29,22 @@ .omnisearch-highlight { } + +.omnisearch-input-container { + display: flex; + flex-direction: row; + gap: 5px; +} + +.omnisearch-input-field { + position: relative; + flex-grow: 1; +} + +.omnisearch-input__context { + position: absolute; + right: 1em; + top: calc(50% - 0.75em); + color: var(--text-faint); + font-size: small; +} \ No newline at end of file diff --git a/src/components/InputSearch.svelte b/src/components/InputSearch.svelte index 49706b9..2ccc568 100644 --- a/src/components/InputSearch.svelte +++ b/src/components/InputSearch.svelte @@ -4,6 +4,7 @@ import { createEventDispatcher, onMount, tick } from 'svelte' export let value = '' + export let label = '' const dispatch = createEventDispatcher() let elInput: HTMLInputElement @@ -22,13 +23,22 @@ }, 100) - toggleInputComposition(true)} - on:compositionend={_ => toggleInputComposition(false)} - type="text" - class="prompt-input" - placeholder="Type to search through your notes" - spellcheck="false" /> +
+
+ + + + {label} + +
+ +
diff --git a/src/components/ModalInFile.svelte b/src/components/ModalInFile.svelte index 298023a..3cff9b9 100644 --- a/src/components/ModalInFile.svelte +++ b/src/components/ModalInFile.svelte @@ -140,28 +140,28 @@ } -
Omnisearch - File
-
- (searchQuery = e.detail)} /> + (searchQuery = e.detail)} + label="Omnisearch - File" /> - - {#if groupedOffsets.length && note} - {#each groupedOffsets as offset, i} - (selectedIndex = i)} - on:click={openSelection} /> - {/each} - {:else} -
- We found 0 result for your search here. -
- {/if} - -
+ + {#if groupedOffsets.length && note} + {#each groupedOffsets as offset, i} + (selectedIndex = i)} + on:click={openSelection} /> + {/each} + {:else} +
+ We found 0 result for your search here. +
+ {/if} +
diff --git a/src/components/ModalVault.svelte b/src/components/ModalVault.svelte index 79b12c7..e31d069 100644 --- a/src/components/ModalVault.svelte +++ b/src/components/ModalVault.svelte @@ -11,7 +11,7 @@ import ResultItemVault from './ResultItemVault.svelte' import { Query } from 'src/query' import { saveSearchHistory, searchHistory } from 'src/search-history' - import { settings } from 'src/settings' + import { settings } from '../settings' export let modal: OmnisearchVaultModal let selectedIndex = 0 @@ -53,6 +53,7 @@ } searchQuery = searchHistory[historySearchIndex] } + function nextSearchHistory() { if (--historySearchIndex < 0) { historySearchIndex = searchHistory.length ? searchHistory.length - 1 : 0 @@ -66,7 +67,7 @@ (a, b) => b.score - a.score ) selectedIndex = 0 - scrollIntoView() + await scrollIntoView() } function onClick(evt?: MouseEvent | KeyboardEvent) { @@ -167,23 +168,29 @@ } -
Omnisearch - Vault
-
- (searchQuery = e.detail)} /> + + {#if $settings.showCreateButton} + + {/if} + - - {#each resultNotes as result, i} - (selectedIndex = i)} - on:click={onClick} /> - {/each} - {#if !resultNotes.length && searchQuery} -
We found 0 result for your search here.
- {/if} - -
+ + {#each resultNotes as result, i} + + {/each} + {#if !resultNotes.length && searchQuery} +
+ We found 0 result for your search here. +
+ {/if} +
diff --git a/src/modals.ts b/src/modals.ts index 3c70032..b45c7d2 100644 --- a/src/modals.ts +++ b/src/modals.ts @@ -1,4 +1,4 @@ -import { App, Modal, TFile, Platform } from 'obsidian' +import { App, Modal, TFile } from 'obsidian' import ModalVault from './components/ModalVault.svelte' import ModalInFile from './components/ModalInFile.svelte' import { eventBus, isInputComposition } from './globals' @@ -6,14 +6,14 @@ import { settings } from './settings' import { get } from 'svelte/store' abstract class OmnisearchModal extends Modal { - constructor(app: App) { + protected constructor(app: App) { super(app) // Remove all the default modal's children // so that we can more easily customize it - const closeEl = this.containerEl.find('.modal-close-button') + // const closeEl = this.containerEl.find('.modal-close-button') this.modalEl.replaceChildren() - this.modalEl.append(closeEl) + // this.modalEl.append(closeEl) this.modalEl.addClass('omnisearch-modal', 'prompt') // this.modalEl.removeClass('modal') this.modalEl.tabIndex = -1 diff --git a/src/settings.ts b/src/settings.ts index ffcff7c..2c45223 100644 --- a/src/settings.ts +++ b/src/settings.ts @@ -1,7 +1,7 @@ import { Plugin, PluginSettingTab, Setting, SliderComponent } from 'obsidian' import { notesCacheFilePath, searchIndexFilePath } from './globals' import type OmnisearchPlugin from './main' -import { get, readable, writable } from 'svelte/store' +import { get, writable } from 'svelte/store' interface WeightingSettings { weightBasename: number @@ -17,6 +17,7 @@ export interface OmnisearchSettings extends WeightingSettings { ribbonIcon: boolean showShortName: boolean showContext: boolean + showCreateButton: boolean CtrlJK: boolean CtrlNP: boolean storeIndexInFile: boolean @@ -61,8 +62,7 @@ export class SettingsTab extends PluginSettingTab { const diacriticsDesc = new DocumentFragment() diacriticsDesc.createSpan({}, span => { span.innerHTML = `Normalize diacritics in search terms. Words like "brûlée" or "žluťoučký" will be indexed as "brulee" and "zlutoucky".
- Needs a restart to fully take effect. - ` + Needs a restart to fully take effect.` }) new Setting(containerEl) .setName('Ignore diacritics') @@ -77,6 +77,7 @@ export class SettingsTab extends PluginSettingTab { }) ) + // Store index const serializedIndexDesc = new DocumentFragment() serializedIndexDesc.createSpan({}, span => { span.innerHTML = `The search index is stored on disk, instead of being rebuilt at every startup. @@ -91,8 +92,8 @@ export class SettingsTab extends PluginSettingTab { .setDesc(serializedIndexDesc) .addToggle(toggle => toggle.setValue(get(settings).storeIndexInFile).onChange(async v => { - app.vault.adapter.remove(notesCacheFilePath) - app.vault.adapter.remove(searchIndexFilePath) + await app.vault.adapter.remove(notesCacheFilePath) + await app.vault.adapter.remove(searchIndexFilePath) settings.update(s => { s.storeIndexInFile = v return s @@ -145,10 +146,29 @@ export class SettingsTab extends PluginSettingTab { }) ) + // Show "Create note" button + const createBtnDesc = new DocumentFragment() + createBtnDesc.createSpan({}, span => { + span.innerHTML = `Shows a button next to the search input, to create a note. + Acts the same as the shift ↵ shortcut, can be useful for mobile device users.` + }) + new Setting(containerEl) + .setName('Show "Create note" button') + .setDesc(createBtnDesc) + .addToggle(toggle => + toggle.setValue(get(settings).showCreateButton).onChange(async v => { + settings.update(s => { + s.showCreateButton = v + return s + }) + await saveSettings(this.plugin) + }) + ) + // Show notices new Setting(containerEl) .setName('Show indexing notices') - .setDesc('Show a notice when indexing is done, usually at startup.') + .setDesc('Shows a notice when indexing is done, usually at startup.') .addToggle(toggle => toggle.setValue(get(settings).showIndexingNotices).onChange(async v => { settings.update(s => { @@ -258,6 +278,7 @@ export const DEFAULT_SETTINGS: OmnisearchSettings = { showShortName: false, ribbonIcon: true, showContext: true, + showCreateButton: false, weightBasename: 2, weightH1: 1.5,