From c5a8af63f8e1fb778a63505f129051900dc306e8 Mon Sep 17 00:00:00 2001
From: Simon Jackson <darkside@zenithmoon.com>
Date: Sun, 27 Nov 2022 14:32:16 +0000
Subject: [PATCH] Updated UIVertical scroller to be 2022 compliant

Resolves:
- https://github.com/Unity-UI-Extensions/com.unity.uiextensions/issues/410
---
 Runtime/Scripts/Layout/UIVerticalScroller.cs | 14 +++++++++++++-
 Runtime/UnityUIExtensions.asmdef             |  4 +++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/Runtime/Scripts/Layout/UIVerticalScroller.cs b/Runtime/Scripts/Layout/UIVerticalScroller.cs
index cad0e86..60e3b2c 100644
--- a/Runtime/Scripts/Layout/UIVerticalScroller.cs
+++ b/Runtime/Scripts/Layout/UIVerticalScroller.cs
@@ -191,7 +191,19 @@ namespace UnityEngine.UI.Extensions
                 if (minDistance == distance[i])
                 {
                     focusedElementIndex = i;
-                    result = _arrayOfElements[i].GetComponentInChildren<Text>().text;
+#if UNITY_2022_1_OR_NEWER
+                    var textComponentTxtMeshPro = _arrayOfElements[i].GetComponentInChildren<TMPro.TMP_Text>();
+                    if (textComponentTxtMeshPro != null)
+                    {
+                        result = textComponentTxtMeshPro.text;
+                    }
+#else
+                    var textComponent = _arrayOfElements[i].GetComponentInChildren<Text>();
+                    if (textComponent != null)
+                    {
+                        result = textComponent.text;
+                    }
+#endif
                 }
             }
             if (focusedElementIndex != oldFocusedElement && OnFocusChanged != null)
diff --git a/Runtime/UnityUIExtensions.asmdef b/Runtime/UnityUIExtensions.asmdef
index f9b5f8a..4fa1840 100644
--- a/Runtime/UnityUIExtensions.asmdef
+++ b/Runtime/UnityUIExtensions.asmdef
@@ -1,8 +1,10 @@
 {
     "name": "UnityUIExtensions",
+    "rootNamespace": "",
     "references": [
         "GUID:2bafac87e7f4b9b418d9448d219b01ab",
-        "GUID:75469ad4d38634e559750d17036d5f7c"
+        "GUID:75469ad4d38634e559750d17036d5f7c",
+        "GUID:6055be8ebefd69e48b49212b09b47b2f"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],