Fix ContextMenu freeze.

AvaloniaUI · Apr 25, 2022 · 5d9dbca · 5d9dbca
1 parent 4f0ad99
commit 5d9dbca
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/Avalonia.Controls/ItemsControl.cs b/src/Avalonia.Controls/ItemsControl.cs
@@ -518,7 +518,7 @@ private void UpdatePseudoClasses(int itemCount)
                 }
 
                 c = result;
-            } while (c != null && c != from);
+            } while (c != null && c != from && direction != NavigationDirection.First && direction != NavigationDirection.Last);
 
             return null;
         }

diff --git a/src/Avalonia.Controls/Platform/DefaultMenuInteractionHandler.cs b/src/Avalonia.Controls/Platform/DefaultMenuInteractionHandler.cs
@@ -417,7 +417,7 @@ protected internal virtual void PointerReleased(object? sender, PointerReleasedE
 
         protected internal virtual void MenuOpened(object? sender, RoutedEventArgs e)
         {
-            if (e.Source == Menu)
+            if (e.Source is Menu)
             {
                 Menu?.MoveSelection(NavigationDirection.First, true);
             }