fix: correct mod, meta and ctrl match

Author: PhoSor

main.ts

@@ -64,20 +64,21 @@ export default class EditorScrollCommandsPlugin extends Plugin {
 
   isScrollHotkeyEvent(event: KeyboardEvent, hotkeys: Hotkey[]) {
     return hotkeys?.some((hotkey: Hotkey) => {
-      let keyMatched =
-        (hotkey.key == event.code) ||
-        ('Key' + hotkey.key == event.code);
-
-      if (!keyMatched) { return false; }
+      if ((hotkey.key != event.code) &&
+        ('Key' + hotkey.key != event.code)) { return false; }
 
       let mods = hotkey.modifiers;
-      let modKeyState = Platform.isMacOS ? event.metaKey : event.ctrlKey;
 
       if (event.altKey != mods.contains('Alt')) { return false; }
-      if (event.ctrlKey != mods.contains('Ctrl')) { return false; }
       if (event.shiftKey != mods.contains('Shift')) { return false; }
-      if (event.metaKey != mods.contains('Meta')) { return false; }
-      if (modKeyState != mods.contains('Mod')) { return false; }
+
+      if (Platform.isMacOS) {
+        if (event.metaKey != (mods.contains('Mod') || mods.contains('Meta')))
+          { return false; }
+      } else {
+        if (event.ctrlKey != (mods.contains('Mod') || mods.contains('Ctrl')))
+          { return false; }
+      }
 
       return true;
     });

manifest.json

@@ -1,7 +1,7 @@
 {
 	"id": "editor-scroll-commands",
 	"name": "Editor Scroll Commands",
-	"version": "1.1.2",
+	"version": "1.1.3",
 	"minAppVersion": "0.15.0",
 	"description": "Add scroll commands for editor, so you can assign hotkeys.",
 	"author": "Andrey Sorokin <[email protected]>",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "editor-scroll-commands",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "description": "Add scroll commands for editor, so you can assign hotkeys.",
   "main": "main.js",
   "scripts": {

versions.json

@@ -3,5 +3,6 @@
 	"1.0.3": "0.15.0",
 	"1.1.0": "0.15.0",
 	"1.1.1": "0.15.0",
-	"1.1.2": "0.15.0"
+	"1.1.2": "0.15.0",
+	"1.1.3": "0.15.0"
 }