feat: added passing serialized property to CustomObjectDrawer and Dropdown

Thundernerd · Thundernerd · commit 5913ab76e775 · 2022-07-24T17:16:20.000+02:00
diff --git a/Editor/Drawers/CustomObjectDrawer.cs b/Editor/Drawers/CustomObjectDrawer.cs
@@ -5,13 +5,13 @@ namespace TNRD.Drawers
 {
     public partial class CustomObjectDrawer
     {
-        public delegate void ButtonClickedDelegate(Rect position);
+        public delegate void ButtonClickedDelegate(Rect position, SerializedProperty property);
 
-        public delegate void ClickedDelegate();
+        public delegate void ClickedDelegate(SerializedProperty property);
 
-        public delegate void DeletePressedDelegate();
+        public delegate void DeletePressedDelegate(SerializedProperty property);
 
-        public delegate void PropertiesClickedDelegate();
+        public delegate void PropertiesClickedDelegate(SerializedProperty property);
 
         private bool isSelected;
 
@@ -21,18 +21,18 @@ public partial class CustomObjectDrawer
         public event ClickedDelegate Clicked;
         public event DeletePressedDelegate DeletePressed;
         public event PropertiesClickedDelegate PropertiesClicked;
-
-        public void OnGUI(Rect position, GUIContent label, GUIContent content)
+        
+        public void OnGUI(Rect position, GUIContent label, GUIContent content, SerializedProperty property)
         {
             Rect positionWithoutThumb = new Rect(position);
             positionWithoutThumb.xMax -= 20;
 
             position = DrawPrefixLabel(position, label);
             DrawObjectField(position, content);
-            DrawButton(position);
+            DrawButton(position, property);
 
-            HandleMouseDown(position, positionWithoutThumb);
-            HandleKeyDown();
+            HandleMouseDown(position, positionWithoutThumb, property);
+            HandleKeyDown(property);
         }
 
         private Rect DrawPrefixLabel(Rect position, GUIContent label)
@@ -66,7 +66,7 @@ private void ForceRepaintEditors()
             }
         }
 
-        private void DrawButton(Rect position)
+        private void DrawButton(Rect position, SerializedProperty property)
         {
             Rect buttonRect = new Rect(position);
             buttonRect.yMin += 1;
@@ -76,11 +76,11 @@ private void DrawButton(Rect position)
 
             if (GUI.Button(buttonRect, string.Empty, "objectFieldButton"))
             {
-                ButtonClicked?.Invoke(position);
+                ButtonClicked?.Invoke(position, property);
             }
         }
 
-        private void HandleMouseDown(Rect position, Rect positionWithoutThumb)
+        private void HandleMouseDown(Rect position, Rect positionWithoutThumb, SerializedProperty property)
         {
             if (Event.type != EventType.MouseDown)
                 return;
@@ -89,26 +89,26 @@ private void HandleMouseDown(Rect position, Rect positionWithoutThumb)
             {
                 isSelected = positionWithoutThumb.Contains(Event.mousePosition);
                 ForceRepaintEditors();
-                Clicked?.Invoke();
+                Clicked?.Invoke(property);
             }
             else if (Event.button == 1 && positionWithoutThumb.Contains(Event.mousePosition))
             {
                 GenericMenu menu = new GenericMenu();
-                menu.AddItem(new GUIContent("Clear"), false, () => { DeletePressed?.Invoke(); });
-                menu.AddItem(new GUIContent("Properties..."), false, () => { PropertiesClicked?.Invoke(); });
+                menu.AddItem(new GUIContent("Clear"), false, () => { DeletePressed?.Invoke(property); });
+                menu.AddItem(new GUIContent("Properties..."), false, () => { PropertiesClicked?.Invoke(property); });
                 menu.DropDown(position);
                 Event.Use();
             }
         }
 
-        private void HandleKeyDown()
+        private void HandleKeyDown(SerializedProperty property)
         {
             if (!isSelected)
                 return;
 
             if (Event.type == EventType.KeyDown && Event.keyCode == KeyCode.Delete)
             {
-                DeletePressed?.Invoke();
+                DeletePressed?.Invoke(property);
             }
         }
     }
