Skip to content

Commit 334a8e0

Browse files
committed
Fix tvOS support
1 parent a0aa210 commit 334a8e0

File tree

2 files changed

+11
-6
lines changed

2 files changed

+11
-6
lines changed

Sources/OctopusKit/Apple API Extensions/OSAgnosticTypeAliases.swift

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,11 @@ public typealias OSClickOrTapGestureRecognizer = UITapGestureRecognizer
4545
public typealias OSPanGestureRecognizer = UIPanGestureRecognizer
4646

4747
public typealias OSMouseOrTouchEventComponent = TouchEventComponent
48-
public typealias OSClickOrTapGestureRecognizerComponent = TapGestureRecognizerComponent
48+
49+
#endif
50+
51+
#if os(iOS)
52+
53+
public typealias OSClickOrTapGestureRecognizerComponent = TapGestureRecognizerComponent // Not available on tvOS
4954

5055
#endif

Sources/OctopusKit/Components/Input/Touch Gestures/PanGestureRecognizerComponent.swift

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,14 @@ public final class PanGestureRecognizerComponent: OctopusGestureRecognizerCompon
3030
super.init()
3131
self.gestureRecognizer.delegate = self
3232

33-
#if canImport(AppKit)
34-
self.compatibleGestureRecognizerTypes = [NSMagnificationGestureRecognizer.self]
35-
#elseif canImport(UIKit)
33+
#if os(iOS)
3634
self.compatibleGestureRecognizerTypes = [UIPinchGestureRecognizer.self]
35+
#elseif os(macOS)
36+
self.compatibleGestureRecognizerTypes = [NSMagnificationGestureRecognizer.self]
3737
#endif
3838
}
3939

40-
#if canImport(UIKit) // MARK: - iOS
40+
#if os(iOS) // MARK: - iOS
4141

4242
/// - NOTE: Unless specified, `maximumNumberOfTouches` will be set equal to `minimumNumberOfTouches`.
4343
public convenience init(minimumNumberOfTouches: Int = 1,
@@ -52,7 +52,7 @@ public final class PanGestureRecognizerComponent: OctopusGestureRecognizerCompon
5252

5353
#endif
5454

55-
#if canImport(AppKit) // MARK: - macOS
55+
#if os(macOS) // MARK: - macOS
5656

5757
public convenience init(buttonMask: Int = 0x1,
5858
numberOfTouchesRequired: Int = 1)

0 commit comments

Comments
 (0)