Possibility to use Lists in the SearchablePopups; minor refactor changes

Author: arimger

Assets/Editor Toolbox/Editor/Internal/SearchablePopup.cs

@@ -17,12 +17,11 @@ public class SearchablePopup : PopupWindowContent
         /// <summary>
         /// Creates searchable popup using given properties.
         /// </summary>
-        public static void Show(Rect activatorRect, int current, string[] options, Action<int> onSelect)
+        public static void Show(Rect activatorRect, int current, IReadOnlyList<string> options, Action<int> onSelect)
         {
             PopupWindow.Show(activatorRect, new SearchablePopup(activatorRect, current, options, onSelect));
         }
 
-
         private readonly Action<int> onSelect;
 
         private readonly SearchArray searchArray;
@@ -35,12 +34,11 @@ public static void Show(Rect activatorRect, int current, string[] options, Actio
         private Rect activatorRect;
         private Rect toolbarRect;
         private Rect contentRect;
-        
 
         /// <summary>
-        /// Constructor should be called only internally by the <see cref="Show(Rect, int, string[], Action{int})"/> method.
+        /// Constructor should be called only internally by the <see cref="Show(Rect, int, IReadOnlyList{String}, Action{int})"/> method.
         /// </summary>
-        private SearchablePopup(Rect activatorRect, int startIndex, string[] options, Action<int> onSelect)
+        private SearchablePopup(Rect activatorRect, int startIndex, IReadOnlyList<string> options, Action<int> onSelect)
         {
             this.activatorRect = activatorRect;
 
@@ -57,7 +55,6 @@ private SearchablePopup(Rect activatorRect, int startIndex, string[] options, Ac
             };
         }
 
-
         private void SelectItem(int index)
         {
             onSelect(index);
@@ -228,7 +225,6 @@ public override void OnGUI(Rect rect)
             GUI.enabled = false;
         }
 
-
         private class SearchArray
         {
             public struct Item
@@ -243,19 +239,16 @@ public Item(int index, string label)
                 }
             }
 
-
             private readonly List<Item> items;
-            private readonly string[] options;
+            private readonly IReadOnlyList<string> options;
 
-
-            public SearchArray(string[] options)
+            public SearchArray(IReadOnlyList<string> options)
             {
                 this.options = options;
                 items = new List<Item>();
                 Search(string.Empty);
             }
 
-
             public bool Search(string filter)
             {
                 if (Filter == filter)
@@ -265,7 +258,8 @@ public bool Search(string filter)
 
                 items.Clear();
                 var simplifiedFilter = filter.ToLower();
-                for (var i = 0; i < options.Length; i++)
+                var optionsCount = options.Count;
+                for (var i = 0; i < optionsCount; i++)
                 {
                     var option = options[i];
                     if (string.IsNullOrEmpty(filter) || option.ToLower().Contains(simplifiedFilter))
@@ -291,7 +285,6 @@ public Item GetItemAt(int index)
                 return items[index];
             }
 
-
             public int ItemsCount => items.Count;
 
             public string Filter { get; private set; }

Assets/Examples/Editor/SampleToolbar.cs

@@ -1,9 +1,8 @@
-using UnityEngine;
-using UnityEngine.SceneManagement;
+using Toolbox.Editor;
 using UnityEditor;
 using UnityEditor.SceneManagement;
-
-using Toolbox.Editor;
+using UnityEngine;
+using UnityEngine.SceneManagement;
 
 [InitializeOnLoad]
 public static class SampleToolbar
@@ -13,7 +12,6 @@ public static class SampleToolbar
     /// </summary>
     private readonly static string mySampleSceneName = "SampleScene";
 
-
     static SampleToolbar()
     {
         EditorSceneManager.sceneOpened -= SceneOpenedCallback;
@@ -23,7 +21,6 @@ static SampleToolbar()
         EditorApplication.update += ValidateFirstScene;
     }
 
-
     /// <summary>
     /// This method is used to validate first scene after Editor launch.
     /// </summary>
@@ -35,8 +32,8 @@ private static void ValidateFirstScene()
         }
 
         EditorApplication.update -= ValidateFirstScene;
-
-        SceneOpenedCallback(SceneManager.GetActiveScene(), OpenSceneMode.Single);
+        var activeScene = SceneManager.GetActiveScene();
+        SceneOpenedCallback(activeScene, OpenSceneMode.Single);
     }
 
     /// <summary>
@@ -51,10 +48,10 @@ private static void SceneOpenedCallback(Scene scene, OpenSceneMode mode)
         {
             return;
         }
+
         ToolboxEditorToolbar.OnToolbarGui += OnToolbarGui;
     }
 
-
     /// <summary>
     /// Layout-based GUI call.
     /// </summary>
@@ -65,21 +62,23 @@ private static void OnToolbarGui()
         {
             Debug.Log("1");
         }
+
         if (GUILayout.Button(Style.sampleContent1, Style.commandMidStyle))
         {
             Debug.Log("2");
         }
+
         if (GUILayout.Button(Style.sampleContent2, Style.commandMidStyle))
         {
             Debug.Log("3");
         }
+
         if (GUILayout.Button("4", Style.commandRightStyle))
         {
             Debug.Log("4");
         }
     }
 
-
     private static class Style
     {
         internal static readonly GUIStyle commandMidStyle = new GUIStyle("CommandMid")