diff --git a/Editor/Drawers/RawReferenceDrawer.cs b/Editor/Drawers/RawReferenceDrawer.cs
@@ -45,7 +45,7 @@ public void OnGUI(Rect position)
                 ? EditorGUIUtility.ObjectContent((MonoScript)null, typeof(MonoScript))
                 : new GUIContent(rawReferenceValue.GetType().Name, IconUtility.ScriptIcon);
 
-            CustomObjectDrawer.OnGUI(objectFieldRect, label, content);
+            CustomObjectDrawer.OnGUI(objectFieldRect, label, content, Property);
 
             HandleDragAndDrop(objectFieldRect);
 
@@ -79,13 +79,13 @@ private void DrawLine(Rect position)
             EditorGUI.DrawRect(line, Styles.LineColor);
         }
 
-        protected override void PingObject()
+        protected override void PingObject(SerializedProperty property)
         {
             // No support for pinging raw objects for now (I guess this would ping the MonoScript?)
         }
 
         /// <inheritdoc />
-        protected override void OnPropertiesClicked()
+        protected override void OnPropertiesClicked(SerializedProperty property)
         {
             if (RawReferenceValue == null)
                 return;
diff --git a/Editor/Drawers/ReferenceDrawer.cs b/Editor/Drawers/ReferenceDrawer.cs
@@ -67,18 +67,18 @@ protected void Initialize(SerializedProperty property, Type genericType, FieldIn
             FieldInfo = fieldInfo;
         }
 
-        private void OnButtonClicked(Rect position)
+        private void OnButtonClicked(Rect position, SerializedProperty property)
         {
             AdvancedDropdownState state = new AdvancedDropdownState();
             SerializableInterfaceAdvancedDropdown dropdown =
-                new SerializableInterfaceAdvancedDropdown(state, GenericType, GetRelevantScene());
+                new SerializableInterfaceAdvancedDropdown(state, GenericType, GetRelevantScene(property), property);
             dropdown.ItemSelectedEvent += OnItemSelected;
             dropdown.Show(position);
         }
 
-        private Scene? GetRelevantScene()
+        private static Scene? GetRelevantScene(SerializedProperty property)
         {
-            Object target = Property.serializedObject.targetObject;
+            Object target = property.serializedObject.targetObject;
 
             if (target is ScriptableObject)
                 return null;
@@ -90,30 +90,30 @@ private void OnButtonClicked(Rect position)
             return null;
         }
 
-        private void OnClicked()
+        private void OnClicked(SerializedProperty property)
         {
-            PingObject();
+            PingObject(property);
         }
 
-        private void OnDeletePressed()
+        private void OnDeletePressed(SerializedProperty property)
         {
-            ModeValue = default;
-            PropertyValue = null;
+            SetModeValue(property, default);
+            SetPropertyValue(property, null);
         }
 
-        private void OnItemSelected(ReferenceMode mode, object reference)
+        private void OnItemSelected(SerializedProperty property, ReferenceMode mode, object reference)
         {
-            ModeValue = mode;
-            PropertyValue = reference;
+            SetModeValue(property, mode);
+            SetPropertyValue(property, reference);
         }
 
-        protected abstract void OnPropertiesClicked();
+        protected abstract void OnPropertiesClicked(SerializedProperty property);
 
         protected void HandleDragAndDrop(Rect position)
         {
             if (!position.Contains(Event.current.mousePosition))
                 return;
-            
+
             if (Event.current.type == EventType.DragPerform)
             {
                 HandleDragUpdated();
@@ -200,12 +200,12 @@ private void HandleDragPerform()
 
         private Object GetUnityObject(Object objectReference)
         {
-            if(objectReference is GameObject gameObject)
+            if (objectReference is GameObject gameObject)
                 return gameObject.GetComponent(GenericType);
             return objectReference;
         }
 
-        protected abstract void PingObject();
+        protected abstract void PingObject(SerializedProperty property);
 
         protected ReferenceMode GetModeValue(SerializedProperty property)
         {
diff --git a/Editor/Drawers/UnityReferenceDrawer.cs b/Editor/Drawers/UnityReferenceDrawer.cs
@@ -27,18 +27,18 @@ public void OnGUI(Rect position)
             Object unityReference = UnityReferenceProperty.objectReferenceValue;
             Type referenceType = unityReference == null ? typeof(Object) : unityReference.GetType();
             GUIContent objectContent = EditorGUIUtility.ObjectContent(unityReference, referenceType);
-            CustomObjectDrawer.OnGUI(position, label, objectContent);
+            CustomObjectDrawer.OnGUI(position, label, objectContent, Property);
             HandleDragAndDrop(position);
         }
 
-        protected override void PingObject()
+        protected override void PingObject(SerializedProperty property)
         {
-            EditorGUIUtility.PingObject((Object)PropertyValue);
+            EditorGUIUtility.PingObject((Object)GetPropertyValue(property));
         }
 
-        protected override void OnPropertiesClicked()
+        protected override void OnPropertiesClicked(SerializedProperty property)
         {
-            PropertyEditorUtility.Show(UnityReferenceProperty.objectReferenceValue);
+            PropertyEditorUtility.Show(property.UnityReferenceProperty().objectReferenceValue);
         }
     }
 }
diff --git a/Editor/Utilities/SerializableInterfaceAdvancedDropdown.cs b/Editor/Utilities/SerializableInterfaceAdvancedDropdown.cs
@@ -3,6 +3,7 @@
 using System.Reflection;
 using TNRD.Builders;
 using TNRD.Items;
+using UnityEditor;
 using UnityEditor.IMGUI.Controls;
 using UnityEngine;
 using UnityEngine.Assertions;
@@ -16,16 +17,18 @@ internal sealed class SerializableInterfaceAdvancedDropdown : AdvancedDropdown
         private readonly MethodInfo sortChildrenMethod;
         private readonly bool canSort;
         private readonly Scene? relevantScene;
+        private readonly SerializedProperty property;
 
-        public delegate void ItemSelectedDelegate(ReferenceMode mode, object reference);
+        public delegate void ItemSelectedDelegate(SerializedProperty property, ReferenceMode mode, object reference);
 
         public event ItemSelectedDelegate ItemSelectedEvent; // Suffixed with Event because of the override
 
         /// <inheritdoc />
         public SerializableInterfaceAdvancedDropdown(
             AdvancedDropdownState state,
             Type interfaceType,
-            Scene? relevantScene
+            Scene? relevantScene,
+            SerializedProperty property
         )
             : base(state)
         {
@@ -38,6 +41,7 @@ public SerializableInterfaceAdvancedDropdown(
             minimumSize = new Vector2(0, 300);
             this.interfaceType = interfaceType;
             this.relevantScene = relevantScene;
+            this.property = property;
         }
 
         /// <inheritdoc />
@@ -52,7 +56,7 @@ protected override AdvancedDropdownItem BuildRoot()
             {
                 dropdownItem.AddChild(new NoneDropdownItem());
             }
-            
+
             if (canSort)
             {
                 sortChildrenMethod.Invoke(item,
@@ -72,7 +76,7 @@ private int Sort(AdvancedDropdownItem a, AdvancedDropdownItem b)
                 return -1;
             if (b is NoneDropdownItem)
                 return 1;
-            
+
             int childrenA = a.children.Count();
             int childrenB = b.children.Count();
 
@@ -90,7 +94,7 @@ protected override void ItemSelected(AdvancedDropdownItem item)
         {
             if (item is IDropdownItem dropdownItem)
             {
-                ItemSelectedEvent?.Invoke(dropdownItem.Mode, dropdownItem.GetValue());
+                ItemSelectedEvent?.Invoke(property, dropdownItem.Mode, dropdownItem.GetValue());
             }
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -5,13 +5,13 @@ namespace TNRD.Drawers`
`5`	`5`	`{`
`6`	`6`	`public partial class CustomObjectDrawer`
`7`	`7`	`{`
`8`		`- public delegate void ButtonClickedDelegate(Rect position);`
	`8`	`+ public delegate void ButtonClickedDelegate(Rect position, SerializedProperty property);`
`9`	`9`
`10`		`- public delegate void ClickedDelegate();`
	`10`	`+ public delegate void ClickedDelegate(SerializedProperty property);`
`11`	`11`
`12`		`- public delegate void DeletePressedDelegate();`
	`12`	`+ public delegate void DeletePressedDelegate(SerializedProperty property);`
`13`	`13`
`14`		`- public delegate void PropertiesClickedDelegate();`
	`14`	`+ public delegate void PropertiesClickedDelegate(SerializedProperty property);`
`15`	`15`
`16`	`16`	`private bool isSelected;`
`17`	`17`
`@@ -21,18 +21,18 @@ public partial class CustomObjectDrawer`
`21`	`21`	`public event ClickedDelegate Clicked;`
`22`	`22`	`public event DeletePressedDelegate DeletePressed;`
`23`	`23`	`public event PropertiesClickedDelegate PropertiesClicked;`
`24`		`-`
`25`		`- public void OnGUI(Rect position, GUIContent label, GUIContent content)`
	`24`	`+`
	`25`	`+ public void OnGUI(Rect position, GUIContent label, GUIContent content, SerializedProperty property)`
`26`	`26`	`{`
`27`	`27`	`Rect positionWithoutThumb = new Rect(position);`
`28`	`28`	`positionWithoutThumb.xMax -= 20;`
`29`	`29`
`30`	`30`	`position = DrawPrefixLabel(position, label);`
`31`	`31`	`DrawObjectField(position, content);`
`32`		`- DrawButton(position);`
	`32`	`+ DrawButton(position, property);`
`33`	`33`
`34`		`- HandleMouseDown(position, positionWithoutThumb);`
`35`		`- HandleKeyDown();`
	`34`	`+ HandleMouseDown(position, positionWithoutThumb, property);`
	`35`	`+ HandleKeyDown(property);`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`private Rect DrawPrefixLabel(Rect position, GUIContent label)`
`@@ -66,7 +66,7 @@ private void ForceRepaintEditors()`
`66`	`66`	`}`
`67`	`67`	`}`
`68`	`68`
`69`		`- private void DrawButton(Rect position)`
	`69`	`+ private void DrawButton(Rect position, SerializedProperty property)`
`70`	`70`	`{`
`71`	`71`	`Rect buttonRect = new Rect(position);`
`72`	`72`	`buttonRect.yMin += 1;`
`@@ -76,11 +76,11 @@ private void DrawButton(Rect position)`
`76`	`76`
`77`	`77`	`if (GUI.Button(buttonRect, string.Empty, "objectFieldButton"))`
`78`	`78`	`{`
`79`		`- ButtonClicked?.Invoke(position);`
	`79`	`+ ButtonClicked?.Invoke(position, property);`
`80`	`80`	`}`
`81`	`81`	`}`
`82`	`82`
`83`		`- private void HandleMouseDown(Rect position, Rect positionWithoutThumb)`
	`83`	`+ private void HandleMouseDown(Rect position, Rect positionWithoutThumb, SerializedProperty property)`
`84`	`84`	`{`
`85`	`85`	`if (Event.type != EventType.MouseDown)`
`86`	`86`	`return;`
`@@ -89,26 +89,26 @@ private void HandleMouseDown(Rect position, Rect positionWithoutThumb)`
`89`	`89`	`{`
`90`	`90`	`isSelected = positionWithoutThumb.Contains(Event.mousePosition);`
`91`	`91`	`ForceRepaintEditors();`
`92`		`- Clicked?.Invoke();`
	`92`	`+ Clicked?.Invoke(property);`
`93`	`93`	`}`
`94`	`94`	`else if (Event.button == 1 && positionWithoutThumb.Contains(Event.mousePosition))`
`95`	`95`	`{`
`96`	`96`	`GenericMenu menu = new GenericMenu();`
`97`		`- menu.AddItem(new GUIContent("Clear"), false, () => { DeletePressed?.Invoke(); });`
`98`		`- menu.AddItem(new GUIContent("Properties..."), false, () => { PropertiesClicked?.Invoke(); });`
	`97`	`+ menu.AddItem(new GUIContent("Clear"), false, () => { DeletePressed?.Invoke(property); });`
	`98`	`+ menu.AddItem(new GUIContent("Properties..."), false, () => { PropertiesClicked?.Invoke(property); });`
`99`	`99`	`menu.DropDown(position);`
`100`	`100`	`Event.Use();`
`101`	`101`	`}`
`102`	`102`	`}`
`103`	`103`
`104`		`- private void HandleKeyDown()`
	`104`	`+ private void HandleKeyDown(SerializedProperty property)`
`105`	`105`	`{`
`106`	`106`	`if (!isSelected)`
`107`	`107`	`return;`
`108`	`108`
`109`	`109`	`if (Event.type == EventType.KeyDown && Event.keyCode == KeyCode.Delete)`
`110`	`110`	`{`
`111`		`- DeletePressed?.Invoke();`
	`111`	`+ DeletePressed?.Invoke(property);`
`112`	`112`	`}`
`113`	`113`	`}`
`114`	`114`	`}`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ public void OnGUI(Rect position)`
`45`	`45`	`? EditorGUIUtility.ObjectContent((MonoScript)null, typeof(MonoScript))`
`46`	`46`	`: new GUIContent(rawReferenceValue.GetType().Name, IconUtility.ScriptIcon);`
`47`	`47`
`48`		`- CustomObjectDrawer.OnGUI(objectFieldRect, label, content);`
	`48`	`+ CustomObjectDrawer.OnGUI(objectFieldRect, label, content, Property);`
`49`	`49`
`50`	`50`	`HandleDragAndDrop(objectFieldRect);`
`51`	`51`
`@@ -79,13 +79,13 @@ private void DrawLine(Rect position)`
`79`	`79`	`EditorGUI.DrawRect(line, Styles.LineColor);`
`80`	`80`	`}`
`81`	`81`
`82`		`- protected override void PingObject()`
	`82`	`+ protected override void PingObject(SerializedProperty property)`
`83`	`83`	`{`
`84`	`84`	`// No support for pinging raw objects for now (I guess this would ping the MonoScript?)`
`85`	`85`	`}`
`86`	`86`
`87`	`87`	`/// <inheritdoc />`
`88`		`- protected override void OnPropertiesClicked()`
	`88`	`+ protected override void OnPropertiesClicked(SerializedProperty property)`
`89`	`89`	`{`
`90`	`90`	`if (RawReferenceValue == null)`
`91`	`91`	`return;`
Original file line number	Diff line number	Diff line change
`@@ -67,18 +67,18 @@ protected void Initialize(SerializedProperty property, Type genericType, FieldIn`
`67`	`67`	`FieldInfo = fieldInfo;`
`68`	`68`	`}`
`69`	`69`
`70`		`- private void OnButtonClicked(Rect position)`
	`70`	`+ private void OnButtonClicked(Rect position, SerializedProperty property)`
`71`	`71`	`{`
`72`	`72`	`AdvancedDropdownState state = new AdvancedDropdownState();`
`73`	`73`	`SerializableInterfaceAdvancedDropdown dropdown =`
`74`		`- new SerializableInterfaceAdvancedDropdown(state, GenericType, GetRelevantScene());`
	`74`	`+ new SerializableInterfaceAdvancedDropdown(state, GenericType, GetRelevantScene(property), property);`
`75`	`75`	`dropdown.ItemSelectedEvent += OnItemSelected;`
`76`	`76`	`dropdown.Show(position);`
`77`	`77`	`}`
`78`	`78`
`79`		`- private Scene? GetRelevantScene()`
	`79`	`+ private static Scene? GetRelevantScene(SerializedProperty property)`
`80`	`80`	`{`
`81`		`- Object target = Property.serializedObject.targetObject;`
	`81`	`+ Object target = property.serializedObject.targetObject;`
`82`	`82`
`83`	`83`	`if (target is ScriptableObject)`
`84`	`84`	`return null;`
`@@ -90,30 +90,30 @@ private void OnButtonClicked(Rect position)`
`90`	`90`	`return null;`
`91`	`91`	`}`
`92`	`92`
`93`		`- private void OnClicked()`
	`93`	`+ private void OnClicked(SerializedProperty property)`
`94`	`94`	`{`
`95`		`- PingObject();`
	`95`	`+ PingObject(property);`
`96`	`96`	`}`
`97`	`97`
`98`		`- private void OnDeletePressed()`
	`98`	`+ private void OnDeletePressed(SerializedProperty property)`
`99`	`99`	`{`
`100`		`- ModeValue = default;`
`101`		`- PropertyValue = null;`
	`100`	`+ SetModeValue(property, default);`
	`101`	`+ SetPropertyValue(property, null);`
`102`	`102`	`}`
`103`	`103`
`104`		`- private void OnItemSelected(ReferenceMode mode, object reference)`
	`104`	`+ private void OnItemSelected(SerializedProperty property, ReferenceMode mode, object reference)`
`105`	`105`	`{`
`106`		`- ModeValue = mode;`
`107`		`- PropertyValue = reference;`
	`106`	`+ SetModeValue(property, mode);`
	`107`	`+ SetPropertyValue(property, reference);`
`108`	`108`	`}`
`109`	`109`
`110`		`- protected abstract void OnPropertiesClicked();`
	`110`	`+ protected abstract void OnPropertiesClicked(SerializedProperty property);`
`111`	`111`
`112`	`112`	`protected void HandleDragAndDrop(Rect position)`
`113`	`113`	`{`
`114`	`114`	`if (!position.Contains(Event.current.mousePosition))`
`115`	`115`	`return;`
`116`		`-`
	`116`	`+`
`117`	`117`	`if (Event.current.type == EventType.DragPerform)`
`118`	`118`	`{`
`119`	`119`	`HandleDragUpdated();`
`@@ -200,12 +200,12 @@ private void HandleDragPerform()`
`200`	`200`
`201`	`201`	`private Object GetUnityObject(Object objectReference)`
`202`	`202`	`{`
`203`		`- if(objectReference is GameObject gameObject)`
	`203`	`+ if (objectReference is GameObject gameObject)`
`204`	`204`	`return gameObject.GetComponent(GenericType);`
`205`	`205`	`return objectReference;`
`206`	`206`	`}`
`207`	`207`
`208`		`- protected abstract void PingObject();`
	`208`	`+ protected abstract void PingObject(SerializedProperty property);`
`209`	`209`
`210`	`210`	`protected ReferenceMode GetModeValue(SerializedProperty property)`
`211`	`211`	`{`
Original file line number	Diff line number	Diff line change
`@@ -27,18 +27,18 @@ public void OnGUI(Rect position)`
`27`	`27`	`Object unityReference = UnityReferenceProperty.objectReferenceValue;`
`28`	`28`	`Type referenceType = unityReference == null ? typeof(Object) : unityReference.GetType();`
`29`	`29`	`GUIContent objectContent = EditorGUIUtility.ObjectContent(unityReference, referenceType);`
`30`		`- CustomObjectDrawer.OnGUI(position, label, objectContent);`
	`30`	`+ CustomObjectDrawer.OnGUI(position, label, objectContent, Property);`
`31`	`31`	`HandleDragAndDrop(position);`
`32`	`32`	`}`
`33`	`33`
`34`		`- protected override void PingObject()`
	`34`	`+ protected override void PingObject(SerializedProperty property)`
`35`	`35`	`{`
`36`		`- EditorGUIUtility.PingObject((Object)PropertyValue);`
	`36`	`+ EditorGUIUtility.PingObject((Object)GetPropertyValue(property));`
`37`	`37`	`}`
`38`	`38`
`39`		`- protected override void OnPropertiesClicked()`
	`39`	`+ protected override void OnPropertiesClicked(SerializedProperty property)`
`40`	`40`	`{`
`41`		`- PropertyEditorUtility.Show(UnityReferenceProperty.objectReferenceValue);`
	`41`	`+ PropertyEditorUtility.Show(property.UnityReferenceProperty().objectReferenceValue);`
`42`	`42`	`}`
`43`	`43`	`}`
`44`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`	`using System.Reflection;`
`4`	`4`	`using TNRD.Builders;`
`5`	`5`	`using TNRD.Items;`
	`6`	`+using UnityEditor;`
`6`	`7`	`using UnityEditor.IMGUI.Controls;`
`7`	`8`	`using UnityEngine;`
`8`	`9`	`using UnityEngine.Assertions;`
`@@ -16,16 +17,18 @@ internal sealed class SerializableInterfaceAdvancedDropdown : AdvancedDropdown`
`16`	`17`	`private readonly MethodInfo sortChildrenMethod;`
`17`	`18`	`private readonly bool canSort;`
`18`	`19`	`private readonly Scene? relevantScene;`
	`20`	`+ private readonly SerializedProperty property;`
`19`	`21`
`20`		`- public delegate void ItemSelectedDelegate(ReferenceMode mode, object reference);`
	`22`	`+ public delegate void ItemSelectedDelegate(SerializedProperty property, ReferenceMode mode, object reference);`
`21`	`23`
`22`	`24`	`public event ItemSelectedDelegate ItemSelectedEvent; // Suffixed with Event because of the override`
`23`	`25`
`24`	`26`	`/// <inheritdoc />`
`25`	`27`	`public SerializableInterfaceAdvancedDropdown(`
`26`	`28`	`AdvancedDropdownState state,`
`27`	`29`	`Type interfaceType,`
`28`		`- Scene? relevantScene`
	`30`	`+ Scene? relevantScene,`
	`31`	`+ SerializedProperty property`
`29`	`32`	`)`
`30`	`33`	`: base(state)`
`31`	`34`	`{`
`@@ -38,6 +41,7 @@ public SerializableInterfaceAdvancedDropdown(`
`38`	`41`	`minimumSize = new Vector2(0, 300);`
`39`	`42`	`this.interfaceType = interfaceType;`
`40`	`43`	`this.relevantScene = relevantScene;`
	`44`	`+ this.property = property;`
`41`	`45`	`}`
`42`	`46`
`43`	`47`	`/// <inheritdoc />`
`@@ -52,7 +56,7 @@ protected override AdvancedDropdownItem BuildRoot()`
`52`	`56`	`{`
`53`	`57`	`dropdownItem.AddChild(new NoneDropdownItem());`
`54`	`58`	`}`
`55`		`-`
	`59`	`+`
`56`	`60`	`if (canSort)`
`57`	`61`	`{`
`58`	`62`	`sortChildrenMethod.Invoke(item,`
`@@ -72,7 +76,7 @@ private int Sort(AdvancedDropdownItem a, AdvancedDropdownItem b)`
`72`	`76`	`return -1;`
`73`	`77`	`if (b is NoneDropdownItem)`
`74`	`78`	`return 1;`
`75`		`-`
	`79`	`+`
`76`	`80`	`int childrenA = a.children.Count();`
`77`	`81`	`int childrenB = b.children.Count();`
`78`	`82`
`@@ -90,7 +94,7 @@ protected override void ItemSelected(AdvancedDropdownItem item)`
`90`	`94`	`{`
`91`	`95`	`if (item is IDropdownItem dropdownItem)`
`92`	`96`	`{`
`93`		`- ItemSelectedEvent?.Invoke(dropdownItem.Mode, dropdownItem.GetValue());`
	`97`	`+ ItemSelectedEvent?.Invoke(property, dropdownItem.Mode, dropdownItem.GetValue());`
`94`	`98`	`}`
`95`	`99`	`}`
`96`	`100`	`}`