fix: sometimes opens two tabs

will-stone · Jun 10, 2019 · a04350b · a04350b
1 parent 4691c7d
commit a04350b
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "browserosaurus",
   "productName": "Browserosaurus",
-  "version": "5.4.5",
+  "version": "5.4.6",
   "engines": {
     "node": ">=10.4.1"
   },

diff --git a/scripts/notarize.ts b/scripts/notarize.ts
@@ -1,8 +1,10 @@
 import { notarize } from 'electron-notarize'
 
+const projectRoot = require('path').resolve(__dirname, '..')
+
 notarize({
   appBundleId: 'com.browserosaurus',
-  appPath: __dirname + '/out/Browserosaurus-darwin-x64/Browserosaurus.app',
+  appPath: projectRoot + '/out/Browserosaurus-darwin-x64/Browserosaurus.app',
   appleId: String(process.env.APPLE_ID),
   appleIdPassword: `@keychain:AC_PASSWORD`,
   ascProvider: 'Z89KPMLTFR',

diff --git a/src/picker/App.tsx b/src/picker/App.tsx
@@ -115,7 +115,14 @@ const App: React.FC = () => {
 
     ipcRenderer.on(FAV_SET, (_: unknown, name: string) => {
       dispatch(AFavSet({ name }))
-      mousetrap.bind('enter', () => ipcRenderer.send(ACTIVITY_RUN, name))
+      mousetrap.bind('enter', e => {
+        // When a browser has been selected with the mouse, it gets (invisible) focus.
+        // This means when enter is pressed next, it will activate the focused activity AND fire
+        // this key binding, causing two identical tabs to open in the selected browser.
+        // This fixes that.
+        e.preventDefault()
+        ipcRenderer.send(ACTIVITY_RUN, name)
+      })
     })
 
     ipcRenderer.on(