@@ -539,7 +539,7 @@ public async void BaseContextFlyout_Opening(object? sender, object e)
539
539
BaseContextMenuFlyout . PrimaryCommands . Clear ( ) ;
540
540
BaseContextMenuFlyout . SecondaryCommands . Clear ( ) ;
541
541
var ( primaryElements , secondaryElements ) = ItemModelListToContextFlyoutHelper . GetAppBarItemsFromModel ( items ) ;
542
- AddCloseHandler ( primaryElements , secondaryElements ) ;
542
+ AddCloseHandler ( BaseContextMenuFlyout , primaryElements , secondaryElements ) ;
543
543
primaryElements . ForEach ( i => BaseContextMenuFlyout . PrimaryCommands . Add ( i ) ) ;
544
544
secondaryElements . OfType < FrameworkElement > ( ) . ForEach ( i => i . MinWidth = Constants . UI . ContextMenuItemsMaxWidth ) ; // Set menu min width
545
545
secondaryElements . ForEach ( i => BaseContextMenuFlyout . SecondaryCommands . Add ( i ) ) ;
@@ -589,7 +589,7 @@ private async Task LoadMenuItemsAsync()
589
589
ItemContextMenuFlyout . PrimaryCommands . Clear ( ) ;
590
590
ItemContextMenuFlyout . SecondaryCommands . Clear ( ) ;
591
591
var ( primaryElements , secondaryElements ) = ItemModelListToContextFlyoutHelper . GetAppBarItemsFromModel ( items ) ;
592
- AddCloseHandler ( primaryElements , secondaryElements ) ;
592
+ AddCloseHandler ( ItemContextMenuFlyout , primaryElements , secondaryElements ) ;
593
593
primaryElements . ForEach ( i => ItemContextMenuFlyout . PrimaryCommands . Add ( i ) ) ;
594
594
secondaryElements . OfType < FrameworkElement > ( ) . ForEach ( i => i . MinWidth = Constants . UI . ContextMenuItemsMaxWidth ) ; // Set menu min width
595
595
secondaryElements . ForEach ( i => ItemContextMenuFlyout . SecondaryCommands . Add ( i ) ) ;
@@ -605,10 +605,10 @@ private async Task LoadMenuItemsAsync()
605
605
}
606
606
}
607
607
608
- private void AddCloseHandler ( IList < ICommandBarElement > primaryElements , IList < ICommandBarElement > secondaryElements )
608
+ private void AddCloseHandler ( CommandBarFlyout flyout , IList < ICommandBarElement > primaryElements , IList < ICommandBarElement > secondaryElements )
609
609
{
610
610
// Workaround for WinUI (#5508)
611
- var closeHandler = new RoutedEventHandler ( ( s , e ) => ItemContextMenuFlyout . Hide ( ) ) ;
611
+ var closeHandler = new RoutedEventHandler ( ( s , e ) => flyout . Hide ( ) ) ;
612
612
613
613
primaryElements
614
614
. OfType < AppBarButton > ( )
0 commit comments