From d3fbc105af38328ff25a30a442b57038e13acf11 Mon Sep 17 00:00:00 2001 From: Max Katz Date: Tue, 16 May 2023 23:26:11 -0400 Subject: [PATCH] Fix "GetFocusManager" with some unit tests --- src/Avalonia.Base/Input/FocusManager.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Avalonia.Base/Input/FocusManager.cs b/src/Avalonia.Base/Input/FocusManager.cs index 214ba21c5c..c3316eb278 100644 --- a/src/Avalonia.Base/Input/FocusManager.cs +++ b/src/Avalonia.Base/Input/FocusManager.cs @@ -196,7 +196,7 @@ namespace Avalonia.Input { // Element might not be a visual, and not attached to the root. // But IFocusManager is always expected to be a FocusManager. - return (FocusManager?)((IInputRoot?)(element as Visual)?.VisualRoot)?.FocusManager + return (FocusManager?)((element as Visual)?.VisualRoot as IInputRoot)?.FocusManager // In our unit tests some elements might not have a root. Remove when we migrate to headless tests. ?? (FocusManager?)AvaloniaLocator.Current.GetService(); }