fix: simplified display for multiple collections dropdown

Author: Bruno Mikoski

CHANGELOG.MD

@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 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.1]
+### Changed
+- Simplified the multiple collection display to be a single line again, showing all the available items inside the `AdvancedDropdown`
+
 ## [1.5.0]
 ### Changed
 - Refactored the `Collectable` for `CollectionItem` this has several changes in multiple parts of the code, I tried my best to keep compability with the old version as well.
@@ -209,7 +213,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### [Unreleased]
 
 
-
+[1.5.1]: https://github.com/badawe/ScriptableObjectCollection/releases/tag/v1.5.1
+[1.5.0]: https://github.com/badawe/ScriptableObjectCollection/releases/tag/v1.5.0
 [1.4.1]: https://github.com/badawe/ScriptableObjectCollection/releases/tag/v1.4.1
 [1.4.0]: https://github.com/badawe/ScriptableObjectCollection/releases/tag/v1.4.0
 [1.3.2]: https://github.com/badawe/ScriptableObjectCollection/releases/tag/v1.3.2

Scripts/Editor/Core/CollectionDropdownItem.cs

@@ -1,4 +1,6 @@
 using System;
+using System.Collections.Generic;
+using System.Linq;
 using UnityEditor;
 using UnityEditor.IMGUI.Controls;
 using UnityEngine;
