From 05a3ed0e57833397a0f12d203462beb69e686e8e Mon Sep 17 00:00:00 2001
From: Alex Andreev <alex.andreev.email@gmail.com>
Date: Tue, 6 Sep 2022 19:28:01 +0300
Subject: [PATCH] Fix scrolling to items on search

Signed-off-by: Alex Andreev <alex.andreev.email@gmail.com>
---
 src/renderer/components/dock/logs/log-list.tsx | 6 ++++--
 src/renderer/search-store/search-store.ts      | 2 ++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/renderer/components/dock/logs/log-list.tsx b/src/renderer/components/dock/logs/log-list.tsx
index b95d904956..e469bea435 100644
--- a/src/renderer/components/dock/logs/log-list.tsx
+++ b/src/renderer/components/dock/logs/log-list.tsx
@@ -81,8 +81,10 @@ export const LogList = observer(({ model }: LogListProps) => {
   }, [model.logTabData.get()]);
 
   useEffect(() => {
-    rowVirtualizer.scrollToIndex(model.searchStore.occurrences[model.searchStore.activeOverlayIndex], { align: 'end', smoothScroll: false });
-  }, [model.searchStore.activeOverlayIndex])
+    if (!model.searchStore.occurrences.length) return;
+
+    scrollTo(model.searchStore.occurrences[model.searchStore.activeOverlayIndex]);
+  }, [model.searchStore.searchQuery, model.searchStore.activeOverlayIndex])
 
   return (
     <div
diff --git a/src/renderer/search-store/search-store.ts b/src/renderer/search-store/search-store.ts
index aa5b74dc97..8d9594dc2a 100644
--- a/src/renderer/search-store/search-store.ts
+++ b/src/renderer/search-store/search-store.ts
@@ -123,6 +123,8 @@ export class SearchStore {
    * @returns A line index within the text/logs array
    */
   @computed get activeOverlayLine(): number {
+    if (!this.occurrences.length) return -1;
+
     return this.occurrences[this.activeOverlayIndex];
   }