Skip to content

Commit 76dc7cd

Browse files
davdromandavdroman
committed
WIP
1 parent bcec0d6 commit 76dc7cd

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+726
-726
lines changed

‎Sources/PlatformView.swift

+9-10
Original file line numberDiff line numberDiff line change
@@ -19,38 +19,37 @@ typealias _PlatformViewControllerRepresentable = UIViewControllerRepresentable
1919
typealias _PlatformViewControllerRepresentable = NSViewControllerRepresentable
2020
#endif
2121

22-
@MainActor
2322
protocol PlatformViewControllerRepresentable: _PlatformViewControllerRepresentable {
2423
#if canImport(UIKit)
2524
typealias ViewController = UIViewControllerType
2625
#elseif canImport(AppKit)
2726
typealias ViewController = NSViewControllerType
2827
#endif
2928

30-
@MainActor func makePlatformViewController(context: Context) -> ViewController
31-
@MainActor func updatePlatformViewController(_ controller: ViewController, context: Context)
32-
@MainActor static func dismantlePlatformViewController(_ controller: ViewController, coordinator: Coordinator)
29+
func makePlatformViewController(context: Context) -> ViewController
30+
func updatePlatformViewController(_ controller: ViewController, context: Context)
31+
static func dismantlePlatformViewController(_ controller: ViewController, coordinator: Coordinator)
3332
}
3433

