Add new view extension

Use solution from sindresorhus#101 (comment)

The old solution creates thousands associatedShortcut, it isn't good

Sources/KeyboardShortcuts/Shortcut.swift

@@ -359,8 +359,72 @@ extension View {
 
 }
 
+@available(macOS 11.0, *)
+extension KeyboardShortcuts.Shortcut {
+ func toKeyEquivalent() -> KeyEquivalent? {
+ let carbonKeyCode = UInt16(self.carbonKeyCode)
+ let maxNameLength = 4
+ var nameBuffer = [UniChar](repeating: 0, count : maxNameLength)
+ var nameLength = 0
+
+ let modifierKeys = UInt32(alphaLock >> 8) & 0xFF // Caps Lock
+ var deadKeys: UInt32 = 0
+ let keyboardType = UInt32(LMGetKbdType())
+
+ let source = TISCopyCurrentKeyboardLayoutInputSource().takeRetainedValue()
+ guard let ptr = TISGetInputSourceProperty(source, kTISPropertyUnicodeKeyLayoutData) else {
+ NSLog("Could not get keyboard layout data")
+ return nil
+ }
+ let layoutData = Unmanaged<CFData>.fromOpaque(ptr).takeUnretainedValue() as Data
+ let osStatus = layoutData.withUnsafeBytes {
+ UCKeyTranslate($0.bindMemory(to: UCKeyboardLayout.self).baseAddress, carbonKeyCode, UInt16(kUCKeyActionDown),
+ modifierKeys, keyboardType, UInt32(kUCKeyTranslateNoDeadKeysMask),
+ &deadKeys, maxNameLength, &nameLength, &nameBuffer)
+ }
+ guard osStatus == noErr else {
+ NSLog("Code: 0x%04X Status: %+i", carbonKeyCode, osStatus);
+ return nil
+ }
+
+ return KeyEquivalent(Character(String(utf16CodeUnits: nameBuffer, count: nameLength)))
+ }
+
+ func toEventModifiers() -> SwiftUI.EventModifiers {
+ var modifiers: SwiftUI.EventModifiers = []
+
+ if self.modifiers.contains(NSEvent.ModifierFlags.command) {
+ modifiers.update(with: EventModifiers.command)
+ }
+
+ if self.modifiers.contains(NSEvent.ModifierFlags.control) {
+ modifiers.update(with: EventModifiers.control)
+ }
+
+ if self.modifiers.contains(NSEvent.ModifierFlags.option) {
+ modifiers.update(with: EventModifiers.option)
+ }
+
+ if self.modifiers.contains(NSEvent.ModifierFlags.shift) {
+ modifiers.update(with: EventModifiers.shift)
+ }
+
+ if self.modifiers.contains(NSEvent.ModifierFlags.capsLock) {
+ modifiers.update(with: EventModifiers.capsLock)
+ }
+
+ if self.modifiers.contains(NSEvent.ModifierFlags.numericPad) {
+ modifiers.update(with: EventModifiers.numericPad)
+ }
+
+ return modifiers
+ }
+
+}
+
 // MARK: - SwiftUI ShortcutViewModifier
 
+@available(*, deprecated, message: "Deprecated because associatedShortcut is created thousands times in the project")
 @available(iOS 14.0, macOS 12.0, *)
 struct ShortcutViewModifier: ViewModifier {
  class AssociatedShortcut: ObservableObject {

Sources/KeyboardShortcuts/ViewModifiers.swift

@@ -42,4 +42,13 @@ extension View {
  public func keyboardShortcut(for name: KeyboardShortcuts.Name) -> some View {
  modifier(ShortcutViewModifier(for: name))
  }
+
+ public func onKeyboardShortcut(for name: KeyboardShortcuts.Name) -> some View {
+ if let shortcut = name.shortcut {
+ if let keyEquivalent = shortcut.toKeyEquivalent() {
+ return AnyView(self.keyboardShortcut(keyEquivalent, modifiers: shortcut.toEventModifiers()))
+ }
+ }
+ return AnyView(self)
+ }
 }