Fix types selection in multiple fields

Author: arimger

Assets/Editor Toolbox/Editor/Drawers/Regular/SerializedTypeDrawer.cs

@@ -11,7 +11,7 @@ namespace Toolbox.Editor.Drawers
     [CustomPropertyDrawer(typeof(SerializedType))]
     public sealed class SerializedTypeDrawer : PropertyDrawerBase
     {
-        private static readonly TypeConstraintStandard sharedConstraint = new TypeConstraintStandard();
+        private static readonly TypeConstraintContext sharedConstraint = new TypeConstraintStandard();
         private static readonly TypeAppearanceContext sharedAppearance = new TypeAppearanceContext(sharedConstraint, TypeGrouping.None, true);
         private static readonly TypeField typeField = new TypeField(sharedConstraint, sharedAppearance);
 
@@ -51,9 +51,12 @@ private TypeConstraintAttribute GetDefaultConstraint()
         private void UpdateConstraint(TypeConstraintAttribute attribute)
         {
             sharedConstraint.ApplyTarget(attribute.AssemblyType);
-            sharedConstraint.AllowAbstract = attribute.AllowAbstract;
-            sharedConstraint.AllowObsolete = attribute.AllowObsolete;
-            sharedConstraint.Settings = attribute.TypeSettings;
+            if (sharedConstraint is TypeConstraintStandard constraint)
+            {
+                constraint.AllowAbstract = attribute.AllowAbstract;
+                constraint.AllowObsolete = attribute.AllowObsolete;
+                constraint.Settings = attribute.TypeSettings;
+            }
         }
 
         private void UpdateAppearance(TypeConstraintAttribute attribute)
@@ -69,8 +72,6 @@ protected override float GetPropertyHeightSafe(SerializedProperty property, GUIC
 
         protected override void OnGUISafe(Rect position, SerializedProperty property, GUIContent label)
         {
-            var referenceProperty = property.FindPropertyRelative("typeReference");
-
             label = EditorGUI.BeginProperty(position, label, property);
             label = property.name != "data" ? label : GUIContent.none;
             position = EditorGUI.PrefixLabel(position, label);
@@ -79,14 +80,22 @@ protected override void OnGUISafe(Rect position, SerializedProperty property, GU
             var addSearchField = validAttribute.AddTextSearchField;
             UpdateConstraint(validAttribute);
             UpdateAppearance(validAttribute);
-            typeField.OnSelect = (type) =>
-            {
-                referenceProperty.serializedObject.Update();
-                referenceProperty.stringValue = SerializedType.GetReferenceValue(type);
-                referenceProperty.serializedObject.ApplyModifiedProperties();
-            };
+
+            var referenceProperty = property.FindPropertyRelative("typeReference");
             var activeType = SerializedType.GetReferenceType(referenceProperty.stringValue);
-            typeField.OnGui(position, addSearchField, activeType);
+            typeField.OnGui(position, addSearchField, (type) =>
+            {
+                try
+                {
+                    referenceProperty.serializedObject.Update();
+                    referenceProperty.stringValue = SerializedType.GetReferenceValue(type);
+                    referenceProperty.serializedObject.ApplyModifiedProperties();
+                }
+                catch (Exception e) when (e is ArgumentNullException || e is NullReferenceException)
+                {
+                    ToolboxEditorLog.LogWarning("Invalid attempt to update disposed property.");
+                }
+            }, activeType);
 
             EditorGUI.EndProperty();
         }

Assets/Editor Toolbox/Editor/Drawers/Toolbox/PropertySelf/ReferencePickerAttributeDrawer.cs

@@ -18,7 +18,7 @@ private void CreateTypeProperty(SerializedProperty property)
             TypeUtilities.TryGetTypeFromManagedReferenceFullTypeName(property.managedReferenceFullTypename, out var currentType);
             var position = EditorGUILayout.GetControlRect(false, EditorGUIUtility.singleLineHeight);
             position = EditorGUI.IndentedRect(position);
-            typeField.OnSelect = (type) =>
+            typeField.OnGui(position, true, (type) =>
             {
                 try
                 {
@@ -43,8 +43,7 @@ private void CreateTypeProperty(SerializedProperty property)
                 {
                     ToolboxEditorLog.LogWarning("Invalid attempt to update disposed property.");
                 }
-            };
-            typeField.OnGui(position, true, currentType, propertyType);
+            }, currentType, propertyType);
         }
 
         private void UpdateTypeProperty(SerializedProperty property, Type referenceType)

Assets/Editor Toolbox/Editor/Internal/TypeField.cs

@@ -39,7 +39,12 @@ private Type RetriveSelectedType(IReadOnlyList<Type> types, int selectedIndex, b
         }
 
 
-        public void OnGui(Rect position, bool addSearchField, Type activeType)
+        public void OnGui(Rect position, bool addSearchField, Action<Type> onSelect)
+        {
+            OnGui(position, addSearchField, onSelect, null);
+        }
+
+        public void OnGui(Rect position, bool addSearchField, Action<Type> onSelect, Type activeType)
         {
             var collection = TypeUtilities.GetCollection(AppearanceContext);
             var values = collection.Values;
@@ -53,7 +58,7 @@ public void OnGui(Rect position, bool addSearchField, Type activeType)
                 ToolboxEditorGui.DrawSearchablePopup(position, buttonLabel, index, labels, (i) =>
                 {
                     var type = RetriveSelectedType(values, i, addEmptyValue);
-                    OnSelect?.Invoke(type);
+                    onSelect?.Invoke(type);
                 });
             }
             else
@@ -65,16 +70,16 @@ public void OnGui(Rect position, bool addSearchField, Type activeType)
                     if (EditorGUI.EndChangeCheck())
                     {
                         var type = RetriveSelectedType(values, index, addEmptyValue);
-                        OnSelect?.Invoke(type);
+                        onSelect?.Invoke(type);
                     }
                 }
             }
         }
 
-        public void OnGui(Rect position, bool addSearchField, Type activeType, Type parentType)
+        public void OnGui(Rect position, bool addSearchField, Action<Type> onSelect, Type activeType, Type parentType)
         {
             ConstraintContext.ApplyTarget(parentType);
-            OnGui(position, addSearchField, activeType);
+            OnGui(position, addSearchField, onSelect, activeType);
         }
 
 
@@ -97,7 +102,5 @@ public TypeAppearanceContext AppearanceContext
                 ConstraintContext = appearanceContext.Constraint;
             }
         }
-
-        public Action<Type> OnSelect { get; set; }
     }
 }