Fix Append/Remove List operations if multi-selection is active

Author: arimger

Assets/Editor Toolbox/Editor/Drawers/Toolbox/PropertySelf/ReferencePickerAttributeDrawer.cs

@@ -56,6 +56,11 @@ private static Type GetCurrentManagedReferenceType(SerializedProperty property,
                     using (var tempSerializedObject = new SerializedObject(target))
                     {
                         var tempProperty = tempSerializedObject.FindProperty(property.propertyPath);
+                        if (tempProperty == null)
+                        {
+                            break;
+                        }
+
                         if (tempProperty.managedReferenceFullTypename != fullTypeName)
                         {
                             hasMixedValues = true;

Assets/Editor Toolbox/Editor/Internal/ReorderableListBase.cs

@@ -457,7 +457,10 @@ public void CutKeyboardFocus()
 
         public void AppendElement()
         {
-            Index = (List.arraySize += 1) - 1;
+            var newSize = Size.intValue + 1;
+            Size.intValue = newSize;
+            Index = newSize - 1;
+
             if (overrideNewElementCallback == null)
             {
                 return;
@@ -522,6 +525,7 @@ public virtual void DrawStandardFooter(Rect rect)
             //set button area rect
             rect = new Rect(rect.xMax - Style.footerWidth, rect.y, Style.footerWidth, rect.height);
 
+            var actionPerformed = false;
             //set rect properties from style
             var buttonWidth = Style.footerButtonWidth;
             var buttonHeight = Style.footerButtonHeight;
@@ -531,7 +535,7 @@ public virtual void DrawStandardFooter(Rect rect)
             //set proper rect for each button
             var appendButtonRect = new Rect(rect.xMin + margin, rect.y - padding, buttonWidth, buttonHeight);
 
-            EditorGUI.BeginDisabledGroup(List.hasMultipleDifferentValues);
+            EditorGUI.BeginDisabledGroup(Size.hasMultipleDifferentValues);
             EditorGUI.BeginDisabledGroup(onCanAppendCallback != null && !onCanAppendCallback(this));
             if (GUI.Button(appendButtonRect, onAppendDropdownCallback != null
                 ? Style.iconToolbarDropContent
@@ -551,9 +555,10 @@ public virtual void DrawStandardFooter(Rect rect)
                 }
 
                 onChangedCallback?.Invoke(this);
+                actionPerformed = true;
             }
-            EditorGUI.EndDisabledGroup();
 
+            EditorGUI.EndDisabledGroup();
             var removeButtonRect = new Rect(rect.xMax - buttonWidth - margin, rect.y - padding, buttonWidth, buttonHeight);
 
             EditorGUI.BeginDisabledGroup((onCanRemoveCallback != null && !onCanRemoveCallback(this) || Index < 0 || Index >= Count));
@@ -569,9 +574,17 @@ public virtual void DrawStandardFooter(Rect rect)
                 }
 
                 onChangedCallback?.Invoke(this);
+                actionPerformed = true;
             }
+
             EditorGUI.EndDisabledGroup();
             EditorGUI.EndDisabledGroup();
+
+            if (actionPerformed)
+            {
+                SerializedObject.ApplyModifiedProperties();
+                GUIUtility.ExitGUI();
+            }
         }
 
         /// <summary>

Assets/Examples/Scriptables/Sample Scriptable Object.asset

@@ -14,5 +14,9 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   var1: 1
   var2: 32
-  vars:
-  - abc
+  vars1: []
+  vars2: 00000000
+  var3:
+    var1: 0
+    vars: 0000000000000000
+    var2: 0

Assets/Examples/Scripts/SampleBehaviour3.cs

@@ -1,4 +1,6 @@
-using UnityEngine;
+using Toolbox.Editor.Drawers;
+using UnityEditor;
+using UnityEngine;
 
 [ExecuteAlways]
 [AddComponentMenu("Editor Toolbox/Cheat Sheet 3 (Toolbox Conditions)")]

Assets/Examples/Scripts/SampleScriptableObject.cs

@@ -1,12 +1,24 @@
-using UnityEngine;
-
+using System;
 using Toolbox.Attributes;
+using UnityEngine;
 
 [CreateInWizard]
 public class SampleScriptableObject : ScriptableObject
 {
+    [Serializable]
+    public class NestedClass
+    {
+        public bool var1;
+        [ReorderableList]
+        public int[] vars;
+        public bool var2;
+    }
+
     public bool var1;
     [EnableIf(nameof(var1), true)]
     public int var2;
-    public string[] vars;
+    public string[] vars1;
+    [ReorderableList]
+    public int[] vars2;
+    public NestedClass var3;
 }