From 0ae9f1755f0ee20ec7434c0e8b4ec5e97415b9b2 Mon Sep 17 00:00:00 2001
From: Lucas Wilkinson <wilkinson.lucas@gmail.com>
Date: Fri, 25 Sep 2020 00:50:17 -0400
Subject: [PATCH] Fix: Introspector in iOS 14 not working for ScrollView (#55)

---
 Introspect/Introspect.swift | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/Introspect/Introspect.swift b/Introspect/Introspect.swift
index e72c32b2..3a768c54 100644
--- a/Introspect/Introspect.swift
+++ b/Introspect/Introspect.swift
@@ -51,7 +51,7 @@ public enum Introspect {
         return nil
     }
     
-    /// Finds a previous sibling that contains a view of the specified type.
+    /// Finds a previous sibling that is or contains a view of the specified type.
     /// This method inspects siblings recursively.
     /// Returns nil if no sibling contains the specified type.
     public static func previousSibling<AnyViewType: PlatformView>(
@@ -67,6 +67,10 @@ public enum Introspect {
         }
         
         for subview in superview.subviews[0..<entryIndex].reversed() {
+            if let typed = subview as? AnyViewType {
+                return typed
+            }
+
             if let typed = findChild(ofType: type, in: subview) {
                 return typed
             }
@@ -124,7 +128,7 @@ public enum Introspect {
         return nil
     }
     
-    /// Finds a next sibling that contains a view of the specified type.
+    /// Finds a next sibling that is or contains a view of the specified type.
     /// This method inspects siblings recursively.
     /// Returns nil if no sibling contains the specified type.
     public static func nextSibling<AnyViewType: PlatformView>(
@@ -139,6 +143,10 @@ public enum Introspect {
         }
         
         for subview in superview.subviews[entryIndex..<superview.subviews.endIndex] {
+            if let typed = subview as? AnyViewType {
+                return typed
+            }
+
             if let typed = findChild(ofType: type, in: subview) {
                 return typed
             }