From 521d95021b4c7b355c3850daa0b1e909bf5ed3b9 Mon Sep 17 00:00:00 2001
From: zadam <zadam.apps@gmail.com>
Date: Fri, 28 Oct 2022 20:05:53 +0200
Subject: [PATCH] fix refocusing find widget, closes #3252

---
 package-lock.json              |  4 ++--
 src/public/app/widgets/find.js | 25 +++++++++++++------------
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index b197bd93c..2f3024b08 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "trilium",
-  "version": "0.56.1",
+  "version": "0.56.2",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "trilium",
-      "version": "0.56.1",
+      "version": "0.56.2",
       "hasInstallScript": true,
       "license": "AGPL-3.0-only",
       "dependencies": {
diff --git a/src/public/app/widgets/find.js b/src/public/app/widgets/find.js
index f165c3e5f..70116d0cb 100644
--- a/src/public/app/widgets/find.js
+++ b/src/public/app/widgets/find.js
@@ -142,26 +142,27 @@ export default class FindWidget extends NoteContextAwareWidget {
             return;
         }
 
-        if (!['text', 'code', 'render'].includes(this.note.type) || !this.$findBox.is(":hidden")) {
+        if (!['text', 'code', 'render'].includes(this.note.type)) {
             return;
         }
 
-        this.handler = await this.getHandler();
-
         this.$findBox.show();
         this.$input.focus();
-        this.$totalFound.text(0);
-        this.$currentFound.text(0);
+        this.handler = await this.getHandler();
 
-        const searchTerm = await this.handler.getInitialSearchTerm();
+        const isAlreadyVisible = this.$findBox.is(":visible");
 
-        this.$input.val(searchTerm || "");
-
-        // Directly perform the search if there's some text to
-        // find, without delaying or waiting for enter
-        if (searchTerm !== "") {
+        if (isAlreadyVisible) {
             this.$input.select();
-            await this.performFind();
+        } else {
+            this.$totalFound.text(0);
+            this.$currentFound.text(0);
+            const searchTerm = await this.handler.getInitialSearchTerm();
+            this.$input.val(searchTerm || "");
+            if (searchTerm !== "") {
+                this.$input.select();
+                await this.performFind();
+            }
         }
     }