Add a check for buttons with flyouts and add a test. (#3054)

Author: StephenLPeters

dev/CommandBarFlyout/CommandBarFlyout.cpp

@@ -271,7 +271,7 @@ void CommandBarFlyout::SetSecondaryCommandsToCloseWhenExecuted()
         auto button = element.try_as<winrt::AppBarButton>();
         auto toggleButton = element.try_as<winrt::AppBarToggleButton>();
 
-        if (button)
+        if (button && !button.Flyout())
         {
             m_secondaryButtonClickRevokerByIndexMap[i] = button.Click(winrt::auto_revoke, closeFlyoutFunc);
         }

dev/CommandBarFlyout/InteractionTests/CommandBarFlyoutTests.cs

@@ -188,6 +188,39 @@ public void CanTapOnSecondaryItems()
             }
         }
 
+        [TestMethod]
+        public void CanTapOnSecondaryItemWithFlyoutWithoutClosing()
+        {
+            using (var setup = new CommandBarFlyoutTestSetupHelper())
+            {
+                Button showCommandBarFlyoutButton = FindElement.ByName<Button>("Show CommandBarFlyout with sub-menu");
+                ToggleButton isFlyoutOpenCheckBox = FindElement.ById<ToggleButton>("IsFlyoutOpenCheckBox");
+
+                Action openCommandBarAction = () =>
+                {
+                    Log.Comment("Tapping on a button to show the CommandBarFlyout.");
+                    InputHelper.Tap(showCommandBarFlyoutButton);
+
+                    // Pre-RS5, CommandBarFlyouts always open expanded,
+                    // so we don't need to tap on the more button in that case.
+                    if (PlatformConfiguration.IsOsVersionGreaterThanOrEqual(OSVersion.Redstone5))
+                    {
+                        Log.Comment("Expanding the CommandBar by invoking the more button.");
+                        FindElement.ById<Button>("MoreButton").InvokeAndWait();
+                    }
+                };
+
+                Log.Comment("Opening the CommandBar and invoking the first button in the secondary commands list.");
+                openCommandBarAction();
+
+
+                setup.ExecuteAndWaitForEvents(() => FindElement.ById<Button>("ProofingButton").Invoke(), new List<string>() { "ProofingButton clicked" });
+
+
+                Verify.IsTrue(isFlyoutOpenCheckBox.ToggleState == ToggleState.On);
+            }
+        }
+
         [TestMethod]
         public void VerifyTabNavigationBetweenPrimaryAndSecondaryCommands()
         {

dev/CommandBarFlyout/TestUI/CommandBarFlyoutPage.xaml

@@ -95,7 +95,7 @@
                 <AppBarButton x:Name="ItalicButton5" AutomationProperties.AutomationId="ItalicButton5" Label="Italic" Icon="Italic" Click="OnElementClicked" />
                 <AppBarButton x:Name="UnderlineButton5" AutomationProperties.AutomationId="UnderlineButton5" Label="Underline" Icon="Underline" Click="OnElementClicked" />
                 <muxc:CommandBarFlyout.SecondaryCommands>
-                    <AppBarButton Label="Proofing">
+                    <AppBarButton x:Name="ProofingButton" AutomationProperties.AutomationId="ProofingButton" Label="Proofing" Click="OnElementClicked">
                         <AppBarButton.Flyout>
                             <MenuFlyout>
                                 <MenuFlyoutItem Text="talk" />