From 8b165ae8d30bfc11b47a91748b2c5408d3d6d470 Mon Sep 17 00:00:00 2001
From: srgooglo <srgooglo@ragestudio.net>
Date: Tue, 15 Mar 2022 03:11:16 +0100
Subject: [PATCH] fix `preventDefault`

---
 packages/app/src/App.jsx                       |  2 ++
 packages/app/src/extensions/shortcuts/index.js | 10 ++++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/packages/app/src/App.jsx b/packages/app/src/App.jsx
index 0050920d..7969acde 100644
--- a/packages/app/src/App.jsx
+++ b/packages/app/src/App.jsx
@@ -286,6 +286,7 @@ class App {
 			window.app.ShortcutsController.register({
 				key: ",",
 				meta: true,
+				preventDefault: true,
 			}, (...args) => {
 				App.publicMethods.openSettings(...args)
 			})
@@ -293,6 +294,7 @@ class App {
 			window.app.ShortcutsController.register({
 				key: ",",
 				ctrl: true,
+				preventDefault: true,
 			}, (...args) => {
 				App.publicMethods.openSettings(...args)
 			})
diff --git a/packages/app/src/extensions/shortcuts/index.js b/packages/app/src/extensions/shortcuts/index.js
index f3814e9f..e1e680ba 100644
--- a/packages/app/src/extensions/shortcuts/index.js
+++ b/packages/app/src/extensions/shortcuts/index.js
@@ -8,8 +8,6 @@ export class ShortcutsController {
             const shortcut = this.shortcuts[key]
 
             if (shortcut) {
-                event.preventDefault()
-
                 if (typeof shortcut.ctrl === "boolean" && event.ctrlKey !== shortcut.ctrl) {
                     return
                 }
@@ -17,14 +15,18 @@ export class ShortcutsController {
                 if (typeof shortcut.shift === "boolean" && event.shiftKey !== shortcut.shift) {
                     return
                 }
-
+                
                 if (typeof shortcut.alt === "boolean" && event.altKey !== shortcut.alt) {
                     return
                 }
-
+                
                 if (typeof shortcut.meta === "boolean" && event.metaKey !== shortcut.meta) {
                     return
                 }
+                
+                if (shortcut.preventDefault) {
+                    event.preventDefault()
+                }
 
                 if (typeof shortcut.fn === "function") {
                     shortcut.fn()