electron-findbar 0.3.0 → 0.4.0

package/index.js

@@ -1,5 +1,4 @@
 const { BaseWindow, BrowserWindow, WebContents, BrowserWindowConstructorOptions, Rectangle } = require('electron')
-const path = require('node:path')
 
 class Findbar {
     /** @type {BaseWindow} */
@@ -23,6 +22,9 @@ class Findbar {
     /** @type {string} */
     #lastValue = ''
 
+    /** @type {boolean} */
+    #followParent = process.platform !== 'darwin'
+
     /**
      * Workaround to fix "findInPage" bug - double-click to loop
      * @type {boolean | null}
@@ -60,7 +62,7 @@ class Findbar {
 
         this.#windowHandler && this.#windowHandler(this.#window)
         
-        this.#window.loadFile(path.join(__dirname, 'web', 'findbar.html'))
+        this.#window.loadFile(`${__dirname}/web/findbar.html`)
     }
 
     /**
@@ -154,6 +156,18 @@ class Findbar {
         this.#windowHandler = windowHandler
     }
 
+    /**
+     * Set the findbar to follow the parent window. Default is true.
+     * 
+     * On darwin platform, the findbar follows the parent window by default. This method is set
+     * to false to not create a "move" event listener unnescessarily.
+     * @platform win32,linux
+     * @param {boolean} follow If true, the findbar will follow the parent window movement.
+     */
+    followParentWindow(follow) {
+        this.#followParent = follow
+    }
+
     /**
      * Merge custom, defaults, and fixed options.
      * @param {Electron.BrowserWindowConstructorOptions} options Custom options.
@@ -183,15 +197,28 @@ class Findbar {
      * Register all event listeners.
      */
     #registerListeners() {
+        const followParent = this.#followParent
         const showCascade = () => this.#window.isVisible() || this.#window.show()
         const hideCascade = () => this.#window.isVisible() && this.#window.hide()
+        
+        let lastPos = this.#parent.getPosition()
+        const moveCascade = () => {
+            const newPos = this.#parent.getPosition()
+            const diff = { x: newPos[0] - lastPos[0], y: newPos[1] - lastPos[1] }
+            lastPos = newPos
+
+            const { x, y } = this.#window.getBounds()
+            this.#window.setPosition(x + diff.x, y + diff.y)
+        }
 
         this.#parent.prependListener('show', showCascade)
         this.#parent.prependListener('hide', hideCascade)
+        followParent && this.#parent.prependListener('move', moveCascade)
 
-        this.#window.once('closed', () => {
+        this.#window.once('close', () => {
             this.#parent.off('show', showCascade)
             this.#parent.off('hide', hideCascade)
+            followParent && this.#parent.off('move', moveCascade)
             this.#window = null
             this.stopFind()
         })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "electron-findbar",
-  "version": "0.3.0",
+  "version": "0.4.0",
   "description": "Chrome-like findbar for your Electron app.",
   "main": "index.js",
   "scripts": {