Updated

Author: 0x5bfa

src/Files.App.Controls/BreadcrumbBar/BreadcrumbBar.Events.cs

@@ -25,6 +25,8 @@ private void RootItemButton_PointerPressed(object sender, PointerRoutedEventArgs
 
 		private void RootItemButton_PointerReleased(object sender, PointerRoutedEventArgs e)
 		{
+			RootItemClicked?.Invoke(this, EventArgs.Empty);
+
 			VisualStateManager.GoToState(this, "PointerOverItem", true);
 		}
 
@@ -57,7 +59,10 @@ private void RootChevronItemButton_PointerExited(object sender, PointerRoutedEve
 
 		private void RootItemChevronDropDownMenuFlyout_Opening(object? sender, object e)
 		{
-			RootItemDropDownFlyoutOpening?.Invoke(this, sender as MenuFlyout);
+			if (sender is not MenuFlyout flyout)
+				return;
+
+			RootItemDropDownFlyoutOpening?.Invoke(this, new(flyout));
 		}
 
 		private void RootItemChevronDropDownMenuFlyout_Opened(object? sender, object e)
@@ -67,7 +72,10 @@ private void RootItemChevronDropDownMenuFlyout_Opened(object? sender, object e)
 
 		private void RootItemChevronDropDownMenuFlyout_Closed(object? sender, object e)
 		{
-			RootItemDropDownFlyoutOpening?.Invoke(this, sender as MenuFlyout);
+			if (sender is not MenuFlyout flyout)
+				return;
+
+			RootItemDropDownFlyoutOpening?.Invoke(this, new(flyout));
 
 			VisualStateManager.GoToState(this, "ChevronNormalOff", true);
 			VisualStateManager.GoToState(this, "PointerNormal", true);

src/Files.App.Controls/BreadcrumbBar/BreadcrumbBar.cs

@@ -41,8 +41,8 @@ public partial class BreadcrumbBar : Control
 		public event EventHandler<BreadcrumbBarItemDropDownFlyoutEventArgs>? ItemDropDownFlyoutClosed;
 
 		public event EventHandler? RootItemClicked;
-		public event EventHandler<MenuFlyout>? RootItemDropDownFlyoutOpening;
-		public event EventHandler<MenuFlyout>? RootItemDropDownFlyoutClosed;
+		public event EventHandler<BreadcrumbBarItemDropDownFlyoutEventArgs>? RootItemDropDownFlyoutOpening;
+		public event EventHandler<BreadcrumbBarItemDropDownFlyoutEventArgs>? RootItemDropDownFlyoutClosed;
 
 		// Constructor
 
@@ -97,13 +97,13 @@ internal void RaiseItemClickedEvent(BreadcrumbBarItem item)
 		internal void RaiseItemDropDownFlyoutOpening(BreadcrumbBarItem item, MenuFlyout flyout)
 		{
 			var index = _itemsRepeater?.GetElementIndex(item) ?? throw new ArgumentNullException($"{_itemsRepeater} is null.");
-			ItemDropDownFlyoutOpening?.Invoke(this, new(item, index, flyout));
+			ItemDropDownFlyoutOpening?.Invoke(this, new(flyout, item, index));
 		}
 
 		internal void RaiseItemDropDownFlyoutClosed(BreadcrumbBarItem item, MenuFlyout flyout)
 		{
 			var index = _itemsRepeater?.GetElementIndex(item) ?? throw new ArgumentNullException($"{_itemsRepeater} is null.");
-			ItemDropDownFlyoutClosed?.Invoke(this, new(item, index, flyout));
+			ItemDropDownFlyoutClosed?.Invoke(this, new(flyout, item, index));
 		}
 
 		// Event methods

src/Files.App.Controls/BreadcrumbBar/BreadcrumbBarItemDropDownFlyoutEventArgs.cs

@@ -3,5 +3,5 @@
 
 namespace Files.App.Controls
 {
-	public record class BreadcrumbBarItemDropDownFlyoutEventArgs(BreadcrumbBarItem Item, int Index, MenuFlyout Flyout);
+	public record class BreadcrumbBarItemDropDownFlyoutEventArgs(MenuFlyout Flyout, BreadcrumbBarItem? Item = null, int Index = -1);
 }

tests/Files.App.UITests/Views/BreadcrumbBarPage.xaml.cs

@@ -69,19 +69,19 @@ private void BreadcrumbBar1_RootItemClicked(object sender, System.EventArgs e)
 			ClickedItemName = "Root item was clicked.";
 		}
 
-		private void BreadcrumbBar1_RootItemDropDownFlyoutOpening(object sender, MenuFlyout e)
+		private void BreadcrumbBar1_RootItemDropDownFlyoutOpening(object sender, BreadcrumbBarItemDropDownFlyoutEventArgs e)
 		{
 			if (sender is not Controls.BreadcrumbBar breadcrumbBar)
 				return;
 
-			e.Items.Add(new MenuFlyoutItem { Icon = new FontIcon() { Glyph = "\uE8B7" }, Text = "Root Item 1" });
-			e.Items.Add(new MenuFlyoutItem { Icon = new FontIcon() { Glyph = "\uE8B7" }, Text = "Root Item 2" });
-			e.Items.Add(new MenuFlyoutItem { Icon = new FontIcon() { Glyph = "\uE8B7" }, Text = "Root Item 3" });
+			e.Flyout.Items.Add(new MenuFlyoutItem { Icon = new FontIcon() { Glyph = "\uE8B7" }, Text = "Root Item 1" });
+			e.Flyout.Items.Add(new MenuFlyoutItem { Icon = new FontIcon() { Glyph = "\uE8B7" }, Text = "Root Item 2" });
+			e.Flyout.Items.Add(new MenuFlyoutItem { Icon = new FontIcon() { Glyph = "\uE8B7" }, Text = "Root Item 3" });
 		}
 
-		private void BreadcrumbBar1_RootItemDropDownFlyoutClosed(object sender, MenuFlyout e)
+		private void BreadcrumbBar1_RootItemDropDownFlyoutClosed(object sender, BreadcrumbBarItemDropDownFlyoutEventArgs e)
 		{
-
+			e.Flyout.Items.Clear();
 		}
 	}
 }