wip

Author: davdroman

Examples/Showcase/Showcase/ContentView.swift

@@ -205,20 +205,34 @@ struct PresentationShowcase: View {
     @State var isPopoverPresented = false
 
     var body: some View {
-        if #available(iOS 14, tvOS 14, *) {
-            Button("Full Screen Cover", action: { isFullScreenPresented = true })
-                .fullScreenCover(isPresented: $isFullScreenPresented) {
-                    Button("Dismiss", action: { isFullScreenPresented = false })
+        VStack(spacing: 20) {
+            Button("Sheet", action: { isSheetPresented = true })
+                .sheet(isPresented: $isSheetPresented) {
+                    Button("Dismiss", action: { isSheetPresented = false })
                         #if os(iOS) || os(tvOS)
                         .introspect(
-                            .fullScreenCover,
-                            on: .iOS(.v14, .v15, .v16, .v17), .tvOS(.v14, .v15, .v16, .v17)
+                            .sheet,
+                            on: .iOS(.v13, .v14, .v15, .v16, .v17), .tvOS(.v13, .v14, .v15, .v16, .v17)
                         ) { presentationController in
                             presentationController.containerView?.backgroundColor = .red.withAlphaComponent(0.75)
-                            presentationController.presentedView?.backgroundColor = .blue
                         }
                         #endif
                 }
+
+            if #available(iOS 14, tvOS 14, *) {
+                Button("Full Screen Cover", action: { isFullScreenPresented = true })
+                    .fullScreenCover(isPresented: $isFullScreenPresented) {
+                        Button("Dismiss", action: { isFullScreenPresented = false })
+                            #if os(iOS) || os(tvOS)
+                            .introspect(
+                                .fullScreenCover,
+                                on: .iOS(.v14, .v15, .v16, .v17), .tvOS(.v14, .v15, .v16, .v17)
+                            ) { presentationController in
+                                presentationController.containerView?.backgroundColor = .red.withAlphaComponent(0.75)
+                            }
+                            #endif
+                    }
+            }
         }
     }
 }

Sources/ViewTypes/Sheet.swift

@@ -12,8 +12,8 @@ import SwiftUI
 ///         Button("Present", action: { isPresented = true })
 ///             .sheet(isPresented: $isPresented) {
 ///                 Button("Dismiss", action: { isPresented = false })
-///                     .introspect(.sheet, on: .iOS(.v14, .v15, .v16, .v17)) {
-///                         print(type(of: $0)) // UISheetPresentationController
+///                     .introspect(.sheet, on: .iOS(.v13, .v14, .v15, .v16, .v17)) {
+///                         print(type(of: $0)) // UIPresentationController
 ///                     }
 ///             }
 ///     }
@@ -30,8 +30,8 @@ import SwiftUI
 ///         Button("Present", action: { isPresented = true })
 ///             .sheet(isPresented: $isPresented) {
 ///                 Button("Dismiss", action: { isPresented = false })
-///                     .introspect(.sheet, on: .tvOS(.v14, .v15, .v16, .v17)) {
-///                         print(type(of: $0)) // UISheetPresentationController
+///                     .introspect(.sheet, on: .tvOS(.v13, .v14, .v15, .v16, .v17)) {
+///                         print(type(of: $0)) // UIPresentationController
 ///                     }
 ///             }
 ///     }
@@ -55,6 +55,9 @@ extension IntrospectableViewType where Self == SheetType {
 extension iOSViewVersion<SheetType, UIPresentationController> {
     public static let v13 = Self(for: .v13, selector: selector)
     public static let v14 = Self(for: .v14, selector: selector)
+    public static let v15 = Self(for: .v15, selector: selector)
+    public static let v16 = Self(for: .v16, selector: selector)
+    public static let v17 = Self(for: .v17, selector: selector)
 
     private static var selector: IntrospectionSelector<UIPresentationController> {
         .from(UIViewController.self, selector: \.presentationController)
@@ -64,8 +67,11 @@ extension iOSViewVersion<SheetType, UIPresentationController> {
 @available(iOS 15, *)
 @available(tvOS, unavailable)
 extension iOSViewVersion<SheetType, UISheetPresentationController> {
+    @_disfavoredOverload
     public static let v15 = Self(for: .v15, selector: selector)
+    @_disfavoredOverload
     public static let v16 = Self(for: .v16, selector: selector)
+    @_disfavoredOverload
     public static let v17 = Self(for: .v17, selector: selector)
 
     private static var selector: IntrospectionSelector<UISheetPresentationController> {

Tests/Tests/ViewTypes/SheetTests.swift

@@ -5,29 +5,23 @@ import XCTest
 
 final class SheetTests: XCTestCase {
     #if os(iOS)
-    func testSheet_beforeiOS15() throws {
-        guard #unavailable(iOS 15, tvOS 15) else {
-            throw XCTSkip()
-        }
-
+    func testSheet() throws {
         XCTAssertViewIntrospection(of: UIPresentationController.self) { spies in
             let spy0 = spies[0]
 
             Text("Root")
                 .sheet(isPresented: .constant(true)) {
                     Text("Sheet")
-                        #if os(iOS) || os(tvOS)
                         .introspect(
                             .sheet,
-                            on: .iOS(.v13, .v14), .tvOS(.v13, .v14, .v15, .v16, .v17),
+                            on: .iOS(.v13, .v14, .v15, .v16, .v17), .tvOS(.v13, .v14, .v15, .v16, .v17),
                             customize: spy0
                         )
-                        #endif
                 }
         }
     }
 
-    func testSheet_iOS15AndLater() throws {
+    func testSheetAsSheetPresentationController() throws {
         guard #available(iOS 15, tvOS 15, *) else {
             throw XCTSkip()
         }
@@ -38,13 +32,11 @@ final class SheetTests: XCTestCase {
             Text("Root")
                 .sheet(isPresented: .constant(true)) {
                     Text("Sheet")
-                        #if os(iOS) || os(tvOS)
                         .introspect(
                             .sheet,
                             on: .iOS(.v15, .v16, .v17),
                             customize: spy0
                         )
-                        #endif
                 }
         }
     }