Add support for NSplitView (#100)

Co-authored-by: David Roman <[email protected]>

Author: steipete

Introspect/ViewExtensions.swift

@@ -45,20 +45,20 @@ extension View {
 
     /// Finds a `UISplitViewController` from  a `SwiftUI.NavigationView` with style `DoubleColumnNavigationViewStyle`.
     public func introspectSplitViewController(customize: @escaping (UISplitViewController) -> ()) -> some View {
-            inject(UIKitIntrospectionViewController(
-                selector: { introspectionViewController in
-                    
-                    // Search in ancestors
-                    if let splitViewController = introspectionViewController.splitViewController {
-                        return splitViewController
-                    }
-                    
-                    // Search in siblings
-                    return Introspect.previousSibling(containing: UISplitViewController.self, from: introspectionViewController)
-                },
-                customize: customize
-            ))
-        }
+        inject(UIKitIntrospectionViewController(
+            selector: { introspectionViewController in
+
+                // Search in ancestors
+                if let splitViewController = introspectionViewController.splitViewController {
+                    return splitViewController
+                }
+
+                // Search in siblings
+                return Introspect.previousSibling(containing: UISplitViewController.self, from: introspectionViewController)
+            },
+            customize: customize
+        ))
+    }
 
     /// Finds the containing `UIViewController` of a SwiftUI view.
     public func introspectViewController(customize: @escaping (UIViewController) -> ()) -> some View {
@@ -202,6 +202,11 @@ extension View {
             customize: customize
         ))
     }
+
+    /// Finds a `NSSplitViewController` from  a `SwiftUI.NavigationView` with style `DoubleColumnNavigationViewStyle`.
+    public func introspectSplitView(customize: @escaping (NSSplitView) -> ()) -> some View {
+        return introspect(selector: TargetViewSelector.ancestorOrSiblingContaining, customize: customize)
+    }
 
     /// Finds a `NSTableView` from a `SwiftUI.List`, or `SwiftUI.List` child.
     public func introspectTableView(customize: @escaping (NSTableView) -> ()) -> some View {

IntrospectTests/AppKitTests.swift

@@ -23,6 +23,20 @@ enum TestUtils {
     }
 }
 
+private struct SplitNavigationTestView: View {
+    let spy: () -> Void
+    var body: some View {
+        NavigationView {
+            VStack {
+                EmptyView()
+            }
+        }
+        .introspectSplitView { splitView in
+            self.spy()
+        }
+    }
+}
+
 private struct ListTestView: View {
 
     let spy1: () -> Void
@@ -242,7 +256,17 @@ private struct MapTestView: View {
 }
 
 class AppKitTests: XCTestCase {
-    
+
+    func testSplitNavigation() {
+
+        let expectation = XCTestExpectation()
+        let view = SplitNavigationTestView(spy: {
+            expectation.fulfill()
+        })
+        TestUtils.present(view: view)
+        wait(for: [expectation], timeout: TestUtils.Constants.timeout)
+    }
+
     func testList() {
         if #available(macOS 11, *) {
             return // TODO: verify whether List still uses NSTableView under the hood in macOS >=11

README.md

@@ -51,6 +51,7 @@ SwiftUI | UIKit | AppKit | Introspect
 --- | --- | --- | ---
 NavigationView (StackNavigationViewStyle) | UINavigationController | _N/A_ | `.introspectNavigationController()`
 NavigationView (DoubleColumnNavigationViewStyle) | UISplitViewController | _N/A_ | `.introspectSplitViewController()`
+NavigationView (DoubleColumnNavigationViewStyle) | _N/A_ | NSSplitView | `.introspectSplitView()`
 _Any embedded view_ | UIViewController | _N/A_ | `.introspectViewController()`
 ScrollView | UIScrollView | NSScrollView | `.introspectScrollView()`
 List | UITableView | NSTableView | `.introspectTableView()`
@@ -188,13 +189,10 @@ $ bundle exec pod trunk push .
 
 
 <!-- References -->
-[CircleCI_Status]: https://circleci.com/gh/siteline/SwiftUI-Introspect.svg?style=svg&circle-token=6f995f204d4d417d31f79e7257f6e1ecf430ae07
 
-[CircleCI_URL]: https://circleci.com/gh/siteline/SwiftUI-Introspect
+[GithubCI_Status]: https://github.com/siteline/swiftui-introspect/actions/workflows/ci.yml/badge.svg?branch=master
 
-[GithubCI_Status]: https://github.com/siteline/swiftui-introspect/actions/workflows/build-and-test.yml/badge.svg?branch=master
-
-[GithubCI_URL]: https://github.com/siteline/SwiftUI-Introspect/actions/workflows/build-and-test.yml
+[GithubCI_URL]: https://github.com/siteline/SwiftUI-Introspect/actions/workflows/ci.yml
 
 [Siteline_Badge]: https://badgen.net/badge/Built%20by/Siteline/blue?icon=https://uploads-ssl.webflow.com/5f4513afbbfc64c4777fcccf/5f525b122370d681879e170e_siteline-icon.svg