fix refocusing find widget, closes #3252

zadam · Oct 28, 2022 · 521d950 · 521d950
1 parent 64d3ec9
commit 521d950
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 14 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git 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);
-
-        const searchTerm = await this.handler.getInitialSearchTerm();
+        this.handler = await this.getHandler();
 
-        this.$input.val(searchTerm || "");
+        const isAlreadyVisible = this.$findBox.is(":visible");
 
-        // 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();
+            }
         }
     }