Aot-safe TextMemberPath access

Author: 0x5bfa

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

@@ -55,31 +55,33 @@ protected override void OnApplyTemplate()
 
 		public void OnItemClicked()
 		{
-			if (_ownerRef is not null &&
-				_ownerRef.TryGetTarget(out var breadcrumbBar))
+			if (_ownerRef is null ||
+				!_ownerRef.TryGetTarget(out var breadcrumbBar))
+				return;
+
+			if (IsEllipsis)
 			{
-				if (IsEllipsis)
-				{
-					// Clear items in the ellipsis flyout
-					_itemEllipsisDropDownMenuFlyout.Items.Clear();
+				// Clear items in the ellipsis flyout
+				_itemEllipsisDropDownMenuFlyout.Items.Clear();
 
-					// Populate items in the ellipsis flyout
-					for (int index = 0; index < breadcrumbBar.IndexAfterEllipsis; index++)
+				// Populate items in the ellipsis flyout
+				for (int index = 0; index < breadcrumbBar.IndexAfterEllipsis; index++)
+				{
+					if (breadcrumbBar.TryGetElement(index, out var item) && item?.Content is string text)
 					{
-						if (breadcrumbBar.TryGetElement(index, out var item) && item?.Content is string text)
-						{
-							_itemEllipsisDropDownMenuFlyout.Items.Add(new MenuFlyoutItem() { Text = text });
-						}
+						var menuFlyoutItem = new MenuFlyoutItem() { Text = text };
+						_itemEllipsisDropDownMenuFlyout.Items.Add(menuFlyoutItem);
+						menuFlyoutItem.Click += (sender, e) => breadcrumbBar.RaiseItemClickedEvent(item);
 					}
-
-					// Open the ellipsis flyout
-					FlyoutBase.ShowAttachedFlyout(_itemContentButton);
-				}
-				else
-				{
-					// Fire a click event
-					breadcrumbBar.RaiseItemClickedEvent(this);
 				}
+
+				// Open the ellipsis flyout
+				FlyoutBase.ShowAttachedFlyout(_itemContentButton);
+			}
+			else
+			{
+				// Fire a click event
+				breadcrumbBar.RaiseItemClickedEvent(this);
 			}
 		}
 

src/Files.App.Controls/BreadcrumbBar/BreadcrumbBarItemEventArgs.cs renamed to src/Files.App.Controls/BreadcrumbBar/EventArgs.cs

@@ -0,0 +1,20 @@
+// Copyright (c) Files Community
+// Licensed under the MIT License.
+
+namespace Files.App.Controls
+{
+	/// <summary>
+	/// An interface that provides a way to get the text member path of <see cref="OmnibarMode.SuggestionItemsSource"/>.
+	/// </summary>
+	/// <remarks>
+	/// An alternative to this interface is to use an <see cref="Microsoft.UI.Xaml.Data.IBindableCustomPropertyImplementation"/> powered by CsWinRT.
+	/// </remarks>
+	public interface IOmnibarTextMemberPathProvider
+	{
+		/// <summary>
+		/// Retrieves the path of the text member as a string. This path can be used to identify the location of the text member.
+		/// </summary>
+		/// <returns>Returns a string representing the path of the text member.</returns>
+		string GetTextMemberPath(string textMemberPath);
+	}
+}

src/Files.App.Controls/Omnibar/IOmnibarTextMemberPathProvider.cs

@@ -2,9 +2,11 @@
 // Licensed under the MIT License.
 
 using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Data;
 using Microsoft.UI.Xaml.Markup;
 using Microsoft.UI.Xaml.Media.Animation;
 using Windows.Foundation;
+using WinRT;
 using static System.Net.Mime.MediaTypeNames;
 
 namespace Files.App.Controls
@@ -227,9 +229,9 @@ private string GetObjectText(object obj)
 			// Get the text to put into the text box from the chosen suggestion item
 			return obj is string text
 				? text
-				: CurrentSelectedMode.DisplayMemberPath is null
-					? obj.ToString() ?? string.Empty
-					: obj.GetType().GetProperty(CurrentSelectedMode.DisplayMemberPath)?.GetValue(obj)?.ToString() ?? string.Empty;
+				: obj is IOmnibarTextMemberPathProvider textMemberPathProvider
+					? textMemberPathProvider.GetTextMemberPath(CurrentSelectedMode.DisplayMemberPath ?? string.Empty)
+					: obj.ToString() ?? string.Empty;
 		}
 
 		private void RevertTextToUserInput()

src/Files.App.Controls/Omnibar/Omnibar.cs

@@ -1,7 +1,24 @@
 // Copyright (c) Files Community
 // Licensed under the MIT License.
 
+using Files.App.Controls;
+using System;
+
 namespace Files.App.UITests.Data
 {
-	internal record OmnibarPaletteSuggestionItem(string Title, string Description, string HotKeys);
+	public partial record OmnibarPaletteSuggestionItem(string Title, string Description, string HotKeys)
+		: IOmnibarTextMemberPathProvider
+	{
+		/// <inheritdoc/>
+		public string GetTextMemberPath(string textMemberPath)
+		{
+			return textMemberPath switch
+			{
+				nameof(Title) => Title,
+				nameof(Description) => Description,
+				nameof(HotKeys) => HotKeys,
+				_ => throw new ArgumentOutOfRangeException(nameof(textMemberPath), textMemberPath, null),
+			};
+		}
+	}
 }

tests/Files.App.UITests/Data/OmnibarPaletteSuggestionItem.cs

@@ -50,7 +50,7 @@
 						</controls:OmnibarMode>
 
 						<controls:OmnibarMode
-							DisplayMemberPath="Title"
+							DisplayMemberPath="{x:Bind Omnibar1_TextMemberPathForPaletteMode}"
 							IconOnActive="{controls:ThemedIconMarkup Style={StaticResource App.ThemedIcons.Omnibar.Commands}, IsFilled=True}"
 							IconOnInactive="{controls:ThemedIconMarkup Style={StaticResource App.ThemedIcons.Omnibar.Commands}, IconType=Outline}"
 							ModeName="Palette"

tests/Files.App.UITests/Views/OmnibarPage.xaml

@@ -12,6 +12,8 @@ namespace Files.App.UITests.Views
 {
 	public sealed partial class OmnibarPage : Page
 	{
+		private readonly string Omnibar1_TextMemberPathForPaletteMode = nameof(OmnibarPaletteSuggestionItem.Title);
+
 		private readonly ObservableCollection<OmnibarPaletteSuggestionItem> Omnibar1_PaletteSuggestions;
 		private readonly ObservableCollection<BreadcrumbBarItemModel> Omnibar1_BreadcrumbBarItems;