Merge pull request #20817 from unoplatform/dev/mazi/cbf-improvements

Author: MartinZikmund

src/Uno.UI.RuntimeTests/Tests/Windows_UI_Xaml_Controls/Given_CommandBarFlyout.cs

@@ -0,0 +1,53 @@
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Controls.Primitives;
+using Microsoft.UI.Xaml.Media;
+using MUXControlsTestApp.Utilities;
+using Private.Infrastructure;
+
+namespace Uno.UI.RuntimeTests.Tests.Windows_UI_Xaml_Controls;
+
+[TestClass]
+[RunsOnUIThread]
+public class Given_CommandBarFlyout
+{
+	[TestMethod]
+	public async Task When_CommandBarFlyoutCommandBar_AlwaysExpanded()
+	{
+		var commandBarFlyout = new CommandBarFlyout
+		{
+			AlwaysExpanded = true
+		};
+		commandBarFlyout.PrimaryCommands.Add(new AppBarButton { Label = "Primary Command" });
+		commandBarFlyout.SecondaryCommands.Add(new AppBarButton { Label = "Secondary Command" });
+
+		var button = new Button
+		{
+			Content = "Open CommandBarFlyout",
+		};
+
+		FlyoutBase.SetAttachedFlyout(button, commandBarFlyout);
+
+		TestServices.WindowHelper.WindowContent = button;
+		await TestServices.WindowHelper.WaitForLoaded(button);
+
+		FlyoutBase.ShowAttachedFlyout(button);
+		await TestServices.WindowHelper.WaitForIdle();
+
+		var popups = VisualTreeHelper.GetOpenPopupsForXamlRoot(TestServices.WindowHelper.XamlRoot);
+
+		var commandBarPopup = popups.FirstOrDefault(p => VisualTreeUtils.FindVisualChildByType<CommandBarFlyoutCommandBar>(p.Child) is not null);
+		Assert.IsNotNull(commandBarPopup);
+		var commandBar = VisualTreeUtils.FindVisualChildByType<CommandBarFlyoutCommandBar>(commandBarPopup?.Child);
+		Assert.IsNotNull(commandBar);
+
+		bool wasClosed = false;
+		commandBar.Closed += (s, e) => wasClosed = true;
+		commandBar.IsOpen = false;
+
+		await TestServices.WindowHelper.WaitForIdle();
+		Assert.IsTrue(commandBar.IsOpen, "CommandBarFlyout should remain open when AlwaysExpanded is true.");
+		Assert.IsFalse(wasClosed, "CommandBarFlyout should not close when AlwaysExpanded is true.");
+	}
+}

src/Uno.UI.RuntimeTests/Tests/Windows_UI_Xaml_Controls/Given_Flyout.cs