3534
extension PlatformViewControllerRepresentable {
3635
#if canImport(UIKit)
37-
@MainActor func makeUIViewController(context: Context) -> ViewController {
36+
func makeUIViewController(context: Context) -> ViewController {
3837
makePlatformViewController(context: context)
3938
}
40-
@MainActor func updateUIViewController(_ controller: ViewController, context: Context) {
39+
func updateUIViewController(_ controller: ViewController, context: Context) {
4140
updatePlatformViewController(controller, context: context)
4241
}
43-
@MainActor static func dismantleUIViewController(_ controller: ViewController, coordinator: Coordinator) {
42+
static func dismantleUIViewController(_ controller: ViewController, coordinator: Coordinator) {
4443
dismantlePlatformViewController(controller, coordinator: coordinator)
4544
}
4645
#elseif canImport(AppKit)
47-
@MainActor func makeNSViewController(context: Context) -> ViewController {
46+
func makeNSViewController(context: Context) -> ViewController {
4847
makePlatformViewController(context: context)
4948
}
50-
@MainActor func updateNSViewController(_ controller: ViewController, context: Context) {
49+
func updateNSViewController(_ controller: ViewController, context: Context) {
5150
updatePlatformViewController(controller, context: context)
5251
}
53-
@MainActor static func dismantleNSViewController(_ controller: ViewController, coordinator: Coordinator) {
52+
static func dismantleNSViewController(_ controller: ViewController, coordinator: Coordinator) {
5453
dismantlePlatformViewController(controller, coordinator: coordinator)
5554
}
5655
#endif

‎Sources/PlatformViewVersion.swift

+3-2
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ public typealias macOSViewVersion<SwiftUIViewType: IntrospectableViewType, Platf
6262
public typealias visionOSViewVersion<SwiftUIViewType: IntrospectableViewType, PlatformSpecificEntity: PlatformEntity> =
6363
PlatformViewVersion<visionOSVersion, SwiftUIViewType, PlatformSpecificEntity>
6464

65+
@MainActor
6566
public enum PlatformViewVersion<Version: PlatformVersion, SwiftUIViewType: IntrospectableViewType, PlatformSpecificEntity: PlatformEntity>: Sendable {
6667
@_spi(Internals) case available(Version, IntrospectionSelector<PlatformSpecificEntity>?)
6768
@_spi(Internals) case unavailable
@@ -116,11 +117,11 @@ public enum PlatformViewVersion<Version: PlatformVersion, SwiftUIViewType: Intro
116117
// This conformance isn't meant to be used directly by the user,
117118
// it's only to satisfy requirements for forming ranges (e.g. `.v15...`).
118119
extension PlatformViewVersion: Comparable {
119-
public static func == (lhs: Self, rhs: Self) -> Bool {
120+
nonisolated public static func == (lhs: Self, rhs: Self) -> Bool {
120121
true
121122
}
122123

123-
public static func < (lhs: Self, rhs: Self) -> Bool {
124+
nonisolated public static func < (lhs: Self, rhs: Self) -> Bool {
124125
true
125126
}
126127
}

‎Sources/ViewTypes/Button.swift

+6-6
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,12 @@ extension IntrospectableViewType where Self == ButtonType {
3636

3737
#if canImport(AppKit) && !targetEnvironment(macCatalyst)
3838
extension macOSViewVersion<ButtonType, NSButton> {
39-
@MainActor public static let v10_15 = Self(for: .v10_15)
40-
@MainActor public static let v11 = Self(for: .v11)
41-
@MainActor public static let v12 = Self(for: .v12)
42-
@MainActor public static let v13 = Self(for: .v13)
43-
@MainActor public static let v14 = Self(for: .v14)
44-
@MainActor public static let v15 = Self(for: .v15)
39+
public static let v10_15 = Self(for: .v10_15)
40+
public static let v11 = Self(for: .v11)
41+
public static let v12 = Self(for: .v12)
42+
public static let v13 = Self(for: .v13)
43+
public static let v14 = Self(for: .v14)
44+
public static let v15 = Self(for: .v15)
4545
}
4646
#endif
4747
#endif

‎Sources/ViewTypes/ColorPicker.swift

+13-13
Original file line numberDiff line numberDiff line change
@@ -62,28 +62,28 @@ extension IntrospectableViewType where Self == ColorPickerType {
6262
@available(iOS 14, *)
6363
extension iOSViewVersion<ColorPickerType, UIColorWell> {
6464
@available(*, unavailable, message: "ColorPicker isn't available on iOS 13")
65-
@MainActor public static let v13 = Self.unavailable()
66-
@MainActor public static let v14 = Self(for: .v14)
67-
@MainActor public static let v15 = Self(for: .v15)
68-
@MainActor public static let v16 = Self(for: .v16)
69-
@MainActor public static let v17 = Self(for: .v17)
70-
@MainActor public static let v18 = Self(for: .v18)
65+
public static let v13 = Self.unavailable()
66+
public static let v14 = Self(for: .v14)
67+
public static let v15 = Self(for: .v15)
68+
public static let v16 = Self(for: .v16)
69+
public static let v17 = Self(for: .v17)
70+
public static let v18 = Self(for: .v18)
7171
}
7272

7373
@available(iOS 14, *)
7474
extension visionOSViewVersion<ColorPickerType, UIColorWell> {
75-
@MainActor public static let v1 = Self(for: .v1)
75+
public static let v1 = Self(for: .v1)
7676
}
7777
#elseif canImport(AppKit)
7878
@available(macOS 11, *)
7979
extension macOSViewVersion<ColorPickerType, NSColorWell> {
8080
@available(*, unavailable, message: "ColorPicker isn't available on macOS 10.15")
81-
@MainActor public static let v10_15 = Self.unavailable()
82-
@MainActor public static let v11 = Self(for: .v11)
83-
@MainActor public static let v12 = Self(for: .v12)
84-
@MainActor public static let v13 = Self(for: .v13)
85-
@MainActor public static let v14 = Self(for: .v14)
86-
@MainActor public static let v15 = Self(for: .v15)
81+
public static let v10_15 = Self.unavailable()
82+
public static let v11 = Self(for: .v11)
83+
public static let v12 = Self(for: .v12)
84+
public static let v13 = Self(for: .v13)
85+
public static let v14 = Self(for: .v14)
86+
public static let v15 = Self(for: .v15)
8787
}
8888
#endif
8989
#endif

‎Sources/ViewTypes/DatePicker.swift

+14-14
Original file line numberDiff line numberDiff line change
@@ -58,26 +58,26 @@ extension IntrospectableViewType where Self == DatePickerType {
5858

5959
#if canImport(UIKit)
6060
extension iOSViewVersion<DatePickerType, UIDatePicker> {
61-
@MainActor public static let v13 = Self(for: .v13)
62-
@MainActor public static let v14 = Self(for: .v14)
63-
@MainActor public static let v15 = Self(for: .v15)
64-
@MainActor public static let v16 = Self(for: .v16)
65-
@MainActor public static let v17 = Self(for: .v17)
66-
@MainActor public static let v18 = Self(for: .v18)
61+
public static let v13 = Self(for: .v13)
62+
public static let v14 = Self(for: .v14)
63+
public static let v15 = Self(for: .v15)
64+
public static let v16 = Self(for: .v16)
65+
public static let v17 = Self(for: .v17)
66+
public static let v18 = Self(for: .v18)
6767
}
6868

6969
extension visionOSViewVersion<DatePickerType, UIDatePicker> {
70-
@MainActor public static let v1 = Self(for: .v1)
71-
@MainActor public static let v2 = Self(for: .v2)
70+
public static let v1 = Self(for: .v1)
71+
public static let v2 = Self(for: .v2)
7272
}
7373
#elseif canImport(AppKit)
7474
extension macOSViewVersion<DatePickerType, NSDatePicker> {
75-
@MainActor public static let v10_15 = Self(for: .v10_15)
76-
@MainActor public static let v11 = Self(for: .v11)
77-
@MainActor public static let v12 = Self(for: .v12)
78-
@MainActor public static let v13 = Self(for: .v13)
79-
@MainActor public static let v14 = Self(for: .v14)
80-
@MainActor public static let v15 = Self(for: .v15)
75+
public static let v10_15 = Self(for: .v10_15)
76+
public static let v11 = Self(for: .v11)
77+
public static let v12 = Self(for: .v12)
78+
public static let v13 = Self(for: .v13)
79+
public static let v14 = Self(for: .v14)
80+
public static let v15 = Self(for: .v15)
8181
}
8282
#endif
8383
#endif

‎Sources/ViewTypes/DatePickerWithCompactStyle.swift

+15-15
Original file line numberDiff line numberDiff line change
@@ -68,28 +68,28 @@ extension IntrospectableViewType where Self == DatePickerWithCompactStyleType {
6868
#if canImport(UIKit)
6969
extension iOSViewVersion<DatePickerWithCompactStyleType, UIDatePicker> {
7070
@available(*, unavailable, message: ".datePickerStyle(.compact) isn't available on iOS 13")
71-
@MainActor public static let v13 = Self(for: .v13)
72-
@MainActor public static let v14 = Self(for: .v14)
73-
@MainActor public static let v15 = Self(for: .v15)
74-
@MainActor public static let v16 = Self(for: .v16)
75-
@MainActor public static let v17 = Self(for: .v17)
76-
@MainActor public static let v18 = Self(for: .v18)
71+
public static let v13 = Self(for: .v13)
72+
public static let v14 = Self(for: .v14)
73+
public static let v15 = Self(for: .v15)
74+
public static let v16 = Self(for: .v16)
75+
public static let v17 = Self(for: .v17)
76+
public static let v18 = Self(for: .v18)
7777
}
7878

7979
extension visionOSViewVersion<DatePickerWithCompactStyleType, UIDatePicker> {
80-
@MainActor public static let v1 = Self(for: .v1)
81-
@MainActor public static let v2 = Self(for: .v2)
80+
public static let v1 = Self(for: .v1)
81+
public static let v2 = Self(for: .v2)
8282
}
8383
#elseif canImport(AppKit) && !targetEnvironment(macCatalyst)
8484
extension macOSViewVersion<DatePickerWithCompactStyleType, NSDatePicker> {
8585
@available(*, unavailable, message: ".datePickerStyle(.compact) isn't available on macOS 10.15")
86-
@MainActor public static let v10_15 = Self(for: .v10_15)
87-
@MainActor public static let v10_15_4 = Self(for: .v10_15_4)
88-
@MainActor public static let v11 = Self(for: .v11)
89-
@MainActor public static let v12 = Self(for: .v12)
90-
@MainActor public static let v13 = Self(for: .v13)
91-
@MainActor public static let v14 = Self(for: .v14)
92-
@MainActor public static let v15 = Self(for: .v15)
86+
public static let v10_15 = Self(for: .v10_15)
87+
public static let v10_15_4 = Self(for: .v10_15_4)
88+
public static let v11 = Self(for: .v11)
89+
public static let v12 = Self(for: .v12)
90+
public static let v13 = Self(for: .v13)
91+
public static let v14 = Self(for: .v14)
92+
public static let v15 = Self(for: .v15)
9393
}
9494
#endif
9595
#endif

‎Sources/ViewTypes/DatePickerWithFieldStyle.swift

+6-6
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,12 @@ extension IntrospectableViewType where Self == DatePickerWithFieldStyleType {
4343

4444
#if canImport(AppKit) && !targetEnvironment(macCatalyst)
4545
extension macOSViewVersion<DatePickerWithFieldStyleType, NSDatePicker> {
46-
@MainActor public static let v10_15 = Self(for: .v10_15)
47-
@MainActor public static let v11 = Self(for: .v11)
48-
@MainActor public static let v12 = Self(for: .v12)
49-
@MainActor public static let v13 = Self(for: .v13)
50-
@MainActor public static let v14 = Self(for: .v14)
51-
@MainActor public static let v15 = Self(for: .v15)
46+
public static let v10_15 = Self(for: .v10_15)
47+
public static let v11 = Self(for: .v11)
48+
public static let v12 = Self(for: .v12)
49+
public static let v13 = Self(for: .v13)
50+
public static let v14 = Self(for: .v14)
51+
public static let v15 = Self(for: .v15)
5252
}
5353
#endif
5454
#endif

‎Sources/ViewTypes/DatePickerWithGraphicalStyle.swift

+14-14
Original file line numberDiff line numberDiff line change
@@ -68,26 +68,26 @@ extension IntrospectableViewType where Self == DatePickerWithGraphicalStyleType
6868
#if canImport(UIKit)
6969
extension iOSViewVersion<DatePickerWithGraphicalStyleType, UIDatePicker> {
7070
@available(*, unavailable, message: ".datePickerStyle(.graphical) isn't available on iOS 13")
71-
@MainActor public static let v13 = Self(for: .v13)
72-
@MainActor public static let v14 = Self(for: .v14)
73-
@MainActor public static let v15 = Self(for: .v15)
74-
@MainActor public static let v16 = Self(for: .v16)
75-
@MainActor public static let v17 = Self(for: .v17)
76-
@MainActor public static let v18 = Self(for: .v18)
71+
public static let v13 = Self(for: .v13)
72+
public static let v14 = Self(for: .v14)
73+
public static let v15 = Self(for: .v15)
74+
public static let v16 = Self(for: .v16)
75+
public static let v17 = Self(for: .v17)
76+
public static let v18 = Self(for: .v18)
7777
}
7878

7979
extension visionOSViewVersion<DatePickerWithGraphicalStyleType, UIDatePicker> {
80-
@MainActor public static let v1 = Self(for: .v1)
81-
@MainActor public static let v2 = Self(for: .v2)
80+
public static let v1 = Self(for: .v1)
81+
public static let v2 = Self(for: .v2)
8282
}
8383
#elseif canImport(AppKit) && !targetEnvironment(macCatalyst)
8484
extension macOSViewVersion<DatePickerWithGraphicalStyleType, NSDatePicker> {
85-
@MainActor public static let v10_15 = Self(for: .v10_15)
86-
@MainActor public static let v11 = Self(for: .v11)
87-
@MainActor public static let v12 = Self(for: .v12)
88-
@MainActor public static let v13 = Self(for: .v13)
89-
@MainActor public static let v14 = Self(for: .v14)
90-
@MainActor public static let v15 = Self(for: .v15)
85+
public static let v10_15 = Self(for: .v10_15)
86+
public static let v11 = Self(for: .v11)
87+
public static let v12 = Self(for: .v12)
88+
public static let v13 = Self(for: .v13)
89+
public static let v14 = Self(for: .v14)
90+
public static let v15 = Self(for: .v15)
9191
}
9292
#endif
9393
#endif

‎Sources/ViewTypes/DatePickerWithStepperFieldStyle.swift

+6-6
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,12 @@ extension IntrospectableViewType where Self == DatePickerWithStepperFieldStyleTy
4343

4444
#if canImport(AppKit) && !targetEnvironment(macCatalyst)
4545
extension macOSViewVersion<DatePickerWithStepperFieldStyleType, NSDatePicker> {
46-
@MainActor public static let v10_15 = Self(for: .v10_15)
47-
@MainActor public static let v11 = Self(for: .v11)
48-
@MainActor public static let v12 = Self(for: .v12)
49-
@MainActor public static let v13 = Self(for: .v13)
50-
@MainActor public static let v14 = Self(for: .v14)
51-
@MainActor public static let v15 = Self(for: .v15)
46+
public static let v10_15 = Self(for: .v10_15)
47+
public static let v11 = Self(for: .v11)
48+
public static let v12 = Self(for: .v12)
49+
public static let v13 = Self(for: .v13)
50+
public static let v14 = Self(for: .v14)
51+
public static let v15 = Self(for: .v15)
5252
}
5353
#endif
5454
#endif

‎Sources/ViewTypes/DatePickerWithWheelStyle.swift

+8-8
Original file line numberDiff line numberDiff line change
@@ -55,17 +55,17 @@ extension IntrospectableViewType where Self == DatePickerWithWheelStyleType {
5555

5656
#if canImport(UIKit)
5757
extension iOSViewVersion<DatePickerWithWheelStyleType, UIDatePicker> {
58-
@MainActor public static let v13 = Self(for: .v13)
59-
@MainActor public static let v14 = Self(for: .v14)
60-
@MainActor public static let v15 = Self(for: .v15)
61-
@MainActor public static let v16 = Self(for: .v16)
62-
@MainActor public static let v17 = Self(for: .v17)
63-
@MainActor public static let v18 = Self(for: .v18)
58+
public static let v13 = Self(for: .v13)
59+
public static let v14 = Self(for: .v14)
60+
public static let v15 = Self(for: .v15)
61+
public static let v16 = Self(for: .v16)
62+
public static let v17 = Self(for: .v17)
63+
public static let v18 = Self(for: .v18)
6464
}
6565

6666
extension visionOSViewVersion<DatePickerWithWheelStyleType, UIDatePicker> {
67-
@MainActor public static let v1 = Self(for: .v1)
68-
@MainActor public static let v2 = Self(for: .v2)
67+
public static let v1 = Self(for: .v1)
68+
public static let v2 = Self(for: .v2)
6969
}
7070
#endif
7171
#endif

‎Sources/ViewTypes/Form.swift

+14-14
Original file line numberDiff line numberDiff line change
@@ -69,29 +69,29 @@ extension IntrospectableViewType where Self == FormType {
6969

7070
#if canImport(UIKit)
7171
extension iOSViewVersion<FormType, UITableView> {
72-
@MainActor public static let v13 = Self(for: .v13)
73-
@MainActor public static let v14 = Self(for: .v14)
74-
@MainActor public static let v15 = Self(for: .v15)
72+
public static let v13 = Self(for: .v13)
73+
public static let v14 = Self(for: .v14)
74+
public static let v15 = Self(for: .v15)
7575
}
7676

7777
extension iOSViewVersion<FormType, UICollectionView> {
78-
@MainActor public static let v16 = Self(for: .v16)
79-
@MainActor public static let v17 = Self(for: .v17)
80-
@MainActor public static let v18 = Self(for: .v18)
78+
public static let v16 = Self(for: .v16)
79+
public static let v17 = Self(for: .v17)
80+
public static let v18 = Self(for: .v18)
8181
}
8282

8383
extension tvOSViewVersion<FormType, UITableView> {
84-
@MainActor public static let v13 = Self(for: .v13)
85-
@MainActor public static let v14 = Self(for: .v14)
86-
@MainActor public static let v15 = Self(for: .v15)
87-
@MainActor public static let v16 = Self(for: .v16)
88-
@MainActor public static let v17 = Self(for: .v17)
89-
@MainActor public static let v18 = Self(for: .v18)
84+
public static let v13 = Self(for: .v13)
85+
public static let v14 = Self(for: .v14)
86+
public static let v15 = Self(for: .v15)
87+
public static let v16 = Self(for: .v16)
88+
public static let v17 = Self(for: .v17)
89+
public static let v18 = Self(for: .v18)
9090
}
9191

9292
extension visionOSViewVersion<FormType, UICollectionView> {
93-
@MainActor public static let v1 = Self(for: .v1)
94-
@MainActor public static let v2 = Self(for: .v2)
93+
public static let v1 = Self(for: .v1)
94+
public static let v2 = Self(for: .v2)
9595
}
9696
#endif
9797
#endif

0 commit comments

Comments
 (0)