Merge pull request #42 from brunomikoski/feature/searcheable_popup

Feature/searcheable popup

Author: brunomikoski

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.3.0]
+### Added
+ - Advanced dropdown for better searching on big collections;
+
 ## [1.2.9]
 ### Changed
  - Fixed issue with the Foldout issue, now showing multiple inherited collectables should work fine
@@ -154,6 +158,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### [Unreleased]
 
+[1.3.0]: https://github.com/badawe/ScriptableObjectCollection/releases/tag/v1.3.0
 [1.2.9]: https://github.com/badawe/ScriptableObjectCollection/releases/tag/v1.2.9
 [1.2.8]: https://github.com/badawe/ScriptableObjectCollection/releases/tag/v1.2.8
 [1.2.7]: https://github.com/badawe/ScriptableObjectCollection/releases/tag/v1.2.7

Scripts/Editor/CollectableDropdown.cs

@@ -0,0 +1,68 @@
+using System;
+using System.Linq;
+using UnityEditor.IMGUI.Controls;
+using UnityEngine;
+
+namespace BrunoMikoski.ScriptableObjectCollections
+{
+    public sealed class CollectableDropdown : AdvancedDropdown
+    {
+        private ScriptableObjectCollection collection;
+        private Action<CollectableScriptableObject> callback;
+
+        public CollectableDropdown(AdvancedDropdownState state, ScriptableObjectCollection collection) : base(state)
+        {
+            this.collection = collection;
+            this.minimumSize = new Vector2(200, 300);
+        }
+
+        protected override AdvancedDropdownItem BuildRoot()
+        {
+            Type collectableType = collection.GetCollectionType();
+            AdvancedDropdownItem root = new AdvancedDropdownItem(collectableType.Name);
+
+            root.AddChild(new AdvancedDropdownItem("None"));
+            for (int i = 0; i < collection.Items.Count; i++)
+            {
+                CollectableScriptableObject collectionItem = collection.Items[i];
+                if (collectionItem.GetType() == collectableType)
+                    root.AddChild(new CollectableDropdownItem(collectionItem));
+                else
+                {
+                    AdvancedDropdownItem parent = GetOrCreateDropdownItemForType(root, collectionItem);
+                    parent.AddChild(new CollectableDropdownItem(collectionItem));
+                }
+            }
+            return root;
+        }
+
+        private AdvancedDropdownItem GetOrCreateDropdownItemForType(AdvancedDropdownItem root,
+            CollectableScriptableObject collectionItem)
+        {
+            AdvancedDropdownItem item = root.children.FirstOrDefault(dropdownItem =>
+                dropdownItem.name.Equals(collectionItem.GetType().Name, StringComparison.Ordinal));
+            if (item == null)
+            {
+                item = new AdvancedDropdownItem(collectionItem.GetType().Name);
+                root.AddChild(item);
+            }
+
+            return item;
+        }
+
+        protected override void ItemSelected(AdvancedDropdownItem item)
+        {
+            base.ItemSelected(item);
+            if (item is CollectableDropdownItem collectableDropdownItem)
+                callback?.Invoke(collectableDropdownItem.Collectable);
+            else
+                callback?.Invoke(null);
+        }
+
+        public void Show(Rect rect, Action<CollectableScriptableObject> onSelectedCallback)
+        {
+            callback = onSelectedCallback;
+            base.Show(rect);
+        }
+    }
+}

Scripts/Editor/CollectableDropdown.cs.meta

@@ -0,0 +1,14 @@
+using UnityEditor.IMGUI.Controls;
+
+namespace BrunoMikoski.ScriptableObjectCollections
+{
+    public sealed class CollectableDropdownItem : AdvancedDropdownItem
+    {
+        internal readonly CollectableScriptableObject Collectable;
+
+        public CollectableDropdownItem(CollectableScriptableObject targetCollectable) : base(targetCollectable.name)
+        {
+            Collectable = targetCollectable;
+        }
+    }
+}

Scripts/Editor/CollectableDropdownItem.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using UnityEditor;
+using UnityEditor.IMGUI.Controls;
 using UnityEngine;
 using Object = UnityEngine.Object;
 
@@ -35,6 +36,8 @@ private CollectableEditorOptionsAttribute optionsAttribute
         private CollectableScriptableObject collectableItem;
         private Object currentObject;
 
+        private CollectableDropdown dropDown;
+
         ~CollectableScriptableObjectPropertyDrawer()
         {
             if(collectableItem.IsNull())
@@ -92,7 +95,7 @@ public override void OnGUI(Rect position, SerializedProperty property, GUIConten
                     {
                         EditorGUI.showMixedValue = property.hasMultipleDifferentValues;
 
-                        DrawDropDown(popupRect, property);
+                        DrawSearchablePopup(popupRect, property);
 
                         break;
                     }
@@ -155,37 +158,37 @@ private void Initialize(SerializedProperty property)
             collection = resultCollection;
 
             options = collection.Items.ToArray();
-            List<string> displayOptions = collection.Items.Select(o => o.name).ToList();
+            List<string> displayOptions = GetDisplayOptions();
             displayOptions.Insert(0, CollectionEditorGUI.DEFAULT_NONE_ITEM_TEXT);
 
             optionsNames = displayOptions.ToArray();
             GUIContents = optionsNames.Select(s => new GUIContent(s)).ToArray();
 
             currentObject = property.serializedObject.targetObject;
             initialized = true;
+            
+            dropDown = new CollectableDropdown(new AdvancedDropdownState(), collection);
         }
 
-        private void DrawDropDown(Rect position, SerializedProperty property)
+        private List<string> GetDisplayOptions()
         {
-            using (EditorGUI.ChangeCheckScope changedCheck = new EditorGUI.ChangeCheckScope())
-            {
-                int selectedIndex = 0;
-
-                if (collectableItem != null)
-                    selectedIndex = Array.IndexOf(options, collectableItem) + 1;
-
-
-                int newSelectedIndex = EditorGUI.Popup(position, selectedIndex,
-                    GUIContents, EditorStyles.popup);
+            return collection.Items.Select(o => o.name).ToList();
+        }
 
-                newSelectedIndex -= 1;
+        private void DrawSearchablePopup(Rect position, SerializedProperty property)
+        {
+            int selectedIndex = 0;
 
-                collectableItem = newSelectedIndex >= 0 ? options[newSelectedIndex] : null;
-                if (changedCheck.changed)
+            if (collectableItem != null)
+                selectedIndex = Array.IndexOf(options, collectableItem) + 1;
+            
+            if (GUI.Button(position, GUIContents[selectedIndex], EditorStyles.popup))
+            {
+                dropDown.Show(position, o =>
                 {
-                    property.objectReferenceValue = collectableItem;
+                    property.objectReferenceValue = o;
                     property.serializedObject.ApplyModifiedProperties();
-                }
+                });
             }
         }