Merge pull request #127 from brunomikoski/feature/fix-editor-serialization-issues

add: changes

Author: brunomikoski

CHANGELOG.MD

@@ -6,6 +6,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+
+## [2.0.9]
+### Changed
+- Editor serialization issues with new drawing methods.
+- Added sorting options for collections
+- Added option to make the collection not reorderable
+- Fixed issue with post processing and recent imported files
+
 ## [2.0.8]
 ### Changed
 - Fixed a small typo in the package description.
@@ -468,6 +476,7 @@ public bool IsValidConsumable(Consumable consumable)
 ### Added 
  - First initial working version 
 
+[2.0.9]: https://github.com/badawe/ScriptableObjectCollection/releases/tag/v2.0.9
 [2.0.8]: https://github.com/badawe/ScriptableObjectCollection/releases/tag/v2.0.8
 [2.0.7]: https://github.com/badawe/ScriptableObjectCollection/releases/tag/v2.0.7
 [2.0.6]: https://github.com/badawe/ScriptableObjectCollection/releases/tag/v2.0.6

Scripts/Editor/CustomEditors/CollectionCustomEditor.cs

@@ -30,7 +30,9 @@ public class CollectionCustomEditor : BaseEditor<CollectionCustomEditor>
         protected int lastCheckedForValidItemsArraySize;
         private readonly Dictionary<int, Rect> itemIndexToRect = new();
         private float? reorderableListYPosition;
+        private Dictionary<Object, SerializedObject> collectionItemSerializedObjectCache = new();
 
+        protected virtual bool CanBeReorderable => true;
         protected virtual bool DisplayAddButton => true;
         protected virtual bool DisplayRemoveButton => true;
         protected virtual bool AllowCustomTypeCreation => true;
