Merge pull request #150 from brunomikoski/bugfix/fix-picker-property-drawer

Bugfix/fix picker property drawer

Author: brunomikoski

CHANGELOG.MD

@@ -5,6 +5,8 @@ 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).
 
 ## [Unreleased]
+## Changed
+- Update PickerPropertyDrawer to use PopupList from property path cache to avoid issue when rendered inside a List/Array
 
 ## [2.3.3]
 ## Added

Scripts/Editor/PropertyDrawers/CollectionItemPickerPropertyDrawer.cs

@@ -19,13 +19,15 @@ public class CollectionItemPickerPropertyDrawer : PropertyDrawer
 
         private const string ITEMS_PROPERTY_NAME = "cachedIndirectReferences";
 
-        private bool initialized;
-        private PopupList<PopupItem> popupList = new PopupList<PopupItem>();
         private static GUIStyle labelStyle;
         private static GUIStyle buttonStyle;
         private float buttonHeight = EditorGUIUtility.singleLineHeight;
         private List<ScriptableObjectCollection> possibleCollections;
-        private List<ScriptableObject> availableItems = new List<ScriptableObject>();
+        private List<ScriptableObject> availableItems = new();
+
+        private readonly HashSet<string> initializedPropertiesPaths = new();
+
+        private readonly Dictionary<string, PopupList<PopupItem>> propertyPathToPopupList = new();
 
         private readonly struct PopupItem : IPopupListItem
         {
@@ -46,9 +48,12 @@ public override float GetPropertyHeight(SerializedProperty property, GUIContent
 
         public override void OnGUI(Rect position, SerializedProperty property, GUIContent label)
         {
+            EditorGUI.BeginProperty(position, label, property);
+
             Initialize(property);
 
-            EditorGUI.BeginProperty(position, label, property);
+            PopupList<PopupItem> popupList = propertyPathToPopupList[property.propertyPath];
+
             position = EditorGUI.PrefixLabel(position, label);
 
             Rect totalPosition = position;
@@ -57,24 +62,24 @@ public override void OnGUI(Rect position, SerializedProperty property, GUIConten
             totalPosition.height = buttonHeight;
             buttonRect.height = buttonHeight;
 
-            // Calculate the rect for the + button
             float buttonWidth = 20f;
             Rect plusButtonRect = new Rect(position.xMax - buttonWidth, position.y, buttonWidth, buttonHeight);
 
-            // Adjust the total position rect to exclude the + button area
             totalPosition.width -= buttonWidth;
 
             if (!popupList.IsOpen)
-                SetSelectedValuesOnPopup(property);
+            {
+                SetSelectedValuesOnPopup(popupList, property);
+            }
 
             if (GUI.Button(totalPosition, "", buttonStyle))
             {
                 EditorWindow inspectorWindow = EditorWindow.focusedWindow;
 
                 popupList.OnClosedEvent += () =>
                 {
-                    GetValuesFromPopup(property);
-                    SetSelectedValuesOnPopup(property);
+                    GetValuesFromPopup(popupList, property);
+                    SetSelectedValuesOnPopup(popupList, property);
                 };
                 popupList.OnItemSelectedEvent += (x, y) => { inspectorWindow.Repaint(); };
                 PopupWindow.Show(buttonRect, popupList);
@@ -156,7 +161,7 @@ private void CreatAndAddNewItems(SerializedProperty property)
             itemsProperty.serializedObject.ApplyModifiedProperties();
         }
 
-        private void GetValuesFromPopup(SerializedProperty property)
+        private void GetValuesFromPopup(PopupList<PopupItem> popupList, SerializedProperty property)
         {
             SerializedProperty itemsProperty = property.FindPropertyRelative(ITEMS_PROPERTY_NAME);
             itemsProperty.ClearArray();
@@ -202,7 +207,7 @@ private void AssignItemGUIDToProperty(ScriptableObject scriptableObject, Seriali
             }
         }
 
-        private void SetSelectedValuesOnPopup(SerializedProperty property)
+        private void SetSelectedValuesOnPopup(PopupList<PopupItem> popupList, SerializedProperty property)
         {
             popupList.DeselectAll();
 
@@ -254,12 +259,11 @@ private LongGuid GetGUIDFromProperty(SerializedProperty property)
             return new LongGuid(itemGUIDValueASerializedProperty.longValue, itemGUIDValueBSerializedProperty.longValue);
         }
 
-
         private void Initialize(SerializedProperty property)
         {
-            if (initialized)
+            if (initializedPropertiesPaths.Contains(property.propertyPath))
                 return;
-            
+
             Type arrayOrListType = fieldInfo.FieldType.GetArrayOrListType();
             Type itemType = arrayOrListType ?? fieldInfo.FieldType;
 
@@ -269,7 +273,8 @@ private void Initialize(SerializedProperty property)
             if (!CollectionsRegistry.Instance.TryGetCollectionsOfItemType(itemType, out possibleCollections))
                 throw new Exception($"No collection found for item type {itemType}");
 
-            popupList.Clear();
+            propertyPathToPopupList.Add(property.propertyPath, new PopupList<PopupItem>());
+
             availableItems.Clear();
             for (int i = 0; i < possibleCollections.Count; i++)
             {
@@ -280,16 +285,16 @@ private void Initialize(SerializedProperty property)
 
                     if (scriptableObjectType != itemType && !scriptableObjectType.IsSubclassOf(itemType))
                         continue;
-                    
+
                     availableItems.Add(scriptableObject);
-                    popupList.AddItem(new PopupItem(scriptableObject), false);
+                    propertyPathToPopupList[property.propertyPath].AddItem(new PopupItem(scriptableObject), false);
                 }
             }
 
             buttonStyle = EditorStyles.textArea;
             GUIStyle assetLabelStyle = new GUIStyle(EditorGUIUtility.GetBuiltinSkin(EditorSkin.Inspector).FindStyle("AssetLabel"));
             labelStyle = assetLabelStyle;
-            initialized = true;
+            initializedPropertiesPaths.Add(property.propertyPath);
         }
     }
 }