Merge branch 'main' into main

Author: chocoford

Example/KeyboardShortcutsExample/MainScreen.swift

@@ -57,11 +57,16 @@ private struct DynamicShortcut: View {
 				Divider()
 				DynamicShortcutRecorder(name: $shortcut.name, isPressed: $isPressed)
 			}
+			Divider()
+				.padding(.vertical)
+			Button("Reset All") {
+				KeyboardShortcuts.resetAll()
+			}
 		}
 		.frame(maxWidth: 300)
 		.padding()
 		.padding(.bottom, 20)
-		.onChange(of: shortcut) { oldValue, newValue in
+		.onChange(of: shortcut, initial: true) { oldValue, newValue in
 			onShortcutChange(oldValue: oldValue, newValue: newValue)
 		}
 	}
@@ -98,9 +103,6 @@ private struct DoubleShortcut: View {
 					.offset(x: 90)
 			}
 			Spacer()
-			Button("Reset All") {
-				KeyboardShortcuts.reset(.testShortcut1, .testShortcut2)
-			}
 		}
 		.offset(x: -40)
 		.frame(maxWidth: 300)

Example/KeyboardShortcutsExample/Utilities.swift

@@ -1,6 +1,5 @@
 import SwiftUI
 
-
 @MainActor
 final class CallbackMenuItem: NSMenuItem {
 	private static var validateCallback: ((NSMenuItem) -> Bool)?
@@ -50,7 +49,6 @@ extension CallbackMenuItem: NSMenuItemValidation {
 	}
 }
 
-
 extension NSMenuItem {
 	convenience init(
 		_ title: String,
@@ -81,7 +79,6 @@ extension NSMenuItem {
 	}
 }
 
-
 extension NSMenu {
 	@MainActor
 	@discardableResult

Sources/KeyboardShortcuts/KeyboardShortcuts.swift

@@ -58,6 +58,19 @@ public enum KeyboardShortcuts {
 		}
 	}
 
+	static var allNames: Set<Name> {
+		UserDefaults.standard.dictionaryRepresentation()
+			.compactMap { key, _ in
+				guard key.hasPrefix(userDefaultsPrefix) else {
+					return nil
+				}
+
+				let name = key.replacingPrefix(userDefaultsPrefix, with: "")
+				return .init(name)
+			}
+			.toSet()
+	}
+
 	/**
 	Enable keyboard shortcuts to work even when an `NSMenu` is open by setting this property when the menu opens and closes.
 
@@ -225,11 +238,8 @@ public enum KeyboardShortcuts {
 		var body: some View {
 			VStack {
 				// …
-				Button("Reset All") {
-					KeyboardShortcuts.reset(
-						.toggleUnicornMode,
-						.showRainbow
-					)
+				Button("Reset") {
+					KeyboardShortcuts.reset(.toggleUnicornMode)
 				}
 			}
 		}
@@ -255,11 +265,8 @@ public enum KeyboardShortcuts {
 		var body: some View {
 			VStack {
 				// …
-				Button("Reset All") {
-					KeyboardShortcuts.reset(
-						.toggleUnicornMode,
-						.showRainbow
-					)
+				Button("Reset") {
+					KeyboardShortcuts.reset(.toggleUnicornMode)
 				}
 			}
 		}
@@ -270,6 +277,31 @@ public enum KeyboardShortcuts {
 		reset(names)
 	}
 
+	/**
+	Reset the keyboard shortcut for all the names.
+
+	Unlike `reset(…)`, this resets all the shortcuts to `nil`, not the `defaultValue`.
+
+	```swift
+	import SwiftUI
+	import KeyboardShortcuts
+
+	struct SettingsScreen: View {
+		var body: some View {
+			VStack {
+				// …
+				Button("Reset All") {
+					KeyboardShortcuts.resetAll()
+				}
+			}
+		}
+	}
+	```
+	*/
+	public static func resetAll() {
+		reset(allNames.toArray())
+	}
+
 	/**
 	Set the keyboard shortcut for a name.
 

Sources/KeyboardShortcuts/Localization/zh-Hans.lproj/Localizable.strings

@@ -1,9 +1,9 @@
 "record_shortcut" = "设置快捷键";
 "press_shortcut" = "按下快捷键";
-"keyboard_shortcut_used_by_menu_item" = "当前快捷键无法使用，因为它已被用作菜单项 “%@” 的快捷键。";
+"keyboard_shortcut_used_by_menu_item" = "当前快捷键无法使用，因为它已被用作菜单项“%@”的快捷键。";
 "keyboard_shortcut_used_by_system" = "当前快捷键无法使用，因为它已被用作系统快捷键。";
-"keyboard_shortcuts_can_be_changed" = "可以在 “系统设置 › 键盘 › 键盘快捷键” 中更改大多数系统快捷键。";
-"keyboard_shortcut_disallowed" = "Option 修飾鍵必須與 Command 或 Control 組合使用。";
+"keyboard_shortcuts_can_be_changed" = "可以在“系统设置 › 键盘 › 键盘快捷键”中更改大多数系统快捷键。";
+"keyboard_shortcut_disallowed" = "Option键必须与Command键或Control键组合使用。";
 "force_use_shortcut" = "强制使用";
 "ok" = "好";
 "space_key" = "空格";

Sources/KeyboardShortcuts/Localization/zh-TW.lproj/Localizable.strings

@@ -3,7 +3,7 @@
 "keyboard_shortcut_used_by_menu_item" = "此快速鍵無法使用，因為它已被選單項目「%@」使用。";
 "keyboard_shortcut_used_by_system" = "此快速鍵無法使用，因為它已被系統使用。";
 "keyboard_shortcuts_can_be_changed" = "可以在「系統設定 › 鍵盤 › 鍵盤快速鍵」中更改大多數的系統快速鍵。";
-"keyboard_shortcut_disallowed" = "Option 鍵必須與 Command 或 Control 鍵組合使用。";
+"keyboard_shortcut_disallowed" = "Option鍵必須與Command鍵或Control鍵組合使用。";
 "force_use_shortcut" = "強制使用";
 "ok" = "好";
 "space_key" = "空格";

Sources/KeyboardShortcuts/NSMenuItem++.swift

@@ -96,7 +96,7 @@ extension NSMenuItem {
 			return
 		}
 
-		keyEquivalent = shortcut.keyEquivalent
+		keyEquivalent = shortcut.keyEquivalent ?? ""
 		keyEquivalentModifierMask = shortcut.modifiers
 
 		if #available(macOS 12, *) {

Sources/KeyboardShortcuts/RecorderCocoa.swift

@@ -264,7 +264,7 @@ extension KeyboardShortcuts {
 
 				// The “shift” key is not allowed without other modifiers or a function key, since it doesn't actually work.
 				guard
-					!event.modifiers.subtracting(.shift).isEmpty
+					!event.modifiers.subtracting([.shift, .function]).isEmpty
 						|| event.specialKey?.isFunctionKey == true,
 					let shortcut = Shortcut(event: event)
 				else {