@@ -61,7 +63,7 @@ protected virtual void OnEnable()
 
         private void CreateReorderableList()
         {
-            reorderableList = new ReorderableList(serializedObject, itemsSerializedProperty, true, true, DisplayAddButton, DisplayRemoveButton);
+            reorderableList = new ReorderableList(serializedObject, itemsSerializedProperty, CanBeReorderable, true, DisplayAddButton, DisplayRemoveButton);
             reorderableList.drawElementCallback += DrawCollectionItemAtIndex;
             reorderableList.elementHeightCallback += GetCollectionItemHeight;
             reorderableList.onAddDropdownCallback += OnClickToAddNewItem;
@@ -141,7 +143,7 @@ private float GetCollectionItemHeight(int index)
         private void DrawCollectionItemAtIndex(Rect rect, int index, bool isActive, bool isFocused)
         {
             SerializedProperty collectionItemSerializedProperty = reorderableList.serializedProperty.GetArrayElementAtIndex(index);
-
+            
             if (itemHidden[index] || collectionItemSerializedProperty.objectReferenceValue == null)
                 return;
 
@@ -212,7 +214,7 @@ private void DrawCollectionItemAtIndex(Rect rect, int index, bool isActive, bool
             if (collectionItemSerializedProperty.isExpanded)
             {
                 rect.y += EditorGUIUtility.standardVerticalSpacing;
-
+                
                 if (SOCSettings.Instance.ShouldDrawUsingCustomEditor(collection))
                     DrawCustomEditor(ref rect, index, collectionItemSerializedProperty);
                 else
@@ -228,11 +230,18 @@ private void DrawProperties(ref Rect rect, int index, SerializedProperty collect
         {
             EditorGUI.indentLevel++;
 
-            SerializedObject collectionItemSerializedObject = new SerializedObject(collectionItemSerializedProperty.objectReferenceValue);
-            SerializedProperty iterator = collectionItemSerializedObject.GetIterator();
+            if (!collectionItemSerializedObjectCache.TryGetValue(collectionItemSerializedProperty.objectReferenceValue, out SerializedObject serializedObject))
+            {
+                serializedObject = new SerializedObject(collectionItemSerializedProperty.objectReferenceValue);
+                collectionItemSerializedObjectCache.Add(collectionItemSerializedProperty.objectReferenceValue, serializedObject);
+            }
 
+            serializedObject.Update();
+            
             using (EditorGUI.ChangeCheckScope changeCheck = new EditorGUI.ChangeCheckScope())
             {
+                SerializedProperty iterator = serializedObject.GetIterator();
+
                 for (bool enterChildren = true; iterator.NextVisible(enterChildren); enterChildren = false)
                 {
                     bool guiEnabled = GUI.enabled;
@@ -241,14 +250,15 @@ private void DrawProperties(ref Rect rect, int index, SerializedProperty collect
 
                     EditorGUI.PropertyField(rect, iterator, true);
                     GUI.enabled = guiEnabled;
-                    
+
                     rect.y += EditorGUI.GetPropertyHeight(iterator, true) +
                               EditorGUIUtility.standardVerticalSpacing;
                 }
-
+                
                 if (changeCheck.changed)
-                    iterator.serializedObject.ApplyModifiedProperties();
+                    serializedObject.ApplyModifiedProperties();
             }
+
             EditorGUI.indentLevel--;
         }
 
@@ -268,16 +278,16 @@ private void DrawCustomEditor(ref Rect rect, int index, SerializedProperty colle
                 GUILayout.BeginArea(actualRect);
                 EditorGUI.indentLevel++;
 
-                EditorGUI.BeginChangeCheck();
+                // EditorGUI.BeginChangeCheck();
                 editor.OnInspectorGUI();
 
                 EditorGUI.indentLevel--;
                 GUILayout.EndArea();
 
-                if (EditorGUI.EndChangeCheck())
-                {
-                    collectionItemSerializedProperty.serializedObject.ApplyModifiedProperties();
-                }
+                // if (EditorGUI.EndChangeCheck())
+                // {
+                //     collectionItemSerializedProperty.serializedObject.ApplyModifiedProperties();
+                // }
 
                 rect.y += actualRect.height;
             }
@@ -415,6 +425,7 @@ private void DuplicateItem(int index)
         public override void OnInspectorGUI()
         {
             base.BeginInspector();
+            EditorGUI.BeginChangeCheck();
             HideProperties();
 
             ValidateCollectionItems();
@@ -434,6 +445,8 @@ public override void OnInspectorGUI()
             DrawSettings();
             CheckForKeyboardShortcuts();
             DrawRemainingPropertiesInInspector();
+            if (EditorGUI.EndChangeCheck())
+                serializedObject.ApplyModifiedProperties();
         }
 
         private void CheckHeightsAndHiddenArraySizes()
@@ -449,12 +462,16 @@ private void DrawSynchronizeButton()
         {
             if (GUILayout.Button("Synchronize Assets"))
             {
-                collection.RefreshCollection();
-                serializedObject.Update();
-                CheckHeightsAndHiddenArraySizes();
+                SynchronizeAssets();
             }
         }
 
+        protected virtual void SynchronizeAssets()
+        {
+            collection.RefreshCollection();
+            CheckHeightsAndHiddenArraySizes();
+        }
+
         private void CheckForKeyboardShortcuts()
         {
             if (reorderableList.index == -1)

Scripts/Editor/Processors/CollectionsAssetsPostProcessor.cs

@@ -35,27 +35,22 @@ static void OnPostprocessAllAssets(string[] importedAssets, string[] deletedAsse
                         {
                             if (socItem.Collection == null)
                             {
-                                Debug.LogError(
-                                    $"CollectionItem ({collectionItem.name}) has null Collection, please assign it some Collection",
-                                    collectionItem
-                                );
+                                continue;
                             }
-                            else
+
+                            if (!socItem.Collection.Contains(collectionItem))
                             {
-                                if (!socItem.Collection.Contains(collectionItem))
+                                if (socItem.Collection.TryGetItemByGUID(socItem.GUID, out _))
                                 {
-                                    if (socItem.Collection.TryGetItemByGUID(socItem.GUID, out _))
-                                    {
-                                        Debug.LogWarning(
-                                            $"Collection already contains one item with the same GUID" +
-                                            $" ({socItem.GUID}) but different name ({socItem.name}), generating new GUID");
-                                        socItem.GenerateNewGUID();
-                                    }
-                                    
-                                    socItem.Collection.Add(collectionItem);
-                                    Debug.Log($"{collectionItem.name} has collection assigned "
-                                              + $"{socItem.Collection} but its missing from collection list, adding it");
+                                    Debug.LogWarning(
+                                        $"Collection already contains one item with the same GUID" +
+                                        $" ({socItem.GUID}) but different name ({socItem.name}), generating new GUID");
+                                    socItem.GenerateNewGUID();
                                 }
+                                    
+                                socItem.Collection.Add(collectionItem);
+                                Debug.Log($"{collectionItem.name} has collection assigned "
+                                          + $"{socItem.Collection} but its missing from collection list, adding it");
                             }
                         }
                     }

Scripts/Editor/Utils/EditorCache.cs.meta

@@ -204,15 +204,15 @@ private Type GetGenericItemType()
             return null;
         }
 
-        public virtual void Sort()
+        public void OrderByName()
         {
-            items.Sort();
+            items = items.OrderBy(o => o.name).ToList();
             ObjectUtility.SetDirty(this);
         }
 
-        public void OrderByName()
+        public void Sort(IComparer<ScriptableObject> comparer)
         {
-            items = items.OrderBy(o => o.name).ToList();
+            items.Sort(comparer);
             ObjectUtility.SetDirty(this);
         }
 
@@ -573,6 +573,7 @@ public bool Remove(TObjectType item)
             return remove;
         }
 
+        
         IEnumerator<TObjectType> IEnumerable<TObjectType>.GetEnumerator()
         {
             using (IEnumerator<ScriptableObject> enumerator = base.GetEnumerator())

Scripts/Runtime/Core/ScriptableObjectCollection.cs

@@ -1,7 +1,7 @@
 {
   "name": "com.brunomikoski.scriptableobjectcollection",
   "displayName": "Scriptable Object Collection",
-  "version": "2.0.8",
+  "version": "2.0.9",
   "unity": "2021.2",
   "description": "A library to help improve the usability of Unity3D Scriptable Objects by grouping them into a collection and exposing them by code or nice inspectors!",
   "keywords": [