Merge branch 'enhancements/tree-view-checked-state' into enhancements/changes-tree-view

Author: StanleyGoldman

src/GitHub.Api/UI/TreeLoader.cs

@@ -8,7 +8,8 @@ public interface ITree
     {
         void AddNode(string path, string label, int level, bool isFolder, bool isActive, bool isHidden, bool isCollapsed, bool isSelected, int customIntTag = 0, string customStringTag = (string)null);
         void Clear();
-        HashSet<string> GetCollapsedFolders();
+        IEnumerable<string> GetCollapsedFolders();
+        IEnumerable<string> GetCheckedFiles();
         string Title { get; }
         bool DisplayRootNode { get; }
         bool IsCheckable { get; }
@@ -20,7 +21,7 @@ public static class TreeLoader
     {
         public static void Load(ITree tree, IEnumerable<ITreeData> treeDatas)
         {
-            var collapsedFolders = tree.GetCollapsedFolders();
+            var collapsedFolders = new HashSet<string>(tree.GetCollapsedFolders());
             var selectedNodePath = tree.SelectedNodePath;
 
             tree.Clear();

src/UnityExtension/Assets/Editor/GitHub.Unity/UI/TreeControl.cs

@@ -28,8 +28,8 @@ public abstract class Tree: ITree
 
         [SerializeField] private List<TreeNode> nodes = new List<TreeNode>();
         [SerializeField] private TreeNode selectedNode = null;
-        [SerializeField] private TreeNode activeNode = null;
         [SerializeField] private TreeNodeDictionary folders = new TreeNodeDictionary();
+        [SerializeField] private TreeNodeDictionary checkedFileNodes = new TreeNodeDictionary();
 
         [NonSerialized] private Stack<bool> indents = new Stack<bool>();
         [NonSerialized] private Action<TreeNode> rightClickNextRender;
@@ -100,11 +100,6 @@ public void AddNode(string path, string label, int level, bool isFolder, bool is
             SetNodeIcon(node);
             nodes.Add(node);
 
-            if (isActive)
-            {
-                activeNode = node;
-            }
-
             if (isSelected)
             {
                 SelectedNode = node;
@@ -119,14 +114,19 @@ public void AddNode(string path, string label, int level, bool isFolder, bool is
         public void Clear()
         {
             folders.Clear();
+            checkedFileNodes.Clear();
             nodes.Clear();
             SelectedNode = null;
         }
 
-        public HashSet<string> GetCollapsedFolders()
+        public IEnumerable<string> GetCollapsedFolders()
         {
-            var collapsedFoldersEnumerable = folders.Where(pair => pair.Value.IsCollapsed).Select(pair => pair.Key);
-            return new HashSet<string>(collapsedFoldersEnumerable);
+            return folders.Where(pair => pair.Value.IsCollapsed).Select(pair => pair.Key);
+        }
+
+        public IEnumerable<string> GetCheckedFiles()
+        {
+            return checkedFileNodes.Where(pair => pair.Value.CheckState == CheckState.Checked).Select(pair => pair.Key);
         }
 
         public Rect Render(Rect containingRect, Rect rect, Vector2 scroll, Action<TreeNode> singleClick = null, Action<TreeNode> doubleClick = null, Action<TreeNode> rightClick = null)
@@ -277,6 +277,13 @@ private void ToggleNodeChecked(int idx, TreeNode node)
             {
                 ToggleChildrenChecked(idx, node, isChecked);
             }
+            else
+            {
+                if (isChecked)
+                {
+                    checkedFileNodes.Add(node.Path, node);
+                }
+            }
 
             ToggleParentFoldersChecked(idx, node, isChecked);
         }
@@ -297,6 +304,13 @@ private void ToggleChildrenChecked(int idx, TreeNode node, bool isChecked)
                 {
                     ToggleChildrenChecked(i, childNode, isChecked);
                 }
+                else
+                {
+                    if (isChecked)
+                    {
+                        checkedFileNodes.Add(node.Path, node);
+                    }
+                }
             }
         }
 
@@ -392,13 +406,13 @@ private void ToggleNodeVisibility(int idx, TreeNode node)
 
         private bool HandleInput(Rect rect, TreeNode currentNode, int index, Action<TreeNode> singleClick = null, Action<TreeNode> doubleClick = null, Action<TreeNode> rightClick = null)
         {
-            bool selectionChanged = false;
+            var requiresRepaint = false;
             var clickRect = new Rect(0f, rect.y, rect.width, rect.height);
             if (Event.current.type == EventType.MouseDown && clickRect.Contains(Event.current.mousePosition))
             {
                 Event.current.Use();
                 SelectedNode = currentNode;
-                selectionChanged = true;
+                requiresRepaint = true;
                 var clickCount = Event.current.clickCount;
                 var mouseButton = Event.current.button;
 
@@ -424,41 +438,50 @@ private bool HandleInput(Rect rect, TreeNode currentNode, int index, Action<Tree
                 int directionX = Event.current.keyCode == KeyCode.LeftArrow ? -1 : Event.current.keyCode == KeyCode.RightArrow ? 1 : 0;
                 if (directionY != 0 || directionX != 0)
                 {
+                    Event.current.Use();
+
                     if (directionY > 0)
                     {
-                        selectionChanged = SelectNext(index, false) != index;
+                        requiresRepaint = SelectNext(index, false) != index;
                     }
                     else if (directionY < 0)
                     {
-                        selectionChanged = SelectPrevious(index, false) != index;
+                        requiresRepaint = SelectPrevious(index, false) != index;
                     }
                     else if (directionX > 0)
                     {
                         if (currentNode.IsFolder && currentNode.IsCollapsed)
                         {
                             ToggleNodeVisibility(index, currentNode);
-                            Event.current.Use();
                         }
                         else
                         {
-                            selectionChanged = SelectNext(index, true) != index;
+                            requiresRepaint = SelectNext(index, true) != index;
                         }
                     }
                     else if (directionX < 0)
                     {
                         if (currentNode.IsFolder && !currentNode.IsCollapsed)
                         {
                             ToggleNodeVisibility(index, currentNode);
-                            Event.current.Use();
                         }
                         else
                         {
-                            selectionChanged = SelectPrevious(index, true) != index;
+                            requiresRepaint = SelectPrevious(index, true) != index;
                         }
                     }
                 }
+
+                if (IsCheckable && Event.current.keyCode == KeyCode.Space)
+                {
+                    Event.current.Use();
+
+                    ToggleNodeChecked(index, currentNode);
+                    requiresRepaint = true;
+                }
             }
-            return selectionChanged;
+
+            return requiresRepaint;
         }
 
         private int SelectNext(int index, bool foldersOnly)