From 22605e52e9d15e9127f308d8e60a70abe38a4770 Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Thu, 29 Oct 2020 13:14:00 +0000 Subject: [PATCH] add fix for treeview navigation when SelectedItem is not in the tree. --- src/Avalonia.Controls/TreeView.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Avalonia.Controls/TreeView.cs b/src/Avalonia.Controls/TreeView.cs index 558bcddfbe..f020280496 100644 --- a/src/Avalonia.Controls/TreeView.cs +++ b/src/Avalonia.Controls/TreeView.cs @@ -382,7 +382,7 @@ namespace Avalonia.Controls ItemContainerGenerator.Index.ContainerFromItem(_selectedItem) : ItemContainerGenerator.ContainerFromIndex(0); - return (true, result); // SelectedItem may not be in the treeview. + return (result is {}, result); // SelectedItem may not be in the treeview. } return (true, null);