From 52efb5dd8fd67da359c8f097bd97c30a1238c284 Mon Sep 17 00:00:00 2001 From: Max Katz Date: Mon, 22 May 2023 19:59:28 -0400 Subject: [PATCH] Fix merge build error --- src/Avalonia.Controls/Primitives/SelectingItemsControl.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Avalonia.Controls/Primitives/SelectingItemsControl.cs b/src/Avalonia.Controls/Primitives/SelectingItemsControl.cs index 64ecb4321e..0e627c2a37 100644 --- 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); }