fix: Fixed incorrect behavior when scrolling the hierarchy up with keyboard

SolidAlloy · SolidAlloy · commit 4a382fe3daaf · 2021-10-17T12:40:01.000+03:00
diff --git a/Editor/TypeDropdown/SelectionTree.KeyboardInput.cs b/Editor/TypeDropdown/SelectionTree.KeyboardInput.cs
@@ -110,7 +110,7 @@ private bool OnArrowUp()
 
             var previousNode = SelectedNode.ParentNode.GetPreviousChild(SelectedNode);
 
-            if (IsExpandedFolder(previousNode))
+            if (IsExpandedFolder(previousNode) && !previousNode.ChildNodes.Contains(SelectedNode))
             {
                 // choose last item of the previous folder instead.
                 previousNode = previousNode.ChildNodes[previousNode.ChildNodes.Count - 1];
@@ -128,7 +128,7 @@ private bool OnArrowUp()
 
         private bool IsExpandedFolder(SelectionNode previousNode)
         {
-            return SelectedNode.IsFolder && previousNode.IsFolder && previousNode.Expanded && previousNode.ChildNodes.Count != 0;
+            return previousNode.IsFolder && previousNode.Expanded && previousNode.ChildNodes.Count != 0;
         }
 
         #endregion

Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,7 @@ private bool OnArrowUp()`
`110`	`110`
`111`	`111`	`var previousNode = SelectedNode.ParentNode.GetPreviousChild(SelectedNode);`
`112`	`112`
`113`		`- if (IsExpandedFolder(previousNode))`
	`113`	`+ if (IsExpandedFolder(previousNode) && !previousNode.ChildNodes.Contains(SelectedNode))`
`114`	`114`	`{`
`115`	`115`	`// choose last item of the previous folder instead.`
`116`	`116`	`previousNode = previousNode.ChildNodes[previousNode.ChildNodes.Count - 1];`
`@@ -128,7 +128,7 @@ private bool OnArrowUp()`
`128`	`128`
`129`	`129`	`private bool IsExpandedFolder(SelectionNode previousNode)`
`130`	`130`	`{`
`131`		`- return SelectedNode.IsFolder && previousNode.IsFolder && previousNode.Expanded && previousNode.ChildNodes.Count != 0;`
	`131`	`+ return previousNode.IsFolder && previousNode.Expanded && previousNode.ChildNodes.Count != 0;`
`132`	`132`	`}`
`133`	`133`
`134`	`134`	`#endregion`