Merge pull request #77 from brunomikoski/feature/keyboard-navigation

Feature/keyboard navigation
brunomikoski · Apr 28, 2021 · c59cbf5 · c59cbf5
2 parents a24fd44 + 6ab4e7b
commit c59cbf5
Show file tree

Hide file tree

Showing 3 changed files with 54 additions and 4 deletions.
diff --git a/CHANGELOG.MD b/CHANGELOG.MD
@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
 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).
 
+## [1.6.1]
+### Added
+- Added arrow navigation on the Collection Editor, now you can navigate between items and expand/collapse it by <kbd>left</kbd> <kbd>right</kbd>
+- You can now expand/collapse all items by holding <kbd>alt</kbd> while clicking on the foldout arrow, like default unity controls
+
 ## [1.6.0]
 ### Changed
 - Refactored the `ScriptableObjectCollection` `Custom Editor` to use `ReorderableList` instead of the previous custom list drawer

diff --git a/Scripts/Editor/Core/CollectionCustomEditor.cs b/Scripts/Editor/Core/CollectionCustomEditor.cs
@@ -130,12 +130,24 @@ private void DrawCollectionItemAtIndex(Rect rect, int index, bool isActive, bool
             rect.width -= 20;
 
             Rect foldoutArrowRect = rect;
+            bool wasExpanded = collectionItemSerializedProperty.isExpanded;
             collectionItemSerializedProperty.isExpanded = EditorGUI.Foldout(
                 foldoutArrowRect,
                 collectionItemSerializedProperty.isExpanded,
                 GUIContent.none
             );
 
+            if (!wasExpanded && collectionItemSerializedProperty.isExpanded)
+            {
+                if (Event.current.alt)
+                    SetAllExpanded(true);
+            }
+            else if (wasExpanded && !collectionItemSerializedProperty.isExpanded)
+            {
+                if (Event.current.alt)
+                    SetAllExpanded(false);
+            }
+
             using (EditorGUI.ChangeCheckScope changeCheck = new EditorGUI.ChangeCheckScope())
             {
                 GUI.SetNextControlName(collectionItemSerializedProperty.objectReferenceValue.name);
@@ -203,6 +215,15 @@ private void DrawCollectionItemAtIndex(Rect rect, int index, bool isActive, bool
             heights[index] = rect.y - originY;
         }
 
+        private void SetAllExpanded(bool expanded)
+        {
+            for (int i = 0; i < reorderableList.count; i++)
+            {
+                SerializedProperty property = reorderableList.serializedProperty.GetArrayElementAtIndex(i);
+                property.isExpanded = expanded;
+            }
+        }
+
         private void CheckForContextInputOnItem(SerializedProperty collectionItemSerializedProperty, int index, float originY, Rect rect)
         {
             Event current = Event.current;
@@ -323,7 +344,33 @@ public override void OnInspectorGUI()
                 DrawBottomMenu();
             }
             DrawSettings();
-       }
+            CheckForKeyboardShortcuts();
+        }
+
+        private void CheckForKeyboardShortcuts()
+        {
+            if (reorderableList.index == -1)
+                return;
+
+            if (!reorderableList.HasKeyboardControl())
+                return;
+
+            if (Event.current.type == EventType.Layout || Event.current.type == EventType.Repaint)
+                return;
+
+            SerializedProperty element = reorderableList.serializedProperty.GetArrayElementAtIndex(reorderableList.index);
+
+            if (Event.current.keyCode == KeyCode.RightArrow)
+            {
+                element.isExpanded = true; 
+                Event.current.Use();
+            }
+            else if (Event.current.keyCode == KeyCode.LeftArrow)
+            {
+                element.isExpanded = false; 
+                Event.current.Use();
+            }
+        }
 
         private void RemoveNullReferences()
         {
@@ -505,7 +552,6 @@ private void DrawSearchField()
 
         private void DrawSettings()
         {
-            Profiler.BeginSample("Collection Editor");
             using (new GUILayout.VerticalScope("Box"))
             {
                 EditorGUI.indentLevel++;
@@ -525,7 +571,6 @@ private void DrawSettings()
                     EditorGUI.indentLevel--;
                 }
             }
-            Profiler.EndSample();
         }
 
         private void DrawGeneratedFileName()

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "com.brunomikoski.scriptableobjectcollection",
   "displayName": "Scriptable Object Collection",
-  "version": "1.6.0",
+  "version": "1.6.1",
   "unity": "2018.4",
   "description": "A library to help improve the usability of Unity3D Scriptable Objects by grouping then into a collection and exposing then by code or nice inspectors!",
   "keywords": [