Skip to content

Commit aa9cbcd

Browse files
authored
Fix: Fixed issue where BaseContextFlyout was not closed after selecting an item (#11245)
1 parent e73396b commit aa9cbcd

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

src/Files.App/BaseLayout.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -539,7 +539,7 @@ public async void BaseContextFlyout_Opening(object? sender, object e)
539539
BaseContextMenuFlyout.PrimaryCommands.Clear();
540540
BaseContextMenuFlyout.SecondaryCommands.Clear();
541541
var (primaryElements, secondaryElements) = ItemModelListToContextFlyoutHelper.GetAppBarItemsFromModel(items);
542-
AddCloseHandler(primaryElements, secondaryElements);
542+
AddCloseHandler(BaseContextMenuFlyout, primaryElements, secondaryElements);
543543
primaryElements.ForEach(i => BaseContextMenuFlyout.PrimaryCommands.Add(i));
544544
secondaryElements.OfType<FrameworkElement>().ForEach(i => i.MinWidth = Constants.UI.ContextMenuItemsMaxWidth); // Set menu min width
545545
secondaryElements.ForEach(i => BaseContextMenuFlyout.SecondaryCommands.Add(i));
@@ -589,7 +589,7 @@ private async Task LoadMenuItemsAsync()
589589
ItemContextMenuFlyout.PrimaryCommands.Clear();
590590
ItemContextMenuFlyout.SecondaryCommands.Clear();
591591
var (primaryElements, secondaryElements) = ItemModelListToContextFlyoutHelper.GetAppBarItemsFromModel(items);
592-
AddCloseHandler(primaryElements, secondaryElements);
592+
AddCloseHandler(ItemContextMenuFlyout, primaryElements, secondaryElements);
593593
primaryElements.ForEach(i => ItemContextMenuFlyout.PrimaryCommands.Add(i));
594594
secondaryElements.OfType<FrameworkElement>().ForEach(i => i.MinWidth = Constants.UI.ContextMenuItemsMaxWidth); // Set menu min width
595595
secondaryElements.ForEach(i => ItemContextMenuFlyout.SecondaryCommands.Add(i));
@@ -605,10 +605,10 @@ private async Task LoadMenuItemsAsync()
605605
}
606606
}
607607

608-
private void AddCloseHandler(IList<ICommandBarElement> primaryElements, IList<ICommandBarElement> secondaryElements)
608+
private void AddCloseHandler(CommandBarFlyout flyout, IList<ICommandBarElement> primaryElements, IList<ICommandBarElement> secondaryElements)
609609
{
610610
// Workaround for WinUI (#5508)
611-
var closeHandler = new RoutedEventHandler((s, e) => ItemContextMenuFlyout.Hide());
611+
var closeHandler = new RoutedEventHandler((s, e) => flyout.Hide());
612612

613613
primaryElements
614614
.OfType<AppBarButton>()

0 commit comments

Comments
 (0)