fix: check exact mods match

Author: PhoSor

main.ts

@@ -13,21 +13,13 @@ interface EditorScrollCommandsSettings {
 }
 
 const DEFAULT_SETTINGS: EditorScrollCommandsSettings = {
-  offset: 2,
-  interval: 5,
+  offset: 4,
+  interval: 6,
   accelerate: true,
-  accelRate: 0.024,
-  maxAccel: 4,
+  accelRate: 0.02,
+  maxAccel: 8,
 }
 
-const MODIFIER_TO_EVENT_PROP = {
-  'Alt': 'altKey',
-  'Shift': 'shiftKey',
-  'Ctrl': 'ctrlKey',
-  'Meta': 'metaKey',
-  'Mod': Platform.isMacOS ? 'metaKey' : 'ctrlKey',
-};
-
 export default class EditorScrollCommandsPlugin extends Plugin {
   settings: EditorScrollCommandsSettings;
   intervalId: number;
@@ -76,14 +68,18 @@ export default class EditorScrollCommandsPlugin extends Plugin {
         (hotkey.key == event.code) ||
         ('Key' + hotkey.key == event.code);
 
-      let allModsMatched = hotkey.modifiers.every(m => {
-        let modifierPressed = MODIFIER_TO_EVENT_PROP[m];
+      if (!keyMatched) { return false; }
 
-        // @ts-expect-error
-        return event[modifierPressed];
-      });
+      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; }
 
-      return keyMatched && allModsMatched;
+      return true;
     });
   }
 

manifest.json

@@ -1,7 +1,7 @@
 {
 	"id": "editor-scroll-commands",
 	"name": "Editor Scroll Commands",
-	"version": "1.1.1",
+	"version": "1.1.2",
 	"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.1",
+  "version": "1.1.2",
   "description": "Add scroll commands for editor, so you can assign hotkeys.",
   "main": "main.js",
   "scripts": {

versions.json

@@ -2,5 +2,6 @@
 	"1.0.0": "0.15.0",
 	"1.0.3": "0.15.0",
 	"1.1.0": "0.15.0",
-	"1.1.1": "0.15.0"
+	"1.1.1": "0.15.0",
+	"1.1.2": "0.15.0"
 }