@@ -38,6 +38,14 @@ public class Given_Flyout
 	{
 		private string GetAllIsOpens() => string.Join(" ", VisualTreeHelper.GetOpenPopupsForXamlRoot(TestServices.WindowHelper.XamlRoot).Select(p => p.IsOpen));
 
+		[TestMethod]
+		[RunsOnUIThread]
+		public async Task When_Default_ShowMode()
+		{
+			var flyout = new Flyout();
+			Assert.AreEqual(FlyoutShowMode.Standard, flyout.ShowMode);
+		}
+
 		[TestMethod]
 		[RunsOnUIThread]
 		public async Task When_Unloaded_Before_Shown()

src/Uno.UI/Generated/3.0.0.0/Microsoft.UI.Xaml.Controls.Primitives/FlyoutBase.cs

@@ -9,7 +9,7 @@ namespace Microsoft.UI.Xaml.Controls.Primitives
 	public partial class FlyoutBase : global::Microsoft.UI.Xaml.DependencyObject
 	{
 		// Skipping already declared property XamlRoot
-#if __ANDROID__ || __IOS__ || __TVOS__ || IS_UNIT_TESTS || __WASM__ || __SKIA__ || __NETSTD_REFERENCE__
+#if false
 		[global::Uno.NotImplemented("__ANDROID__", "__IOS__", "__TVOS__", "IS_UNIT_TESTS", "__WASM__", "__SKIA__", "__NETSTD_REFERENCE__")]
 		public global::Microsoft.UI.Xaml.Controls.Primitives.FlyoutShowMode ShowMode
 		{
@@ -145,7 +145,7 @@ public bool IsConstrainedToRootBounds
 			typeof(global::Microsoft.UI.Xaml.Controls.Primitives.FlyoutBase),
 			new Microsoft.UI.Xaml.FrameworkPropertyMetadata(default(bool)));
 #endif
-#if __ANDROID__ || __IOS__ || __TVOS__ || IS_UNIT_TESTS || __WASM__ || __SKIA__ || __NETSTD_REFERENCE__
+#if false
 		[global::Uno.NotImplemented("__ANDROID__", "__IOS__", "__TVOS__", "IS_UNIT_TESTS", "__WASM__", "__SKIA__", "__NETSTD_REFERENCE__")]
 		public static global::Microsoft.UI.Xaml.DependencyProperty ShowModeProperty { get; } =
 		Microsoft.UI.Xaml.DependencyProperty.Register(

src/Uno.UI/Generated/3.0.0.0/Microsoft.UI.Xaml.Controls.Primitives/FlyoutShowMode.cs

@@ -3,19 +3,19 @@
 #pragma warning disable 114 // new keyword hiding
 namespace Microsoft.UI.Xaml.Controls.Primitives
 {
-#if __ANDROID__ || __IOS__ || __TVOS__ || IS_UNIT_TESTS || __WASM__ || __SKIA__ || __NETSTD_REFERENCE__
+#if false
 	public enum FlyoutShowMode
 	{
-#if __ANDROID__ || __IOS__ || __TVOS__ || IS_UNIT_TESTS || __WASM__ || __SKIA__ || __NETSTD_REFERENCE__
+#if false
 		Auto = 0,
 #endif
-#if __ANDROID__ || __IOS__ || __TVOS__ || IS_UNIT_TESTS || __WASM__ || __SKIA__ || __NETSTD_REFERENCE__
+#if false
 		Standard = 1,
 #endif
-#if __ANDROID__ || __IOS__ || __TVOS__ || IS_UNIT_TESTS || __WASM__ || __SKIA__ || __NETSTD_REFERENCE__
+#if false
 		Transient = 2,
 #endif
-#if __ANDROID__ || __IOS__ || __TVOS__ || IS_UNIT_TESTS || __WASM__ || __SKIA__ || __NETSTD_REFERENCE__
+#if false
 		TransientWithDismissOnPointerMoveAway = 3,
 #endif
 	}

src/Uno.UI/Generated/3.0.0.0/Microsoft.UI.Xaml.Controls.Primitives/FlyoutShowOptions.cs

@@ -8,7 +8,7 @@ namespace Microsoft.UI.Xaml.Controls.Primitives
 #endif
 	public partial class FlyoutShowOptions
 	{
-#if __ANDROID__ || __IOS__ || __TVOS__ || IS_UNIT_TESTS || __WASM__ || __SKIA__ || __NETSTD_REFERENCE__
+#if false
 		[global::Uno.NotImplemented("__ANDROID__", "__IOS__", "__TVOS__", "IS_UNIT_TESTS", "__WASM__", "__SKIA__", "__NETSTD_REFERENCE__")]
 		public global::Microsoft.UI.Xaml.Controls.Primitives.FlyoutShowMode ShowMode
 		{

src/Uno.UI/UI/Xaml/Controls/AppBar/AppBar.Partial.cs

@@ -850,7 +850,7 @@ private void OnIsOpenChanged(bool isOpen)
 				// matter because Blue apps wouldn't have had access to them.
 				// For post-WinBlue AppBars, we fire the Opening/Closing & Opened/Closed
 				// events based on our display mode state transitions.
-				//if (m_tpDisplayModesStateGroup == null)
+				if (IsOpen == isOpen)
 				{
 					if (isOpen)
 					{
@@ -1228,9 +1228,8 @@ protected bool TryDismissInlineAppBar()
 				if (isOpen)
 				{
 					isAppBarDismissed = true;
+					IsOpen = false;
 				}
-
-				IsOpen = false;
 			}
 
 			return isAppBarDismissed;

src/Uno.UI/UI/Xaml/Controls/CommandBarFlyout/CommandBarFlyoutCommandBar.mux.cs

@@ -845,7 +845,7 @@ private void UpdateItemVisualState(Control? item, bool isPrimaryItem)
 		}
 	}
 
-	protected override void UpdateTemplateSettings()
+	private new void UpdateTemplateSettings()
 	{
 		//COMMANDBARFLYOUT_TRACE_INFO(this, TRACE_MSG_METH_INT, METH_NAME, this, IsOpen);
 

src/Uno.UI/UI/Xaml/Controls/Flyout/FlyoutBase.cs

@@ -286,6 +286,25 @@ public bool AllowFocusOnInteraction
 		[GeneratedDependencyProperty(DefaultValue = true, Options = FrameworkPropertyMetadataOptions.Inherits, ChangedCallback = true)]
 		public static DependencyProperty AllowFocusOnInteractionProperty { get; } = CreateAllowFocusOnInteractionProperty();
 
+		/// <summary>
+		/// Gets or sets a value that indicates how a flyout behaves when shown.
+		/// </summary>
+		public FlyoutShowMode ShowMode
+		{
+			get => (FlyoutShowMode)this.GetValue(ShowModeProperty);
+			set => this.SetValue(ShowModeProperty, value);
+		}
+
+		/// <summary>
+		/// Identifies the ShowMode dependency property.
+		/// </summary>
+		public static DependencyProperty ShowModeProperty { get; } =
+			DependencyProperty.Register(
+				nameof(ShowMode),
+				typeof(FlyoutShowMode),
+				typeof(FlyoutBase),
+				new FrameworkPropertyMetadata(FlyoutShowMode.Standard));
+
 		private void OnAllowFocusOnInteractionChanged(bool oldValue, bool newValue) =>
 			SynchronizePropertyToPopup(Popup.AllowFocusOnInteractionProperty, AllowFocusOnInteraction);
 
@@ -459,6 +478,13 @@ private protected virtual void ShowAtCore(FrameworkElement placementTarget, Flyo
 				_ => PopupPlacementMode.Auto,
 			};
 
+			ShowMode = showOptions?.ShowMode ?? FlyoutShowMode.Standard;
+
+			if (ShowMode == FlyoutShowMode.Auto)
+			{
+				ShowMode = FlyoutShowMode.Standard;
+			}
+
 			OnOpening();
 
 			if (m_openingCanceled)

src/Uno.UI/UI/Xaml/Controls/Flyout/FlyoutShowMode.cs

@@ -0,0 +1,27 @@
+namespace Microsoft.UI.Xaml.Controls.Primitives;
+
+/// <summary>
+/// Defines constants that specify how a flyout behaves when shown.
+/// </summary>
+public enum FlyoutShowMode
+{
+	/// <summary>
+	/// The show mode is determined automatically based on the method used to show the flyout.	
+	/// </summary>
+	Auto = 0,
+
+	/// <summary>
+	/// Behavior is typical of a flyout shown reactively, like a context menu. The open flyout takes focus. For a CommandBarFlyout, it opens in its expanded state.
+	/// </summary>
+	Standard = 1,
+
+	/// <summary>
+	/// Behavior is typical of a flyout shown proactively. The open flyout does not take focus. For a CommandBarFlyout, it opens in its collapsed state.
+	/// </summary>
+	Transient = 2,
+
+	/// <summary>
+	/// The flyout exhibits Transient behavior while the cursor is close to it, but is dismissed when the cursor moves away.
+	/// </summary>
+	TransientWithDismissOnPointerMoveAway = 3,
+}

src/Uno.UI/UI/Xaml/Controls/Flyout/FlyoutShowOptions.cs

@@ -1,15 +1,31 @@
 using Windows.Foundation;
 
-namespace Microsoft.UI.Xaml.Controls.Primitives
+namespace Microsoft.UI.Xaml.Controls.Primitives;
+
+/// <summary>
+/// Represents the options used to show a flyout.
+/// </summary>
+public partial class FlyoutShowOptions
 {
-	public partial class FlyoutShowOptions
+	/// <summary>
+	/// Initializes a new instance of the FlyoutShowOptions class.
+	/// </summary>
+	public FlyoutShowOptions()
 	{
-		public Point? Position { get; set; }
+	}
 
-		public FlyoutPlacementMode Placement { get; set; } = FlyoutPlacementMode.Auto;
+	/// <summary>
+	/// Gets or sets the position where the flyout opens.
+	/// </summary>
+	public Point? Position { get; set; }
 
-		public FlyoutShowOptions()
-		{
-		}
-	}
+	/// <summary>
+	/// Gets or sets a value that indicates where the flyout is placed in relation to its target element.
+	/// </summary>
+	public FlyoutPlacementMode Placement { get; set; } = FlyoutPlacementMode.Auto;
+
+	/// <summary>
+	/// Gets or sets a value that indicates how the flyout behaves when opened.
+	/// </summary>
+	public FlyoutShowMode ShowMode { get; set; }
 }