Add more button shortcuts

danielsaidi · Jan 20, 2025 · 546c0ef · 546c0ef
1 parent 0883c18
commit 546c0ef
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 11 deletions.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -4,6 +4,13 @@ SwiftUIKit makes its best effort to honor semver, but breaking changes can occur
 
 
 
+## 5.1.1
+
+### ✨ Features
+
+* `StandardButtonType` adds even more standard button shortcuts.
+
+
 ## 5.1
 
 ### ✨ Features

diff --git a/Sources/SwiftUIKit/Buttons/StandardButtonType.swift b/Sources/SwiftUIKit/Buttons/StandardButtonType.swift
@@ -74,20 +74,18 @@ public extension ButtonType {
     }
 
     #if os(iOS) || os(macOS)
-    var keyboardShortcut: KeyEquivalent? {
+    var keyboardShortcut: (key: KeyEquivalent, modifiers: EventModifiers?)? {
         switch self {
-        case .search: "f"
+        case .add: ("a", .command)
+        case .cancel: (.escape, nil)
+        case .done: (.return, .command)
+        case .edit: ("e", .command)
+        case .search: ("f", .command)
         default: nil
         }
     }
     #endif
 
-    var keyboardShortcutModifier: EventModifiers? {
-        switch self {
-        default: .command
-        }
-    }
-
     var role: ButtonRole? {
         switch self {
         case .cancel: .cancel
@@ -128,10 +126,10 @@ public extension View {
     ) -> some View {
         #if os(iOS) || os(macOS)
         if let shortcut = button.keyboardShortcut {
-            if let modifier = button.keyboardShortcutModifier {
-                self.keyboardShortcut(shortcut, modifiers: modifier)
+            if let modifiers = shortcut.modifiers {
+                self.keyboardShortcut(shortcut.key, modifiers: modifiers)
             } else {
-                self.keyboardShortcut(shortcut)
+                self.keyboardShortcut(shortcut.key)
             }
         } else {
             self