diff --git a/dev/CommandBarFlyout/CommandBarFlyout.cpp b/dev/CommandBarFlyout/CommandBarFlyout.cpp index b65bb1480c..cc99dc4659 100644 --- a/dev/CommandBarFlyout/CommandBarFlyout.cpp +++ b/dev/CommandBarFlyout/CommandBarFlyout.cpp @@ -162,8 +162,9 @@ CommandBarFlyout::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/dev/CommandBarFlyout/InteractionTests/CommandBarFlyoutTests.cs b/dev/CommandBarFlyout/InteractionTests/CommandBarFlyoutTests.cs index 7dc62882e0..5f4c75d3c4 100644 --- a/dev/CommandBarFlyout/InteractionTests/CommandBarFlyoutTests.cs +++ b/dev/CommandBarFlyout/InteractionTests/CommandBarFlyoutTests.cs @@ -620,5 +620,46 @@ public void VerifyFlowsToAndFromIsNotSetWithoutPrimaryCommands() InputHelper.Tap(showCommandBarFlyoutButton); } } + + [TestMethod] + public void VerifyFlyoutClosingBehavior() + { + if (PlatformConfiguration.IsOSVersionLessThan(OSVersion.Redstone2)) + { + Log.Warning("Test is disabled pre-RS2 because CommandBarFlyout is not supported pre-RS2"); + return; + } + + using (var setup = new CommandBarFlyoutTestSetupHelper()) + { + Button showCommandBarFlyoutButton = FindElement.ByName