Fix issue with flyouts created in CommandBarFlyout not closing when c…

…ommandbar closes (microsoft/microsoft-ui-xaml#3079)
Kinnara · Aug 17, 2020 · 468801a · 468801a
1 parent 31b4427
commit 468801a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/ModernWpf.Controls/CommandBarFlyout/CommandBarFlyout.cs b/ModernWpf.Controls/CommandBarFlyout/CommandBarFlyout.cs
@@ -160,8 +160,9 @@ public CommandBarFlyout()
                             Hide();
                             m_isClosingAfterCloseAnimation = false;
                         });
-                        commandBar.IsOpen = false;
                     }
+                    // Close commandbar and thus other associated flyouts
+                    commandBar.IsOpen = false;
 
                     //CommandBarFlyoutCommandBar.Closed will be called when
                     //clicking the more (...) button, we clear the translations

diff --git a/test/ModernWpfTestApp/CommandBarFlyoutPage.xaml b/test/ModernWpfTestApp/CommandBarFlyoutPage.xaml
@@ -124,7 +124,7 @@
                     <ui:AppBarButton x:Name="ProofingButton" AutomationProperties.AutomationId="ProofingButton" Label="Proofing" Click="OnElementClicked">
                         <ui:AppBarButton.Flyout>
                             <ui:MenuFlyout>
-                                <MenuItem Header="talk" />
+                                <MenuItem AutomationProperties.Name="FirstFlyoutItem" Header="talk" />
                                 <MenuItem Header="talks" />
                                 <MenuItem Header="talk a" />
                                 <Separator />