From 7c428526087a49dee9819026c883dbd634c86b4e Mon Sep 17 00:00:00 2001 From: Seungwoo Choe Date: Sun, 19 Nov 2023 15:22:03 +0100 Subject: [PATCH] Make iOS and iPadOS previews for multiplatform apps work --- Sources/KeyboardShortcuts/CarbonKeyboardShortcuts.swift | 2 ++ Sources/KeyboardShortcuts/Key.swift | 2 ++ Sources/KeyboardShortcuts/KeyboardShortcuts.swift | 2 ++ Sources/KeyboardShortcuts/NSMenuItem++.swift | 2 ++ Sources/KeyboardShortcuts/Name.swift | 2 ++ Sources/KeyboardShortcuts/Recorder.swift | 2 ++ Sources/KeyboardShortcuts/RecorderCocoa.swift | 2 ++ Sources/KeyboardShortcuts/Shortcut.swift | 2 ++ Sources/KeyboardShortcuts/Utilities.swift | 2 ++ Sources/KeyboardShortcuts/ViewModifiers.swift | 2 ++ 10 files changed, 20 insertions(+) diff --git a/Sources/KeyboardShortcuts/CarbonKeyboardShortcuts.swift b/Sources/KeyboardShortcuts/CarbonKeyboardShortcuts.swift index 3d8dc4b8..52edf71e 100644 --- a/Sources/KeyboardShortcuts/CarbonKeyboardShortcuts.swift +++ b/Sources/KeyboardShortcuts/CarbonKeyboardShortcuts.swift @@ -1,3 +1,4 @@ +#if os(macOS) import Carbon.HIToolbox private func carbonKeyboardShortcutsEventHandler(eventHandlerCall: EventHandlerCallRef?, event: EventRef?, userData: UnsafeMutableRawPointer?) -> OSStatus { @@ -345,3 +346,4 @@ extension CarbonKeyboardShortcuts { } } } +#endif diff --git a/Sources/KeyboardShortcuts/Key.swift b/Sources/KeyboardShortcuts/Key.swift index d4666836..27c35402 100644 --- a/Sources/KeyboardShortcuts/Key.swift +++ b/Sources/KeyboardShortcuts/Key.swift @@ -1,3 +1,4 @@ +#if os(macOS) import Carbon.HIToolbox extension KeyboardShortcuts { @@ -192,3 +193,4 @@ extension KeyboardShortcuts.Key { */ var isFunctionKey: Bool { Self.functionKeys.contains(self) } } +#endif diff --git a/Sources/KeyboardShortcuts/KeyboardShortcuts.swift b/Sources/KeyboardShortcuts/KeyboardShortcuts.swift index 02e5b3e4..06e6e142 100644 --- a/Sources/KeyboardShortcuts/KeyboardShortcuts.swift +++ b/Sources/KeyboardShortcuts/KeyboardShortcuts.swift @@ -1,3 +1,4 @@ +#if os(macOS) import AppKit.NSMenu /** @@ -589,3 +590,4 @@ extension KeyboardShortcuts { extension Notification.Name { static let shortcutByNameDidChange = Self("KeyboardShortcuts_shortcutByNameDidChange") } +#endif diff --git a/Sources/KeyboardShortcuts/NSMenuItem++.swift b/Sources/KeyboardShortcuts/NSMenuItem++.swift index c45aa8c8..79afbd8a 100644 --- a/Sources/KeyboardShortcuts/NSMenuItem++.swift +++ b/Sources/KeyboardShortcuts/NSMenuItem++.swift @@ -1,3 +1,4 @@ +#if os(macOS) import AppKit extension NSMenuItem { @@ -107,3 +108,4 @@ extension NSMenuItem { } } } +#endif diff --git a/Sources/KeyboardShortcuts/Name.swift b/Sources/KeyboardShortcuts/Name.swift index a36fd971..d0e5eac2 100644 --- a/Sources/KeyboardShortcuts/Name.swift +++ b/Sources/KeyboardShortcuts/Name.swift @@ -1,3 +1,4 @@ +#if os(macOS) extension KeyboardShortcuts { /** The strongly-typed name of the keyboard shortcut. @@ -56,3 +57,4 @@ extension KeyboardShortcuts.Name: RawRepresentable { self.init(rawValue) } } +#endif diff --git a/Sources/KeyboardShortcuts/Recorder.swift b/Sources/KeyboardShortcuts/Recorder.swift index 189a3c1a..5e2f71a8 100644 --- a/Sources/KeyboardShortcuts/Recorder.swift +++ b/Sources/KeyboardShortcuts/Recorder.swift @@ -1,3 +1,4 @@ +#if os(macOS) import SwiftUI @available(macOS 10.15, *) @@ -164,3 +165,4 @@ extension KeyboardShortcuts.Recorder { KeyboardShortcuts.Recorder(for: .init("xcodePreview")) .environment(\.locale, .init(identifier: "ru")) } +#endif diff --git a/Sources/KeyboardShortcuts/RecorderCocoa.swift b/Sources/KeyboardShortcuts/RecorderCocoa.swift index 920bb758..79353390 100644 --- a/Sources/KeyboardShortcuts/RecorderCocoa.swift +++ b/Sources/KeyboardShortcuts/RecorderCocoa.swift @@ -1,3 +1,4 @@ +#if os(macOS) import AppKit import Carbon.HIToolbox @@ -323,3 +324,4 @@ extension KeyboardShortcuts { } } } +#endif diff --git a/Sources/KeyboardShortcuts/Shortcut.swift b/Sources/KeyboardShortcuts/Shortcut.swift index a0c4b072..92f4568b 100644 --- a/Sources/KeyboardShortcuts/Shortcut.swift +++ b/Sources/KeyboardShortcuts/Shortcut.swift @@ -1,3 +1,4 @@ +#if os(macOS) import AppKit import Carbon.HIToolbox @@ -324,3 +325,4 @@ extension KeyboardShortcuts.Shortcut: CustomStringConvertible { modifiers.description + (keyToCharacter()?.capitalized ?? "�") } } +#endif diff --git a/Sources/KeyboardShortcuts/Utilities.swift b/Sources/KeyboardShortcuts/Utilities.swift index 083ded37..c12908e1 100644 --- a/Sources/KeyboardShortcuts/Utilities.swift +++ b/Sources/KeyboardShortcuts/Utilities.swift @@ -1,3 +1,4 @@ +#if os(macOS) import Carbon.HIToolbox import SwiftUI @@ -470,3 +471,4 @@ extension View { .alignmentGuide(.leading) { $0[.controlAlignment] } } } +#endif diff --git a/Sources/KeyboardShortcuts/ViewModifiers.swift b/Sources/KeyboardShortcuts/ViewModifiers.swift index b4017713..589e2cb9 100644 --- a/Sources/KeyboardShortcuts/ViewModifiers.swift +++ b/Sources/KeyboardShortcuts/ViewModifiers.swift @@ -1,3 +1,4 @@ +#if os(macOS) import SwiftUI @available(macOS 12, *) @@ -38,3 +39,4 @@ extension View { } } } +#endif