Require CMD for Pack and Unpack shortcuts (#1275)

Author: pianostringquartet

Stitch/App/Shortcut/PatchNodeShortcutKeys.swift

@@ -10,6 +10,7 @@ import SwiftUI
 
 // MARK: PATCH SHORTCUTS
 
+// Require CMD
 let ADD_PACK_NODE_SHORTCUT: KeyEquivalent = "P"
 let ADD_UNPACK_NODE_SHORTCUT: KeyEquivalent = "U"
 
@@ -88,29 +89,35 @@ extension Character {
         }
     }
 
-    func patchFromShortcutKey(isShiftDown: Bool) -> Patch? {
+    func patchFromShortcutKey(isShiftDown: Bool,
+                              isCommandDown: Bool) -> Patch? {
         log("patchFromShortcutKey: isShiftDown: \(isShiftDown)")
+        log("patchFromShortcutKey: isCommandDown: \(isCommandDown)")
 
         let lowercaseCharacter = self.lowercased().toCharacter
 
         if isShiftDown {
             switch lowercaseCharacter {
-                // Always requires shift ?
             case NOT_NODE_SHORTCUT.character.lowercased().toCharacter:
                 return .not
             default:
                 break
             }
         }
 
+        if isCommandDown {
+            switch lowercaseCharacter {
+            case ADD_PACK_NODE_SHORTCUT.character.lowercased().toCharacter:
+                return .sizePack
+            case ADD_UNPACK_NODE_SHORTCUT.character.lowercased().toCharacter:
+                return .sizeUnpack
+            default:
+                break
+            }
+        }
+        
         switch lowercaseCharacter {
 
-        case ADD_PACK_NODE_SHORTCUT.character.lowercased().toCharacter:
-            return .sizePack
-            
-        case ADD_UNPACK_NODE_SHORTCUT.character.lowercased().toCharacter:
-            return .sizeUnpack
-
         case ADD_SPLITTER_NODE_SHORTCUT.character.lowercased().toCharacter:
             return .splitter
 

Stitch/Graph/Node/Patch/Type/Interaction/Keyboard/KeyPressActions.swift

@@ -163,7 +163,9 @@ extension StitchStore {
         // Else: If option is not required for shortcuts, and shortcuts are not disabled, try to treat the keypress as a shortcut.
         else if !self.isOptionRequiredForShortcut,
                 !document.shouldDisablePatchShortcuts,
-                let patch = char.patchFromShortcutKey(isShiftDown: document.keypressState.isShiftPressed) {
+                let patch = char.patchFromShortcutKey(
+                    isShiftDown: document.keypressState.isShiftPressed,
+                    isCommandDown: document.keypressState.isCommandPressed) {
 
             if document.reduxFocusedField?.isInputPortSelected ?? false {
                 document.nodeCreatedWhileInputSelected(patch: patch)