Fixing hotkeyManager when the main key is included in general modifie…

…rKeys, see #1621

js/input/Hotkey.ts

@@ -79,6 +79,9 @@ export default class Hotkey extends EnabledComponent {
   public readonly fireOnHoldTiming: HotkeyFireOnHoldTiming;
   public readonly allowOverlap: boolean;
 
+  // All keys that are part of this hotkey (key + modifierKeys)
+  public readonly keys: EnglishKey[];
+
   // A Property that tracks whether the hotkey is currently pressed.
   // Will be true if it meets the following conditions:
   //
@@ -126,6 +129,8 @@ export default class Hotkey extends EnabledComponent {
     this.fireOnHoldTiming = options.fireOnHoldTiming;
     this.allowOverlap = options.allowOverlap;
 
+    this.keys = _.uniq( [ this.key, ...this.modifierKeys ] );
+
     // Create a timer to handle the optional fire-on-hold feature.
     if ( this.fireOnHold && this.fireOnHoldTiming === 'custom' ) {
       this.fireOnHoldTimer = new CallbackTimer( {

js/input/hotkeyManager.ts

@@ -189,14 +189,15 @@ class HotkeyManager {
     }
 
     const compatibleKeys = [ ...this.enabledHotkeysProperty.value ].filter( hotkey => {
+
       // Filter out hotkeys that don't have the main key
       if ( hotkey.key !== mainKey ) {
         return false;
       }
 
       // See whether the modifier keys match
       return this.modifierKeys.every( modifierKey => {
-        return this.englishKeysDown.has( modifierKey ) === hotkey.modifierKeys.includes( modifierKey ) ||
+        return this.englishKeysDown.has( modifierKey ) === hotkey.keys.includes( modifierKey ) ||
                hotkey.ignoredModifierKeys.includes( modifierKey );
       } );
     } );
@@ -215,6 +216,7 @@ class HotkeyManager {
    * there are no conflicts).
    */
   private updateHotkeyStatus( keyboardEvent: KeyboardEvent | null ): void {
+
     // For fireOnDown on/off cases, we only want to fire the hotkeys when we have a keyboard event specifying hotkey's
     // main `key`.
     const pressedOrReleasedKeyCode = KeyboardUtils.getEventCode( keyboardEvent );