feat: CommandBarFlyoutCommandBar

MartinZikmund · MartinZikmund · commit 442290d6a471 · 2025-06-13T13:56:23.000+02:00
diff --git a/src/Uno.UI/Helpers/WinUI/SharedHelpers.cs b/src/Uno.UI/Helpers/WinUI/SharedHelpers.cs
@@ -935,6 +935,19 @@ FrameworkElement FindInVisualTreeInner(DependencyObject parent, Func<FrameworkEl
 			return FindInVisualTreeInner(parent, isMatch);
 		}
 
+		public static bool IsFrameworkElementLoaded(FrameworkElement frameworkElement)
+		{
+			if (IsRS5OrHigher())
+			{
+				// TODO:MZ: Does this work everywhere?
+				return frameworkElement.IsLoaded;
+			}
+			else
+			{
+				return VisualTreeHelper.GetParent(frameworkElement) != null;
+			}
+		}
+
 		public static bool IsTrue(bool? nullableBool)
 		{
 			if (nullableBool != null)
diff --git a/src/Uno.UI/UI/Xaml/Controls/CommandBar/ICommandBarElement2.cs b/src/Uno.UI/UI/Xaml/Controls/CommandBar/ICommandBarElement2.cs
@@ -1,11 +1,17 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace Microsoft.UI.Xaml.Controls;
+﻿namespace Microsoft.UI.Xaml.Controls;
 
+/// <summary>
+/// Defines members to manage the command bar overflow menu.
+/// </summary>
 public partial interface ICommandBarElement2
 {
+	/// <summary>
+	/// Gets or sets the order in which this item is moved to the CommandBar overflow menu.
+	/// </summary>
 	int DynamicOverflowOrder { get; set; }
+
+	/// <summary>
+	/// Gets a value that indicates whether this item is in the overflow menu.
+	/// </summary>
 	bool IsInOverflow { get; }
 }
diff --git a/src/Uno.UI/UI/Xaml/Controls/CommandBar/ICommandBarElement3.cs b/src/Uno.UI/UI/Xaml/Controls/CommandBar/ICommandBarElement3.cs
@@ -1,8 +1,4 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace Microsoft.UI.Xaml.Controls;
+﻿namespace Microsoft.UI.Xaml.Controls;
 
 internal interface ICommandBarElement3
 {
diff --git a/src/Uno.UI/UI/Xaml/Input/StandardUICommand/CommandBarFlyoutCommandBar.cs b/src/Uno.UI/UI/Xaml/Input/StandardUICommand/CommandBarFlyoutCommandBar.cs
@@ -1,7 +1,26 @@
-﻿using Windows.UI.Xaml.Controls;
+﻿using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
 
 namespace Microsoft.UI.Xaml.Controls.Primitives;
 
 public partial class CommandBarFlyoutCommandBar : CommandBar
 {
+	/// <summary>
+	/// Gets an object that provides calculated values that can be referenced as {TemplateBinding} markup
+	/// extension sources when defining templates for a CommandBarFlyoutCommandBar control.
+	/// </summary>
+	public CommandBarFlyoutCommandBarTemplateSettings FlyoutTemplateSettings
+	{
+		get => (CommandBarFlyoutCommandBarTemplateSettings)GetValue(FlyoutTemplateSettingsProperty);
+		set => SetValue(FlyoutTemplateSettingsProperty, value);
+	}
+
+	internal static DependencyProperty FlyoutTemplateSettingsProperty { get; } =
+		DependencyProperty.Register(
+			nameof(FlyoutTemplateSettings),
+				typeof(CommandBarFlyoutCommandBarTemplateSettings),
+				typeof(CommandBarFlyoutCommandBar),
+				new FrameworkPropertyMetadata(null));
+
+
 }
diff --git a/src/Uno.UI/UI/Xaml/Input/StandardUICommand/CommandBarFlyoutCommandBar.h.mux.cs b/src/Uno.UI/UI/Xaml/Input/StandardUICommand/CommandBarFlyoutCommandBar.h.mux.cs
@@ -41,7 +41,7 @@ partial class CommandBarFlyoutCommandBar
 	private FrameworkElement? m_currentSecondaryItemsStartElement;
 
 	private CommandBarFlyoutOpenCloseAnimationKind m_openAnimationKind = CommandBarFlyoutOpenCloseAnimationKind.Clip;
-	private ManagedWeakReference m_flyoutPresenter;
+	private ManagedWeakReference? m_flyoutPresenter;
 	private Storyboard? m_openingStoryboard;
 	private Storyboard? m_closingStoryboard;
 	private readonly SerialDisposable m_openingStoryboardCompletedRevoker = new();
diff --git a/src/Uno.UI/UI/Xaml/Input/StandardUICommand/CommandBarFlyoutCommandBar.mux.cs b/src/Uno.UI/UI/Xaml/Input/StandardUICommand/CommandBarFlyoutCommandBar.mux.cs

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,4 @@`
`1`		`-using System;`
`2`		`-using System.Collections.Generic;`
`3`		`-using System.Text;`
`4`		`-`
`5`		`-namespace Microsoft.UI.Xaml.Controls;`
	`1`	`+namespace Microsoft.UI.Xaml.Controls;`
`6`	`2`
`7`	`3`	`internal interface ICommandBarElement3`
`8`	`4`	`{`