From 37cb5f5e9acd8b4bd666b013705c863a72f02b68 Mon Sep 17 00:00:00 2001
From: zadam <zadam.apps@gmail.com>
Date: Wed, 25 May 2022 20:43:52 +0200
Subject: [PATCH] added previous/next buttons to the find widget

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

diff --git a/package-lock.json b/package-lock.json
index 0301aa51e..6424b4f78 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -73,7 +73,7 @@
       },
       "devDependencies": {
         "cross-env": "7.0.3",
-        "electron": "16.2.7",
+        "electron": "16.2.8",
         "electron-builder": "23.0.3",
         "electron-packager": "15.5.1",
         "electron-rebuild": "3.2.7",
@@ -3506,9 +3506,9 @@
       }
     },
     "node_modules/electron": {
-      "version": "16.2.7",
-      "resolved": "https://registry.npmjs.org/electron/-/electron-16.2.7.tgz",
-      "integrity": "sha512-aZKF3b00+rqW/HGs8lJM5DhPNj+mOfCuhLSiFXV6J9dQCIRhctJTmToOrwXfbCxvXK8as8eQTNl5uSfnHmH6tA==",
+      "version": "16.2.8",
+      "resolved": "https://registry.npmjs.org/electron/-/electron-16.2.8.tgz",
+      "integrity": "sha512-KSOytY6SPLsh3iCziztqa/WgJyfDOKzCvNqku9gGIqSdT8CqtV66dTU1SOrKZQjRFLxHaF8LbyxUL1vwe4taqw==",
       "hasInstallScript": true,
       "dependencies": {
         "@electron/get": "^1.13.0",
@@ -13575,9 +13575,9 @@
       }
     },
     "electron": {
-      "version": "16.2.7",
-      "resolved": "https://registry.npmjs.org/electron/-/electron-16.2.7.tgz",
-      "integrity": "sha512-aZKF3b00+rqW/HGs8lJM5DhPNj+mOfCuhLSiFXV6J9dQCIRhctJTmToOrwXfbCxvXK8as8eQTNl5uSfnHmH6tA==",
+      "version": "16.2.8",
+      "resolved": "https://registry.npmjs.org/electron/-/electron-16.2.8.tgz",
+      "integrity": "sha512-KSOytY6SPLsh3iCziztqa/WgJyfDOKzCvNqku9gGIqSdT8CqtV66dTU1SOrKZQjRFLxHaF8LbyxUL1vwe4taqw==",
       "requires": {
         "@electron/get": "^1.13.0",
         "@types/node": "^14.6.2",
diff --git a/package.json b/package.json
index ed817a939..5bf807d9d 100644
--- a/package.json
+++ b/package.json
@@ -85,7 +85,7 @@
   },
   "devDependencies": {
     "cross-env": "7.0.3",
-    "electron": "16.2.7",
+    "electron": "16.2.8",
     "electron-builder": "23.0.3",
     "electron-packager": "15.5.1",
     "electron-rebuild": "3.2.7",
diff --git a/src/public/app/widgets/find.js b/src/public/app/widgets/find.js
index 9e0590ce9..c95db043c 100644
--- a/src/public/app/widgets/find.js
+++ b/src/public/app/widgets/find.js
@@ -34,8 +34,8 @@ const TPL = `
             font-weight: bold;
         }
         
-        .find-widget-search-term-input {
-            max-width: 250px;
+        .find-widget-search-term-input-group {
+            max-width: 300px;
         }
         
         .find-widget-spacer {
@@ -44,7 +44,13 @@ const TPL = `
     </style>
 
     <div class="find-widget-box">
-        <input type="text" class="form-control find-widget-search-term-input">
+        <div class="input-group find-widget-search-term-input-group">
+            <input type="text" class="form-control find-widget-search-term-input">
+            <div class="input-group-append">
+                <button class="btn btn-outline-secondary bx bxs-chevron-up find-widget-previous-button" type="button"></button>
+                <button class="btn btn-outline-secondary bx bxs-chevron-down find-widget-next-button" type="button"></button>
+            </div>
+        </div>
         
         <div class="form-check">
             <label tabIndex="-1" class="form-check-label">
@@ -93,6 +99,10 @@ export default class FindWidget extends NoteContextAwareWidget {
         this.$caseSensitiveCheckbox.change(() => this.performFind());
         this.$matchWordsCheckbox = this.$widget.find(".find-widget-match-words-checkbox");
         this.$matchWordsCheckbox.change(() => this.performFind());
+        this.$previousButton = this.$widget.find(".find-widget-previous-button");
+        this.$previousButton.on("click", () => this.findNext(-1));
+        this.$nextButton = this.$widget.find(".find-widget-next-button");
+        this.$nextButton.on("click", () => this.findNext(1));
         this.$closeButton = this.$widget.find(".find-widget-close-button");
         this.$closeButton.on("click", () => this.closeSearch());
 
@@ -102,7 +112,7 @@ export default class FindWidget extends NoteContextAwareWidget {
                 // whole input to find
                 this.$input.select();
             } else if (e.key === 'Enter' || e.key === 'F3') {
-                await this.findNext(e);
+                await this.findNext(e?.shiftKey ? -1 : 1);
                 e.preventDefault();
                 return false;
             } else if (e.key === 'Escape') {
@@ -135,7 +145,11 @@ export default class FindWidget extends NoteContextAwareWidget {
         }
     }
 
-    async findNext(e) {
+    /**
+     * @param direction +1 for next, -1 for previous
+     * @returns {Promise<void>}
+     */
+    async findNext(direction) {
         const searchTerm = this.$input.val();
         if (waitForEnter && this.searchTerm !== searchTerm) {
             await this.performFind();
@@ -144,7 +158,6 @@ export default class FindWidget extends NoteContextAwareWidget {
         const currentFound = parseInt(this.$currentFound.text()) - 1;
 
         if (totalFound > 0) {
-            const direction = e.shiftKey ? -1 : 1;
             let nextFound = currentFound + direction;
             // Wrap around
             if (nextFound > totalFound - 1) {