Fix merge build error

3 years ago · 52efb5dd8f
1 changed files with 2 additions and 2 deletions
--- a/src/Avalonia.Controls/Primitives/SelectingItemsControl.cs
+++ b/src/Avalonia.Controls/Primitives/SelectingItemsControl.cs
@ -704,8 +704,8 @@ namespace Avalonia.Controls.Primitives
            bool wrap = false,
            bool rangeModifier = false)
        {
-            var from = GetContainerFromEventSource(FocusManager.Instance?.Current) ??
-                ContainerFromIndex(Selection.AnchorIndex);
+            var focused = FocusManager.GetFocusManager(this)?.GetFocusedElement();
+            var from = GetContainerFromEventSource(focused) ?? ContainerFromIndex(Selection.AnchorIndex);
            return MoveSelection(from, direction, wrap, rangeModifier);
        }