Fix .introspectScrollView on iOS 14

Author: ldiqual

CHANGELOG.md

@@ -5,6 +5,8 @@ Changelog
 
  - Allow `Introspect` to be imported in apps that support older platform versions.
  - Added Catalyst support in the Introspect iOS framework.
+ - Fixed `.introspectScrollView()` on iOS 14
+   [#55](https://github.com/siteline/SwiftUI-Introspect/issues/55)
 
 ## [0.1.0]
 

Introspect/Introspect.swift

@@ -75,6 +75,30 @@ public enum Introspect {
         return nil
     }
 
+    /// Finds a previous sibling that is of the specified type.
+    /// This method inspects siblings recursively.
+    /// Returns nil if no sibling contains the specified type.
+    public static func previousSibling<AnyViewType: PlatformView>(
+        ofType type: AnyViewType.Type,
+        from entry: PlatformView
+    ) -> AnyViewType? {
+        
+        guard let superview = entry.superview,
+            let entryIndex = superview.subviews.firstIndex(of: entry),
+            entryIndex > 0
+        else {
+            return nil
+        }
+        
+        for subview in superview.subviews[0..<entryIndex].reversed() {
+            if let typed = subview as? AnyViewType {
+                return typed
+            }
+        }
+        
+        return nil
+    }
+    
     /// Finds a previous sibling that contains a view controller of the specified type.
     /// This method inspects siblings recursively.
     /// Returns nil if no sibling contains the specified type.
@@ -147,6 +171,29 @@ public enum Introspect {
         return nil
     }
 
+    /// Finds a next sibling that if of the specified type.
+    /// This method inspects siblings recursively.
+    /// Returns nil if no sibling contains the specified type.
+    public static func nextSibling<AnyViewType: PlatformView>(
+        ofType type: AnyViewType.Type,
+        from entry: PlatformView
+    ) -> AnyViewType? {
+        
+        guard let superview = entry.superview,
+            let entryIndex = superview.subviews.firstIndex(of: entry)
+        else {
+            return nil
+        }
+        
+        for subview in superview.subviews[entryIndex..<superview.subviews.endIndex] {
+            if let typed = subview as? AnyViewType {
+                return typed
+            }
+        }
+        
+        return nil
+    }
+    
     /// Finds an ancestor of the specified type.
     /// If it reaches the top of the view without finding the specified view type, it returns nil.
     public static func findAncestor<AnyViewType: PlatformView>(ofType type: AnyViewType.Type, from entry: PlatformView) -> AnyViewType? {
@@ -191,18 +238,32 @@ public enum Introspect {
 }
 
 public enum TargetViewSelector {
-    public static func sibling<TargetView: PlatformView>(from entry: PlatformView) -> TargetView? {
+    public static func siblingContaining<TargetView: PlatformView>(from entry: PlatformView) -> TargetView? {
         guard let viewHost = Introspect.findViewHost(from: entry) else {
             return nil
         }
         return Introspect.previousSibling(containing: TargetView.self, from: viewHost)
     }
 
-    public static func ancestorOrSibling<TargetView: PlatformView>(from entry: PlatformView) -> TargetView? {
+    public static func siblingOfType<TargetView: PlatformView>(from entry: PlatformView) -> TargetView? {
+        guard let viewHost = Introspect.findViewHost(from: entry) else {
+            return nil
+        }
+        return Introspect.previousSibling(ofType: TargetView.self, from: viewHost)
+    }
+    
+    public static func ancestorOrSiblingContaining<TargetView: PlatformView>(from entry: PlatformView) -> TargetView? {
+        if let tableView = Introspect.findAncestor(ofType: TargetView.self, from: entry) {
+            return tableView
+        }
+        return siblingContaining(from: entry)
+    }
+    
+    public static func ancestorOrSiblingOfType<TargetView: PlatformView>(from entry: PlatformView) -> TargetView? {
         if let tableView = Introspect.findAncestor(ofType: TargetView.self, from: entry) {
             return tableView
         }
-        return sibling(from: entry)
+        return siblingOfType(from: entry)
     }
 }
 

Introspect/ViewExtensions.swift

@@ -72,46 +72,50 @@ extension View {
 
     /// Finds a `UITableView` from a `SwiftUI.List`, or `SwiftUI.List` child.
     public func introspectTableView(customize: @escaping (UITableView) -> ()) -> some View {
-        return introspect(selector: TargetViewSelector.ancestorOrSibling, customize: customize)
+        return introspect(selector: TargetViewSelector.ancestorOrSiblingContaining, customize: customize)
     }
 
     /// Finds a `UIScrollView` from a `SwiftUI.ScrollView`, or `SwiftUI.ScrollView` child.
     public func introspectScrollView(customize: @escaping (UIScrollView) -> ()) -> some View {
-        return introspect(selector: TargetViewSelector.ancestorOrSibling, customize: customize)
+        if #available(iOS 14.0, tvOS 14.0, macOS 11.0, *) {
+            return introspect(selector: TargetViewSelector.ancestorOrSiblingOfType, customize: customize)
+        } else {
+            return introspect(selector: TargetViewSelector.ancestorOrSiblingContaining, customize: customize)
+        }
     }
 
     /// Finds a `UITextField` from a `SwiftUI.TextField`
     public func introspectTextField(customize: @escaping (UITextField) -> ()) -> some View {
-        return introspect(selector: TargetViewSelector.sibling, customize: customize)
+        return introspect(selector: TargetViewSelector.siblingContaining, customize: customize)
     }
 
     /// Finds a `UISwitch` from a `SwiftUI.Toggle`
     @available(tvOS, unavailable)
     public func introspectSwitch(customize: @escaping (UISwitch) -> ()) -> some View {
-        return introspect(selector: TargetViewSelector.sibling, customize: customize)
+        return introspect(selector: TargetViewSelector.siblingContaining, customize: customize)
     }
 
     /// Finds a `UISlider` from a `SwiftUI.Slider`
     @available(tvOS, unavailable)
     public func introspectSlider(customize: @escaping (UISlider) -> ()) -> some View {
-        return introspect(selector: TargetViewSelector.sibling, customize: customize)
+        return introspect(selector: TargetViewSelector.siblingContaining, customize: customize)
     }
 
     /// Finds a `UIStepper` from a `SwiftUI.Stepper`
     @available(tvOS, unavailable)
     public func introspectStepper(customize: @escaping (UIStepper) -> ()) -> some View {
-        return introspect(selector: TargetViewSelector.sibling, customize: customize)
+        return introspect(selector: TargetViewSelector.siblingContaining, customize: customize)
     }
 
     /// Finds a `UIDatePicker` from a `SwiftUI.DatePicker`
     @available(tvOS, unavailable)
     public func introspectDatePicker(customize: @escaping (UIDatePicker) -> ()) -> some View {
-        return introspect(selector: TargetViewSelector.sibling, customize: customize)
+        return introspect(selector: TargetViewSelector.siblingContaining, customize: customize)
     }
 
     /// Finds a `UISegmentedControl` from a `SwiftUI.Picker` with style `SegmentedPickerStyle`
     public func introspectSegmentedControl(customize: @escaping (UISegmentedControl) -> ()) -> some View {
-        return introspect(selector: TargetViewSelector.sibling, customize: customize)
+        return introspect(selector: TargetViewSelector.siblingContaining, customize: customize)
     }
 }
 #endif
@@ -133,37 +137,37 @@ extension View {
 
     /// Finds a `NSTableView` from a `SwiftUI.List`, or `SwiftUI.List` child.
     public func introspectTableView(customize: @escaping (NSTableView) -> ()) -> some View {
-        return introspect(selector: TargetViewSelector.ancestorOrSibling, customize: customize)
+        return introspect(selector: TargetViewSelector.ancestorOrSiblingContaining, customize: customize)
     }
 
     /// Finds a `NSScrollView` from a `SwiftUI.ScrollView`, or `SwiftUI.ScrollView` child.
     public func introspectScrollView(customize: @escaping (NSScrollView) -> ()) -> some View {
-        return introspect(selector: TargetViewSelector.ancestorOrSibling, customize: customize)
+        return introspect(selector: TargetViewSelector.ancestorOrSiblingContaining, customize: customize)
     }
 
     /// Finds a `NSTextField` from a `SwiftUI.TextField`
     public func introspectTextField(customize: @escaping (NSTextField) -> ()) -> some View {
-        return introspect(selector: TargetViewSelector.sibling, customize: customize)
+        return introspect(selector: TargetViewSelector.siblingContaining, customize: customize)
     }
 
     /// Finds a `NSSlider` from a `SwiftUI.Slider`
     public func introspectSlider(customize: @escaping (NSSlider) -> ()) -> some View {
-        return introspect(selector: TargetViewSelector.sibling, customize: customize)
+        return introspect(selector: TargetViewSelector.siblingContaining, customize: customize)
     }
 
     /// Finds a `NSStepper` from a `SwiftUI.Stepper`
     public func introspectStepper(customize: @escaping (NSStepper) -> ()) -> some View {
-        return introspect(selector: TargetViewSelector.sibling, customize: customize)
+        return introspect(selector: TargetViewSelector.siblingContaining, customize: customize)
     }
 
     /// Finds a `NSDatePicker` from a `SwiftUI.DatePicker`
     public func introspectDatePicker(customize: @escaping (NSDatePicker) -> ()) -> some View {
-        return introspect(selector: TargetViewSelector.sibling, customize: customize)
+        return introspect(selector: TargetViewSelector.siblingContaining, customize: customize)
     }
 
     /// Finds a `NSSegmentedControl` from a `SwiftUI.Picker` with style `SegmentedPickerStyle`
     public func introspectSegmentedControl(customize: @escaping (NSSegmentedControl) -> ()) -> some View {
-        return introspect(selector: TargetViewSelector.sibling, customize: customize)
+        return introspect(selector: TargetViewSelector.siblingContaining, customize: customize)
     }
 }
 #endif