Merge pull request #530 from github-for-unity/fixes/tree-retains-checked-state

Functionality to retain the checked state of nodes when loading data

Author: StanleyGoldman

src/GitHub.Api/UI/TreeBase.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 
 namespace GitHub.Unity
 {
@@ -31,13 +32,14 @@ public void Load(IEnumerable<TData> treeDatas)
         {
             var collapsedFolders = new HashSet<string>(GetCollapsedFolders());
             var selectedNodePath = SelectedNodePath;
+            var checkedFiles = new HashSet<string>(GetCheckedFiles());
 
             Clear();
 
             var displayRootLevel = DisplayRootNode ? 1 : 0;
 
             var isSelected = IsSelectable && selectedNodePath != null && Title == selectedNodePath;
-            AddNode(Title, Title, -1 + displayRootLevel, true, false, false, false, isSelected, null);
+            AddNode(Title, Title, -1 + displayRootLevel, true, false, false, false, isSelected, false, null);
 
             var hideChildren = false;
             var hideChildrenBelowLevel = 0;
@@ -70,6 +72,7 @@ public void Load(IEnumerable<TData> treeDatas)
                         }
 
                         var isActive = false;
+                        var isChecked = false;
                         var nodeIsCollapsed = false;
                         TData? treeNodeTreeData = null;
 
@@ -92,11 +95,42 @@ public void Load(IEnumerable<TData> treeDatas)
                         {
                             isActive = treeData.IsActive;
                             treeNodeTreeData = treeData;
+                            isChecked = checkedFiles.Contains(nodePath);
                         }
 
                         isSelected = selectedNodePath != null && nodePath == selectedNodePath;
                         AddNode(nodePath, label, i + displayRootLevel, isFolder, isActive, nodeIsHidden,
-                            nodeIsCollapsed, isSelected, treeNodeTreeData);
+                            nodeIsCollapsed, isSelected, isChecked, treeNodeTreeData);
+                    }
+                }
+            }
+
+            if (IsCheckable && checkedFiles.Any())
+            {
+                for (var index = Nodes.Count - 1; index >= 0; index--)
+                {
+                    var node = Nodes[index];
+                    if (node.Level >= 0 && node.IsFolder)
+                    {
+                        bool? anyChecked = null;
+                        bool? allChecked = null;
+
+                        for (var i = index + 1; i < Nodes.Count; i++)
+                        {
+                            var nodeCompare = Nodes[i];
+                            if (nodeCompare.Level < node.Level + 1)
+                            {
+                                break;
+                            }
+
+                            var nodeIsChecked = nodeCompare.CheckState == CheckState.Checked;
+                            allChecked = (allChecked ?? true) && nodeIsChecked;
+                            anyChecked = (anyChecked ?? false) || nodeIsChecked;
+                        }
+
+                        node.CheckState = anyChecked.Value 
+                            ? (allChecked.Value ? CheckState.Checked : CheckState.Mixed)
+                            : CheckState.Empty;
                     }
                 }
             }
@@ -126,10 +160,9 @@ public void SetCheckStateOnAll(bool isChecked)
 
         protected abstract IEnumerable<string> GetCollapsedFolders();
 
-        protected void AddNode(string path, string label, int level, bool isFolder, bool isActive, bool isHidden,
-            bool isCollapsed, bool isSelected, TData? treeData)
+        protected void AddNode(string path, string label, int level, bool isFolder, bool isActive, bool isHidden, bool isCollapsed, bool isSelected, bool isChecked, TData? treeData)
         {
-            var node = CreateTreeNode(path, label, level, isFolder, isActive, isHidden, isCollapsed, treeData);
+            var node = CreateTreeNode(path, label, level, isFolder, isActive, isHidden, isCollapsed, isChecked, treeData);
 
             SetNodeIcon(node);
             Nodes.Add(node);
@@ -151,8 +184,7 @@ protected void Clear()
 
         protected abstract void AddCheckedNode(TNode node);
 
-        protected abstract TNode CreateTreeNode(string path, string label, int level, bool isFolder, bool isActive,
-            bool isHidden, bool isCollapsed, TData? treeData);
+        protected abstract TNode CreateTreeNode(string path, string label, int level, bool isFolder, bool isActive, bool isHidden, bool isCollapsed, bool isChecked, TData? treeData);
 
         protected abstract void OnClear();
 

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

@@ -160,7 +160,7 @@ protected Texture GetNodeIconBadge(ChangesTreeNode node)
             return Styles.GetFileStatusIcon(gitFileStatus, node.IsLocked);
         }
 
-        protected override ChangesTreeNode CreateTreeNode(string path, string label, int level, bool isFolder, bool isActive, bool isHidden, bool isCollapsed, GitStatusEntryTreeData? treeData)
+        protected override ChangesTreeNode CreateTreeNode(string path, string label, int level, bool isFolder, bool isActive, bool isHidden, bool isCollapsed, bool isChecked, GitStatusEntryTreeData? treeData)
         {
             var gitFileStatus = GitFileStatus.None;
             var projectPath = (string) null;
@@ -183,12 +183,13 @@ protected override ChangesTreeNode CreateTreeNode(string path, string label, int
                 IsHidden = isHidden,
                 IsCollapsed = isCollapsed,
                 TreeIsCheckable = IsCheckable,
+                CheckState = isChecked ? CheckState.Checked : CheckState.Empty,
                 GitFileStatus = gitFileStatus,
                 ProjectPath = projectPath,
                 IsLocked = isLocked
             };
 
-            if (isFolder)
+            if (isFolder && level >= 0)
             {
                 folders.Add(node.Path, node);
             }

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

@@ -633,7 +633,7 @@ protected Texture GetNodeIcon(TreeNode node)
             return nodeIcon;
         }
 
-        protected override TreeNode CreateTreeNode(string path, string label, int level, bool isFolder, bool isActive, bool isHidden, bool isCollapsed, GitBranchTreeData? treeData)
+        protected override TreeNode CreateTreeNode(string path, string label, int level, bool isFolder, bool isActive, bool isHidden, bool isCollapsed, bool isChecked, GitBranchTreeData? treeData)
         {
             var node = new TreeNode {
                 Path = path,
@@ -643,10 +643,11 @@ protected override TreeNode CreateTreeNode(string path, string label, int level,
                 IsActive = isActive,
                 IsHidden = isHidden,
                 IsCollapsed = isCollapsed,
-                TreeIsCheckable = IsCheckable
+                TreeIsCheckable = IsCheckable,
+                CheckState = isChecked ? CheckState.Checked: CheckState.Empty
             };
 
-            if (isFolder)
+            if (isFolder && level >= 0)
             {
                 folders.Add(node.Path, node);
             }