Merge pull request #126 from techno-dwarf-works/feature/refactoring

Version 3.1.6

Editor/EditorAddons/Drawers/Select/Handlers/SelectSerializedTypeHandler.cs

@@ -43,7 +43,14 @@ public override object GetCurrentValue()
         {
             var property = _container.SerializedProperty;
             var objectOfProperty = property.GetValue();
-            var type = objectOfProperty.GetType();
+            Type type = null;
+            if (objectOfProperty == null)
+            {
+                type = GetFieldOrElementType();
+                return type;
+            }
+
+            type = objectOfProperty.GetType();
             if (type == typeof(SerializedType))
             {
                 type = (objectOfProperty as SerializedType)?.Type;

Editor/EditorAddons/Drawers/Select/SelectDrawer.cs

@@ -21,7 +21,6 @@ public class SelectDrawer : BasePropertyDrawer<BaseSelectHandler, BaseSelectAttr
     {
         //TODO: Consider to use Locators
         private Dictionary<SerializedProperty, BehavioredElement<Button>> _behavioredElements;
-        private Guid g = Guid.NewGuid();
 
         public SelectDrawer()
         {

Samples~/TestSamples/Scripts/Models/SomeAbstractClass.cs

@@ -6,8 +6,5 @@ namespace Samples.Models
     [Serializable]
     public abstract class SomeAbstractClass
     {
-        [SerializeField] private protected int baseIntField;
-
-        public int BaseIntField => baseIntField;
     }
 }

Samples~/TestSamples/Scripts/Models/SomeAbstractClassImplementation2.cs

@@ -7,5 +7,14 @@ namespace Samples.Models
     public class SomeAbstractClassImplementation2 : SomeAbstractClass
     {
         [SerializeField] private bool boolField;
+
+        [SerializeField] private protected int baseIntField;
+
+        public int BaseIntField => baseIntField;
+    }
+
+    [Serializable]
+    public class SomeAbstractClassImplementation3 : SomeAbstractClass
+    {
     }
 }

Samples~/TestSamples/Scripts/Test.cs

@@ -61,12 +61,28 @@ public class TestInner
         private int testIntLog;
     }
 
+    [Serializable]
+    public class TestSerializableType : ITestSerializableType
+    {
+        [Select(typeof(ISomeInterface))] 
+        [SerializeField]
+        private List<SerializedType> serializedTypes;
+    }
+
+    public interface ITestSerializableType
+    {
+    }
+
     public class Test : MonoBehaviour
     {
         [HideLabel] [Select(typeof(ISomeInterface))] 
         [SerializeField]
         private SerializedType serializedType;
 
+        [Select] 
+        [SerializeReference]
+        private List<ITestSerializableType> serializedTypes;
+
         [Select(typeof(ISomeInterface))] 
         [SerializeField]
         private SerializedType serializedType2;

package.json

@@ -1,11 +1,11 @@
 {
   "name": "com.uurha.betterattributes",
   "displayName": "Better Attributes",
-  "version": "3.1.5",
+  "version": "3.1.6",
   "unity": "2021.3",
   "description": "Unity attributes, allows to serialize interfaces, draw handles for Vector3/Vector2/Quaternion/Bounds, create read only fields.",
   "dependencies": {
-    "com.tdw.better.commons" : "0.0.16",
+    "com.tdw.better.commons" : "0.0.26",
     "com.tdw.better.internal.core" : "0.0.2"
   },
   "author": {