Merge branch 'main' into patch-1

Author: davdroman

.github/workflows/ci.yml

@@ -25,7 +25,7 @@ jobs:
           fetch-depth: 0 # required to be able to find Git tags
 
       - name: Select Xcode version
-        run: sudo xcodes select 16.2
+        run: sudo xcodes select 16.4
 
       - name: Lint Podspec
         run: |

Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version:5.7
+// swift-tools-version:6.0
 
 import PackageDescription
 
@@ -21,3 +21,11 @@ let package = Package(
         ),
     ]
 )
+
+for target in package.targets {
+    target.swiftSettings = target.swiftSettings ?? []
+    target.swiftSettings? += [
+        .enableUpcomingFeature("ExistentialAny"),
+        .enableUpcomingFeature("InternalImportsByDefault"),
+    ]
+}

[email protected]

@@ -1,5 +1,5 @@
 #if !os(watchOS)
-import SwiftUI
+public import SwiftUI
 
 /// The scope of introspection i.e. where introspect should look to find
 /// the desired target view relative to the applied `.introspect(...)`
@@ -26,6 +26,14 @@ extension View {
     ///   - scope: Optionally overrides the view's default scope of introspection.
     ///   - customize: A closure that hands over the underlying UIKit/AppKit instance ready for customization.
     ///
+    ///     Note there is no guarantee of one-time execution for this closure. As `customize` may fire multiple times,
+    ///     make sure to guard against repeated or heavy work in your closure by keeping track of its completeness.
+    ///
+    ///     Additionally, note mutating SwiftUI state within `customize` will trigger runtime warnings unless that mutation
+    ///     is wrapped in a `DispatchQueue.main.async { ... }` call. This is because introspect attempts to hand you
+    ///     the requested view as soon as possible, and this might mean SwiftUI isn't ready for state mutations at that
+    ///     particular moment.
+    ///
     /// Here's an example usage:
     ///
     /// ```swift

Sources/Introspect.swift

@@ -121,15 +121,6 @@ struct IntrospectionView<Target: PlatformEntity>: PlatformViewControllerRepresen
             customize(target)
             controller.handler = nil
         }
-
-        // - Workaround -
-        // iOS/tvOS 13 sometimes need a nudge on the next run loop.
-        if #available(iOS 14, tvOS 14, *) {} else {
-            DispatchQueue.main.async { [weak controller] in
-                controller?.handler?()
-            }
-        }
-
         return controller
     }
 
@@ -159,7 +150,13 @@ final class IntrospectionPlatformViewController: PlatformViewController {
             guard let self else {
                 return
             }
-            handler?(self)
+
+            // NB: .introspect makes no guarantees about the number of times its callback is invoked,
+            // so the below is fair play to maximize compatibility and predictability
+            handler?(self) // we call this eagerly as most customization can successfully happen without a thread hop
+            DispatchQueue.main.async {
+                handler?(self) // we also thread hop to cover the rest of the cases where the underlying UI component isn't quite ready for customization
+            }
         }
         self.isIntrospectionPlatformEntity = true
         IntrospectionStore.shared[id, default: .init()].controller = self

Sources/IntrospectionView.swift

@@ -1,5 +1,5 @@
 #if !os(watchOS)
-import SwiftUI
+public import SwiftUI
 
 #if canImport(UIKit)
 public typealias PlatformView = UIView

Sources/PlatformView.swift

@@ -1,6 +1,4 @@
 #if !os(watchOS)
-import SwiftUI
-
 /// An abstract representation of the `Button` type in SwiftUI.
 ///
 /// ### iOS
@@ -35,6 +33,8 @@ extension IntrospectableViewType where Self == ButtonType {
 }
 
 #if canImport(AppKit) && !targetEnvironment(macCatalyst)
+public import AppKit
+
 extension macOSViewVersion<ButtonType, NSButton> {
     public static let v10_15 = Self(for: .v10_15)
     public static let v11 = Self(for: .v11)

Sources/ViewTypes/Button.swift

@@ -1,6 +1,4 @@
 #if !os(watchOS)
-import SwiftUI
-
 /// An abstract representation of the `ColorPicker` type in SwiftUI.
 ///
 /// ### iOS
@@ -59,6 +57,8 @@ extension IntrospectableViewType where Self == ColorPickerType {
 }
 
 #if canImport(UIKit)
+public import UIKit
+
 @available(iOS 14, *)
 extension iOSViewVersion<ColorPickerType, UIColorWell> {
     @available(*, unavailable, message: "ColorPicker isn't available on iOS 13")
@@ -78,6 +78,8 @@ extension visionOSViewVersion<ColorPickerType, UIColorWell> {
     public static let v26 = Self(for: .v26)
 }
 #elseif canImport(AppKit)
+public import AppKit
+
 @available(macOS 11, *)
 extension macOSViewVersion<ColorPickerType, NSColorWell> {
     @available(*, unavailable, message: "ColorPicker isn't available on macOS 10.15")

Sources/ViewTypes/ColorPicker.swift

@@ -1,6 +1,4 @@
 #if !os(watchOS)
-import SwiftUI
-
 /// An abstract representation of the `DatePicker` type in SwiftUI.
 ///
 /// ### iOS
@@ -57,6 +55,8 @@ extension IntrospectableViewType where Self == DatePickerType {
 }
 
 #if canImport(UIKit)
+public import UIKit
+
 extension iOSViewVersion<DatePickerType, UIDatePicker> {
     public static let v13 = Self(for: .v13)
     public static let v14 = Self(for: .v14)
@@ -73,6 +73,8 @@ extension visionOSViewVersion<DatePickerType, UIDatePicker> {
     public static let v26 = Self(for: .v26)
 }
 #elseif canImport(AppKit)
+public import AppKit
+
 extension macOSViewVersion<DatePickerType, NSDatePicker> {
     public static let v10_15 = Self(for: .v10_15)
     public static let v11 = Self(for: .v11)

Sources/ViewTypes/DatePicker.swift

@@ -1,6 +1,4 @@
 #if !os(watchOS)
-import SwiftUI
-
 /// An abstract representation of the `DatePicker` type in SwiftUI, with `.compact` style.
 ///
 /// ### iOS
@@ -66,6 +64,8 @@ extension IntrospectableViewType where Self == DatePickerWithCompactStyleType {
 }
 
 #if canImport(UIKit)
+public import UIKit
+
 extension iOSViewVersion<DatePickerWithCompactStyleType, UIDatePicker> {
     @available(*, unavailable, message: ".datePickerStyle(.compact) isn't available on iOS 13")
     public static let v13 = Self.unavailable()
@@ -83,6 +83,8 @@ extension visionOSViewVersion<DatePickerWithCompactStyleType, UIDatePicker> {
     public static let v26 = Self(for: .v26)
 }
 #elseif canImport(AppKit) && !targetEnvironment(macCatalyst)
+public import AppKit
+
 extension macOSViewVersion<DatePickerWithCompactStyleType, NSDatePicker> {
     @available(*, unavailable, message: ".datePickerStyle(.compact) isn't available on macOS 10.15")
     public static let v10_15 = Self.unavailable()