Merge pull request #72 from brunomikoski/feature/indirect-reference-property-drawer-revamp

Feature/indirect reference property drawer revamp

Author: brunomikoski

CHANGELOG.MD

@@ -5,6 +5,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 
+## [1.5.6]
+### Changed
+- Improved the Refreshing of the `CollectionRegistry` to try to refresh when items are deleted/created
+- Refactored the `IndirectReference` to not need a serialized version of the `CollectionItem` type, so avoid any serialization issues
+- Renamed some of the editor classes to match the standard
+
 ## [1.5.5]
 ### Changed
 - In order to support multiple collections of the same type the check of the `Values` I had to tweak how the instance of every instance its assigned, changed for the `OnEnable` of the collection item
@@ -22,7 +28,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - The settings are now on the Project Preferences where you can define the default folder for the Scriptable Objects and default namespace.
 - Removed the `ReadOnlyList` on the `Collection`, the casting was expensive and was an unnecessary safety measure
 
-
 ## [1.5.3]
 ### Changed
 - Disabled the reload of the collection after script reloading on batch mode. 
@@ -240,6 +245,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Unreleased
 
 
+[1.5.6]: https://github.com/badawe/ScriptableObjectCollection/releases/tag/v1.5.6
 [1.5.5]: https://github.com/badawe/ScriptableObjectCollection/releases/tag/v1.5.5
 [1.5.4]: https://github.com/badawe/ScriptableObjectCollection/releases/tag/v1.5.4
 [1.5.3]: https://github.com/badawe/ScriptableObjectCollection/releases/tag/v1.5.3

Scripts/Editor/Core/CollectionCustomEditor.cs

@@ -59,6 +59,16 @@ private void OnDisable()
             ObjectUtility.SetDirty(collection);
         }
 
+        private void OnDestroy()
+        {
+            if (Application.isPlaying)
+                return;
+            
+#if UNITY_EDITOR
+            CollectionsRegistry.Instance.DeleteCollection(collection);
+#endif
+        }
+
         private void ValidateGUIDS()
         {
             collection.ValidateGUID();

Scripts/Editor/Core/CollectionItemDropdown.cs

@@ -66,16 +66,16 @@ protected override void ItemSelected(AdvancedDropdownItem item)
             {
                 ScriptableObjectCollection collection = collections.First();
                 ScriptableObjectCollectionItem collectionItem = collection.AddNew(itemType);
-                callback?.Invoke(collectionItem);
+                callback.Invoke(collectionItem);
                 Selection.objects = new Object[] {collection};
                 CollectionCustomEditor.SetLastAddedEnum(collectionItem);
                 return;
             }
 
             if (item is CollectionItemDropdownItem dropdownItem)
-                callback?.Invoke(dropdownItem.CollectionItem);
+                callback.Invoke(dropdownItem.CollectionItem);
             else
-                callback?.Invoke(null);
+                callback.Invoke(null);
         }
 
         public void Show(Rect rect, Action<ScriptableObjectCollectionItem> onSelectedCallback)

Scripts/Editor/Core/CollectionItemIndirectReferenceDrawer.cs

@@ -0,0 +1,95 @@
+using System;
+using System.Linq;
+using UnityEditor;
+using UnityEngine;
+
+namespace BrunoMikoski.ScriptableObjectCollections
+{
+    [CustomPropertyDrawer(typeof(CollectionItemIndirectReference), true)]
+    public sealed class CollectionItemIndirectReferencePropertyDrawer : PropertyDrawer
+    {
+        private const string COLLECTION_ITEM_GUID_PROPERTY_PATH = "collectionItemGUID";
+        private const string COLLECTION_GUID_PROPERTY_PATh = "collectionGUID";
+
+        private Type collectionItemType;
+        private CollectionItemItemPropertyDrawer collectionItemPropertyDrawer;
+
+        public override void OnGUI(Rect position, SerializedProperty property, GUIContent label)
+        {
+            if (collectionItemType == null)
+            {
+                Type arrayOrListType = fieldInfo.FieldType.GetArrayOrListType();
+                Type properFieldType = arrayOrListType != null ? arrayOrListType : fieldInfo.FieldType;
+                collectionItemType = GetGenericItemType(properFieldType).GetGenericArguments().First();
+            }
+
+            if (collectionItemPropertyDrawer == null)
+            {
+                collectionItemPropertyDrawer = new CollectionItemItemPropertyDrawer();
+                collectionItemPropertyDrawer.Initialize(collectionItemType, null);
+            }
+            
+            SerializedProperty collectionItemGUIDSerializedProperty = property.FindPropertyRelative(COLLECTION_ITEM_GUID_PROPERTY_PATH);
+            SerializedProperty collectionGUIDSerializedProperty = property.FindPropertyRelative(COLLECTION_GUID_PROPERTY_PATh);
+            
+            ScriptableObjectCollectionItem collectionItem = null;
+            
+            if (!string.IsNullOrEmpty(collectionItemGUIDSerializedProperty.stringValue)
+                && !string.IsNullOrEmpty(collectionGUIDSerializedProperty.stringValue))
+            {
+                if (CollectionsRegistry.Instance.TryGetCollectionByGUID(collectionGUIDSerializedProperty.stringValue,
+                    out ScriptableObjectCollection collection))
+                {
+                    if (collection.TryGetItemByGUID(collectionItemGUIDSerializedProperty.stringValue,
+                        out ScriptableObjectCollectionItem resultCollection))
+                    {
+                        collectionItem = resultCollection;
+                    }
+                }
+            }
+
+            int indexOfArrayPart = property.propertyPath.IndexOf('[');
+
+            if (indexOfArrayPart > -1)
+            {
+                if (string.Equals(label.text, collectionItemGUIDSerializedProperty.stringValue, StringComparison.Ordinal))
+                {
+                    label.text = $"Element {property.propertyPath.Substring(indexOfArrayPart+1, 1)}";
+                }
+            }
+            
+            collectionItemPropertyDrawer.DrawCollectionItemDrawer(
+                position, collectionItem, label,
+                item =>
+                {
+                    string collectionItemGUID = string.Empty;
+                    string collectionGUID = string.Empty;
+                    if (item != null)
+                    {
+                        collectionItemGUID = item.GUID;
+                        collectionGUID = item.Collection.GUID;
+                    }
+                    
+                    collectionItemGUIDSerializedProperty.stringValue = collectionItemGUID;
+                    collectionGUIDSerializedProperty.stringValue = collectionGUID;
+                    collectionItem = item;
+                    property.serializedObject.ApplyModifiedProperties();
+                }
+            );
+        }
+
+        private Type GetGenericItemType(Type targetType)
+        {
+            Type baseType = targetType.BaseType;
+
+            while (baseType != null)
+            {
+                if (baseType.IsGenericType && baseType.GetGenericTypeDefinition() == typeof(CollectionItemIndirectReference<>))
+                    return baseType;
+                baseType = baseType.BaseType;
+            }
+            return null;
+        }
+    }
+}
+