Merge pull request #152 from brunomikoski/feature/more-qol-fixes

Feature/more qol fixes

Author: brunomikoski

CHANGELOG.MD

@@ -8,6 +8,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## Changed
 - Update PickerPropertyDrawer to use PopupList from property path cache to avoid issue when rendered inside a List/Array
 - Update CollectionRegistry to search for the ScriptableObjectCollection using the `AssetDatabase.FindAssets` instead of the `TypeCache` first
+- Added confirmation popup for deleting items from the Collection
+- Fixed issue while renaming one asset could be canceled on arrow keys press
 
 ## [2.3.3]
 ## Added

Scripts/Editor/CustomEditors/CollectionCustomEditor.cs

@@ -298,6 +298,9 @@ private void BindCollectionItemListItem(VisualElement targetElement, int targetI
 
         private void OnKeyUpOnCollectionListView(KeyUpEvent evt)
         {
+            if (currentRenamingLabel != null)
+                return;
+
             switch (evt.keyCode)
             {
                 case KeyCode.F2:
@@ -648,6 +651,12 @@ protected void DeleteItemAtIndex(int selectedIndex)
                 return;
             }
 
+            if (!EditorUtility.DisplayDialog($"Delete {scriptableObject.name}",
+                $"Are you sure you want to delete {scriptableObject.name}?", "Yes", "No"))
+            {
+                return;
+            }
+
             Undo.RecordObject(collection, "Remove Item");
 
             filteredItems.Remove(scriptableObject);

Scripts/Runtime/Utils/AssetDatabaseUtils.cs

@@ -21,10 +21,18 @@ public static void CreatePathIfDoesntExist(string targetPath)
         public static void RenameAsset(Object targetObject, string newName)
         {
 #if UNITY_EDITOR
-            UnityEditor.AssetDatabase.RenameAsset(UnityEditor.AssetDatabase.GetAssetPath(targetObject), newName);
-            targetObject.name = newName;
+            string assetPath = UnityEditor.AssetDatabase.GetAssetPath(targetObject);
+
+            string guid = UnityEditor.AssetDatabase.AssetPathToGUID(assetPath);
+            UnityEditor.Undo.SetCurrentGroupName($"Rename Asset from {targetObject.name} to {newName}");
+            UnityEditor.Undo.RecordObject(targetObject, "Rename Asset");
+
+            UnityEditor.AssetDatabase.RenameAsset(assetPath, newName);
+
+            UnityEditor.Undo.CollapseUndoOperations(UnityEditor.Undo.GetCurrentGroup());
             ObjectUtility.SetDirty(targetObject);
+            UnityEditor.AssetDatabase.ImportAsset(UnityEditor.AssetDatabase.GUIDToAssetPath(guid));
 #endif
         }
     }
-}
+}