com.wallstop-studios.unity-helpers 2.0.0-rc78 → 2.0.0-rc78.2

package/Runtime/Core/Helper/Helpers.cs

@@ -182,8 +182,8 @@
         {
             return target switch
             {
-                GameObject go => go.GetComponent<T>(),
-                Component c => c.GetComponent<T>(),
+                GameObject go => go != null ? go.GetComponent<T>() : default,
+                Component c => c != null ? c.GetComponent<T>() : default,
                 _ => default,
             };
         }
@@ -192,8 +192,8 @@
         {
             return target switch
             {
-                GameObject go => go.GetComponents<T>(),
-                Component c => c.GetComponents<T>(),
+                GameObject go => go != null ? go.GetComponents<T>() : Array.Empty<T>(),
+                Component c => c != null ? c.GetComponents<T>() : Array.Empty<T>(),
                 _ => default,
             };
         }
@@ -203,7 +203,7 @@
             return target switch
             {
                 GameObject go => go,
-                Component c => c.gameObject,
+                Component c => c != null ? c.gameObject : null,
                 _ => null,
             };
         }
@@ -213,8 +213,8 @@
             component = default;
             return target switch
             {
-                GameObject go => go.TryGetComponent(out component),
-                Component c => c.TryGetComponent(out component),
+                GameObject go => go != null && go.TryGetComponent(out component),
+                Component c => c != null && c.TryGetComponent(out component),
                 _ => false,
             };
         }

package/Runtime/Visuals/UGUI/EnhancedImage.cs

@@ -53,11 +53,13 @@ namespace WallstopStudios.UnityHelpers.Visuals.UGUI
             UpdateMaterialInstance();
         }
 
+#if UNITY_EDITOR
         protected override void OnValidate()
         {
             base.OnValidate();
             UpdateMaterialInstance();
         }
+#endif
 
         private void UpdateMaterialInstance()
         {

package/Tests/Runtime/Helper/ObjectHelperTests.cs

@@ -398,5 +398,35 @@
 
             yield break;
         }
+
+        [Test]
+        public void GetGameObject()
+        {
+            GameObject go = new("Test", typeof(SpriteRenderer));
+            SpriteRenderer spriteRenderer = go.GetComponent<SpriteRenderer>();
+
+            GameObject result = go.GetGameObject();
+            Assert.AreEqual(result, go);
+            result = spriteRenderer.GetGameObject();
+            Assert.AreEqual(result, go);
+
+            Object.DestroyImmediate(spriteRenderer);
+            result = spriteRenderer.GetGameObject();
+            Assert.IsTrue(result == null);
+            result = go.GetGameObject();
+            Assert.AreEqual(result, go);
+
+            Object.DestroyImmediate(go);
+            result = spriteRenderer.GetGameObject();
+            Assert.IsTrue(result == null);
+            result = go.GetGameObject();
+            Assert.IsTrue(result == null);
+
+            result = ((GameObject)null).GetGameObject();
+            Assert.IsTrue(result == null);
+
+            result = ((SpriteRenderer)null).GetGameObject();
+            Assert.IsTrue(result == null);
+        }
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "com.wallstop-studios.unity-helpers",
-  "version": "2.0.0-rc78",
+  "version": "2.0.0-rc78.2",
   "displayName": "Unity Helpers",
   "description": "Various Unity Helper Library",
   "dependencies": {},
@@ -93,5 +93,6 @@
 
 
 
+