From 47b30b5c62d299f70420258dd6d740a07584f6d4 Mon Sep 17 00:00:00 2001
From: Simon Cambier <simon.cambier@protonmail.com>
Date: Mon, 18 Apr 2022 18:35:08 +0200
Subject: [PATCH] Fixed layout, removed agressive highlighter and some
 console.logs

---
 assets/styles.css        |  3 +++
 src/CmpModalFile.svelte  |  4 ++--
 src/CmpModalVault.svelte | 46 +++++++++++++++++-----------------------
 src/globals.ts           |  2 ++
 src/search.ts            |  4 ++--
 src/utils.ts             |  3 ++-
 6 files changed, 30 insertions(+), 32 deletions(-)

diff --git a/assets/styles.css b/assets/styles.css
index cb111c8..5c91709 100644
--- a/assets/styles.css
+++ b/assets/styles.css
@@ -24,3 +24,6 @@
 
   color: var(--text-muted);
 }
+
+.omnisearch-highlight {
+}
diff --git a/src/CmpModalFile.svelte b/src/CmpModalFile.svelte
index 013352e..cca83f1 100644
--- a/src/CmpModalFile.svelte
+++ b/src/CmpModalFile.svelte
@@ -15,8 +15,8 @@ $: {
     groupedOffsets = groups.map((group) =>
       Math.round((group.first()!.offset + group.last()!.offset) / 2)
     )
-    console.log(groups)
-    console.log(groupedOffsets)
+    // console.log(groups)
+    // console.log(groupedOffsets)
   }
 }
 
diff --git a/src/CmpModalVault.svelte b/src/CmpModalVault.svelte
index b514d39..a6ee460 100644
--- a/src/CmpModalVault.svelte
+++ b/src/CmpModalVault.svelte
@@ -3,15 +3,7 @@ import CmpInput from "./CmpInput.svelte"
 import CmpNoteResult from "./CmpNoteResult.svelte"
 import type { ResultNote } from "./globals"
 import { openNote } from "./notes"
-import {
-  modal,
-  plugin,
-  resultNotes,
-  searchQuery,
-  selectedNote,
-} from "./stores"
-
-
+import { modal, plugin, resultNotes, searchQuery, selectedNote } from "./stores"
 
 async function createOrOpenNote(item: ResultNote): Promise<void> {
   try {
@@ -60,23 +52,23 @@ function onInputShiftEnter(event: CustomEvent<ResultNote>): void {
       <CmpNoteResult selected={result === $selectedNote} note={result} />
     {/each}
   </div>
-  <div class="prompt-instructions">
-    <div class="prompt-instruction">
-      <span class="prompt-instruction-command">↑↓</span><span>to navigate</span>
-    </div>
-    <div class="prompt-instruction">
-      <span class="prompt-instruction-command">↵</span><span>to open</span>
-    </div>
-    <div class="prompt-instruction">
-      <span class="prompt-instruction-command">ctrl ↵</span>
-      <span>to open in a new pane</span>
-    </div>
-    <div class="prompt-instruction">
-      <span class="prompt-instruction-command">shift ↵</span>
-      <span>to create</span>
-    </div>
-    <div class="prompt-instruction">
-      <span class="prompt-instruction-command">esc</span><span>to dismiss</span>
-    </div>
+</div>
+<div class="prompt-instructions">
+  <div class="prompt-instruction">
+    <span class="prompt-instruction-command">↑↓</span><span>to navigate</span>
+  </div>
+  <div class="prompt-instruction">
+    <span class="prompt-instruction-command">↵</span><span>to open</span>
+  </div>
+  <div class="prompt-instruction">
+    <span class="prompt-instruction-command">ctrl ↵</span>
+    <span>to open in a new pane</span>
+  </div>
+  <div class="prompt-instruction">
+    <span class="prompt-instruction-command">shift ↵</span>
+    <span>to create</span>
+  </div>
+  <div class="prompt-instruction">
+    <span class="prompt-instruction-command">esc</span><span>to dismiss</span>
   </div>
 </div>
diff --git a/src/globals.ts b/src/globals.ts
index 2aa4612..a3d390f 100644
--- a/src/globals.ts
+++ b/src/globals.ts
@@ -6,6 +6,8 @@ export const regexYaml = /^---\s*\n(.*?)\n?^---\s?/ms
 export const excerptBefore = 100
 export const excerptAfter = 180
 
+export const highlightClass = 'suggestion-highlight omnisearch-highlight'
+
 export type SearchNote = {
   path: string
   basename: string
diff --git a/src/search.ts b/src/search.ts
index 1e44480..dad14f8 100644
--- a/src/search.ts
+++ b/src/search.ts
@@ -91,8 +91,8 @@ function subscribeToQuery(): void {
       ? getSuggestions(q, { singleFile: get(singleFileSearch) })
       : getSuggestions(q)
 
-    console.log('Search results')
-    console.log(results)
+    // console.log('Search results')
+    // console.log(results)
 
     // Save the results in the store
     resultNotes.set(results)
diff --git a/src/utils.ts b/src/utils.ts
index 5720bbc..ca0a19b 100644
--- a/src/utils.ts
+++ b/src/utils.ts
@@ -1,5 +1,6 @@
 import type { CachedMetadata } from 'obsidian'
 import {
+  highlightClass,
   isSearchMatch,
   regexLineSplit,
   regexYaml,
@@ -7,7 +8,7 @@ import {
 import type { SearchMatch } from './globals'
 
 export function highlighter(str: string): string {
-  return '<span class="search-result-file-matched-text">' + str + '</span>'
+  return `<span class="${highlightClass}">${str}</span>`
 }
 
 export function escapeHTML(html: string): string {