@@ -9,29 +11,50 @@ namespace BrunoMikoski.ScriptableObjectCollections
     public sealed class CollectionItemDropdown : AdvancedDropdown
     {
         private const string CREATE_NEW_TEXT = "+ Create New";
-        private readonly ScriptableObjectCollection collection;
         private Action<ScriptableObjectCollectionItem> callback;
+        private readonly List<ScriptableObjectCollection> collections;
 
-        public CollectionItemDropdown(AdvancedDropdownState state, ScriptableObjectCollection collection) : base(state)
+        private Type itemType;
+
+        public CollectionItemDropdown(AdvancedDropdownState state, Type targetItemType) : base(state)
         {
-            this.collection = collection;
-            this.minimumSize = new Vector2(200, 300);
+            itemType = targetItemType;
+            collections = CollectionsRegistry.Instance.GetCollectionsByItemType(itemType);
+            minimumSize = new Vector2(200, 300);
         }
 
         protected override AdvancedDropdownItem BuildRoot()
         {
-            Type collectionItemType = collection.GetItemType();
-            AdvancedDropdownItem root = new AdvancedDropdownItem(collectionItemType.Name);
+            AdvancedDropdownItem root = new AdvancedDropdownItem(itemType.Name);
 
             root.AddChild(new AdvancedDropdownItem("None"));
             root.AddSeparator();
-            for (int i = 0; i < collection.Count; i++)
+
+            AdvancedDropdownItem targetParent = root;
+            bool multipleCollections = collections.Count > 1;
+            for (int i = 0; i < collections.Count; i++)
             {
-                ScriptableObjectCollectionItem collectionItem = collection[i];
-                root.AddChild(new CollectionItemDropdownItem(collectionItem));
+                ScriptableObjectCollection collection = collections[i];
+                
+                if (multipleCollections)
+                {
+                    AdvancedDropdownItem collectionParent = new AdvancedDropdownItem(collection.name);
+                    root.AddChild(collectionParent);
+                    targetParent = collectionParent;
+                }
+
+                for (int j = 0; j < collection.Count; j++)
+                {
+                    ScriptableObjectCollectionItem collectionItem = collection[j];
+                    targetParent.AddChild(new CollectionItemDropdownItem(collectionItem));
+                }
+            }
+
+            if (!multipleCollections)
+            {
+                root.AddSeparator();
+                root.AddChild(new AdvancedDropdownItem(CREATE_NEW_TEXT));
             }
-            root.AddSeparator();
-            root.AddChild(new AdvancedDropdownItem(CREATE_NEW_TEXT));
             return root;
         }
 
@@ -41,7 +64,8 @@ protected override void ItemSelected(AdvancedDropdownItem item)
 
             if (item.name.Equals(CREATE_NEW_TEXT, StringComparison.OrdinalIgnoreCase))
             {
-                ScriptableObjectCollectionItem collectionItem = collection.AddNew(collection.GetItemType());
+                ScriptableObjectCollection collection = collections.First();
+                ScriptableObjectCollectionItem collectionItem = collection.AddNew(itemType);
                 callback?.Invoke(collectionItem);
                 Selection.objects = new Object[] {collection};
                 CollectionCustomEditor.SetLastAddedEnum(collectionItem);

Scripts/Editor/Core/CollectionItemDropdown.cs

@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
 using UnityEditor;
 using UnityEditor.IMGUI.Controls;
 using UnityEngine;
@@ -27,30 +25,12 @@ private CollectionItemEditorOptionsAttribute OptionsAttribute
         }
 
         private bool initialized;
-        private ScriptableObjectCollection collection;
 
-        private ScriptableObjectCollectionItem[] options;
-        private GUIContent[] guiContents;
-        
-        private ScriptableObjectCollectionItem item;
         private Object currentObject;
 
         private CollectionItemDropdown collectionItemDropdown;
+        private ScriptableObjectCollectionItem item;
 
-        private ScriptableObjectCollection[] availableCollections;
-        private GUIContent[] availableCollectionsGUIContents;
-
-        private bool singleCollection;
-        private CollectionsDropDown collectionsDropdown;
-
-        ~CollectionItemItemObjectPropertyDrawer()
-        {
-            if(item.IsNull())
-                return;
-
-            ObjectUtility.SetDirty(item);
-        }
-        
         private CollectionItemEditorOptionsAttribute GetOptionsAttribute()
         {
             if (fieldInfo == null)
@@ -62,14 +42,6 @@ object[] attributes
             return DefaultAttribute;
         }
 
-        public override float GetPropertyHeight(SerializedProperty property, GUIContent label)
-        {
-            if (singleCollection || OptionsAttribute.DrawType == DrawType.AsReference)
-                return base.GetPropertyHeight(property, label);
-            
-            return (EditorGUIUtility.singleLineHeight + EditorGUIUtility.standardVerticalSpacing) * 2;
-        }
-
         public override void OnGUI(Rect position, SerializedProperty property, GUIContent label)
         {
             Initialize(property);
@@ -93,13 +65,6 @@ public override void OnGUI(Rect position, SerializedProperty property, GUIConten
                 int indent = EditorGUI.indentLevel;
                 EditorGUI.indentLevel = 0;
 
-
-                if (!singleCollection)
-                {
-                    DrawCollectionDropDown(ref popupRect, property);
-                    popupRect.y += EditorGUIUtility.singleLineHeight + EditorGUIUtility.standardVerticalSpacing;
-                }
-                
                 if (item != null)
                 {
                     DrawEditFoldoutButton(ref popupRect);
@@ -137,97 +102,28 @@ public override void OnGUI(Rect position, SerializedProperty property, GUIConten
             }
         }
 
-        private void DrawCollectionDropDown(ref Rect popupRect, SerializedProperty property)
-        {
-            int index = 0;
-            if (collection != null)
-                index = Array.IndexOf(availableCollections, collection) + 1;
-
-            if (GUI.Button(popupRect, availableCollectionsGUIContents[index], EditorStyles.popup))
-            {
-                collectionsDropdown.Show(popupRect, objectCollection =>
-                    {
-                        OnCollectionChanged(objectCollection, property);
-                    }
-                );
-            }
-        }
-
-        private void OnCollectionChanged(ScriptableObjectCollection scriptableObjectCollection, SerializedProperty property)
-        {
-            if (scriptableObjectCollection == null)
-            {
-                collection = null;
-                property.objectReferenceValue = null;
-                property.serializedObject.ApplyModifiedProperties();
-                return;
-            }
-
-            collection = scriptableObjectCollection;
-            options = collection.Items.ToArray();
-            List<string> displayOptions = collection.Items.Select(o => o.name).ToList();
-            displayOptions.Insert(0, CollectionEditorGUI.DEFAULT_NONE_ITEM_TEXT);
-            
-            string[] optionsNames = displayOptions.ToArray();
-            guiContents = optionsNames.Select(s => new GUIContent(s)).ToArray();
-            collectionItemDropdown = new CollectionItemDropdown(new AdvancedDropdownState(), collection);
-        }
-
         private void Initialize(SerializedProperty property)
         {
             if (initialized)
                 return;
             Type arrayOrListType = fieldInfo.FieldType.GetArrayOrListType();
             Type itemType = arrayOrListType != null ? arrayOrListType : fieldInfo.FieldType;
-            
-            availableCollections = CollectionsRegistry.Instance.GetCollectionsByItemType(itemType).ToArray();
-            if (availableCollections.Length == 0)
-            {
-                OptionsAttribute.DrawType = DrawType.AsReference;
-                return;
-            }
-            
-            if (availableCollections.Length == 1)
-            {
-                singleCollection = true;
-                OnCollectionChanged(availableCollections.First(), property);
-            }
-            else
-            {
-                List<GUIContent> collectionsNames = availableCollections
-                    .Select(objectCollection => new GUIContent(objectCollection.name))
-                    .ToList();
-                
-                collectionsNames.Insert(0, new GUIContent("None"));
-                availableCollectionsGUIContents = collectionsNames.ToArray();
-
-                collectionsDropdown = new CollectionsDropDown(new AdvancedDropdownState(), availableCollections);
-
-                if (property.objectReferenceValue != null)
-                {
-                    if (property.objectReferenceValue is ScriptableObjectCollectionItem collectionItem)
-                    {
-                        OnCollectionChanged(collectionItem.Collection, property);
-                    }
-                }
-            }
 
+            collectionItemDropdown = new CollectionItemDropdown(
+                new AdvancedDropdownState(),
+                itemType
+            );
+            
             currentObject = property.serializedObject.targetObject;
             initialized = true;
         }
 
         private void DrawCollectionItemDropDown(ref Rect position, SerializedProperty property)
         {
-            bool guiEnabled = GUI.enabled;
-            if (collection == null)
-                GUI.enabled = false;
-            GUIContent displayValue = new GUIContent("Select Collection First");
+            GUIContent displayValue = new GUIContent("None");
 
-            if (collection != null)
-            {
-                int selectedIndex = Array.IndexOf(options, item) + 1;
-                displayValue = guiContents[selectedIndex];
-            }
+            if (item != null)
+                displayValue = new GUIContent(item.name);
 
             if (GUI.Button(position, displayValue, EditorStyles.popup))
             {
@@ -237,8 +133,6 @@ private void DrawCollectionItemDropDown(ref Rect position, SerializedProperty pr
                     property.serializedObject.ApplyModifiedProperties();
                 });
             }
-
-            GUI.enabled = guiEnabled;
         }
 
         private void DrawGotoButton(ref Rect popupRect)
@@ -250,8 +144,8 @@ private void DrawGotoButton(ref Rect popupRect)
             buttonRect.x += popupRect.width;
             if (GUI.Button(buttonRect, CollectionEditorGUI.ARROW_RIGHT_CHAR))
             {
-                Selection.activeObject = collection;
-                CollectionUtility.SetFoldoutOpen(true, item, collection);
+                Selection.activeObject = item.Collection;
+                CollectionUtility.SetFoldoutOpen(true, item, item.Collection);
             }
         }
 

Scripts/Editor/Core/CollectionItemItemObjectPropertyDrawer.cs

@@ -94,6 +94,21 @@ private void ValidateCurrentGUIDs()
             }
         }
 
+        public List<ScriptableObjectCollectionItem> GetAllCollectionItemsOfType(Type itemType)
+        {
+            List<ScriptableObjectCollectionItem> results = new List<ScriptableObjectCollectionItem>();
+            for (int i = 0; i < collections.Count; i++)
+            {
+                ScriptableObjectCollection scriptableObjectCollection = collections[i];
+                if (!scriptableObjectCollection.GetItemType().IsAssignableFrom(itemType))
+                    continue;
+
+                results.AddRange(scriptableObjectCollection.Items);
+            }
+
+            return results;
+        }
+        
         public List<ScriptableObjectCollection> GetCollectionsByItemType<T>() where T : ScriptableObjectCollectionItem
         {
             return GetCollectionsByItemType(typeof(T));

Scripts/Editor/Core/CollectionsDropDown.cs

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