Implement TypeFilters.UnitySmart

Exanite · Nov 6, 2024 · 41aaa12 · 41aaa12
1 parent da6cedb
commit 41aaa12
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 20 deletions.
diff --git a/DependencyInjection/ObjectBinding.cs b/DependencyInjection/ObjectBinding.cs
@@ -6,8 +6,6 @@
 using Sirenix.OdinInspector;
 using UniDi;
 using UnityEngine;
-using UnityEngine.EventSystems;
-using UnityEngine.UI;
 using Object = UnityEngine.Object;
 using SerializationUtility = Exanite.Core.Utilities.SerializationUtility;
 
@@ -16,21 +14,6 @@ namespace Exanite.Core.DependencyInjection
     [Serializable]
     public class ObjectBinding : ISerializationCallbackReceiver
     {
-        /// <summary>
-        /// Types ignored by <see cref="BindTypeFilter.Smart"/>.
-        /// </summary>
-        public static IReadOnlyCollection<Type> IgnoredTypes { get; } = new HashSet<Type>
-        {
-            typeof(MonoBehaviour),
-            typeof(Behaviour),
-            typeof(Component),
-            typeof(ScriptableObject),
-            typeof(Object),
-            typeof(UIBehaviour),
-            typeof(Graphic),
-            typeof(MaskableGraphic),
-        };
-
         [PropertyOrder(0)]
         [LabelText("Object")]
         [SerializeField] private Object instance = new();
@@ -91,8 +74,7 @@ private IEnumerable<Type> GetTypesToBindNonCustom()
 
             if ((filter & BindTypeFilter.Smart) != 0)
             {
-                typeFilter.Add(new InheritanceHierarchyTypeFilter(IgnoredTypes, false, false));
-                typeFilter.Interfaces();
+                typeFilter.Add(TypeFilters.UnitySmart);
             }
 
             if ((filter & BindTypeFilter.Self) != 0)

diff --git a/Types/TypeFilters.cs b/Types/TypeFilters.cs
@@ -1,3 +1,10 @@
+using System;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.EventSystems;
+using UnityEngine.UI;
+using Object = UnityEngine.Object;
+
 namespace Exanite.Core.Types
 {
     public static class TypeFilters
@@ -8,7 +15,31 @@ public static class TypeFilters
         public static ITypeFilter Smart { get; } = new TypeFilter().InheritanceHierarchy().Interfaces();
 
 #if UNITY_2021_3_OR_NEWER
-        // Todo public static TypeFilter UnitySmart { get; } = new TypeFilter().InheritanceHierarchy().Interfaces();
+        /// <summary>
+        /// Types ignored by the <see cref="UnitySmart"/> <see cref="ITypeFilter"/>.
+        /// </summary>
+        public static IReadOnlyCollection<Type> UnityIgnoredTypes { get; }
+
+        public static ITypeFilter UnitySmart { get; }
+
+        static TypeFilters()
+        {
+            UnityIgnoredTypes = new HashSet<Type>
+            {
+                typeof(MonoBehaviour),
+                typeof(Behaviour),
+                typeof(Component),
+                typeof(ScriptableObject),
+                typeof(Object),
+                typeof(UIBehaviour),
+                typeof(Graphic),
+                typeof(MaskableGraphic),
+            };
+
+            UnitySmart = new TypeFilter()
+                .Add(new InheritanceHierarchyTypeFilter(UnityIgnoredTypes, false, false))
+                .Interfaces();
+        }
 #endif
     }
 }