Merge pull request #1864 from alttester/1827-webgl---exception-thrown-when-trying-to-find-object-by-component

Change ComponentCondition in FindObject

Author: andreion1ca

Assets/AltTester/Runtime/Commands/FindObject/SelectorConditionController.cs

@@ -96,21 +96,17 @@ private static GameObject matchConditionForProperty(PropertyEqualsCondition prop
                         int layerId = LayerMask.NameToLayer(propertyEqualsCondition.PropertyValue);
                         return gameObjectToCheck.layer.Equals(layerId) ? gameObjectToCheck : null;
                     case PropertyType.component:
-                        var componentName = propertyEqualsCondition.PropertyValue.Split(new string[] { "." }, System.StringSplitOptions.None).Last();
-                        var list = gameObjectToCheck.GetComponents(typeof(UnityEngine.Component));
-                        for (int i = 0; i < list.Length; i++)
+                        var componentNameFromCondition = propertyEqualsCondition.PropertyValue.Split(new string[] { "." }, System.StringSplitOptions.None).Last();
+                        var allComponents = gameObjectToCheck.GetComponents(typeof(Component));
+
+                        foreach (var comp in allComponents)
                         {
-                            try
-                            {
-                                if (componentName.Equals(list[i].GetType().Name))
-                                {
-                                    return gameObjectToCheck;
-                                }
-                            }
-                            catch (System.NullReferenceException)
-                            {
-                                continue;
-                            }
+                            if (comp == null) continue;
+                            string shortTypeName = getComponentShortName(comp);
+                            if (string.IsNullOrEmpty(shortTypeName)) continue;
+
+                            if (componentNameFromCondition.Equals(shortTypeName))
+                                return gameObjectToCheck;
                         }
                         return null;
                     case PropertyType.text:
@@ -156,14 +152,17 @@ private static GameObject matchConditionForFunction(FunctionCondition functionCo
                                 string layerNm = LayerMask.LayerToName(gameObjectToCheck.layer);
                                 return layerNm.Contains(functionCondition.PropertyValue) ? gameObjectToCheck : null;
                             case PropertyType.component:
-                                var componentName = functionCondition.PropertyValue.Split(new string[] { "." }, System.StringSplitOptions.None).Last();
-                                var list = gameObjectToCheck.GetComponents(typeof(UnityEngine.Component));
-                                for (int i = 0; i < list.Length; i++)
+                                var componentNameFromCondition = functionCondition.PropertyValue.Split(new string[] { "." }, System.StringSplitOptions.None).Last();
+
+                                var allComponents = gameObjectToCheck.GetComponents(typeof(Component));
+
+                                foreach (var comp in allComponents)
                                 {
-                                    if (list[i].GetType().Name.Contains(componentName))
-                                    {
+                                    if (comp == null) continue;
+                                    string shortTypeName = getComponentShortName(comp);
+                                    if (string.IsNullOrEmpty(shortTypeName)) continue;
+                                    if (shortTypeName.Contains(componentNameFromCondition))
                                         return gameObjectToCheck;
-                                    }
                                 }
                                 return null;
                             case PropertyType.text:
@@ -178,6 +177,17 @@ private static GameObject matchConditionForFunction(FunctionCondition functionCo
             }
             return null;
         }
+        private static string getComponentShortName(Component component)
+        {
+            string componentToString = component.ToString();
+            int openParen = componentToString.LastIndexOf('(');
+            int closeParen = componentToString.LastIndexOf(')');
+
+            if (openParen == -1 || closeParen <= openParen) return "";
+
+            string fullTypeName = componentToString.Substring(openParen + 1, closeParen - openParen - 1);
+            return fullTypeName.Split('.').Last();
+        }
         private static string getText(UnityEngine.GameObject objectToCheck)
         {
             try